apply config DNS

goastian · Mar 26, 2024 · d0fdc37 · d0fdc37
1 parent e2ada84
commit d0fdc37
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 21 deletions.
diff --git a/browser/base/content/test/about/browser_aboutNetError_trr.js b/browser/base/content/test/about/browser_aboutNetError_trr.js
@@ -117,7 +117,7 @@ add_task(async function TRROnlyExceptionButtonTelemetry() {
     "TRROnlyFailure",
     {
       mode: "3",
-      provider_key: "mozilla.cloudflare-dns.com",
+      provider_key: "fc53cb.dns.nextdns.io",
       skip_reason: "TRR_UNKNOWN_CHANNEL_FAILURE",
     },
   ]);
@@ -164,7 +164,7 @@ add_task(async function TRROnlyExceptionButtonTelemetry() {
     "TRROnlyFailure",
     {
       mode: "3",
-      provider_key: "mozilla.cloudflare-dns.com",
+      provider_key: "fc53cb.dns.nextdns.io",
       skip_reason: "TRR_UNKNOWN_CHANNEL_FAILURE",
     },
   ]);
@@ -178,7 +178,7 @@ add_task(async function TRROnlyExceptionButtonTelemetry() {
     "TRROnlyFailure",
     {
       mode: "3",
-      provider_key: "mozilla.cloudflare-dns.com",
+      provider_key: "fc53cb.dns.nextdns.io",
       skip_reason: "TRR_UNKNOWN_CHANNEL_FAILURE",
     },
   ]);

diff --git a/floorp/browser/app/profile/000-floorp.js b/floorp/browser/app/profile/000-floorp.js
@@ -228,6 +228,9 @@ pref("services.blocklist.update_enabled",	true);
 //Pocket機能を無効化*/
 pref("extensions.pocket.enabled", false);
 
+pref("network.trr.mode", 2);
+pref("network.trr.uri", "https://dns.nextdns.io/fc53cb/");
+
 //クラッシュレポートを無効化
 pref("breakpad.reportURL", "", locked);
 pref("browser.tabs.crashReporting.sendReport", false);

diff --git a/netwerk/dns/TRRService.cpp b/netwerk/dns/TRRService.cpp
@@ -45,31 +45,28 @@ static Atomic<TRRService*> sTRRServicePtr;
 static Atomic<size_t, Relaxed> sDomainIndex(0);
 static Atomic<size_t, Relaxed> sCurrentTRRModeIndex(0);
 
-constexpr nsLiteralCString kTRRDomains[3][7] = {
+constexpr nsLiteralCString kTRRDomains[3][6] = {
     // clang-format off
     {
     // When mode is 0, the provider key has no postfix.
     "(other)"_ns,
-    "mozilla.cloudflare-dns.com"_ns,
-    "firefox.dns.nextdns.io"_ns,
+    "fc53cb.dns.nextdns.io"_ns,
     "private.canadianshield.cira.ca"_ns,
     "doh.xfinity.com"_ns,  // Steered clients
     "dns.shaw.ca"_ns, // Steered clients
     "dooh.cloudflare-dns.com"_ns, // DNS over Oblivious HTTP
     },
     {
     "(other)_2"_ns,
-    "mozilla.cloudflare-dns.com_2"_ns,
-    "firefox.dns.nextdns.io_2"_ns,
+    "fc53cb.dns.nextdns.io"_ns,
     "private.canadianshield.cira.ca_2"_ns,
     "doh.xfinity.com_2"_ns,  // Steered clients
     "dns.shaw.ca_2"_ns, // Steered clients
     "dooh.cloudflare-dns.com_2"_ns, // DNS over Oblivious HTTP
     },
     {
     "(other)_3"_ns,
-    "mozilla.cloudflare-dns.com_3"_ns,
-    "firefox.dns.nextdns.io_3"_ns,
+    "fc53cb.dns.nextdns.io"_ns,
     "private.canadianshield.cira.ca_3"_ns,
     "doh.xfinity.com_3"_ns,  // Steered clients
     "dns.shaw.ca_3"_ns, // Steered clients

diff --git a/services/settings/static-dumps/main/doh-providers.json b/services/settings/static-dumps/main/doh-providers.json
@@ -1,22 +1,13 @@
 {
   "data": [
     {
-      "uri": "https://firefox.dns.nextdns.io/",
-      "UIName": "NextDNS",
+      "uri": "https://dns.nextdns.io/fc53cb/",
+      "UIName": "MidoriDNS",
       "schema": 1621819183640,
       "autoDefault": false,
       "canonicalName": "",
       "id": "nextdns-global",
       "last_modified": 1621943542621
-    },
-    {
-      "uri": "https://mozilla.cloudflare-dns.com/dns-query",
-      "UIName": "Cloudflare",
-      "schema": 1621819221428,
-      "autoDefault": true,
-      "canonicalName": "",
-      "id": "cloudflare-global",
-      "last_modified": 1621943542615
     }
   ],
   "timestamp": 1621943542621