commit cac1b381359652fe623a1bdd320f0877b7b7a300
author Jiayang Liu <jiayl@chromium.org> Thu Apr 30 12:35:24 2015 -0700
committer Jiayang Liu <jiayl@chromium.org> Thu Apr 30 19:35:32 2015 +0000
tree c7887627581e92053c5f5e9fbde3a020bf6d9378
parent 4eddf18b1c4a93bc9c736783094cc4204c2d955e

Expose RTCConfiguration to java JNI and add an option to disable TCP

BUG=4585, 4589
R=glaznev@webrtc.org, juberti@google.com, pthatcher@webrtc.org

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

Cr-Commit-Position: refs/heads/master@{#9125}

talk/app/webrtc/peerconnectioninterface.h

diff --git a/talk/app/webrtc/peerconnectioninterface.h b/talk/app/webrtc/peerconnectioninterface.h
index 6f6eb24..ed4f5b3 100644
--- a/talk/app/webrtc/peerconnectioninterface.h
+++ b/talk/app/webrtc/peerconnectioninterface.h
@@ -197,6 +197,11 @@
     kBundlePolicyMaxCompat
   };
 
+  enum TcpCandidatePolicy {
+    kTcpCandidatePolicyEnabled,
+    kTcpCandidatePolicyDisabled
+  };
+
   struct RTCConfiguration {
     // TODO(pthatcher): Rename this ice_transport_type, but update
     // Chromium at the same time.
@@ -205,8 +210,12 @@
     // at the same time.
     IceServers servers;
     BundlePolicy bundle_policy;
+    TcpCandidatePolicy tcp_candidate_policy;
 
-    RTCConfiguration() : type(kAll), bundle_policy(kBundlePolicyBalanced) {}
+    RTCConfiguration()
+        : type(kAll),
+          bundle_policy(kBundlePolicyBalanced),
+          tcp_candidate_policy(kTcpCandidatePolicyEnabled) {}
   };
 
   struct RTCOfferAnswerOptions {