From 730a904b850c761e06fecaa7cffe803b5c9d82e2 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Mon, 29 Jan 2024 17:10:53 +0100 Subject: [PATCH 1/4] Set LAN with higher metric --- mptcp/files/etc/init.d/mptcp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mptcp/files/etc/init.d/mptcp b/mptcp/files/etc/init.d/mptcp index 4342e2732..09a99bf73 100755 --- a/mptcp/files/etc/init.d/mptcp +++ b/mptcp/files/etc/init.d/mptcp @@ -125,6 +125,9 @@ interface_multipath_settings() { else metric="$(uci -q get openmptcprouter.${config}.metric)" fi + if [ "${config}" = "lan" ] || [ "$(uci -q get network.${config}.ip4table)" = "lan" ]; then + metric="9999" + fi config_set "$config" metric $metric uci -q set network.${config}.metric=$metric uci -q set openmptcprouter.${config}.metric=$metric From 2c02eb0c618f1f72b25fe4f4e84d190e9c8ff99b Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Mon, 29 Jan 2024 17:11:31 +0100 Subject: [PATCH 2/4] Use always rtt line for latency* --- omr-tracker/files/bin/omr-tracker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omr-tracker/files/bin/omr-tracker b/omr-tracker/files/bin/omr-tracker index ff1e058ed..f75fd2a1a 100755 --- a/omr-tracker/files/bin/omr-tracker +++ b/omr-tracker/files/bin/omr-tracker @@ -177,7 +177,7 @@ _ping() { loss=$(echo "$ret" | grep 'packet loss' | cut -d " " -f6 | sed 's/%//' | tr -d '\n') if [ -n "$loss" ] && [ "$loss" -ne 100 ]; then if [ "$localip" = "yes" ]; then - latency=$(echo "$ret" | cut -d "/" -s -f5 | cut -d "." -f1 | tr -d '\n') + latency=$(echo "$ret" | grep rtt | cut -d "/" -s -f5 | cut -d "." -f1 | tr -d '\n') [ -n "$latency" ] && { OMR_TRACKER_LATENCY="$latency" _update_rto "$OMR_TRACKER_LATENCY" From 11dc97bcecec366a9975e82ae93bac5e14fded5f Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Mon, 29 Jan 2024 17:12:01 +0100 Subject: [PATCH 3/4] Add luci-app-ddns and jq --- openmptcprouter-full/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openmptcprouter-full/Makefile b/openmptcprouter-full/Makefile index 21baab06c..6ecfef576 100644 --- a/openmptcprouter-full/Makefile +++ b/openmptcprouter-full/Makefile @@ -87,7 +87,7 @@ MY_DEPENDS := \ (TARGET_x86||TARGET_x86_64):kmod-mlx4-core \ !(TARGET_ips40xx||TARGET_ramips):iptables-mod-ndpi !(TARGET_ips40xx||TARGET_ramips):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 (LINUX_5_4&&(TARGET_x86_64||aarch64)):kmod-tcp-bbr2 kmod-ovpn-dco-v2 \ - luci-proto-external omr-schedule + luci-proto-external omr-schedule jq luci-app-ddns # keepalived disabled by default because it's running even with no configuration, would need a default OMR config with some changes # (TARGET_x86||TARGET_x86_64):keepalived (TARGET_x86||TARGET_x86_64):keepalived-sync From d930f7fefab1dfc7aad070073432bb426ecdca61 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Mon, 29 Jan 2024 17:13:12 +0100 Subject: [PATCH 4/4] Use openmptcprouter setting instead of shadowsocks for encryption --- openmptcprouter/files/etc/init.d/openmptcprouter-vps | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/openmptcprouter/files/etc/init.d/openmptcprouter-vps b/openmptcprouter/files/etc/init.d/openmptcprouter-vps index 8b7afd374..544a4ff74 100755 --- a/openmptcprouter/files/etc/init.d/openmptcprouter-vps +++ b/openmptcprouter/files/etc/init.d/openmptcprouter-vps @@ -2231,7 +2231,8 @@ _config_service() { vps_aes="$(echo "$vps_config" | jsonfilter -q -e '@.vps.aes')" if [ "$vps_aes" != "false" ] && [ "$user_permission" != "ro" ]; then logger -t "OMR-VPS" "CPU support AES, set it by default" - method="$(uci -q get shadowsocks-libev.sss0.method)" + #method="$(uci -q get shadowsocks-libev.sss0.method)" + method="$(uci -q get openmptcprouter.settings.encryption)" uci -q batch <<-EOF >/dev/null set openmptcprouter.settings.encryption="aes-256-gcm" commit openmptcprouter @@ -2281,7 +2282,7 @@ _config_service() { [ -z "$(_set_vpn_vps)" ] && error=1 [ -z "$(_set_proxy_vps)" ] && error=1 fi - [ "$(uci -q get shadowsocks-libev.sss0.key)" = "" ] && uci -q set openmptcprouter.${servername}.get_config=1 + [ "$(uci -q get shadowsocks-libev.sss0.key)" = "" ] && [ "$(uci -q get shadowsocks-rust.sss0.key)" = "" ] && uci -q set openmptcprouter.${servername}.get_config=1 #_set_pihole [ -n "$wanips" ] && _set_wan_ip