Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #7398 from rosysong/nft-qos

Browse source 
nft-qos: replace input chain with prerouting for monitor and dynamic
This commit is contained in:
Hannu Nyman 2018-11-12 17:18:34 +02:00 committed by GitHub
commit 6c8980fae7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/nft-qos/Makefile
View file

@ -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

4
net/nft-qos/files/lib/dynamic.sh
View file

@ -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"

4
net/nft-qos/files/lib/monitor.sh
View file

@ -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