From 86c495223f048e5ca2cf0d8730af7db3b76f7aba Mon Sep 17 00:00:00 2001 From: Jon Atack Date: Wed, 21 Oct 2020 11:53:38 +0200 Subject: [PATCH] net: add CNode::IsInboundOnion() public getter and unit tests --- src/net.h | 3 +++ src/test/net_tests.cpp | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/src/net.h b/src/net.h index ca5944d46b2..0b7d0f406cf 100644 --- a/src/net.h +++ b/src/net.h @@ -1234,6 +1234,9 @@ public: void MaybeSetAddrName(const std::string& addrNameIn); std::string ConnectionTypeAsString() const; + + /** Whether this peer is an inbound onion, e.g. connected via our Tor onion service. */ + bool IsInboundOnion() const { return m_inbound_onion; } }; /** Return a timestamp in the future (in microseconds) for exponentially distributed events. */ diff --git a/src/test/net_tests.cpp b/src/test/net_tests.cpp index eb2f4cee690..f6adc6a28da 100644 --- a/src/test/net_tests.cpp +++ b/src/test/net_tests.cpp @@ -200,6 +200,7 @@ BOOST_AUTO_TEST_CASE(cnode_simple_test) BOOST_CHECK(pnode1->IsFeelerConn() == false); BOOST_CHECK(pnode1->IsAddrFetchConn() == false); BOOST_CHECK(pnode1->IsInboundConn() == false); + BOOST_CHECK(pnode1->IsInboundOnion() == false); BOOST_CHECK_EQUAL(pnode1->ConnectedThroughNetwork(), Network::NET_IPV4); std::unique_ptr pnode2 = MakeUnique( @@ -214,6 +215,7 @@ BOOST_AUTO_TEST_CASE(cnode_simple_test) BOOST_CHECK(pnode2->IsFeelerConn() == false); BOOST_CHECK(pnode2->IsAddrFetchConn() == false); BOOST_CHECK(pnode2->IsInboundConn() == true); + BOOST_CHECK(pnode2->IsInboundOnion() == false); BOOST_CHECK_EQUAL(pnode2->ConnectedThroughNetwork(), Network::NET_IPV4); std::unique_ptr pnode3 = MakeUnique( @@ -228,6 +230,7 @@ BOOST_AUTO_TEST_CASE(cnode_simple_test) BOOST_CHECK(pnode3->IsFeelerConn() == false); BOOST_CHECK(pnode3->IsAddrFetchConn() == false); BOOST_CHECK(pnode3->IsInboundConn() == false); + BOOST_CHECK(pnode3->IsInboundOnion() == false); BOOST_CHECK_EQUAL(pnode3->ConnectedThroughNetwork(), Network::NET_IPV4); std::unique_ptr pnode4 = MakeUnique( @@ -242,6 +245,7 @@ BOOST_AUTO_TEST_CASE(cnode_simple_test) BOOST_CHECK(pnode4->IsFeelerConn() == false); BOOST_CHECK(pnode4->IsAddrFetchConn() == false); BOOST_CHECK(pnode4->IsInboundConn() == true); + BOOST_CHECK(pnode4->IsInboundOnion() == true); BOOST_CHECK_EQUAL(pnode4->ConnectedThroughNetwork(), Network::NET_ONION); }