Fix filter_rules_sort's compare function to know about floating rules so it won't change their order.

1 files changed, 16 insertions, 0 deletions

diff --git a/etc/inc/util.inc b/etc/inc/util.inc
index 63b76da..2be567a 100644
--- a/etc/inc/util.inc
+++ b/etc/inc/util.inc
@@ -566,6 +566,22 @@ function get_configured_ip_aliases_list() {
 }
 
 
+/* comparison function for sorting by the order in which interfaces are normally created */
+function compare_interface_friendly_names($a, $b) {
+	if ($a == $b)
+		return 0;
+	else if ($a == 'wan')
+		return -1;
+	else if ($b == 'wan')
+		return 1;
+	else if ($a == 'lan')
+		return -1;
+	else if ($b == 'lan')
+		return 1;
+
+	return strnatcmp($a, $b);
+}
+
 /* return the configured interfaces list. */
 function get_configured_interface_list($only_opt = false, $withdisabled = false) {
 	global $config;