From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Thu, 11 Jan 2024 09:04:39 +0000 (+0100)
Subject: remove isValid
X-Git-Tag: auth-4.9.0-alpha1^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12788f5734c7a2c48ccd61d798da44f980f6d2e5;p=thirdparty%2Fpdns.git

remove isValid
---

diff --git a/pdns/dnsproxy.cc b/pdns/dnsproxy.cc
index d3b8e03e15..6482b67cf1 100644
--- a/pdns/dnsproxy.cc
+++ b/pdns/dnsproxy.cc
@@ -268,12 +268,10 @@ void DNSProxy::mainloop()
         memset(&msgh, 0, sizeof(struct msghdr));
         string reply; // needs to be alive at time of sendmsg!
         MOADNSParser mdp(false, p.getString());
-        if (p.d_eso.scope.isValid()){
-          // update the EDNS options with info from the resolver - issue #5469
-          // note that this relies on the ECS string encoder to use the source network, and only take the prefix length from scope
-          i->second.complete->d_eso.scope = p.d_eso.scope;
-          DLOG(g_log<<"from dnsproxy::mainLoop: updated EDNS options from resolver EDNS source: "<<i->second.complete->d_eso.source.toString()<<" EDNS scope: "<<i->second.complete->d_eso.scope.toString()<<endl);
-        }
+        // update the EDNS options with info from the resolver - issue #5469
+        // note that this relies on the ECS string encoder to use the source network, and only take the prefix length from scope
+        i->second.complete->d_eso.scope = p.d_eso.scope;
+        DLOG(g_log<<"from dnsproxy::mainLoop: updated EDNS options from resolver EDNS source: "<<i->second.complete->d_eso.source.toString()<<" EDNS scope: "<<i->second.complete->d_eso.scope.toString()<<endl);
 
         if (mdp.d_header.rcode == RCode::NoError) {
           for (const auto & answer : mdp.d_answers) {        
diff --git a/pdns/iputils.hh b/pdns/iputils.hh
index 5810bf1f0a..ade4c82a30 100644
--- a/pdns/iputils.hh
+++ b/pdns/iputils.hh
@@ -261,16 +261,6 @@ union ComboAddress {
     return ret;
   }
 
-  bool isValid() const
-  {
-    char host[1024];
-    int retval = 0;
-    if(sin4.sin_family && !(retval = getnameinfo(reinterpret_cast<const struct sockaddr*>(this), getSocklen(), host, sizeof(host),0, 0, NI_NUMERICHOST)))
-      return true;
-    else
-      return false;
-  }
-
   string toString() const
   {
     char host[1024];
@@ -605,11 +595,6 @@ public:
     return (ip & d_mask) == (ntohl(d_network.sin4.sin_addr.s_addr));
   }
 
-  bool isValid()
-  {
-    return d_network.isValid();
-  }
-  
   string toString() const
   {
     return d_network.toStringNoInterface()+"/"+std::to_string((unsigned int)d_bits);