Further clean up timeout logicexperiment

1 files changed, 11 insertions, 12 deletions

diff --git a/src/network/transportsender.cc b/src/network/transportsender.cc
index 79c6d30..c955d1e 100644
--- a/src/network/transportsender.cc
+++ b/src/network/transportsender.cc
@@ -79,23 +79,22 @@ void TransportSender<MyState>::calculate_timers( void )
     next_ack_time = now + ACK_DELAY;
   }
 
-  if ( !(current_state == sent_states.back().state) ) { /* pending data to send */
+  if ( !(current_state == sent_states.back().state) ) {
     if ( mindelay_clock == uint64_t( -1 ) ) {
       mindelay_clock = now;
     }
 
-    if ( next_send_time > mindelay_clock + SEND_MINDELAY ) {
-      next_send_time = mindelay_clock + SEND_MINDELAY;
-    }
-
-    if ( next_send_time < sent_states.back().timestamp + send_interval() ) {
-      next_send_time = sent_states.back().timestamp + send_interval();
-    }
-  } else if ( ( !(current_state == assumed_receiver_state->state)
-		&& (last_heard + ACTIVE_RETRY_TIMEOUT > now) ) ) {
-    if ( next_send_time < sent_states.back().timestamp + send_interval() ) {
-      next_send_time = sent_states.back().timestamp + send_interval();
+    next_send_time = max( mindelay_clock + SEND_MINDELAY,
+			  sent_states.back().timestamp + send_interval() );
+  } else if ( !(current_state == assumed_receiver_state->state)
+	      && (last_heard + ACTIVE_RETRY_TIMEOUT > now) ) {
+    next_send_time = sent_states.back().timestamp + send_interval();
+    if ( mindelay_clock != uint64_t( -1 ) ) {
+      next_send_time = max( next_send_time, mindelay_clock + SEND_MINDELAY );
     }
+  } else if ( !(current_state == sent_states.front().state )
+	      && (last_heard + ACTIVE_RETRY_TIMEOUT > now) ) {
+    next_send_time = sent_states.back().timestamp + connection->timeout() + ACK_DELAY;
   } else {
     next_send_time = uint64_t(-1);
   }