From 013876d16aa628ad0405ec7e109ce461d40e7124 Mon Sep 17 00:00:00 2001 From: Dirk Brenken Date: Sat, 2 Mar 2024 09:33:39 +0100 Subject: [PATCH] luci-app-banip: sync with release 0.9.4-1 * small changes to support the new destination port & protocol options in the feed editor and in the reporting engine Signed-off-by: Dirk Brenken (cherry picked from commit 85c0429651b09a75195bb583506decf07fa9b7bf) --- .../htdocs/luci-static/resources/view/banip/feeds.js | 3 +-- .../htdocs/luci-static/resources/view/banip/setreport.js | 6 ++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/applications/luci-app-banip/htdocs/luci-static/resources/view/banip/feeds.js b/applications/luci-app-banip/htdocs/luci-static/resources/view/banip/feeds.js index 0e4e682986..e6704efdca 100644 --- a/applications/luci-app-banip/htdocs/luci-static/resources/view/banip/feeds.js +++ b/applications/luci-app-banip/htdocs/luci-static/resources/view/banip/feeds.js @@ -236,12 +236,11 @@ return view.extend({ } o = s.option(form.Value, 'flag', _('Flag')); - o.datatype = 'and(minlength(2),maxlength(2))'; o.validate = function (section_id, value) { if (!value) { return true; } - if (!value.match(/^gz$/)) { + if (!value.match(/^(\bgz\b|\btcp\b|\budp\b|\b[0-9\-]+\b| )*$/)) { return _('Flag not supported'); } return true; diff --git a/applications/luci-app-banip/htdocs/luci-static/resources/view/banip/setreport.js b/applications/luci-app-banip/htdocs/luci-static/resources/view/banip/setreport.js index 97d8e2b243..02865335a7 100644 --- a/applications/luci-app-banip/htdocs/luci-static/resources/view/banip/setreport.js +++ b/applications/luci-app-banip/htdocs/luci-static/resources/view/banip/setreport.js @@ -155,7 +155,8 @@ return view.extend({ E('th', { 'class': 'th right', 'style': 'padding-right: 20px' }, _('Elements')), E('th', { 'class': 'th' }, _('WAN-Input (packets)')), E('th', { 'class': 'th' }, _('WAN-Forward (packets)')), - E('th', { 'class': 'th' }, _('LAN-Forward (packets)')) + E('th', { 'class': 'th' }, _('LAN-Forward (packets)')), + E('th', { 'class': 'th' }, _('Port/Protocol Limit')) ]) ]); @@ -170,7 +171,8 @@ return view.extend({ E('em', { 'style': 'padding-right: 20px' }, content.sets[key].cnt_elements), E('em', content.sets[key].input + cnt1), E('em', content.sets[key].wan_forward + cnt2), - E('em', content.sets[key].lan_forward + cnt3) + E('em', content.sets[key].lan_forward + cnt3), + E('em', content.sets[key].port) ]); }); rowSets.push([ -- 2.30.2