aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Atack <jon@atack.com>2021-05-24 22:02:02 +0200
committerJon Atack <jon@atack.com>2021-05-28 01:42:21 +0200
commitc56a1c9b182815018b8bd3d8e6b8c2cb27859607 (patch)
treeaa9e81a1c73cef5988a240b75fc20cb2adcf9eba
parentf8e94002fcfdc7890d38c23488b1f3a662e97bc4 (diff)
downloadbitcoin-c56a1c9b182815018b8bd3d8e6b8c2cb27859607.tar.xz
p2p: drop onions from IsAddrV1Compatible(), no longer relay torv2
-rw-r--r--src/netaddress.cpp1
-rw-r--r--src/test/net_tests.cpp2
2 files changed, 1 insertions, 2 deletions
diff --git a/src/netaddress.cpp b/src/netaddress.cpp
index eeb88d679c..b6f0463a1d 100644
--- a/src/netaddress.cpp
+++ b/src/netaddress.cpp
@@ -522,7 +522,6 @@ bool CNetAddr::IsAddrV1Compatible() const
case NET_INTERNAL:
return true;
case NET_ONION:
- return m_addr.size() == ADDR_TORV2_SIZE;
case NET_I2P:
case NET_CJDNS:
return false;
diff --git a/src/test/net_tests.cpp b/src/test/net_tests.cpp
index 8d47bfb290..1f5c29c657 100644
--- a/src/test/net_tests.cpp
+++ b/src/test/net_tests.cpp
@@ -613,7 +613,7 @@ BOOST_AUTO_TEST_CASE(cnetaddr_unserialize_v2)
s >> addr;
BOOST_CHECK(addr.IsValid());
BOOST_CHECK(addr.IsTor());
- BOOST_CHECK(addr.IsAddrV1Compatible());
+ BOOST_CHECK(!addr.IsAddrV1Compatible());
BOOST_CHECK_EQUAL(addr.ToString(), "6hzph5hv6337r6p2.onion");
BOOST_REQUIRE(s.empty());