Migrate remoting to net::IPAddress.

remoting/host/daemon_process.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 "remoting/host/daemon_process.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 322 matching lines @@
   DCHECK(caller_task_runner()->BelongsToCurrentThread());
 
   // Validate |route|.
   if (route.type != protocol::TransportRoute::DIRECT &&
       route.type != protocol::TransportRoute::STUN &&
       route.type != protocol::TransportRoute::RELAY) {
     LOG(ERROR) << "An invalid RouteType " << route.type << " passed.";
     CrashNetworkProcess(FROM_HERE);
     return;
   }
-  if (route.remote_address.size() != net::kIPv4AddressSize &&
-      route.remote_address.size() != net::kIPv6AddressSize) {
-    LOG(ERROR) << "An invalid net::IPAddressNumber size "
-               << route.remote_address.size() << " passed.";
+  net::IPAddress remote_address(route.remote_address);
+  if (!remote_address.IsValid()) {
+    LOG(ERROR) << "An invalid IPAddress size " << remote_address.size()
+               << " passed.";
     CrashNetworkProcess(FROM_HERE);
     return;
   }
-  if (route.local_address.size() != net::kIPv4AddressSize &&
-      route.local_address.size() != net::kIPv6AddressSize) {
-    LOG(ERROR) << "An invalid net::IPAddressNumber size "
-               << route.local_address.size() << " passed.";
+  net::IPAddress local_address(route.local_address);
+  if (!local_address.IsValid()) {
+    LOG(ERROR) << "An invalid IPAddress size " << local_address.size()
+               << " passed.";
     CrashNetworkProcess(FROM_HERE);
     return;
   }
 
   protocol::TransportRoute parsed_route;
   parsed_route.type =
       static_cast<protocol::TransportRoute::RouteType>(route.type);

[dcheng, 2016/04/04 19:13:53]

Unrelated, but IPC_STRUCT_MEMBER for type should probably just be the enum type.

[martijnc, 2016/04/05 17:02:35]

Done.

   parsed_route.remote_address =
-      net::IPEndPoint(route.remote_address, route.remote_port);
-  parsed_route.local_address =
-      net::IPEndPoint(route.local_address, route.local_port);
+      net::IPEndPoint(remote_address, route.remote_port);
+  parsed_route.local_address = net::IPEndPoint(local_address, route.local_port);
   FOR_EACH_OBSERVER(HostStatusObserver, status_observers_,
                     OnClientRouteChange(jid, channel_name, parsed_route));
 }
 
 void DaemonProcess::OnHostStarted(const std::string& xmpp_login) {
   DCHECK(caller_task_runner()->BelongsToCurrentThread());
 
   FOR_EACH_OBSERVER(HostStatusObserver, status_observers_, OnStart(xmpp_login));
 }
 
 void DaemonProcess::OnHostShutdown() {
   DCHECK(caller_task_runner()->BelongsToCurrentThread());
 
   FOR_EACH_OBSERVER(HostStatusObserver, status_observers_, OnShutdown());
 }
 
 void DaemonProcess::DeleteAllDesktopSessions() {
   while (!desktop_sessions_.empty()) {
     delete desktop_sessions_.front();
     desktop_sessions_.pop_front();
   }
 }
 
 }  // namespace remoting