generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Disabling shared socket mode for TURN ports. This is done as currently when

Browse Source 
TURN server also used as STUN server, binding responses will be handed over
to TURN port, which simply discard these messages, as requests are originated
from StunPort.

Until we find the right solution for this problem, it's better we disable this
feature.

BUG=https://code.google.com/p/webrtc/issues/detail?id=3537
R=jiayl@webrtc.org, juberti@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/19889004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6618 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
mallinath@webrtc.org 2014-07-07 20:47:24 +00:00
parent 3c637cdaa5
commit a70be68f65
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
talk/p2p/base/portallocator.h
View File

@ -54,6 +54,7 @@ const uint32 PORTALLOCATOR_ENABLE_IPV6 = 0x40;
const uint32 PORTALLOCATOR_ENABLE_SHARED_UFRAG = 0x80; const uint32 PORTALLOCATOR_ENABLE_SHARED_UFRAG = 0x80;
const uint32 PORTALLOCATOR_ENABLE_SHARED_SOCKET = 0x100; const uint32 PORTALLOCATOR_ENABLE_SHARED_SOCKET = 0x100;
const uint32 PORTALLOCATOR_ENABLE_STUN_RETRANSMIT_ATTRIBUTE = 0x200; const uint32 PORTALLOCATOR_ENABLE_STUN_RETRANSMIT_ATTRIBUTE = 0x200;
const uint32 PORTALLOCATOR_ENABLE_TURN_SHARED_SOCKET = 0x400;
const uint32 kDefaultPortAllocatorFlags = 0; const uint32 kDefaultPortAllocatorFlags = 0;

4
talk/p2p/client/basicportallocator.cc
View File

@ -1018,7 +1018,9 @@ void AllocationSequence::CreateTurnPort(const RelayServerConfig& config) {
TurnPort* port = NULL; TurnPort* port = NULL;
// Shared socket mode must be enabled only for UDP based ports. Hence // Shared socket mode must be enabled only for UDP based ports. Hence
// don't pass shared socket for ports which will create TCP sockets. // don't pass shared socket for ports which will create TCP sockets.
if (IsFlagSet(PORTALLOCATOR_ENABLE_SHARED_SOCKET) && // TODO(mallinath) - Enable shared socket mode for TURN ports. Disabled
// due to webrtc bug https://code.google.com/p/webrtc/issues/detail?id=3537
if (IsFlagSet(PORTALLOCATOR_ENABLE_TURN_SHARED_SOCKET) &&
relay_port->proto == PROTO_UDP) { relay_port->proto == PROTO_UDP) {
port = TurnPort::Create(session_->network_thread(), port = TurnPort::Create(session_->network_thread(),
session_->socket_factory(), session_->socket_factory(),