From dc729420c73b26d10e76851690ad6b0f48189f1a Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Wed, 28 Feb 2024 14:51:26 +0100 Subject: [PATCH 1/5] Fix status page CSS --- .../luci-static/resources/openmptcprouter/css/wanstatus.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/luci-app-openmptcprouter/htdocs/luci-static/resources/openmptcprouter/css/wanstatus.css b/luci-app-openmptcprouter/htdocs/luci-static/resources/openmptcprouter/css/wanstatus.css index b475ce419..20019851b 100644 --- a/luci-app-openmptcprouter/htdocs/luci-static/resources/openmptcprouter/css/wanstatus.css +++ b/luci-app-openmptcprouter/htdocs/luci-static/resources/openmptcprouter/css/wanstatus.css @@ -1,6 +1,6 @@ .container { /* container for entire page. fixes bootstrap theme's ridiculously small page width */ - max-width: 1644px; + max-width: 1600px; } #interface_field { padding: 12px 20px 20px 20px; From c2e937e8183ae88b9a9f7b5cd8de05602d804dca Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Wed, 28 Feb 2024 14:52:55 +0100 Subject: [PATCH 2/5] Add xray and shadowsocks-rust support to blocklan script for 5.4 kernel --- openmptcprouter/files/bin/blocklanfw | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openmptcprouter/files/bin/blocklanfw b/openmptcprouter/files/bin/blocklanfw index 56f176c81..1ba1f3c8a 100755 --- a/openmptcprouter/files/bin/blocklanfw +++ b/openmptcprouter/files/bin/blocklanfw @@ -1,6 +1,6 @@ #!/bin/sh -if [ -f /usr/sbin/iptables-legacy ]; then +if [ -e /usr/sbin/iptables-legacy ]; then IPTABLES="/usr/sbin/iptables-legacy" IP6TABLES="/usr/sbin/ip6tables-legacy" IPTABLESSAVE="/usr/sbin/iptables-legacy-save" @@ -89,10 +89,10 @@ v2ray_rules6_fw_drop() { [ -n "$(pgrep blocklanfw)" ] && exit 0 [ -z "$($IPTABLESSAVE 2>/dev/null | grep zone_lan)" ] && exit 0 fw=0 -if [ "$(uci -q get openmptcprouter.settings.proxy)" = "shadowsocks" ]; then +if [ "$(uci -q get openmptcprouter.settings.proxy)" = "shadowsocks" ] || [ "$(uci -q get openmptcprouter.settings.proxy)" = "shadowsocks-rust" ]; then ss_rules6_fw_drop ss_rules_fw_drop -elif [ "$(uci -q get openmptcprouter.settings.proxy)" = "v2ray" ]; then +elif [ -n "$(uci -q get openmptcprouter.settings.proxy | grep v2ray)" ] || [ -n "$(uci -q get openmptcprouter.settings.proxy | grep xray)" ]; then v2r_rules_fw_drop v2ray_rules6_fw_drop fi From 00a724f34a9041ca9f6d86517c08362bac7186e8 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Wed, 28 Feb 2024 15:03:46 +0100 Subject: [PATCH 3/5] Set tracker config by default for Shadowsocks-* --- shadowsocks-libev/files/shadowsocks-libev.config | 16 ++++++++++++++-- shadowsocks-rust/files/shadowsocks-rust.config | 14 +++++++++++++- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/shadowsocks-libev/files/shadowsocks-libev.config b/shadowsocks-libev/files/shadowsocks-libev.config index 9423ef9bc..a425f7d62 100644 --- a/shadowsocks-libev/files/shadowsocks-libev.config +++ b/shadowsocks-libev/files/shadowsocks-libev.config @@ -14,7 +14,7 @@ config ss_redir hi1 config ss_redir hi2 option server 'sss0' - option local_address '0.0.0.0' + option local_address '::' option local_port '1100' option mode 'tcp_and_udp' option timeout '1000' @@ -47,4 +47,16 @@ config ss_tunnel 'dns' option mode 'tcp_and_udp' option server 'sss0' option local_port '5353' - option tunnel_address '8.8.8.8:53' \ No newline at end of file + option tunnel_address '8.8.8.8:53' + +config ss_local 'tracker_sss0' + option server 'sss0' + option local_address '127.0.0.1' + option local_port '1111' + option mode 'tcp_and_udp' + option timeout '600' + option fast_open '0' + option syslog '0' + option reuse_port '1' + option mptcp '1' + option verbose '0' diff --git a/shadowsocks-rust/files/shadowsocks-rust.config b/shadowsocks-rust/files/shadowsocks-rust.config index f488f9b60..b131b7a12 100644 --- a/shadowsocks-rust/files/shadowsocks-rust.config +++ b/shadowsocks-rust/files/shadowsocks-rust.config @@ -55,4 +55,16 @@ config ss_tunnel 'dns' option mode 'tcp_and_udp' option server 'sss0' option local_port '5353' - option tunnel_address '8.8.8.8:53' \ No newline at end of file + option tunnel_address '8.8.8.8:53' + +config ss_local 'tracker_sss0' + option server 'sss0' + option local_address '127.0.0.1' + option local_port '1111' + option mode 'tcp_and_udp' + option timeout '600' + option fast_open '0' + option syslog '0' + option reuse_port '1' + option mptcp '1' + option verbose '0' From 45b7fee19bcac0de0016997354dbc39b66b4f0c1 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Wed, 28 Feb 2024 15:49:21 +0100 Subject: [PATCH 4/5] Change to limit token errors logs from openmptcprouter-vps --- openmptcprouter/files/etc/init.d/openmptcprouter-vps | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/openmptcprouter/files/etc/init.d/openmptcprouter-vps b/openmptcprouter/files/etc/init.d/openmptcprouter-vps index ef12d21fd..96747ac57 100755 --- a/openmptcprouter/files/etc/init.d/openmptcprouter-vps +++ b/openmptcprouter/files/etc/init.d/openmptcprouter-vps @@ -1343,7 +1343,7 @@ _set_vps_firewall() { vps_config="" _login [ -z "$token" ] && { - logger -t "OMR-VPS" "Can't get ${fwservername} token, try later" + [ "$(logread | tail -n 3 | grep -c 'vps token')" -lt 3 ] && logger -t "OMR-VPS" "Can't get ${fwservername} token, try later" uci -q batch <<-EOF >/dev/null set openmptcprouter.${fwservername}.admin_error=1 EOF @@ -2018,7 +2018,7 @@ _backup_send() { vps_config="" _login [ -z "$token" ] && { - logger -t "OMR-VPS" "Can't get ${servername} token, try later" + [ "$(logread | tail -n 3 | grep -c 'vps token')" -lt 3 ] && logger -t "OMR-VPS" "Can't get ${servername} token, try later" uci -q batch <<-EOF >/dev/null set openmptcprouter.${servername}.admin_error=1 EOF @@ -2060,7 +2060,7 @@ _backup_get_and_apply() { vps_config="" _login [ -z "$token" ] && { - logger -t "OMR-VPS" "Can't get ${servername} token, try later" + [ "$(logread | tail -n 3 | grep -c 'vps token')" -lt 3 ] && logger -t "OMR-VPS" "Can't get ${servername} token, try later" uci -q batch <<-EOF >/dev/null set openmptcprouter.${servername}.admin_error=1 EOF @@ -2104,7 +2104,7 @@ _backup_list() { vps_config="" _login [ -z "$token" ] && { - logger -t "OMR-VPS" "Can't get ${servername} token, try later" + [ "$(logread | tail -n 3 | grep -c 'vps token')" -lt 3 ] && logger -t "OMR-VPS" "Can't get ${servername} token, try later" uci -q batch <<-EOF >/dev/null set openmptcprouter.${servername}.admin_error=1 EOF @@ -2186,7 +2186,7 @@ _get_token() { if [ "$(uci -q get openmptcprouter.${servername}.username)" != "openmptcprouter" ]; then reason="$reason, custom username" fi - logger -t "OMR-VPS" "Can't get ${servername} token, try later ($reason)" + [ "$(logread | tail -n 3 | grep -c 'vps token')" -lt 3 ] && logger -t "OMR-VPS" "Can't get ${servername} token, try later ($reason)" uci -q batch <<-EOF >/dev/null set openmptcprouter.${servername}.admin_error=1 EOF @@ -2321,7 +2321,7 @@ _set_pihole_server() { vps_config="" _login [ -z "$token" ] && { - logger -t "OMR-VPS" "Can't get token, try later" + [ "$(logread | tail -n 3 | grep -c 'vps token')" -lt 3 ] && logger -t "OMR-VPS" "Can't get token, try later" uci -q batch <<-EOF >/dev/null set openmptcprouter.${pservername}.admin_error=1 EOF From 9c55b0be85ba9053df6a51691fdb5bfd3cde909b Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Wed, 28 Feb 2024 20:17:59 +0100 Subject: [PATCH 5/5] Increase timeout for VPS status --- .../root/etc/uci-defaults/openmptcprouter | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/luci-app-openmptcprouter/root/etc/uci-defaults/openmptcprouter b/luci-app-openmptcprouter/root/etc/uci-defaults/openmptcprouter index 647c23303..f8c681624 100755 --- a/luci-app-openmptcprouter/root/etc/uci-defaults/openmptcprouter +++ b/luci-app-openmptcprouter/root/etc/uci-defaults/openmptcprouter @@ -86,9 +86,9 @@ if [ "$(uci -q get openmptcprouter.settings.check_ipv6_website)" = "" ]; then commit openmptcprouter EOF fi -if [ "$(uci -q get openmptcprouter.settings.status_vps_timeout)" = "" ]; then +if [ "$(uci -q get openmptcprouter.settings.status_vps_timeout)" = "" ] || [ "$(uci -q get openmptcprouter.settings.status_vps_timeout)" = "1" ]; then uci -q batch <<-EOF >/dev/null - set openmptcprouter.settings.status_vps_timeout=1 + set openmptcprouter.settings.status_vps_timeout=3 commit openmptcprouter EOF fi