diff options
author | Vasil Dimov <vd@FreeBSD.org> | 2021-12-07 12:56:02 +0100 |
---|---|---|
committer | Jon Atack <jon@atack.com> | 2021-12-07 13:13:18 +0100 |
commit | c44c20108f7b7314f59f034110789385a24db280 (patch) | |
tree | f58f1458ab93e6ba3144c9f1c6b4b68f86f67a9f | |
parent | f0c9e68080432c1ab11b14e571b8dfb7cfe727f8 (diff) | |
download | bitcoin-c44c20108f7b7314f59f034110789385a24db280.tar.xz |
p2p, refactor: drop unused DNSLookupFn param in LookupSubnet()
-rw-r--r-- | src/netbase.cpp | 6 | ||||
-rw-r--r-- | src/netbase.h | 2 | ||||
-rw-r--r-- | src/test/fuzz/netbase_dns_lookup.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/netbase.cpp b/src/netbase.cpp index 5d7d45f2ef..0b68c0d041 100644 --- a/src/netbase.cpp +++ b/src/netbase.cpp @@ -676,7 +676,7 @@ bool ConnectThroughProxy(const proxyType& proxy, const std::string& strDest, uin return true; } -bool LookupSubNet(const std::string& subnet_str, CSubNet& subnet_out, DNSLookupFn dns_lookup_function) +bool LookupSubNet(const std::string& subnet_str, CSubNet& subnet_out) { if (!ValidAsCString(subnet_str)) { return false; @@ -686,7 +686,7 @@ bool LookupSubNet(const std::string& subnet_str, CSubNet& subnet_out, DNSLookupF const std::string str_addr{subnet_str.substr(0, slash_pos)}; CNetAddr addr; - if (LookupHost(str_addr, addr, /*fAllowLookup=*/false, dns_lookup_function)) { + if (LookupHost(str_addr, addr, /*fAllowLookup=*/false)) { if (slash_pos != subnet_str.npos) { const std::string netmask_str{subnet_str.substr(slash_pos + 1)}; uint8_t netmask; @@ -697,7 +697,7 @@ bool LookupSubNet(const std::string& subnet_str, CSubNet& subnet_out, DNSLookupF } else { // Invalid number; try full netmask syntax. Never allow lookup for netmask. CNetAddr full_netmask; - if (LookupHost(netmask_str, full_netmask, /*fAllowLookup=*/false, dns_lookup_function)) { + if (LookupHost(netmask_str, full_netmask, /*fAllowLookup=*/false)) { subnet_out = CSubNet{addr, full_netmask}; return subnet_out.IsValid(); } diff --git a/src/netbase.h b/src/netbase.h index a730626a50..f3d8f15788 100644 --- a/src/netbase.h +++ b/src/netbase.h @@ -176,7 +176,7 @@ CService LookupNumeric(const std::string& name, uint16_t portDefault = 0, DNSLoo * from `subnet_str`. * @returns whether the operation succeeded or not. */ -bool LookupSubNet(const std::string& subnet_str, CSubNet& subnet_out, DNSLookupFn dns_lookup_function = g_dns_lookup); +bool LookupSubNet(const std::string& subnet_str, CSubNet& subnet_out); /** * Create a TCP socket in the given address family. diff --git a/src/test/fuzz/netbase_dns_lookup.cpp b/src/test/fuzz/netbase_dns_lookup.cpp index d01d413cff..31ea31744a 100644 --- a/src/test/fuzz/netbase_dns_lookup.cpp +++ b/src/test/fuzz/netbase_dns_lookup.cpp @@ -64,7 +64,7 @@ FUZZ_TARGET(netbase_dns_lookup) } { CSubNet resolved_subnet; - if (LookupSubNet(name, resolved_subnet, fuzzed_dns_lookup_function)) { + if (LookupSubNet(name, resolved_subnet)) { assert(resolved_subnet.IsValid()); } } |