From f3c5affbfbf4babae8dac6e9cb4c61bb5810ef6b Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Mon, 30 Sep 2019 14:45:34 +0800 Subject: [PATCH] qos-gargoyle: update --- .../po/templates/qos-gargoyle.pot | 0 .../etc/uci-defaults/40_luci-qos-gargoyle | 3 - package/jsda/qos-gargoyle/Makefile | 2 +- .../jsda/qos-gargoyle/files/qos_gargoyle.conf | 141 +++++++++++++++++- .../qos-gargoyle/files/qos_gargoyle.hotplug | 0 .../jsda/qos-gargoyle/files/qos_gargoyle.init | 0 .../qos-gargoyle/patches/001-musl-fixes.patch | 10 ++ 7 files changed, 145 insertions(+), 11 deletions(-) mode change 100755 => 100644 package/jsda/luci-app-qos-gargoyle/po/templates/qos-gargoyle.pot mode change 100644 => 100755 package/jsda/qos-gargoyle/files/qos_gargoyle.hotplug mode change 100644 => 100755 package/jsda/qos-gargoyle/files/qos_gargoyle.init diff --git a/package/jsda/luci-app-qos-gargoyle/po/templates/qos-gargoyle.pot b/package/jsda/luci-app-qos-gargoyle/po/templates/qos-gargoyle.pot old mode 100755 new mode 100644 diff --git a/package/jsda/luci-app-qos-gargoyle/root/etc/uci-defaults/40_luci-qos-gargoyle b/package/jsda/luci-app-qos-gargoyle/root/etc/uci-defaults/40_luci-qos-gargoyle index 4f6cc1b41c..675fd39fc3 100755 --- a/package/jsda/luci-app-qos-gargoyle/root/etc/uci-defaults/40_luci-qos-gargoyle +++ b/package/jsda/luci-app-qos-gargoyle/root/etc/uci-defaults/40_luci-qos-gargoyle @@ -7,8 +7,5 @@ uci -q batch <<-EOF >/dev/null commit ucitrack EOF -/etc/init.d/qos_gargoyle stop -/etc/init.d/qos_gargoyle disable - rm -rf /tmp/luci-modulecache /tmp/luci-indexcache exit 0 diff --git a/package/jsda/qos-gargoyle/Makefile b/package/jsda/qos-gargoyle/Makefile index 5ac73beb96..d8e3db695d 100644 --- a/package/jsda/qos-gargoyle/Makefile +++ b/package/jsda/qos-gargoyle/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=qos-gargoyle -PKG_VERSION:=1.0.1 +PKG_VERSION:=1.0.2 PKG_RELEASE:=1 PKG_LICENSE:=GPL-3.0+ PKG_MAINTAINER:=Xingwang Liao diff --git a/package/jsda/qos-gargoyle/files/qos_gargoyle.conf b/package/jsda/qos-gargoyle/files/qos_gargoyle.conf index 9c281d0b07..bd49967489 100644 --- a/package/jsda/qos-gargoyle/files/qos_gargoyle.conf +++ b/package/jsda/qos-gargoyle/files/qos_gargoyle.conf @@ -1,26 +1,153 @@ +config 'global' 'global' + config upload 'upload' - option default_class 'uclass_2' - option total_bandwidth '1000' + option total_bandwidth '20480' + option default_class 'uclass_1' config download 'download' option qos_monenabled 'true' - option total_bandwidth '10000' + option total_bandwidth '102400' option default_class 'dclass_1' config download_class 'dclass_1' + option name 'Fast' + option percent_bandwidth '66' + option min_bandwidth '3000' + +config download_class 'dclass_2' option name 'Normal' - option percent_bandwidth '100' + option percent_bandwidth '19' + +config download_class 'dclass_3' + option name 'Slow' + option percent_bandwidth '5' + +config download_class 'dclass_4' + option name 'MinRTT' + option percent_bandwidth '10' + option min_bandwidth '100' + option minRTT 'Yes' + +config download_rule 'download_rule_100' + option class 'dclass_4' + option test_order '100' + option max_pkt_size '320' + +config download_rule 'download_rule_200' + option class 'dclass_4' + option test_order '200' + option srcport '53' + +config download_rule 'download_rule_300' + option class 'dclass_3' + option test_order '300' + option srcport '80' + option min_pkt_size '1024' + option connbytes_kb '16384' + +config download_rule 'download_rule_400' + option class 'dclass_2' + option test_order '400' + option srcport '80' + option connbytes_kb '1024' + +config download_rule 'download_rule_500' + option class 'dclass_1' + option test_order '500' + option srcport '80' + +config download_rule 'download_rule_600' + option class 'dclass_3' + option test_order '600' + option srcport '443' + option min_pkt_size '1024' + option connbytes_kb '16384' + +config download_rule 'download_rule_700' + option class 'dclass_2' + option test_order '700' + option srcport '443' + option connbytes_kb '1024' + +config download_rule 'download_rule_800' + option class 'dclass_1' + option test_order '800' + option srcport '443' + +config download_rule 'download_rule_900' + option class 'dclass_3' + option test_order '900' + option min_pkt_size '1280' + option connbytes_kb '1024' + +config download_rule 'download_rule_1000' + option class 'dclass_2' + option test_order '1000' + option connbytes_kb '64' config upload_class 'uclass_1' option name 'Fast' - option percent_bandwidth '90' + option percent_bandwidth '76' + option min_bandwidth '1200' config upload_class 'uclass_2' option name 'Normal' - option percent_bandwidth '10' + option percent_bandwidth '19' + +config upload_class 'uclass_3' + option name 'Slow' + option percent_bandwidth '5' config upload_rule 'upload_rule_100' option class 'uclass_1' - option max_pkt_size '128' + option test_order '100' + option dstport '53' + +config upload_rule 'upload_rule_200' + option class 'uclass_3' + option test_order '200' + option dstport '80' + option min_pkt_size '128' + option connbytes_kb '4096' + +config upload_rule 'upload_rule_300' + option class 'uclass_2' + option test_order '300' + option dstport '80' + option connbytes_kb '256' + +config upload_rule 'upload_rule_400' + option class 'uclass_1' + option test_order '400' + option dstport '80' + +config upload_rule 'upload_rule_500' + option class 'uclass_3' + option test_order '500' + option dstport '443' + option min_pkt_size '128' + option connbytes_kb '4096' + +config upload_rule 'upload_rule_600' + option class 'uclass_2' + option test_order '600' + option dstport '443' + option connbytes_kb '256' + +config upload_rule 'upload_rule_700' + option class 'uclass_1' + option test_order '700' + option dstport '443' + +config upload_rule 'upload_rule_800' + option class 'uclass_3' + option test_order '800' + option min_pkt_size '160' + option connbytes_kb '256' + +config upload_rule 'upload_rule_900' + option class 'uclass_2' + option test_order '900' + option connbytes_kb '16' diff --git a/package/jsda/qos-gargoyle/files/qos_gargoyle.hotplug b/package/jsda/qos-gargoyle/files/qos_gargoyle.hotplug old mode 100644 new mode 100755 diff --git a/package/jsda/qos-gargoyle/files/qos_gargoyle.init b/package/jsda/qos-gargoyle/files/qos_gargoyle.init old mode 100644 new mode 100755 diff --git a/package/jsda/qos-gargoyle/patches/001-musl-fixes.patch b/package/jsda/qos-gargoyle/patches/001-musl-fixes.patch index 1aac736677..d981df7e33 100644 --- a/package/jsda/qos-gargoyle/patches/001-musl-fixes.patch +++ b/package/jsda/qos-gargoyle/patches/001-musl-fixes.patch @@ -36,6 +36,16 @@ /* use_names is required when linking to tc_util.o */ bool use_names = false; +@@ -379,8 +382,7 @@ int use_iec = 0; + int resolve_hosts = 0; + + +-int print_class(const struct sockaddr_nl *who, +- struct nlmsghdr *n, void *arg) ++int print_class(struct nlmsghdr *n, void *arg) + { + struct tcmsg *t = NLMSG_DATA(n); + int len = n->nlmsg_len; @@ -630,7 +633,7 @@ int tc_class_modify(__u32 rate) }