sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-05-18 22:59:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# 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
parent 5c9aabf4bc 205ebcfda2
commit a8671e5248
231 changed files with 10358 additions and 2870 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/internal/dns/upstream_android.go
View File

@@ -87,7 +87,7 @@ func (u *upstreamResolver) isLocalResolver(upstream string) bool {
return false
}
func GetClientPrivate(ip netip.Addr, interfaceName string, dialTimeout time.Duration) (*dns.Client, error) {
func GetClientPrivate(_ privateClientIface, _ netip.Addr, dialTimeout time.Duration) (*dns.Client, error) {
return &dns.Client{
Timeout: dialTimeout,
Net: "udp",