qosify: update to the latest version

68961a555e42 ubus: drop dnsmasq check for dns_result method
1ca3e26b8169 bpf: refactor code to support explicit opt-in for bulk+prio detection
3f0acf039f41 bpf: move flow prio/bulk detection config into a separate data structure
bc54c97e3333 map, bpf: create a separate map for configured dscp classes
46cf3eae2d99 bpf: fix bulk flow detaction
88f1db7dd611 bpf: fix priority flow detection
b5dec7874373 bpf: remove access to skb->gso_size
e728a319a9a5 interface: unify status, always include ifname, ingress, egress

Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2021-11-19 22:57:03 +01:00
parent 8f355becdf
commit 0351a5ff87
3 changed files with 24 additions and 16 deletions

View File

@ -11,9 +11,9 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=qosify PKG_NAME:=qosify
PKG_SOURCE_URL=$(PROJECT_GIT)/project/qosify.git PKG_SOURCE_URL=$(PROJECT_GIT)/project/qosify.git
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_DATE:=2021-11-12 PKG_SOURCE_DATE:=2021-11-19
PKG_SOURCE_VERSION:=bfc2cafe2a8c66ffab88a7e5c1ad1b0a4d886271 PKG_SOURCE_VERSION:=e728a319a9a5ac692d18fef936e6ac4377f1bbf1
PKG_MIRROR_HASH:=88990d5816f37ba1e334499e7ee53a364fa0ba1e5751a91ef0a94934cd2a5451 PKG_MIRROR_HASH:=86362483e4462a9dc4c4c31363a9a43a140472f105da363053e07e2486fff24f
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name> PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>

View File

@ -8,15 +8,15 @@ config defaults
option bulk_trigger_pps 100 option bulk_trigger_pps 100
option prio_max_avg_pkt_len 500 option prio_max_avg_pkt_len 500
config alias bulk config class bulk
option ingress LE option ingress LE
option egress LE option egress LE
config alias video config class video
option ingress AF41 option ingress AF41
option egress AF41 option egress AF41
config alias voice config class voice
option ingress CS6 option ingress CS6
option egress CS6 option egress CS6

View File

@ -15,6 +15,16 @@ add_option() {
[ -n "$val" ] && json_add_$type "$name" "$val" [ -n "$val" ] && json_add_$type "$name" "$val"
} }
add_flow_config() {
local cfg="$1"
add_option string dscp_prio
add_option string dscp_bulk
add_option int bulk_trigger_timeout
add_option int bulk_trigger_pps
add_option int prio_max_avg_pkt_len
}
add_defaults() { add_defaults() {
cfg="$1" cfg="$1"
@ -27,15 +37,11 @@ add_defaults() {
done done
json_close_array json_close_array
add_flow_config "$cfg"
add_option int timeout add_option int timeout
add_option string dscp_prio
add_option string dscp_bulk
add_option string dscp_icmp add_option string dscp_icmp
add_option string dscp_default_udp add_option string dscp_default_udp
add_option string dscp_default_tcp add_option string dscp_default_tcp
add_option int bulk_trigger_timeout
add_option int bulk_trigger_pps
add_option int prio_max_avg_pkt_len
} }
add_interface() { add_interface() {
@ -71,17 +77,18 @@ add_interface() {
json_close_object json_close_object
} }
add_alias() { add_class() {
local cfg="$1" local cfg="$1"
config_get value "$cfg" value config_get value "$cfg" value
config_get ingress "$cfg" ingress config_get ingress "$cfg" ingress
config_get egress "$cfg" egress config_get egress "$cfg" egress
json_add_array "$cfg" json_add_object "$cfg"
json_add_string ingress "${ingress:-$value}" json_add_string ingress "${ingress:-$value}"
json_add_string egress "${egress:-$value}" json_add_string egress "${egress:-$value}"
json_close_array add_flow_config "$cfg"
json_close_object
} }
@ -96,8 +103,9 @@ reload_service() {
config_foreach add_interface interface config_foreach add_interface interface
json_close_object json_close_object
json_add_object aliases json_add_object classes
config_foreach add_alias alias config_foreach add_class class
config_foreach add_class alias
json_close_object json_close_object
json_add_object devices json_add_object devices