cmd/tailscale,feature/relayserver,ipn: add relay-server-static-endpoints set flag
Updates tailscale/corp#31489 Updates #17791 Signed-off-by: Jordan Whited <jordan@tailscale.com>
This commit is contained in:
committed by
Jordan Whited
parent
755309c04e
commit
7426eca163
@@ -69,6 +69,7 @@ func TestPrefsEqual(t *testing.T) {
|
||||
"NetfilterKind",
|
||||
"DriveShares",
|
||||
"RelayServerPort",
|
||||
"RelayServerStaticEndpoints",
|
||||
"AllowSingleHosts",
|
||||
"Persist",
|
||||
}
|
||||
@@ -90,6 +91,16 @@ func TestPrefsEqual(t *testing.T) {
|
||||
}
|
||||
return ns
|
||||
}
|
||||
aps := func(strs ...string) (ret []netip.AddrPort) {
|
||||
for _, s := range strs {
|
||||
n, err := netip.ParseAddrPort(s)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
ret = append(ret, n)
|
||||
}
|
||||
return ret
|
||||
}
|
||||
tests := []struct {
|
||||
a, b *Prefs
|
||||
want bool
|
||||
@@ -369,6 +380,16 @@ func TestPrefsEqual(t *testing.T) {
|
||||
&Prefs{RelayServerPort: relayServerPort(1)},
|
||||
false,
|
||||
},
|
||||
{
|
||||
&Prefs{RelayServerStaticEndpoints: aps("[2001:db8::1]:40000", "192.0.2.1:40000")},
|
||||
&Prefs{RelayServerStaticEndpoints: aps("[2001:db8::1]:40000", "192.0.2.1:40000")},
|
||||
true,
|
||||
},
|
||||
{
|
||||
&Prefs{RelayServerStaticEndpoints: aps("[2001:db8::1]:40000", "192.0.2.2:40000")},
|
||||
&Prefs{RelayServerStaticEndpoints: aps("[2001:db8::1]:40000", "192.0.2.1:40000")},
|
||||
false,
|
||||
},
|
||||
}
|
||||
for i, tt := range tests {
|
||||
got := tt.a.Equals(tt.b)
|
||||
|
||||
Reference in New Issue
Block a user