diff options
| author | agayev@chromium.org <agayev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-01 16:18:35 +0000 |
|---|---|---|
| committer | agayev@chromium.org <agayev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-01 16:18:35 +0000 |
| commit | 258ffc5314093be40b510db22239e0ace4bbb006 (patch) | |
| tree | 49f858a9b63d7d168f7aa1247ff85636e4fa2867 /net/base | |
| parent | 773f5d5e099ed205d3c78a35b049b10cdb75e254 (diff) | |
| download | chromium_src-258ffc5314093be40b510db22239e0ace4bbb006.zip chromium_src-258ffc5314093be40b510db22239e0ace4bbb006.tar.gz chromium_src-258ffc5314093be40b510db22239e0ace4bbb006.tar.bz2 | |
fix unit test bug
BUG=None assigned
TEST=net_unittest --gtest_filter="*AddressList*"
Review URL: http://codereview.chromium.org/7062035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87483 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base')
| -rw-r--r-- | net/base/address_list.cc | 6 | ||||
| -rw-r--r-- | net/base/address_list_unittest.cc | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/net/base/address_list.cc b/net/base/address_list.cc index 5763a9a..279ed79 100644 --- a/net/base/address_list.cc +++ b/net/base/address_list.cc @@ -38,6 +38,9 @@ struct addrinfo* CreateAddrInfo(const IPAddressNumber& address, new char[sockaddr_in_size]); memset(addr, 0, sockaddr_in_size); addr->sin_family = AF_INET; +#if defined(OS_MACOSX) + addr->sin_len = sockaddr_in_size; +#endif memcpy(&addr->sin_addr, &address[0], kIPv4AddressSize); ai->ai_addr = reinterpret_cast<struct sockaddr*>(addr); break; @@ -51,6 +54,9 @@ struct addrinfo* CreateAddrInfo(const IPAddressNumber& address, new char[sockaddr_in6_size]); memset(addr6, 0, sockaddr_in6_size); addr6->sin6_family = AF_INET6; +#if defined(OS_MACOSX) + addr6->sin6_len = sockaddr_in6_size; +#endif memcpy(&addr6->sin6_addr, &address[0], kIPv6AddressSize); ai->ai_addr = reinterpret_cast<struct sockaddr*>(addr6); break; diff --git a/net/base/address_list_unittest.cc b/net/base/address_list_unittest.cc index 202a8b7..7f9e330 100644 --- a/net/base/address_list_unittest.cc +++ b/net/base/address_list_unittest.cc @@ -267,8 +267,8 @@ TEST(AddressListTest, AddressFromAddrInfo) { EXPECT_EQ(good_ai->ai_family, test_ai->ai_family); EXPECT_EQ(good_ai->ai_addrlen, test_ai->ai_addrlen); size_t sockaddr_size = - good_ai->ai_socktype == AF_INET ? sizeof(struct sockaddr_in) : - good_ai->ai_socktype == AF_INET6 ? sizeof(struct sockaddr_in6) : 0; + good_ai->ai_family == AF_INET ? sizeof(struct sockaddr_in) : + good_ai->ai_family == AF_INET6 ? sizeof(struct sockaddr_in6) : 0; EXPECT_EQ(memcmp(good_ai->ai_addr, test_ai->ai_addr, sockaddr_size), 0); EXPECT_EQ(good_ai->ai_next, test_ai->ai_next); } @@ -311,8 +311,8 @@ TEST(AddressListTest, CreateFromIPAddressList) { EXPECT_EQ(good_ai->ai_family, next_ai->ai_family); EXPECT_EQ(good_ai->ai_addrlen, next_ai->ai_addrlen); size_t sockaddr_size = - good_ai->ai_socktype == AF_INET ? sizeof(struct sockaddr_in) : - good_ai->ai_socktype == AF_INET6 ? sizeof(struct sockaddr_in6) : 0; + good_ai->ai_family == AF_INET ? sizeof(struct sockaddr_in) : + good_ai->ai_family == AF_INET6 ? sizeof(struct sockaddr_in6) : 0; EXPECT_EQ(memcmp(good_ai->ai_addr, next_ai->ai_addr, sockaddr_size), 0); } next_ai = next_ai->ai_next; |