diff options
| author | zhaoqin@chromium.org <zhaoqin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-08 00:11:42 +0000 |
|---|---|---|
| committer | zhaoqin@chromium.org <zhaoqin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-08 00:11:42 +0000 |
| commit | a352869a59d48c3bd3a4a453d73c3392255275ef (patch) | |
| tree | 1375d4e5900d6df89efd8780d82c5874245bef2a /remoting/jingle_glue | |
| parent | dc67e1c39fc3d2373391db49465cc1011c23011d (diff) | |
| download | chromium_src-a352869a59d48c3bd3a4a453d73c3392255275ef.zip chromium_src-a352869a59d48c3bd3a4a453d73c3392255275ef.tar.gz chromium_src-a352869a59d48c3bd3a4a453d73c3392255275ef.tar.bz2 | |
fixed issue 128383 - replace GetPeerAddress(AddressList* address) with GetPeerAddress(IPEndPoint* address)
R=szym@chromium.org
BUG=128383
TEST=try bot
Review URL: https://chromiumcodereview.appspot.com/10491007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141125 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/jingle_glue')
| -rw-r--r-- | remoting/jingle_glue/ssl_socket_adapter.cc | 6 | ||||
| -rw-r--r-- | remoting/jingle_glue/ssl_socket_adapter.h | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/remoting/jingle_glue/ssl_socket_adapter.cc b/remoting/jingle_glue/ssl_socket_adapter.cc index b6b530d..9e5ef86 100644 --- a/remoting/jingle_glue/ssl_socket_adapter.cc +++ b/remoting/jingle_glue/ssl_socket_adapter.cc @@ -217,11 +217,9 @@ bool TransportSocket::IsConnectedAndIdle() const { return false; } -int TransportSocket::GetPeerAddress(net::AddressList* address) const { +int TransportSocket::GetPeerAddress(net::IPEndPoint* address) const { talk_base::SocketAddress socket_address = socket_->GetRemoteAddress(); - net::IPEndPoint endpoint; - if (jingle_glue::SocketAddressToIPEndPoint(socket_address, &endpoint)) { - *address = net::AddressList(endpoint); + if (jingle_glue::SocketAddressToIPEndPoint(socket_address, address)) { return net::OK; } else { return net::ERR_FAILED; diff --git a/remoting/jingle_glue/ssl_socket_adapter.h b/remoting/jingle_glue/ssl_socket_adapter.h index 24b0e05..dee1d18 100644 --- a/remoting/jingle_glue/ssl_socket_adapter.h +++ b/remoting/jingle_glue/ssl_socket_adapter.h @@ -44,7 +44,7 @@ class TransportSocket : public net::StreamSocket, public sigslot::has_slots<> { virtual void Disconnect() OVERRIDE; virtual bool IsConnected() const OVERRIDE; virtual bool IsConnectedAndIdle() const OVERRIDE; - virtual int GetPeerAddress(net::AddressList* address) const OVERRIDE; + virtual int GetPeerAddress(net::IPEndPoint* address) const OVERRIDE; virtual int GetLocalAddress(net::IPEndPoint* address) const OVERRIDE; virtual const net::BoundNetLog& NetLog() const OVERRIDE; virtual void SetSubresourceSpeculation() OVERRIDE; |