Change PPB_NetAddress_Private.GetFamily to return a PP_AddressFamily_Private value instead of uint1…

ppapi/shared_impl/private/net_address_private_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ppapi/shared_impl/private/net_address_private_impl.h"
 
 #include <string.h>
 
 #include <string>
 
@@ skipping 30 matching lines @@
 namespace {
 
 // This assert fails on OpenBSD for an unknown reason at the moment.
 #if !defined(OS_OPENBSD)
 // Make sure the storage in |PP_NetAddress_Private| is big enough. (Do it here
 // since the data is opaque elsewhere.)
 COMPILE_ASSERT(sizeof(reinterpret_cast<PP_NetAddress_Private*>(0)->data) >=
                sizeof(sockaddr_storage), PP_NetAddress_Private_data_too_small);
 #endif
 
-uint16_t GetFamily(const PP_NetAddress_Private* addr) {
-  return reinterpret_cast<const sockaddr*>(addr->data)->sa_family;
+PP_AddressFamily_Private GetFamily(const PP_NetAddress_Private* addr) {
+  switch (reinterpret_cast<const sockaddr*>(addr->data)->sa_family) {
+    case AF_INET:
+      return PP_ADDRESSFAMILY_IPV4;
+    case AF_INET6:
+      return PP_ADDRESSFAMILY_IPV6;
+    default:
+      return PP_ADDRESSFAMILY_UNSPECIFIED;
+  }
 }
 
 uint16_t GetPort(const PP_NetAddress_Private* addr) {
-  if (GetFamily(addr) == AF_INET)  {
+  if (GetFamily(addr) == PP_ADDRESSFAMILY_IPV4)  {

[viettrungluu, 2012/02/15 01:43:03]

Now that GetFamily() has a nontrivial cost, you should probably use a switch
statement here. (That, or have a GetFamilyInternal() returns an sa_family_t ...
which would be ever-so-slightly more efficient.)

[yzshen1, 2012/02/15 18:40:55]

Done. (I did both.)

On 2012/02/15 01:43:03, viettrungluu wrote:

     const sockaddr_in* a = reinterpret_cast<const sockaddr_in*>(addr->data);
     return ntohs(a->sin_port);
-  } else if (GetFamily(addr) == AF_INET6)  {
+  } else if (GetFamily(addr) == PP_ADDRESSFAMILY_IPV6)  {
     const sockaddr_in6* a = reinterpret_cast<const sockaddr_in6*>(addr->data);
     return ntohs(a->sin6_port);
   }
 
   return 0;
 }
 
 PP_Bool GetAddress(const PP_NetAddress_Private* addr,
                    void* address,
                    uint16_t address_size) {
-  if (GetFamily(addr) == AF_INET)  {
+  if (GetFamily(addr) == PP_ADDRESSFAMILY_IPV4)  {

[viettrungluu, 2012/02/15 01:43:03]

"

[yzshen1, 2012/02/15 18:40:55]

Done.

     const sockaddr_in* a = reinterpret_cast<const sockaddr_in*>(addr->data);
     if (address_size >= sizeof(a->sin_addr.s_addr))  {
       memcpy(address, &(a->sin_addr.s_addr), sizeof(a->sin_addr.s_addr));
       return PP_TRUE;
     }
-  } else if (GetFamily(addr) == AF_INET6)  {
+  } else if (GetFamily(addr) == PP_ADDRESSFAMILY_IPV6)  {
     const sockaddr_in6* a = reinterpret_cast<const sockaddr_in6*>(addr->data);
     if (address_size >= sizeof(a->sin6_addr.s6_addr)) {
       memcpy(address, &(a->sin6_addr.s6_addr), sizeof(a->sin6_addr.s6_addr));
       return PP_TRUE;
     }
   }
 
   return PP_FALSE;
 }
 
 PP_Bool AreHostsEqual(const PP_NetAddress_Private* addr1,
                       const PP_NetAddress_Private* addr2) {
   if (!NetAddressPrivateImpl::ValidateNetAddress(*addr1) ||
       !NetAddressPrivateImpl::ValidateNetAddress(*addr2))
     return PP_FALSE;
 
   if (GetFamily(addr1) != GetFamily(addr2))

[viettrungluu, 2012/02/15 01:43:03]

Similarly, save the family of addr1 and compare it to GetFamily(addr2). (And use
a switch below.)

[yzshen1, 2012/02/15 18:40:55]

Done.

     return PP_FALSE;
 
-  if (GetFamily(addr1) == AF_INET) {
+  if (GetFamily(addr1) == PP_ADDRESSFAMILY_IPV4) {
     const sockaddr_in* a1 = reinterpret_cast<const sockaddr_in*>(addr1->data);
     const sockaddr_in* a2 = reinterpret_cast<const sockaddr_in*>(addr2->data);
     return PP_FromBool(a1->sin_addr.s_addr == a2->sin_addr.s_addr);
   }
 
-  if (GetFamily(addr1) == AF_INET6) {
+  if (GetFamily(addr1) == PP_ADDRESSFAMILY_IPV6) {
     const sockaddr_in6* a1 = reinterpret_cast<const sockaddr_in6*>(addr1->data);
     const sockaddr_in6* a2 = reinterpret_cast<const sockaddr_in6*>(addr2->data);
     return PP_FromBool(a1->sin6_flowinfo == a2->sin6_flowinfo &&
                        memcmp(&a1->sin6_addr, &a2->sin6_addr,
                               sizeof(a1->sin6_addr)) == 0 &&
                        a1->sin6_scope_id == a2->sin6_scope_id);
   }
 
   return PP_FALSE;
 }
 
 PP_Bool AreEqual(const PP_NetAddress_Private* addr1,
                  const PP_NetAddress_Private* addr2) {
   // |AreHostsEqual()| will also validate the addresses and return false if
   // either is invalid.
   if (!AreHostsEqual(addr1, addr2))
     return PP_FALSE;
 
   // Note: Here, we know that |addr1| and |addr2| have the same family.
-  if (GetFamily(addr1) == AF_INET) {
+  if (GetFamily(addr1) == PP_ADDRESSFAMILY_IPV4) {
     const sockaddr_in* a1 = reinterpret_cast<const sockaddr_in*>(addr1->data);
     const sockaddr_in* a2 = reinterpret_cast<const sockaddr_in*>(addr2->data);
     return PP_FromBool(a1->sin_port == a2->sin_port);
   }
 
-  if (GetFamily(addr1) == AF_INET6) {
+  if (GetFamily(addr1) == PP_ADDRESSFAMILY_IPV6) {
     const sockaddr_in6* a1 = reinterpret_cast<const sockaddr_in6*>(addr1->data);
     const sockaddr_in6* a2 = reinterpret_cast<const sockaddr_in6*>(addr2->data);
     return PP_FromBool(a1->sin6_port == a2->sin6_port);
   }
 
   return PP_FALSE;
 }
 
 #if defined(OS_WIN) || defined(OS_MACOSX)
 std::string ConvertIPv4AddressToString(const sockaddr_in* a,
@@ skipping 91 matching lines @@
   if (!NetAddressPrivateImpl::ValidateNetAddress(*addr))
     return PP_MakeUndefined();
 
 #if defined(OS_WIN) || defined(OS_MACOSX)
   // On Windows, |NetAddressToString()| doesn't work in the sandbox. On Mac,
   // the output isn't consistent with RFC 5952, at least on Mac OS 10.6:
   // |getnameinfo()| collapses length-one runs of zeros (and also doesn't
   // display the scope).
   // TODO(viettrungluu): Consider switching to this on Linux.
   switch (GetFamily(addr)) {
-    case AF_INET: {
+    case PP_ADDRESSFAMILY_IPV4: {
       const sockaddr_in* a = reinterpret_cast<const sockaddr_in*>(addr->data);
       return StringVar::StringToPPVar(
           ConvertIPv4AddressToString(a, !!include_port));
     }
-    case AF_INET6: {
+    case PP_ADDRESSFAMILY_IPV6: {
       const sockaddr_in6* a = reinterpret_cast<const sockaddr_in6*>(addr->data);
       return StringVar::StringToPPVar(
           ConvertIPv6AddressToString(a, !!include_port));
     }
     default:
       NOTREACHED();
       break;
   }
   return PP_MakeUndefined();
 #else
   const sockaddr* a = reinterpret_cast<const sockaddr*>(addr->data);
   socklen_t l = addr->size;
   std::string description =
       include_port ? net::NetAddressToStringWithPort(a, l) :
                      net::NetAddressToString(a, l);
   return StringVar::StringToPPVar(description);
 #endif
 }
 
 PP_Bool ReplacePort(const struct PP_NetAddress_Private* src_addr,
                     uint16_t port,
                     struct PP_NetAddress_Private* dest_addr) {
   if (!NetAddressPrivateImpl::ValidateNetAddress(*src_addr))
     return PP_FALSE;
 
-  if (GetFamily(src_addr) == AF_INET) {
+  if (GetFamily(src_addr) == PP_ADDRESSFAMILY_IPV4) {

[viettrungluu, 2012/02/15 01:43:03]

"

[yzshen1, 2012/02/15 18:40:55]

Done.

     memmove(dest_addr, src_addr, sizeof(*src_addr));
     reinterpret_cast<sockaddr_in*>(dest_addr->data)->sin_port = htons(port);
     return PP_TRUE;
   }
 
-  if (GetFamily(src_addr) == AF_INET6) {
+  if (GetFamily(src_addr) == PP_ADDRESSFAMILY_IPV6) {
     memmove(dest_addr, src_addr, sizeof(*src_addr));
     reinterpret_cast<sockaddr_in6*>(dest_addr->data)->sin6_port = htons(port);
     return PP_TRUE;
   }
 
   return PP_FALSE;
 }
 
 void GetAnyAddress(PP_Bool is_ipv6, PP_NetAddress_Private* addr) {
   memset(addr->data, 0, arraysize(addr->data) * sizeof(addr->data[0]));
@@ skipping 48 matching lines @@
 // static
 const PP_NetAddress_Private NetAddressPrivateImpl::kInvalidNetAddress = { 0 };
 
 // static
 bool NetAddressPrivateImpl::ValidateNetAddress(
     const PP_NetAddress_Private& addr) {
   if (addr.size < sizeof(reinterpret_cast<sockaddr*>(0)->sa_family))
     return false;
 
   // TODO(viettrungluu): more careful validation?
-  // Just do a size check for AF_INET.
-  if (GetFamily(&addr) == AF_INET && addr.size >= sizeof(sockaddr_in))
+  // Just do a size check for IPv4.
+  if (GetFamily(&addr) == PP_ADDRESSFAMILY_IPV4 &&

[viettrungluu, 2012/02/15 01:43:03]

"

[yzshen1, 2012/02/15 18:40:55]

Done.

+      addr.size >= sizeof(sockaddr_in)) {
     return true;
+  }
 
-  // Ditto for AF_INET6.
-  if (GetFamily(&addr) == AF_INET6 && addr.size >= sizeof(sockaddr_in6))
+  // Ditto for IPv6.
+  if (GetFamily(&addr) == PP_ADDRESSFAMILY_IPV6 &&
+      addr.size >= sizeof(sockaddr_in6)) {
     return true;
+  }
 
   // Reject everything else.
   return false;
 }
 
 // static
 bool NetAddressPrivateImpl::SockaddrToNetAddress(
     const sockaddr* sa,
     uint32_t sa_length,
     PP_NetAddress_Private* net_addr) {
@@ skipping 51 matching lines @@
   net::IPEndPoint ip_end_point;
   if (!NetAddressToIPEndPoint(net_addr, &ip_end_point))
     return false;
 
   *address_list = net::AddressList::CreateFromIPAddress(ip_end_point.address(),
                                                         ip_end_point.port());
   return true;
 }
 
 }  // namespace ppapi