From e97c4c3033286f8d8bc4a2f3d4ebe8014d0d0cf7 Mon Sep 17 00:00:00 2001 From: Colin Adler Date: Fri, 18 Oct 2024 16:58:38 -0500 Subject: [PATCH] fix(ssh): timeout stalled ssh connections after 15-30s Closes https://github.com/coder/wush/issues/33 --- cmd/wush/ssh.go | 2 +- go.mod | 4 ++-- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/wush/ssh.go b/cmd/wush/ssh.go index 8a51e9c..4e7b86a 100644 --- a/cmd/wush/ssh.go +++ b/cmd/wush/ssh.go @@ -86,7 +86,7 @@ func sshCmd() *serpent.Command { } } - return xssh.TailnetSSH(ctx, inv, ts, ip.String()+":3", quiet) + return xssh.TailnetSSH(ctx, inv, ts, netip.AddrPortFrom(ip, 3).String(), quiet) }, Options: []serpent.Option{ { diff --git a/go.mod b/go.mod index 1badb5c..c23fe34 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/coder/wush go 1.22.6 -replace tailscale.com => github.com/coadler/tailscale v1.1.1-0.20240926000438-059d0c1039af +replace tailscale.com => github.com/coadler/tailscale v1.1.1-0.20241018213052-0d22086da1b2 // replace tailscale.com => /home/colin/Projects/coadler/tailscale @@ -34,7 +34,7 @@ require ( golang.org/x/sys v0.26.0 golang.org/x/term v0.25.0 golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da - tailscale.com v1.70.0 + tailscale.com v1.76.1 ) require ( diff --git a/go.sum b/go.sum index 123507e..0f2433c 100644 --- a/go.sum +++ b/go.sum @@ -145,8 +145,8 @@ github.com/cilium/ebpf v0.15.0 h1:7NxJhNiBT3NG8pZJ3c+yfrVdHY8ScgKD27sScgjLMMk= github.com/cilium/ebpf v0.15.0/go.mod h1:DHp1WyrLeiBh19Cf/tfiSMhqheEiK8fXFZ4No0P1Hso= github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU= github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA= -github.com/coadler/tailscale v1.1.1-0.20240926000438-059d0c1039af h1:7h0hQxaizCT3u7Fu9b6k1NgGj4EHxx/K3H7YBAFanVE= -github.com/coadler/tailscale v1.1.1-0.20240926000438-059d0c1039af/go.mod h1:rRq+xvgprFys8sZbJgcAMMqpiP6r+Y75CJRhCRmXrd0= +github.com/coadler/tailscale v1.1.1-0.20241018213052-0d22086da1b2 h1:tPtLbP7XIycbAaHUW78XWWhnnGOe+/ejL7tT5wVfH50= +github.com/coadler/tailscale v1.1.1-0.20241018213052-0d22086da1b2/go.mod h1:rRq+xvgprFys8sZbJgcAMMqpiP6r+Y75CJRhCRmXrd0= github.com/coder/coder/v2 v2.16.0 h1:+IzbcLU7YFUp6knJJhS4xw8yphuqrIUKt7mIk7LwUQA= github.com/coder/coder/v2 v2.16.0/go.mod h1:/kiN4IfNwd5T7xGEyVbp7jiNOVaHtdiIDyLqN9OqboE= github.com/coder/pretty v0.0.0-20230908205945-e89ba86370e0 h1:3A0ES21Ke+FxEM8CXx9n47SZOKOpgSE1bbJzlE4qPVs=