summaryrefslogtreecommitdiffstats
path: root/remoting/jingle_glue
diff options
context:
space:
mode:
Diffstat (limited to 'remoting/jingle_glue')
-rw-r--r--remoting/jingle_glue/ssl_socket_adapter.cc6
-rw-r--r--remoting/jingle_glue/ssl_socket_adapter.h2
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;