summaryrefslogtreecommitdiffstats
path: root/net/udp
diff options
context:
space:
mode:
authorszym@chromium.org <szym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-13 01:46:44 +0000
committerszym@chromium.org <szym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-13 01:46:44 +0000
commite466aaf8879c1b585999cc8625d06a772ab4ced1 (patch)
tree6e63b713017efd4bb0e337a7788a4367d0b3bc4c /net/udp
parent8960f40c5568df1263fdb9b05a53f3650238d422 (diff)
downloadchromium_src-e466aaf8879c1b585999cc8625d06a772ab4ced1.zip
chromium_src-e466aaf8879c1b585999cc8625d06a772ab4ced1.tar.gz
chromium_src-e466aaf8879c1b585999cc8625d06a772ab4ced1.tar.bz2
[net] Make IPEndPoint::GetFamily() return AddressFamily and add GetSockAddrFamily() to be used when creating sockets.
BUG=126002 TEST=browse anywhere Review URL: https://chromiumcodereview.appspot.com/11528012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172768 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/udp')
-rw-r--r--net/udp/udp_socket_libevent.cc2
-rw-r--r--net/udp/udp_socket_win.cc4
2 files changed, 3 insertions, 3 deletions
diff --git a/net/udp/udp_socket_libevent.cc b/net/udp/udp_socket_libevent.cc
index d02d6f1..f67c145 100644
--- a/net/udp/udp_socket_libevent.cc
+++ b/net/udp/udp_socket_libevent.cc
@@ -361,7 +361,7 @@ void UDPSocketLibevent::LogRead(int result,
}
int UDPSocketLibevent::CreateSocket(const IPEndPoint& address) {
- socket_ = socket(address.GetFamily(), SOCK_DGRAM, 0);
+ socket_ = socket(address.GetSockAddrFamily(), SOCK_DGRAM, 0);
if (socket_ == kInvalidSocket)
return MapSystemError(errno);
if (SetNonBlocking(socket_)) {
diff --git a/net/udp/udp_socket_win.cc b/net/udp/udp_socket_win.cc
index 0be64513..662ca4c 100644
--- a/net/udp/udp_socket_win.cc
+++ b/net/udp/udp_socket_win.cc
@@ -349,8 +349,8 @@ int UDPSocketWin::Bind(const IPEndPoint& address) {
}
int UDPSocketWin::CreateSocket(const IPEndPoint& address) {
- socket_ = WSASocket(address.GetFamily(), SOCK_DGRAM, IPPROTO_UDP, NULL, 0,
- WSA_FLAG_OVERLAPPED);
+ socket_ = WSASocket(address.GetSockAddrFamily(), SOCK_DGRAM, IPPROTO_UDP,
+ NULL, 0, WSA_FLAG_OVERLAPPED);
if (socket_ == INVALID_SOCKET)
return MapSystemError(WSAGetLastError());
core_ = new Core(this);