libnetwork/iptables: deprecate Passthrough

thaJeztah · thaJeztah · commit d688389f4ac9 · 2024-12-16T23:23:11.000+01:00
Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
diff --git a/libnetwork/iptables/firewalld.go b/libnetwork/iptables/firewalld.go
@@ -174,8 +174,15 @@ func checkRunning() bool {
 	return err == nil
 }
 
-// Passthrough method simply passes args through to iptables/ip6tables
+// Passthrough method simply passes args through to iptables/ip6tables.
+//
+// Deprecated: this function is only used internally and will be removed in the next release.
 func Passthrough(ipv IPVersion, args ...string) ([]byte, error) {
+	return passthrough(ipv, args...)
+}
+
+// passthrough method simply passes args through to iptables/ip6tables
+func passthrough(ipv IPVersion, args ...string) ([]byte, error) {
 	var output string
 	log.G(context.TODO()).Debugf("Firewalld passthrough: %s, %s", ipv, args)
 	if err := connection.sysObj.Call(dbusInterface+".direct.passthrough", 0, ipv, args).Store(&output); err != nil {
diff --git a/libnetwork/iptables/firewalld_test.go b/libnetwork/iptables/firewalld_test.go
@@ -96,7 +96,7 @@ func TestPassthrough(t *testing.T) {
 		"-j", "ACCEPT",
 	}
 
-	_, err := Passthrough(IPv4, append([]string{"-A"}, rule1...)...)
+	_, err := passthrough(IPv4, append([]string{"-A"}, rule1...)...)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/libnetwork/iptables/iptables.go b/libnetwork/iptables/iptables.go
@@ -425,7 +425,7 @@ func filterOutput(start time.Time, output []byte, args ...string) []byte {
 func (iptable IPTable) Raw(args ...string) ([]byte, error) {
 	if firewalldRunning {
 		startTime := time.Now()
-		output, err := Passthrough(iptable.ipVersion, args...)
+		output, err := passthrough(iptable.ipVersion, args...)
 		if err == nil || !strings.Contains(err.Error(), "was not provided by any .service files") {
 			return filterOutput(startTime, output, args...), err
 		}

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ func TestPassthrough(t *testing.T) {`
`96`	`96`	`"-j", "ACCEPT",`
`97`	`97`	`}`
`98`	`98`
`99`		`- _, err := Passthrough(IPv4, append([]string{"-A"}, rule1...)...)`
	`99`	`+ _, err := passthrough(IPv4, append([]string{"-A"}, rule1...)...)`
`100`	`100`	`if err != nil {`
`101`	`101`	`t.Fatal(err)`
`102`	`102`	`}`
Original file line number	Diff line number	Diff line change
`@@ -425,7 +425,7 @@ func filterOutput(start time.Time, output []byte, args ...string) []byte {`
`425`	`425`	`func (iptable IPTable) Raw(args ...string) ([]byte, error) {`
`426`	`426`	`if firewalldRunning {`
`427`	`427`	`startTime := time.Now()`
`428`		`- output, err := Passthrough(iptable.ipVersion, args...)`
	`428`	`+ output, err := passthrough(iptable.ipVersion, args...)`
`429`	`429`	`if err == nil \|\| !strings.Contains(err.Error(), "was not provided by any .service files") {`
`430`	`430`	`return filterOutput(startTime, output, args...), err`
`431`	`431`	`}`