mirrors/tailscale
1
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

control/controlclient: remove unused NetworkMap.UAPI method

Browse Source 
And remove last remaining use of wgcfg.ToUAPI in a test's debug
output; replace it with JSON.
This commit is contained in:
Brad Fitzpatrick
2020-08-06 10:23:16 -07:00
parent cff737786e
commit 41c4560592
2 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
control/controlclient/netmap.go
View File

@ -7,7 +7,6 @@ package controlclient
import (
"encoding/json"
"fmt"
"log"
"net"
"reflect"
"strconv"
@ -223,20 +222,6 @@ const (
HackDefaultRoute
)
// TODO(bradfitz): UAPI seems to only be used by the old confnode and
// pingnode; delete this when those are deleted/rewritten?
func (nm *NetworkMap) UAPI(flags WGConfigFlags) string {
wgcfg, err := nm.WGCfg(log.Printf, flags)
if err != nil {
log.Fatalf("WGCfg() failed unexpectedly: %v", err)
}
s, err := wgcfg.ToUAPI()
if err != nil {
log.Fatalf("ToUAPI() failed unexpectedly: %v", err)
}
return s
}
// EndpointDiscoSuffix is appended to the hex representation of a peer's discovery key
// and is then the sole wireguard endpoint for peers with a non-zero discovery key.
// This form is then recognize by magicsock's CreateEndpoint.