Skip to content
Permalink
Browse files

Fix unit test if there isn't a localhost address (for example FreeBSD…

… jails), second part
  • Loading branch information...
nerzhul committed Feb 15, 2015
1 parent a3e2b3e commit 8aebc31a173fa3e6b80f25219b23131d9974a160
Showing with 21 additions and 2 deletions.
  1. +21 −2 src/test.cpp
@@ -1865,9 +1865,24 @@ struct TestConnection: public TestBase
Handler hand_server("server");
Handler hand_client("client");

Address address(0, 0, 0, 0, 30001);
Address bind_addr(0, 0, 0, 0, 30001);
/*
* Try to use the bind_address for servers with no localhost address
* For example: FreeBSD jails
*/
std::string bind_str = g_settings->get("bind_address");
try {
bind_addr.Resolve(bind_str.c_str());

if (!bind_addr.isIPv6()) {
address = bind_addr;
}
} catch (ResolveError &e) {
}

infostream<<"** Creating server Connection"<<std::endl;
con::Connection server(proto_id, 512, 5.0, false, &hand_server);
Address address(0,0,0,0, 30001);
server.Serve(address);

infostream<<"** Creating client Connection"<<std::endl;
@@ -1878,7 +1893,11 @@ struct TestConnection: public TestBase

sleep_ms(50);

Address server_address(127,0,0,1, 30001);
Address server_address(127, 0, 0, 1, 30001);
if (address != Address(0, 0, 0, 0, 30001)) {
server_address = bind_addr;
}

infostream<<"** running client.Connect()"<<std::endl;
client.Connect(server_address);

0 comments on commit 8aebc31

Please sign in to comment.
You can’t perform that action at this time.