From cf239752d259410aed2e24a144464badd433c178 Mon Sep 17 00:00:00 2001 From: Rosy Song Date: Mon, 12 Nov 2018 09:42:55 +0800 Subject: [PATCH] nft-qos: replace input chain with prerouting for monitor and dynamic QoS as well Signed-off-by: Rosy Song --- net/nft-qos/Makefile | 2 +- net/nft-qos/files/lib/dynamic.sh | 4 ++-- net/nft-qos/files/lib/monitor.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/net/nft-qos/Makefile b/net/nft-qos/Makefile index 6e0627d89..3ec2b5601 100644 --- 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 960ca5282..a3032086f 100644 --- 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 d05943ae2..54de88eb3 100644 --- a/net/nft-qos/files/lib/monitor.sh +++ b/net/nft-qos/files/lib/monitor.sh @@ -26,11 +26,11 @@ qosdef_monitor_del() { # # 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