From a178cdb5cf67a3da8f37e5a8fd5d59fef301fb83 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Thu, 16 Jan 2020 13:54:22 +0100 Subject: [PATCH] luci-app-firewall: fix family display for port forwards The underlying fw3 program currently only does IPv4 port forwards while LuCI incorrectly reports IPv4 + IPv6 for each forward. Adjust the text accordingly to fix this. Signed-off-by: Jo-Philipp Wich --- .../htdocs/luci-static/resources/view/firewall/forwards.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js index dc2249275..af2f9b76e 100644 --- a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js +++ b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js @@ -43,7 +43,7 @@ function fmt(fmt /*, ...*/) { function forward_proto_txt(s) { return fmt('%s-%s', - fwtool.fmt_family(uci.get('firewall', s, 'family')), + fwtool.fmt_family('ipv4'), fwtool.fmt_proto(uci.get('firewall', s, 'proto'), uci.get('firewall', s, 'icmp_type')) || 'TCP+UDP'); } -- 2.25.1