TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-29 13:05:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

control/controlclient: use slices package more

Browse Source 
Updates #cleanup

Change-Id: Ic17384266dc59bc4e710efdda311d6e0719529da
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2023-08-30 13:34:22 -07:00 committed by Brad Fitzpatrick
parent 37eab31f68
commit 313a129fe5
1 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
control/controlclient/direct.go
View File

@ -22,6 +22,7 @@
"os" "os"
"reflect" "reflect"
"runtime" "runtime"
"slices"
"strings" "strings"
"sync" "sync"
"sync/atomic" "sync/atomic"
@ -736,18 +737,6 @@ func resignNKS(priv key.NLPrivate, nodeKey key.NodePublic, oldNKS tkatype.Marsha
return newSig.Serialize(), nil return newSig.Serialize(), nil
} }
func sameEndpoints(a, b []tailcfg.Endpoint) bool {
if len(a) != len(b) {
return false
}
for i := range a {
if a[i] != b[i] {
return false
}
}
return true
}
// newEndpoints acquires c.mu and sets the local port and endpoints and reports // newEndpoints acquires c.mu and sets the local port and endpoints and reports
// whether they've changed. // whether they've changed.
// //
@ -757,15 +746,11 @@ func (c *Direct) newEndpoints(endpoints []tailcfg.Endpoint) (changed bool) {
defer c.mu.Unlock() defer c.mu.Unlock()
// Nothing new? // Nothing new?
if sameEndpoints(c.endpoints, endpoints) { if slices.Equal(c.endpoints, endpoints) {
return false // unchanged return false // unchanged
} }
var epStrs []string c.logf("[v2] client.newEndpoints(%v)", endpoints)
for _, ep := range endpoints { c.endpoints = slices.Clone(endpoints)
epStrs = append(epStrs, ep.Addr.String())
}
c.logf("[v2] client.newEndpoints(%v)", epStrs)
c.endpoints = append(c.endpoints[:0], endpoints...)
return true // changed return true // changed
} }