diff options
| author | Wladimir J. van der Laan <laanwj@protonmail.com> | 2020-10-12 18:30:14 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@protonmail.com> | 2020-10-12 18:40:45 +0200 |
| commit | f79a4a895279ba4efa43494270633f94f7d18342 (patch) | |
| tree | cd511bde84b87f1d0650a6078dae655fe89527f9 /src/netaddress.h | |
| parent | af22322dab1a2277483b2512723491a5fad1a606 (diff) | |
| parent | 3984b78cd7f49e409377f2175a56e8e4bd71d1d8 (diff) | |
| download | bitcoin-f79a4a895279ba4efa43494270633f94f7d18342.tar.xz | |
Merge #19998: net: Add CNode::ConnectedThroughNetwork member function
3984b78cd7f49e409377f2175a56e8e4bd71d1d8 test: Add tests for CNode::ConnectedThroughNetwork (Hennadii Stepanov)
49fba9c1aa699d3aa47ea4dafe07b47c8d0aac6e net: Add CNode::ConnectedThroughNetwork member function (Hennadii Stepanov)
d4dde24034d7467883b290111da60527ab8048f8 net: Add CNode::m_inbound_onion data member (Hennadii Stepanov)
Pull request description:
This PR:
- adds `CNode::ConnectedThroughNetwork` member function
- is based on #19991, and only last two commits belong to it
- is required for https://github.com/bitcoin-core/gui/pull/86 and #20002
ACKs for top commit:
jonatack:
re-ACK 3984b78cd7f49e409377f2175a56e8e4bd71d1d8 per `git diff 3989fcf 3984b78c`
laanwj:
Code review ACK 3984b78cd7f49e409377f2175a56e8e4bd71d1d8
Tree-SHA512: 23a9c8bca8dca75113b5505fe443b294f2d42d03c98c7e34919da12d8396beb8d0ada3a58ae16e3da04b7044395f72cf9c216625afc078256cd6c897ac42bf3d
Diffstat (limited to 'src/netaddress.h')
| -rw-r--r-- | src/netaddress.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/netaddress.h b/src/netaddress.h index 023e83e73d..9c8148e33e 100644 --- a/src/netaddress.h +++ b/src/netaddress.h @@ -188,7 +188,7 @@ class CNetAddr std::string ToStringIP() const; uint64_t GetHash() const; bool GetInAddr(struct in_addr* pipv4Addr) const; - uint32_t GetNetClass() const; + Network GetNetClass() const; //! For IPv4, mapped IPv4, SIIT translated IPv4, Teredo, 6to4 tunneled addresses, return the relevant IPv4 address as a uint32. uint32_t GetLinkedIPv4() const; |