From 7b907615d5a8dfff5df5adc81e324d57dc41fb4f Mon Sep 17 00:00:00 2001 From: Josh Bleecher Snyder Date: Mon, 29 Mar 2021 10:27:06 -0700 Subject: [PATCH] wgengine/wgcfg/nmcfg: remove dead code The call to appendEndpoint updates cpeer.Endpoints. Then it is overwritten in the next line. The only errors from appendEndpoint occur when the host/port pair is malformed, but that cannot happen. Signed-off-by: Josh Bleecher Snyder --- wgengine/wgcfg/nmcfg/nmcfg.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/wgengine/wgcfg/nmcfg/nmcfg.go b/wgengine/wgcfg/nmcfg/nmcfg.go index 57053ea78..8bd807ecf 100644 --- a/wgengine/wgcfg/nmcfg/nmcfg.go +++ b/wgengine/wgcfg/nmcfg/nmcfg.go @@ -74,9 +74,6 @@ func WGCfg(nm *netmap.NetworkMap, logf logger.Logf, flags netmap.WGConfigFlags, } if !peer.DiscoKey.IsZero() { - if err := appendEndpoint(cpeer, fmt.Sprintf("%x%s", peer.DiscoKey[:], wgcfg.EndpointDiscoSuffix)); err != nil { - return nil, err - } cpeer.Endpoints = fmt.Sprintf("%x.disco.tailscale:12345", peer.DiscoKey[:]) } else { if err := appendEndpoint(cpeer, peer.DERP); err != nil {