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>

diff --git a/package/network/config/qosify/Makefile b/package/network/config/qosify/Makefile
index a5e171484b63d76fb4a2daf1b76364407dcf576a..c5d1ce789b7675721fca97613830407e65b20df3 100644 (file)
--- a/package/network/config/qosify/Makefile
+++ b/package/network/config/qosify/Makefile
@@ -11,9 +11,9 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=qosify
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/qosify.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2021-11-12
-PKG_SOURCE_VERSION:=bfc2cafe2a8c66ffab88a7e5c1ad1b0a4d886271
-PKG_MIRROR_HASH:=88990d5816f37ba1e334499e7ee53a364fa0ba1e5751a91ef0a94934cd2a5451
+PKG_SOURCE_DATE:=2021-11-19
+PKG_SOURCE_VERSION:=e728a319a9a5ac692d18fef936e6ac4377f1bbf1
+PKG_MIRROR_HASH:=86362483e4462a9dc4c4c31363a9a43a140472f105da363053e07e2486fff24f
 
 PKG_LICENSE:=GPL-2.0
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>

diff --git a/package/network/config/qosify/files/qosify.conf b/package/network/config/qosify/files/qosify.conf
index 42713ce791b38dec5dfcd07f4d2958da99431f13..bec9849653d0a3955711c4c35cde9932c5d18c30 100644 (file)
--- a/package/network/config/qosify/files/qosify.conf
+++ b/package/network/config/qosify/files/qosify.conf
@@ -8,15 +8,15 @@ config defaults
        option bulk_trigger_pps 100
        option prio_max_avg_pkt_len 500
 
-config alias bulk
+config class bulk
        option ingress LE
        option egress LE
 
-config alias video
+config class video
        option ingress AF41
        option egress AF41
 
-config alias voice
+config class voice
        option ingress CS6
        option egress CS6
 

diff --git a/package/network/config/qosify/files/qosify.init b/package/network/config/qosify/files/qosify.init
index 040266cc32342afbb8a4f2b41a4e4f30c1620aa8..eca79e6024c8650637a40f2acd9ac4e8e74879ba 100644 (file)
--- a/package/network/config/qosify/files/qosify.init
+++ b/package/network/config/qosify/files/qosify.init
@@ -15,6 +15,16 @@ add_option() {
        [ -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() {
        cfg="$1"
 
@@ -27,15 +37,11 @@ add_defaults() {
        done
        json_close_array
 
+       add_flow_config "$cfg"
        add_option int timeout
-       add_option string dscp_prio
-       add_option string dscp_bulk
        add_option string dscp_icmp
        add_option string dscp_default_udp
        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() {
@@ -71,17 +77,18 @@ add_interface() {
        json_close_object
 }
 
-add_alias() {
+add_class() {
        local cfg="$1"
 
        config_get value "$cfg" value
        config_get ingress "$cfg" ingress
        config_get egress "$cfg" egress
 
-       json_add_array "$cfg"
+       json_add_object "$cfg"
        json_add_string ingress "${ingress:-$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
        json_close_object
 
-       json_add_object aliases
-       config_foreach add_alias alias
+       json_add_object classes
+       config_foreach add_class class
+       config_foreach add_class alias
        json_close_object
 
        json_add_object devices