Update HighSpeedNetIO to take in two ports instead of one

emp-tool/io/highspeed_net_io_channel.h

@@ -1,25 +1,26 @@
 #ifndef EMP_HIGHSPEED_NETWORK_IO_CHANNEL_H__
 #define EMP_HIGHSPEED_NETWORK_IO_CHANNEL_H__
 
-#include <iostream>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
+#include <iostream>
 #include <string>
+
 #include "emp-tool/io/io_channel.h"
 using std::string;
 
-#include <unistd.h>
 #include <arpa/inet.h>
-#include <sys/types.h>
-#include <netinet/tcp.h>
 #include <netinet/in.h>
+#include <netinet/tcp.h>
 #include <sys/socket.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 namespace emp {
 
-class SubChannel {
-public:
+class SubChannel { public:
 	int sock;
 	FILE *stream = nullptr;
 	char *buf = nullptr;
@@ -42,9 +43,7 @@ class SubChannel {
 };
 
 class SenderSubChannel : public SubChannel { public:
-	SenderSubChannel(int sock): SubChannel(sock) {
-		ptr = 0;
-	}
+	SenderSubChannel(int sock) : SubChannel(sock) { ptr = 0; }
 
 	void flush() {
 		flushes++;
@@ -80,9 +79,7 @@ class SenderSubChannel: public SubChannel {public:
 };
 
 class RecverSubChannel : public SubChannel { public:
-	RecverSubChannel(int sock): SubChannel(sock) {
-		ptr = NETWORK_BUFFER_SIZE2;
-	}
+	RecverSubChannel(int sock) : SubChannel(sock) { ptr = NETWORK_BUFFER_SIZE2; }
 	void flush() {
 		flushes++;
 		ptr = NETWORK_BUFFER_SIZE2;
@@ -123,15 +120,33 @@ class RecverSubChannel: public SubChannel {public:
 		}
 	}
 };
+
 class HighSpeedNetIO : public IOChannel<HighSpeedNetIO> { public:
 	bool is_server, quiet;
 	int send_sock = 0;
 	int recv_sock = 0;
 	int FSM = 0;
 	SenderSubChannel *schannel;
 	RecverSubChannel *rchannel;
-	string addr;
-	int port;
+
+	HighSpeedNetIO(const char *address, int send_port, int recv_port, bool quiet = true) : quiet(quiet) {
+		is_server = (address == nullptr);
+		if (is_server) {
+			recv_sock = server_listen(send_port);
+			usleep(2000);
+			send_sock = server_listen(recv_port & 0xFFFF);
+		} else {
+			send_sock = client_connect(address, send_port);
+			recv_sock = client_connect(address, recv_port & 0xFFFF);
+		}
+		FSM = 0;
+		set_delay_opt(send_sock, true);
+		set_delay_opt(recv_sock, true);
+		schannel = new SenderSubChannel(send_sock);
+		rchannel = new RecverSubChannel(recv_sock);
+		if (not quiet) std::cout << "connected\n";
+	}
+
 	int server_listen(int port) {
 		int mysocket;
 		struct sockaddr_in dest;
@@ -166,34 +181,12 @@ class HighSpeedNetIO: public IOChannel<HighSpeedNetIO> { public:
 
 		while (1) {
 			sock = socket(AF_INET, SOCK_STREAM, 0);
-			if (connect(sock, (struct sockaddr *)&dest, sizeof(struct sockaddr)) == 0)
-				break;
+			if (connect(sock, (struct sockaddr *)&dest, sizeof(struct sockaddr)) == 0) break;
 
 			close(sock);
 			usleep(1000);
 		}
 		return sock;
-
-	}
-	HighSpeedNetIO(const char * address, int port, bool quiet = true): quiet(quiet), port(port & 0xFFFF) {
-		is_server = (address == nullptr);
-		if (is_server) {
-			recv_sock = server_listen(port);
-			usleep(2000);
-			send_sock = server_listen((port+1)&0xFFFF);
-		}
-		else {
-			addr = string(address);
-			send_sock = client_connect(address, port);
-			recv_sock = client_connect(address, (port+1)&0xFFFF);
-		}
-		FSM = 0;
-		set_delay_opt(send_sock, true);
-		set_delay_opt(recv_sock, true);
-		schannel = new SenderSubChannel(send_sock);
-		rchannel = new RecverSubChannel(recv_sock);
-		if(not quiet)
-			std::cout << "connected\n";	
 	}
 
 	~HighSpeedNetIO() {
@@ -209,8 +202,7 @@ class HighSpeedNetIO: public IOChannel<HighSpeedNetIO> { public:
 		close(recv_sock);
 	}
 
-	void sync() {
-	}
+	void sync() {}
 
 	void set_delay_opt(int sock, bool enable_nodelay) {
 		if (enable_nodelay) {
@@ -240,6 +232,7 @@ class HighSpeedNetIO: public IOChannel<HighSpeedNetIO> { public:
 		schannel->send_data(data, len);
 		FSM = 2;
 	}
+
 	void recv_data_internal(void *data, int len) {
 		if (FSM == 2) {
 			schannel->flush();
@@ -249,5 +242,5 @@ class HighSpeedNetIO: public IOChannel<HighSpeedNetIO> { public:
 	}
 };
 
-}
+}  // namespace emp
 #endif

test/garble.cpp

@@ -1,5 +1,6 @@
-#include "emp-tool/emp-tool.h"
 #include <iostream>
+
+#include "emp-tool/emp-tool.h"
 using namespace std;
 using namespace emp;
 
@@ -65,6 +66,7 @@ void test(T * netio) {
 	delete[] b;
 	delete[] c;
 }
+
 int main(int argc, char** argv) {
 	parse_party_and_port(argv, &party, &port);
 	cout << "Using NetIO\n";
@@ -73,7 +75,7 @@ int main(int argc, char** argv) {
 	delete netio;
 
 	cout << "Using HighSpeedNetIO\n";
-	HighSpeedNetIO* hsnetio = new HighSpeedNetIO(party == ALICE?nullptr:"127.0.0.1", port);
+	HighSpeedNetIO* hsnetio = new HighSpeedNetIO(party == ALICE ? nullptr : "127.0.0.1", port, port+1);
 	test<HighSpeedNetIO>(hsnetio);
 	delete hsnetio;
 }

test/netio.cpp

@@ -54,8 +54,7 @@ int main(int argc, char** argv) {
 	delete io;
 
 	cout <<"HighSpeed NetIO\n";
-	HighSpeedNetIO * hsio = new HighSpeedNetIO(party == ALICE ? nullptr:"127.0.0.1", port);
+	HighSpeedNetIO * hsio = new HighSpeedNetIO(party == ALICE ? nullptr:"127.0.0.1", port, port+1);
 	test<HighSpeedNetIO>(hsio);
 	delete hsio;
 }
-