Merge pull request #2976 from aaronmdjones/master

luci-app-firewall: rules: allow ICMPv6 ND types and sort alphabetically

1 files changed, 28 insertions, 26 deletions

diff --git a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js
index 4252cf3691..a7924b1076 100644
--- a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js
+++ b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js
@@ -221,42 +221,44 @@ return L.view.extend({
 		o.cast = 'table';
 		o.placeholder = _('any');
 		o.value('', 'any');
-		o.value('echo-reply');
+		o.value('address-mask-reply');
+		o.value('address-mask-request');
+		o.value('communication-prohibited');
 		o.value('destination-unreachable');
-		o.value('network-unreachable');
-		o.value('host-unreachable');
-		o.value('protocol-unreachable');
-		o.value('port-unreachable');
+		o.value('echo-reply');
+		o.value('echo-request');
 		o.value('fragmentation-needed');
-		o.value('source-route-failed');
-		o.value('network-unknown');
+		o.value('host-precedence-violation');
+		o.value('host-prohibited');
+		o.value('host-redirect');
 		o.value('host-unknown');
+		o.value('host-unreachable');
+		o.value('ip-header-bad');
+		o.value('neighbour-advertisement');
+		o.value('neighbour-solicitation');
 		o.value('network-prohibited');
-		o.value('host-prohibited');
-		o.value('TOS-network-unreachable');
-		o.value('TOS-host-unreachable');
-		o.value('communication-prohibited');
-		o.value('host-precedence-violation');
+		o.value('network-redirect');
+		o.value('network-unknown');
+		o.value('network-unreachable');
+		o.value('parameter-problem');
+		o.value('port-unreachable');
 		o.value('precedence-cutoff');
-		o.value('source-quench');
+		o.value('protocol-unreachable');
 		o.value('redirect');
-		o.value('network-redirect');
-		o.value('host-redirect');
-		o.value('TOS-network-redirect');
-		o.value('TOS-host-redirect');
-		o.value('echo-request');
+		o.value('required-option-missing');
 		o.value('router-advertisement');
 		o.value('router-solicitation');
+		o.value('source-quench');
+		o.value('source-route-failed');
 		o.value('time-exceeded');
-		o.value('ttl-zero-during-transit');
-		o.value('ttl-zero-during-reassembly');
-		o.value('parameter-problem');
-		o.value('ip-header-bad');
-		o.value('required-option-missing');
-		o.value('timestamp-request');
 		o.value('timestamp-reply');
-		o.value('address-mask-request');
-		o.value('address-mask-reply');
+		o.value('timestamp-request');
+		o.value('TOS-host-redirect');
+		o.value('TOS-host-unreachable');
+		o.value('TOS-network-redirect');
+		o.value('TOS-network-unreachable');
+		o.value('ttl-zero-during-reassembly');
+		o.value('ttl-zero-during-transit');
 		o.depends('proto', 'icmp');
 
 		o = s.taboption('general', widgets.ZoneSelect, 'src', _('Source zone'));