Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1305)

Unified Diff: remoting/host/daemon_process.cc

Issue 1853643007: Migrate remoting to net::IPAddress. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: remoting/host/daemon_process.cc
diff --git a/remoting/host/daemon_process.cc b/remoting/host/daemon_process.cc
index b874426eaa999a9ae60cb35f736c71b2c51d3721..aa2def2fa611b7a751b465cd9efd168f5eb7c998 100644
--- a/remoting/host/daemon_process.cc
+++ b/remoting/host/daemon_process.cc
@@ -340,17 +340,17 @@ void DaemonProcess::OnClientRouteChange(const std::string& jid,
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;
}
@@ -359,9 +359,8 @@ void DaemonProcess::OnClientRouteChange(const std::string& jid,
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 p
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));
}

Powered by Google App Engine
This is Rietveld 408576698