Forward port for both tcp and udp, not just udp

qdm12 · Jun 1, 2023 · f4d2599 · f4d2599
1 parent 417b866
commit f4d2599
Showing 1 changed file with 38 additions and 37 deletions.
diff --git a/internal/provider/protonvpn/portforward.go b/internal/provider/protonvpn/portforward.go
@@ -32,26 +32,29 @@ func (p *Provider) PortForward(ctx context.Context, _ *http.Client,
 	}
 
 	logger.Info("gateway external IPv4 address is " + externalIPv4Address.String())
-	const networkProtocol = "udp"
+	networkProtocols := []string{"udp", "tcp"}
 	const internalPort, externalPort = 0, 0
 	const lifetime = 60 * time.Second
-	_, assignedInternalPort, assignedExternalPort, assignedLiftetime, err :=
-		client.AddPortMapping(ctx, gateway, networkProtocol,
-			internalPort, externalPort, lifetime)
-	if err != nil {
-		return 0, fmt.Errorf("adding port mapping: %w", err)
-	}
+	var assignedExternalPort uint16
+	for _, networkProtocol := range networkProtocols {
+		_, assignedInternalPort, assignedExternalPort, assignedLiftetime, err :=
+			client.AddPortMapping(ctx, gateway, networkProtocol,
+				internalPort, externalPort, lifetime)
+		if err != nil {
+			return 0, fmt.Errorf("adding port mapping: %w", err)
+		}
 
-	if assignedLiftetime != lifetime {
-		logger.Warn(fmt.Sprintf("assigned lifetime %s differs"+
-			" from requested lifetime %s",
-			assignedLiftetime, lifetime))
-	}
+		if assignedLiftetime != lifetime {
+			logger.Warn(fmt.Sprintf("assigned lifetime %s differs"+
+				" from requested lifetime %s",
+				assignedLiftetime, lifetime))
+		}
 
-	if assignedInternalPort != assignedExternalPort {
-		logger.Warn(fmt.Sprintf("internal port assigned %d differs"+
-			" from external port assigned %d",
-			assignedInternalPort, assignedExternalPort))
+		if assignedInternalPort != assignedExternalPort {
+			logger.Warn(fmt.Sprintf("internal port assigned %d differs"+
+				" from external port assigned %d",
+				assignedInternalPort, assignedExternalPort))
+		}
 	}
 
 	port = assignedExternalPort
@@ -60,7 +63,6 @@ func (p *Provider) PortForward(ctx context.Context, _ *http.Client,
 
 func (p *Provider) KeepPortForward(ctx context.Context, port uint16,
 	gateway netip.Addr, _ string, logger utils.Logger) (err error) {
-	logger.Info(fmt.Sprintf("keeping port forward with port %d", port))
 	client := natpmp.New()
 	const refreshTimeout = 45 * time.Second
 	timer := time.NewTimer(refreshTimeout)
@@ -70,32 +72,31 @@ func (p *Provider) KeepPortForward(ctx context.Context, port uint16,
 			return ctx.Err()
 		case <-timer.C:
 		}
-		logger.Info("keeping port forward triggered by 45s timer")
 
-		const networkProtocol = "udp"
+		networkProtocols := []string{"udp", "tcp"}
 		const internalPort = 0
 		const lifetime = 60 * time.Second
-		_, assignedInternalPort, assignedExternalPort, assignedLiftetime, err :=
-			client.AddPortMapping(ctx, gateway, networkProtocol,
-				internalPort, port, lifetime)
-		if err != nil {
-			return fmt.Errorf("adding port mapping: %w", err)
-		}
 
-		if assignedLiftetime != lifetime {
-			logger.Warn(fmt.Sprintf("assigned lifetime %s differs"+
-				" from requested lifetime %s",
-				assignedLiftetime, lifetime))
-		}
+		for _, networkProtocol := range networkProtocols {
+			_, assignedInternalPort, assignedExternalPort, assignedLiftetime, err :=
+				client.AddPortMapping(ctx, gateway, networkProtocol,
+					internalPort, port, lifetime)
+			if err != nil {
+				return fmt.Errorf("adding port mapping: %w", err)
+			}
 
-		if assignedInternalPort != assignedExternalPort {
-			logger.Warn(fmt.Sprintf("internal port assigned %d differs"+
-				" from external port assigned %d",
-				assignedInternalPort, assignedExternalPort))
+			if assignedLiftetime != lifetime {
+				logger.Warn(fmt.Sprintf("assigned lifetime %s differs"+
+					" from requested lifetime %s",
+					assignedLiftetime, lifetime))
+			}
+
+			if assignedInternalPort != assignedExternalPort {
+				logger.Warn(fmt.Sprintf("internal port assigned %d differs"+
+					" from external port assigned %d",
+					assignedInternalPort, assignedExternalPort))
+			}
 		}
-		logger.Info(fmt.Sprintf(
-			"port %d, assigned internal port %d, assigned external port %d, assignled lifetime %s",
-			port, assignedInternalPort, assignedExternalPort, assignedLiftetime))
 
 		timer.Reset(refreshTimeout)
 	}