From 2238ca8a05f227c8f9f37c6f911b80acdc4c19a8 Mon Sep 17 00:00:00 2001 From: Maisem Ali Date: Mon, 8 Jul 2024 18:17:38 -0700 Subject: [PATCH] go.mod: bump bart Updates #bart Signed-off-by: Maisem Ali --- cmd/natc/natc.go | 6 +++--- go.mod | 2 +- go.sum | 4 ++-- net/ipset/ipset.go | 2 +- net/tsdial/tsdial.go | 2 +- net/tstun/wrap.go | 8 ++++---- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cmd/natc/natc.go b/cmd/natc/natc.go index 68fd115e3..41166fd4a 100644 --- a/cmd/natc/natc.go +++ b/cmd/natc/natc.go @@ -448,7 +448,7 @@ func (c *connector) handleTCPFlow(src, dst netip.AddrPort) (handler func(net.Con // in --ignore-destinations func (c *connector) ignoreDestination(dstAddrs []netip.Addr) bool { for _, a := range dstAddrs { - if _, ok := c.ignoreDsts.Get(a); ok { + if _, ok := c.ignoreDsts.Lookup(a); ok { return true } } @@ -489,7 +489,7 @@ type perPeerState struct { func (ps *perPeerState) domainForIP(ip netip.Addr) (_ string, ok bool) { ps.mu.Lock() defer ps.mu.Unlock() - return ps.addrToDomain.Get(ip) + return ps.addrToDomain.Lookup(ip) } // ipForDomain assigns a pair of unique IP addresses for the given domain and @@ -515,7 +515,7 @@ func (ps *perPeerState) ipForDomain(domain string) ([]netip.Addr, error) { // domain. // ps.mu must be held. func (ps *perPeerState) isIPUsedLocked(ip netip.Addr) bool { - _, ok := ps.addrToDomain.Get(ip) + _, ok := ps.addrToDomain.Lookup(ip) return ok } diff --git a/go.mod b/go.mod index 0320d471d..0d5a69d6c 100644 --- a/go.mod +++ b/go.mod @@ -30,7 +30,7 @@ require ( github.com/evanw/esbuild v0.19.11 github.com/frankban/quicktest v1.14.6 github.com/fxamacker/cbor/v2 v2.6.0 - github.com/gaissmai/bart v0.4.1 + github.com/gaissmai/bart v0.11.1 github.com/go-json-experiment/json v0.0.0-20231102232822-2e55bd4e08b0 github.com/go-logr/zapr v1.3.0 github.com/go-ole/go-ole v1.3.0 diff --git a/go.sum b/go.sum index 9ac2c01da..863b9db02 100644 --- a/go.sum +++ b/go.sum @@ -312,8 +312,8 @@ github.com/fxamacker/cbor/v2 v2.6.0 h1:sU6J2usfADwWlYDAFhZBQ6TnLFBHxgesMrQfQgk1t github.com/fxamacker/cbor/v2 v2.6.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ= github.com/fzipp/gocyclo v0.6.0 h1:lsblElZG7d3ALtGMx9fmxeTKZaLLpU8mET09yN4BBLo= github.com/fzipp/gocyclo v0.6.0/go.mod h1:rXPyn8fnlpa0R2csP/31uerbiVBugk5whMdlyaLkLoA= -github.com/gaissmai/bart v0.4.1 h1:G1t58voWkNmT47lBDawH5QhtTDsdqRIO+ftq5x4P9Ls= -github.com/gaissmai/bart v0.4.1/go.mod h1:KHeYECXQiBjTzQz/om2tqn3sZF1J7hw9m6z41ftj3fg= +github.com/gaissmai/bart v0.11.1 h1:5Uv5XwsaFBRo4E5VBcb9TzY8B7zxFf+U7isDxqOrRfc= +github.com/gaissmai/bart v0.11.1/go.mod h1:KHeYECXQiBjTzQz/om2tqn3sZF1J7hw9m6z41ftj3fg= github.com/github/fakeca v0.1.0 h1:Km/MVOFvclqxPM9dZBC4+QE564nU4gz4iZ0D9pMw28I= github.com/github/fakeca v0.1.0/go.mod h1:+bormgoGMMuamOscx7N91aOuUST7wdaJ2rNjeohylyo= github.com/gliderlabs/ssh v0.3.5 h1:OcaySEmAQJgyYcArR+gGGTHCyE7nvhEMTlYY+Dp8CpY= diff --git a/net/ipset/ipset.go b/net/ipset/ipset.go index 70068d0a2..622fd61d0 100644 --- a/net/ipset/ipset.go +++ b/net/ipset/ipset.go @@ -22,7 +22,7 @@ func emptySet(ip netip.Addr) bool { return false } func bartLookup(t *bart.Table[struct{}]) func(netip.Addr) bool { return func(ip netip.Addr) bool { - _, ok := t.Get(ip) + _, ok := t.Lookup(ip) return ok } } diff --git a/net/tsdial/tsdial.go b/net/tsdial/tsdial.go index d69075318..f0c4b1042 100644 --- a/net/tsdial/tsdial.go +++ b/net/tsdial/tsdial.go @@ -417,7 +417,7 @@ func (d *Dialer) UserDial(ctx context.Context, network, addr string) (net.Conn, } if routes := d.routes.Load(); routes != nil { - if isTailscaleRoute, _ := routes.Get(ipp.Addr()); isTailscaleRoute { + if isTailscaleRoute, _ := routes.Lookup(ipp.Addr()); isTailscaleRoute { return d.getPeerDialer().DialContext(ctx, network, ipp.String()) } diff --git a/net/tstun/wrap.go b/net/tstun/wrap.go index 06296815d..e80639048 100644 --- a/net/tstun/wrap.go +++ b/net/tstun/wrap.go @@ -626,7 +626,7 @@ func (pc *peerConfigTable) mapDstIP(src, oldDst netip.Addr) netip.Addr { // The 'dst' of the packet is the address for this local node. It could // be a masquerade address that we told other nodes to use, or one of // our local node's Addresses. - c, ok := pc.byIP.Get(src) + c, ok := pc.byIP.Lookup(src) if !ok { return oldDst } @@ -657,7 +657,7 @@ func (pc *peerConfigTable) selectSrcIP(oldSrc, dst netip.Addr) netip.Addr { } // Look up the configuration for the destination - c, ok := pc.byIP.Get(dst) + c, ok := pc.byIP.Lookup(dst) if !ok { return oldSrc } @@ -767,7 +767,7 @@ func (pc *peerConfigTable) inboundPacketIsJailed(p *packet.Parsed) bool { if pc == nil { return false } - c, ok := pc.byIP.Get(p.Src.Addr()) + c, ok := pc.byIP.Lookup(p.Src.Addr()) if !ok { return false } @@ -778,7 +778,7 @@ func (pc *peerConfigTable) outboundPacketIsJailed(p *packet.Parsed) bool { if pc == nil { return false } - c, ok := pc.byIP.Get(p.Dst.Addr()) + c, ok := pc.byIP.Lookup(p.Dst.Addr()) if !ok { return false }