summaryrefslogtreecommitdiffhomepage
path: root/cmd
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@tailscale.com>2022-11-07 15:32:53 -0800
committerBrad Fitzpatrick <brad@danga.com>2022-11-08 19:39:07 -0800
commit2daf0f146c5f644e6345f79fe9c538ae730485c2 (patch)
tree829cb1b006d06b75f175aaf5ae1167a2f341e9eb /cmd
parentacf5839dd23dd661edfed1d159ac963251e2380d (diff)
downloadtailscale-bradfitz/port_intercept.tar.xz
tailscale-bradfitz/port_intercept.zip
ipn/ipnlocal, wgengine/netstack: start handling ports for future servingbradfitz/port_intercept
Updates tailscale/corp#7515 Change-Id: I966e936e72a2ee99be8d0f5f16872b48cc150258 Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
Diffstat (limited to 'cmd')
-rw-r--r--cmd/tailscale/cli/debug.go10
-rw-r--r--cmd/tailscaled/depaware.txt2
2 files changed, 10 insertions, 2 deletions
diff --git a/cmd/tailscale/cli/debug.go b/cmd/tailscale/cli/debug.go
index de68a7ef6..526da75b5 100644
--- a/cmd/tailscale/cli/debug.go
+++ b/cmd/tailscale/cli/debug.go
@@ -568,5 +568,13 @@ func runDevStoreSet(ctx context.Context, args []string) error {
if !devStoreSetArgs.danger {
return errors.New("this command is dangerous; use --danger to proceed")
}
- return localClient.SetDevStoreKeyValue(ctx, args[0], args[1])
+ key, val := args[0], args[1]
+ if val == "-" {
+ valb, err := io.ReadAll(os.Stdin)
+ if err != nil {
+ return err
+ }
+ val = string(valb)
+ }
+ return localClient.SetDevStoreKeyValue(ctx, key, val)
}
diff --git a/cmd/tailscaled/depaware.txt b/cmd/tailscaled/depaware.txt
index ff43ec4cd..0439e1e78 100644
--- a/cmd/tailscaled/depaware.txt
+++ b/cmd/tailscaled/depaware.txt
@@ -290,7 +290,7 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de
tailscale.com/util/singleflight from tailscale.com/control/controlclient+
tailscale.com/util/strs from tailscale.com/hostinfo+
tailscale.com/util/systemd from tailscale.com/control/controlclient+
- tailscale.com/util/uniq from tailscale.com/wgengine/magicsock
+ tailscale.com/util/uniq from tailscale.com/wgengine/magicsock+
💣 tailscale.com/util/winutil from tailscale.com/cmd/tailscaled+
tailscale.com/version from tailscale.com/derp+
tailscale.com/version/distro from tailscale.com/hostinfo+