OpenWrt
/
luci
mirror of https://git.openwrt.org/project/luci.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #5869 from galeksandrp/status-fix-oom-nftables 

luci-mod-status: nftables.js: fix OOM on big nftables IP sets
This commit is contained in:
Jo-Philipp Wich 2022-07-05 23:50:06 +02:00 committed by GitHub
parent 2b25474059 88c62fe218
commit 6d9e282f3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/luci-mod-status/htdocs/luci-static/resources/view/status/nftables.js
View File

@ -133,7 +133,7 @@ var action_translations = {
return view.extend({
load: function() {
return Promise.all([
L.resolveDefault(fs.exec_direct('/usr/sbin/nft', [ '--json', 'list', 'ruleset' ], 'json'), {}),
L.resolveDefault(fs.exec_direct('/usr/sbin/nft', [ '--terse', '--json', 'list', 'ruleset' ], 'json'), {}),
L.resolveDefault(fs.exec_direct('/usr/sbin/iptables-save'), ''),
L.resolveDefault(fs.exec_direct('/usr/sbin/ip6tables-save'), '')
]);

2
modules/luci-mod-status/root/usr/share/rpcd/acl.d/luci-mod-status.json
View File

@ -71,7 +71,7 @@
"read": {
"cgi-io": [ "exec" ],
"file": {
"/usr/sbin/nft --json list ruleset": [ "exec" ],
"/usr/sbin/nft --terse --json list ruleset": [ "exec" ],
"/usr/sbin/iptables --line-numbers -w -nvxL -t *": [ "exec" ],
"/usr/sbin/ip6tables --line-numbers -w -nvxL -t *": [ "exec" ],
"/usr/sbin/ip6tables": [ "list" ],