diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-01 18:51:46 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-01 18:51:46 +0000 |
| commit | cbbb0c609a5816c1d5b8ff93b8cf15358f51ac28 (patch) | |
| tree | bab110759ac919fb95192ebdf14862ba89a1c0af | |
| parent | 7b3ee8bf212b43ea15d46a390af411c689ba24a8 (diff) | |
| download | chromium_src-cbbb0c609a5816c1d5b8ff93b8cf15358f51ac28.zip chromium_src-cbbb0c609a5816c1d5b8ff93b8cf15358f51ac28.tar.gz chromium_src-cbbb0c609a5816c1d5b8ff93b8cf15358f51ac28.tar.bz2 | |
Correction for r80070: call DoStartSession(), enable TCP.
TEST=remoting connection works
BUG=None
Review URL: http://codereview.chromium.org/6706024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80197 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | remoting/jingle_glue/jingle_client.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/remoting/jingle_glue/jingle_client.cc b/remoting/jingle_glue/jingle_client.cc index 538b05b..b7b27c4 100644 --- a/remoting/jingle_glue/jingle_client.cc +++ b/remoting/jingle_glue/jingle_client.cc @@ -169,7 +169,8 @@ JingleClient::JingleClient(JingleThread* thread, SignalStrategy* signal_strategy, PortAllocatorSessionFactory* session_factory, Callback* callback) - : thread_(thread), + : enable_nat_traversing_(false), + thread_(thread), state_(START), initialized_(false), closed_(false), @@ -233,8 +234,7 @@ void JingleClient::DoInitialize() { port_allocator_session_factory_.get(), "transp2")); if (!enable_nat_traversing_) { port_allocator_->set_flags(cricket::PORTALLOCATOR_DISABLE_STUN | - cricket::PORTALLOCATOR_DISABLE_RELAY | - cricket::PORTALLOCATOR_DISABLE_TCP); + cricket::PORTALLOCATOR_DISABLE_RELAY); } // TODO(ajwong): The strategy needs a "start" command or something. Right @@ -250,6 +250,8 @@ void JingleClient::DoInitialize() { NewCallback(this, &JingleClient::OnJingleInfo)); jingle_info_request_->Run( NewRunnableMethod(this, &JingleClient::DoStartSession)); + } else { + DoStartSession(); } } |