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

Unified Diff: remoting/protocol/libjingle_transport_factory.cc

Issue 10209008: Roll libjingle 132:133 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 8 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
« no previous file with comments | « remoting/protocol/jingle_session.cc ('k') | third_party/libjingle/README.chromium » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/libjingle_transport_factory.cc
diff --git a/remoting/protocol/libjingle_transport_factory.cc b/remoting/protocol/libjingle_transport_factory.cc
index 2c16101dc8c29efc1b3bd5949b533a5a4d614a97..189757dd35565cb0e8d98b98db1cbb26eb7f1ce9 100644
--- a/remoting/protocol/libjingle_transport_factory.cc
+++ b/remoting/protocol/libjingle_transport_factory.cc
@@ -155,10 +155,12 @@ void LibjingleStreamTransport::Connect(
port_allocator_->SetPortRange(config_.min_port, config_.max_port);
- // Create P2PTransportChannel, attach signal handlers and connect it.
DCHECK(!channel_.get());
+
+ // Create P2PTransportChannel, attach signal handlers and connect it.
+ // TODO(sergeyu): Specify correct component ID for the channel.
channel_.reset(new cricket::P2PTransportChannel(
- name_, "", NULL, port_allocator_.get()));
+ name_, 0, NULL, port_allocator_.get()));
channel_->SignalRequestSignaling.connect(
this, &LibjingleStreamTransport::OnRequestSignaling);
channel_->SignalCandidateReady.connect(
@@ -247,10 +249,9 @@ void LibjingleStreamTransport::OnRouteChange(
LOG(FATAL) << "Failed to convert peer IP address.";
}
- DCHECK(channel->GetP2PChannel());
- DCHECK(channel->GetP2PChannel()->best_connection());
+ DCHECK(channel_->best_connection());
const cricket::Candidate& local_candidate =
- channel->GetP2PChannel()->best_connection()->local_candidate();
+ channel_->best_connection()->local_candidate();
if (!jingle_glue::SocketAddressToIPEndPoint(
local_candidate.address(), &route.local_address)) {
LOG(FATAL) << "Failed to convert local IP address.";
« no previous file with comments | « remoting/protocol/jingle_session.cc ('k') | third_party/libjingle/README.chromium » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698