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

Unified Diff: remoting/host/remoting_me2me_host.cc

Issue 1015853002: Use port 5222 for XMPP connection from Me2Me host (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « remoting/base/service_urls.cc ('k') | remoting/signaling/xmpp_signal_strategy.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/remoting_me2me_host.cc
diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc
index c426a655f96e0dc14c54b739ae08da1e1f36fca4..96fe46e40165ff34fb2a592013ed555494c8eaff 100644
--- a/remoting/host/remoting_me2me_host.cc
+++ b/remoting/host/remoting_me2me_host.cc
@@ -494,12 +494,12 @@ bool HostProcess::InitWithCommandLine(const base::CommandLine* cmd_line) {
net::URLFetcher::SetIgnoreCertificateRequests(true);
ServiceUrls* service_urls = ServiceUrls::GetInstance();
- bool xmpp_server_valid = net::ParseHostAndPort(
- service_urls->xmpp_server_address(),
- &xmpp_server_config_.host, &xmpp_server_config_.port);
- if (!xmpp_server_valid) {
- LOG(ERROR) << "Invalid XMPP server: " <<
- service_urls->xmpp_server_address();
+
+ const std::string& xmpp_server =
+ service_urls->xmpp_server_address_for_me2me_host();
+ if (!net::ParseHostAndPort(xmpp_server, &xmpp_server_config_.host,
+ &xmpp_server_config_.port)) {
+ LOG(ERROR) << "Invalid XMPP server: " << xmpp_server;
return false;
}
xmpp_server_config_.use_tls = service_urls->xmpp_server_use_tls();
« no previous file with comments | « remoting/base/service_urls.cc ('k') | remoting/signaling/xmpp_signal_strategy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698