highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-11 06:28:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

p2p: drop onions from IsAddrV1Compatible(), no longer relay torv2

Browse Source
This commit is contained in:
Jon Atack
2021-05-24 22:02:02 +02:00
parent f8e94002fc
commit c56a1c9b18
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/netaddress.cpp
View File

@@ -522,7 +522,6 @@ bool CNetAddr::IsAddrV1Compatible() const
case NET_INTERNAL: case NET_INTERNAL:
return true; return true;
case NET_ONION: case NET_ONION:
return m_addr.size() == ADDR_TORV2_SIZE;
case NET_I2P: case NET_I2P:
case NET_CJDNS: case NET_CJDNS:
return false; return false;

2
src/test/net_tests.cpp
View File

@@ -613,7 +613,7 @@ BOOST_AUTO_TEST_CASE(cnetaddr_unserialize_v2)
s >> addr; s >> addr;
BOOST_CHECK(addr.IsValid()); BOOST_CHECK(addr.IsValid());
BOOST_CHECK(addr.IsTor()); BOOST_CHECK(addr.IsTor());
BOOST_CHECK(addr.IsAddrV1Compatible()); BOOST_CHECK(!addr.IsAddrV1Compatible());
BOOST_CHECK_EQUAL(addr.ToString(), "6hzph5hv6337r6p2.onion"); BOOST_CHECK_EQUAL(addr.ToString(), "6hzph5hv6337r6p2.onion");
BOOST_REQUIRE(s.empty()); BOOST_REQUIRE(s.empty());