aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsubtly <subtly@users.noreply.github.com>2015-03-23 01:39:56 +0800
committersubtly <subtly@users.noreply.github.com>2015-03-23 01:39:56 +0800
commit3d98932c1ee505fd937e9a56941b5a3d25cd65eb (patch)
treeeb29b73b02a0ee98280e936cf4d77f6f3caf424b
parent96a32d19d52391aa455035bb88ce167e31163df2 (diff)
downloaddexon-solidity-3d98932c1ee505fd937e9a56941b5a3d25cd65eb.tar
dexon-solidity-3d98932c1ee505fd937e9a56941b5a3d25cd65eb.tar.gz
dexon-solidity-3d98932c1ee505fd937e9a56941b5a3d25cd65eb.tar.bz2
dexon-solidity-3d98932c1ee505fd937e9a56941b5a3d25cd65eb.tar.lz
dexon-solidity-3d98932c1ee505fd937e9a56941b5a3d25cd65eb.tar.xz
dexon-solidity-3d98932c1ee505fd937e9a56941b5a3d25cd65eb.tar.zst
dexon-solidity-3d98932c1ee505fd937e9a56941b5a3d25cd65eb.zip
NodeTable constructor requires and listens to explicit IP address instead of defaulting to 0.0.0.0 (all addresses).
-rw-r--r--net.cpp6
-rw-r--r--peer.cpp6
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<std::pair<KeyPair,unsigned>> 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<TestNodeTable>(m_io,n.first,n.second)); }
+ void setup() { for (auto n: testNodes) nodeTables.push_back(make_shared<TestNodeTable>(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<Host*> 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();