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

Unified Diff: remoting/protocol/jingle_session_manager.cc

Issue 9549029: Set incoming_only flag on the host side when NAT traversal is disabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 10 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/protocol/jingle_session_manager.cc
diff --git a/remoting/protocol/jingle_session_manager.cc b/remoting/protocol/jingle_session_manager.cc
index 173595484deac5e8510680a549f892e816a7a63f..8f50b72e8aa7096bd280dac81602c9c87646b92a 100644
--- a/remoting/protocol/jingle_session_manager.cc
+++ b/remoting/protocol/jingle_session_manager.cc
@@ -40,7 +40,10 @@ void JingleSessionManager::Init(
signal_strategy_ = signal_strategy;
iq_sender_.reset(new IqSender(signal_strategy_));
- transport_config_.nat_traversal = network_settings.allow_nat_traversal;
+ transport_config_.nat_traversal_mode =
+ network_settings.allow_nat_traversal ?
+ TransportConfig::NAT_TRAVERSAL_ENABLED :
+ TransportConfig::NAT_TRAVERSAL_DISABLED;
transport_config_.min_port = network_settings.min_port;
transport_config_.max_port = network_settings.max_port;
@@ -107,7 +110,8 @@ void JingleSessionManager::OnSignalStrategyStateChange(
SignalStrategy::State state) {
// If NAT traversal is enabled then we need to request STUN/Relay info.
if (state == SignalStrategy::CONNECTED) {
- if (transport_config_.nat_traversal) {
+ if (transport_config_.nat_traversal_mode ==
+ TransportConfig::NAT_TRAVERSAL_ENABLED) {
jingle_info_request_.reset(new JingleInfoRequest(signal_strategy_));
jingle_info_request_->Send(base::Bind(&JingleSessionManager::OnJingleInfo,
base::Unretained(this)));
« no previous file with comments | « no previous file | remoting/protocol/libjingle_transport_factory.cc » ('j') | remoting/protocol/transport_config.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698