oops

Author: nyiyui

coord/server.go

@@ -209,14 +209,14 @@ func (s *Server) patchReifySpec(w http.ResponseWriter, r *http.Request) {
 		newSpec.Networks[nI].Devices[sndI].PersistentKeepalive = req.PersistentKeepalive
 	}
 	if req.AccessibleSet {
-		// TODO: check req.ForwardsFor validity
 		for _, name := range req.Accessible {
 			if _, ok := newSpec.Networks[nI].GetDevice(name); !ok {
 				http.Error(w, fmt.Sprintf("ForwardsFor contains nonexistent device name: %s/%s", network, name), 400)
 				return
 			}
 		}
-		newSpec.Networks[nI].Devices[sndI].ForwardsFor = req.Accessible
+		zap.S().Debugf("setting Accessible to %v", req.Accessible)
+		newSpec.Networks[nI].Devices[sndI].Accessible = req.Accessible
 	}
 	s.latestLock.Lock()
 	defer s.latestLock.Unlock()

spec/compile.go

@@ -16,7 +16,7 @@ func (sc SpecCensored) CompileMachine(name string, ignoreIncomplete bool) (goal.
 			continue
 		}
 		snd := sn.Devices[sndI]
-		for _, name := range snd.ForwardsFor {
+		for _, name := range snd.Accessible {
 			forwardee, ok := sn.GetDevice(name)
 			if !ok {
 				panic("malformed spec")

spec/spec.go

@@ -113,7 +113,7 @@ func (nc NetworkCensored) GetDeviceIndex(name string) (i int, ok bool) {
 func (nc NetworkCensored) GetForwardersFor(name string) []string {
 	forwarders := make([]string, 0)
 	for _, ndc := range nc.Devices {
-		if slices.Contains(ndc.ForwardsFor, name) && ndc.ForwarderAndEndpointChosen {
+		if slices.Contains(ndc.Accessible, name) && ndc.ForwarderAndEndpointChosen {
 			forwarders = append(forwarders, ndc.Name)
 		}
 	}
@@ -196,10 +196,10 @@ type NetworkDeviceCensored struct {
 	// Set to 0 to disable persistent keepalive.
 	// This can be set by this peer.
 	PersistentKeepalive goal.Duration
-	// ForwardsFor is the list of devices (in the same network) that this peer has access to, and can fowrard packets to.
+	// Accessible is the list of devices (in the same network) that this peer has access to, and can fowrard packets to.
 	// Note that IPv6 forwarding is not supported yet.
 	// This can be set by this peer.
-	ForwardsFor []string
+	Accessible []string
 }
 
 type networkDeviceCensoredJSON struct {
@@ -245,7 +245,7 @@ func ipNetEqual(a, b goal.IPNet) bool {
 }
 
 func (a NetworkDeviceCensored) Equal(b NetworkDeviceCensored) bool {
-	return a.Name == b.Name && slices.Equal(a.Endpoints, b.Endpoints) && slices.EqualFunc(a.Addresses, b.Addresses, ipNetEqual) && a.ListenPort == b.ListenPort && a.PublicKey == b.PublicKey && (a.PresharedKey != nil && b.PresharedKey != nil && *a.PresharedKey == *b.PresharedKey || a.PresharedKey == nil && b.PresharedKey == nil) && a.PersistentKeepalive == b.PersistentKeepalive && slices.Equal(a.ForwardsFor, b.ForwardsFor)
+	return a.Name == b.Name && slices.Equal(a.Endpoints, b.Endpoints) && slices.EqualFunc(a.Addresses, b.Addresses, ipNetEqual) && a.ListenPort == b.ListenPort && a.PublicKey == b.PublicKey && (a.PresharedKey != nil && b.PresharedKey != nil && *a.PresharedKey == *b.PresharedKey || a.PresharedKey == nil && b.PresharedKey == nil) && a.PersistentKeepalive == b.PersistentKeepalive && slices.Equal(a.Accessible, b.Accessible)
 }
 
 func (ndc NetworkDeviceCensored) Clone() NetworkDeviceCensored {