From d78ecf78c9397887495f55eeca863409d16e1999 Mon Sep 17 00:00:00 2001 From: Honghai Zhang Date: Fri, 1 Jul 2016 14:40:40 -0700 Subject: [PATCH] Add pruneTurnPorts to the java RTCConfiguration. And adds a log about the flag. BUG= R=pthatcher@webrtc.org Review URL: https://codereview.webrtc.org/2118873002 . Cr-Commit-Position: refs/heads/master@{#13369} --- webrtc/api/android/java/src/org/webrtc/PeerConnection.java | 2 ++ webrtc/api/android/jni/peerconnection_jni.cc | 5 +++++ webrtc/p2p/client/basicportallocator.cc | 3 +++ 3 files changed, 10 insertions(+) diff --git a/webrtc/api/android/java/src/org/webrtc/PeerConnection.java b/webrtc/api/android/java/src/org/webrtc/PeerConnection.java index 04fd563e11..70813a60d7 100644 --- a/webrtc/api/android/java/src/org/webrtc/PeerConnection.java +++ b/webrtc/api/android/java/src/org/webrtc/PeerConnection.java @@ -146,6 +146,7 @@ public class PeerConnection { public KeyType keyType; public ContinualGatheringPolicy continualGatheringPolicy; public int iceCandidatePoolSize; + public boolean pruneTurnPorts; public boolean presumeWritableWhenFullyRelayed; public RTCConfiguration(List iceServers) { @@ -162,6 +163,7 @@ public class PeerConnection { keyType = KeyType.ECDSA; continualGatheringPolicy = ContinualGatheringPolicy.GATHER_ONCE; iceCandidatePoolSize = 0; + pruneTurnPorts = false; presumeWritableWhenFullyRelayed = false; } }; diff --git a/webrtc/api/android/jni/peerconnection_jni.cc b/webrtc/api/android/jni/peerconnection_jni.cc index 759e5abe61..0e9a5a035b 100644 --- a/webrtc/api/android/jni/peerconnection_jni.cc +++ b/webrtc/api/android/jni/peerconnection_jni.cc @@ -1592,6 +1592,9 @@ static void JavaRTCConfigurationToJsepRTCConfiguration( jfieldID j_presume_writable_when_fully_relayed_id = GetFieldID( jni, j_rtc_config_class, "presumeWritableWhenFullyRelayed", "Z"); + jfieldID j_prune_turn_ports_id = + GetFieldID(jni, j_rtc_config_class, "pruneTurnPorts", "Z"); + rtc_config->type = JavaIceTransportsTypeToNativeType(jni, j_ice_transports_type); rtc_config->bundle_policy = @@ -1616,6 +1619,8 @@ static void JavaRTCConfigurationToJsepRTCConfiguration( jni, j_continual_gathering_policy); rtc_config->ice_candidate_pool_size = GetIntField(jni, j_rtc_config, j_ice_candidate_pool_size_id); + rtc_config->prune_turn_ports = + GetBooleanField(jni, j_rtc_config, j_prune_turn_ports_id); rtc_config->presume_writable_when_fully_relayed = GetBooleanField( jni, j_rtc_config, j_presume_writable_when_fully_relayed_id); } diff --git a/webrtc/p2p/client/basicportallocator.cc b/webrtc/p2p/client/basicportallocator.cc index 3a7aa5a333..7f8ad52889 100644 --- a/webrtc/p2p/client/basicportallocator.cc +++ b/webrtc/p2p/client/basicportallocator.cc @@ -246,6 +246,9 @@ void BasicPortAllocatorSession::StartGettingPorts() { } network_thread_->Post(RTC_FROM_HERE, this, MSG_CONFIG_START); + + LOG(LS_INFO) << "Pruning turn ports " + << (prune_turn_ports_ ? "enabled" : "disabled"); } void BasicPortAllocatorSession::StopGettingPorts() {