From d08810bd895a334c37f41679db273d89140841ed Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Thu, 15 Sep 2022 09:07:47 +0200 Subject: [PATCH 1/4] Fix V2Ray UDP disable --- .../luasrc/controller/openmptcprouter.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua index ec1dbcd6b..67e907243 100644 --- a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua +++ b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua @@ -1158,8 +1158,10 @@ function settings_add() ucic:set("openmptcprouter","settings","shadowsocksudp",shadowsocksudp) -- Enable/disable v2ray udp - local v2rayudp = luci.http.formvalue("v2rayudp") or "1" + local v2rayudp = luci.http.formvalue("v2rayudp") or "0" ucic:set("v2ray","main_transparent_proxy","redirect_udp",v2rayudp) + ucic:save("v2ray") + ucic:commit("v2ray") -- Enable/disable nDPI local ndpi = luci.http.formvalue("ndpi") or "1" From 3d8e9968097f20c660748198f0c9bb39cecb71ec Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Thu, 15 Sep 2022 12:58:22 +0200 Subject: [PATCH 2/4] Add some USB dependencies --- openmptcprouter-full/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openmptcprouter-full/Makefile b/openmptcprouter-full/Makefile index 5f301a04b..9a41f555a 100644 --- a/openmptcprouter-full/Makefile +++ b/openmptcprouter-full/Makefile @@ -62,7 +62,7 @@ MY_DEPENDS := \ rng-tools \ openvpn-openssl \ mmc-utils \ - libimobiledevice \ + libimobiledevice libimobiledevice-utils \ comgt \ kmod-random-core \ kmod-netem \ @@ -75,14 +75,14 @@ MY_DEPENDS := \ TARGET_mvebu:kmod-mwlwifi TARGET_mvebu:mwlwifi-firmware-88w8864 TARGET_mvebu:mwlwifi-firmware-88w8897 TARGET_mvebu:mwlwifi-firmware-88w8964 TARGET_mvebu:mwlwifi-firmware-88w8997 \ !TARGET_mvebu:kmod-usb-serial !TARGET_mvebu:kmod-usb-serial-option !TARGET_mvebu:kmod-usb-serial-wwan !TARGET_mvebu:usb-modeswitch !TARGET_mvebu:uqmi \ !TARGET_mvebu:umbim !TARGET_mvebu:kmod-mii !TARGET_mvebu:kmod-usb-net !TARGET_mvebu:kmod-usb-wdm !TARGET_mvebu:kmod-usb-net-qmi-wwan !TARGET_mvebu:kmod-usb-net-cdc-mbim !TARGET_mvebu:umbim \ - !TARGET_mvebu:kmod-usb-net-huawei-cdc-ncm !TARGET_mvebu:kmod-usb-net-rndis !TARGET_mvebu:kmod-usb-net-cdc-ether !TARGET_mvebu:kmod-usb-net-ipheth !TARGET_mvebu:usbmuxd \ + !TARGET_mvebu:kmod-usb-net-huawei-cdc-ncm !TARGET_mvebu:kmod-usb-net-rndis !TARGET_mvebu:kmod-usb-net-cdc-ether !TARGET_mvebu:kmod-usb-net-ipheth !TARGET_mvebu:usbmuxd !TARGET_mvebu:libusbmuxd \ kmod-rt2800-usb kmod-rtl8xxxu kmod-rtl8192cu kmod-net-rtl8192su kmod-rtl8812au-ct \ !TARGET_mvebu:luci-proto-qmi wpad-basic kmod-mt7601u kmod-rtl8187 TARGET_r4s:kmod-r8168 (TARGET_x86||TARGET_x86_64):kmod-usb-net-rtl8152 \ luci-app-mlvpn mlvpn 464xlat kmod-zram kmod-swconfig swconfig kmod-ipt-nat kmod-ipt-nat6 luci-app-https-dns-proxy kmod-tcp-nanqinlang (TARGET_x86_64||aarch64):kmod-tcp-bbr2 iptables-mod-ipopt igmpproxy ss iptraf-ng \ luci-app-acl block-mount blockd fstools luci-app-shutdown libwebp luci-proto-gre tcptraceroute luci-proto-mbim kmod-rtl8xxxu kmod-ath9k-htc luci-app-ttyd luci-mod-dashboard (TARGET_x86||TARGET_x86_64):rtl8192eu-firmware kmod-usb2 libustream-openssl (TARGET_x86||TARGET_x86_64):kmod-ixgbevf (TARGET_x86||TARGET_x86_64):kmod-igbvf \ hwinfo (TARGET_x86||TARGET_x86_64):dmidecode luci-app-packet-capture kmod-bonding luci-proto-bonding luci-app-sysupgrade \ luci-theme-openwrt-2020 luci-proto-wireguard luci-app-wireguard kmod-crypto-lib-blake2s (TARGET_x86||TARGET_x86_64):kmod-r8125 TARGET_x86_64:kmod-atlantic \ - LINUX_5_15:mptcpd (TARGET_x86||TARGET_x86_64):kmod-igc kmod-mmc-spi kmod-macsec + LINUX_5_15:mptcpd (TARGET_x86||TARGET_x86_64):kmod-igc kmod-mmc-spi kmod-macsec usbutils # !TARGET_mvebu:kmod-usb-net-smsc75xx # libnetfilter-conntrack ebtables ebtables-utils ip-full nstat \ From a196e8b86a25471f39d731be0ff8b41b676571f2 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Thu, 15 Sep 2022 20:55:53 +0200 Subject: [PATCH 3/4] Launch sqm-autorate only if max/min upload/download speed are set --- luci-app-sqm-autorate/root/etc/init.d/sqm-autorate | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/luci-app-sqm-autorate/root/etc/init.d/sqm-autorate b/luci-app-sqm-autorate/root/etc/init.d/sqm-autorate index 2d70776e7..1646d2e2a 100755 --- a/luci-app-sqm-autorate/root/etc/init.d/sqm-autorate +++ b/luci-app-sqm-autorate/root/etc/init.d/sqm-autorate @@ -21,6 +21,15 @@ _launch_autorate() { config_get autorate "$1" autorate [ "${autorate}" != "1" ] && return + config_get min_download "$1" min_download + config_get download "$1" download + config_get max_download "$1" max_download + [ "${min_download}" == "0" ] || [ "${max_download}" == "0" ] || [ "${download}" == "0" ] && return + config_get min_upload "$1" min_upload + config_get upload "$1" upload + config_get max_upload "$1" max_upload + [ "${min_upload}" == "0" ] || [ "${max_upload}" == "0" ] || [ "${upload}" == "0" ] && return + procd_open_instance # shellcheck disable=SC2086 procd_set_param command /usr/share/sqm-autorate/CAKE-autorate.sh "$1" From a1404fd3eb0e73905db32f7d55a06c03e39cdb89 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 16 Sep 2022 08:32:15 +0200 Subject: [PATCH 4/4] ndpi-netfilter patch --- ndpi-netfilter2/patches/fcommon.patch | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 ndpi-netfilter2/patches/fcommon.patch diff --git a/ndpi-netfilter2/patches/fcommon.patch b/ndpi-netfilter2/patches/fcommon.patch new file mode 100644 index 000000000..faa8c57cf --- /dev/null +++ b/ndpi-netfilter2/patches/fcommon.patch @@ -0,0 +1,19 @@ +--- a/ndpi-netfilter/ipt/Makefile.anc 2022-09-05 09:34:30.579787766 +0200 ++++ b/ndpi-netfilter/ipt/Makefile 2022-09-05 09:34:42.555588398 +0200 +@@ -2,14 +2,14 @@ + NDPI_PRO := ${NDPI_SRC}/lib/protocols + XTBL := $(shell pkg-config --variable=xtlibdir xtables) + +-CFLAGS = -fPIC -I../.. -I${NDPI_SRC}/include -I${NDPI_SRC}/lib -I../src -I../libre -DOPENDPI_NETFILTER_MODULE -O2 -Wall ++CFLAGS = -fPIC -I../.. -I${NDPI_SRC}/include -I${NDPI_SRC}/lib -I../src -I../libre -DOPENDPI_NETFILTER_MODULE -O2 -Wall -fcommon + + all: libxt_ndpi.so + install: libxt_ndpi.so + if [ -n "$(DESTDIR)$(XTBL)" -a -d "$(DESTDIR)$(XTBL)" ]; then install -v libxt_ndpi.so $(DESTDIR)$(XTBL); ln -fs libxt_ndpi.so $(DESTDIR)$(XTBL)/libxt_NDPI.so ; else echo "No pkg-config --variable=xtlibdir xtables"; fi + + lib%.so: lib%.o +- $(CC) -shared -o $@ $^; ++ $(CC) -shared -nostartfiles -o $@ $^; + lib%.o: lib%.c ../src/xt_ndpi.h ${NDPI_SRC}/include/ndpi_config.h ../libre/regexp.h ../libre/regexp.c + $(CC) ${CFLAGS} -D_INIT=lib$*_init -c -o $@ $<; + clean: