nft-qos: replace input chain with prerouting for monitor and dynamic QoS as well

Signed-off-by: Rosy Song <redacted>

diff --git a/net/nft-qos/Makefile b/net/nft-qos/Makefile
index 6e0627d891abd61bcbf64c8ee65e71b6de8b9bf9..3ec2b56011c60c51181f04ba29deb41f6365eca6 100644 (file)
--- a/net/nft-qos/Makefile
+++ b/net/nft-qos/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nft-qos
-PKG_VERSION:=1.0.1
+PKG_VERSION:=1.0.2
 PKG_RELEASE:=1
 PKG_LICENSE:=GPL-2.0
 

diff --git a/net/nft-qos/files/lib/dynamic.sh b/net/nft-qos/files/lib/dynamic.sh
index 960ca528292dfcdcb5e9cf8810678f31afedf169..a3032086f51b1f7cf84ea926b0fd9352d7d72fdd 100644 (file)
--- a/net/nft-qos/files/lib/dynamic.sh
+++ b/net/nft-qos/files/lib/dynamic.sh
@@ -56,7 +56,7 @@ qosdef_flush_dynamic() {
 # init dynamic qos
 qosdef_init_dynamic() {
        local dynamic_bw_up dynamic_bw_down limit_enable limit_type
-       local hook_ul="input" hook_dl="postrouting"
+       local hook_ul="prerouting" hook_dl="postrouting"
 
        uci_validate_section nft-qos default default \
                'limit_enable:bool:0' \
@@ -79,7 +79,7 @@ qosdef_init_dynamic() {
 
        [ -z "$NFT_QOS_HAS_BRIDGE" ] && {
                hook_ul="postrouting"
-               hook_dl="input"
+               hook_dl="prerouting"
        }
 
        qosdef_appendx "table $NFT_QOS_INET_FAMILY nft-qos-dynamic {\n"

diff --git a/net/nft-qos/files/lib/monitor.sh b/net/nft-qos/files/lib/monitor.sh
index d05943ae2a8594355ddd2b098967ca22182b75f9..54de88eb3681e90a79e0b6780863c8e0f516f230 100644 (file)
--- a/net/nft-qos/files/lib/monitor.sh
+++ b/net/nft-qos/files/lib/monitor.sh
@@ -26,11 +26,11 @@ qosdef_monitor_del() { # <mac> <ip> <hostname>
 
 # init qos monitor
 qosdef_init_monitor() {
-       local hook_ul="input" hook_dl="postrouting"
+       local hook_ul="prerouting" hook_dl="postrouting"
 
        [ -z "$NFT_QOS_HAS_BRIDGE" ] && {
                hook_ul="postrouting"
-               hook_dl="input"
+               hook_dl="prerouting"
        }
 
        nft add table $NFT_QOS_INET_FAMILY nft-qos-monitor