From: Victor Grishchenko (mughal) <victor.grishchenko@gmail.com>
Date: Wed, 17 Feb 2010 13:27:16 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/gritzko/swift
X-Git-Url: http://p2p-next.cs.pub.ro/gitweb/?a=commitdiff_plain;h=f2b79f5d1dedb1c11468414f75a572b721c0460f;p=swift-upb.git

Merge branch 'master' of git://github.com/gritzko/swift

Conflicts:
	sendrecv.cpp
---

f2b79f5d1dedb1c11468414f75a572b721c0460f
diff --cc sendrecv.cpp
index 04d8d12,9f74a2a..71180d9
--- a/sendrecv.cpp
+++ b/sendrecv.cpp
@@@ -183,11 -183,10 +183,11 @@@ bin64_t        Channel::AddData (Datagr
          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_>>2; // may wake up a bit earlier
 +    if (data_out_.size()<cwnd_ && last_data_out_time_+send_interval_+luft<=NOW) {
          tosend = DequeueHint();
          if (tosend==bin64_t::NONE) {
-             dprintf("%s #%u no idea what to send #sendctrl\n",tintstr(),id_);
+             dprintf("%s #%u sendctrl no idea what to send\n",tintstr(),id_);
              if (send_control_!=KEEP_ALIVE_CONTROL)
                  SwitchSendControl(KEEP_ALIVE_CONTROL);
          }