From 4a90f6a0ef4bad4edd572f6ad05fc2d1e767bfb2 Mon Sep 17 00:00:00 2001 From: Keith Winstein Date: Wed, 10 Aug 2011 00:03:48 -0400 Subject: [PATCH] Remove some debugging code --- network.hpp | 2 +- networktransport.cpp | 10 +++++++--- ntester.cpp | 4 +--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/network.hpp b/network.hpp index 1cbda21..1a1d873 100644 --- a/network.hpp +++ b/network.hpp @@ -76,7 +76,7 @@ namespace Network { void send( string &s ); string recv( void ); int fd( void ) { return sock; } - int get_MTU( void ) { return 110; } + int get_MTU( void ) { return MTU; } int port( void ); string get_key( void ) { return key.printable_key(); } diff --git a/networktransport.cpp b/networktransport.cpp index 159d17c..4c2779b 100644 --- a/networktransport.cpp +++ b/networktransport.cpp @@ -131,9 +131,13 @@ void Transport::send_to_receiver( void ) /* If this is the final diff in a sequence, make sure it does get the highest state number (even if we've retread to previously-seen ground ) */ /* This will force the client to update to this state */ - if ( (previously_sent->num != sent_states.back().num) - && (new_state == target_receiver_state) ) { - previously_sent = sent_states.end(); + if ( new_state == target_receiver_state ) { + if ( new_state == sent_states.back().state ) { + previously_sent = sent_states.end(); + previously_sent--; + } else { + previously_sent = sent_states.end(); + } } if ( previously_sent == sent_states.end() ) { /* not previously sent */ diff --git a/ntester.cpp b/ntester.cpp index 3ef57de..6294ea9 100644 --- a/ntester.cpp +++ b/ntester.cpp @@ -102,9 +102,7 @@ int main( int argc, char *argv[] ) if ( fds[ 0 ].revents & POLLIN ) { char x = getchar(); - for ( int i = 0; i < 20; i++ ) { - n->get_current_state().key_hit( x ); - } + n->get_current_state().key_hit( x ); } if ( fds[ 1 ].revents & POLLIN ) {