webrtc/p2p/client/basicportallocator.cc - Issue 1303393002: Reland "Remove GICE (gone forever!) and PORTALLOCATOR_ENABLE_SHARED_UFRAG (enabled forever)." becau…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/p2p/client/basicportallocator.cc

Issue 1303393002: Reland "Remove GICE (gone forever!) and PORTALLOCATOR_ENABLE_SHARED_UFRAG (enabled forever)." becau… (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Add memcheck suppression Created 5 years, 4 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

Index: webrtc/p2p/client/basicportallocator.cc

diff --git a/webrtc/p2p/client/basicportallocator.cc b/webrtc/p2p/client/basicportallocator.cc

index fe263f597fdc3898adc7e5eaf24e225af7003f13..2a9ee3b8ba063cdb987dc25cf89c680a6b67280e 100644

--- a/webrtc/p2p/client/basicportallocator.cc

+++ b/webrtc/p2p/client/basicportallocator.cc

@@ -692,14 +692,6 @@ AllocationSequence::AllocationSequence(BasicPortAllocatorSession* session,

}

bool AllocationSequence::Init() {

- if (IsFlagSet(PORTALLOCATOR_ENABLE_SHARED_SOCKET) &&

- !IsFlagSet(PORTALLOCATOR_ENABLE_SHARED_UFRAG)) {

- LOG(LS_ERROR) << "Shared socket option can't be set without "

- << "shared ufrag.";

- ASSERT(false);

- return false;

- }

if (IsFlagSet(PORTALLOCATOR_ENABLE_SHARED_SOCKET)) {

udp_socket_.reset(session_->socket_factory()->CreateUdpSocket(

rtc::SocketAddress(ip_, 0), session_->allocator()->min_port(),

« no previous file with comments | « webrtc/p2p/base/turnport_unittest.cc ('k') | webrtc/p2p/client/connectivitychecker.cc » ('j') | no next file with comments »