Simplify the dnscheck list

ooni · Oct 14, 2024 · b363fc2 · b363fc2
1 parent 9053991
commit b363fc2
Showing 1 changed file with 102 additions and 100 deletions.
diff --git a/internal/experiment/dnscheck/richerinput.go b/internal/experiment/dnscheck/richerinput.go
@@ -130,6 +130,46 @@ var defaultInput = []model.ExperimentTarget{
 			DefaultAddrs: "1.1.1.1 1.0.0.1",
 		},
 	},
+	// &Target{
+	// 	URL: "https://dns.cloudflare.com/dns-query",
+	// 	Config: &Config{
+	// 		HTTP3Enabled: true,
+	// 	},
+	// },
+	// &Target{
+	// 	URL:    "https://dns.cloudflare.com/dns-query",
+	// 	Config: &Config{},
+	// },
+	// &Target{
+	// 	URL: "https://family.cloudflare-dns.com/dns-query",
+	// 	Config: &Config{
+	// 		HTTP3Enabled: true,
+	// 	},
+	// },
+	// &Target{
+	// 	URL:    "https://family.cloudflare-dns.com/dns-query",
+	// 	Config: &Config{},
+	// },
+	// &Target{
+	// 	URL: "https://1dot1dot1dot1.cloudflare-dns.com/dns-query",
+	// 	Config: &Config{
+	// 		HTTP3Enabled: true,
+	// 	},
+	// },
+	// &Target{
+	// 	URL:    "https://1dot1dot1dot1.cloudflare-dns.com/dns-query",
+	// 	Config: &Config{},
+	// },
+	// &Target{
+	// 	URL: "https://security.cloudflare-dns.com/dns-query",
+	// 	Config: &Config{
+	// 		HTTP3Enabled: true,
+	// 	},
+	// },
+	// &Target{
+	// 	URL:    "https://security.cloudflare-dns.com/dns-query",
+	// 	Config: &Config{},
+	// },
 	&Target{
 		URL: "https://dns.quad9.net/dns-query",
 		Config: &Config{
@@ -143,56 +183,47 @@ var defaultInput = []model.ExperimentTarget{
 			DefaultAddrs: "9.9.9.9",
 		},
 	},
-	&Target{
-		URL: "https://family.cloudflare-dns.com/dns-query",
-		Config: &Config{
-			HTTP3Enabled: true,
-		},
-	},
-	&Target{
-		URL:    "https://family.cloudflare-dns.com/dns-query",
-		Config: &Config{},
-	},
-	&Target{
-		URL: "https://dns11.quad9.net/dns-query",
-		Config: &Config{
-			HTTP3Enabled: true,
-		},
-	},
-	&Target{
-		URL:    "https://dns11.quad9.net/dns-query",
-		Config: &Config{},
-	},
-	&Target{
-		URL: "https://dns9.quad9.net/dns-query",
-		Config: &Config{
-			HTTP3Enabled: true,
-		},
-	},
-	&Target{
-		URL:    "https://dns9.quad9.net/dns-query",
-		Config: &Config{},
-	},
-	&Target{
-		URL: "https://dns12.quad9.net/dns-query",
-		Config: &Config{
-			HTTP3Enabled: true,
-		},
-	},
-	&Target{
-		URL:    "https://dns12.quad9.net/dns-query",
-		Config: &Config{},
-	},
-	&Target{
-		URL: "https://1dot1dot1dot1.cloudflare-dns.com/dns-query",
-		Config: &Config{
-			HTTP3Enabled: true,
-		},
-	},
-	&Target{
-		URL:    "https://1dot1dot1dot1.cloudflare-dns.com/dns-query",
-		Config: &Config{},
-	},
+	// &Target{
+	// 	URL: "https://dns11.quad9.net/dns-query",
+	// 	Config: &Config{
+	// 		HTTP3Enabled: true,
+	// 	},
+	// },
+	// &Target{
+	// 	URL:    "https://dns11.quad9.net/dns-query",
+	// 	Config: &Config{},
+	// },
+	// &Target{
+	// 	URL: "https://dns9.quad9.net/dns-query",
+	// 	Config: &Config{
+	// 		HTTP3Enabled: true,
+	// 	},
+	// },
+	// &Target{
+	// 	URL:    "https://dns9.quad9.net/dns-query",
+	// 	Config: &Config{},
+	// },
+	// &Target{
+	// 	URL: "https://dns12.quad9.net/dns-query",
+	// 	Config: &Config{
+	// 		HTTP3Enabled: true,
+	// 	},
+	// },
+	// &Target{
+	// 	URL:    "https://dns12.quad9.net/dns-query",
+	// 	Config: &Config{},
+	// },
+	// &Target{
+	// 	URL: "https://dns10.quad9.net/dns-query",
+	// 	Config: &Config{
+	// 		HTTP3Enabled: true,
+	// 	},
+	// },
+	// &Target{
+	// 	URL:    "https://dns10.quad9.net/dns-query",
+	// 	Config: &Config{},
+	// },
+
 	&Target{
 		URL: "https://dns.adguard.com/dns-query",
 		Config: &Config{
@@ -203,36 +234,26 @@ var defaultInput = []model.ExperimentTarget{
 		URL:    "https://dns.adguard.com/dns-query",
 		Config: &Config{},
 	},
-	&Target{
-		URL: "https://dns-family.adguard.com/dns-query",
-		Config: &Config{
-			HTTP3Enabled: true,
-		},
-	},
-	&Target{
-		URL:    "https://dns-family.adguard.com/dns-query",
-		Config: &Config{},
-	},
-	&Target{
-		URL: "https://dns.cloudflare.com/dns-query",
-		Config: &Config{
-			HTTP3Enabled: true,
-		},
-	},
-	&Target{
-		URL:    "https://dns.cloudflare.com/dns-query",
-		Config: &Config{},
-	},
-	&Target{
-		URL: "https://adblock.doh.mullvad.net/dns-query",
-		Config: &Config{
-			HTTP3Enabled: true,
-		},
-	},
-	&Target{
-		URL:    "https://adblock.doh.mullvad.net/dns-query",
-		Config: &Config{},
-	},
+	// &Target{
+	// 	URL: "https://dns-family.adguard.com/dns-query",
+	// 	Config: &Config{
+	// 		HTTP3Enabled: true,
+	// 	},
+	// },
+	// &Target{
+	// 	URL:    "https://dns-family.adguard.com/dns-query",
+	// 	Config: &Config{},
+	// },
+	// &Target{
+	// 	URL: "https://adblock.doh.mullvad.net/dns-query",
+	// 	Config: &Config{
+	// 		HTTP3Enabled: true,
+	// 	},
+	// },
+	// &Target{
+	// 	URL:    "https://adblock.doh.mullvad.net/dns-query",
+	// 	Config: &Config{},
+	// },
 	&Target{
 		URL: "https://dns.alidns.com/dns-query",
 		Config: &Config{
@@ -263,26 +284,7 @@ var defaultInput = []model.ExperimentTarget{
 		URL:    "https://dns.nextdns.io/dns-query",
 		Config: &Config{},
 	},
-	&Target{
-		URL: "https://dns10.quad9.net/dns-query",
-		Config: &Config{
-			HTTP3Enabled: true,
-		},
-	},
-	&Target{
-		URL:    "https://dns10.quad9.net/dns-query",
-		Config: &Config{},
-	},
-	&Target{
-		URL: "https://security.cloudflare-dns.com/dns-query",
-		Config: &Config{
-			HTTP3Enabled: true,
-		},
-	},
-	&Target{
-		URL:    "https://security.cloudflare-dns.com/dns-query",
-		Config: &Config{},
-	},
+
 	&Target{
 		URL: "https://dns.switch.ch/dns-query",
 		Config: &Config{