mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-22 15:04:44 +01:00
Code Issues Projects Releases Wiki Activity

net: assert CNode::m_inbound_onion is inbound in ctor

Browse source 
and drop an unneeded check in CNode::ConnectedThroughNetwork()
This commit is contained in:
Jon Atack 2020-10-21 11:52:19 +02:00
parent 993d1ecd19
commit 6609eb8cb5
No known key found for this signature in database
GPG key ID: 4F5721B3D0E3921D
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/net.cpp
View file

@ -555,7 +555,7 @@ void CNode::SetAddrLocal(const CService& addrLocalIn) {
Network CNode::ConnectedThroughNetwork() const Network CNode::ConnectedThroughNetwork() const
{ {
return IsInboundConn() && m_inbound_onion ? NET_ONION : addr.GetNetClass(); return m_inbound_onion ? NET_ONION : addr.GetNetClass();
} }
#undef X #undef X
@ -2954,6 +2954,7 @@ CNode::CNode(NodeId idIn, ServiceFlags nLocalServicesIn, int nMyStartingHeightIn
nMyStartingHeight(nMyStartingHeightIn), nMyStartingHeight(nMyStartingHeightIn),
m_inbound_onion(inbound_onion) m_inbound_onion(inbound_onion)
{ {
if (inbound_onion) assert(conn_type_in == ConnectionType::INBOUND);
hSocket = hSocketIn; hSocket = hSocketIn;
addrName = addrNameIn == "" ? addr.ToStringIPPort() : addrNameIn; addrName = addrNameIn == "" ? addr.ToStringIPPort() : addrNameIn;
hashContinue = uint256(); hashContinue = uint256();

2
src/net.h
View file

@ -1110,7 +1110,7 @@ private:
CService addrLocal GUARDED_BY(cs_addrLocal); CService addrLocal GUARDED_BY(cs_addrLocal);
mutable RecursiveMutex cs_addrLocal; mutable RecursiveMutex cs_addrLocal;
//! Whether this peer connected via our Tor onion service. //! Whether this peer is an inbound onion, e.g. connected via our Tor onion service.
const bool m_inbound_onion{false}; const bool m_inbound_onion{false};
public: public: