From 85db02c599647665633a11c830d514c96bd9aa5b Mon Sep 17 00:00:00 2001
From: Bert Hubert <bert.hubert@netherlabs.nl>
Date: Mon, 14 Feb 2011 09:58:10 +0000
Subject: [PATCH] phase out sockAddrToString function (ComboAddress has a
 better one) teach ComboAddress to accept 1.2.3.4:53 as well as [::]:53

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2010 d19b8d6e-7fed-0310-83ef-9ca221ded41b
---
 pdns/dnsproxy.cc      |  2 +-
 pdns/iputils.hh       |  8 +++--
 pdns/misc.cc          | 68 ++++++++++++++++++++++++++++++-------------
 pdns/misc.hh          |  3 +-
 pdns/pdns_recursor.cc |  6 ++--
 5 files changed, 58 insertions(+), 29 deletions(-)

diff --git a/pdns/dnsproxy.cc b/pdns/dnsproxy.cc
index eec5dd2ee..9b77666ba 100644
--- a/pdns/dnsproxy.cc
+++ b/pdns/dnsproxy.cc
@@ -139,7 +139,7 @@ int DNSProxy::getID_locked()
     else if(i->second.created<time(0)-60) {
       if(i->second.created)
         L<<Logger::Warning<<"Recursive query for remote "<<
-          sockAddrToString((struct sockaddr_in *)&i->second.remote)<<" with internal id "<<n<<
+          i->second.remote.toStringWithPort()<<" with internal id "<<n<<
           " was not answered by backend within timeout, reusing id"<<endl;
       
       return n;
diff --git a/pdns/iputils.hh b/pdns/iputils.hh
index b7e5e5f44..3af1dacda 100644
--- a/pdns/iputils.hh
+++ b/pdns/iputils.hh
@@ -108,18 +108,20 @@ union ComboAddress {
     sin4.sin_port=0;
   }
 
+  // 'port' sets a default value in case 'str' does not set a port
   explicit ComboAddress(const string& str, uint16_t port=0)
   {
     memset(&sin6, 0, sizeof(sin6));
     sin4.sin_family = AF_INET;
-    
-    if(!IpToU32(str, (uint32_t*)&sin4.sin_addr.s_addr)) {
+    sin4.sin_port = 0;
+    if(makeIPv4sockaddr(str, &sin4)) {
       sin6.sin6_family = AF_INET6;
       if(makeIPv6sockaddr(str, &sin6) < 0)
         throw AhuException("Unable to convert presentation address '"+ str +"'"); 
       
     }
-    sin4.sin_port=htons(port);
+    if(!sin4.sin_port) // 'str' overrides port!
+      sin4.sin_port=htons(port);
   }
 
   bool isMappedIPv4()  const
diff --git a/pdns/misc.cc b/pdns/misc.cc
index 8b811fc9e..b39e6e7d1 100644
--- a/pdns/misc.cc
+++ b/pdns/misc.cc
@@ -481,23 +481,6 @@ string U32ToIP(uint32_t val)
 }
 
 
-const string sockAddrToString(struct sockaddr_in *remote) 
-{    
-  if(remote->sin_family == AF_INET) {
-    struct sockaddr_in sip;
-    memcpy(&sip,(struct sockaddr_in*)remote,sizeof(sip));
-    return inet_ntoa(sip.sin_addr);
-  }
-  else {
-    char tmp[128];
-    
-    if(!Utility::inet_ntop(AF_INET6, ( const char * ) &((struct sockaddr_in6 *)remote)->sin6_addr, tmp, sizeof(tmp)))
-      return "IPv6 untranslateable";
-
-    return tmp;
-  }
-}
-
 string makeHexDump(const string& str)
 {
   char tmp[5];
@@ -511,8 +494,6 @@ string makeHexDump(const string& str)
   return ret;
 }
 
-
-
 // shuffle, maintaining some semblance of order
 void shuffle(vector<DNSResourceRecord>& rrs)
 {
@@ -665,6 +646,18 @@ string dotConcat(const std::string& a, const std::string &b)
 
 int makeIPv6sockaddr(const std::string& addr, struct sockaddr_in6* ret)
 {
+  if(addr.empty())
+    return -1;
+  string ourAddr(addr);
+  int port = -1;
+  if(addr[0]=='[') { // [::]:53 style address
+    string::size_type pos = addr.find(']');
+    if(pos == string::npos || pos + 2 > addr.size() || addr[pos+1]!=':')
+      return -1;
+    ourAddr.assign(addr.c_str() + 1, pos-1);
+    port = atoi(addr.c_str()+pos+2);  
+  }
+  
   struct addrinfo* res;
   struct addrinfo hints;
   memset(&hints, 0, sizeof(hints));
@@ -673,7 +666,7 @@ int makeIPv6sockaddr(const std::string& addr, struct sockaddr_in6* ret)
   hints.ai_flags = AI_NUMERICHOST;
   
   int error;
-  if((error=getaddrinfo(addr.c_str(), 0, &hints, &res))) {
+  if((error=getaddrinfo(ourAddr.c_str(), 0, &hints, &res))) { // this is correct
     /*
     cerr<<"Error translating IPv6 address '"<<addr<<"': ";
     if(error==EAI_SYSTEM)
@@ -685,11 +678,44 @@ int makeIPv6sockaddr(const std::string& addr, struct sockaddr_in6* ret)
   }
   
   memcpy(ret, res->ai_addr, res->ai_addrlen);
-  
+  if(port >= 0)
+    ret->sin6_port = htons(port);
   freeaddrinfo(res);
   return 0;
 }
 
+int makeIPv4sockaddr(const string &str, struct sockaddr_in* ret)
+{
+  if(str.empty()) {
+    return -1;
+  }
+  struct in_addr inp;
+  
+  string::size_type pos = str.find(':');
+  if(pos == string::npos) { // no port specified, not touching the port
+    if(Utility::inet_aton(str.c_str(), &inp)) {
+      ret->sin_addr.s_addr=inp.s_addr;
+      return 0;
+    }
+    return -1;
+  }
+  if(!*(str.c_str() + pos + 1)) // trailing :
+    return -1; 
+    
+  char *eptr = (char*)str.c_str() + str.size();
+  int port = strtol(str.c_str() + pos + 1, &eptr, 10);
+  if(*eptr)
+    return -1;
+  
+  ret->sin_port = htons(port);
+  if(Utility::inet_aton(str.substr(0, pos).c_str(), &inp)) {
+    ret->sin_addr.s_addr=inp.s_addr;
+    return 0;
+  }
+  return -1;
+}
+
+
 //! read a line of text from a FILE* to a std::string, returns false on 'no data'
 bool stringfgets(FILE* fp, std::string& line)
 {
diff --git a/pdns/misc.hh b/pdns/misc.hh
index ebcfa4430..c366976cb 100644
--- a/pdns/misc.hh
+++ b/pdns/misc.hh
@@ -215,7 +215,7 @@ public:
 private:
   struct timeval d_set;
 };
-const string sockAddrToString(struct sockaddr_in *remote);
+
 int sendData(const char *buffer, int replen, int outsock);
 
 inline void DTime::set()
@@ -457,6 +457,7 @@ string makeRelative(const std::string& fqdn, const std::string& zone);
 string labelReverse(const std::string& qname);
 std::string dotConcat(const std::string& a, const std::string &b);
 int makeIPv6sockaddr(const std::string& addr, struct sockaddr_in6* ret);
+int makeIPv4sockaddr(const string &str, struct sockaddr_in* ret);
 bool stringfgets(FILE* fp, std::string& line);
 
 template<typename Index>
diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 141f48613..c2a15f619 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -1384,7 +1384,7 @@ void handleUDPServerResponse(int fd, FDMultiplexer::funcparam_t& var)
     else {
       g_stats.serverParseError++; 
       if(g_logCommonErrors)
-        L<<Logger::Error<<"Unable to parse packet from remote UDP server "<< sockAddrToString((struct sockaddr_in*) &fromaddr) <<
+        L<<Logger::Error<<"Unable to parse packet from remote UDP server "<< fromaddr.toString() <<
           ": packet smalller than DNS header"<<endl;
     }
 
@@ -1417,7 +1417,7 @@ void handleUDPServerResponse(int fd, FDMultiplexer::funcparam_t& var)
       }
       catch(std::exception& e) {
         g_stats.serverParseError++; // won't be fed to lwres.cc, so we have to increment
-        L<<Logger::Warning<<"Error in packet from "<<sockAddrToString((struct sockaddr_in*) &fromaddr) << ": "<<e.what() << endl;
+        L<<Logger::Warning<<"Error in packet from "<< fromaddr.toStringWithPort() << ": "<<e.what() << endl;
         return;
       }
     }
@@ -1457,7 +1457,7 @@ void handleUDPServerResponse(int fd, FDMultiplexer::funcparam_t& var)
     }
   }
   else
-    L<<Logger::Warning<<"Ignoring question on outgoing socket from "<< sockAddrToString((struct sockaddr_in*) &fromaddr)  <<endl;
+    L<<Logger::Warning<<"Ignoring question on outgoing socket from "<< fromaddr.toStringWithPort()  <<endl;
 }
 
 FDMultiplexer* getMultiplexer()
-- 
2.50.0