From b6d20e6f8f202389fcc61eeb3ae22ba8960ba768 Mon Sep 17 00:00:00 2001 From: Andrew Dunham Date: Mon, 19 Jun 2023 10:09:12 -0400 Subject: [PATCH] go.mod, net/dns/recursive: update github.com/miekg/dns Updates #cleanup Change-Id: If4de6a84448a17dd81cc2a8af788bd18c3d0bbe3 Signed-off-by: Andrew Dunham --- go.mod | 2 +- go.sum | 4 ++-- net/dns/recursive/recursive.go | 6 +----- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 2d99a6125..92613bc6b 100644 --- a/go.mod +++ b/go.mod @@ -48,7 +48,7 @@ require ( github.com/mdlayher/genetlink v1.3.2 github.com/mdlayher/netlink v1.7.2 github.com/mdlayher/sdnotify v1.0.0 - github.com/miekg/dns v1.1.54 + github.com/miekg/dns v1.1.55 github.com/mitchellh/go-ps v1.0.0 github.com/peterbourgon/ff/v3 v3.3.0 github.com/pkg/errors v0.9.1 diff --git a/go.sum b/go.sum index 10eaa3632..1848ea67e 100644 --- a/go.sum +++ b/go.sum @@ -767,8 +767,8 @@ github.com/mdlayher/socket v0.4.1/go.mod h1:cAqeGjoufqdxWkD7DkpyS+wcefOtmu5OQ8Ku github.com/mgechev/revive v1.3.1 h1:OlQkcH40IB2cGuprTPcjB0iIUddgVZgGmDX3IAMR8D4= github.com/mgechev/revive v1.3.1/go.mod h1:YlD6TTWl2B8A103R9KWJSPVI9DrEf+oqr15q21Ld+5I= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= -github.com/miekg/dns v1.1.54 h1:5jon9mWcb0sFJGpnI99tOMhCPyJ+RPVz5b63MQG0VWI= -github.com/miekg/dns v1.1.54/go.mod h1:uInx36IzPl7FYnDcMeVWxj9byh7DutNykX4G9Sj60FY= +github.com/miekg/dns v1.1.55 h1:GoQ4hpsj0nFLYe+bWiCToyrBEJXkQfOOIvFGFy0lEgo= +github.com/miekg/dns v1.1.55/go.mod h1:uInx36IzPl7FYnDcMeVWxj9byh7DutNykX4G9Sj60FY= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw= diff --git a/net/dns/recursive/recursive.go b/net/dns/recursive/recursive.go index 8bba66944..98bbaaf31 100644 --- a/net/dns/recursive/recursive.go +++ b/net/dns/recursive/recursive.go @@ -582,12 +582,8 @@ func (r *Resolver) queryNameserverProto( } // Send the DNS request to the current nameserver. - // - // TODO(andrew): use ExchangeWithConnContext after this upstream PR is - // merged: - // https://github.com/miekg/dns/pull/1459 r.depthlogf(depth, "asking %s over %s about %q (type: %v)", nameserverStr, protocol, name, qtype) - resp, _, err = c.ExchangeWithConn(m, conn) + resp, _, err = c.ExchangeWithConnContext(ctx, m, conn) } if err != nil { return nil, err