Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change port 8333 to 12024. #166

Merged
merged 7 commits into from Feb 1, 2024
Merged

Change port 8333 to 12024. #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7957e65
Update net.cpp
Jan 31, 2024
dc0e918
Update net_tests.cpp
Jan 31, 2024
c4b9470
netbase_tests.cpp
Jan 31, 2024
508d3a2
Update netbase.h
Jan 31, 2024
f7d8caf
Update addrman_tests.cpp
Jan 31, 2024
26938d1
addrman_tests.cpp
Jan 31, 2024
11d6842
net.cpp
Jan 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/netbase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ bool LookupHost(const std::string& name, CNetAddr& addr, bool fAllowLookup, DNSL
* @param name The string representing a service. Could be a name or a
* numerical IP address (IPv6 addresses should be in their
* disambiguated bracketed form), optionally followed by a uint16_t port
* number. (e.g. example.com:8333 or
* number. (e.g. example.com:12024 or
* [2001:db8:85a3:8d3:1319:8a2e:370:7348]:420)
* @param[out] vAddr The resulting services to which the specified service string
* resolved.
Expand Down
16 changes: 8 additions & 8 deletions src/rpc/net.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,8 +291,8 @@ static RPCHelpMan addnode()
},
RPCResult{RPCResult::Type::NONE, "", ""},
RPCExamples{
HelpExampleCli("addnode", "\"192.168.0.6:8333\" \"onetry\"")
+ HelpExampleRpc("addnode", "\"192.168.0.6:8333\", \"onetry\"")
HelpExampleCli("addnode", "\"192.168.0.6:12024\" \"onetry\"")
+ HelpExampleRpc("addnode", "\"192.168.0.6:12024\", \"onetry\"")
},
[&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
{
Expand Down Expand Up @@ -349,8 +349,8 @@ static RPCHelpMan addconnection()
{ RPCResult::Type::STR, "connection_type", "Type of connection opened." },
}},
RPCExamples{
HelpExampleCli("addconnection", "\"192.168.0.6:8333\" \"outbound-full-relay\"")
+ HelpExampleRpc("addconnection", "\"192.168.0.6:8333\" \"outbound-full-relay\"")
HelpExampleCli("addconnection", "\"192.168.0.6:12024\" \"outbound-full-relay\"")
+ HelpExampleRpc("addconnection", "\"192.168.0.6:12024\" \"outbound-full-relay\"")
},
[&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
{
Expand Down Expand Up @@ -401,9 +401,9 @@ static RPCHelpMan disconnectnode()
},
RPCResult{RPCResult::Type::NONE, "", ""},
RPCExamples{
HelpExampleCli("disconnectnode", "\"192.168.0.6:8333\"")
HelpExampleCli("disconnectnode", "\"192.168.0.6:12024\"")
+ HelpExampleCli("disconnectnode", "\"\" 1")
+ HelpExampleRpc("disconnectnode", "\"192.168.0.6:8333\"")
+ HelpExampleRpc("disconnectnode", "\"192.168.0.6:12024\"")
+ HelpExampleRpc("disconnectnode", "\"\", 1")
},
[&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
Expand Down Expand Up @@ -926,8 +926,8 @@ static RPCHelpMan addpeeraddress()
},
},
RPCExamples{
HelpExampleCli("addpeeraddress", "\"1.2.3.4\" 8333")
+ HelpExampleRpc("addpeeraddress", "\"1.2.3.4\", 8333")
HelpExampleCli("addpeeraddress", "\"1.2.3.4\" 12024")
+ HelpExampleRpc("addpeeraddress", "\"1.2.3.4\", 12024")
},
[&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
{
Expand Down
74 changes: 37 additions & 37 deletions src/test/addrman_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,15 +143,15 @@ BOOST_AUTO_TEST_CASE(addrman_simple)
BOOST_CHECK_EQUAL(addr_null.ToString(), "[::]:0");

// Test: Does Addrman::Add work as expected.
CService addr1 = ResolveService("250.1.1.1", 8333);
CService addr1 = ResolveService("250.1.1.1", 12024);
BOOST_CHECK(addrman.Add(CAddress(addr1, NODE_NONE), source));
BOOST_CHECK_EQUAL(addrman.size(), 1U);
CAddrInfo addr_ret1 = addrman.Select();
BOOST_CHECK_EQUAL(addr_ret1.ToString(), "250.1.1.1:8333");
BOOST_CHECK_EQUAL(addr_ret1.ToString(), "250.1.1.1:12024");

// Test: Does IP address deduplication work correctly.
// Expected dup IP should not be added.
CService addr1_dup = ResolveService("250.1.1.1", 8333);
CService addr1_dup = ResolveService("250.1.1.1", 12024);
BOOST_CHECK(!addrman.Add(CAddress(addr1_dup, NODE_NONE), source));
BOOST_CHECK_EQUAL(addrman.size(), 1U);

Expand All @@ -162,7 +162,7 @@ BOOST_AUTO_TEST_CASE(addrman_simple)
// hash collisions may occur. But we can always be sure of at least one
// success.

CService addr2 = ResolveService("250.1.1.2", 8333);
CService addr2 = ResolveService("250.1.1.2", 12024);
BOOST_CHECK(addrman.Add(CAddress(addr2, NODE_NONE), source));
BOOST_CHECK(addrman.size() >= 1);

Expand All @@ -174,8 +174,8 @@ BOOST_AUTO_TEST_CASE(addrman_simple)

// Test: AddrMan::Add multiple addresses works as expected
std::vector<CAddress> vAddr;
vAddr.push_back(CAddress(ResolveService("250.1.1.3", 8333), NODE_NONE));
vAddr.push_back(CAddress(ResolveService("250.1.1.4", 8333), NODE_NONE));
vAddr.push_back(CAddress(ResolveService("250.1.1.3", 12024), NODE_NONE));
vAddr.push_back(CAddress(ResolveService("250.1.1.4", 12024), NODE_NONE));
BOOST_CHECK(addrman.Add(vAddr, source));
BOOST_CHECK(addrman.size() >= 1);
}
Expand All @@ -189,23 +189,23 @@ BOOST_AUTO_TEST_CASE(addrman_ports)
BOOST_CHECK_EQUAL(addrman.size(), 0U);

// Test 7; Addr with same IP but diff port does not replace existing addr.
CService addr1 = ResolveService("250.1.1.1", 8333);
CService addr1 = ResolveService("250.1.1.1", 12024);
BOOST_CHECK(addrman.Add(CAddress(addr1, NODE_NONE), source));
BOOST_CHECK_EQUAL(addrman.size(), 1U);

CService addr1_port = ResolveService("250.1.1.1", 8334);
BOOST_CHECK(!addrman.Add(CAddress(addr1_port, NODE_NONE), source));
BOOST_CHECK_EQUAL(addrman.size(), 1U);
CAddrInfo addr_ret2 = addrman.Select();
BOOST_CHECK_EQUAL(addr_ret2.ToString(), "250.1.1.1:8333");
BOOST_CHECK_EQUAL(addr_ret2.ToString(), "250.1.1.1:12024");

// Test: 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.
addrman.Good(CAddress(addr1_port, NODE_NONE));
BOOST_CHECK_EQUAL(addrman.size(), 1U);
bool newOnly = true;
CAddrInfo addr_ret3 = addrman.Select(newOnly);
BOOST_CHECK_EQUAL(addr_ret3.ToString(), "250.1.1.1:8333");
BOOST_CHECK_EQUAL(addr_ret3.ToString(), "250.1.1.1:12024");
}


Expand All @@ -216,13 +216,13 @@ BOOST_AUTO_TEST_CASE(addrman_select)
CNetAddr source = ResolveIP("252.2.2.2");

// Test: Select from new with 1 addr in new.
CService addr1 = ResolveService("250.1.1.1", 8333);
CService addr1 = ResolveService("250.1.1.1", 12024);
BOOST_CHECK(addrman.Add(CAddress(addr1, NODE_NONE), source));
BOOST_CHECK_EQUAL(addrman.size(), 1U);

bool newOnly = true;
CAddrInfo addr_ret1 = addrman.Select(newOnly);
BOOST_CHECK_EQUAL(addr_ret1.ToString(), "250.1.1.1:8333");
BOOST_CHECK_EQUAL(addr_ret1.ToString(), "250.1.1.1:12024");

// Test: move addr to tried, select from new expected nothing returned.
addrman.Good(CAddress(addr1, NODE_NONE));
Expand All @@ -231,30 +231,30 @@ BOOST_AUTO_TEST_CASE(addrman_select)
BOOST_CHECK_EQUAL(addr_ret2.ToString(), "[::]:0");

CAddrInfo addr_ret3 = addrman.Select();
BOOST_CHECK_EQUAL(addr_ret3.ToString(), "250.1.1.1:8333");
BOOST_CHECK_EQUAL(addr_ret3.ToString(), "250.1.1.1:12024");

BOOST_CHECK_EQUAL(addrman.size(), 1U);


// Add three addresses to new table.
CService addr2 = ResolveService("250.3.1.1", 8333);
CService addr2 = ResolveService("250.3.1.1", 12024);
CService addr3 = ResolveService("250.3.2.2", 9999);
CService addr4 = ResolveService("250.3.3.3", 9999);

BOOST_CHECK(addrman.Add(CAddress(addr2, NODE_NONE), ResolveService("250.3.1.1", 8333)));
BOOST_CHECK(addrman.Add(CAddress(addr3, NODE_NONE), ResolveService("250.3.1.1", 8333)));
BOOST_CHECK(addrman.Add(CAddress(addr4, NODE_NONE), ResolveService("250.4.1.1", 8333)));
BOOST_CHECK(addrman.Add(CAddress(addr2, NODE_NONE), ResolveService("250.3.1.1", 12024)));
BOOST_CHECK(addrman.Add(CAddress(addr3, NODE_NONE), ResolveService("250.3.1.1", 12024)));
BOOST_CHECK(addrman.Add(CAddress(addr4, NODE_NONE), ResolveService("250.4.1.1", 12024)));

// Add three addresses to tried table.
CService addr5 = ResolveService("250.4.4.4", 8333);
CService addr5 = ResolveService("250.4.4.4", 12024);
CService addr6 = ResolveService("250.4.5.5", 7777);
CService addr7 = ResolveService("250.4.6.6", 8333);
CService addr7 = ResolveService("250.4.6.6", 12024);

BOOST_CHECK(addrman.Add(CAddress(addr5, NODE_NONE), ResolveService("250.3.1.1", 8333)));
BOOST_CHECK(addrman.Add(CAddress(addr5, NODE_NONE), ResolveService("250.3.1.1", 12024)));
addrman.Good(CAddress(addr5, NODE_NONE));
BOOST_CHECK(addrman.Add(CAddress(addr6, NODE_NONE), ResolveService("250.3.1.1", 8333)));
BOOST_CHECK(addrman.Add(CAddress(addr6, NODE_NONE), ResolveService("250.3.1.1", 12024)));
addrman.Good(CAddress(addr6, NODE_NONE));
BOOST_CHECK(addrman.Add(CAddress(addr7, NODE_NONE), ResolveService("250.1.1.3", 8333)));
BOOST_CHECK(addrman.Add(CAddress(addr7, NODE_NONE), ResolveService("250.1.1.3", 12024)));
addrman.Good(CAddress(addr7, NODE_NONE));

// Test: 6 addrs + 1 addr from last test = 7.
Expand Down Expand Up @@ -327,9 +327,9 @@ BOOST_AUTO_TEST_CASE(addrman_find)

BOOST_CHECK_EQUAL(addrman.size(), 0U);

CAddress addr1 = CAddress(ResolveService("250.1.2.1", 8333), NODE_NONE);
CAddress addr1 = CAddress(ResolveService("250.1.2.1", 12024), NODE_NONE);
CAddress addr2 = CAddress(ResolveService("250.1.2.1", 9999), NODE_NONE);
CAddress addr3 = CAddress(ResolveService("251.255.2.1", 8333), NODE_NONE);
CAddress addr3 = CAddress(ResolveService("251.255.2.1", 12024), NODE_NONE);

CNetAddr source1 = ResolveIP("250.1.2.1");
CNetAddr source2 = ResolveIP("250.1.2.2");
Expand All @@ -341,7 +341,7 @@ BOOST_AUTO_TEST_CASE(addrman_find)
// Test: ensure Find returns an IP matching what we searched on.
CAddrInfo* info1 = addrman.Find(addr1);
BOOST_REQUIRE(info1);
BOOST_CHECK_EQUAL(info1->ToString(), "250.1.2.1:8333");
BOOST_CHECK_EQUAL(info1->ToString(), "250.1.2.1:12024");

// Test 18; Find does not discriminate by port number.
CAddrInfo* info2 = addrman.Find(addr2);
Expand All @@ -351,7 +351,7 @@ BOOST_AUTO_TEST_CASE(addrman_find)
// Test: Find returns another IP matching what we searched on.
CAddrInfo* info3 = addrman.Find(addr3);
BOOST_REQUIRE(info3);
BOOST_CHECK_EQUAL(info3->ToString(), "251.255.2.1:8333");
BOOST_CHECK_EQUAL(info3->ToString(), "251.255.2.1:12024");
}

