Split out sender behavior into new class

networktransport.hpp

@@ -8,127 +8,41 @@
 #include <vector>
 
 #include "network.hpp"
-#include "transportinstruction.pb.h"
+#include "transportsender.hpp"
+#include "transportfragment.hpp"
 
 using namespace std;
-using namespace TransportBuffers;
 
 namespace Network {
-  class Fragment
-  {
-  private:
-    static const size_t frag_header_len = 2 * sizeof( uint16_t );
-
-  public:
-    uint16_t id;
-    uint16_t fragment_num;
-    bool final;
-
-    bool initialized;
-
-    string contents;
-
-    Fragment()
-      : id( -1 ), fragment_num( -1 ), final( false ), initialized( false ), contents()
-    {}
-
-    Fragment( uint16_t s_id, uint16_t s_fragment_num, bool s_final, string s_contents )
-      : id( s_id ), fragment_num( s_fragment_num ), final( s_final ), initialized( true ),
-	contents( s_contents )
-    {}
-
-    Fragment( string &x );
-
-    string tostring( void );
-
-    bool operator==( const Fragment &x );
-  };
-
-  class FragmentAssembly
-  {
-  private:
-    vector<Fragment> fragments;
-    uint16_t current_id;
-    int fragments_arrived, fragments_total;
-
-  public:
-    FragmentAssembly() : fragments(), current_id( -1 ), fragments_arrived( 0 ), fragments_total( -1 ) {}
-    bool add_fragment( Fragment &inst );
-    Instruction get_assembly( void );
-  };
-
-  template <class State>
-  class TimestampedState
-  {
-  public:
-    uint64_t timestamp;
-    uint64_t num;
-    State state;
-
-    TimestampedState( uint64_t s_timestamp, uint64_t s_num, State &s_state )
-      : timestamp( s_timestamp ), num( s_num ), state( s_state )
-    {}
-  };
-
   template <class MyState, class RemoteState>
   class Transport
   {
   private:
-    static const int SEND_INTERVAL_MIN = 20; /* ms between frames */
-    static const int SEND_INTERVAL_MAX = 250; /* ms between frames */
-    static const int ACK_INTERVAL = 1000; /* ms between empty acks */
-    static const int ACK_DELAY = 10; /* ms before delayed ack */
-    static const int SEND_MINDELAY = 20; /* ms to collect all input */
-    static const int HEADER_LEN = 120;
+    /* the underlying, encrypted network connection */
+    Connection connection;
 
-    /* helper methods for tick() */
-    unsigned int send_interval( void );
-    void update_assumed_receiver_state( void );
-    void rationalize_states( void );
-    void send_to_receiver( string diff );
-    void send_empty_ack( void );
-    void send_in_fragments( string diff, uint64_t new_num, bool send_timestamp = true );
+    /* sender side */
+    TransportSender<MyState> sender;
 
     /* helper methods for recv() */
-    void process_acknowledgment_through( uint64_t ack_num );
     void process_throwaway_until( uint64_t throwaway_num );
 
-    Connection connection;
-    bool server;
-
-    /* sender */
-    MyState current_state;
-
-    list< TimestampedState<MyState> > sent_states;
-    /* first element: known, acknowledged receiver state */
-    /* last element: last sent state */
-    /* somewhere in the middle: the assumed state of the receiver */
-
-    typename list< TimestampedState<MyState> >::iterator assumed_receiver_state;
-
-    uint16_t next_instruction_id;
-    Instruction last_instruction_sent;
-
     /* simple receiver */
     list< TimestampedState<RemoteState> > received_states;
     RemoteState last_receiver_state; /* the state we were in when user last queried state */
 
     FragmentAssembly fragments;
 
-    bool verbose;
-    uint64_t next_ack_time;
-    uint64_t next_send_time;
-
   public:
     Transport( MyState &initial_state, RemoteState &initial_remote );
     Transport( MyState &initial_state, RemoteState &initial_remote,
 	       const char *key_str, const char *ip, int port );
 
     /* Send data or an ack if necessary. */
-    void tick( void );
+    void tick( void ) { sender.tick(); }
 
-    /* Returns the number of ms to wait until next event. */
-    int wait_time( void );
+    /* Returns the number of ms to wait until next possible event. */
+    int wait_time( void ) { return sender.wait_time(); }
 
     /* Blocks waiting for a packet. */
     void recv( void );
@@ -136,8 +50,8 @@ namespace Network {
     int port( void ) { return connection.port(); }
     string get_key( void ) { return connection.get_key(); }
 
-    MyState &get_current_state( void ) { return current_state; }
-    void set_current_state( const MyState &x ) { current_state = x; }
+    MyState &get_current_state( void ) { return sender.get_current_state(); }
+    void set_current_state( const MyState &x ) { sender.set_current_state( x ); }
 
     string get_remote_diff( void );
 
@@ -148,7 +62,7 @@ namespace Network {
 
     int fd( void ) { return connection.fd(); }
 
-    void set_verbose( void ) { verbose = true; }
+    void set_verbose( void ) { sender.set_verbose(); }
   };
 }