summaryrefslogtreecommitdiffhomepage
path: root/net
diff options
context:
space:
mode:
authorKevin Liang <kevinliang@tailscale.com>2024-05-15 15:51:46 +0000
committerKevinLiang10 <37811973+KevinLiang10@users.noreply.github.com>2024-05-15 12:21:58 -0400
commit7f83f9fc832b17626e94de308cf37a29e04cd555 (patch)
treec0905c0a535f33fd39fb6369ed8ee0493292fde6 /net
parent6877d4496585adb75da5efa2eb528684aa71f24f (diff)
downloadtailscale-7f83f9fc832b17626e94de308cf37a29e04cd555.tar.xz
tailscale-7f83f9fc832b17626e94de308cf37a29e04cd555.zip
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 <kevinliang@tailscale.com>
Diffstat (limited to 'net')
-rw-r--r--net/dns/publicdns/publicdns.go4
-rw-r--r--net/dns/publicdns/publicdns_test.go8
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",
),
},
}