From 3d98932c1ee505fd937e9a56941b5a3d25cd65eb Mon Sep 17 00:00:00 2001 From: subtly Date: Sun, 22 Mar 2015 18:39:56 +0100 Subject: NodeTable constructor requires and listens to explicit IP address instead of defaulting to 0.0.0.0 (all addresses). --- net.cpp | 6 +++--- peer.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/net.cpp b/net.cpp index 3a69a627..e5cca9b6 100644 --- a/net.cpp +++ b/net.cpp @@ -53,7 +53,7 @@ protected: struct TestNodeTable: public NodeTable { /// Constructor - TestNodeTable(ba::io_service& _io, KeyPair _alias, uint16_t _port = 30300): NodeTable(_io, _alias, _port) {} + TestNodeTable(ba::io_service& _io, KeyPair _alias, bi::address const& _addr, uint16_t _port = 30300): NodeTable(_io, _alias, _addr, _port) {} static std::vector> createTestNodes(unsigned _count) { @@ -106,10 +106,10 @@ struct TestNodeTable: public NodeTable */ struct TestNodeTableHost: public TestHost { - TestNodeTableHost(unsigned _count = 8): m_alias(KeyPair::create()), nodeTable(new TestNodeTable(m_io, m_alias)), testNodes(TestNodeTable::createTestNodes(_count)) {}; + TestNodeTableHost(unsigned _count = 8): m_alias(KeyPair::create()), nodeTable(new TestNodeTable(m_io, m_alias, bi::address::from_string("127.0.0.1"))), testNodes(TestNodeTable::createTestNodes(_count)) {}; ~TestNodeTableHost() { m_io.stop(); stopWorking(); } - void setup() { for (auto n: testNodes) nodeTables.push_back(make_shared(m_io,n.first,n.second)); } + void setup() { for (auto n: testNodes) nodeTables.push_back(make_shared(m_io,n.first, bi::address::from_string("127.0.0.1"),n.second)); } void pingAll() { for (auto& t: nodeTables) t->pingTestNodes(testNodes); } diff --git a/peer.cpp b/peer.cpp index 9a68401e..3ad2e294 100644 --- a/peer.cpp +++ b/peer.cpp @@ -35,8 +35,8 @@ BOOST_AUTO_TEST_CASE(host) auto oldLogVerbosity = g_logVerbosity; g_logVerbosity = 10; - NetworkPreferences host1prefs(30301, "127.0.0.1", true, true); - NetworkPreferences host2prefs(30302, "127.0.0.1", true, true); + NetworkPreferences host1prefs(30301, "127.0.0.1", false, true); + NetworkPreferences host2prefs(30302, "127.0.0.1", false, true); Host host1("Test", host1prefs); host1.start(); @@ -62,7 +62,7 @@ BOOST_AUTO_TEST_CASE(save_nodes) std::list hosts; for (auto i:{0,1,2,3,4,5}) { - Host* h = new Host("Test", NetworkPreferences(30300 + i, "127.0.0.1", true, true)); + Host* h = new Host("Test", NetworkPreferences(30300 + i, "127.0.0.1", false, true)); h->setIdealPeerCount(10); // starting host is required so listenport is available h->start(); -- cgit v1.2.3