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) ;
+ 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)
return bin64_t::NONE;
+ bin64_t cover = transfer().ack_out().cover(pos);
for(int i=0; i<transfer().cb_installed; i++)
- transfer().callbacks[i](transfer().fd(),pos); // FIXME FIXME FIXME
+ 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_) {
uint32_t mych = data.Pull32();
Sha1Hash hash;
Channel* channel = NULL;
- if (!mych) { // handshake initiated
+ 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());
tint towait = min(limit,send_time) - NOW;
dprintf("%s #0 waiting %lliusec\n",tintstr(),towait);
- Datagram::Wait(socket_count,sockets,towait);
+ Datagram::Wait(towait);
if (sender) // get back to that later
send_queue.push(tintbin(send_time,sender->id()));