kvazar
/
kevacoin
mirror of https://github.com/kvazar-network/kevacoin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Don't require services in -addnode

0.13
Pieter Wuille 9 years ago
parent
5e7ab16d29
commit
15bf863219
6 changed files with 64 additions and 63 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      src/net.cpp
  2. 2
      src/protocol.cpp
  3. 2
      src/protocol.h
  4. 8
      src/test/DoS_tests.cpp
  5. 92
      src/test/addrman_tests.cpp
  6. 8
      src/test/net_tests.cpp

15
src/net.cpp
Unescape View File

@ -162,7 +162,7 @@ static std::vector<CAddress> convertSeed6(const std::vector<SeedSpec6> &vSeedsIn
{ {
struct in6_addr ip; struct in6_addr ip;
memcpy(&ip, i->addr, sizeof(ip)); memcpy(&ip, i->addr, sizeof(ip));
CAddress addr(CService(ip, i->port)); CAddress addr(CService(ip, i->port), NODE_NETWORK);
addr.nTime = GetTime() - GetRand(nOneWeek) - nOneWeek; addr.nTime = GetTime() - GetRand(nOneWeek) - nOneWeek;
vSeedsOut.push_back(addr); vSeedsOut.push_back(addr);
} }
@ -179,9 +179,8 @@ CAddress GetLocalAddress(const CNetAddr *paddrPeer)
CService addr; CService addr;
if (GetLocal(addr, paddrPeer)) if (GetLocal(addr, paddrPeer))
{ {
ret = CAddress(addr); ret = CAddress(addr, nLocalServices);
} }
ret.nServices = nLocalServices;
ret.nTime = GetAdjustedTime(); ret.nTime = GetAdjustedTime();
return ret; return ret;
} }
@ -465,7 +464,7 @@ void CNode::PushVersion()
int nBestHeight = GetNodeSignals().GetHeight().get_value_or(0); int nBestHeight = GetNodeSignals().GetHeight().get_value_or(0);
int64_t nTime = (fInbound ? GetAdjustedTime() : GetTime()); int64_t nTime = (fInbound ? GetAdjustedTime() : GetTime());
CAddress addrYou = (addr.IsRoutable() && !IsProxy(addr) ? addr : CAddress(CService("0.0.0.0",0))); CAddress addrYou = (addr.IsRoutable() && !IsProxy(addr) ? addr : CAddress(CService("0.0.0.0",0), addr.nServices));
CAddress addrMe = GetLocalAddress(&addr); CAddress addrMe = GetLocalAddress(&addr);
GetRandBytes((unsigned char*)&nLocalHostNonce, sizeof(nLocalHostNonce)); GetRandBytes((unsigned char*)&nLocalHostNonce, sizeof(nLocalHostNonce));
if (fLogIPs) if (fLogIPs)
@ -1441,7 +1440,7 @@ void ThreadDNSAddressSeed()
} else { } else {
std::vector<CNetAddr> vIPs; std::vector<CNetAddr> vIPs;
std::vector<CAddress> vAdd; std::vector<CAddress> vAdd;
uint64_t requiredServiceBits = NODE_NETWORK; uint64_t requiredServiceBits = nRelevantServices;
if (LookupHost(seed.getHost(requiredServiceBits).c_str(), vIPs, 0, true)) if (LookupHost(seed.getHost(requiredServiceBits).c_str(), vIPs, 0, true))
{ {
BOOST_FOREACH(const CNetAddr& ip, vIPs) BOOST_FOREACH(const CNetAddr& ip, vIPs)
@ -1524,7 +1523,7 @@ void ThreadOpenConnections()
ProcessOneShot(); ProcessOneShot();
BOOST_FOREACH(const std::string& strAddr, mapMultiArgs["-connect"]) BOOST_FOREACH(const std::string& strAddr, mapMultiArgs["-connect"])
{ {
CAddress addr; CAddress addr(CService(), 0);
OpenNetworkConnection(addr, false, NULL, strAddr.c_str()); OpenNetworkConnection(addr, false, NULL, strAddr.c_str());
for (int i = 0; i < 10 && i < nLoop; i++) for (int i = 0; i < 10 && i < nLoop; i++)
{ {
@ -1674,7 +1673,9 @@ void ThreadOpenAddedConnections()
BOOST_FOREACH(std::vector<CService>& vserv, lservAddressesToAdd) BOOST_FOREACH(std::vector<CService>& vserv, lservAddressesToAdd)
{ {
CSemaphoreGrant grant(*semOutbound); CSemaphoreGrant grant(*semOutbound);
OpenNetworkConnection(CAddress(vserv[i % vserv.size()]), false, &grant); /* We want -addnode to work even for nodes that don't provide all
* wanted services, so pass in nServices=0 to CAddress. */
OpenNetworkConnection(CAddress(vserv[i % vserv.size()], 0), false, &grant);
MilliSleep(500); MilliSleep(500);
} }
MilliSleep(120000); // Retry every 2 minutes MilliSleep(120000); // Retry every 2 minutes

2
src/protocol.cpp
Unescape View File

@ -141,7 +141,7 @@ CAddress::CAddress(CService ipIn, uint64_t nServicesIn) : CService(ipIn)
void CAddress::Init() void CAddress::Init()
{ {
nServices = NODE_NETWORK; nServices = 0;
nTime = 100000000; nTime = 100000000;
} }

2
src/protocol.h
Unescape View File

@ -251,7 +251,7 @@ class CAddress : public CService
{ {
public: public:
CAddress(); CAddress();
explicit CAddress(CService ipIn, uint64_t nServicesIn = NODE_NETWORK); explicit CAddress(CService ipIn, uint64_t nServicesIn);
void Init(); void Init();

8
src/test/DoS_tests.cpp
Unescape View File

@ -45,7 +45,7 @@ BOOST_FIXTURE_TEST_SUITE(DoS_tests, TestingSetup)
BOOST_AUTO_TEST_CASE(DoS_banning) BOOST_AUTO_TEST_CASE(DoS_banning)
{ {
CNode::ClearBanned(); CNode::ClearBanned();
CAddress addr1(ip(0xa0b0c001)); CAddress addr1(ip(0xa0b0c001), 0);
CNode dummyNode1(INVALID_SOCKET, addr1, "", true); CNode dummyNode1(INVALID_SOCKET, addr1, "", true);
dummyNode1.nVersion = 1; dummyNode1.nVersion = 1;
Misbehaving(dummyNode1.GetId(), 100); // Should get banned Misbehaving(dummyNode1.GetId(), 100); // Should get banned
@ -53,7 +53,7 @@ BOOST_AUTO_TEST_CASE(DoS_banning)
BOOST_CHECK(CNode::IsBanned(addr1)); BOOST_CHECK(CNode::IsBanned(addr1));
BOOST_CHECK(!CNode::IsBanned(ip(0xa0b0c001|0x0000ff00))); // Different IP, not banned BOOST_CHECK(!CNode::IsBanned(ip(0xa0b0c001|0x0000ff00))); // Different IP, not banned
CAddress addr2(ip(0xa0b0c002)); CAddress addr2(ip(0xa0b0c002), 0);
CNode dummyNode2(INVALID_SOCKET, addr2, "", true); CNode dummyNode2(INVALID_SOCKET, addr2, "", true);
dummyNode2.nVersion = 1; dummyNode2.nVersion = 1;
Misbehaving(dummyNode2.GetId(), 50); Misbehaving(dummyNode2.GetId(), 50);
@ -69,7 +69,7 @@ BOOST_AUTO_TEST_CASE(DoS_banscore)
{ {
CNode::ClearBanned(); CNode::ClearBanned();
mapArgs["-banscore"] = "111"; // because 11 is my favorite number mapArgs["-banscore"] = "111"; // because 11 is my favorite number
CAddress addr1(ip(0xa0b0c001)); CAddress addr1(ip(0xa0b0c001), 0);
CNode dummyNode1(INVALID_SOCKET, addr1, "", true); CNode dummyNode1(INVALID_SOCKET, addr1, "", true);
dummyNode1.nVersion = 1; dummyNode1.nVersion = 1;
Misbehaving(dummyNode1.GetId(), 100); Misbehaving(dummyNode1.GetId(), 100);
@ -90,7 +90,7 @@ BOOST_AUTO_TEST_CASE(DoS_bantime)
int64_t nStartTime = GetTime(); int64_t nStartTime = GetTime();
SetMockTime(nStartTime); // Overrides future calls to GetTime() SetMockTime(nStartTime); // Overrides future calls to GetTime()
CAddress addr(ip(0xa0b0c001)); CAddress addr(ip(0xa0b0c001), 0);
CNode dummyNode(INVALID_SOCKET, addr, "", true); CNode dummyNode(INVALID_SOCKET, addr, "", true);
dummyNode.nVersion = 1; dummyNode.nVersion = 1;

92
src/test/addrman_tests.cpp
Unescape View File

@ -68,7 +68,7 @@ BOOST_AUTO_TEST_CASE(addrman_simple)
// Test 2: Does Addrman::Add work as expected. // Test 2: Does Addrman::Add work as expected.
CService addr1 = CService("250.1.1.1", 8333); CService addr1 = CService("250.1.1.1", 8333);
addrman.Add(CAddress(addr1), source); addrman.Add(CAddress(addr1, 0), source);
BOOST_CHECK(addrman.size() == 1); BOOST_CHECK(addrman.size() == 1);
CAddrInfo addr_ret1 = addrman.Select(); CAddrInfo addr_ret1 = addrman.Select();
BOOST_CHECK(addr_ret1.ToString() == "250.1.1.1:8333"); BOOST_CHECK(addr_ret1.ToString() == "250.1.1.1:8333");
@ -76,14 +76,14 @@ BOOST_AUTO_TEST_CASE(addrman_simple)
// Test 3: Does IP address deduplication work correctly. // Test 3: Does IP address deduplication work correctly.
// Expected dup IP should not be added. // Expected dup IP should not be added.
CService addr1_dup = CService("250.1.1.1", 8333); CService addr1_dup = CService("250.1.1.1", 8333);
addrman.Add(CAddress(addr1_dup), source); addrman.Add(CAddress(addr1_dup, 0), source);
BOOST_CHECK(addrman.size() == 1); BOOST_CHECK(addrman.size() == 1);
// Test 5: New table has one addr and we add a diff addr we should // Test 5: New table has one addr and we add a diff addr we should
// have two addrs. // have two addrs.
CService addr2 = CService("250.1.1.2", 8333); CService addr2 = CService("250.1.1.2", 8333);
addrman.Add(CAddress(addr2), source); addrman.Add(CAddress(addr2, 0), source);
BOOST_CHECK(addrman.size() == 2); BOOST_CHECK(addrman.size() == 2);
// Test 6: AddrMan::Clear() should empty the new table. // Test 6: AddrMan::Clear() should empty the new table.
@ -106,18 +106,18 @@ BOOST_AUTO_TEST_CASE(addrman_ports)
// Test 7; Addr with same IP but diff port does not replace existing addr. // Test 7; Addr with same IP but diff port does not replace existing addr.
CService addr1 = CService("250.1.1.1", 8333); CService addr1 = CService("250.1.1.1", 8333);
addrman.Add(CAddress(addr1), source); addrman.Add(CAddress(addr1, 0), source);
BOOST_CHECK(addrman.size() == 1); BOOST_CHECK(addrman.size() == 1);
CService addr1_port = CService("250.1.1.1", 8334); CService addr1_port = CService("250.1.1.1", 8334);
addrman.Add(CAddress(addr1_port), source); addrman.Add(CAddress(addr1_port, 0), source);
BOOST_CHECK(addrman.size() == 1); BOOST_CHECK(addrman.size() == 1);
CAddrInfo addr_ret2 = addrman.Select(); CAddrInfo addr_ret2 = addrman.Select();
BOOST_CHECK(addr_ret2.ToString() == "250.1.1.1:8333"); BOOST_CHECK(addr_ret2.ToString() == "250.1.1.1:8333");
// Test 8: Add same IP but diff port to tried table, it doesn't get added. // Test 8: Add same IP but diff port to tried table, it doesn't get added.
// Perhaps this is not ideal behavior but it is the current behavior. // Perhaps this is not ideal behavior but it is the current behavior.
addrman.Good(CAddress(addr1_port)); addrman.Good(CAddress(addr1_port, 0));
BOOST_CHECK(addrman.size() == 1); BOOST_CHECK(addrman.size() == 1);
bool newOnly = true; bool newOnly = true;
CAddrInfo addr_ret3 = addrman.Select(newOnly); CAddrInfo addr_ret3 = addrman.Select(newOnly);
@ -136,7 +136,7 @@ BOOST_AUTO_TEST_CASE(addrman_select)
// Test 9: Select from new with 1 addr in new. // Test 9: Select from new with 1 addr in new.
CService addr1 = CService("250.1.1.1", 8333); CService addr1 = CService("250.1.1.1", 8333);
addrman.Add(CAddress(addr1), source); addrman.Add(CAddress(addr1, 0), source);
BOOST_CHECK(addrman.size() == 1); BOOST_CHECK(addrman.size() == 1);
bool newOnly = true; bool newOnly = true;
@ -144,7 +144,7 @@ BOOST_AUTO_TEST_CASE(addrman_select)
BOOST_CHECK(addr_ret1.ToString() == "250.1.1.1:8333"); BOOST_CHECK(addr_ret1.ToString() == "250.1.1.1:8333");
// Test 10: move addr to tried, select from new expected nothing returned. // Test 10: move addr to tried, select from new expected nothing returned.
addrman.Good(CAddress(addr1)); addrman.Good(CAddress(addr1, 0));
BOOST_CHECK(addrman.size() == 1); BOOST_CHECK(addrman.size() == 1);
CAddrInfo addr_ret2 = addrman.Select(newOnly); CAddrInfo addr_ret2 = addrman.Select(newOnly);
BOOST_CHECK(addr_ret2.ToString() == "[::]:0"); BOOST_CHECK(addr_ret2.ToString() == "[::]:0");
@ -160,21 +160,21 @@ BOOST_AUTO_TEST_CASE(addrman_select)
CService addr3 = CService("250.3.2.2", 9999); CService addr3 = CService("250.3.2.2", 9999);
CService addr4 = CService("250.3.3.3", 9999); CService addr4 = CService("250.3.3.3", 9999);
addrman.Add(CAddress(addr2), CService("250.3.1.1", 8333)); addrman.Add(CAddress(addr2, 0), CService("250.3.1.1", 8333));
addrman.Add(CAddress(addr3), CService("250.3.1.1", 8333)); addrman.Add(CAddress(addr3, 0), CService("250.3.1.1", 8333));
addrman.Add(CAddress(addr4), CService("250.4.1.1", 8333)); addrman.Add(CAddress(addr4, 0), CService("250.4.1.1", 8333));
// Add three addresses to tried table. // Add three addresses to tried table.
CService addr5 = CService("250.4.4.4", 8333); CService addr5 = CService("250.4.4.4", 8333);
CService addr6 = CService("250.4.5.5", 7777); CService addr6 = CService("250.4.5.5", 7777);
CService addr7 = CService("250.4.6.6", 8333); CService addr7 = CService("250.4.6.6", 8333);
addrman.Add(CAddress(addr5), CService("250.3.1.1", 8333)); addrman.Add(CAddress(addr5, 0), CService("250.3.1.1", 8333));
addrman.Good(CAddress(addr5)); addrman.Good(CAddress(addr5, 0));
addrman.Add(CAddress(addr6), CService("250.3.1.1", 8333)); addrman.Add(CAddress(addr6, 0), CService("250.3.1.1", 8333));
addrman.Good(CAddress(addr6)); addrman.Good(CAddress(addr6, 0));
addrman.Add(CAddress(addr7), CService("250.1.1.3", 8333)); addrman.Add(CAddress(addr7, 0), CService("250.1.1.3", 8333));
addrman.Good(CAddress(addr7)); addrman.Good(CAddress(addr7, 0));
// Test 11: 6 addrs + 1 addr from last test = 7. // Test 11: 6 addrs + 1 addr from last test = 7.
BOOST_CHECK(addrman.size() == 7); BOOST_CHECK(addrman.size() == 7);
@ -199,7 +199,7 @@ BOOST_AUTO_TEST_CASE(addrman_new_collisions)
for (unsigned int i = 1; i < 18; i++) { for (unsigned int i = 1; i < 18; i++) {
CService addr = CService("250.1.1." + boost::to_string(i)); CService addr = CService("250.1.1." + boost::to_string(i));
addrman.Add(CAddress(addr), source); addrman.Add(CAddress(addr, 0), source);
//Test 13: No collision in new table yet. //Test 13: No collision in new table yet.
BOOST_CHECK(addrman.size() == i); BOOST_CHECK(addrman.size() == i);
@ -207,11 +207,11 @@ BOOST_AUTO_TEST_CASE(addrman_new_collisions)
//Test 14: new table collision! //Test 14: new table collision!
CService addr1 = CService("250.1.1.18"); CService addr1 = CService("250.1.1.18");
addrman.Add(CAddress(addr1), source); addrman.Add(CAddress(addr1, 0), source);
BOOST_CHECK(addrman.size() == 17); BOOST_CHECK(addrman.size() == 17);
CService addr2 = CService("250.1.1.19"); CService addr2 = CService("250.1.1.19");
addrman.Add(CAddress(addr2), source); addrman.Add(CAddress(addr2, 0), source);
BOOST_CHECK(addrman.size() == 18); BOOST_CHECK(addrman.size() == 18);
} }
@ -228,8 +228,8 @@ BOOST_AUTO_TEST_CASE(addrman_tried_collisions)
for (unsigned int i = 1; i < 80; i++) { for (unsigned int i = 1; i < 80; i++) {
CService addr = CService("250.1.1." + boost::to_string(i)); CService addr = CService("250.1.1." + boost::to_string(i));
addrman.Add(CAddress(addr), source); addrman.Add(CAddress(addr, 0), source);
addrman.Good(CAddress(addr)); addrman.Good(CAddress(addr, 0));
//Test 15: No collision in tried table yet. //Test 15: No collision in tried table yet.
BOOST_TEST_MESSAGE(addrman.size()); BOOST_TEST_MESSAGE(addrman.size());
@ -238,11 +238,11 @@ BOOST_AUTO_TEST_CASE(addrman_tried_collisions)
//Test 16: tried table collision! //Test 16: tried table collision!
CService addr1 = CService("250.1.1.80"); CService addr1 = CService("250.1.1.80");
addrman.Add(CAddress(addr1), source); addrman.Add(CAddress(addr1, 0), source);
BOOST_CHECK(addrman.size() == 79); BOOST_CHECK(addrman.size() == 79);
CService addr2 = CService("250.1.1.81"); CService addr2 = CService("250.1.1.81");
addrman.Add(CAddress(addr2), source); addrman.Add(CAddress(addr2, 0), source);
BOOST_CHECK(addrman.size() == 80); BOOST_CHECK(addrman.size() == 80);
} }
@ -255,9 +255,9 @@ BOOST_AUTO_TEST_CASE(addrman_find)
BOOST_CHECK(addrman.size() == 0); BOOST_CHECK(addrman.size() == 0);
CAddress addr1 = CAddress(CService("250.1.2.1", 8333)); CAddress addr1 = CAddress(CService("250.1.2.1", 8333), 0);
CAddress addr2 = CAddress(CService("250.1.2.1", 9999)); CAddress addr2 = CAddress(CService("250.1.2.1", 9999), 0);
CAddress addr3 = CAddress(CService("251.255.2.1", 8333)); CAddress addr3 = CAddress(CService("251.255.2.1", 8333), 0);
CNetAddr source1 = CNetAddr("250.1.2.1"); CNetAddr source1 = CNetAddr("250.1.2.1");
CNetAddr source2 = CNetAddr("250.1.2.2"); CNetAddr source2 = CNetAddr("250.1.2.2");
@ -294,7 +294,7 @@ BOOST_AUTO_TEST_CASE(addrman_create)
BOOST_CHECK(addrman.size() == 0); BOOST_CHECK(addrman.size() == 0);
CAddress addr1 = CAddress(CService("250.1.2.1", 8333)); CAddress addr1 = CAddress(CService("250.1.2.1", 8333), 0);
CNetAddr source1 = CNetAddr("250.1.2.1"); CNetAddr source1 = CNetAddr("250.1.2.1");
int nId; int nId;
@ -317,7 +317,7 @@ BOOST_AUTO_TEST_CASE(addrman_delete)
BOOST_CHECK(addrman.size() == 0); BOOST_CHECK(addrman.size() == 0);
CAddress addr1 = CAddress(CService("250.1.2.1", 8333)); CAddress addr1 = CAddress(CService("250.1.2.1", 8333), 0);
CNetAddr source1 = CNetAddr("250.1.2.1"); CNetAddr source1 = CNetAddr("250.1.2.1");
int nId; int nId;
@ -344,15 +344,15 @@ BOOST_AUTO_TEST_CASE(addrman_getaddr)
vector<CAddress> vAddr1 = addrman.GetAddr(); vector<CAddress> vAddr1 = addrman.GetAddr();
BOOST_CHECK(vAddr1.size() == 0); BOOST_CHECK(vAddr1.size() == 0);
CAddress addr1 = CAddress(CService("250.250.2.1", 8333)); CAddress addr1 = CAddress(CService("250.250.2.1", 8333), 0);
addr1.nTime = GetAdjustedTime(); // Set time so isTerrible = false addr1.nTime = GetAdjustedTime(); // Set time so isTerrible = false
CAddress addr2 = CAddress(CService("250.251.2.2", 9999)); CAddress addr2 = CAddress(CService("250.251.2.2", 9999), 0);
addr2.nTime = GetAdjustedTime(); addr2.nTime = GetAdjustedTime();
CAddress addr3 = CAddress(CService("251.252.2.3", 8333)); CAddress addr3 = CAddress(CService("251.252.2.3", 8333), 0);
addr3.nTime = GetAdjustedTime(); addr3.nTime = GetAdjustedTime();
CAddress addr4 = CAddress(CService("252.253.3.4", 8333)); CAddress addr4 = CAddress(CService("252.253.3.4", 8333), 0);
addr4.nTime = GetAdjustedTime(); addr4.nTime = GetAdjustedTime();
CAddress addr5 = CAddress(CService("252.254.4.5", 8333)); CAddress addr5 = CAddress(CService("252.254.4.5", 8333), 0);
addr5.nTime = GetAdjustedTime(); addr5.nTime = GetAdjustedTime();
CNetAddr source1 = CNetAddr("250.1.2.1"); CNetAddr source1 = CNetAddr("250.1.2.1");
CNetAddr source2 = CNetAddr("250.2.3.3"); CNetAddr source2 = CNetAddr("250.2.3.3");
@ -368,8 +368,8 @@ BOOST_AUTO_TEST_CASE(addrman_getaddr)
BOOST_CHECK(addrman.GetAddr().size() == 1); BOOST_CHECK(addrman.GetAddr().size() == 1);
// Test 24: Ensure GetAddr works with new and tried addresses. // Test 24: Ensure GetAddr works with new and tried addresses.
addrman.Good(CAddress(addr1)); addrman.Good(CAddress(addr1, 0));
addrman.Good(CAddress(addr2)); addrman.Good(CAddress(addr2, 0));
BOOST_CHECK(addrman.GetAddr().size() == 1); BOOST_CHECK(addrman.GetAddr().size() == 1);
// Test 25: Ensure GetAddr still returns 23% when addrman has many addrs. // Test 25: Ensure GetAddr still returns 23% when addrman has many addrs.
@ -378,7 +378,7 @@ BOOST_AUTO_TEST_CASE(addrman_getaddr)
int octet2 = (i / 256) % 256; int octet2 = (i / 256) % 256;
int octet3 = (i / (256 * 2)) % 256; int octet3 = (i / (256 * 2)) % 256;
string strAddr = boost::to_string(octet1) + "." + boost::to_string(octet2) + "." + boost::to_string(octet3) + ".23"; string strAddr = boost::to_string(octet1) + "." + boost::to_string(octet2) + "." + boost::to_string(octet3) + ".23";
CAddress addr = CAddress(CService(strAddr)); CAddress addr = CAddress(CService(strAddr), 0);
// Ensure that for all addrs in addrman, isTerrible == false. // Ensure that for all addrs in addrman, isTerrible == false.
addr.nTime = GetAdjustedTime(); addr.nTime = GetAdjustedTime();
@ -403,8 +403,8 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_tried_bucket)
// Set addrman addr placement to be deterministic. // Set addrman addr placement to be deterministic.
addrman.MakeDeterministic(); addrman.MakeDeterministic();
CAddress addr1 = CAddress(CService("250.1.1.1", 8333)); CAddress addr1 = CAddress(CService("250.1.1.1", 8333), 0);
CAddress addr2 = CAddress(CService("250.1.1.1", 9999)); CAddress addr2 = CAddress(CService("250.1.1.1", 9999), 0);
CNetAddr source1 = CNetAddr("250.1.1.1"); CNetAddr source1 = CNetAddr("250.1.1.1");
@ -431,7 +431,7 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_tried_bucket)
set<int> buckets; set<int> buckets;
for (int i = 0; i < 255; i++) { for (int i = 0; i < 255; i++) {
CAddrInfo infoi = CAddrInfo( CAddrInfo infoi = CAddrInfo(
CAddress(CService("250.1.1." + boost::to_string(i))), CAddress(CService("250.1.1." + boost::to_string(i)), 0),
CNetAddr("250.1.1." + boost::to_string(i))); CNetAddr("250.1.1." + boost::to_string(i)));
int bucket = infoi.GetTriedBucket(nKey1); int bucket = infoi.GetTriedBucket(nKey1);
buckets.insert(bucket); buckets.insert(bucket);
@ -443,7 +443,7 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_tried_bucket)
buckets.clear(); buckets.clear();
for (int j = 0; j < 255; j++) { for (int j = 0; j < 255; j++) {
CAddrInfo infoj = CAddrInfo( CAddrInfo infoj = CAddrInfo(
CAddress(CService("250." + boost::to_string(j) + ".1.1")), CAddress(CService("250." + boost::to_string(j) + ".1.1"), 0),
CNetAddr("250." + boost::to_string(j) + ".1.1")); CNetAddr("250." + boost::to_string(j) + ".1.1"));
int bucket = infoj.GetTriedBucket(nKey1); int bucket = infoj.GetTriedBucket(nKey1);
buckets.insert(bucket); buckets.insert(bucket);
@ -460,8 +460,8 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_new_bucket)
// Set addrman addr placement to be deterministic. // Set addrman addr placement to be deterministic.
addrman.MakeDeterministic(); addrman.MakeDeterministic();
CAddress addr1 = CAddress(CService("250.1.2.1", 8333)); CAddress addr1 = CAddress(CService("250.1.2.1", 8333), 0);
CAddress addr2 = CAddress(CService("250.1.2.1", 9999)); CAddress addr2 = CAddress(CService("250.1.2.1", 9999), 0);
CNetAddr source1 = CNetAddr("250.1.2.1"); CNetAddr source1 = CNetAddr("250.1.2.1");
@ -484,7 +484,7 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_new_bucket)
set<int> buckets; set<int> buckets;
for (int i = 0; i < 255; i++) { for (int i = 0; i < 255; i++) {
CAddrInfo infoi = CAddrInfo( CAddrInfo infoi = CAddrInfo(
CAddress(CService("250.1.1." + boost::to_string(i))), CAddress(CService("250.1.1." + boost::to_string(i)), 0),
CNetAddr("250.1.1." + boost::to_string(i))); CNetAddr("250.1.1." + boost::to_string(i)));
int bucket = infoi.GetNewBucket(nKey1); int bucket = infoi.GetNewBucket(nKey1);
buckets.insert(bucket); buckets.insert(bucket);
@ -497,7 +497,7 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_new_bucket)
for (int j = 0; j < 4 * 255; j++) { for (int j = 0; j < 4 * 255; j++) {
CAddrInfo infoj = CAddrInfo(CAddress( CAddrInfo infoj = CAddrInfo(CAddress(
CService( CService(
boost::to_string(250 + (j / 255)) + "." + boost::to_string(j % 256) + ".1.1")), boost::to_string(250 + (j / 255)) + "." + boost::to_string(j % 256) + ".1.1"), 0),
CNetAddr("251.4.1.1")); CNetAddr("251.4.1.1"));
int bucket = infoj.GetNewBucket(nKey1); int bucket = infoj.GetNewBucket(nKey1);
buckets.insert(bucket); buckets.insert(bucket);
@ -509,7 +509,7 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_new_bucket)
buckets.clear(); buckets.clear();
for (int p = 0; p < 255; p++) { for (int p = 0; p < 255; p++) {
CAddrInfo infoj = CAddrInfo( CAddrInfo infoj = CAddrInfo(
CAddress(CService("250.1.1.1")), CAddress(CService("250.1.1.1"), 0),
CNetAddr("250." + boost::to_string(p) + ".1.1")); CNetAddr("250." + boost::to_string(p) + ".1.1"));
int bucket = infoj.GetNewBucket(nKey1); int bucket = infoj.GetNewBucket(nKey1);
buckets.insert(bucket); buckets.insert(bucket);

8
src/test/net_tests.cpp
Unescape View File

@ -51,7 +51,7 @@ public:
int nUBuckets = ADDRMAN_NEW_BUCKET_COUNT ^ (1 << 30); int nUBuckets = ADDRMAN_NEW_BUCKET_COUNT ^ (1 << 30);
s << nUBuckets; s << nUBuckets;
CAddress addr = CAddress(CService("252.1.1.1", 7777)); CAddress addr = CAddress(CService("252.1.1.1", 7777), 0);
CAddrInfo info = CAddrInfo(addr, CNetAddr("252.2.2.2")); CAddrInfo info = CAddrInfo(addr, CNetAddr("252.2.2.2"));
s << info; s << info;
} }
@ -79,9 +79,9 @@ BOOST_AUTO_TEST_CASE(caddrdb_read)
CService addr3 = CService("250.7.3.3", 9999); CService addr3 = CService("250.7.3.3", 9999);
// Add three addresses to new table. // Add three addresses to new table.
addrmanUncorrupted.Add(CAddress(addr1), CService("252.5.1.1", 8333)); addrmanUncorrupted.Add(CAddress(addr1, 0), CService("252.5.1.1", 8333));
addrmanUncorrupted.Add(CAddress(addr2), CService("252.5.1.1", 8333)); addrmanUncorrupted.Add(CAddress(addr2, 0), CService("252.5.1.1", 8333));
addrmanUncorrupted.Add(CAddress(addr3), CService("252.5.1.1", 8333)); addrmanUncorrupted.Add(CAddress(addr3, 0), CService("252.5.1.1", 8333));
// Test that the de-serialization does not throw an exception. // Test that the de-serialization does not throw an exception.
CDataStream ssPeers1 = AddrmanToStream(addrmanUncorrupted); CDataStream ssPeers1 = AddrmanToStream(addrmanUncorrupted);

Write Preview
Loading…
Cancel
Save