From b34db33a697cf6672d529212b4254d28e557a6bf Mon Sep 17 00:00:00 2001
From: "W. J. van der Laan" <laanwj@protonmail.com>
Date: Mon, 6 Dec 2021 19:49:56 +0100
Subject: [PATCH] Merge bitcoin/bitcoin#17160: refactor: net: subnet lookup:
 use single-result LookupHost()

a989f98d240a84b5c798252acaa4a316ac711189 refactor: net: subnet lookup: use single-result LookupHost() (Sebastian Falbesoner)

Pull request description:

  plus describe single IP subnet case for more clarity

ACKs for top commit:
  jonatack:
    utACK a989f98d240a84b5c798252acaa4a316ac711189 the patch rebases cleanly to master, the debug build is green, and it is essentially the same patch as c8991f0251dd2a modulo local variable naming, braced initialization, and a comment
  vasild:
    ACK a989f98d240a84b5c798252acaa4a316ac711189

Tree-SHA512: 082d3481b1fa5e5f3267b7c4a812954b67b36d1f94c5296fe20110699f053e5042dfa13f728ae20249e9b8d71e930c3b119410125d0faeccdfbdc259223ee3a6
---
 src/netbase.cpp | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/netbase.cpp b/src/netbase.cpp
index df466422ee..6fa2f6f78b 100644
--- a/src/netbase.cpp
+++ b/src/netbase.cpp
@@ -674,14 +674,11 @@ bool LookupSubNet(const std::string& strSubnet, CSubNet& ret, DNSLookupFn dns_lo
         return false;
     }
     size_t slash = strSubnet.find_last_of('/');
-    std::vector<CNetAddr> vIP;
+    CNetAddr network;
 
     std::string strAddress = strSubnet.substr(0, slash);
-    // TODO: Use LookupHost(const std::string&, CNetAddr&, bool) instead to just get
-    //       one CNetAddr.
-    if (LookupHost(strAddress, vIP, 1, false, dns_lookup_function))
+    if (LookupHost(strAddress, network, false, dns_lookup_function))
     {
-        CNetAddr network = vIP[0];
         if (slash != strSubnet.npos)
         {
             std::string strNetmask = strSubnet.substr(slash + 1);
@@ -693,14 +690,15 @@ bool LookupSubNet(const std::string& strSubnet, CSubNet& ret, DNSLookupFn dns_lo
             }
             else // If not a valid number, try full netmask syntax
             {
+                CNetAddr netmask;
                 // Never allow lookup for netmask
-                if (LookupHost(strNetmask, vIP, 1, false, dns_lookup_function)) {
-                    ret = CSubNet(network, vIP[0]);
+                if (LookupHost(strNetmask, netmask, false, dns_lookup_function)) {
+                    ret = CSubNet(network, netmask);
                     return ret.IsValid();
                 }
             }
         }
-        else
+        else // Single IP subnet (<ipv4>/32 or <ipv6>/128)
         {
             ret = CSubNet(network);
             return ret.IsValid();