Changeset 9991 for source/ariba/utility/transport/tcpip/protlib/address.cpp

Timestamp:

Jul 28, 2011, 2:03:14 PM (14 years ago)

Author:

Christoph Mayer

Message:

-fixes on protlib for android

File:

• source/ariba/utility/transport/tcpip/protlib/address.cpp (modified) (3 diffs)

source/ariba/utility/transport/tcpip/protlib/address.cpp

@@ -91 +91 @@
           Log(DEBUG_LOG,LOG_NORMAL,"hostaddress","::operator==()" << haddr->get_ip_str()<<"=="<<this->get_ip_str());
           if (!ipv4flag)
-            Log(DEBUG_LOG,LOG_NORMAL,"hostaddress","::operator==(), v6=" << IN6_ARE_ADDR_EQUAL(ipv6addr.s6_addr, haddr->ipv6addr.s6_addr));
+            Log(DEBUG_LOG,LOG_NORMAL,"hostaddress","::operator==(), v6=" << IN6_ARE_ADDR_EQUAL(&ipv6addr, &(haddr->ipv6addr)));
 #endif
           return ipv4flag ? (ipv4addr.s_addr==haddr->ipv4addr.s_addr) :
-                            IN6_ARE_ADDR_EQUAL(ipv6addr.s6_addr, haddr->ipv6addr.s6_addr);
+                            IN6_ARE_ADDR_EQUAL(&ipv6addr, &(haddr->ipv6addr));
         } else return false;
 } // end operator==
@@ -177 +177 @@
 bool hostaddress::is_ip_unspec() const {
         if (ipv4flag) return (ipv4addr.s_addr==0);
-        else return IN6_IS_ADDR_UNSPECIFIED(ipv6addr.s6_addr);
+        else return IN6_IS_ADDR_UNSPECIFIED(&ipv6addr);
         // never reached
         return true;
@@ -225 +225 @@
                 in = ipv4addr;
                 return true;
-        } else if (IN6_IS_ADDR_V4MAPPED(ipv6addr.s6_addr)) {
+        } else if (IN6_IS_ADDR_V4MAPPED(&ipv6addr)) {
                 memcpy(&(in.s_addr),ipv6addr.s6_addr+12,4);
                 return true;