diff options
| author | Jordan Whited <jordan@tailscale.com> | 2025-11-24 20:00:48 -0800 |
|---|---|---|
| committer | Jordan Whited <jordan@tailscale.com> | 2025-11-24 20:12:42 -0800 |
| commit | d97b9e479671b0f50a5c75be3ace43ae70ea6caf (patch) | |
| tree | 91f78e789155fbcef749a785f5a2020a7501d886 | |
| parent | 9c3a2aa79789542262ebae3c3d224da16dc61dbb (diff) | |
| download | tailscale-jwhited/relay-set-flags-config.tar.xz tailscale-jwhited/relay-set-flags-config.zip | |
ipn: add peer relay set flags to ConfigVAlpha config formatjwhited/relay-set-flags-config
Updates #17791
Signed-off-by: Jordan Whited <jordan@tailscale.com>
| -rw-r--r-- | ipn/conf.go | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/ipn/conf.go b/ipn/conf.go index 2c9fb2fd1..8680c0b9f 100644 --- a/ipn/conf.go +++ b/ipn/conf.go @@ -50,6 +50,9 @@ type ConfigVAlpha struct { // should advertise amongst its wireguard endpoints. 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: // 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 { 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 } |