From 5dc6df3858ed4c9006428521f94d54b4c8089b67 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Tue, 26 Nov 2024 09:03:38 +0100 Subject: [PATCH 1/3] Fix R2S support --- openmptcprouter-full/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openmptcprouter-full/Makefile b/openmptcprouter-full/Makefile index d58738041..eef55f8f9 100644 --- a/openmptcprouter-full/Makefile +++ b/openmptcprouter-full/Makefile @@ -77,7 +77,7 @@ MY_DEPENDS := \ usb-modeswitch !(TARGET_mvebu||TARGET_ipq806x):uqmi \ !(TARGET_mvebu||TARGET_ramips||TARGET_ipq806x):umbim !(TARGET_mvebu||TARGET_ramips||TARGET_ipq806x):kmod-mii !(TARGET_mvebu||TARGET_ramips||TARGET_ipq806x):kmod-usb-net !(TARGET_mvebu||TARGET_ramips||TARGET_ipq806x):kmod-usb-wdm !(TARGET_mvebu||TARGET_ramips||TARGET_ipq806x):kmod-usb-net-qmi-wwan !(TARGET_mvebu||TARGET_ramips||TARGET_ipq806x):kmod-usb-net-cdc-mbim !(TARGET_mvebu||TARGET_ramips||TARGET_ipq806x):umbim \ !(TARGET_mvebu||TARGET_ramips||TARGET_ipq40xx||TARGET_ipq806x):kmod-usb-net-huawei-cdc-ncm !(TARGET_mvebu||TARGET_ramips||TARGET_ipq40xx||TARGET_ipq806x):kmod-usb-net-rndis !(TARGET_mvebu||TARGET_ramips||TARGET_ipq40xx||TARGET_ipq806x):kmod-usb-net-cdc-ether !(TARGET_mvebu||TARGET_ramips||TARGET_ipq40xx||TARGET_ipq806x):kmod-usb-net-ipheth !(TARGET_mvebu||TARGET_ramips||TARGET_ipq40xx||TARGET_ipq806x):usbmuxd !(TARGET_mvebu||TARGET_ramips||TARGET_ipq40xx||TARGET_ipq806x):libusbmuxd \ - !(TARGET_mvebu||TARGET_ramips||TARGET_ipq806x):luci-proto-qmi !LINUX_5_4:wpad-mesh-openssl !LINUX_5_4:libopenssl-legacy LINUX_5_4:wpad-basic (TARGET_x86||TARGET_x86_64):kmod-usb-net-rtl8152 \ + !(TARGET_mvebu||TARGET_ramips||TARGET_ipq806x):luci-proto-qmi !LINUX_5_4:wpad-mesh-openssl !LINUX_5_4:libopenssl-legacy LINUX_5_4:wpad-basic (TARGET_x86||TARGET_x86_64||TARGET_rockchip_armv8):kmod-usb-net-rtl8152 \ !(TARGET_mvebu||TARGET_ramips||TARGET_ipq806x):luci-app-mlvpn !(TARGET_mvebu||TARGET_ramips||TARGET_ipq806x):mlvpn 464xlat kmod-zram kmod-swconfig swconfig kmod-ipt-nat kmod-ipt-nat6 luci-app-https-dns-proxy kmod-tcp-nanqinlang 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 luci-app-ttyd luci-mod-dashboard 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 kmod-bonding luci-proto-bonding luci-app-sysupgrade \ From 4a4ab3d746fc49effa111153a1bd9fda26c531ed Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Tue, 26 Nov 2024 14:30:39 +0100 Subject: [PATCH 2/3] Reload MPTCP config when interface is up --- mptcp/files/etc/hotplug.d/iface/30-mptcp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/mptcp/files/etc/hotplug.d/iface/30-mptcp b/mptcp/files/etc/hotplug.d/iface/30-mptcp index 33bc70ebe..c01ab8f35 100644 --- a/mptcp/files/etc/hotplug.d/iface/30-mptcp +++ b/mptcp/files/etc/hotplug.d/iface/30-mptcp @@ -6,11 +6,10 @@ /etc/init.d/mptcp enabled || exit 0 -#if [ "$ACTION" = ifup -o "$ACTION" = ifupdate -o "$ACTION" = iflink ] && [ -z "$(echo $DEVICE | grep oip | grep gre)" ]; then -# logger -t "mptcp" "Reloading mptcp config due to $ACTION of $INTERFACE ($DEVICE)" -# /etc/init.d/mptcp reload "$DEVICE" >/dev/null || exit 0 -#else -if [ "$ACTION" = ifdown ]; then +if [ "$ACTION" = ifup -o "$ACTION" = ifupdate -o "$ACTION" = iflink ] && [ -z "$(echo $DEVICE | grep oip | grep gre)" ]; then + logger -t "mptcp" "Reloading mptcp config due to $ACTION of $INTERFACE ($DEVICE)" + /etc/init.d/mptcp reload "$DEVICE" >/dev/null || exit 0 +elif [ "$ACTION" = ifdown ]; then multipath $DEVICE off 2>&1 >/dev/null fi From ec9e8905b596991ea3c0a7b096b5fd8f8b08c2f0 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Tue, 26 Nov 2024 14:31:17 +0100 Subject: [PATCH 3/3] Fix: use ssserver binary for server on Shadowsocks-Rust --- shadowsocks-rust/files/shadowsocks-rust.init-nft | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/shadowsocks-rust/files/shadowsocks-rust.init-nft b/shadowsocks-rust/files/shadowsocks-rust.init-nft index 8adf9b0fc..2c69a2a7b 100755 --- a/shadowsocks-rust/files/shadowsocks-rust.init-nft +++ b/shadowsocks-rust/files/shadowsocks-rust.init-nft @@ -70,7 +70,11 @@ ss_xxx() { local cfg="$1" local cfgtype="$2" # local bin="$ss_bindir/${cfgtype/_/-}" - local bin="$ss_bindir/sslocal" + if [ "$cfgtype" = "ss_server" ]; then + local bin="$ss_bindir/ssserver" + else + local bin="$ss_bindir/sslocal" + fi local confjson="$ss_confdir/$cfgtype.$cfg.json" [ -x "$bin" ] || return