tor-browser

commit 95bf265604bcb44857609c3f51a68dc68b707238
parent 2b618da83effc1da4fbc8661a562f9dcc7bf4ea9
Author: Michael Froman <mfroman@mozilla.com>
Date:   Wed, 19 Nov 2025 15:55:26 +0000

Bug 2000995 - simplify NR_reg_init since we don't use NR_REG_MODE_REMOTE. r=bwc

Differential Revision: https://phabricator.services.mozilla.com/D273134

Diffstat:
M
dom/media/webrtc/transport/nricectx.cpp
 | 
2
+-
M
dom/media/webrtc/transport/rlogconnector.cpp
 | 
2
+-
M
dom/media/webrtc/transport/test/gtest_utils.h
 | 
2
+-
M
dom/media/webrtc/transport/test/rlogconnector_unittest.cpp
 | 
2
+-
M
dom/media/webrtc/transport/test/stunserver.cpp
 | 
4
++--
M
dom/media/webrtc/transport/third_party/nrappkit/src/registry/registry.c
 | 
4
++--
M
dom/media/webrtc/transport/third_party/nrappkit/src/registry/registry.h
 | 
3
+--

7 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/dom/media/webrtc/transport/nricectx.cpp b/dom/media/webrtc/transport/nricectx.cpp
@@ -556,7 +556,7 @@ void NrIceCtx::InitializeGlobals(const GlobalConfig& aConfig) {
   RLogConnector::CreateInstance();
   // Initialize the crypto callbacks and logging stuff
   if (!initialized) {
-    NR_reg_init(NR_REG_MODE_LOCAL);
+    NR_reg_init();
     nr_crypto_vtbl = &nr_ice_crypto_nss_vtbl;
     initialized = true;
 
diff --git a/dom/media/webrtc/transport/rlogconnector.cpp b/dom/media/webrtc/transport/rlogconnector.cpp
@@ -104,7 +104,7 @@ inline void RLogConnector::RemoveOld() {
 RLogConnector* RLogConnector::CreateInstance() {
   if (!instance) {
     instance = new RLogConnector;
-    NR_reg_init(NR_REG_MODE_LOCAL);
+    NR_reg_init();
     r_log_set_extra_destination(LOG_DEBUG, &ringbuffer_vlog);
   }
   return instance;
diff --git a/dom/media/webrtc/transport/test/gtest_utils.h b/dom/media/webrtc/transport/test/gtest_utils.h
@@ -110,7 +110,7 @@ class MtransportTest : public ::testing::Test {
     NSS_NoDB_Init(nullptr);
     NSS_SetDomesticPolicy();
 
-    NR_reg_init(NR_REG_MODE_LOCAL);
+    NR_reg_init();
 
     // Attempt to load env vars used by tests.
     GetEnvironment("TURN_SERVER_ADDRESS", turn_server_);
diff --git a/dom/media/webrtc/transport/test/rlogconnector_unittest.cpp b/dom/media/webrtc/transport/test/rlogconnector_unittest.cpp
@@ -33,7 +33,7 @@ class RLogConnectorTest : public ::testing::Test {
   ~RLogConnectorTest() { Free(); }
 
   static void SetUpTestCase() {
-    NR_reg_init(NR_REG_MODE_LOCAL);
+    NR_reg_init();
     r_log_init();
     /* Would be nice to be able to unregister in the fixture */
     const char* facility = "rlogconnector_test";
diff --git a/dom/media/webrtc/transport/test/stunserver.cpp b/dom/media/webrtc/transport/test/stunserver.cpp
@@ -341,7 +341,7 @@ int TestStunServer::Initialize(int address_family) {
 }
 
 UniquePtr<TestStunServer> TestStunServer::Create(int address_family) {
-  NR_reg_init(NR_REG_MODE_LOCAL);
+  NR_reg_init();
 
   UniquePtr<TestStunServer> server(new TestStunServer());
 
@@ -623,7 +623,7 @@ void TestStunTcpServer::accept_cb(NR_SOCKET s, int how, void* cb_arg) {
 }
 
 UniquePtr<TestStunTcpServer> TestStunTcpServer::Create(int address_family) {
-  NR_reg_init(NR_REG_MODE_LOCAL);
+  NR_reg_init();
 
   UniquePtr<TestStunTcpServer> server(new TestStunTcpServer());
 
diff --git a/dom/media/webrtc/transport/third_party/nrappkit/src/registry/registry.c b/dom/media/webrtc/transport/third_party/nrappkit/src/registry/registry.c
@@ -73,10 +73,10 @@ int NR_LOG_REGISTRY=0;
 NR_registry NR_TOP_LEVEL_REGISTRY = "";
 
 int
-NR_reg_init(void *mode)
+NR_reg_init()
 {
     int r, _status;
-    nr_registry_module *module = (nr_registry_module*)mode;
+    nr_registry_module *module = (nr_registry_module*)NR_REG_MODE_LOCAL;
 #ifdef SANITY_CHECKS
     NR_registry registry;
 #endif
diff --git a/dom/media/webrtc/transport/third_party/nrappkit/src/registry/registry.h b/dom/media/webrtc/transport/third_party/nrappkit/src/registry/registry.h
@@ -59,9 +59,8 @@ typedef char NR_registry_type[NR_REG_MAX_TYPE_LEN];
 extern NR_registry NR_TOP_LEVEL_REGISTRY;
 
 extern void *NR_REG_MODE_LOCAL;
-extern void *NR_REG_MODE_REMOTE;
 
-int NR_reg_init(void *mode);
+int NR_reg_init(void);
 
 int NR_reg_initted(void);