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

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: comments wez Created 4 years, 8 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
« no previous file with comments | « remoting/host/chromoting_param_traits.cc ('k') | remoting/host/ipc_host_event_logger.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/daemon_process.cc
diff --git a/remoting/host/daemon_process.cc b/remoting/host/daemon_process.cc
index b874426eaa999a9ae60cb35f736c71b2c51d3721..020166a2dc24a04c52d187ecd2d8df99a96bad94 100644
--- a/remoting/host/daemon_process.cc
+++ b/remoting/host/daemon_process.cc
@@ -332,36 +332,10 @@ void DaemonProcess::OnClientRouteChange(const std::string& jid,
const SerializedTransportRoute& route) {
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.";
- 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.";
- CrashNetworkProcess(FROM_HERE);
- return;
- }
-
protocol::TransportRoute parsed_route;
- parsed_route.type =
- static_cast<protocol::TransportRoute::RouteType>(route.type);
- parsed_route.remote_address =
- net::IPEndPoint(route.remote_address, route.remote_port);
- parsed_route.local_address =
- net::IPEndPoint(route.local_address, route.local_port);
+ parsed_route.type = route.type;
+ parsed_route.remote_address = route.remote_address;
+ parsed_route.local_address = route.local_address;
FOR_EACH_OBSERVER(HostStatusObserver, status_observers_,
OnClientRouteChange(jid, channel_name, parsed_route));
}
« no previous file with comments | « remoting/host/chromoting_param_traits.cc ('k') | remoting/host/ipc_host_event_logger.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698