TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-29 04:55:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/tailscale/cli: fix build break

Browse Source 
Accidental break from 64d482ff48.

Signed-off-by: Maisem Ali <maisem@tailscale.com>
This commit is contained in:
Maisem Ali 2022-08-15 06:47:12 -07:00 committed by Maisem Ali
parent d4916a8be3
commit dbcc34981a
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/tailscale/cli/debug.go
View File

@ -489,7 +489,7 @@ func runTS2021(ctx context.Context, args []string) error {
return c, err return c, err
} }
conn, err := controlhttp.Dial(ctx, net.JoinHostPort(ts2021Args.host, "80"), machinePrivate, keys.PublicKey, uint16(ts2021Args.version), dialFunc) conn, err := controlhttp.Dial(ctx, ts2021Args.host, "80", "443", machinePrivate, keys.PublicKey, uint16(ts2021Args.version), dialFunc)
log.Printf("controlhttp.Dial = %p, %v", conn, err) log.Printf("controlhttp.Dial = %p, %v", conn, err)
if err != nil { if err != nil {
return err return err

11
control/controlhttp/client_js.go
View File

@ -18,25 +18,20 @@
// Variant of Dial that tunnels the request over WebSockets, since we cannot do // Variant of Dial that tunnels the request over WebSockets, since we cannot do
// bi-directional communication over an HTTP connection when in JS. // bi-directional communication over an HTTP connection when in JS.
func Dial(ctx context.Context, addr string, machineKey key.MachinePrivate, controlKey key.MachinePublic, protocolVersion uint16, dialer dnscache.DialContextFunc) (*controlbase.Conn, error) { func Dial(ctx context.Context, host string, httpPort string, httpsPort string, machineKey key.MachinePrivate, controlKey key.MachinePublic, protocolVersion uint16, dialer dnscache.DialContextFunc) (*controlbase.Conn, error) {
init, cont, err := controlbase.ClientDeferred(machineKey, controlKey, protocolVersion) init, cont, err := controlbase.ClientDeferred(machineKey, controlKey, protocolVersion)
if err != nil { if err != nil {
return nil, err return nil, err
} }
host, _, err := net.SplitHostPort(addr)
if err != nil {
return nil, err
}
wsScheme := "wss" wsScheme := "wss"
wsHost := host
if host == "localhost" { if host == "localhost" {
wsScheme = "ws" wsScheme = "ws"
wsHost = addr host = net.JoinHostPort(host, httpPort)
} }
wsURL := &url.URL{ wsURL := &url.URL{
Scheme: wsScheme, Scheme: wsScheme,
Host: wsHost, Host: host,
Path: serverUpgradePath, Path: serverUpgradePath,
// Can't set HTTP headers on the websocket request, so we have to to send // Can't set HTTP headers on the websocket request, so we have to to send
// the handshake via an HTTP header. // the handshake via an HTTP header.