aboutsummaryrefslogtreecommitdiff
path: root/src/net.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2019-01-09 17:04:16 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2019-01-09 17:12:54 +0100
commit854ca855ab33a3563f138d628bc94e8aee121819 (patch)
tree197963a853275e9e1ac8b8898b9859dfeb4da7a5 /src/net.cpp
parent699d0bd9fe5d39dd078ae4996079af2caf29a4e3 (diff)
parent6dc4593db1ccfb8745b2daa42f457981ae08dba9 (diff)
downloadbitcoin-854ca855ab33a3563f138d628bc94e8aee121819.tar.xz
Merge #15051: Tests: IsReachable is the inverse of IsLimited (DRY). Includes unit tests
6dc4593db1ccfb8745b2daa42f457981ae08dba9 IsReachable is the inverse of IsLimited (DRY). Includes unit tests (marcaiaf) Pull request description: IsReachable is the inverse of IsLimited, but the implementation is duplicated (DRY) - Changed the implementation accordingly. - Added unit tests to document behavior and relationship - My modification in net.cpp applies only to IsReachable. - Applied clang-format-diffpy Created new pull request to avoid the mess with: https://github.com/bitcoin/bitcoin/pull/15044 Checked with supposedly conflicting PRs mentioned in the old PR. No conflicts with the specific changes in this PR. Tree-SHA512: b132dec6cc2c788ebe4f63f228d78f441614e156743b17adebc990de0180a5872874d2724c86eeaa470b4521918bd137b0e33ebcaae77c5efc1f0d56104f6c87
Diffstat (limited to 'src/net.cpp')
-rw-r--r--src/net.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/net.cpp b/src/net.cpp
index 03ee7af5e4..86e5225839 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -295,15 +295,13 @@ bool IsLocal(const CService& addr)
/** check whether a given network is one we can probably connect to */
bool IsReachable(enum Network net)
{
- LOCK(cs_mapLocalHost);
- return !vfLimited[net];
+ return !IsLimited(net);
}
/** check whether a given address is in a network we can probably connect to */
bool IsReachable(const CNetAddr& addr)
{
- enum Network net = addr.GetNetwork();
- return IsReachable(net);
+ return IsReachable(addr.GetNetwork());
}