summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2020-01-20 18:57:47 +0100
committerJo-Philipp Wich <jo@mein.io>2020-01-20 18:57:47 +0100
commit9fd7e9fc23647fe7adfe84d1bc3b406ab52186e7 (patch)
tree83bacf456f4dee6d410410e35979019b99aac2a2
parent8b1d831935d64758b798958f69dc976ffa6dd8eb (diff)
luci-app-firewall: fix variable clash leading to incorrect family display
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
-rw-r--r--applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js4
1 files changed, 2 insertions, 2 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 b68f428d95..ada05f24ca 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
@@ -29,7 +29,7 @@ function rule_proto_txt(s, ctHelpers) {
} : null;
m = String(uci.get('firewall', s, 'mark')).match(/^(!\s*)?(0x[0-9a-f]{1,8}|[0-9]{1,10})(?:\/(0x[0-9a-f]{1,8}|[0-9]{1,10}))?$/i);
- var f = m ? {
+ var w = m ? {
val: m[0].toUpperCase().replace(/X/g, 'x'),
inv: m[1],
num: '0x%02X'.format(+m[2]),
@@ -51,7 +51,7 @@ function rule_proto_txt(s, ctHelpers) {
dest: uci.get('firewall', s, 'dest'),
proto: proto,
helper: h,
- mark: f,
+ mark: w,
dscp: d
});
}