Changeset 1620

Timestamp:

05/25/10 22:26:23 (3 years ago)

Author:

ahu

Message:

make sure that we can bind to IPv6 link-local addresses. Feature suggested by Darren Gamble, implemented with help of Niels Bakker.

Location:

trunk/pdns/pdns

Files:

• iputils.hh (modified) (2 diffs)
• misc.cc (modified) (1 diff)
• misc.hh (modified) (1 diff)
• pdns_recursor.cc (modified) (2 diffs)

trunk/pdns/pdns/iputils.hh

@@ -116 +116 @@
     if(!IpToU32(str, (uint32_t*)&sin4.sin_addr.s_addr)) {
       sin6.sin6_family = AF_INET6;
-      if(Utility::inet_pton(AF_INET6, str.c_str(), &sin6.sin6_addr) <= 0)
+      if(makeIPv6sockaddr(str, &sin6) < 0)
         throw AhuException("Unable to convert presentation address '"+ str +"'"); 
     }
@@ -187 +187 @@
   if(Utility::inet_pton(AF_INET, str.c_str(), &address.sin4.sin_addr) <= 0) {
     address.sin4.sin_family=AF_INET6;
-    if(Utility::inet_pton(AF_INET6, str.c_str(), &address.sin6.sin6_addr) <= 0)
+    if(makeIPv6sockaddr(str, &address.sin6) < 0)
       throw NetmaskException("Unable to convert '"+str+"' to a netmask");        
   }

trunk/pdns/pdns/misc.cc

@@ -666 +666 @@
     return a+"."+b;
 }
+
+int makeIPv6sockaddr(const std::string& addr, struct sockaddr_in6* ret)
+{
+  struct addrinfo* res;
+  struct addrinfo hints;
+  memset(&hints, 0, sizeof(hints));
+  
+  hints.ai_family = AF_INET6;
+  hints.ai_flags = AI_NUMERICHOST;
+  
+  if(getaddrinfo(addr.c_str(), 0, &hints, &res) < 0) {
+    perror("getaddrinfo");
+    return -1;
+  }
+  
+  memcpy(ret, res->ai_addr, sizeof(*ret));
+  
+  freeaddrinfo(res);
+  return 0;
+}

trunk/pdns/pdns/misc.hh

@@ -384 +384 @@
 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);
 #endif

trunk/pdns/pdns/pdns_recursor.cc

@@ -904 +904 @@
     if(!IpToU32(st.host, (uint32_t*)&sin.sin4.sin_addr.s_addr)) {
       sin.sin6.sin6_family = AF_INET6;
-      if(Utility::inet_pton(AF_INET6, st.host.c_str(), &sin.sin6.sin6_addr) <= 0)
+      if(makeIPv6sockaddr(st.host, &sin.sin6) < 0)
         throw AhuException("Unable to resolve local address for TCP server on '"+ st.host +"'"); 
     }
@@ -968 +968 @@
     if(!IpToU32(st.host.c_str() , (uint32_t*)&sin.sin4.sin_addr.s_addr)) {
       sin.sin6.sin6_family = AF_INET6;
-      if(Utility::inet_pton(AF_INET6, st.host.c_str(), &sin.sin6.sin6_addr) <= 0)
+      if(makeIPv6sockaddr(st.host, &sin.sin6) < 0)
         throw AhuException("Unable to resolve local address for UDP server on '"+ st.host +"'"); 
     }