BOOST_AUTO_TEST_CASE(addrman_create)
Expand All @@ -360,17 +360,17 @@ BOOST_AUTO_TEST_CASE(addrman_create)

BOOST_CHECK_EQUAL(addrman.size(), 0U);

CAddress addr1 = CAddress(ResolveService("250.1.2.1", 8333), NODE_NONE);
CAddress addr1 = CAddress(ResolveService("250.1.2.1", 12024), NODE_NONE);
CNetAddr source1 = ResolveIP("250.1.2.1");

int nId;
CAddrInfo* pinfo = addrman.Create(addr1, source1, &nId);

// Test: The result should be the same as the input addr.
BOOST_CHECK_EQUAL(pinfo->ToString(), "250.1.2.1:8333");
BOOST_CHECK_EQUAL(pinfo->ToString(), "250.1.2.1:12024");

CAddrInfo* info2 = addrman.Find(addr1);
BOOST_CHECK_EQUAL(info2->ToString(), "250.1.2.1:8333");
BOOST_CHECK_EQUAL(info2->ToString(), "250.1.2.1:12024");
}


Expand All @@ -380,7 +380,7 @@ BOOST_AUTO_TEST_CASE(addrman_delete)

BOOST_CHECK_EQUAL(addrman.size(), 0U);

