Commitf674d83

committed

fix(tailnet): update WorkspaceAgentSSHPort to 22

Change-Id: Ifd986b260f8ac317e37d65111cd4e0bd1dc38af8Signed-off-by: Thomas Kosiewski <tk@coder.com>

1 parentad275dc commitf674d83Copy full SHA for f674d83

File tree

+17

-12

lines changed

+17

-12

lines changed

Lines changed: 14 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -1193,19 +1193,22 @@ func (a *agent) createTailnet(`
`1193`	`1193`	`returnnil,xerrors.Errorf("update host signer: %w",err)`
`1194`	`1194`	`}`
`1195`	`1195`
`1196`		`-sshListener,err:=network.Listen("tcp",":"+strconv.Itoa(workspacesdk.AgentSSHPort))`
`1197`		`-iferr!=nil {`
`1198`		`-returnnil,xerrors.Errorf("listen on the ssh port: %w",err)`
`1199`		`-}`
`1200`		`-deferfunc() {`
	`1196`	`+for_,port:=range []int{workspacesdk.AgentSSHPort,workspacesdk.AgentStandardSSHPort} {`
	`1197`	`+sshListener,err:=network.Listen("tcp",":"+strconv.Itoa(port))`
`1201`	`1198`	`iferr!=nil {`
`1202`		`-_=sshListener.Close()`
	`1199`	`+returnnil,xerrors.Errorf("listen on the ssh port (%v): %w",port,err)`
	`1200`	`+}`
	`1201`	`+// nolint:revive // We do want to run the deferred functions when createTailnet returns.`
	`1202`	`+deferfunc() {`
	`1203`	`+iferr!=nil {`
	`1204`	`+_=sshListener.Close()`
	`1205`	`+}`
	`1206`	`+}()`
	`1207`	`+iferr=a.trackGoroutine(func() {`
	`1208`	`+_=a.sshServer.Serve(sshListener)`
	`1209`	`+});err!=nil {`
	`1210`	`+returnnil,err`
`1203`	`1211`	`}`
`1204`		`-}()`
`1205`		`-iferr=a.trackGoroutine(func() {`
`1206`		`-_=a.sshServer.Serve(sshListener)`
`1207`		`-});err!=nil {`
`1208`		`-returnnil,err`
`1209`	`1212`	`}`
`1210`	`1213`
`1211`	`1214`	`reconnectingPTYListener,err:=network.Listen("tcp",":"+strconv.Itoa(workspacesdk.AgentReconnectingPTYPort))`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ var ErrSkipClose = xerrors.New("skip tailnet close")`
`29`	`29`
`30`	`30`	`const (`
`31`	`31`	`AgentSSHPort=tailnet.WorkspaceAgentSSHPort`
	`32`	`+AgentStandardSSHPort=tailnet.WorkspaceAgentStandardSSHPort`
`32`	`33`	`AgentReconnectingPTYPort=tailnet.WorkspaceAgentReconnectingPTYPort`
`33`	`34`	`AgentSpeedtestPort=tailnet.WorkspaceAgentSpeedtestPort`
`34`	`35`	`// AgentHTTPAPIServerPort serves a HTTP server with endpoints for e.g.`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,7 @@ const (`
`52`	`52`	`WorkspaceAgentSSHPort=1`
`53`	`53`	`WorkspaceAgentReconnectingPTYPort=2`
`54`	`54`	`WorkspaceAgentSpeedtestPort=3`
	`55`	`+WorkspaceAgentStandardSSHPort=22`
`55`	`56`	`)`
`56`	`57`
`57`	`58`	`// EnvMagicsockDebugLogging enables super-verbose logging for the magicsock`
`@@ -745,7 +746,7 @@ func (c *Conn) forwardTCP(src, dst netip.AddrPort) (handler func(net.Conn), opts`
`745`	`746`	`returnnil,nil,false`
`746`	`747`	`}`
`747`	`748`	`// See: https://github.com/tailscale/tailscale/blob/c7cea825aea39a00aca71ea02bab7266afc03e7c/wgengine/netstack/netstack.go#L888`
`748`		`-ifdst.Port()==WorkspaceAgentSSHPort\|\|dst.Port()==22 {`
	`749`	`+ifdst.Port()==WorkspaceAgentSSHPort\|\|dst.Port()==WorkspaceAgentStandardSSHPort {`
`749`	`750`	`opt:=tcpip.KeepaliveIdleOption(72*time.Hour)`
`750`	`751`	`opts=append(opts,&opt)`
`751`	`752`	`}`

Comments

(0)