From 9d261ee5729ea9fbe5a4ab82a14cf0a1d78b0c90 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 4 Oct 2024 17:47:34 +0200 Subject: [PATCH 1/3] Add firewall.user script with firewall4 --- .../files/etc/uci-defaults/1980-omr-firewall | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/openmptcprouter/files/etc/uci-defaults/1980-omr-firewall b/openmptcprouter/files/etc/uci-defaults/1980-omr-firewall index b2b465778..fa4ac9ffc 100755 --- a/openmptcprouter/files/etc/uci-defaults/1980-omr-firewall +++ b/openmptcprouter/files/etc/uci-defaults/1980-omr-firewall @@ -280,8 +280,19 @@ uci -q batch <<-EOF >/dev/null del firewall.omr_server.reload del firewall.gre_tunnel.reload del firewall.ttl.reload + commit firewall EOF +if [ -z "$(uci -q get firewall.user)" ]; then + uci -q batch <<-EOF >/dev/null + set firewall.user=include + set firewall.user.path='/etc/firewall.user' + set firewall.user.enabled='1' + set firewall.user.type='script' + set firewall.user.fw4_compatible='1' + commit firewall + EOF +fi rm -f /tmp/luci-indexcache exit 0 From 0519dff9d03d723fade189b90373cc94a8d903a7 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 4 Oct 2024 17:48:10 +0200 Subject: [PATCH 2/3] Add kernel 6.12 changes --- ndpi-netfilter2/Makefile | 2 +- openmptcprouter-full/Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ndpi-netfilter2/Makefile b/ndpi-netfilter2/Makefile index d6950a554..249859718 100644 --- a/ndpi-netfilter2/Makefile +++ b/ndpi-netfilter2/Makefile @@ -41,7 +41,7 @@ define Package/iptables-mod-ndpi # DEPENDS:=+iptables +iptables-mod-conntrack-extra +kmod-ipt-ndpi +libpcap # DEPENDS:=+iptables +kmod-ipt-ndpi +libpcap @(LINUX_5_4||LINUX_5_15||TARGET_x86_64) # DEPENDS:=+iptables +kmod-ipt-ndpi +libpcap @(LINUX_5_4||LINUX_5_15) @!TARGET_ramips - DEPENDS:=+iptables +kmod-ipt-ndpi +libpcap @!TARGET_ramips @!LINUX_6_6 @!LINUX_6_10 @!LINUX_6_11 + DEPENDS:=+iptables +kmod-ipt-ndpi +libpcap @!TARGET_ramips @!LINUX_6_6 @!LINUX_6_10 @!LINUX_6_11 @!LINUX_6_12 MAINTAINER:=Ycarus (Yannick Chabanois) endef diff --git a/openmptcprouter-full/Makefile b/openmptcprouter-full/Makefile index 1407935ad..64562ea41 100644 --- a/openmptcprouter-full/Makefile +++ b/openmptcprouter-full/Makefile @@ -84,7 +84,7 @@ MY_DEPENDS := \ luci-theme-openwrt-2020 luci-proto-wireguard luci-app-wireguard kmod-crypto-lib-blake2s \ !(LINUX_5_4):mptcpd (TARGET_x86||TARGET_x86_64):kmod-igc !TARGET_mvebu:kmod-mmc-spi kmod-macsec usbutils v2ray-core LINUX_5_4:v2ray-config !LINUX_5_4:v2ray-config-nft \ (TARGET_x86||TARGET_x86_64):kmod-mlx4-core \ - !(TARGET_ipq40xx||TARGET_ramips||LINUX_6_6||LINUX_6_10||LINUX_6_11):iptables-mod-ndpi !(TARGET_ipq40xx||TARGET_ramips||LINUX_6_6||LINUX_6_10||LINUX_6_11):kmod-ipt-ndpi libip4tc libip6tc \ + !(TARGET_ipq40xx||TARGET_ramips||LINUX_6_6||LINUX_6_10||LINUX_6_11||LINUX_6_12):iptables-mod-ndpi !(TARGET_ipq40xx||TARGET_ramips||LINUX_6_6||LINUX_6_10||LINUX_6_11||LINUX_6_12):kmod-ipt-ndpi libip4tc libip6tc \ xray-core LINUX_5_4:xray-config !LINUX_5_4:xray-config-nft \ shadowsocks-rust-sslocal shadowsocks-rust-ssservice LINUX_5_4:shadowsocks-rust-config !LINUX_5_4:shadowsocks-rust-config-nft luci-app-shadowsocks-rust \ luci-proto-external omr-schedule jq luci-app-ddns \ @@ -93,7 +93,7 @@ MY_DEPENDS := \ (LINUX_5_4&&(TARGET_x86_64||TARGET_aarch64)):kmod-tcp-bbr2 \ TARGET_x86_64:kmod-atlantic \ !(LINUX_5_4||LINUX_6_1||TARGET_ramips||TARGET_ipq806x):mptcp-bpf-burst !(LINUX_5_4||LINUX_6_1||TARGET_ramips||TARGET_ipq806x):mptcp-bpf-first !(LINUX_5_4||LINUX_6_1||TARGET_ramips||TARGET_ipq806x):mptcp-bpf-red !(LINUX_5_4||LINUX_6_1||TARGET_ramips||TARGET_ipq806x):mptcp-bpf-rr !(LINUX_5_4||LINUX_6_1||TARGET_ramips||TARGET_ipq806x):bpftool-full \ - !(LINUX_6_10||LINUX_6_11):kmod-ovpn-dco-v2 lspci + !(LINUX_6_10||LINUX_6_11||LINUX_6_12):kmod-ovpn-dco-v2 lspci # !TARGET_ipq40xx:kmod-rt2800-usb (TARGET_x86||TARGET_x86_64):kmod-iwlwifi (TARGET_x86||TARGET_x86_64):iwlwifi-firmware-iwl1000 (TARGET_x86||TARGET_x86_64):iwlwifi-firmware-iwl100 (TARGET_x86||TARGET_x86_64):iwlwifi-firmware-iwl105 (TARGET_x86||TARGET_x86_64):iwlwifi-firmware-iwl135 (TARGET_x86||TARGET_x86_64):iwlwifi-firmware-iwl2000 (TARGET_x86||TARGET_x86_64):iwlwifi-firmware-iwl2030 (TARGET_x86||TARGET_x86_64):iwlwifi-firmware-iwl3160 (TARGET_x86||TARGET_x86_64):iwlwifi-firmware-iwl3168 (TARGET_x86||TARGET_x86_64):iwlwifi-firmware-iwl5000 (TARGET_x86||TARGET_x86_64):iwlwifi-firmware-iwl5150 (TARGET_x86||TARGET_x86_64):iwlwifi-firmware-iwl6000g2 (TARGET_x86||TARGET_x86_64):iwlwifi-firmware-iwl6000g2a (TARGET_x86||TARGET_x86_64):iwlwifi-firmware-iwl6000g2b (TARGET_x86||TARGET_x86_64):iwlwifi-firmware-iwl6050 (TARGET_x86||TARGET_x86_64):iwlwifi-firmware-iwl7260 (TARGET_x86||TARGET_x86_64):iwlwifi-firmware-iwl7265 (TARGET_x86||TARGET_x86_64):iwlwifi-firmware-iwl7265d (TARGET_x86||TARGET_x86_64):iwlwifi-firmware-iwl8260c (TARGET_x86||TARGET_x86_64):iwlwifi-firmware-iwl8265 \ # !TARGET_ipq40xx:kmod-rtl8xxxu !TARGET_ipq40xx:kmod-rtl8192cu !TARGET_ipq40xx:kmod-net-rtl8192su !LINUX_6_1:kmod-rtl8812au-ct (TARGET_x86||TARGET_x86_64):kmod-r8169 (TARGET_x86||TARGET_x86_64):kmod-8139too (TARGET_x86||TARGET_x86_64):kmod-r8125 !TARGET_ipq40xx:kmod-rtl8187 kmod-rtl8xxxu (TARGET_x86||TARGET_x86_64):rtl8192eu-firmware From ef3eaf6ed13ece41fe79336b48402ac9491170c6 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 4 Oct 2024 17:48:46 +0200 Subject: [PATCH 3/3] Change init order for z8102 --- z8102/files/etc/init.d/z8102 | 2 +- z8102/files/etc/init.d/z8102-wdg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/z8102/files/etc/init.d/z8102 b/z8102/files/etc/init.d/z8102 index a9a8b8aa9..36c3ffe2c 100755 --- a/z8102/files/etc/init.d/z8102 +++ b/z8102/files/etc/init.d/z8102 @@ -2,7 +2,7 @@ # Copyright (C) 2013 OpenWrt.org # Copyright (C) 2023 Yannick Chabanois (Ycarus) for OpenMPTCProuter -START=10 +START=00 USE_PROCD=1 log() { diff --git a/z8102/files/etc/init.d/z8102-wdg b/z8102/files/etc/init.d/z8102-wdg index ed69d4db6..14cbd877e 100755 --- a/z8102/files/etc/init.d/z8102-wdg +++ b/z8102/files/etc/init.d/z8102-wdg @@ -2,7 +2,7 @@ # Copyright (C) 2013 OpenWrt.org # Copyright (C) 2023 Yannick Chabanois (Ycarus) for OpenMPTCProuter -START=30 +START=01 USE_PROCD=1 log() {