[reSIProcate] [PATCH] DnsUtil: Fix for multihomed interfaces

[Gregor Jasny <jasny@xxxxxxxxxx>]

Hi,

without the attached patch DnsUtil::getInterfaces() returns 0.0.0.0 for 
all adapater addresses on my system (the first address is an IPv6 
address and USE_IPV6 is disabled).

The patch fixes:
* iterate over all interface addresses, not just the first one
* skip parsing !AF_INET adrdesses if USE_IPV6 is not defined
  (otherwise we would get 0.0.0.0 for a AF_INET6 address)

Byron: could you apply it also to the 1.4 branch?

Thanks,
Gregor

Index: WinCompat.cxx
===================================================================
--- WinCompat.cxx       (revision 8306)
+++ WinCompat.cxx       (working copy)
@@ -244,13 +244,14 @@
          int i;
          for (i = 0, AI = pAdapterAddresses; AI != NULL; AI = AI->Next, i++) 
          {
-             if (AI->FirstUnicastAddress != NULL) 
+             for (const IP_ADAPTER_UNICAST_ADDRESS_LH *unicast = 
AI->FirstUnicastAddress;
+                  unicast; unicast = unicast->Next)
              {
-                if (AI->FirstUnicastAddress->Address.lpSockaddr->sa_family != 
saddr->sa_family)
+                if (unicast->Address.lpSockaddr->sa_family != saddr->sa_family)
                    continue;
                 if (saddr->sa_family == AF_INET && AI->IfIndex == 
dwBestIfIndex)
                 {
-                   GenericIPAddress 
ipaddress(*AI->FirstUnicastAddress->Address.lpSockaddr);
+                   GenericIPAddress ipaddress(*unicast->Address.lpSockaddr);
                    LocalFree(pAdapterAddresses);
                    return(ipaddress);
                 }
@@ -259,7 +260,7 @@
                 {
                    // explicitly cast to sockaddr_in6, to use that version of 
GenericIPAddress' ctor. If we don't, then compiler
                    // defaults to ctor for sockaddr_in (at least under Win32), 
which will truncate the lower-bits of the IPv6 address.
-                   const struct sockaddr_in6* psa = reinterpret_cast<const 
struct sockaddr_in6*>(AI->FirstUnicastAddress->Address.lpSockaddr);
+                   const struct sockaddr_in6* psa = reinterpret_cast<const 
struct sockaddr_in6*>(unicast->Address.lpSockaddr);
                    GenericIPAddress ipaddress(*psa);
                    LocalFree(pAdapterAddresses);
                    return(ipaddress);
@@ -443,7 +444,10 @@
                Data name(AI->Description);
                if(matching == Data::Empty || name == matching)
                {
-                  results.push_back(std::make_pair(name, 
Data(AI->IpAddressList.IpAddress.String)));
+                  for (const IP_ADDR_STRING *addr=&AI->IpAddressList; addr; 
addr = addr->Next)
+                  {
+                     results.push_back(std::make_pair(name, 
Data(addr->IpAddress.String)));
+                  }
                }
             }
             LocalFree(pAdaptersInfo);
@@ -490,7 +494,15 @@
 
                if(matching == Data::Empty || name == matching)
                {
-                  results.push_back(std::make_pair(name, 
DnsUtil::inet_ntop(*AI->FirstUnicastAddress->Address.lpSockaddr)));
+                  for (const IP_ADAPTER_UNICAST_ADDRESS_LH *unicast = 
AI->FirstUnicastAddress;
+                       unicast; unicast = unicast->Next)
+                  {
+#ifndef USE_IPV6
+                     // otherwise we would get 0.0.0.0 for AF_INET6 addresses
+                     if (unicast->Address.lpSockaddr->sa_family != AF_INET) 
continue;
+#endif
+                     results.push_back(std::make_pair(name, 
DnsUtil::inet_ntop(*unicast->Address.lpSockaddr)));
+                  }
                }
             } 
          }