Simplify WireGuard endpoint configuration by removing unused parameters and redundant logic

Author: pappz

client/internal/peer/conn.go

@@ -392,10 +392,8 @@ func (conn *Conn) onICEConnectionIsReady(priority conntype.ConnPriority, iceConn
 	conn.Log.Infof("configure WireGuard endpoint to: %s", ep.String())
 	conn.enableWgWatcherIfNeeded()
 
-	hasRelayBackup := conn.wgProxyRelay != nil
-
 	presharedKey := conn.presharedKey(iceConnInfo.RosenpassPubKey)
-	if err = conn.endpointUpdater.ConfigureWGEndpoint(ep, presharedKey, hasRelayBackup); err != nil {
+	if err = conn.endpointUpdater.ConfigureWGEndpoint(ep, presharedKey); err != nil {
 		conn.handleConfigurationFailure(err, wgProxy)
 		return
 	}
@@ -436,7 +434,7 @@ func (conn *Conn) onICEStateDisconnected() {
 		conn.wgProxyRelay.Work()
 
 		presharedKey := conn.presharedKey(conn.rosenpassRemoteKey)
-		if err := conn.endpointUpdater.ConfigureWGEndpoint(conn.wgProxyRelay.EndpointAddr(), presharedKey, true); err != nil {
+		if err := conn.endpointUpdater.SwitchWGEndpoint(conn.wgProxyRelay.EndpointAddr(), presharedKey); err != nil {
 			conn.Log.Errorf("failed to switch to relay conn: %v", err)
 		}
 
@@ -501,20 +499,20 @@ func (conn *Conn) onRelayConnectionIsReady(rci RelayConnInfo) {
 		return
 	}
 
-	setEndpointNow := isController(conn.config)
+	controller := isController(conn.config)
 
-	if setEndpointNow {
+	if controller {
 		wgProxy.Work()
 	}
 	conn.enableWgWatcherIfNeeded()
-	if err := conn.endpointUpdater.ConfigureWGEndpoint(wgProxy.EndpointAddr(), conn.presharedKey(rci.rosenpassPubKey), setEndpointNow); err != nil {
+	if err := conn.endpointUpdater.ConfigureWGEndpoint(wgProxy.EndpointAddr(), conn.presharedKey(rci.rosenpassPubKey)); err != nil {
 		if err := wgProxy.CloseConn(); err != nil {
 			conn.Log.Warnf("Failed to close relay connection: %v", err)
 		}
 		conn.Log.Errorf("Failed to update WireGuard peer configuration: %v", err)
 		return
 	}
-	if !setEndpointNow {
+	if !controller {
 		wgProxy.Work()
 	}
 	conn.rosenpassRemoteKey = rci.rosenpassPubKey

client/internal/peer/endpoint.go

@@ -34,7 +34,7 @@ func NewEndpointUpdater(log *logrus.Entry, wgConfig WgConfig, initiator bool) *E
 	}
 }
 
-func (e *EndpointUpdater) ConfigureWGEndpoint(addr *net.UDPAddr, presharedKey *wgtypes.Key, setEndpointNow bool) error {
+func (e *EndpointUpdater) ConfigureWGEndpoint(addr *net.UDPAddr, presharedKey *wgtypes.Key) error {
 	e.mu.Lock()
 	defer e.mu.Unlock()
 
@@ -44,7 +44,7 @@ func (e *EndpointUpdater) ConfigureWGEndpoint(addr *net.UDPAddr, presharedKey *w
 	}
 
 	e.log.Debugf("configure up WireGuard as responder")
-	return e.configureAsResponder(addr, presharedKey, setEndpointNow)
+	return e.configureAsResponder(addr, presharedKey)
 }
 
 func (e *EndpointUpdater) SwitchWGEndpoint(addr *net.UDPAddr, presharedKey *wgtypes.Key) error {
@@ -80,25 +80,19 @@ func (e *EndpointUpdater) configureAsInitiator(addr *net.UDPAddr, presharedKey *
 	return nil
 }
 
-func (e *EndpointUpdater) configureAsResponder(addr *net.UDPAddr, presharedKey *wgtypes.Key, setEndpointNow bool) error {
+func (e *EndpointUpdater) configureAsResponder(addr *net.UDPAddr, presharedKey *wgtypes.Key) error {
 	// prevent to run new update while cancel the previous update
 	e.waitForCloseTheDelayedUpdate()
 
 	e.log.Debugf("configure up WireGuard and wait for handshake")
-	if setEndpointNow {
-		if err := e.updateWireGuardPeer(addr, presharedKey); err != nil {
-			return err
-		}
-	} else {
-		var ctx context.Context
-		ctx, e.cancelFunc = context.WithCancel(context.Background())
-		e.updateWg.Add(1)
-		go e.scheduleDelayedUpdate(ctx, addr, presharedKey)
-
-		if err := e.updateWireGuardPeer(nil, presharedKey); err != nil {
-			e.waitForCloseTheDelayedUpdate()
-			return err
-		}
+	var ctx context.Context
+	ctx, e.cancelFunc = context.WithCancel(context.Background())
+	e.updateWg.Add(1)
+	go e.scheduleDelayedUpdate(ctx, addr, presharedKey)
+
+	if err := e.updateWireGuardPeer(nil, presharedKey); err != nil {
+		e.waitForCloseTheDelayedUpdate()
+		return err
 	}
 	return nil
 }