Merge remote-tracking branch 'origin/main' into drop-dns-probes

# Conflicts:
#	client/internal/dns/server.go
#	client/internal/dns/upstream_ios.go
This commit is contained in:
Viktor Liu
2026-05-07 12:20:09 +02:00
231 changed files with 10358 additions and 2870 deletions

View File

@@ -13,7 +13,6 @@ import (
"github.com/miekg/dns"
log "github.com/sirupsen/logrus"
"golang.org/x/exp/maps"
"github.com/netbirdio/netbird/client/internal/dns/resutil"
"github.com/netbirdio/netbird/client/internal/dns/types"
@@ -67,9 +66,9 @@ func (d *Resolver) Stop() {
d.mu.Lock()
defer d.mu.Unlock()
maps.Clear(d.records)
maps.Clear(d.domains)
maps.Clear(d.zones)
clear(d.records)
clear(d.domains)
clear(d.zones)
}
// ID returns the unique handler ID
@@ -442,9 +441,9 @@ func (d *Resolver) Update(customZones []nbdns.CustomZone) {
d.mu.Lock()
defer d.mu.Unlock()
maps.Clear(d.records)
maps.Clear(d.domains)
maps.Clear(d.zones)
clear(d.records)
clear(d.domains)
clear(d.zones)
for _, zone := range customZones {
zoneDomain := domain.Domain(strings.ToLower(dns.Fqdn(zone.Domain)))