fix(tailnet): update WorkspaceAgentSSHPort to 22

ThomasK33 · ThomasK33 · commit 7a2f8dd0f943 · 2025-02-20T12:15:54.000+01:00
Change-Id: Ifd986b260f8ac317e37d65111cd4e0bd1dc38af8
Signed-off-by: Thomas Kosiewski &lt;tk@coder.com&gt;
diff --git a/tailnet/conn.go b/tailnet/conn.go
@@ -49,7 +49,7 @@ import (
 var ErrConnClosed = xerrors.New("connection closed")
 
 const (
-	WorkspaceAgentSSHPort             = 1
+	WorkspaceAgentSSHPort             = 22
 	WorkspaceAgentReconnectingPTYPort = 2
 	WorkspaceAgentSpeedtestPort       = 3
 )
@@ -745,7 +745,7 @@ func (c *Conn) forwardTCP(src, dst netip.AddrPort) (handler func(net.Conn), opts
 		return nil, nil, false
 	}
 	// See: https://github.com/tailscale/tailscale/blob/c7cea825aea39a00aca71ea02bab7266afc03e7c/wgengine/netstack/netstack.go#L888
-	if dst.Port() == WorkspaceAgentSSHPort || dst.Port() == 22 {
+	if dst.Port() == WorkspaceAgentSSHPort {
 		opt := tcpip.KeepaliveIdleOption(72 * time.Hour)
 		opts = append(opts, &opt)
 	}

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ import (`
`49`	`49`	`var ErrConnClosed = xerrors.New("connection closed")`
`50`	`50`
`51`	`51`	`const (`
`52`		`- WorkspaceAgentSSHPort = 1`
	`52`	`+ WorkspaceAgentSSHPort = 22`
`53`	`53`	`WorkspaceAgentReconnectingPTYPort = 2`
`54`	`54`	`WorkspaceAgentSpeedtestPort = 3`
`55`	`55`	`)`
`@@ -745,7 +745,7 @@ func (c *Conn) forwardTCP(src, dst netip.AddrPort) (handler func(net.Conn), opts`
`745`	`745`	`return nil, nil, false`
`746`	`746`	`}`
`747`	`747`	`// See: https://github.com/tailscale/tailscale/blob/c7cea825aea39a00aca71ea02bab7266afc03e7c/wgengine/netstack/netstack.go#L888`
`748`		`- if dst.Port() == WorkspaceAgentSSHPort \|\| dst.Port() == 22 {`
	`748`	`+ if dst.Port() == WorkspaceAgentSSHPort {`
`749`	`749`	`opt := tcpip.KeepaliveIdleOption(72 * time.Hour)`
`750`	`750`	`opts = append(opts, &opt)`
`751`	`751`	`}`