tweak it

Author: JackDoan

examples/config.yml

@@ -151,7 +151,7 @@ listen:
   # office to home) leaves Nebula sending out an interface that no longer has a route. When true, Nebula watches
   # the routing socket and rebinds the listener once the change settles.
   # iOS does not use this, the host app drives the same rebind itself.
-  # Default true. This setting is reloadable.
+  # Default true. Not reloadable.
   #rebind_on_network_change: true
 
   # By default, Nebula replies to packets it has no tunnel for with a "recv_error" packet. This packet helps speed up reconnection

main.go

@@ -268,8 +268,6 @@ func Main(c *config.C, configTest bool, buildVersion string, l *slog.Logger, dev
 
 	attachCommands(l, c, ssh, ifce)
 
-	networkChanges := newNetworkChangeMonitorFromConfig(ctx, l, c)
-
 	control := &Control{
 		state:                  StateReady,
 		f:                      ifce,
@@ -280,13 +278,13 @@ func Main(c *config.C, configTest bool, buildVersion string, l *slog.Logger, dev
 		statsStart:             stats.Start,
 		dnsStart:               ds.Start,
 		lighthouseStart:        lightHouse.StartUpdateWorker,
-		networkChangeStart:     networkChanges.Start,
 		connectionManagerStart: connManager.Start,
 	}
 
 	// The monitor's whole job is to trigger a rebind, and Control is what owns rebinding and the state gating
-	// around it, so this can only be wired once Control exists.
-	networkChanges.setRebind(control.RebindUDPServer)
+	// around it, so it is injected the rebind func and can only be built once Control exists.
+	networkChanges := udp.NewNetworkChangeMonitor(ctx, l, c, control.RebindUDPServer)
+	control.networkChangeStart = networkChanges.Start
 
 	return control, nil
 }

network_change.go

@@ -25,7 +25,7 @@ const (
 	netChangeReadBuffer = 4096
 )
 
-// WatchNetworkChanges reports when the local network moves out from under us, so the listener can be rebound.
+// watchNetworkChanges reports when the local network moves out from under us, so the listener can be rebound.
 //
 // Darwin scopes a udp socket to whatever interface it came up on. Move between networks and we keep sending out an
 // interface that no longer has a route, which surfaces as an instant "no route to host" with no packet ever leaving
@@ -35,7 +35,7 @@ const (
 // The returned channel is buffered and coalescing: a send is dropped if one is already pending, since both mean the
 // same thing to a reader. It is closed when ctx is cancelled or the routing socket fails, so a caller can simply
 // range over it. Platforms whose sockets do not need rebinding return a nil channel and no error.
-func WatchNetworkChanges(ctx context.Context, l *slog.Logger) (<-chan struct{}, error) {
+func watchNetworkChanges(ctx context.Context, l *slog.Logger) (<-chan struct{}, error) {
 	sock, err := openRouteSocket()
 	if err != nil {
 		return nil, err