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.cpp | |
| 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.cpp')
| -rw-r--r-- | src/netaddress.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/netaddress.cpp b/src/netaddress.cpp index 147c775e61..6695ec3700 100644 --- a/src/netaddress.cpp +++ b/src/netaddress.cpp @@ -649,7 +649,7 @@ uint32_t CNetAddr::GetLinkedIPv4() const assert(false); } -uint32_t CNetAddr::GetNetClass() const +Network CNetAddr::GetNetClass() const { // Make sure that if we return NET_IPV6, then IsIPv6() is true. The callers expect that. |