From 63e8b90656319fae72553564ee0408746a619c1d Mon Sep 17 00:00:00 2001 From: John Crispin Date: Fri, 29 Oct 2021 19:49:34 +0200 Subject: [PATCH] qosify: update to latest bpf-headers ABI Signed-off-by: John Crispin --- feeds/ucentral/qosify/Makefile | 10 ++++------ feeds/ucentral/qosify/files/qosify-bpf.o | Bin 19824 -> 19376 bytes feeds/ucentral/qosify/files/qosify.init | 2 +- feeds/ucentral/qosify/src/main.c | 1 + feeds/ucentral/qosify/src/qosify-bpf.c | 4 +++- feeds/ucentral/qosify/src/qosify.h | 3 ++- feeds/ucentral/qosify/src/ubus.c | 9 +++++++-- 7 files changed, 18 insertions(+), 11 deletions(-) diff --git a/feeds/ucentral/qosify/Makefile b/feeds/ucentral/qosify/Makefile index 61c2d4179..f2c511b34 100644 --- a/feeds/ucentral/qosify/Makefile +++ b/feeds/ucentral/qosify/Makefile @@ -16,7 +16,7 @@ PKG_BUILD_DEPENDS:=bpf-headers include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk -#include $(INCLUDE_DIR)/bpf.mk +include $(INCLUDE_DIR)/bpf.mk define Package/qosify SECTION:=kernel @@ -27,12 +27,10 @@ define Package/qosify PKGFLAGS+=nonshared endef -#BPF_DOC = $(wildcard $(patsubst %,$(BPF_HEADERS_DIR)/scripts/%.py,bpf_doc bpf_helpers_doc)) - -TARGET_CFLAGS += -I$(BPF_HEADERS_DIR)/user_headers/include +BPF_DOC = $(wildcard $(patsubst %,$(BPF_HEADERS_DIR)/scripts/%.py,bpf_doc bpf_helpers_doc)) define Build/Compile -# $(call CompileBPF,$(PKG_BUILD_DIR)/qosify-bpf.c) + $(call CompileBPF,$(PKG_BUILD_DIR)/qosify-bpf.c) $(Build/Compile/Default) endef @@ -43,7 +41,7 @@ endef define Package/qosify/install $(INSTALL_DIR) $(1)/lib/bpf $(1)/usr/sbin $(1)/etc/init.d $(1)/etc/config $(1)/etc/hotplug.d/net - $(INSTALL_DATA) ./files/qosify-bpf.o $(1)/lib/bpf + $(INSTALL_DATA) $(PKG_BUILD_DIR)/qosify-bpf.o $(1)/lib/bpf $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/qosify $(1)/usr/sbin/ $(INSTALL_BIN) ./files/qosify.init $(1)/etc/init.d/qosify $(INSTALL_DATA) ./files/qosify-defaults.conf $(1)/etc/qosify-defaults.conf diff --git a/feeds/ucentral/qosify/files/qosify-bpf.o b/feeds/ucentral/qosify/files/qosify-bpf.o index 2181ff1f6f70b240a28c68a771a8db8a0c95e41d..0f8103fef1d79cf5233f435ec6391d717d55c18e 100644 GIT binary patch literal 19376 zcmd^`YiwM{b;pOx<&ur|Sq8ufq4Le|hq+wbFQCl}<6QyO)v|!s55?Zt*iZoS=6cvyJ5K;#q5H}T4wICWJ z)dwf)|37nPd3i*|P9L8-(A}BeIrBJkX70?~%d1~Gc;ry5qQdx4VgA!Bke3?M+`f=b z*<{MBF!!37C!BmHDe-$;+)!P#iP!L3h3g!ywYX-a@?OLNZ^KuYQSM1(X<8N7jKdZ8*th|DhHCU5=HD*XJNaoc1)0-uUG z`-|(S<-JD(+_=&RKaQWbQk1{XCG>nvuXJ+yg*7x(xb`krJ9#?o{9I+$SV6k0!^LNh z*x37l^NusQspY3uKD?2=HfFf-UK?{hb0m)Kvxs(L=4B+=4$GaYs5awM3w~vNbV*ao zk8Oc$qqC!-;?;6F>KiIvvE}@@vYh~O`kiq@#na{!-)H?lvh81noWZXT#r1F5G3#3Y zwvD6f4dT(9Uc@2{qv-?Qxwi@#|n{Y|@{LOe5S)uxV% zCxTxOW?pg3b|1mjiz~pzb(Zld^N;vNJ7R}#zph}#W`>0jX52DusxiFQuCs0&n>PHd z)z`gjBjfL1=Hm=&+VB~x7%sRD^L~wn^e#uekfST+_YrgbIgOb8t7~!ktn}Oaxgqv( zn_v5v^PMZpsn|KgB3iG<$B##YaSoK*827`7ZTNqCy!|*;V=^bv!n+@*-?a9W$H{G1 zrp}pZW=>eO9Us=4E|1TzTg4rIZ*}=kW02_g%kVd+PD7mJ7$%zXxSp|MQ`hEVJ}1 zo?~wPoOPu^)^R_N{rVI=pS*?gGsCXFnX@i_4a+0%yW!t;>seOzkC_cl&-<|%$%abT zA3y$-ryxI7dB|quy2KIZx-<*dzJZu4Z?vBIr?HO9ef>Zq0HMFU5ACsB_GfL(a@n7? zuKnT9Ir%&JGtEUFf%_i)$@`i1G{i`bIpQ<2-qlHdJuZHo_&*zu&slTK9piCH#$(u> zn}&1M=k_cAp+1^yN;gc{D&FWRK3p-aB(()NjvZTzw5RwDj$Npm{>m85w`e8Z)2 zigfJ~;iouP^>5?yKDh4W)~-3EF$^Y!>rGso!JW8%go{2N!}Swf2rF2RuLH@LdupL- z@%YFwkn))L`Hno^kIeI4YF$_~X4XK+qkWJgySZB*c+#ftJ8`iO>v4_Ys&R&|xF6|g zAKVH7A?yfjWPcXhff6fSp_+#!Pt+z~-`#AYUmwKPiHkOIzK!8}P;6>Mn#rVMh!|p< zUCiG_cEuOu^2BKci}Flv@2FUqL#JH18vZjHCmk z2PK_Cn%fZbbmDqh(ql+}O45@^e?ii-NKZ<74(UITG>!PWqyxm?kaP<1w z=}Dw_NS*)_=}AeakUk{oPNW%j;Tl7_1M)|rQzRbU4!Q=aSjc8l2p{p-lu-ca0RJZJ=9=~NHi+w|dk|~|fXG}gjIG7#mHT{|M=EZbw zBxBf2W)LQ2iblF%6=5;^QpWV;hR(r~yvd`AFkL95&!deJy9hzijCA`HYIH@AJM77& zdy6KUf3ejTMq;;3gkiBiJUi0UW7s41%vv>&F7%t>k<3VjxnN^2TrgA`>Ke+K7jx-B z_%l<4kq$~-SuaH%>#RbybRI+2i)_U(+mjva&Wsu#m%2hH=sIiq(#1ZQA9m%^#bUPG zbf-&c`vV_zo56HG8$#NX9?0g-n?hz_sFVq_`Bsw~>PqKqsw~`H7Vh>r=@XIKBx?@` zGH9YyETu90=dy*29n9Y1P*}{sM>bLRG@MxE=YD%XIU46S-FhNjeD}_sJKW5csOfCJXL}cKjKH^^ES3r*U8SHr ztie_ox5ddSQXGqo+q zl=^~4gO)8YuMd+B(+l-M*tAy=#ca7os|>Tnkn=MsT9#X?+81->Y9sYR%6jbt&kS~@ z^Tm-Iyx;8_Uhu?1)3n%mZBKyF2>VJygT>^*lkH Lv^m2NyXWSfqlNGKC>~o1zcR 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 literal 19824 zcmd^`e{7vsdB=~h?Q17ZV<)X!C$#Xoq2VTt6Wd9RX`A$>Y0_k*jcJl5-4DIKv9Ikr z|GK{Sx^bXvZdXuXFc~N!+sg3PP717JMq?z}5Z4;j6trnFf}v;>utYaSTS3-Vz#1Lh z_xqgZT%Vk{KPIuic9i!$=kq+z`Te}-ocsFCZ|^^RAW>CiT&OZXGt1Whtb zz-Y((#m3b^K1=`t_4o(9Ex()*vG@)Bsn}@8!I!iD#YQ_$#U8as^(>*-!_qK*30q%o z+_tN!O8Z;1`tm!)%-p(bt0XeNV>y$s?QTlkDuQ>R8n⪻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 diff --git a/feeds/ucentral/qosify/files/qosify.init b/feeds/ucentral/qosify/files/qosify.init index 8252fe381..20697e3ab 100644 --- a/feeds/ucentral/qosify/files/qosify.init +++ b/feeds/ucentral/qosify/files/qosify.init @@ -20,7 +20,7 @@ add_defaults() { json_add_boolean reset 1 - config_get files "$cfg" files + config_get files "$cfg" defaults json_add_array files for i in $files; do json_add_string "" "$i" diff --git a/feeds/ucentral/qosify/src/main.c b/feeds/ucentral/qosify/src/main.c index 8fa9ec12f..6d5cfed2f 100644 --- a/feeds/ucentral/qosify/src/main.c +++ b/feeds/ucentral/qosify/src/main.c @@ -62,6 +62,7 @@ int main(int argc, char **argv) uloop_run(); + qosify_ubus_stop(); qosify_iface_stop(); uloop_done(); diff --git a/feeds/ucentral/qosify/src/qosify-bpf.c b/feeds/ucentral/qosify/src/qosify-bpf.c index ff40d766d..49468c96e 100644 --- a/feeds/ucentral/qosify/src/qosify-bpf.c +++ b/feeds/ucentral/qosify/src/qosify-bpf.c @@ -238,7 +238,9 @@ parse_l4proto(struct qosify_config *config, struct __sk_buff *skb, return; if ((*value & DSCP_FALLBACK_FLAG) && *dscp_out) - *dscp_out = *value; + return; + + *dscp_out = *value; } static void diff --git a/feeds/ucentral/qosify/src/qosify.h b/feeds/ucentral/qosify/src/qosify.h index 764d3189a..18120c5e9 100644 --- a/feeds/ucentral/qosify/src/qosify.h +++ b/feeds/ucentral/qosify/src/qosify.h @@ -38,7 +38,7 @@ struct qosify_map_data { uint8_t file_dscp; union { - uint16_t port; + uint32_t port; struct in_addr ip; struct in6_addr ip6; } addr; @@ -77,6 +77,7 @@ void qosify_iface_status(struct blob_buf *b); void qosify_iface_stop(void); int qosify_ubus_init(void); +void qosify_ubus_stop(void); int qosify_ubus_check_interface(const char *name, char *ifname, int ifname_len); #endif diff --git a/feeds/ucentral/qosify/src/ubus.c b/feeds/ucentral/qosify/src/ubus.c index ae1994041..4340b9661 100644 --- a/feeds/ucentral/qosify/src/ubus.c +++ b/feeds/ucentral/qosify/src/ubus.c @@ -139,8 +139,8 @@ static const struct blobmsg_policy qosify_config_policy[__CL_CONFIG_MAX] = { [CL_CONFIG_RESET] = { "reset", BLOBMSG_TYPE_BOOL }, [CL_CONFIG_FILES] = { "files", BLOBMSG_TYPE_ARRAY }, [CL_CONFIG_TIMEOUT] = { "timeout", BLOBMSG_TYPE_INT32 }, - [CL_CONFIG_DSCP_UDP] = { "dscp_default_tcp", BLOBMSG_TYPE_STRING }, - [CL_CONFIG_DSCP_TCP] = { "dscp_default_udp", BLOBMSG_TYPE_STRING }, + [CL_CONFIG_DSCP_UDP] = { "dscp_default_udp", BLOBMSG_TYPE_STRING }, + [CL_CONFIG_DSCP_TCP] = { "dscp_default_tcp", BLOBMSG_TYPE_STRING }, [CL_CONFIG_DSCP_PRIO] = { "dscp_prio", BLOBMSG_TYPE_STRING }, [CL_CONFIG_DSCP_BULK] = { "dscp_bulk", BLOBMSG_TYPE_STRING }, [CL_CONFIG_DSCP_ICMP] = { "dscp_icmp", BLOBMSG_TYPE_STRING }, @@ -308,6 +308,11 @@ int qosify_ubus_init(void) return 0; } +void qosify_ubus_stop(void) +{ + ubus_auto_shutdown(&conn); +} + struct iface_req { char *name; int len;