Changeset 5757 for source/ariba

Timestamp:

Aug 7, 2009, 10:06:04 AM (15 years ago)

Author:

Christoph Mayer

Message:

v6 address detection

File:

• source/ariba/communication/networkinfo/AddressDiscovery.cpp (modified) (3 diffs)

source/ariba/communication/networkinfo/AddressDiscovery.cpp

@@ -97 +97 @@
         struct ifaddrs* tmpAddr     = NULL;
         void*           tmpAddrPtr  = NULL;
-        char            straddr     [INET_ADDRSTRLEN];
 
         int ret = getifaddrs( &ifaceBuffer );
@@ -107 +106 @@
                 if(i == NULL) continue;
                 struct sockaddr* addr = i->ifa_addr;
+                if (addr==NULL) continue;
 
                 if (addr->sa_family == AF_INET) {
                         // look for ipv4
-                        if (addr==NULL) continue;
+                        char straddr[INET_ADDRSTRLEN];
                         tmpAddrPtr= &((struct sockaddr_in*)addr)->sin_addr;
                         inet_ntop( i->ifa_addr->sa_family, tmpAddrPtr, straddr, sizeof(straddr) );
@@ -120 +120 @@
                 if (addr->sa_family == AF_INET6) {
                         // look for ipv6
-                        if (addr==NULL) continue;
+                        char straddr[INET6_ADDRSTRLEN];
                         tmpAddrPtr= &((struct sockaddr_in6*)addr)->sin6_addr;
                         inet_ntop( i->ifa_addr->sa_family, tmpAddrPtr, straddr, sizeof(straddr) );