Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Luci mod status handle obsoleted /proc/net/nf conntrack #5699

Open
wants to merge 9 commits into
base: master
Choose a base branch
from

Conversation

jpfox156
Copy link

enables use of the conntrack tool (/usr/sbin/conntrack) in cases the kernel hasn't been compiled with CONFIG_NF_CONNTRACK_PROCFS.

Obsoleting of /proc/net/nf_conntrack affects luci-bwc (luci-mod-status) and sys.net.conntrack within sys.lua (luci-base).

/proc/net/nf_conntrack remains preferred over /usr/sbin/conntrack

Fall through to /usr/sbin/conntrack tool if /proc/net/nf_conntrack or ip_conntrack is not available.

/proc/net/nf_conntrack has been obsoleted in recent kernels (https://cateee.net/lkddb/web-lkddb/NF_CONNTRACK_PROCFS.html). This change enables luci-bwc to collect conntrack information via the /usr/sbin/conntrack tool (if installed) instead. 

Populates the /luci/admin/status/realtime/connections chart

Signed-off-by: James Fox <[email protected]>
Fall through to /usr/sbin/conntrack tool if /proc/net/nf_conntrack is not available.

/proc/net/nf_conntrack has been obsoleted in recent kernels (https://cateee.net/lkddb/web-lkddb/NF_CONNTRACK_PROCFS.html). This change enables sys.net.conntrack() to return conntrack information via the /usr/sbin/conntrack tool (if installed) instead. 

enables population of the /luci/admin/status/realtime/connections list

Signed-off-by: James Fox <[email protected]>
This reverts commit 853d729.
…onntrack

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]>
@jpfox156 jpfox156 force-pushed the luci-mod-status-handle-obsoleted-/proc/net/nf_conntrack branch from 2849f1d to 47ef0f8 Compare March 13, 2024 13:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants