From 84acf830191a3898de3215ed6923698eb4ba8c49 Mon Sep 17 00:00:00 2001 From: James Tucker Date: Thu, 28 Sep 2023 16:47:52 -0700 Subject: [PATCH] go.mod,net/dnsfallback: bump go4.org/netipx Updates #8043 Signed-off-by: James Tucker --- go.mod | 4 ++-- go.sum | 4 ++++ net/dnsfallback/dnsfallback.go | 7 ++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 9b1dc5b97..769a49cb5 100644 --- a/go.mod +++ b/go.mod @@ -75,7 +75,7 @@ require ( github.com/vishvananda/netns v0.0.4 go.uber.org/zap v1.24.0 go4.org/mem v0.0.0-20220726221520-4f986261bf13 - go4.org/netipx v0.0.0-20230728180743-ad4cb58a6516 + go4.org/netipx v0.0.0-20230824141953-6213f710f925 golang.org/x/crypto v0.13.0 golang.org/x/exp v0.0.0-20230725093048-515e97ebf090 golang.org/x/mod v0.12.0 @@ -89,7 +89,7 @@ require ( golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 golang.zx2c4.com/wireguard/windows v0.5.3 gvisor.dev/gvisor v0.0.0-20230928000133-4fe30062272c - honnef.co/go/tools v0.4.3 + honnef.co/go/tools v0.4.5 inet.af/peercred v0.0.0-20210906144145-0893ea02156a inet.af/tcpproxy v0.0.0-20221017015627-91f861402626 inet.af/wf v0.0.0-20221017222439-36129f591884 diff --git a/go.sum b/go.sum index ebefa4111..ef411b784 100644 --- a/go.sum +++ b/go.sum @@ -981,6 +981,8 @@ go4.org/mem v0.0.0-20220726221520-4f986261bf13 h1:CbZeCBZ0aZj8EfVgnqQcYZgf0lpZ3H go4.org/mem v0.0.0-20220726221520-4f986261bf13/go.mod h1:reUoABIJ9ikfM5sgtSF3Wushcza7+WeD01VB9Lirh3g= go4.org/netipx v0.0.0-20230728180743-ad4cb58a6516 h1:X66ZEoMN2SuaoI/dfZVYobB6E5zjZyyHUMWlCA7MgGE= go4.org/netipx v0.0.0-20230728180743-ad4cb58a6516/go.mod h1:TQvodOM+hJTioNQJilmLXu08JNb8i+ccq418+KWu1/Y= +go4.org/netipx v0.0.0-20230824141953-6213f710f925 h1:eeQDDVKFkx0g4Hyy8pHgmZaK0EqB4SD6rvKbUdN3ziQ= +go4.org/netipx v0.0.0-20230824141953-6213f710f925/go.mod h1:PLyyIXexvUFg3Owu6p/WfdlivPbZJsZdgWZlrGope/Y= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -1452,6 +1454,8 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.4.3 h1:o/n5/K5gXqk8Gozvs2cnL0F2S1/g1vcGCAx2vETjITw= honnef.co/go/tools v0.4.3/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA= +honnef.co/go/tools v0.4.5 h1:YGD4H+SuIOOqsyoLOpZDWcieM28W47/zRO7f+9V3nvo= +honnef.co/go/tools v0.4.5/go.mod h1:GUV+uIBCLpdf0/v6UhHHG/yzI/z6qPskBeQCjcNB96k= howett.net/plist v1.0.0 h1:7CrbWYbPPO/PyNy38b2EB/+gYbjCe2DXBxgtOOZbSQM= howett.net/plist v1.0.0/go.mod h1:lqaXoTrLY4hg8tnEzNru53gicrbv7rrk+2xJA/7hw9g= inet.af/peercred v0.0.0-20210906144145-0893ea02156a h1:qdkS8Q5/i10xU2ArJMKYhVa1DORzBfYS/qA2UK2jheg= diff --git a/net/dnsfallback/dnsfallback.go b/net/dnsfallback/dnsfallback.go index de58fa38c..707ed2cf1 100644 --- a/net/dnsfallback/dnsfallback.go +++ b/net/dnsfallback/dnsfallback.go @@ -23,7 +23,6 @@ import ( "sync/atomic" "time" - "go4.org/netipx" "tailscale.com/atomicfile" "tailscale.com/envknob" "tailscale.com/net/dns/recursive" @@ -77,11 +76,13 @@ func MakeLookupFunc(logf logger.Logf, netMon *netmon.Monitor) func(ctx context.C metricRecursiveErrors.Add(1) return } - slices.SortFunc(addrs, netipx.CompareAddr) + + compareAddr := func(a, b netip.Addr) int { return a.Compare(b) } + slices.SortFunc(addrs, compareAddr) // Wait for a response from the main function oldAddrs := <-addrsCh - slices.SortFunc(oldAddrs, netipx.CompareAddr) + slices.SortFunc(oldAddrs, compareAddr) matches := slices.Equal(addrs, oldAddrs)