From 7f83f9fc832b17626e94de308cf37a29e04cd555 Mon Sep 17 00:00:00 2001 From: Kevin Liang Date: Wed, 15 May 2024 15:51:46 +0000 Subject: [PATCH] Net/DNS/Publicdns: update the IPv6 range that we use to recreate route endpoint for control D In this commit I updated the Ipv6 range we use to generate Control D DOH ip, we were using the NextDNSRanges to generate Control D DOH ip, updated to use the correct range. Updates: #7946 Signed-off-by: Kevin Liang --- net/dns/publicdns/publicdns.go | 4 ++-- net/dns/publicdns/publicdns_test.go | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/net/dns/publicdns/publicdns.go b/net/dns/publicdns/publicdns.go index c67c1145d..1024b321b 100644 --- a/net/dns/publicdns/publicdns.go +++ b/net/dns/publicdns/publicdns.go @@ -125,8 +125,8 @@ func DoHIPsOfBase(dohBase string) []netip.Addr { return []netip.Addr{ controlDv4One, controlDv4Two, - controlDv6Gen(nextDNSv6RangeA.Addr(), pathStr), - controlDv6Gen(nextDNSv6RangeB.Addr(), pathStr), + controlDv6Gen(controlDv6RangeA.Addr(), pathStr), + controlDv6Gen(controlDv6RangeB.Addr(), pathStr), } } return nil diff --git a/net/dns/publicdns/publicdns_test.go b/net/dns/publicdns/publicdns_test.go index 7c77dea1a..a10660bf2 100644 --- a/net/dns/publicdns/publicdns_test.go +++ b/net/dns/publicdns/publicdns_test.go @@ -121,8 +121,8 @@ func TestDoHIPsOfBase(t *testing.T) { want: ips( "76.76.2.22", "76.76.10.22", - "2a07:a8c0:0:6:7b5b:5949:35ad:0", - "2a07:a8c1:0:6:7b5b:5949:35ad:0", + "2606:1a40:0:6:7b5b:5949:35ad:0", + "2606:1a40:1:6:7b5b:5949:35ad:0", ), }, { @@ -130,8 +130,8 @@ func TestDoHIPsOfBase(t *testing.T) { want: ips( "76.76.2.22", "76.76.10.22", - "2a07:a8c0:0:ffff:ffff:ffff:ffff:0", - "2a07:a8c1:0:ffff:ffff:ffff:ffff:0", + "2606:1a40:0:ffff:ffff:ffff:ffff:0", + "2606:1a40:1:ffff:ffff:ffff:ffff:0", ), }, }