summaryrefslogtreecommitdiffhomepage
path: root/control/controlclient/map.go
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@tailscale.com>2023-08-19 19:26:55 -0700
committerBrad Fitzpatrick <bradfitz@tailscale.com>2023-08-20 07:59:59 -0700
commit54a91c1a58181e0619031e5b2996506d02ce03a1 (patch)
tree0d8445117f6b1e8134f35242cb71d0f5cd2f166e /control/controlclient/map.go
parentd483ed777442906520d8b00465cf573e66cbe267 (diff)
downloadtailscale-bradfitz/tkasig_type.tar.xz
tailscale-bradfitz/tkasig_type.zip
types/tkatype: change MarshaledSignature from []byte to stringbradfitz/tkasig_type
The MarshaledSignature's underlying type of []byte didn't play nicely with cmd/viewer, which mapped the []byte to a mem.RO handle which was then clumsy to work with. Instead, change it to a string. (But keep its JSON encoding for compatibility) Updates #1909 Change-Id: I9bc86a892c21958b3f33bfdda9dbb27c8fbb1ef8 Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
Diffstat (limited to 'control/controlclient/map.go')
-rw-r--r--control/controlclient/map.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/control/controlclient/map.go b/control/controlclient/map.go
index ef99a2609..71e8eeee7 100644
--- a/control/controlclient/map.go
+++ b/control/controlclient/map.go
@@ -330,7 +330,7 @@ func undeltaPeers(mapRes *tailcfg.MapResponse, prev []*tailcfg.Node) {
if v := ec.Capabilities; v != nil {
n.Capabilities = *v
}
- if v := ec.KeySignature; v != nil {
+ if v := ec.KeySignature; v != "" {
n.KeySignature = v
}
}