From: Victor Grishchenko <victor.grishchenko@gmail.com>
Date: Tue, 9 Feb 2010 14:34:15 +0000 (+0100)
Subject: owd calc bugs
X-Git-Url: http://p2p-next.cs.pub.ro/gitweb/?a=commitdiff_plain;h=3e92234304ca66dc21b54fcb6cbad06efb17772c;p=swift-upb.git

owd calc bugs
---

diff --git a/sendrecv.cpp b/sendrecv.cpp
index 68784e4..49e9686 100644
--- a/sendrecv.cpp
+++ b/sendrecv.cpp
@@ -361,10 +361,11 @@ void    Channel::CleanDataOut (bin64_t ackd_pos) { // TODO: isn't it too long?
                 rtt_avg_ = (rtt_avg_*7 + rtt) >> 3;
                 dev_avg_ = ( dev_avg_*3 + abs(rtt-rtt_avg_) ) >> 2;
                 if (peer_send_time_) {
+                    assert(data_out_[i].time!=TINT_NEVER);
                     tint owd = peer_send_time_ - data_out_[i].time;
                     owd_cur_bin_ = (owd_cur_bin_+1) & 3;
                     owd_current_[owd_cur_bin_] = owd;
-                    if (owd_min_bin_start_<NOW+TINT_SEC*30) {
+                    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;