(filter.inc) integrate filter_rules_compare into filter_rules_sort

opnsense · Aug 11, 2016 · 26a6680 · 26a6680
1 parent 48769e2
commit 26a6680
Showing 1 changed file with 23 additions and 15 deletions.
diff --git a/src/etc/inc/filter.inc b/src/etc/inc/filter.inc
@@ -280,27 +280,35 @@ function filter_rules_sort()
     for ($i = 0; isset($config['filter']['rule'][$i]); $i++) {
         $config['filter']['rule'][$i]['seq'] = $i;
     }
-    usort($config['filter']['rule'], "filter_rules_compare");
+    usort($config['filter']['rule'], function($a, $b){
+        if (isset($a['floating']) && isset($b['floating'])) {
+            return $a['seq'] - $b['seq'];
+        } elseif (isset($a['floating'])) {
+            return -1;
+        } elseif (isset($b['floating'])) {
+            return 1;
+        } elseif ($a['interface'] == $b['interface']) {
+            return $a['seq'] - $b['seq'];
+        } elseif ($a['interface'] == $b['interface']) {
+            return 0;
+        } elseif ($a['interface'] == 'wan') {
+            return -1;
+        } elseif ($b['interface'] == 'wan') {
+            return 1;
+        } elseif ($a['interface'] == 'lan') {
+            return -1;
+        } elseif ($b['interface'] == 'lan') {
+            return 1;
+        } else {
+            return strnatcmp($a['interface'], $b['interface']);
+        }
+    });
     /* strip the sequence numbers again */
     for ($i = 0; isset($config['filter']['rule'][$i]); $i++) {
         unset($config['filter']['rule'][$i]['seq']);
     }
 }
 
-function filter_rules_compare($a, $b) {
-    if (isset($a['floating']) && isset($b['floating'])) {
-        return $a['seq'] - $b['seq'];
-    } elseif (isset($a['floating'])) {
-        return -1;
-    } elseif (isset($b['floating'])) {
-        return 1;
-    } elseif ($a['interface'] == $b['interface']) {
-        return $a['seq'] - $b['seq'];
-    } else {
-        return compare_interface_friendly_names($a['interface'], $b['interface']);
-    }
-}
-
 function filter_pflog_start()
 {
     if (isvalidpid('/var/run/filterlog.pid')) {