Merge d97b9e4796 into 4c37141ab7

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
 }