(filter) refactor inet46 to single rule and add some more tags

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

@@ -46,6 +46,9 @@ class FilterRule
         'interface' => 'parseInterface',
         'ipprotocol' => 'parsePlain',
         'protocol' => 'parseReplaceSimple,tcp/udp:{tcp udp}',
+        'from' => 'parsePlain',
+        'to' => 'parsePlain',
+        'icmp6-type' => 'parsePlain,{,}',
         'state' => 'parseState',
         'label' => 'parsePlain,label ","'
     );
@@ -161,17 +164,14 @@ class FilterRule
         $result = array();
         $interfaces = empty($this->rule['interface']) ? array(null) : explode(',', $this->rule['interface']);
         foreach ($interfaces as $interface) {
-            if (isset($this->rule['ipprotocol']) && $this->rule['ipprotocol'] == 'inet46') {
-                $ipprotos = array('inet', 'inet6');
-            } elseif (isset($this->rule['ipprotocol'])) {
-                $ipprotos = array($this->rule['ipprotocol']);
+            $tmp = $this->rule;
+            // protocol handling
+            if (empty($this->rule['ipprotocol']) || $this->rule['ipprotocol'] == 'inet46') {
+                $tmp['ipprotocol'] = "";
             } else {
-                $ipprotos = array(null);
+                $tmp['ipprotocol'] = $this->rule['ipprotocol'];
             }
-            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,7 +212,6 @@ class FilterRule
             }
             $result[] = $tmp;
         }
-        }
         return $result;
     }