mirror of
https://github.com/novatiq/packages.git
synced 2026-04-30 07:28:39 +01:00
Merge pull request #7398 from rosysong/nft-qos
nft-qos: replace input chain with prerouting for monitor and dynamic
This commit is contained in:
@@ -8,7 +8,7 @@
|
|||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=nft-qos
|
PKG_NAME:=nft-qos
|
||||||
PKG_VERSION:=1.0.1
|
PKG_VERSION:=1.0.2
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
PKG_LICENSE:=GPL-2.0
|
PKG_LICENSE:=GPL-2.0
|
||||||
|
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ qosdef_flush_dynamic() {
|
|||||||
# init dynamic qos
|
# init dynamic qos
|
||||||
qosdef_init_dynamic() {
|
qosdef_init_dynamic() {
|
||||||
local dynamic_bw_up dynamic_bw_down limit_enable limit_type
|
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 \
|
uci_validate_section nft-qos default default \
|
||||||
'limit_enable:bool:0' \
|
'limit_enable:bool:0' \
|
||||||
@@ -79,7 +79,7 @@ qosdef_init_dynamic() {
|
|||||||
|
|
||||||
[ -z "$NFT_QOS_HAS_BRIDGE" ] && {
|
[ -z "$NFT_QOS_HAS_BRIDGE" ] && {
|
||||||
hook_ul="postrouting"
|
hook_ul="postrouting"
|
||||||
hook_dl="input"
|
hook_dl="prerouting"
|
||||||
}
|
}
|
||||||
|
|
||||||
qosdef_appendx "table $NFT_QOS_INET_FAMILY nft-qos-dynamic {\n"
|
qosdef_appendx "table $NFT_QOS_INET_FAMILY nft-qos-dynamic {\n"
|
||||||
|
|||||||
@@ -26,11 +26,11 @@ qosdef_monitor_del() { # <mac> <ip> <hostname>
|
|||||||
|
|
||||||
# init qos monitor
|
# init qos monitor
|
||||||
qosdef_init_monitor() {
|
qosdef_init_monitor() {
|
||||||
local hook_ul="input" hook_dl="postrouting"
|
local hook_ul="prerouting" hook_dl="postrouting"
|
||||||
|
|
||||||
[ -z "$NFT_QOS_HAS_BRIDGE" ] && {
|
[ -z "$NFT_QOS_HAS_BRIDGE" ] && {
|
||||||
hook_ul="postrouting"
|
hook_ul="postrouting"
|
||||||
hook_dl="input"
|
hook_dl="prerouting"
|
||||||
}
|
}
|
||||||
|
|
||||||
nft add table $NFT_QOS_INET_FAMILY nft-qos-monitor
|
nft add table $NFT_QOS_INET_FAMILY nft-qos-monitor
|
||||||
|
|||||||
Reference in New Issue
Block a user