fix up IPv6 address & port assignment in ComboAddress, broken since %link selection...

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@1638 d19b8d6e-7fed-0310-83ef-9ca221ded41b

diff --git a/pdns/iputils.hh b/pdns/iputils.hh
index 5b9ecb302b255c16fa45f2fe71e5a69782bfb520..cfc2671886ef543650bf73a724c9cbc8f4cec838 100644 (file)
--- a/pdns/iputils.hh
+++ b/pdns/iputils.hh
@@ -112,12 +112,14 @@ union ComboAddress {
   {
     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);
   }
 
   bool isMappedIPv4()  const