ipn: add peer relay set flags to ConfigVAlpha config format

Updates #17791

Signed-off-by: Jordan Whited <jordan@tailscale.com>
jwhited/relay-set-flags-config
Jordan Whited 1 week ago
parent 9c3a2aa797
commit d97b9e4796
No known key found for this signature in database
GPG Key ID: 33DF352F65991EB8

@ -50,6 +50,9 @@ type ConfigVAlpha struct {
// should advertise amongst its wireguard endpoints. // should advertise amongst its wireguard endpoints.
StaticEndpoints []netip.AddrPort `json:",omitempty"` StaticEndpoints []netip.AddrPort `json:",omitempty"`
RelayServerPort *int `json:",omitzero"` // --relay-server-port
RelayServerStaticEndpoints []netip.AddrPort `json:",omitempty"` // --relay-server-static-endpoints
// TODO(bradfitz,maisem): future something like: // TODO(bradfitz,maisem): future something like:
// Profile map[string]*Config // keyed by alice@gmail.com, corp.com (TailnetSID) // Profile map[string]*Config // keyed by alice@gmail.com, corp.com (TailnetSID)
} }
@ -155,5 +158,13 @@ func (c *ConfigVAlpha) ToPrefs() (MaskedPrefs, error) {
if c.AdvertiseServices != nil { if c.AdvertiseServices != nil {
mp.AdvertiseServices = c.AdvertiseServices mp.AdvertiseServices = c.AdvertiseServices
} }
if mp.RelayServerPort != nil {
mp.RelayServerPort = c.RelayServerPort
mp.RelayServerPortSet = true
}
if mp.RelayServerStaticEndpoints != nil {
mp.RelayServerStaticEndpoints = c.RelayServerStaticEndpoints
mp.RelayServerStaticEndpointsSet = true
}
return mp, nil return mp, nil
} }

Loading…
Cancel
Save