small fix; need a big change

git-svn-id: https://ttuki.vtt.fi/svn/p2p-next/TUD/p2tp/trunk@561 e16421f0-f15b-0410-abcd-98678b794739

diff --git a/ext/send_control.cpp b/ext/send_control.cpp
index 54ed980ea7ec0ff15740cabac7b3edcd992d1716..495eb165cc90c804044956ac7619db0b61532ac7 100644 (file)
--- a/ext/send_control.cpp
+++ b/ext/send_control.cpp
@@ -104,10 +104,11 @@ bool    CwndController::MaySendData() {
     
 
 void    CwndController::OnDataSent(bin64_t b) {
-    if ( (b==bin64_t::ALL || b==bin64_t::NONE) && MaySendData() ) { // no more data
-        Schedule(NOW+ch_->rtt_avg_);
-        Swap(new KeepAliveController(this));
-    } else {
+    if ( (b==bin64_t::ALL || b==bin64_t::NONE) && MaySendData() ) { // no more data (no hints?)
+        Schedule(NOW+ch_->rtt_avg_); // soft pause; nothing to send yet
+        if (ch_->last_send_data_time_ < NOW-ch_->rtt_avg_)
+            Swap(new KeepAliveController(this)); // really, nothing to send
+    } else { // FIXME: mandatory rescheduling after send/recv; based on state
         tint spacing = ch_->rtt_avg_ / cwnd_;
         if (ch_->data_out_.size() < cwnd_) { // have cwnd; not the right time yet
             Schedule(ch_->last_send_data_time_+spacing);