|
@@ -512,8 +512,14 @@ func filterOutput(start time.Time, output []byte, args ...string) []byte {
|
|
// Raw calls 'iptables' system command, passing supplied arguments.
|
|
// Raw calls 'iptables' system command, passing supplied arguments.
|
|
func (iptable IPTable) Raw(args ...string) ([]byte, error) {
|
|
func (iptable IPTable) Raw(args ...string) ([]byte, error) {
|
|
if firewalldRunning {
|
|
if firewalldRunning {
|
|
|
|
+ // select correct IP version for firewalld
|
|
|
|
+ ipv := Iptables
|
|
|
|
+ if iptable.Version == IPv6 {
|
|
|
|
+ ipv = IP6Tables
|
|
|
|
+ }
|
|
|
|
+
|
|
startTime := time.Now()
|
|
startTime := time.Now()
|
|
- output, err := Passthrough(Iptables, args...)
|
|
|
|
|
|
+ output, err := Passthrough(ipv, args...)
|
|
if err == nil || !strings.Contains(err.Error(), "was not provided by any .service files") {
|
|
if err == nil || !strings.Contains(err.Error(), "was not provided by any .service files") {
|
|
return filterOutput(startTime, output, args...), err
|
|
return filterOutput(startTime, output, args...), err
|
|
}
|
|
}
|