Browse Source

P0 and P1 should connect to each other before connecting to P2

Ian Goldberg 1 year ago
parent
commit
1b92bfd041
1 changed files with 12 additions and 12 deletions
  1. 12 12
      preprocessing/network.h

+ 12 - 12
preprocessing/network.h

@@ -55,13 +55,6 @@ void make_connections(bool& party, const std::string host1,
 	#if (PARTY == 0)    
 		
 		party = false;
-		for(size_t j = 0; j < number_of_sockets; ++j)
-		{
-		tcp::socket sb_a(io_context);
-		boost::asio::connect(sb_a, resolver.resolve({host2, std::to_string(ports2_0[j])}));
-		socketsP2.emplace_back(std::move(sb_a)); 
-		}
-	
 		for(size_t j = 0; j < number_of_sockets; ++j)
 		{
 		tcp::socket sb_a(io_context);
@@ -69,16 +62,16 @@ void make_connections(bool& party, const std::string host1,
 		socketsPb[j] = std::move(sb_a); 
 		}
 
-	#else	
-		party = true;	
-
 		for(size_t j = 0; j < number_of_sockets; ++j)
 		{
 		tcp::socket sb_a(io_context);
-		boost::asio::connect(sb_a, resolver.resolve({host2, std::to_string(ports2_1[j])}));
+		boost::asio::connect(sb_a, resolver.resolve({host2, std::to_string(ports2_0[j])}));
 		socketsP2.emplace_back(std::move(sb_a)); 
 		}
 	
+	#else	
+		party = true;	
+
 		boost::asio::thread_pool pool_connections(number_of_sockets); 
 	
 		for(size_t j = 0; j < number_of_sockets; ++j)
@@ -87,5 +80,12 @@ void make_connections(bool& party, const std::string host1,
 		}
 	
 	pool_connections.join();
+
+		for(size_t j = 0; j < number_of_sockets; ++j)
+		{
+		tcp::socket sb_a(io_context);
+		boost::asio::connect(sb_a, resolver.resolve({host2, std::to_string(ports2_1[j])}));
+		socketsP2.emplace_back(std::move(sb_a)); 
+		}
 	#endif
-}
+}