diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-27 19:33:26 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-27 19:33:26 +0000 |
| commit | b12073f1457876e10e2d880e599dc2cbb09aca6e (patch) | |
| tree | 28e4f6e959702bc25513348d90f57403d4707998 | |
| parent | 165c4583c6334e6037402a2e7efc3d6d4b95051b (diff) | |
| download | chromium_src-b12073f1457876e10e2d880e599dc2cbb09aca6e.zip chromium_src-b12073f1457876e10e2d880e599dc2cbb09aca6e.tar.gz chromium_src-b12073f1457876e10e2d880e599dc2cbb09aca6e.tar.bz2 | |
Actually enable NAT traversal in Chromoting client.
BUG=111386
Review URL: https://chromiumcodereview.appspot.com/9225016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119474 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | remoting/protocol/pepper_session_manager.cc | 6 | ||||
| -rw-r--r-- | remoting/protocol/pepper_session_manager.h | 1 |
2 files changed, 2 insertions, 5 deletions
diff --git a/remoting/protocol/pepper_session_manager.cc b/remoting/protocol/pepper_session_manager.cc index 4d519f7..b45a315 100644 --- a/remoting/protocol/pepper_session_manager.cc +++ b/remoting/protocol/pepper_session_manager.cc @@ -23,9 +23,7 @@ PepperSessionManager::PepperSessionManager(pp::Instance* pp_instance) : pp_instance_(pp_instance), signal_strategy_(NULL), listener_(NULL), - allow_nat_traversal_(false), ready_(false) { - transport_config_.nat_traversal = allow_nat_traversal_; } PepperSessionManager::~PepperSessionManager() { @@ -39,7 +37,7 @@ void PepperSessionManager::Init( listener_ = listener; signal_strategy_ = signal_strategy; iq_sender_.reset(new IqSender(signal_strategy_)); - allow_nat_traversal_ = network_settings.allow_nat_traversal; + transport_config_.nat_traversal = network_settings.allow_nat_traversal; // Limiting the port range is not supported yet. DCHECK(network_settings.max_port == 0 && @@ -108,7 +106,7 @@ void PepperSessionManager::OnSignalStrategyStateChange( SignalStrategy::State state) { // If NAT traversal is enabled then we need to request STUN/Relay info. if (state == SignalStrategy::CONNECTED) { - if (allow_nat_traversal_) { + if (transport_config_.nat_traversal) { jingle_info_request_.reset(new JingleInfoRequest(signal_strategy_)); jingle_info_request_->Send(base::Bind(&PepperSessionManager::OnJingleInfo, base::Unretained(this))); diff --git a/remoting/protocol/pepper_session_manager.h b/remoting/protocol/pepper_session_manager.h index 630684d..508c161 100644 --- a/remoting/protocol/pepper_session_manager.h +++ b/remoting/protocol/pepper_session_manager.h @@ -89,7 +89,6 @@ class PepperSessionManager : public SessionManager, scoped_ptr<AuthenticatorFactory> authenticator_factory_; scoped_ptr<IqSender> iq_sender_; SessionManager::Listener* listener_; - bool allow_nat_traversal_; bool ready_; |