From 4ef0dfc9133a671025caab04d145f054999c985d Mon Sep 17 00:00:00 2001 From: Paul Dee Date: Thu, 9 Feb 2023 23:47:15 +0100 Subject: [PATCH] luci-app-firewall: extend icmpv6 types available luci complement to https://github.com/openwrt/firewall4/commit/e6e82a55206cf7017f26b92f7097f779161b5cac Tested on 22.03.3 Signed-off-by: Paul Dee (cherry picked from commit 88a016cbff7eacf3a8248bc4949904abacef6685) --- .../resources/view/firewall/rules.js | 33 ++++++++++++++++--- 1 file changed, 28 insertions(+), 5 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 9908121637..6aa0173ce5 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 @@ -297,26 +297,46 @@ return view.extend({ o.placeholder = _('any/all'); o.value('address-mask-reply'); o.value('address-mask-request'); - o.value('address-unreachable'); /* ipv6 */ - o.value('bad-header'); /* ipv6 */ + o.value('address-unreachable'); /* icmpv6 1:3 */ + o.value('bad-header'); /* icmpv6 4:0 */ + o.value('certification-path-solicitation-message'); /* icmpv6 148 */ + o.value('certification-path-advertisement-message'); /* icmpv6 149 */ o.value('communication-prohibited'); o.value('destination-unreachable'); + o.value('duplicate-address-request'); /* icmpv6 157 */ + o.value('duplicate-address-confirmation'); /* icmpv6 158 */ o.value('echo-reply'); o.value('echo-request'); + o.value('extended-echo-request'); /* icmpv6 160 */ + o.value('extended-echo-reply'); /* icmpv6 161 */ + o.value('fmipv6-message'); /* icmpv6 154 */ o.value('fragmentation-needed'); + o.value('home-agent-address-discovery-reply-message'); /* icmpv6 145 */ + o.value('home-agent-address-discovery-request-message'); /* icmpv6 144 */ o.value('host-precedence-violation'); o.value('host-prohibited'); o.value('host-redirect'); o.value('host-unknown'); o.value('host-unreachable'); + o.value('ilnpv6-locator-update-message'); /* icmpv6 156 */ + o.value('inverse-neighbour-discovery-advertisement-message'); /* icmpv6 142 */ + o.value('inverse-neighbour-discovery-solicitation-message'); /* icmpv6 141 */ o.value('ip-header-bad'); + o.value('mobile-prefix-advertisement'); /* icmpv6 147 */ + o.value('mobile-prefix-solicitation'); /* icmpv6 146 */ + o.value('mpl-control-message'); /* icmpv6 159 */ + o.value('multicast-router-advertisement'); /* icmpv6 151 */ + o.value('multicast-router-solicitation'); /* icmpv6 152 */ + o.value('multicast-router-termination'); /* icmpv6 153 */ o.value('neighbour-advertisement'); o.value('neighbour-solicitation'); o.value('network-prohibited'); o.value('network-redirect'); o.value('network-unknown'); o.value('network-unreachable'); - o.value('no-route'); /* ipv6 */ + o.value('no-route'); /* icmpv6 1:0 */ + o.value('node-info-query'); /* icmpv6 139 */ + o.value('node-info-response'); /* icmpv6 140 */ o.value('packet-too-big'); o.value('parameter-problem'); o.value('port-unreachable'); @@ -325,7 +345,9 @@ return view.extend({ o.value('redirect'); o.value('required-option-missing'); o.value('router-advertisement'); + o.value('router-renumbering'); /* icmpv6 138 */ o.value('router-solicitation'); + o.value('rpl-control-message'); /* icmpv6 155 */ o.value('source-quench'); o.value('source-route-failed'); o.value('time-exceeded'); @@ -337,8 +359,9 @@ return view.extend({ o.value('TOS-network-unreachable'); o.value('ttl-zero-during-reassembly'); o.value('ttl-zero-during-transit'); - o.value('unknown-header-type'); /* ipv6 */ - o.value('unknown-option'); /* ipv6 */ + o.value('v2-multicast-listener-report'); /* icmpv6 143 */ + o.value('unknown-header-type'); /* icmpv6 4:1 */ + o.value('unknown-option'); /* icmpv6 4:2 */ o.depends({ proto: 'icmp', '!contains': true }); o.depends({ proto: 'icmpv6', '!contains': true }); -- 2.30.2