/*
- * datasendrecv.cpp
- * serp++
+ * sendrecv.cpp
+ * most of the swift's state machine
*
* Created by Victor Grishchenko on 3/6/09.
* Copyright 2009 Delft University of Technology. All rights reserved.
*
*/
-#include "p2tp.h"
-#include "compat/util.h"
+#include "swift.h"
+#include <algorithm> // kill it
-
-using namespace p2tp;
+using namespace swift;
using namespace std;
/*
void Channel::AddPeakHashes (Datagram& dgram) {
for(int i=0; i<file().peak_count(); i++) {
bin64_t peak = file().peak(i);
- dgram.Push8(P2TP_HASH);
+ dgram.Push8(SWIFT_HASH);
dgram.Push32((uint32_t)peak);
dgram.PushHash(file().peak_hash(i));
- //DLOG(INFO)<<"#"<<id<<" +pHASH"<<file().peak(i);
- dprintf("%s #%u +phash %s\n",tintstr(),id,peak.str());
+ dprintf("%s #%u +phash %s\n",tintstr(),id_,peak.str());
}
}
void Channel::AddUncleHashes (Datagram& dgram, bin64_t pos) {
bin64_t peak = file().peak_for(pos);
- while (pos!=peak && /*((NOW&3)==3 || !data_out_cap_.within(pos.parent())) &&*/
- ack_in_.get(pos.parent())==bins::EMPTY) {
+ while (pos!=peak && ((NOW&3)==3 || !data_out_cap_.within(pos.parent())) &&
+ ack_in_.get(pos.parent())==binmap_t::EMPTY ) {
bin64_t uncle = pos.sibling();
- dgram.Push8(P2TP_HASH);
+ dgram.Push8(SWIFT_HASH);
dgram.Push32((uint32_t)uncle);
dgram.PushHash( file().hash(uncle) );
- //DLOG(INFO)<<"#"<<id<<" +uHASH"<<uncle;
- dprintf("%s #%u +hash %s\n",tintstr(),id,uncle.str());
+ dprintf("%s #%u +hash %s\n",tintstr(),id_,uncle.str());
pos = pos.parent();
}
}
+bin64_t Channel::ImposeHint () {
+ uint64_t twist = peer_channel_id_; // got no hints, send something randomly
+ twist &= file().peak(0); // FIXME may make it semi-seq here
+ file().ack_out().twist(twist);
+ ack_in_.twist(twist);
+ bin64_t my_pick =
+ file().ack_out().find_filtered(ack_in_,bin64_t::ALL,binmap_t::FILLED);
+ while (my_pick.width()>max(1,(int)cwnd_))
+ my_pick = my_pick.left();
+ file().ack_out().twist(0);
+ ack_in_.twist(0);
+ return my_pick.twisted(twist);
+}
+
+
bin64_t Channel::DequeueHint () {
- if (hint_in_.empty() && last_recv_time_>NOW-rtt_avg_-TINT_SEC) {
- uint64_t twist = peer_channel_id_; // got no hints, send something randomly
- twist &= file().peak(0); // may make it semi-seq here
- file().ack_out().twist(twist);
- ack_in_.twist(twist);
- bin64_t my_pick =
- file().ack_out().find_filtered(ack_in_,bin64_t::ALL,bins::FILLED);
- while (my_pick.width()>max(1,(int)cwnd_))
- my_pick = my_pick.left();
- file().ack_out().twist(0);
- ack_in_.twist(0);
+ if (hint_in_.empty() && last_recv_time_>NOW-rtt_avg_-TINT_SEC) {
+ bin64_t my_pick = ImposeHint(); // FIXME move to the loop
if (my_pick!=bin64_t::NONE) {
- my_pick = my_pick.twisted(twist);
hint_in_.push_back(my_pick);
- dprintf("%s #%u *hint %s\n",tintstr(),id,my_pick.str());
+ dprintf("%s #%u *hint %s\n",tintstr(),id_,my_pick.str());
}
}
bin64_t send = bin64_t::NONE;
}
//if (time < NOW-TINT_SEC*3/2 )
// continue; bad idea
- if (ack_in_.get(hint)!=bins::FILLED)
+ if (ack_in_.get(hint)!=binmap_t::FILLED)
send = hint;
}
uint64_t mass = 0;
for(int i=0; i<hint_in_.size(); i++)
mass += hint_in_[i].bin.width();
- dprintf("%s #%u dequeued %s [%lli]\n",tintstr(),id,send.str(),mass);
+ dprintf("%s #%u dequeued %s [%lli]\n",tintstr(),id_,send.str(),mass);
return send;
}
void Channel::AddHandshake (Datagram& dgram) {
if (!peer_channel_id_) { // initiating
- dgram.Push8(P2TP_HASH);
+ dgram.Push8(SWIFT_HASH);
dgram.Push32(bin64_t::ALL32);
dgram.PushHash(file().root_hash());
dprintf("%s #%u +hash ALL %s\n",
- tintstr(),id,file().root_hash().hex().c_str());
+ tintstr(),id_,file().root_hash().hex().c_str());
}
- dgram.Push8(P2TP_HANDSHAKE);
- int encoded = EncodeID(id);
+ dgram.Push8(SWIFT_HANDSHAKE);
+ int encoded = EncodeID(id_);
dgram.Push32(encoded);
- dprintf("%s #%u +hs %x\n",tintstr(),id,encoded);
- ack_out_.clear();
- AddAck(dgram);
+ dprintf("%s #%u +hs %x\n",tintstr(),id_,encoded);
+ have_out_.clear();
+ AddHave(dgram);
}
bin64_t data = bin64_t::NONE;
if ( is_established() ) {
// FIXME: seeder check
+ AddHave(dgram);
AddAck(dgram);
if (!file().is_complete())
AddHint(dgram);
AddPex(dgram);
- CleanDataOut();
+ TimeoutDataOut();
data = AddData(dgram);
} else {
AddHandshake(dgram);
+ AddHave(dgram);
AddAck(dgram);
}
dprintf("%s #%u sent %ib %s:%x\n",
- tintstr(),id,dgram.size(),peer().str(),peer_channel_id_);
+ tintstr(),id_,dgram.size(),peer().str(),peer_channel_id_);
if (dgram.size()==4) {// only the channel id; bare keep-alive
data = bin64_t::ALL;
- //dprintf("%s #%u considering keepalive %i %f %s\n",
- // tintstr(),id,(int)data_out_.size(),cwnd_,SEND_CONTROL_MODES[send_control_]);
- if (data_out_.size()<cwnd_ && send_control_!=KEEP_ALIVE_CONTROL) {
- if ( cwnd_ < 1 )
- SwitchSendControl(KEEP_ALIVE_CONTROL);
- else
- cwnd_ = cwnd_/2.0;
- }
- //if (data_out_.empty() && send_control_!=KEEP_ALIVE_CONTROL)
- // SwitchSendControl(KEEP_ALIVE_CONTROL);// we did our best
- //if (NOW<last_send_time_+MAX_SEND_INTERVAL) // no need for keepalive
- // return; // don't send empty dgram
}
if (dgram.Send()==-1)
print_error("can't send datagram");
last_send_time_ = NOW;
sent_since_recv_++;
dgrams_sent_++;
+ Reschedule();
}
void Channel::AddHint (Datagram& dgram) {
tint plan_for = max(TINT_SEC,rtt_avg_*4);
-
+
tint timed_out = NOW - plan_for*2;
while ( !hint_out_.empty() && hint_out_.front().time < timed_out ) {
hint_out_size_ -= hint_out_.front().bin.width();
hint_out_.pop_front();
}
-
- /*int peer_cwnd = (int)(rtt_avg_ / dip_avg_);
- if (!peer_cwnd)
- peer_cwnd = 1;*/
- int plan_pck = std::max ( 1LL, plan_for / dip_avg_ );
-
+
+ int plan_pck = max ( (tint)1, plan_for / dip_avg_ );
+
if ( hint_out_size_ < plan_pck ) {
-
+
int diff = plan_pck - hint_out_size_; // TODO: aggregate
bin64_t hint = transfer().picker().Pick(ack_in_,diff,NOW+plan_for*2);
-
+
if (hint!=bin64_t::NONE) {
- dgram.Push8(P2TP_HINT);
+ dgram.Push8(SWIFT_HINT);
dgram.Push32(hint);
- dprintf("%s #%u +hint %s [%lli]\n",tintstr(),id,hint.str(),hint_out_size_);
+ dprintf("%s #%u +hint %s [%lli]\n",tintstr(),id_,hint.str(),hint_out_size_);
hint_out_.push_back(hint);
hint_out_size_ += hint.width();
} else
- dprintf("%s #%u Xhint\n",tintstr(),id);
-
+ dprintf("%s #%u Xhint\n",tintstr(),id_);
+
}
}
bin64_t Channel::AddData (Datagram& dgram) {
-
+
if (!file().size()) // know nothing
return bin64_t::NONE;
-
+
bin64_t tosend = bin64_t::NONE;
- if (data_out_.size()<cwnd_ && last_data_out_time_<=NOW-send_interval_) {
+ tint luft = send_interval_>>4; // may wake up a bit earlier
+ if (data_out_.size()<cwnd_ &&
+ last_data_out_time_+send_interval_<=NOW+luft) {
tosend = DequeueHint();
- if (tosend==bin64_t::NONE)
- dprintf("%s #%u out of hints #sendctrl\n",tintstr(),id);
+ if (tosend==bin64_t::NONE) {
+ dprintf("%s #%u sendctrl no idea what to send\n",tintstr(),id_);
+ if (send_control_!=KEEP_ALIVE_CONTROL)
+ SwitchSendControl(KEEP_ALIVE_CONTROL);
+ }
} else
- dprintf("%s #%u no cwnd #sendctrl\n",tintstr(),id);
-
- if (tosend==bin64_t::NONE)// && (last_data_out_time_>NOW-TINT_SEC || data_out_.empty()))
+ dprintf("%s #%u sendctrl wait cwnd %f data_out %i next %s\n",
+ tintstr(),id_,cwnd_,(int)data_out_.size(),tintstr(last_data_out_time_+NOW-send_interval_));
+
+ if (tosend==bin64_t::NONE)// && (last_data_out_time_>NOW-TINT_SEC || data_out_.empty()))
return bin64_t::NONE; // once in a while, empty data is sent just to check rtt FIXED
-
+
if (ack_in_.is_empty() && file().size())
AddPeakHashes(dgram);
AddUncleHashes(dgram,tosend);
dgram.Send(); // kind of fragmentation
dgram.Push32(peer_channel_id_);
}
-
- dgram.Push8(P2TP_DATA);
+
+ dgram.Push8(SWIFT_DATA);
dgram.Push32(tosend.to32());
-
+
uint8_t buf[1024];
- size_t r = pread(file().file_descriptor(),buf,1024,tosend.base_offset()<<10);
+ size_t r = pread(file().file_descriptor(),buf,1024,tosend.base_offset()<<10);
// TODO: corrupted data, retries, caching
if (r<0) {
print_error("error on reading");
}
assert(dgram.space()>=r+4+1);
dgram.Push(buf,r);
-
+
last_data_out_time_ = NOW;
data_out_.push_back(tosend);
- dprintf("%s #%u +data %s\n",tintstr(),id,tosend.str());
-
+ dprintf("%s #%u +data %s\n",tintstr(),id_,tosend.str());
+
return tosend;
}
-void Channel::AddTs (Datagram& dgram) {
- dgram.Push8(P2TP_TS);
- dgram.Push64(data_in_.time);
- dprintf("%s #%u +ts %s\n",tintstr(),id,tintstr(data_in_.time));
+void Channel::AddAck (Datagram& dgram) {
+ if (data_in_==tintbin())
+ return;
+ dgram.Push8(SWIFT_ACK);
+ dgram.Push32(data_in_.bin.to32()); // FIXME not cover
+ dgram.Push64(data_in_.time); // FIXME 32
+ have_out_.set(data_in_.bin);
+ dprintf("%s #%u +ack %s %s\n",
+ tintstr(),id_,data_in_.bin.str(),tintstr(data_in_.time));
+ if (data_in_.bin.layer()>2)
+ data_in_dbl_ = data_in_.bin;
+ data_in_ = tintbin();
}
-void Channel::AddAck (Datagram& dgram) {
+void Channel::AddHave (Datagram& dgram) {
if (data_in_dbl_!=bin64_t::NONE) { // TODO: do redundancy better
- dgram.Push8(P2TP_ACK);
+ dgram.Push8(SWIFT_HAVE);
dgram.Push32(data_in_dbl_.to32());
data_in_dbl_=bin64_t::NONE;
}
- if (data_in_.time!=TINT_NEVER) { // TODO: ACK NONE for corrupted data
- AddTs(dgram);
- bin64_t pos = file().ack_out().cover(data_in_.bin);
- dgram.Push8(P2TP_ACK);
- dgram.Push32(pos.to32());
- //dgram.Push64(data_in_.time);
- ack_out_.set(pos);
- dprintf("%s #%u +ack %s %s\n",tintstr(),id,pos.str(),tintstr(data_in_.time));
- data_in_ = tintbin(TINT_NEVER,bin64_t::NONE);
- if (pos.layer()>2)
- data_in_dbl_ = pos;
- }
for(int count=0; count<4; count++) {
- bin64_t ack = file().ack_out().find_filtered(ack_out_, bin64_t::ALL, bins::FILLED);
+ bin64_t ack = file().ack_out().find_filtered // FIXME: do rotating queue
+ (have_out_, bin64_t::ALL, binmap_t::FILLED);
if (ack==bin64_t::NONE)
break;
ack = file().ack_out().cover(ack);
- ack_out_.set(ack);
- dgram.Push8(P2TP_ACK);
+ have_out_.set(ack);
+ dgram.Push8(SWIFT_HAVE);
dgram.Push32(ack.to32());
- dprintf("%s #%u +ack %s\n",tintstr(),id,ack.str());
+ dprintf("%s #%u +have %s\n",tintstr(),id_,ack.str());
}
}
void Channel::Recv (Datagram& dgram) {
- dprintf("%s #%u recvd %i\n",tintstr(),id,dgram.size()+4);
- peer_send_time_ = 0; // has scope of 1 datagram
+ dprintf("%s #%u recvd %ib\n",tintstr(),id_,dgram.size()+4);
dgrams_rcvd_++;
if (last_send_time_ && rtt_avg_==TINT_SEC && dev_avg_==0) {
rtt_avg_ = NOW - last_send_time_;
dev_avg_ = rtt_avg_;
dip_avg_ = rtt_avg_;
- dprintf("%s #%u rtt init %lli\n",tintstr(),id,rtt_avg_);
+ dprintf("%s #%u sendctrl rtt init %lli\n",tintstr(),id_,rtt_avg_);
}
bin64_t data = dgram.size() ? bin64_t::NONE : bin64_t::ALL;
while (dgram.size()) {
uint8_t type = dgram.Pull8();
switch (type) {
- case P2TP_HANDSHAKE: OnHandshake(dgram); break;
- case P2TP_DATA: data=OnData(dgram); break;
- case P2TP_TS: OnTs(dgram); break;
- case P2TP_ACK: OnAck(dgram); break;
- case P2TP_HASH: OnHash(dgram); break;
- case P2TP_HINT: OnHint(dgram); break;
- case P2TP_PEX_ADD: OnPex(dgram); break;
+ case SWIFT_HANDSHAKE: OnHandshake(dgram); break;
+ case SWIFT_DATA: data=OnData(dgram); break;
+ case SWIFT_HAVE: OnHave(dgram); break;
+ case SWIFT_ACK: OnAck(dgram); break;
+ case SWIFT_HASH: OnHash(dgram); break;
+ case SWIFT_HINT: OnHint(dgram); break;
+ case SWIFT_PEX_ADD: OnPex(dgram); break;
default:
- eprintf("%s #%u ?msg id unknown %i\n",tintstr(),id,(int)type);
+ eprintf("%s #%u ?msg id unknown %i\n",tintstr(),id_,(int)type);
return;
}
}
last_recv_time_ = NOW;
sent_since_recv_ = 0;
+ Reschedule();
}
bin64_t pos = dgram.Pull32();
Sha1Hash hash = dgram.PullHash();
file().OfferHash(pos,hash);
- //DLOG(INFO)<<"#"<<id<<" .HASH"<<(int)pos;
- dprintf("%s #%u -hash %s\n",tintstr(),id,pos.str());
+ dprintf("%s #%u -hash %s\n",tintstr(),id_,pos.str());
}
}
-bin64_t Channel::OnData (Datagram& dgram) {
+bin64_t Channel::OnData (Datagram& dgram) { // TODO: HAVE NONE for corrupted data
bin64_t pos = dgram.Pull32();
uint8_t *data;
int length = dgram.Pull(&data,1024);
- bool ok = (pos==bin64_t::NONE) || file().OfferData(pos, (char*)data, length) ;
- dprintf("%s #%u %cdata %s\n",tintstr(),id,ok?'-':'!',pos.str());
+ bool ok = (pos==bin64_t::NONE) ||
+ (!file().ack_out().get(pos) && file().OfferData(pos, (char*)data, length) );
+ dprintf("%s #%u %cdata %s\n",tintstr(),id_,ok?'-':'!',pos.str());
data_in_ = tintbin(NOW,bin64_t::NONE);
- if (!ok)
+ if (!ok)
return bin64_t::NONE;
+ bin64_t cover = transfer().ack_out().cover(pos);
+ for(int i=0; i<transfer().cb_installed; i++)
+ if (cover.layer()>=transfer().cb_agg[i])
+ transfer().callbacks[i](transfer().fd(),cover); // FIXME
data_in_.bin = pos;
if (pos!=bin64_t::NONE) {
if (last_data_in_time_) {
}
last_data_in_time_ = NOW;
}
- CleanHintOut(pos);
+ CleanHintOut(pos);
return pos;
}
-void Channel::CleanDataOut (bin64_t ackd_pos) { // TODO: isn't it too long?
-
- int max_ack_off = 0;
- //FIXME do LEDBAT magic somewhere here
-
- if (ackd_pos!=bin64_t::NONE) {
- for (int i=0; i<8 && i<data_out_.size(); i++) {
- if (data_out_[i]!=tintbin() && data_out_[i].bin.within(ackd_pos)) {
- tint rtt = NOW-data_out_[i].time;
- rtt_avg_ = (rtt_avg_*7 + rtt) >> 3;
- dev_avg_ = ( dev_avg_*3 + abs(rtt-rtt_avg_) ) >> 2;
- dprintf("%s #%u rtt %lli dev %lli\n",tintstr(),id,rtt_avg_,dev_avg_);
- bin64_t pos = data_out_[i].bin;
- ack_rcvd_recent_++;
- data_out_[i]=tintbin();
- max_ack_off = i;
- if (ackd_pos==pos)
- break;
- }
- }
- while (!data_out_.empty() && data_out_.front().bin==bin64_t::NONE) {
- data_out_.pop_front();
- max_ack_off--;
+void Channel::OnAck (Datagram& dgram) {
+ bin64_t ackd_pos = dgram.Pull32();
+ tint peer_time = dgram.Pull64(); // FIXME 32
+ // FIXME FIXME: wrap around here
+ if (ackd_pos==bin64_t::NONE)
+ return; // likely, brocken packet / insufficient hashes
+ if (file().size() && ackd_pos.base_offset()>=file().packet_size()) {
+ eprintf("invalid ack: %s\n",ackd_pos.str());
+ return;
+ }
+ ack_in_.set(ackd_pos);
+ int di = 0, ri = 0;
+ // find an entry for the send (data out) event
+ while ( di<data_out_.size() && ( data_out_[di]==tintbin() ||
+ !data_out_[di].bin.within(ackd_pos) ) )
+ di++;
+ // FUTURE: delayed acks
+ // rule out retransmits
+ while ( ri<data_out_tmo_.size() && !data_out_tmo_[ri].bin.within(ackd_pos) )
+ ri++;
+ dprintf("%s #%u %cack %s %lli\n",tintstr(),id_,
+ di==data_out_.size()?'?':'-',ackd_pos.str(),peer_time);
+ if (di!=data_out_.size() && ri==data_out_tmo_.size()) { // not a retransmit
+ // round trip time calculations
+ tint rtt = NOW-data_out_[di].time;
+ rtt_avg_ = (rtt_avg_*7 + rtt) >> 3;
+ dev_avg_ = ( dev_avg_*3 + ::abs(rtt-rtt_avg_) ) >> 2;
+ assert(data_out_[di].time!=TINT_NEVER);
+ // one-way delay calculations
+ tint owd = peer_time - data_out_[di].time;
+ owd_cur_bin_ = 0;//(owd_cur_bin_+1) & 3;
+ owd_current_[owd_cur_bin_] = owd;
+ if ( owd_min_bin_start_+TINT_SEC*30 < NOW ) {
+ owd_min_bin_start_ = NOW;
+ owd_min_bin_ = (owd_min_bin_+1) & 3;
+ owd_min_bins_[owd_min_bin_] = TINT_NEVER;
}
- static const int MAX_REORDERING = 2; // the triple-ACK principle
- if (max_ack_off>MAX_REORDERING) {
- while (max_ack_off && (data_out_.front().bin==bin64_t::NONE
- || ack_in_.is_filled(data_out_.front().bin)) ) {
- data_out_.pop_front();
- max_ack_off--;
- }
- while (max_ack_off>MAX_REORDERING) {
- ack_not_rcvd_recent_++;
- dprintf("%s #%u Rdata %s\n",tintstr(),id,data_out_.front().bin.str());
- data_out_.pop_front();
- max_ack_off--;
- data_out_cap_ = bin64_t::ALL;
- }
+ if (owd_min_bins_[owd_min_bin_]>owd)
+ owd_min_bins_[owd_min_bin_] = owd;
+ dprintf("%s #%u sendctrl rtt %lli dev %lli based on %s\n",
+ tintstr(),id_,rtt_avg_,dev_avg_,data_out_[di].bin.str());
+ ack_rcvd_recent_++;
+ // early loss detection by packet reordering
+ for (int re=0; re<di-MAX_REORDERING; re++) {
+ if (data_out_[re]==tintbin())
+ continue;
+ ack_not_rcvd_recent_++;
+ data_out_tmo_.push_back(data_out_[re].bin);
+ dprintf("%s #%u Rdata %s\n",tintstr(),id_,data_out_.front().bin.str());
+ data_out_cap_ = bin64_t::ALL;
+ data_out_[re] = tintbin();
}
}
- tint timeout = NOW - rtt_avg_ - 4*std::max(dev_avg_,TINT_MSEC*50);
- while (!data_out_.empty() && data_out_.front().time<timeout) {
- if (data_out_.front().bin!=bin64_t::NONE && ack_in_.is_empty(data_out_.front().bin)) {
+ if (di!=data_out_.size())
+ data_out_[di]=tintbin();
+ // clear zeroed items
+ while (!data_out_.empty() && ( data_out_.front()==tintbin() ||
+ ack_in_.is_filled(data_out_.front().bin) ) )
+ data_out_.pop_front();
+ assert(data_out_.empty() || data_out_.front().time!=TINT_NEVER);
+}
+
+
+void Channel::TimeoutDataOut ( ) {
+ // losses: timeouted packets
+ tint timeout = NOW - ack_timeout();
+ while (!data_out_.empty() &&
+ ( data_out_.front().time<timeout || data_out_.front()==tintbin() ) ) {
+ if (data_out_.front()!=tintbin() && ack_in_.is_empty(data_out_.front().bin)) {
ack_not_rcvd_recent_++;
data_out_cap_ = bin64_t::ALL;
- dprintf("%s #%u Tdata %s\n",tintstr(),id,data_out_.front().bin.str());
+ data_out_tmo_.push_back(data_out_.front().bin);
+ dprintf("%s #%u Tdata %s\n",tintstr(),id_,data_out_.front().bin.str());
}
data_out_.pop_front();
}
- while (!data_out_.empty() && data_out_.front().bin==bin64_t::NONE)
- data_out_.pop_front();
-
+ // clear retransmit queue of older items
+ while (!data_out_tmo_.empty() && data_out_tmo_.front().time<NOW-MAX_POSSIBLE_RTT)
+ data_out_tmo_.pop_front();
}
-void Channel::OnAck (Datagram& dgram) {
+void Channel::OnHave (Datagram& dgram) {
bin64_t ackd_pos = dgram.Pull32();
if (ackd_pos==bin64_t::NONE)
- return; // likely, brocken packet / insufficient hashes
- if (file().size() && ackd_pos.base_offset()>=file().packet_size()) {
- eprintf("invalid ack: %s\n",ackd_pos.str());
- return;
- }
- dprintf("%s #%u -ack %s\n",tintstr(),id,ackd_pos.str());
+ return; // wow, peer has hashes
ack_in_.set(ackd_pos);
- CleanDataOut(ackd_pos); // FIXME do AFTER all ACKs
-}
-
-
-void Channel::OnTs (Datagram& dgram) {
- peer_send_time_ = dgram.Pull64();
- dprintf("%s #%u -ts %lli\n",tintstr(),id,peer_send_time_);
+ dprintf("%s #%u -have %s\n",tintstr(),id_,ackd_pos.str());
}
void Channel::OnHint (Datagram& dgram) {
bin64_t hint = dgram.Pull32();
+ // FIXME: wake up here
hint_in_.push_back(hint);
- //ack_in_.set(hint,bins::EMPTY);
- //RequeueSend(cc_->OnHintRecvd(hint));
- dprintf("%s #%u -hint %s\n",tintstr(),id,hint.str());
+ dprintf("%s #%u -hint %s\n",tintstr(),id_,hint.str());
}
void Channel::OnHandshake (Datagram& dgram) {
peer_channel_id_ = dgram.Pull32();
- dprintf("%s #%u -hs %x\n",tintstr(),id,peer_channel_id_);
+ dprintf("%s #%u -hs %x\n",tintstr(),id_,peer_channel_id_);
// self-connection check
if (!SELF_CONN_OK) {
uint32_t try_id = DecodeID(peer_channel_id_);
if (channel(try_id) && !channel(try_id)->peer_channel_id_) {
- delete this;
- return;
+ peer_channel_id_ = 0;
+ Close();
+ return; // this is a self-connection
}
}
// FUTURE: channel forking
uint32_t ipv4 = dgram.Pull32();
uint16_t port = dgram.Pull16();
Address addr(ipv4,port);
- dprintf("%s #%u -pex %s\n",tintstr(),id,addr.str());
+ dprintf("%s #%u -pex %s\n",tintstr(),id_,addr.str());
transfer().OnPexIn(addr);
}
void Channel::AddPex (Datagram& dgram) {
int chid = transfer().RevealChannel(pex_out_);
- if (chid==-1 || chid==id)
+ if (chid==-1 || chid==id_)
return;
Address a = channels[chid]->peer();
- dgram.Push8(P2TP_PEX_ADD);
+ dgram.Push8(SWIFT_PEX_ADD);
dgram.Push32(a.ipv4());
dgram.Push16(a.port());
- dprintf("%s #%u +pex %s\n",tintstr(),id,a.str());
+ dprintf("%s #%u +pex %s\n",tintstr(),id_,a.str());
}
-Channel* Channel::RecvDatagram (int socket) {
+void Channel::RecvDatagram (SOCKET socket) {
Datagram data(socket);
data.Recv();
- Address& addr = data.addr;
-#define return_log(...) { eprintf(__VA_ARGS__); return NULL; }
- if (data.size()<4)
+ const Address& addr = data.address();
+#define return_log(...) { fprintf(stderr,__VA_ARGS__); return; }
+ if (data.size()<4)
return_log("datagram shorter than 4 bytes %s\n",addr.str());
uint32_t mych = data.Pull32();
Sha1Hash hash;
Channel* channel = NULL;
- if (!mych) { // handshake initiated
- if (data.size()<1+4+1+4+Sha1Hash::SIZE)
- return_log ("incorrect size %i initial handshake packet %s\n",data.size(),addr.str());
+ if (mych==0) { // handshake initiated
+ if (data.size()<1+4+1+4+Sha1Hash::SIZE)
+ return_log ("%s #0 incorrect size %i initial handshake packet %s\n",
+ tintstr(),data.size(),addr.str());
uint8_t hashid = data.Pull8();
- if (hashid!=P2TP_HASH)
- return_log ("no hash in the initial handshake %s\n",addr.str());
+ if (hashid!=SWIFT_HASH)
+ return_log ("%s #0 no hash in the initial handshake %s\n",
+ tintstr(),addr.str());
bin64_t pos = data.Pull32();
- if (pos!=bin64_t::ALL)
- return_log ("that is not the root hash %s\n",addr.str());
+ if (pos!=bin64_t::ALL)
+ return_log ("%s #0 that is not the root hash %s\n",tintstr(),addr.str());
hash = data.PullHash();
FileTransfer* file = FileTransfer::Find(hash);
- if (!file)
- return_log ("hash %s unknown, no such file %s\n",hash.hex().c_str(),addr.str());
+ if (!file)
+ return_log ("%s #0 hash %s unknown, no such file %s\n",tintstr(),hash.hex().c_str(),addr.str());
dprintf("%s #0 -hash ALL %s\n",tintstr(),hash.hex().c_str());
for(binqueue::iterator i=file->hs_in_.begin(); i!=file->hs_in_.end(); i++)
- if (channels[*i] && channels[*i]->peer_==data.addr &&
+ if (channels[*i] && channels[*i]->peer_==data.address() &&
channels[*i]->last_recv_time_>NOW-TINT_SEC*2)
- return_log("have a channel already to %s\n",addr.str());
+ return_log("%s #0 have a channel already to %s\n",tintstr(),addr.str());
channel = new Channel(file, socket, data.address());
} else {
mych = DecodeID(mych);
- if (mych>=channels.size())
- return_log("invalid channel #%u, %s\n",mych,addr.str());
+ if (mych>=channels.size())
+ return_log("%s invalid channel #%u, %s\n",tintstr(),mych,addr.str());
channel = channels[mych];
- if (!channel)
- return_log ("channel #%u is already closed\n",mych,addr.str());
- if (channel->peer() != addr)
- return_log ("invalid peer address #%u %s!=%s\n",mych,channel->peer().str(),addr.str());
+ if (!channel)
+ return_log ("%s #%u is already closed\n",tintstr(),mych,addr.str());
+ if (channel->peer() != addr)
+ return_log ("%s #%u invalid peer address %s!=%s\n",
+ tintstr(),mych,channel->peer().str(),addr.str());
channel->own_id_mentioned_ = true;
}
//dprintf("recvd %i bytes for %i\n",data.size(),channel->id);
channel->Recv(data);
- return channel;
}
-void Channel::Loop (tint howlong) {
-
+void Channel::Loop (tint howlong) {
+
tint limit = Datagram::Time() + howlong;
-
+
do {
tint send_time(TINT_NEVER);
Channel* sender(NULL);
while (!sender && !send_queue.is_empty()) { // dequeue
tintbin next = send_queue.pop();
- send_time = next.time;
sender = channel((int)next.bin);
+ send_time = next.time;
if (sender && sender->next_send_time_!=send_time &&
sender->next_send_time_!=TINT_NEVER )
sender = NULL; // it was a stale entry
}
-
+
if ( sender!=NULL && send_time<=NOW ) { // it's time
-
- if (sender->next_send_time_<NOW+TINT_MIN) { // either send
- dprintf("%s #%u sch_send %s\n",tintstr(),sender->id,
- tintstr(send_time));
- sender->Send();
- sender->Reschedule();
- } else { // or close the channel
- dprintf("%s #%u closed sendctrl\n",tintstr(),sender->id);
- delete sender;
- }
-
+
+ dprintf("%s #%u sch_send %s\n",tintstr(),sender->id(),
+ tintstr(send_time));
+ sender->Send();
+
} else { // it's too early, wait
-
+
tint towait = min(limit,send_time) - NOW;
- dprintf("%s waiting %lliusec\n",tintstr(),towait);
- int rd = Datagram::Wait(socket_count,sockets,towait);
- if (rd!=INVALID_SOCKET) { // in meantime, received something
- Channel* receiver = RecvDatagram(rd);
- if (receiver) // receiver's state may have changed
- receiver->Reschedule();
- }
+ dprintf("%s #0 waiting %lliusec\n",tintstr(),towait);
+ Datagram::Wait(towait);
if (sender) // get back to that later
- send_queue.push(tintbin(send_time,sender->id));
-
+ send_queue.push(tintbin(send_time,sender->id()));
+
}
-
+
} while (NOW<limit);
-
+
+}
+
+
+void Channel::Close () {
+ this->SwitchSendControl(CLOSE_CONTROL);
}
-
+
void Channel::Reschedule () {
next_send_time_ = NextSendTime();
if (next_send_time_!=TINT_NEVER) {
assert(next_send_time_<NOW+TINT_MIN);
- send_queue.push(tintbin(next_send_time_,id));
- } else
- send_queue.push(tintbin(NOW+TINT_MIN,id));
- dprintf("%s requeue #%u for %s\n",tintstr(),id,tintstr(next_send_time_));
+ send_queue.push(tintbin(next_send_time_,id_));
+ dprintf("%s #%u requeue for %s\n",tintstr(),id_,tintstr(next_send_time_));
+ } else {
+ dprintf("%s #%u closed\n",tintstr(),id_);
+ delete this;
+ }
}
projects / swift-upb.git / blobdiff