Skip to content

Commit c7570de

Browse files
committed
Pull request: AGDNS-2769-upd-all
Merge in GO/dnsproxy from upd-all to master Squashed commit of the following: commit afe379e Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Apr 7 10:51:11 2025 +0700 upstream: imp code commit 7e33518 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Apr 7 10:44:29 2025 +0700 all: upd golibs
1 parent d64332f commit c7570de

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/AdguardTeam/dnsproxy
33
go 1.24.1
44

55
require (
6-
github.com/AdguardTeam/golibs v0.32.6
6+
github.com/AdguardTeam/golibs v0.32.7
77
github.com/ameshkov/dnscrypt/v2 v2.3.0
88
github.com/ameshkov/dnsstamps v1.0.3
99
github.com/beefsack/go-rate v0.0.0-20220214233405-116f4ca011a0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ cloud.google.com/go/compute/metadata v0.6.0 h1:A6hENjEsCDtC1k8byVsgwvVcioamEHvZ4
1010
cloud.google.com/go/compute/metadata v0.6.0/go.mod h1:FjyFAW1MW0C203CEOMDTu3Dk1FlqW3Rga40jzHL4hfg=
1111
cloud.google.com/go/longrunning v0.6.5 h1:sD+t8DO8j4HKW4QfouCklg7ZC1qC4uzVZt8iz3uTW+Q=
1212
cloud.google.com/go/longrunning v0.6.5/go.mod h1:Et04XK+0TTLKa5IPYryKf5DkpwImy6TluQ1QTLwlKmY=
13-
github.com/AdguardTeam/golibs v0.32.6 h1:J/s6BiDHIJa5VsumGAzgI6S1SVLOaVB3YIvFlBK79HU=
14-
github.com/AdguardTeam/golibs v0.32.6/go.mod h1:bE8KV1zqTzgZjmjFyBJ9f9O5DEKO717r7e57j1HclJA=
13+
github.com/AdguardTeam/golibs v0.32.7 h1:3dmGlAVgmvquCCwHsvEl58KKcRAK3z1UnjMnwSIeDH4=
14+
github.com/AdguardTeam/golibs v0.32.7/go.mod h1:bE8KV1zqTzgZjmjFyBJ9f9O5DEKO717r7e57j1HclJA=
1515
github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c h1:pxW6RcqyfI9/kWtOwnv/G+AzdKuy2ZrqINhenH4HyNs=
1616
github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
1717
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmHS9iAKVt9AyzRSqNU1qabPih5BY=

upstream/upstream.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -386,8 +386,7 @@ func newDialerInitializer(u *url.URL, opts *Options) (di DialerInitializer) {
386386
l = slog.Default()
387387
}
388388

389-
// TODO(e.burkov): Add netutil.IsValidIPPortString.
390-
if _, err := netip.ParseAddrPort(u.Host); err == nil {
389+
if netutil.IsValidIPPortString(u.Host) {
391390
// Don't resolve the address of the server since it's already an IP.
392391
handler := bootstrap.NewDialContext(opts.Timeout, l, u.Host)
393392

0 commit comments

Comments
 (0)