diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2019-02-12 07:57:35 +0100 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2019-02-12 07:57:35 +0100 |
| commit | 83df3eb6c7678a5988bc8c9942e9892a24ab6967 (patch) | |
| tree | ecc40f4f1e4a16d0c915c8a9acc445f96978a15c | |
| parent | 8e4780a65d25155ee348dfef1b43cf141447da94 (diff) | |
luci-mod-status: iptables.js: fix parsing IP addresses in rules
Rework the regexp pattern to allow both IP addresses without mask
and IPv6 addresses with netmask instead of CIDR notation.
Fixes: #2495, #2530
Fixes: f6bfac211 ("luci-mod-status: rework iptables status page")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
| -rw-r--r-- | modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js index 39ddab3979..a742243a03 100644 --- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js +++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js @@ -165,7 +165,7 @@ function parse_output(table, s) else if (m[1].match(/^num /)) { continue; } - else if ((m2 = m[1].match(/^(\d+) +(\d+) +(\d+) +(.*?) +(\S+) +(\S*) +(\S+) +(\S+) +([a-f0-9:.]+\/\d+) +([a-f0-9:.]+\/\d+) +(.+)$/)) !== null) { + else if ((m2 = m[1].match(/^(\d+) +(\d+) +(\d+) +(.*?) +(\S+) +(\S*) +(\S+) +(\S+) +([a-f0-9:.]+(?:\/[a-f0-9:.]+)?) +([a-f0-9:.]+(?:\/[a-f0-9:.]+)?) +(.+)$/)) !== null) { var num = +m2[1], pkts = +m2[2], bytes = +m2[3], |