TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-12-01 14:05:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

wgengine/wgcfg/nmcfg: don't configure peers who can't DERP or disco.

Browse Source 
Fixes #2770

Signed-off-by: David Anderson <danderson@tailscale.com>
This commit is contained in:
David Anderson 2021-09-01 15:29:06 -07:00 committed by Dave Anderson
parent f90ac11bd8
commit 954064bdfe
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wgengine/wgcfg/nmcfg/nmcfg.go
View File

@ -69,6 +69,12 @@ func WGCfg(nm *netmap.NetworkMap, logf logger.Logf, flags netmap.WGConfigFlags,
if controlclient.Debug.OnlyDisco && peer.DiscoKey.IsZero() { if controlclient.Debug.OnlyDisco && peer.DiscoKey.IsZero() {
continue continue
} }
if peer.DiscoKey.IsZero() && peer.DERP == "" {
// Peer predates both DERP and active discovery, we cannot
// communicate with it.
logf("[v1] wgcfg: skipped peer %s, doesn't offer DERP or disco", peer.Key.ShortString())
continue
}
cfg.Peers = append(cfg.Peers, wgcfg.Peer{ cfg.Peers = append(cfg.Peers, wgcfg.Peer{
PublicKey: wgkey.Key(peer.Key), PublicKey: wgkey.Key(peer.Key),
DiscoKey: peer.DiscoKey, DiscoKey: peer.DiscoKey,