Source IP and port are no longer required. This was long overdue!

Author: venkatarun95

ctcp.hh

@@ -27,9 +27,6 @@ private:
   UDPSocket socket;
   ConnectionType conntype;
 
-  string myaddr;
-  int myport;
-
   string dstaddr;
   int dstport;
 
@@ -47,12 +44,10 @@ private:
 
 public:
 
-  CTCP( T s_congctrl, string ipaddr, int port, string s_myaddr, int s_myport ) 
+  CTCP( T s_congctrl, string ipaddr, int port ) 
   :   congctrl( s_congctrl ), 
     socket(), 
     conntype( SENDER ),
-    myaddr( s_myaddr ),
-    myport( s_myport ), 
     dstaddr( ipaddr ),
     dstport( port ),
     _last_send_time( 0.0 ),
@@ -63,15 +58,13 @@ public:
     tot_bytes_transmitted( 0 ),
     tot_packets_transmitted( 0 )
   {
-    socket.bindsocket( ipaddr, port, myaddr, myport );
+    socket.bindsocket( ipaddr, port );
   }
 
   CTCP( CTCP<T> &other )
   : congctrl( other.congctrl ),
     socket(),
     conntype( other.conntype ),
-    myaddr( other.myaddr ),
-    myport( other.myport ),
     dstaddr( other.dstaddr ),
     dstport( other.dstport ),
     _last_send_time( 0.0 ),
@@ -82,7 +75,7 @@ public:
     tot_bytes_transmitted( 0 ),
     tot_packets_transmitted( 0 )
   {
-    socket.bindsocket( dstaddr, dstport, myaddr, myport );
+    socket.bindsocket( dstaddr, dstport );
   }
 
   //duration in milliseconds

prober.cc

@@ -27,20 +27,18 @@ double current_timestamp( chrono::high_resolution_clock::time_point &start_time_
 }
 
 int main( int argc, char* argv[] ) {
-	string dstaddr, myaddr;
-	int dstport, myport;
+	string dstaddr;
+	int dstport;
 	if( argc != 5 ){
-		cout << "Usage: ./prober dstaddr myaddr dstport outfilename " << endl;
+		cout << "Usage: ./prober dstaddr dstport outfilename " << endl;
 		exit( 0 );
 	}
 	dstaddr = argv[1];
-	myaddr = argv[2];
-	dstport = atoi( argv[3] );
-	myport = 0;
+	dstport = atoi( argv[2] );
 	LINK_LOGGING_FILENAME = argv[4];
 
 	UDPSocket socket;
-	socket.bindsocket( dstaddr, dstport, myaddr, myport );
+	socket.bindsocket( dstaddr, dstport );
 
 	const int src_id = 42; // some arbitrary number
 	const int packet_size = sizeof(TCPHeader)+2;
@@ -144,4 +142,4 @@ int main( int argc, char* argv[] ) {
 
 	if( LINK_LOGGING )
 		link_logfile.close();
-}
+}

receiver.cc

