projects
/
project
/
luci.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c62117c
)
luci-base: update sys.uc conntrack_list to use /usr/sbin/conntrack
author
Paul Donald
<
[email protected]
>
Thu, 2 Oct 2025 13:24:56 +0000
(15:24 +0200)
committer
Paul Donald
<
[email protected]
>
Thu, 2 Oct 2025 13:43:30 +0000
(15:43 +0200)
Update sys.uc so that ubus luci->getConntrackList method is optionally
populated by /usr/sbin/conntrack application if /proc/net/nf_conntrack
is not available.
Signed-off-by: James <
[email protected]
>
modules/luci-base/ucode/sys.uc
patch
|
blob
|
history
diff --git
a/modules/luci-base/ucode/sys.uc
b/modules/luci-base/ucode/sys.uc
index 305499c7978342613d876b67eb573c9fa0b75862..35b5fcdebfaf1210be16ab1552752cb249346899 100644
(file)
--- a/
modules/luci-base/ucode/sys.uc
+++ b/
modules/luci-base/ucode/sys.uc
@@
-44,7
+44,10
@@
export function conntrack_list(callback) {
etcpr.close();
}
- const nfct = open('/proc/net/nf_conntrack', 'r');
+ let nfct = open('/proc/net/nf_conntrack', 'r');
+ if (! nfct) {
+ nfct = popen('/usr/sbin/conntrack -L -o extended', 'r');
+ }
let connt;
if (nfct) {