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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/renderer/p2p/p2p_transport_impl.cc

Issue 10382003: Changes needed to roll libjingle r141 (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Created 8 years, 7 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 | « content/renderer/media/peer_connection_handler_unittest.cc ('k') | content/renderer/p2p/port_allocator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/p2p/p2p_transport_impl.cc
===================================================================
--- content/renderer/p2p/p2p_transport_impl.cc (revision 137969)
+++ content/renderer/p2p/p2p_transport_impl.cc (working copy)
@@ -12,6 +12,8 @@
#include "jingle/glue/thread_wrapper.h"
#include "jingle/glue/utils.h"
#include "net/base/net_errors.h"
+#include "third_party/libjingle/source/talk/base/helpers.h"
+#include "third_party/libjingle/source/talk/p2p/base/constants.h"
#include "third_party/libjingle/source/talk/p2p/base/p2ptransportchannel.h"
#include "third_party/libjingle/source/talk/p2p/client/basicportallocator.h"
@@ -75,7 +77,10 @@
DCHECK(!channel_.get());
channel_.reset(new cricket::P2PTransportChannel(
- name, 0, NULL, allocator_.get()));
+ 0, NULL, allocator_.get()));
+ channel_->SetIceUfrag(
+ talk_base::CreateRandomString(cricket::ICE_UFRAG_LENGTH));
+ channel_->SetIcePwd(talk_base::CreateRandomString(cricket::ICE_PWD_LENGTH));
channel_->SignalRequestSignaling.connect(
this, &P2PTransportImpl::OnRequestSignaling);
channel_->SignalCandidateReady.connect(
« no previous file with comments | « content/renderer/media/peer_connection_handler_unittest.cc ('k') | content/renderer/p2p/port_allocator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698