Changeset 1638

Timestamp:

06/16/10 09:04:26 (3 years ago)

Author:

ahu

Message:

fix up IPv6 address & port assignment in ComboAddress?, broken since %link selection added!

Files:

• trunk/pdns/pdns/iputils.hh (modified) (1 diff)

trunk/pdns/pdns/iputils.hh

@@ -113 +113 @@
     memset(&sin6, 0, sizeof(sin6));
     sin4.sin_family = AF_INET;
-    sin4.sin_port=htons(port);
+    
     if(!IpToU32(str, (uint32_t*)&sin4.sin_addr.s_addr)) {
       sin6.sin6_family = AF_INET6;
       if(makeIPv6sockaddr(str, &sin6) < 0)
         throw AhuException("Unable to convert presentation address '"+ str +"'"); 
-    }
+      
+    }
+    sin4.sin_port=htons(port);
   }