From 03ad9c30eb9ca5e86a60b614b314a47a59ca1eac Mon Sep 17 00:00:00 2001 From: "Nils Ohlmeier [:drno]" Date: Fri, 28 Aug 2015 13:22:45 -0700 Subject: [PATCH] Bug 1199766 - Disable ICE TCP SO gathering via user pref. r=bwc --HG-- extra : transplant_source : %60%C8%88-%E0%F2%9F%3FMn%A8%7C%3Ah%94s%D2%99%2AX --- media/mtransport/nricectx.cpp | 2 -- modules/libpref/init/all.js | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/media/mtransport/nricectx.cpp b/media/mtransport/nricectx.cpp index 98b2c2b7bb99..99f3e6014123 100644 --- a/media/mtransport/nricectx.cpp +++ b/media/mtransport/nricectx.cpp @@ -468,8 +468,6 @@ RefPtr NrIceCtx::Create(const std::string& name, ice_trickle_grace_period); NR_reg_set_int4((char *)NR_ICE_REG_ICE_TCP_SO_SOCK_COUNT, ice_tcp_so_sock_count); - NR_reg_set_int4((char *)NR_ICE_REG_ICE_TCP_SO_SOCK_COUNT, - ice_tcp_so_sock_count); NR_reg_set_int4((char *)NR_ICE_REG_ICE_TCP_LISTEN_BACKLOG, ice_tcp_listen_backlog); diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index c6836365625d..5c322d855887 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -397,6 +397,7 @@ pref("media.navigator.permission.disabled", false); pref("media.peerconnection.default_iceservers", "[]"); pref("media.peerconnection.ice.loopback", false); // Set only for testing in offline environments. pref("media.peerconnection.ice.tcp", false); +pref("media.peerconnection.ice.tcp_so_sock_count", 0); // Disable SO gathering pref("media.peerconnection.ice.link_local", false); // Set only for testing IPV6 in networks that don't assign IPV6 addresses pref("media.peerconnection.ice.force_interface", ""); // Limit to only a single interface pref("media.peerconnection.ice.relay_only", false); // Limit candidates to TURN