(filter) reverse inet46 handling

src/opnsense/mvc/app/library/OPNsense/Firewall/FilterRule.php

@@ -164,14 +164,18 @@ class FilterRule
         $result = array();
         $interfaces = empty($this->rule['interface']) ? array(null) : explode(',', $this->rule['interface']);
         foreach ($interfaces as $interface) {
-            $tmp = $this->rule;
-            // protocol handling
-            if (empty($this->rule['ipprotocol']) || $this->rule['ipprotocol'] == 'inet46') {
-                $tmp['ipprotocol'] = "";
+            if (isset($this->rule['ipprotocol']) && $this->rule['ipprotocol'] == 'inet46') {
+                $ipprotos = array('inet', 'inet6');
+            } elseif (isset($this->rule['ipprotocol'])) {
+                $ipprotos = array($this->rule['ipprotocol']);
             } else {
-                $tmp['ipprotocol'] = $this->rule['ipprotocol'];
+                $ipprotos = array(null);
             }
+
+            foreach ($ipprotos as $ipproto) {
+                $tmp = $this->rule;
                 $tmp['interface'] = $interface;
+                $tmp['ipprotocol'] = $ipproto;
                 // disable rule when interface not found
                 if (!empty($interface) && empty($this->interfaceMapping[$interface]['if'])) {
                     $tmp['disabled'] = true;
@@ -212,6 +216,7 @@ class FilterRule
                 }
                 $result[] = $tmp;
             }
+        }
         return $result;
     }