CAddress addr1 = CAddress(ResolveService("250.1.2.1", 8333), NODE_NONE);
CAddress addr1 = CAddress(ResolveService("250.1.2.1", 12024), NODE_NONE);
CNetAddr source1 = ResolveIP("250.1.2.1");

int nId;
Expand All @@ -404,15 +404,15 @@ BOOST_AUTO_TEST_CASE(addrman_getaddr)
std::vector<CAddress> vAddr1 = addrman.GetAddr(/* max_addresses */ 0, /* max_pct */ 0, /* network */ std::nullopt);
BOOST_CHECK_EQUAL(vAddr1.size(), 0U);

CAddress addr1 = CAddress(ResolveService("250.250.2.1", 8333), NODE_NONE);
CAddress addr1 = CAddress(ResolveService("250.250.2.1", 12024), NODE_NONE);
addr1.nTime = GetAdjustedTime(); // Set time so isTerrible = false
CAddress addr2 = CAddress(ResolveService("250.251.2.2", 9999), NODE_NONE);
addr2.nTime = GetAdjustedTime();
CAddress addr3 = CAddress(ResolveService("251.252.2.3", 8333), NODE_NONE);
CAddress addr3 = CAddress(ResolveService("251.252.2.3", 12024), NODE_NONE);
addr3.nTime = GetAdjustedTime();
CAddress addr4 = CAddress(ResolveService("252.253.3.4", 8333), NODE_NONE);
CAddress addr4 = CAddress(ResolveService("252.253.3.4", 12024), NODE_NONE);
addr4.nTime = GetAdjustedTime();
CAddress addr5 = CAddress(ResolveService("252.254.4.5", 8333), NODE_NONE);
CAddress addr5 = CAddress(ResolveService("252.254.4.5", 12024), NODE_NONE);
addr5.nTime = GetAdjustedTime();
CNetAddr source1 = ResolveIP("250.1.2.1");
CNetAddr source2 = ResolveIP("250.2.3.3");
Expand Down Expand Up @@ -461,7 +461,7 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_tried_bucket_legacy)
{
CAddrManTest addrman;

CAddress addr1 = CAddress(ResolveService("250.1.1.1", 8333), NODE_NONE);
CAddress addr1 = CAddress(ResolveService("250.1.1.1", 12024), NODE_NONE);
CAddress addr2 = CAddress(ResolveService("250.1.1.1", 9999), NODE_NONE);

CNetAddr source1 = ResolveIP("250.1.1.1");
Expand Down Expand Up @@ -516,7 +516,7 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_new_bucket_legacy)
{
CAddrManTest addrman;

CAddress addr1 = CAddress(ResolveService("250.1.2.1", 8333), NODE_NONE);
CAddress addr1 = CAddress(ResolveService("250.1.2.1", 12024), NODE_NONE);
CAddress addr2 = CAddress(ResolveService("250.1.2.1", 9999), NODE_NONE);

CNetAddr source1 = ResolveIP("250.1.2.1");
Expand Down Expand Up @@ -594,7 +594,7 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_tried_bucket)
{
CAddrManTest addrman;

CAddress addr1 = CAddress(ResolveService("250.1.1.1", 8333), NODE_NONE);
CAddress addr1 = CAddress(ResolveService("250.1.1.1", 12024), NODE_NONE);
CAddress addr2 = CAddress(ResolveService("250.1.1.1", 9999), NODE_NONE);

CNetAddr source1 = ResolveIP("250.1.1.1");
Expand Down Expand Up @@ -649,7 +649,7 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_new_bucket)
{
CAddrManTest addrman;

CAddress addr1 = CAddress(ResolveService("250.1.2.1", 8333), NODE_NONE);
CAddress addr1 = CAddress(ResolveService("250.1.2.1", 12024), NODE_NONE);
CAddress addr2 = CAddress(ResolveService("250.1.2.1", 9999), NODE_NONE);

CNetAddr source1 = ResolveIP("250.1.2.1");
Expand Down
4 changes: 2 additions & 2 deletions src/test/net_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,15 +108,15 @@ BOOST_AUTO_TEST_CASE(caddrdb_read)
addrmanUncorrupted.MakeDeterministic();

CService addr1, addr2, addr3;
BOOST_CHECK(Lookup("250.7.1.1", addr1, 8333, false));
BOOST_CHECK(Lookup("250.7.1.1", addr1, 12024, false));
BOOST_CHECK(Lookup("250.7.2.2", addr2, 9999, false));
BOOST_CHECK(Lookup("250.7.3.3", addr3, 9999, false));
BOOST_CHECK(Lookup("250.7.3.3"s, addr3, 9999, false));
BOOST_CHECK(!Lookup("250.7.3.3\0example.com"s, addr3, 9999, false));

// Add three addresses to new table.
CService source;
BOOST_CHECK(Lookup("252.5.1.1", source, 8333, false));
BOOST_CHECK(Lookup("252.5.1.1", source, 12024, false));
BOOST_CHECK(addrmanUncorrupted.Add(CAddress(addr1, NODE_NONE), source));
BOOST_CHECK(addrmanUncorrupted.Add(CAddress(addr2, NODE_NONE), source));
BOOST_CHECK(addrmanUncorrupted.Add(CAddress(addr3, NODE_NONE), source));
Expand Down
18 changes: 9 additions & 9 deletions src/test/netbase_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,15 +99,15 @@ BOOST_AUTO_TEST_CASE(netbase_splithost)
BOOST_CHECK(TestSplitHost("www.digibyte.org:80", "www.digibyte.org", 80));
BOOST_CHECK(TestSplitHost("[www.digibyte.org]:80", "www.digibyte.org", 80));
BOOST_CHECK(TestSplitHost("127.0.0.1", "127.0.0.1", 0));
BOOST_CHECK(TestSplitHost("127.0.0.1:8333", "127.0.0.1", 8333));
BOOST_CHECK(TestSplitHost("127.0.0.1:12024", "127.0.0.1", 12024));
BOOST_CHECK(TestSplitHost("[127.0.0.1]", "127.0.0.1", 0));
BOOST_CHECK(TestSplitHost("[127.0.0.1]:8333", "127.0.0.1", 8333));
BOOST_CHECK(TestSplitHost("[127.0.0.1]:12024", "127.0.0.1", 12024));
BOOST_CHECK(TestSplitHost("::ffff:127.0.0.1", "::ffff:127.0.0.1", 0));
BOOST_CHECK(TestSplitHost("[::ffff:127.0.0.1]:8333", "::ffff:127.0.0.1", 8333));
BOOST_CHECK(TestSplitHost("[::]:8333", "::", 8333));
BOOST_CHECK(TestSplitHost("::8333", "::8333", 0));
BOOST_CHECK(TestSplitHost(":8333", "", 8333));
BOOST_CHECK(TestSplitHost("[]:8333", "", 8333));
BOOST_CHECK(TestSplitHost("[::ffff:127.0.0.1]:12024", "::ffff:127.0.0.1", 12024));
BOOST_CHECK(TestSplitHost("[::]:12024", "::", 12024));
BOOST_CHECK(TestSplitHost("::12024", "::12024", 0));
BOOST_CHECK(TestSplitHost(":12024", "", 12024));
BOOST_CHECK(TestSplitHost("[]:12024", "", 12024));
BOOST_CHECK(TestSplitHost("", "", 0));
}

Expand All @@ -120,10 +120,10 @@ bool static TestParse(std::string src, std::string canon)
BOOST_AUTO_TEST_CASE(netbase_lookupnumeric)
{
BOOST_CHECK(TestParse("127.0.0.1", "127.0.0.1:65535"));
BOOST_CHECK(TestParse("127.0.0.1:8333", "127.0.0.1:8333"));
BOOST_CHECK(TestParse("127.0.0.1:12024", "127.0.0.1:12024"));
BOOST_CHECK(TestParse("::ffff:127.0.0.1", "127.0.0.1:65535"));
BOOST_CHECK(TestParse("::", "[::]:65535"));
BOOST_CHECK(TestParse("[::]:8333", "[::]:8333"));
BOOST_CHECK(TestParse("[::]:12024", "[::]:12024"));
BOOST_CHECK(TestParse("[127.0.0.1]", "127.0.0.1:65535"));
BOOST_CHECK(TestParse(":::", "[::]:0"));

Expand Down