Make socket tests pass
This commit is contained in:
		
					parent
					
						
							
								3ea2f5c7a9
							
						
					
				
			
			
				commit
				
					
						2fd368a643
					
				
			
		
					 1 changed files with 30 additions and 12 deletions
				
			
		| 
						 | 
					@ -31,8 +31,11 @@ TEST (socket, max_connections)
 | 
				
			||||||
	// start a server socket that allows max 2 live connections
 | 
						// start a server socket that allows max 2 live connections
 | 
				
			||||||
	auto listener = std::make_shared<nano::transport::tcp_listener> (server_port, *node, 2);
 | 
						auto listener = std::make_shared<nano::transport::tcp_listener> (server_port, *node, 2);
 | 
				
			||||||
	nano::test::stop_guard stop_guard{ *listener };
 | 
						nano::test::stop_guard stop_guard{ *listener };
 | 
				
			||||||
	listener->start ([&server_sockets] (std::shared_ptr<nano::transport::socket> const & new_connection, boost::system::error_code const & ec_a) {
 | 
						listener->start ([&server_sockets] (std::shared_ptr<nano::transport::socket> const & new_connection, boost::system::error_code const & ec) {
 | 
				
			||||||
 | 
							if (!ec)
 | 
				
			||||||
 | 
							{
 | 
				
			||||||
			server_sockets.push_back (new_connection);
 | 
								server_sockets.push_back (new_connection);
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
		return true;
 | 
							return true;
 | 
				
			||||||
	});
 | 
						});
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -124,8 +127,11 @@ TEST (socket, max_connections_per_ip)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	auto listener = std::make_shared<nano::transport::tcp_listener> (server_port, *node, max_global_connections);
 | 
						auto listener = std::make_shared<nano::transport::tcp_listener> (server_port, *node, max_global_connections);
 | 
				
			||||||
	nano::test::stop_guard stop_guard{ *listener };
 | 
						nano::test::stop_guard stop_guard{ *listener };
 | 
				
			||||||
	listener->start ([&server_sockets] (std::shared_ptr<nano::transport::socket> const & new_connection, boost::system::error_code const & ec_a) {
 | 
						listener->start ([&server_sockets] (std::shared_ptr<nano::transport::socket> const & new_connection, boost::system::error_code const & ec) {
 | 
				
			||||||
 | 
							if (!ec)
 | 
				
			||||||
 | 
							{
 | 
				
			||||||
			server_sockets.push_back (new_connection);
 | 
								server_sockets.push_back (new_connection);
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
		return true;
 | 
							return true;
 | 
				
			||||||
	});
 | 
						});
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -243,8 +249,11 @@ TEST (socket, max_connections_per_subnetwork)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	auto listener = std::make_shared<nano::transport::tcp_listener> (server_port, *node, max_global_connections);
 | 
						auto listener = std::make_shared<nano::transport::tcp_listener> (server_port, *node, max_global_connections);
 | 
				
			||||||
	nano::test::stop_guard stop_guard{ *listener };
 | 
						nano::test::stop_guard stop_guard{ *listener };
 | 
				
			||||||
	listener->start ([&server_sockets] (std::shared_ptr<nano::transport::socket> const & new_connection, boost::system::error_code const & ec_a) {
 | 
						listener->start ([&server_sockets] (std::shared_ptr<nano::transport::socket> const & new_connection, boost::system::error_code const & ec) {
 | 
				
			||||||
 | 
							if (!ec)
 | 
				
			||||||
 | 
							{
 | 
				
			||||||
			server_sockets.push_back (new_connection);
 | 
								server_sockets.push_back (new_connection);
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
		return true;
 | 
							return true;
 | 
				
			||||||
	});
 | 
						});
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -302,8 +311,11 @@ TEST (socket, disabled_max_peers_per_ip)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	auto server_socket = std::make_shared<nano::transport::tcp_listener> (server_port, *node, max_global_connections);
 | 
						auto server_socket = std::make_shared<nano::transport::tcp_listener> (server_port, *node, max_global_connections);
 | 
				
			||||||
	nano::test::stop_guard stop_guard{ *server_socket };
 | 
						nano::test::stop_guard stop_guard{ *server_socket };
 | 
				
			||||||
	server_socket->start ([&server_sockets] (std::shared_ptr<nano::transport::socket> const & new_connection, boost::system::error_code const & ec_a) {
 | 
						server_socket->start ([&server_sockets] (std::shared_ptr<nano::transport::socket> const & new_connection, boost::system::error_code const & ec) {
 | 
				
			||||||
 | 
							if (!ec)
 | 
				
			||||||
 | 
							{
 | 
				
			||||||
			server_sockets.push_back (new_connection);
 | 
								server_sockets.push_back (new_connection);
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
		return true;
 | 
							return true;
 | 
				
			||||||
	});
 | 
						});
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -361,8 +373,11 @@ TEST (socket, disconnection_of_silent_connections)
 | 
				
			||||||
	// start a server listening socket
 | 
						// start a server listening socket
 | 
				
			||||||
	auto listener = std::make_shared<nano::transport::tcp_listener> (server_port, *node, 1);
 | 
						auto listener = std::make_shared<nano::transport::tcp_listener> (server_port, *node, 1);
 | 
				
			||||||
	nano::test::stop_guard stop_guard{ *listener };
 | 
						nano::test::stop_guard stop_guard{ *listener };
 | 
				
			||||||
	listener->start ([&server_data_socket] (std::shared_ptr<nano::transport::socket> const & new_connection, boost::system::error_code const & ec_a) {
 | 
						listener->start ([&server_data_socket] (std::shared_ptr<nano::transport::socket> const & new_connection, boost::system::error_code const & ec) {
 | 
				
			||||||
 | 
							if (!ec)
 | 
				
			||||||
 | 
							{
 | 
				
			||||||
			server_data_socket = new_connection;
 | 
								server_data_socket = new_connection;
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
		return true;
 | 
							return true;
 | 
				
			||||||
	});
 | 
						});
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -411,8 +426,11 @@ TEST (socket, drop_policy)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		auto listener = std::make_shared<nano::transport::tcp_listener> (server_port, *node, 1);
 | 
							auto listener = std::make_shared<nano::transport::tcp_listener> (server_port, *node, 1);
 | 
				
			||||||
		nano::test::stop_guard stop_guard{ *listener };
 | 
							nano::test::stop_guard stop_guard{ *listener };
 | 
				
			||||||
		listener->start ([&connections] (std::shared_ptr<nano::transport::socket> const & new_connection, boost::system::error_code const & ec_a) {
 | 
							listener->start ([&connections] (std::shared_ptr<nano::transport::socket> const & new_connection, boost::system::error_code const & ec) {
 | 
				
			||||||
 | 
								if (!ec)
 | 
				
			||||||
 | 
								{
 | 
				
			||||||
				connections.push_back (new_connection);
 | 
									connections.push_back (new_connection);
 | 
				
			||||||
 | 
								}
 | 
				
			||||||
			return true;
 | 
								return true;
 | 
				
			||||||
		});
 | 
							});
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue