TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-02-18 02:48:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

control/controlclient: rename map debug knob, make it do both request+response

Browse Source 
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2020-10-20 10:40:52 -07:00 committed by Brad Fitzpatrick
parent 6b1d2a5630
commit 3909c82f3d
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
control/controlclient/direct.go
View File

@ -781,7 +781,7 @@ func decode(res *http.Response, v interface{}, serverKey *wgcfg.Key, mkey *wgcfg
return decodeMsg(msg, v, serverKey, mkey) return decodeMsg(msg, v, serverKey, mkey)
} }
var dumpMapResponse, _ = strconv.ParseBool(os.Getenv("TS_DEBUG_MAPRESPONSE")) var debugMap, _ = strconv.ParseBool(os.Getenv("TS_DEBUG_MAP"))
func (c *Direct) decodeMsg(msg []byte, v interface{}) error { func (c *Direct) decodeMsg(msg []byte, v interface{}) error {
c.mu.Lock() c.mu.Lock()
@ -806,7 +806,7 @@ func (c *Direct) decodeMsg(msg []byte, v interface{}) error {
return err return err
} }
} }
if dumpMapResponse { if debugMap {
var buf bytes.Buffer var buf bytes.Buffer
json.Indent(&buf, b, "", " ") json.Indent(&buf, b, "", " ")
log.Printf("MapResponse: %s", buf.Bytes()) log.Printf("MapResponse: %s", buf.Bytes())
@ -850,8 +850,7 @@ func encode(v interface{}, serverKey *wgcfg.Key, mkey *wgcfg.PrivateKey) ([]byte
if err != nil { if err != nil {
return nil, err return nil, err
} }
const debugMapRequests = false if debugMap {
if debugMapRequests {
if _, ok := v.(tailcfg.MapRequest); ok { if _, ok := v.(tailcfg.MapRequest); ok {
log.Printf("MapRequest: %s", b) log.Printf("MapRequest: %s", b)
} }