luci-base: properly detect flow offloading capabilities with nftables
authorJo-Philipp Wich <jo@mein.io>
Thu, 20 Jan 2022 12:55:53 +0000 (13:55 +0100)
committerJo-Philipp Wich <jo@mein.io>
Thu, 20 Jan 2022 12:57:15 +0000 (13:57 +0100)
When the system is running with nftables instead of iptables, the
proprietary XT_FLOWOFFLOAD module will not be present, query the nft
equivalent instead.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
modules/luci-base/root/usr/libexec/rpcd/luci

index fbfc3c7a593091f6aaf66499544858735ca696fd..1938e3e9665d1aa09d57c8ffcf8c25d859cb3ddf 100755 (executable)
@@ -209,7 +209,7 @@ local methods = {
                        rv.firewall      = fs.access("/sbin/fw3")
                        rv.firewall4     = fs.access("/sbin/fw4")
                        rv.opkg          = fs.access("/bin/opkg")
-                       rv.offloading    = fs.access("/sys/module/xt_FLOWOFFLOAD/refcnt")
+                       rv.offloading    = fs.access("/sys/module/xt_FLOWOFFLOAD/refcnt") or fs.access("/sys/module/nft_flow_offload/refcnt")
                        rv.br2684ctl     = fs.access("/usr/sbin/br2684ctl")
                        rv.swconfig      = fs.access("/sbin/swconfig")
                        rv.odhcpd        = fs.access("/usr/sbin/odhcpd")