fix(firewall): query iptables version for iptables found

qdm12 · May 4, 2024 · ef6874f · ef6874f
1 parent 29bc60b
commit ef6874f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/cmd/gluetun/main.go b/cmd/gluetun/main.go
@@ -279,9 +279,7 @@ func _main(ctx context.Context, buildInfo models.BuildInformation,
 		{name: "OpenVPN 2.5", getVersion: ovpnConf.Version25},
 		{name: "OpenVPN 2.6", getVersion: ovpnConf.Version26},
 		{name: "Unbound", getVersion: dnsConf.Version},
-		{name: "IPtables", getVersion: func(ctx context.Context) (version string, err error) {
-			return firewall.Version(ctx, cmder)
-		}},
+		{name: "IPtables", getVersion: firewallConf.Version},
 	})
 	if err != nil {
 		return err

diff --git a/internal/firewall/iptables.go b/internal/firewall/iptables.go
@@ -11,7 +11,6 @@ import (
 	"strings"
 
 	"github.com/qdm12/gluetun/internal/models"
-	"github.com/qdm12/golibs/command"
 )
 
 var (
@@ -44,9 +43,9 @@ func flipRule(rule string) string {
 }
 
 // Version obtains the version of the installed iptables.
-func Version(ctx context.Context, runner command.Runner) (string, error) {
-	cmd := exec.CommandContext(ctx, "iptables", "--version")
-	output, err := runner.Run(cmd)
+func (c *Config) Version(ctx context.Context) (string, error) {
+	cmd := exec.CommandContext(ctx, c.ipTables, "--version") //nolint:gosec
+	output, err := c.runner.Run(cmd)
 	if err != nil {
 		return "", err
 	}