fix(portforward): rework run loop and fix deadlocks (#1874)

internal/vpn/tunnelup.go

@@ -10,10 +10,9 @@ import (
 
 type tunnelUpData struct {
 	// Port forwarding
-	portForwarding bool
-	vpnIntf        string
-	serverName     string
-	portForwarder  provider.PortForwarder
+	vpnIntf       string
+	serverName    string
+	portForwarder provider.PortForwarder
 }
 
 func (l *Loop) onTunnelUp(ctx context.Context, data tunnelUpData) {
@@ -42,7 +41,7 @@ func (l *Loop) onTunnelUp(ctx context.Context, data tunnelUpData) {
 		}
 	}
 
-	err := l.startPortForwarding(ctx, data)
+	err := l.startPortForwarding(data)
 	if err != nil {
 		l.logger.Error(err.Error())
 	}