diff options
| author | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-19 21:16:28 +0000 |
|---|---|---|
| committer | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-19 21:16:28 +0000 |
| commit | c3778612df854a3cf1cadffe0c4a0b1518afa274 (patch) | |
| tree | 0145b8eca2bcc19c5af48a0cdfddae4c48a49161 /net/socket | |
| parent | db0cb7abdc635e40273f0ad31e1126c98223ff2b (diff) | |
| download | chromium_src-c3778612df854a3cf1cadffe0c4a0b1518afa274.zip chromium_src-c3778612df854a3cf1cadffe0c4a0b1518afa274.tar.gz chromium_src-c3778612df854a3cf1cadffe0c4a0b1518afa274.tar.bz2 | |
Enabled the GetPeerName on all platforms, not just Linux.
BUG=32595
TEST=using a SOCKS5 proxy and a debug build, you don't blow out in a NOTREACHED() any more
Review URL: http://codereview.chromium.org/551069
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36548 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket')
| -rw-r--r-- | net/socket/socks5_client_socket.cc | 2 | ||||
| -rw-r--r-- | net/socket/socks5_client_socket.h | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/net/socket/socks5_client_socket.cc b/net/socket/socks5_client_socket.cc index d546231..a4ba814 100644 --- a/net/socket/socks5_client_socket.cc +++ b/net/socket/socks5_client_socket.cc @@ -443,11 +443,9 @@ int SOCKS5ClientSocket::DoHandshakeReadComplete(int result) { return OK; } -#if defined(OS_LINUX) int SOCKS5ClientSocket::GetPeerName(struct sockaddr* name, socklen_t* namelen) { return transport_->GetPeerName(name, namelen); } -#endif } // namespace net diff --git a/net/socket/socks5_client_socket.h b/net/socket/socks5_client_socket.h index f8de9a6..dec1cc4 100644 --- a/net/socket/socks5_client_socket.h +++ b/net/socket/socks5_client_socket.h @@ -56,9 +56,7 @@ class SOCKS5ClientSocket : public ClientSocket { virtual bool SetReceiveBufferSize(int32 size); virtual bool SetSendBufferSize(int32 size); -#if defined(OS_LINUX) virtual int GetPeerName(struct sockaddr* name, socklen_t* namelen); -#endif private: enum State { |