diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-03 01:09:05 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-03 01:09:05 +0000 |
| commit | a06da298d68e1bd4e3f7f25f90d4786b38a10caf (patch) | |
| tree | ba7ea5449d40f076e9b4f27e3bc96208d1b42847 /remoting/protocol/connection_to_host.cc | |
| parent | 9d03345197526ec8b5d93d047b422744d9efa22e (diff) | |
| download | chromium_src-a06da298d68e1bd4e3f7f25f90d4786b38a10caf.zip chromium_src-a06da298d68e1bd4e3f7f25f90d4786b38a10caf.tar.gz chromium_src-a06da298d68e1bd4e3f7f25f90d4786b38a10caf.tar.bz2 | |
Respect NAT traversal policy in the Chromoting client plugin.
BUG=90213
TEST=manual
Review URL: http://codereview.chromium.org/7453066
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95185 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol/connection_to_host.cc')
| -rw-r--r-- | remoting/protocol/connection_to_host.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/remoting/protocol/connection_to_host.cc b/remoting/protocol/connection_to_host.cc index fe75cfe..580f198 100644 --- a/remoting/protocol/connection_to_host.cc +++ b/remoting/protocol/connection_to_host.cc @@ -115,9 +115,6 @@ void ConnectionToHost::InitSession() { session_manager_.reset(session_manager); session_manager_->Init( local_jid_, signal_strategy_.get(), this, NULL, "", allow_nat_traversal_); - - // Set the shared-secret for securing SSL channels. - session_->set_shared_secret(access_code_); } const SessionConfig* ConnectionToHost::config() { @@ -154,6 +151,9 @@ void ConnectionToHost::OnSessionManagerInitialized() { session_.reset(session_manager_->Connect( host_jid_, host_public_key_, client_token, candidate_config, NewCallback(this, &ConnectionToHost::OnSessionStateChange))); + + // Set the shared-secret for securing SSL channels. + session_->set_shared_secret(access_code_); } void ConnectionToHost::OnIncomingSession( |