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

Unified Diff: remoting/signaling/xmpp_signal_strategy.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/host/remoting_me2me_host.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/signaling/xmpp_signal_strategy.cc
diff --git a/remoting/signaling/xmpp_signal_strategy.cc b/remoting/signaling/xmpp_signal_strategy.cc
index 92c0db5b3b33874b11287f07a1a9c7b51d19ad6b..b4612667447e97e762f2e1c0a82cf0e23ad3dbb7 100644
--- a/remoting/signaling/xmpp_signal_strategy.cc
+++ b/remoting/signaling/xmpp_signal_strategy.cc
@@ -140,26 +140,6 @@ XmppSignalStrategy::Core::Core(
// Non-secure connections are allowed only for debugging.
CHECK(xmpp_server_config_.use_tls);
#endif
-
- // TODO(sergeyu): Support for direct connections without TLS is not
- // implemented yet.
- if (!xmpp_server_config_.use_tls)
- NOTIMPLEMENTED();
-
- // Port 5222 may be blocked by firewall. talk.google.com allows connections on
- // port 443 which can be used instead of 5222. The webapp still requests to
- // use port 5222 for backwards compatibility with older versions of the host
- // that do not pass correct |use_fake_ssl_client_socket| value to
- // XmppClientSocketFactory (and so cannot connect to port 443). In case we are
- // connecting to talk.google.com try to use port 443 anyway.
- //
- // TODO(sergeyu): Once all hosts support connections on port 443
- // the webapp needs to be updated to request port 443 and these 2 lines can be
- // removed. crbug.com/443384
- if (xmpp_server_config_.host == "talk.google.com" &&
- xmpp_server_config_.port == kDefaultXmppPort) {
- xmpp_server_config_.port = kDefaultHttpsPort;
- }
}
XmppSignalStrategy::Core::~Core() {
« no previous file with comments | « remoting/host/remoting_me2me_host.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698