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

controlhttp: add some docs, change Dial's path from /switch to /ts2021

Browse Source 
When I deployed server-side changes, I put the upgrade handler at /ts2021
instead of /switch. We could move the server to /switch, but ts2021 seems
more specific and better, but I don't feel strongly.

Updates #3488

Change-Id: Ifbf8ea60a815fd2fa1bfbe1b7af1ac2a27218354
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2022-02-26 09:19:18 -08:00 committed by Brad Fitzpatrick
parent 4b50977422
commit 5d085a6f41
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
control/controlhttp/client.go
View File

@ -40,11 +40,19 @@
"tailscale.com/types/key" "tailscale.com/types/key"
) )
// upgradeHeader is the value of the Upgrade HTTP header used to
// indicate the Tailscale control protocol.
const ( const (
upgradeHeaderValue = "tailscale-control-protocol" // upgradeHeader is the value of the Upgrade HTTP header used to
// indicate the Tailscale control protocol.
upgradeHeaderValue = "tailscale-control-protocol"
// handshakeHeaderName is the HTTP request header that can
// optionally contain base64-encoded initial handshake
// payload, to save an RTT.
handshakeHeaderName = "X-Tailscale-Handshake" handshakeHeaderName = "X-Tailscale-Handshake"
// serverUpgradePath is where the server-side HTTP handler to
// to do the protocol switch is located.
serverUpgradePath = "/ts2021"
) )
// Dial connects to the HTTP server at addr, requests to switch to the // Dial connects to the HTTP server at addr, requests to switch to the
@ -53,6 +61,9 @@
// //
// If Dial fails to connect using addr, it also tries to tunnel over // If Dial fails to connect using addr, it also tries to tunnel over
// TLS to <addr's host>:443 as a compatibility fallback. // TLS to <addr's host>:443 as a compatibility fallback.
//
// The provided ctx is only used for the initial connection, until
// Dial returns. It does not affect the connection once established.
func Dial(ctx context.Context, addr string, machineKey key.MachinePrivate, controlKey key.MachinePublic) (*controlbase.Conn, error) { func Dial(ctx context.Context, addr string, machineKey key.MachinePrivate, controlKey key.MachinePublic) (*controlbase.Conn, error) {
host, port, err := net.SplitHostPort(addr) host, port, err := net.SplitHostPort(addr)
if err != nil { if err != nil {
@ -92,7 +103,7 @@ func (a *dialParams) dial() (*controlbase.Conn, error) {
u := &url.URL{ u := &url.URL{
Scheme: "http", Scheme: "http",
Host: net.JoinHostPort(a.host, a.httpPort), Host: net.JoinHostPort(a.host, a.httpPort),
Path: "/switch", Path: serverUpgradePath,
} }
conn, httpErr := a.tryURL(u, init) conn, httpErr := a.tryURL(u, init)
if httpErr == nil { if httpErr == nil {