Handle h_addr in a more libc independent way.

native_client_sdk/src/tests/nacl_io_test/host_resolver_test.cc

 // Copyright 2014 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 <arpa/inet.h>
 #include <netinet/in.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 
 #include "fake_ppapi/fake_pepper_interface.h"
@@ skipping 305 matching lines @@
   ASSERT_NE(NULL_HOST, host);
   ASSERT_EQ(AF_INET, host->h_addrtype);
   ASSERT_EQ(sizeof(in_addr_t), host->h_length);
   ASSERT_STREQ(FAKE_HOSTNAME, host->h_name);
 
   in_addr_t** addr_list = reinterpret_cast<in_addr_t**>(host->h_addr_list);
   ASSERT_NE(reinterpret_cast<in_addr_t**>(NULL), addr_list);
   ASSERT_EQ(NULL, addr_list[1]);
   in_addr_t exptected_addr = htonl(FAKE_IP);
   ASSERT_EQ(exptected_addr, *addr_list[0]);
+  // Check that h_addr also matches as in some libc's it may be a separate
+  // member.
+  in_addr_t* first_addr = reinterpret_cast<in_addr_t*>(host->h_addr);
+  ASSERT_EQ(exptected_addr, *first_addr);

[binji, 2014/05/07 22:35:04]

rename this to expected_addr

[bradn, 2014/05/07 22:39:06]

Done.

 }
 
 TEST_F(FakeHostResolverTest, Gethostbyname_Failure) {
   hostent* host = ki_gethostbyname("nosuchhost.com");
   ASSERT_EQ(NULL_HOST, host);
   ASSERT_EQ(HOST_NOT_FOUND, h_errno);
 }
 
 // Looking up purely numeric hostnames should work without PPAPI
 // so we don't need the fakes for this test
 TEST_F(HostResolverTest, Gethostbyname_Numeric) {
   struct hostent* host = ki_gethostbyname("8.8.8.8");
 
   // Verify the returned hostent structure
   ASSERT_NE(NULL_HOST, host);
   ASSERT_EQ(AF_INET, host->h_addrtype);
   ASSERT_EQ(sizeof(in_addr_t), host->h_length);
   ASSERT_STREQ("8.8.8.8", host->h_name);
 
   in_addr_t** addr_list = reinterpret_cast<in_addr_t**>(host->h_addr_list);
   ASSERT_NE(reinterpret_cast<in_addr_t**>(NULL), addr_list);
   ASSERT_EQ(NULL, addr_list[1]);
   ASSERT_EQ(inet_addr("8.8.8.8"), *addr_list[0]);
+  // Check that h_addr also matches as in some libc's it may be a separate
+  // member.
+  in_addr_t* first_addr = reinterpret_cast<in_addr_t*>(host->h_addr);
+  ASSERT_EQ(inet_addr("8.8.8.8"), *first_addr);
 }
 
 // These utility functions are only used for newlib (glibc provides its own
 // implementations of these functions).
 #if !defined(__GLIBC__)
 
 TEST(SocketUtilityFunctions, Hstrerror) {
   EXPECT_STREQ("Unknown error in gethostbyname: 2718.", hstrerror(2718));
 }
 
 TEST(SocketUtilityFunctions, Gai_Strerror) {
   EXPECT_STREQ("Unknown error in getaddrinfo: 2719.", gai_strerror(2719));
 }
 
 #endif  // !defined(__GLIBC__)