| Index: content/browser/renderer_host/pepper/pepper_tcp_server_socket.cc
|
| ===================================================================
|
| --- content/browser/renderer_host/pepper/pepper_tcp_server_socket.cc (revision 156377)
|
| +++ content/browser/renderer_host/pepper/pepper_tcp_server_socket.cc (working copy)
|
| @@ -42,9 +42,10 @@
|
| int32 backlog) {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
|
|
|
| - net::IPEndPoint ip_end_point;
|
| + net::IPAddressNumber address;
|
| + int port;
|
| if (state_ != BEFORE_LISTENING ||
|
| - !NetAddressPrivateImpl::NetAddressToIPEndPoint(addr, &ip_end_point)) {
|
| + !NetAddressPrivateImpl::NetAddressToIPEndPoint(addr, &address, &port)) {
|
| CancelListenRequest();
|
| return;
|
| }
|
| @@ -52,7 +53,7 @@
|
| state_ = LISTEN_IN_PROGRESS;
|
|
|
| socket_.reset(new net::TCPServerSocket(NULL, net::NetLog::Source()));
|
| - int result = socket_->Listen(ip_end_point, backlog);
|
| + int result = socket_->Listen(net::IPEndPoint(address, port), backlog);
|
| if (result != net::ERR_IO_PENDING)
|
| OnListenCompleted(result);
|
| }
|
| @@ -134,11 +135,15 @@
|
| NetAddressPrivateImpl::kInvalidNetAddress;
|
|
|
| if (socket->GetLocalAddress(&ip_end_point_local) != net::OK ||
|
| - !NetAddressPrivateImpl::IPEndPointToNetAddress(ip_end_point_local,
|
| - &local_addr) ||
|
| + !NetAddressPrivateImpl::IPEndPointToNetAddress(
|
| + ip_end_point_local.address(),
|
| + ip_end_point_local.port(),
|
| + &local_addr) ||
|
| socket->GetPeerAddress(&ip_end_point_remote) != net::OK ||
|
| - !NetAddressPrivateImpl::IPEndPointToNetAddress(ip_end_point_remote,
|
| - &remote_addr)) {
|
| + !NetAddressPrivateImpl::IPEndPointToNetAddress(
|
| + ip_end_point_remote.address(),
|
| + ip_end_point_remote.port(),
|
| + &remote_addr)) {
|
| SendAcceptACKError();
|
| } else {
|
| uint32 accepted_socket_id =
|
|
|