Refactor the P2PSocketDispatcher to be created on the RenderThread instead of the RenderView.

content/browser/renderer_host/p2p/socket_dispatcher_host.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/p2p/socket_dispatcher_host.h"
 
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "content/browser/renderer_host/p2p/socket_host.h"
 #include "content/public/browser/resource_context.h"
 #include "content/common/p2p_messages.h"
 #include "net/base/address_list.h"
 #include "net/base/completion_callback.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_log.h"
 #include "net/base/single_request_host_resolver.h"
 #include "net/base/sys_addrinfo.h"
 
 using content::BrowserMessageFilter;
 using content::BrowserThread;
 
 namespace content {
 
 class P2PSocketDispatcherHost::DnsRequest {
  public:
   typedef base::Callback<void(const net::IPAddressNumber&)> DoneCallback;
 
-  DnsRequest(int32 routing_id, int32 request_id,
+  DnsRequest(int32 request_id,
              net::HostResolver* host_resolver)
-      : routing_id_(routing_id),
-        request_id_(request_id),
+      : request_id_(request_id),
         resolver_(host_resolver) {
   }
 
   void Resolve(const std::string& host_name,
                const DoneCallback& done_callback) {
     DCHECK(!done_callback.is_null());
 
     host_name_ = host_name;
     done_callback_ = done_callback;
 
@@ skipping 11 matching lines @@
     net::HostResolver::RequestInfo info(net::HostPortPair(host_name_, 0));
     int result = resolver_.Resolve(
         info, &addresses_,
         base::Bind(&P2PSocketDispatcherHost::DnsRequest::OnDone,
                    base::Unretained(this)),
         net::BoundNetLog());
     if (result != net::ERR_IO_PENDING)
       OnDone(result);
   }
 
-  int32 routing_id() { return routing_id_; }
   int32 request_id() { return request_id_; }
 
  private:
   void OnDone(int result) {
     if (result != net::OK) {
       LOG(ERROR) << "Failed to resolve address for " << host_name_
                  << ", errorcode: " << result;
       done_callback_.Run(net::IPAddressNumber());
       return;
     }
 
     // TODO(szym): Redundant check. http://crbug.com/126211
     if (addresses_.empty()) {
       LOG(ERROR) << "Received 0 addresses when trying to resolve address for "
                  << host_name_;
       done_callback_.Run(net::IPAddressNumber());
       return;
     }
 
     done_callback_.Run(addresses_.front().address());
   }
 
-  int32 routing_id_;
   int32 request_id_;
   net::AddressList addresses_;
 
   std::string host_name_;
   net::SingleRequestHostResolver resolver_;
 
   DoneCallback done_callback_;
 };
 
 P2PSocketDispatcherHost::P2PSocketDispatcherHost(
@@ skipping 44 matching lines @@
 }
 
 P2PSocketDispatcherHost::~P2PSocketDispatcherHost() {
   DCHECK(sockets_.empty());
   DCHECK(dns_requests_.empty());
 
   if (monitoring_networks_)
     net::NetworkChangeNotifier::RemoveIPAddressObserver(this);
 }
 
-P2PSocketHost* P2PSocketDispatcherHost::LookupSocket(
-    int32 routing_id, int socket_id) {
-  SocketsMap::iterator it = sockets_.find(
-      ExtendedSocketId(routing_id, socket_id));
+P2PSocketHost* P2PSocketDispatcherHost::LookupSocket(int socket_id) {
+  SocketsMap::iterator it = sockets_.find(socket_id);
   if (it == sockets_.end())

[tommi (sloooow) - chröme, 2012/09/11 12:09:09]

change this to:

return (it == sockets_.end()) ? NULL : it->second;

[perkj_chrome, 2012/09/11 14:27:30]

Done.

     return NULL;
   else
     return it->second;
 }
 
 void P2PSocketDispatcherHost::OnStartNetworkNotifications(
     const IPC::Message& msg) {
   if (!monitoring_networks_) {
     net::NetworkChangeNotifier::AddIPAddressObserver(this);
     monitoring_networks_ = true;
   }
 
-  notifications_routing_ids_.insert(msg.routing_id());
-
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE, base::Bind(
           &P2PSocketDispatcherHost::DoGetNetworkList, this));
 }
 
 void P2PSocketDispatcherHost::OnStopNetworkNotifications(
     const IPC::Message& msg) {
-  notifications_routing_ids_.erase(msg.routing_id());
+  if (monitoring_networks_) {
+    net::NetworkChangeNotifier::RemoveIPAddressObserver(this);
+    monitoring_networks_ = false;
+  }
 }
 
-void P2PSocketDispatcherHost::OnGetHostAddress(const IPC::Message& msg,
-                                               const std::string& host_name,
+void P2PSocketDispatcherHost::OnGetHostAddress(const std::string& host_name,
                                                int32 request_id) {
-  DnsRequest* request = new DnsRequest(
-      msg.routing_id(), request_id, resource_context_->GetHostResolver());
+  DnsRequest* request = new DnsRequest(request_id,
+                                       resource_context_->GetHostResolver());
   dns_requests_.insert(request);
   request->Resolve(host_name, base::Bind(
       &P2PSocketDispatcherHost::OnAddressResolved,
       base::Unretained(this), request));
 }
 
 void P2PSocketDispatcherHost::OnCreateSocket(
-    const IPC::Message& msg, P2PSocketType type, int socket_id,
+    P2PSocketType type, int socket_id,
     const net::IPEndPoint& local_address,
     const net::IPEndPoint& remote_address) {
-  if (LookupSocket(msg.routing_id(), socket_id)) {
+  if (LookupSocket(socket_id)) {
     LOG(ERROR) << "Received P2PHostMsg_CreateSocket for socket "
         "that already exists.";
     return;
   }
 
   scoped_ptr<P2PSocketHost> socket(
-      P2PSocketHost::Create(this, msg.routing_id(), socket_id, type));
+      P2PSocketHost::Create(this, socket_id, type));
 
   if (!socket.get()) {
-    Send(new P2PMsg_OnError(msg.routing_id(), socket_id));
+    Send(new P2PMsg_OnError(socket_id));
     return;
   }
 
   if (socket->Init(local_address, remote_address)) {
-    sockets_.insert(std::pair<ExtendedSocketId, P2PSocketHost*>(
-        ExtendedSocketId(msg.routing_id(), socket_id), socket.release()));
+    sockets_.insert(SocketPair(socket_id, socket.release()));

[tommi (sloooow) - chröme, 2012/09/11 12:09:09]

without using SocketPair, this should just be:
sockets_[socket_id] = socket.release();

[perkj_chrome, 2012/09/11 14:27:30]

Done.

   }
 }
 
 void P2PSocketDispatcherHost::OnAcceptIncomingTcpConnection(
-    const IPC::Message& msg, int listen_socket_id,
-    const net::IPEndPoint& remote_address, int connected_socket_id) {
-  P2PSocketHost* socket = LookupSocket(msg.routing_id(), listen_socket_id);
+    int listen_socket_id, const net::IPEndPoint& remote_address,
+    int connected_socket_id) {
+  P2PSocketHost* socket = LookupSocket(listen_socket_id);
   if (!socket) {
     LOG(ERROR) << "Received P2PHostMsg_AcceptIncomingTcpConnection "
         "for invalid socket_id.";
     return;
   }
   P2PSocketHost* accepted_connection =
       socket->AcceptIncomingTcpConnection(remote_address, connected_socket_id);
   if (accepted_connection) {
-    sockets_.insert(std::pair<ExtendedSocketId, P2PSocketHost*>(
-        ExtendedSocketId(msg.routing_id(), connected_socket_id),
-        accepted_connection));
+    sockets_.insert(SocketPair(connected_socket_id, accepted_connection));

[tommi (sloooow) - chröme, 2012/09/11 12:09:09]

sockets_[connected_socket_id] = accepted_connection;

[perkj_chrome, 2012/09/11 14:27:30]

Done.

   }
 }
 
-void P2PSocketDispatcherHost::OnSend(const IPC::Message& msg, int socket_id,
+void P2PSocketDispatcherHost::OnSend(int socket_id,
                                      const net::IPEndPoint& socket_address,
                                      const std::vector<char>& data) {
-  P2PSocketHost* socket = LookupSocket(msg.routing_id(), socket_id);
+  P2PSocketHost* socket = LookupSocket(socket_id);
   if (!socket) {
     LOG(ERROR) << "Received P2PHostMsg_Send for invalid socket_id.";
     return;
   }
   socket->Send(socket_address, data);
 }
 
-void P2PSocketDispatcherHost::OnDestroySocket(const IPC::Message& msg,
-                                              int socket_id) {
-  SocketsMap::iterator it = sockets_.find(
-      ExtendedSocketId(msg.routing_id(), socket_id));
+void P2PSocketDispatcherHost::OnDestroySocket(int socket_id) {
+  SocketsMap::iterator it = sockets_.find(socket_id);
   if (it != sockets_.end()) {
     delete it->second;
     sockets_.erase(it);
   } else {
     LOG(ERROR) << "Received P2PHostMsg_DestroySocket for invalid socket_id.";
   }
 }
 
 void P2PSocketDispatcherHost::DoGetNetworkList() {
   net::NetworkInterfaceList list;
   net::GetNetworkList(&list);
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE, base::Bind(
           &P2PSocketDispatcherHost::SendNetworkList, this, list));
 }
 
 void P2PSocketDispatcherHost::SendNetworkList(
     const net::NetworkInterfaceList& list) {
-  for (std::set<int>::iterator it = notifications_routing_ids_.begin();
-       it != notifications_routing_ids_.end(); ++it) {
-    Send(new P2PMsg_NetworkListChanged(*it, list));
-  }
+  Send(new P2PMsg_NetworkListChanged(list));
 }
 
 void P2PSocketDispatcherHost::OnAddressResolved(
     DnsRequest* request,
     const net::IPAddressNumber& result) {
-  Send(new P2PMsg_GetHostAddressResult(
-      request->routing_id(), request->request_id(), result));
+  Send(new P2PMsg_GetHostAddressResult(request->request_id(), result));
 
   dns_requests_.erase(request);
   delete request;
 }
 
 }  // namespace content