summaryrefslogtreecommitdiffstats
path: root/remoting/protocol
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-08 01:57:11 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-08 01:57:11 +0000
commit977eacb1d457d672ec617a61ee3a7c66d81a8587 (patch)
tree2906eb399646c2f7d86f3e563951deaae238f8d6 /remoting/protocol
parent215bfa0db9e4c563ab6d4f90558e8d753521b1f6 (diff)
downloadchromium_src-977eacb1d457d672ec617a61ee3a7c66d81a8587.zip
chromium_src-977eacb1d457d672ec617a61ee3a7c66d81a8587.tar.gz
chromium_src-977eacb1d457d672ec617a61ee3a7c66d81a8587.tar.bz2
Explicitly select ICEPROTO_GOOGLE mode in LibjingleTransportFactory
Libjingle has switched to using ICEPROTO_HYBRID by default, and that mode is not compatible with chromoting at the moment. Review URL: https://codereview.chromium.org/133363006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@249890 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol')
-rw-r--r--remoting/protocol/libjingle_transport_factory.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/remoting/protocol/libjingle_transport_factory.cc b/remoting/protocol/libjingle_transport_factory.cc
index ef22f2a..b37cbb4 100644
--- a/remoting/protocol/libjingle_transport_factory.cc
+++ b/remoting/protocol/libjingle_transport_factory.cc
@@ -195,6 +195,7 @@ void LibjingleStreamTransport::DoStart() {
// TODO(sergeyu): Specify correct component ID for the channel.
channel_.reset(new cricket::P2PTransportChannel(
std::string(), 0, NULL, port_allocator_));
+ channel_->SetIceProtocolType(cricket::ICEPROTO_GOOGLE);
channel_->SetIceCredentials(ice_username_fragment_, ice_password_);
channel_->SignalRequestSignaling.connect(
this, &LibjingleStreamTransport::OnRequestSignaling);