From 509247bf427f0d9fd33af165d020c30baaf2d962 Mon Sep 17 00:00:00 2001
From: Avery Pennarun <apenwarr@gmail.com>
Date: Wed, 11 Mar 2020 21:00:25 -0400
Subject: [PATCH] tailscale, tailscaled: update safesocket port number.

This makes them able to connect to each other on Windows.
---
 cmd/tailscale/tailscale.go   | 2 +-
 cmd/tailscaled/tailscaled.go | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/cmd/tailscale/tailscale.go b/cmd/tailscale/tailscale.go
index 996f410dc..57db63be8 100644
--- a/cmd/tailscale/tailscale.go
+++ b/cmd/tailscale/tailscale.go
@@ -147,7 +147,7 @@ func runUp(ctx context.Context, args []string) error {
 	prefs.UsePacketFilter = !upArgs.noPacketFilter
 	prefs.AdvertiseRoutes = adv
 
-	c, err := safesocket.Connect(upArgs.socket, 0)
+	c, err := safesocket.Connect(upArgs.socket, 41112)
 	if err != nil {
 		log.Fatalf("safesocket.Connect: %v\n", err)
 	}
diff --git a/cmd/tailscaled/tailscaled.go b/cmd/tailscaled/tailscaled.go
index 14bacb329..82652bd6e 100644
--- a/cmd/tailscaled/tailscaled.go
+++ b/cmd/tailscaled/tailscaled.go
@@ -79,6 +79,7 @@ func main() {
 
 	opts := ipnserver.Options{
 		SocketPath:         *socketpath,
+		Port:               41112,
 		StatePath:          *statepath,
 		AutostartStateKey:  globalStateKey,
 		LegacyConfigPath:   paths.LegacyConfigPath,