chore(portforward): move vpn gateway obtention within port forwarding service

internal/portforward/service/start.go

@@ -3,6 +3,8 @@ package service
 import (
 	"context"
 	"fmt"
+
+	"github.com/qdm12/gluetun/internal/provider/utils"
 )
 
 func (s *Service) Start(ctx context.Context) (runError <-chan error, err error) {
@@ -14,8 +16,19 @@ func (s *Service) Start(ctx context.Context) (runError <-chan error, err error)
 	}
 
 	s.logger.Info("starting")
-	port, err := s.settings.PortForwarder.PortForward(ctx, s.client, s.logger,
-		s.settings.Gateway, s.settings.ServerName)
+
+	gateway, err := s.routing.VPNLocalGatewayIP(s.settings.Interface)
+	if err != nil {
+		return nil, fmt.Errorf("getting VPN local gateway IP: %w", err)
+	}
+
+	obj := utils.PortForwardObjects{
+		Logger:     s.logger,
+		Gateway:    gateway,
+		Client:     s.client,
+		ServerName: s.settings.ServerName,
+	}
+	port, err := s.settings.PortForwarder.PortForward(ctx, obj)
 	if err != nil {
 		return nil, fmt.Errorf("port forwarding for the first time: %w", err)
 	}
@@ -43,18 +56,17 @@ func (s *Service) Start(ctx context.Context) (runError <-chan error, err error)
 	keepPortDoneCh := make(chan struct{})
 	s.keepPortDoneCh = keepPortDoneCh
 
-	go func(ctx context.Context, settings Settings, port uint16,
-		runError chan<- error, doneCh chan<- struct{}) {
+	go func(ctx context.Context, portForwarder PortForwarder,
+		obj utils.PortForwardObjects, runError chan<- error, doneCh chan<- struct{}) {
 		defer close(doneCh)
-		err = settings.PortForwarder.KeepPortForward(ctx, port,
-			settings.Gateway, settings.ServerName, s.logger)
+		err = portForwarder.KeepPortForward(ctx, obj)
 		crashed := ctx.Err() == nil
 		if !crashed { // stopped by Stop call
 			return
 		}
 		_ = s.cleanup()
 		runError <- err
-	}(keepPortCtx, s.settings, port, runErrorCh, keepPortDoneCh)
+	}(keepPortCtx, s.settings.PortForwarder, obj, runErrorCh, keepPortDoneCh)
 
 	return runErrorCh, nil
 }