diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-27 18:29:28 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-27 18:29:28 +0000 |
| commit | 3a91c5b51bc1890ecf3a558dbd51e3da68c418ca (patch) | |
| tree | 415cb2b0a2c2fccf332ccc6076a0d81806a0c678 /net | |
| parent | 9f63d0d5410bfac775371c29715093ec63f4b1d6 (diff) | |
| download | chromium_src-3a91c5b51bc1890ecf3a558dbd51e3da68c418ca.zip chromium_src-3a91c5b51bc1890ecf3a558dbd51e3da68c418ca.tar.gz chromium_src-3a91c5b51bc1890ecf3a558dbd51e3da68c418ca.tar.bz2 | |
Test SIN6_LEN instead of OS_MACOSX to determine if sockaddr_in*
structures have a sin*_len member.
The SIN6_LEN macro is required by RFC 3493 Section 3.4. Since
Chrome requires the IPv6 socket API, it is fine to use SIN6_LEN
for the IPv6 sockaddr_in structure also.
R=agayev@chromium.org,cbentzel@chromium.org,eroman@chromium.org
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7461105
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94324 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/base/address_list.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/base/address_list.cc b/net/base/address_list.cc index 85bd012..5442687 100644 --- a/net/base/address_list.cc +++ b/net/base/address_list.cc @@ -38,7 +38,7 @@ 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) +#if defined(SIN6_LEN) addr->sin_len = sockaddr_in_size; #endif memcpy(&addr->sin_addr, &address[0], kIPv4AddressSize); @@ -54,7 +54,7 @@ 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) +#if defined(SIN6_LEN) addr6->sin6_len = sockaddr_in6_size; #endif memcpy(&addr6->sin6_addr, &address[0], kIPv6AddressSize); |