tailcfg: add CanPort80 field to DERPNode

A follow-up PR will start using this field after we set it in our production DERPMap. Updates tailscale#7925 Signed-off-by: Andrew Dunham <andrew@du.nham.ca> Change-Id: Idb41b79e6055dddb8944f79d91ad4a186ace98c7
uhthomas · Apr 21, 2023 · 6f521c1 · 6f521c1
1 parent 04a3118
commit 6f521c1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/tailcfg/derpmap.go b/tailcfg/derpmap.go
@@ -142,6 +142,10 @@ type DERPNode struct {
 	// STUNTestIP is used in tests to override the STUN server's IP.
 	// If empty, it's assumed to be the same as the DERP server.
 	STUNTestIP string `json:",omitempty"`
+
+	// CanPort80 specifies whether this DERP node is accessible over HTTP
+	// on port 80 specifically. This is used for captive portal checks.
+	CanPort80 bool `json:",omitempty"`
 }
 
 // DotInvalid is a fake DNS TLD used in tests for an invalid hostname.

diff --git a/tailcfg/tailcfg_clone.go b/tailcfg/tailcfg_clone.go
diff --git a/tailcfg/tailcfg_view.go b/tailcfg/tailcfg_view.go