lzc256
/
tailscale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tailcfg: add CanPort80 field to DERPNode 

A follow-up PR will start using this field after we set it in our
production DERPMap.

Updates #7925

Signed-off-by: Andrew Dunham <andrew@du.nham.ca>
Change-Id: Idb41b79e6055dddb8944f79d91ad4a186ace98c7
pull/7941/head
Andrew Dunham 2023-04-20 10:21:46 -04:00
parent 04a3118d45
commit 6f521c138d
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tailcfg/derpmap.go
View File

@ -142,6 +142,10 @@ type DERPNode struct {
// STUNTestIP is used in tests to override the STUN server's IP. // 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. // If empty, it's assumed to be the same as the DERP server.
STUNTestIP string `json:",omitempty"` 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. // DotInvalid is a fake DNS TLD used in tests for an invalid hostname.

1
tailcfg/tailcfg_clone.go
View File

@ -353,6 +353,7 @@ var _DERPNodeCloneNeedsRegeneration = DERPNode(struct {
DERPPort int DERPPort int
InsecureForTests bool InsecureForTests bool
STUNTestIP string STUNTestIP string
CanPort80 bool
}{}) }{})
// Clone makes a deep copy of SSHRule. // Clone makes a deep copy of SSHRule.

2
tailcfg/tailcfg_view.go
View File

@ -802,6 +802,7 @@ func (v DERPNodeView) STUNOnly() bool { return v.ж.STUNOnly }
func (v DERPNodeView) DERPPort() int { return v.ж.DERPPort } func (v DERPNodeView) DERPPort() int { return v.ж.DERPPort }
func (v DERPNodeView) InsecureForTests() bool { return v.ж.InsecureForTests } func (v DERPNodeView) InsecureForTests() bool { return v.ж.InsecureForTests }
func (v DERPNodeView) STUNTestIP() string { return v.ж.STUNTestIP } func (v DERPNodeView) STUNTestIP() string { return v.ж.STUNTestIP }
func (v DERPNodeView) CanPort80() bool { return v.ж.CanPort80 }
// A compilation failure here means this code must be regenerated, with the command at the top of this file. // A compilation failure here means this code must be regenerated, with the command at the top of this file.
var _DERPNodeViewNeedsRegeneration = DERPNode(struct { var _DERPNodeViewNeedsRegeneration = DERPNode(struct {
@ -816,6 +817,7 @@ var _DERPNodeViewNeedsRegeneration = DERPNode(struct {
DERPPort int DERPPort int
InsecureForTests bool InsecureForTests bool
STUNTestIP string STUNTestIP string
CanPort80 bool
}{}) }{})
// View returns a readonly view of SSHRule. // View returns a readonly view of SSHRule.