diff options
| author | braveyao@webrtc.org <braveyao@webrtc.org> | 2014-10-27 03:01:37 +0000 |
|---|---|---|
| committer | braveyao@webrtc.org <braveyao@webrtc.org> | 2014-10-27 03:01:37 +0000 |
| commit | bdfc44cca724ec4a98293f3733d3037dfbe0ffdd (patch) | |
| tree | eb50d1a75a002f7ca5b28983ec40177323cfcb91 /app/webrtc | |
| parent | 11a355dd6972751814cef9629f105b280b36c0ce (diff) | |
| download | talk-bdfc44cca724ec4a98293f3733d3037dfbe0ffdd.tar.gz | |
Use flags set by the port allocator.
Currently, port allocator flags are ignored. This is inconvenient if you
want to have your own PortAllocatorFactory subclass.
BUG=webrtc:3958
R=juberti@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/29919004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@7524 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'app/webrtc')
| -rw-r--r-- | app/webrtc/peerconnection.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/webrtc/peerconnection.cc b/app/webrtc/peerconnection.cc index d939f98..f45ce0b 100644 --- a/app/webrtc/peerconnection.cc +++ b/app/webrtc/peerconnection.cc @@ -350,9 +350,10 @@ bool PeerConnection::DoInitialize( // To handle both internal and externally created port allocator, we will // enable BUNDLE here. - int portallocator_flags = cricket::PORTALLOCATOR_ENABLE_BUNDLE | - cricket::PORTALLOCATOR_ENABLE_SHARED_UFRAG | - cricket::PORTALLOCATOR_ENABLE_SHARED_SOCKET; + int portallocator_flags = port_allocator_->flags(); + portallocator_flags |= cricket::PORTALLOCATOR_ENABLE_BUNDLE | + cricket::PORTALLOCATOR_ENABLE_SHARED_UFRAG | + cricket::PORTALLOCATOR_ENABLE_SHARED_SOCKET; bool value; // If IPv6 flag was specified, we'll not override it by experiment. if (FindConstraint( |