@@ -35,7 +35,7 @@ void punch_NAT(string serverip, UDPSocket &sender_socket) {
 	UDPSocket::SockAddress addr_holder;
 	UDPSocket server_socket;
 
-	server_socket.bindsocket(serverip, 4839, "0.0.0.0", 0);
+	server_socket.bindsocket(serverip, 4839);
 	while (1) {
 		this_thread::sleep_for( chrono::seconds(5) );
 

sender.cc

@@ -20,8 +20,8 @@ int main( int argc, char *argv[] ) {
 	WhiskerTree whiskers;
 	bool ratFound = false;
 
-	string serverip = "", sourceip = "";
-	int serverport=8888, sourceport=0;
+	string serverip = "";
+	int serverport=8888;
 	int offduration=5000, onduration=5000;
 	string traffic_params = "";
 	string delta_conf = ""; // for MarkovianCC
@@ -60,12 +60,8 @@ int main( int argc, char *argv[] ) {
 		}
 		else if( arg.substr( 0, 9 ) == "serverip=" )
 			serverip = arg.substr( 9 );
-		else if( arg.substr( 0, 9 ) == "sourceip=" )
-			sourceip = arg.substr( 9 );
 		else if( arg.substr( 0, 11 ) == "serverport=" )
 			serverport = atoi( arg.substr( 11 ).c_str() );
-		else if( arg.substr( 0, 11 ) == "sourceport=" )
-			sourceport = atoi( arg.substr( 11 ).c_str() );
 		else if( arg.substr( 0, 12 ) == "offduration=" )
 			offduration	= atoi( arg.substr( 12 ).c_str() );
 		else if( arg.substr( 0, 11 ) == "onduration=" )
@@ -108,8 +104,8 @@ int main( int argc, char *argv[] ) {
 		}
 	}
 
-	if ( serverip == "" || sourceip == "") {
-		fprintf( stderr, "Usage: sender serverip=(ipaddr) sourceip=(ipaddr) [if=(ratname)] [offduration=(time in ms)] [onduration=(time in ms)] [cctype=remy|kernel|tcp|markovian] [delta_conf=(for MarkovianCC)] [linkrate=(packets/sec)] [linklog=filename][serverport=(port)] [sourceport=(port)]\n");
+	if ( serverip == "" ) {
+		fprintf( stderr, "Usage: sender serverip=(ipaddr) [if=(ratname)] [offduration=(time in ms)] [onduration=(time in ms)] [cctype=remy|kernel|tcp|markovian] [delta_conf=(for MarkovianCC)] [linkrate=(packets/sec)] [linklog=filename] [serverport=(port)]\n");
 		exit(1);
 	}
 
@@ -121,14 +117,14 @@ int main( int argc, char *argv[] ) {
 	if( cctype == CCType::REMYCC) {
 		fprintf( stdout, "Using RemyCC.\n" );
 		RemyCC congctrl( whiskers );
-		CTCP< RemyCC > connection( congctrl, serverip, serverport, sourceip, sourceport );
+		CTCP< RemyCC > connection( congctrl, serverip, serverport );
 		TrafficGenerator<CTCP<RemyCC>> traffic_generator( connection, onduration, offduration, traffic_params );
 		traffic_generator.spawn_senders( 1 );
 	}
 	else if( cctype == CCType::TCPCC ) {
 		fprintf( stdout, "Using UDT's TCP CC.\n" );
 		DefaultCC congctrl;
-		CTCP< DefaultCC > connection( congctrl, serverip, serverport, sourceip, sourceport );
+		CTCP< DefaultCC > connection( congctrl, serverip, serverport );
 		TrafficGenerator< CTCP< DefaultCC > > traffic_generator( connection, onduration, offduration, traffic_params );
 		traffic_generator.spawn_senders( 1 );
 	}
@@ -164,7 +160,7 @@ int main( int argc, char *argv[] ) {
 		fprintf ( stderr, "NashCC Deprecated. Use MarkovianCC.\n" );
 		assert( cctype != CCType::NASHCC );
 		//NashCC congctrl( nashcc_utility_mode, param );
-		//CTCP< NashCC > connection( congctrl, serverip, serverport, sourceip, sourceport );
+		//CTCP< NashCC > connection( congctrl, serverip, serverport );
 		//TrafficGenerator<CTCP<NashCC>> traffic_generator( connection, onduration, offduration, traffic_params );
 		//traffic_generator.spawn_senders( 1 );
 	}
@@ -173,7 +169,7 @@ int main( int argc, char *argv[] ) {
 		MarkovianCC congctrl(1.0);
 		assert(delta_conf != "");
 		congctrl.interpret_config_str(delta_conf);
-		CTCP< MarkovianCC > connection( congctrl, serverip, serverport, sourceip, sourceport );
+		CTCP< MarkovianCC > connection( congctrl, serverip, serverport );
 		TrafficGenerator< CTCP< MarkovianCC > > traffic_generator( connection, onduration, offduration, traffic_params );
 		traffic_generator.spawn_senders( 1 );
 	}

udp-socket.cc

@@ -8,25 +8,9 @@
 
 using namespace std;
 
-int UDPSocket::bindsocket(string s_ipaddr, int s_port, string myaddr /* __attribute((unused)) */, int myport /* __attribute((unused)) */){
+int UDPSocket::bindsocket(string s_ipaddr, int s_port){
 	ipaddr = s_ipaddr;
 	port = s_port;
-	sockaddr_in my_addr;
-	
-	memset((char*) &my_addr, 0, sizeof(my_addr));
-	my_addr.sin_family = AF_INET;
-    my_addr.sin_port = htons(myport);
-    if (inet_aton(myaddr.c_str(), &my_addr.sin_addr) == 0) 
-    {
-        std::cerr<<"inet_aton failed while binding to port. Check the format of given ip address. Code: "<<errno<<endl;
-        return -1;
-    }
-    myport = myport*2;
-    if (bind(udp_socket, (struct sockaddr *)&my_addr, sizeof(my_addr)) < 0 ){
-    	std::cerr<<"Failed to bind to port. Code: "<<errno<<endl;
-        return -2;
-    }
-
 	bound = true;
 	return 0;
 }
@@ -155,4 +139,4 @@ string UDPSocket::decipher_socket_addr(sockaddr_in addr) {
 	string ip_addr; int port;
 	UDPSocket::decipher_socket_addr(addr, ip_addr, port);
 	return ip_addr + ":" + to_string(port);
- }
+ }

udp-socket.hh

@@ -22,7 +22,7 @@ public:
 		udp_socket = socket(AF_INET, SOCK_DGRAM, 0);
 	}
 
-	int bindsocket(std::string ipaddr, int port, std::string myaddr, int myport);
+	int bindsocket(std::string ipaddr, int port);
 	int bindsocket(int port);
 	ssize_t senddata(const char* data, ssize_t size, SockAddress *s_dest_addr);
 	ssize_t senddata(const char* data, ssize_t size, std::string dest_ip, int dest_port);
@@ -32,4 +32,4 @@ public:
 	static std::string decipher_socket_addr(SockAddress addr);
 };
 
-#endif
+#endif