[NaCl SDK] nacl_io: Fix bug in getaddrinfo() where service is "0"

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 89 matching lines @@
   ASSERT_NE(NULL_ADDR, ai->ai_addr);
   ASSERT_EQ(AF_INET, ai->ai_family);
   ASSERT_EQ(SOCK_STREAM, ai->ai_socktype);
   in = (struct sockaddr_in*)ai->ai_addr;
   ASSERT_EQ(expected_addr, in->sin_addr.s_addr);
   ASSERT_EQ(NULL_INFO, ai->ai_next);
 
   ki_freeaddrinfo(ai);
 }
 
+TEST_F(HostResolverTest, Getaddrinfo_Service) {
+  struct addrinfo* ai = NULL;
+  struct sockaddr_in* in;
+  struct addrinfo hints;
+
+  // Numberic only

[binji, 2014/06/19 20:00:32]

Numeric

+  memset(&hints, 0, sizeof(hints));
+  hints.ai_family = AF_INET;
+  hints.ai_socktype = SOCK_STREAM;
+
+  ASSERT_EQ(0, ki_getaddrinfo("1.2.3.4", "0", &hints, &ai));
+  ASSERT_NE(NULL_INFO, ai);
+  ASSERT_NE(NULL_ADDR, ai->ai_addr);
+  in = (struct sockaddr_in*)ai->ai_addr;
+  ASSERT_EQ(htons(0), in->sin_port);

[binji, 2014/06/19 20:00:32]

only testing the port? If so, maybe change the test name.

[Sam Clegg, 2014/06/19 22:37:48]

Done.. although the "Service" is really the port (IIUC).

[binji, 2014/06/19 22:52:29]

Sorry, I was confused. I've never heard a port called a service before, and I
didn't see any reference to service anywhere else.

+  ASSERT_EQ(NULL_INFO, ai->ai_next);
+
+  ASSERT_EQ(0, ki_getaddrinfo("1.2.3.4", "65000", &hints, &ai));
+  ASSERT_NE(NULL_INFO, ai);
+  ASSERT_NE(NULL_ADDR, ai->ai_addr);
+  in = (struct sockaddr_in*)ai->ai_addr;
+  ASSERT_EQ(htons(65000), in->sin_port);
+  ASSERT_EQ(NULL_INFO, ai->ai_next);
+
+  ki_freeaddrinfo(ai);
+}
+
 TEST_F(HostResolverTest, Getaddrinfo_MissingPPAPI) {
   // Verify that full lookups fail due to lack of PPAPI interfaces
   struct addrinfo* ai = NULL;
   ASSERT_EQ(EAI_SYSTEM, ki_getaddrinfo("google.com", NULL, NULL, &ai));
 }
 
 TEST_F(HostResolverTest, Getaddrinfo_Passive) {
   struct addrinfo* ai = NULL;
   struct sockaddr_in* in;
   struct sockaddr_in6* in6;
@@ skipping 246 matching lines @@
 
 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__)