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

Unified Diff: remoting/protocol/libjingle_transport_factory.cc

Issue 209323002: New policies: enable/disable relay; port range (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed android build. Created 6 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/jingle_glue/network_settings_unittest.cc ('k') | remoting/remoting_srcs.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/libjingle_transport_factory.cc
diff --git a/remoting/protocol/libjingle_transport_factory.cc b/remoting/protocol/libjingle_transport_factory.cc
index b37cbb40da551c22fe13364825a03df30c837f00..332665ddf0cf41394421e82e885ceb1ca2e88288 100644
--- a/remoting/protocol/libjingle_transport_factory.cc
+++ b/remoting/protocol/libjingle_transport_factory.cc
@@ -205,10 +205,8 @@ void LibjingleStreamTransport::DoStart() {
this, &LibjingleStreamTransport::OnRouteChange);
channel_->SignalWritableState.connect(
this, &LibjingleStreamTransport::OnWritableState);
- if (network_settings_.nat_traversal_mode ==
- NetworkSettings::NAT_TRAVERSAL_DISABLED) {
- channel_->set_incoming_only(true);
- }
+ channel_->set_incoming_only(
+ !(network_settings_.flags & NetworkSettings::NAT_TRAVERSAL_OUTGOING));
channel_->Connect();
@@ -452,8 +450,9 @@ LibjingleTransportFactory::CreateDatagramTransport() {
}
void LibjingleTransportFactory::EnsureFreshJingleInfo() {
- if (network_settings_.nat_traversal_mode !=
- NetworkSettings::NAT_TRAVERSAL_ENABLED ||
+ uint32 stun_or_relay_flags = NetworkSettings::NAT_TRAVERSAL_STUN |
+ NetworkSettings::NAT_TRAVERSAL_RELAY;
+ if (!(network_settings_.flags & stun_or_relay_flags) ||
jingle_info_request_) {
return;
}
« no previous file with comments | « remoting/jingle_glue/network_settings_unittest.cc ('k') | remoting/remoting_srcs.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698