TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-25 19:15:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

go.mod: bump bart

Browse Source 
Updates #bart

Signed-off-by: Maisem Ali <maisem@tailscale.com>
This commit is contained in:
Maisem Ali 2024-07-08 18:17:38 -07:00 committed by Maisem Ali
parent 8bd442ba8c
commit 2238ca8a05
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/natc/natc.go
View File

@ -448,7 +448,7 @@ func (c *connector) handleTCPFlow(src, dst netip.AddrPort) (handler func(net.Con
// in --ignore-destinations // in --ignore-destinations
func (c *connector) ignoreDestination(dstAddrs []netip.Addr) bool { func (c *connector) ignoreDestination(dstAddrs []netip.Addr) bool {
for _, a := range dstAddrs { for _, a := range dstAddrs {
if _, ok := c.ignoreDsts.Get(a); ok { if _, ok := c.ignoreDsts.Lookup(a); ok {
return true return true
} }
} }
@ -489,7 +489,7 @@ type perPeerState struct {
func (ps *perPeerState) domainForIP(ip netip.Addr) (_ string, ok bool) { func (ps *perPeerState) domainForIP(ip netip.Addr) (_ string, ok bool) {
ps.mu.Lock() ps.mu.Lock()
defer ps.mu.Unlock() 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 // 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. // domain.
// ps.mu must be held. // ps.mu must be held.
func (ps *perPeerState) isIPUsedLocked(ip netip.Addr) bool { func (ps *perPeerState) isIPUsedLocked(ip netip.Addr) bool {
_, ok := ps.addrToDomain.Get(ip) _, ok := ps.addrToDomain.Lookup(ip)
return ok return ok
} }

2
go.mod
View File

@ -30,7 +30,7 @@ require (
github.com/evanw/esbuild v0.19.11 github.com/evanw/esbuild v0.19.11
github.com/frankban/quicktest v1.14.6 github.com/frankban/quicktest v1.14.6
github.com/fxamacker/cbor/v2 v2.6.0 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-json-experiment/json v0.0.0-20231102232822-2e55bd4e08b0
github.com/go-logr/zapr v1.3.0 github.com/go-logr/zapr v1.3.0
github.com/go-ole/go-ole v1.3.0 github.com/go-ole/go-ole v1.3.0

4
go.sum
View File

@ -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/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 h1:lsblElZG7d3ALtGMx9fmxeTKZaLLpU8mET09yN4BBLo=
github.com/fzipp/gocyclo v0.6.0/go.mod h1:rXPyn8fnlpa0R2csP/31uerbiVBugk5whMdlyaLkLoA= 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.11.1 h1:5Uv5XwsaFBRo4E5VBcb9TzY8B7zxFf+U7isDxqOrRfc=
github.com/gaissmai/bart v0.4.1/go.mod h1:KHeYECXQiBjTzQz/om2tqn3sZF1J7hw9m6z41ftj3fg= 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 h1:Km/MVOFvclqxPM9dZBC4+QE564nU4gz4iZ0D9pMw28I=
github.com/github/fakeca v0.1.0/go.mod h1:+bormgoGMMuamOscx7N91aOuUST7wdaJ2rNjeohylyo= github.com/github/fakeca v0.1.0/go.mod h1:+bormgoGMMuamOscx7N91aOuUST7wdaJ2rNjeohylyo=
github.com/gliderlabs/ssh v0.3.5 h1:OcaySEmAQJgyYcArR+gGGTHCyE7nvhEMTlYY+Dp8CpY= github.com/gliderlabs/ssh v0.3.5 h1:OcaySEmAQJgyYcArR+gGGTHCyE7nvhEMTlYY+Dp8CpY=

2
net/ipset/ipset.go
View File

@ -22,7 +22,7 @@ func emptySet(ip netip.Addr) bool { return false }
func bartLookup(t *bart.Table[struct{}]) func(netip.Addr) bool { func bartLookup(t *bart.Table[struct{}]) func(netip.Addr) bool {
return func(ip netip.Addr) bool { return func(ip netip.Addr) bool {
_, ok := t.Get(ip) _, ok := t.Lookup(ip)
return ok return ok
} }
} }

2
net/tsdial/tsdial.go
View File

@ -417,7 +417,7 @@ func (d *Dialer) UserDial(ctx context.Context, network, addr string) (net.Conn,
} }
if routes := d.routes.Load(); routes != nil { 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()) return d.getPeerDialer().DialContext(ctx, network, ipp.String())
} }

8
net/tstun/wrap.go
View File

@ -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 // 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 // be a masquerade address that we told other nodes to use, or one of
// our local node's Addresses. // our local node's Addresses.
c, ok := pc.byIP.Get(src) c, ok := pc.byIP.Lookup(src)
if !ok { if !ok {
return oldDst return oldDst
} }
@ -657,7 +657,7 @@ func (pc *peerConfigTable) selectSrcIP(oldSrc, dst netip.Addr) netip.Addr {
} }
// Look up the configuration for the destination // Look up the configuration for the destination
c, ok := pc.byIP.Get(dst) c, ok := pc.byIP.Lookup(dst)
if !ok { if !ok {
return oldSrc return oldSrc
} }
@ -767,7 +767,7 @@ func (pc *peerConfigTable) inboundPacketIsJailed(p *packet.Parsed) bool {
if pc == nil { if pc == nil {
return false return false
} }
c, ok := pc.byIP.Get(p.Src.Addr()) c, ok := pc.byIP.Lookup(p.Src.Addr())
if !ok { if !ok {
return false return false
} }
@ -778,7 +778,7 @@ func (pc *peerConfigTable) outboundPacketIsJailed(p *packet.Parsed) bool {
if pc == nil { if pc == nil {
return false return false
} }
c, ok := pc.byIP.Get(p.Dst.Addr()) c, ok := pc.byIP.Lookup(p.Dst.Addr())
if !ok { if !ok {
return false return false
} }