From 370d78a82a8edd2256ca4485a416f3c2b1ca4ca0 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Tue, 7 May 2024 11:19:32 +0200 Subject: [PATCH 1/3] Exit if Shadowsocks-Rust ss-redir are not enabled --- shadowsocks-rust/files/shadowsocks-rust.init-nft | 1 + 1 file changed, 1 insertion(+) diff --git a/shadowsocks-rust/files/shadowsocks-rust.init-nft b/shadowsocks-rust/files/shadowsocks-rust.init-nft index 8b51253b9..f83311968 100755 --- a/shadowsocks-rust/files/shadowsocks-rust.init-nft +++ b/shadowsocks-rust/files/shadowsocks-rust.init-nft @@ -166,6 +166,7 @@ ss_rules_nft_gen() { max_ss_redir_ports="0" config_load shadowsocks-rust config_foreach ss_redir_ports ss_redir $cfgrulesserver + [ "$max_ss_redir_ports" = "0" ] && return 2 if [ "$min_ss_redir_ports" != "$max_ss_redir_ports" ]; then all_ss_redir_ports=$min_ss_redir_ports-$max_ss_redir_ports else From 55430ee3ae9c0f1d056ff601595694b66d6fa7d1 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Tue, 7 May 2024 11:23:03 +0200 Subject: [PATCH 2/3] Small change in omr-tracker server log --- omr-tracker/files/bin/omr-tracker-server | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/omr-tracker/files/bin/omr-tracker-server b/omr-tracker/files/bin/omr-tracker-server index d83ccfc64..f518aff37 100755 --- a/omr-tracker/files/bin/omr-tracker-server +++ b/omr-tracker/files/bin/omr-tracker-server @@ -249,7 +249,7 @@ _check_master() { [ -n "$script_alert_up" ] && eval $script_alert_up count=$((count+1)) else - [ -z "$(logread | tail -n 10 | grep "Master server ${name} down" | grep $ip)" ] && logger -t "OMR-Tracker-Server" "Master server ${name} down ($ip)" + [ -n "$ip" ] && [ -z "$(logread | tail -n 10 | grep "Master server ${name} down" | grep "$ip")" ] && logger -t "OMR-Tracker-Server" "Master server ${name} down ($ip)" OMR_TRACKER_STATUS_MSG="No answer to ping and API check" servername="" config_load shadowsocks-libev @@ -428,7 +428,7 @@ _check_backup() { [ -n "$script_alert_up" ] && eval $script_alert_up count=$((count+1)) else - [ -z "$(logread | tail -n 10 | grep "Backup server ${name} down" | grep $ip)" ] && logger -t "OMR-Tracker-Server" "Backup server ${name} down ($ip)" + [ -n "$ip" ] && [ -z "$(logread | tail -n 10 | grep "Backup server ${name} down" | grep "$ip")" ] && logger -t "OMR-Tracker-Server" "Backup server ${name} down ($ip)" uci -q batch <<-EOF >/dev/null set openmptcprouter.${name}.current='0' commit openmptcprouter From 1d2a10b0ba4a79791c4832d171717cec3ce05b67 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Tue, 7 May 2024 11:24:04 +0200 Subject: [PATCH 3/3] Add Shadowsocks rust or libev info in omr-tracker shadowsocks proxy --- omr-tracker/files/bin/omr-tracker-ss | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/omr-tracker/files/bin/omr-tracker-ss b/omr-tracker/files/bin/omr-tracker-ss index 7b5697cc5..ec0b70be1 100755 --- a/omr-tracker/files/bin/omr-tracker-ss +++ b/omr-tracker/files/bin/omr-tracker-ss @@ -79,6 +79,7 @@ interval=${OMR_TRACKER_INTERVAL:-10} retry=${OMR_TRACKER_TRIES:-4} proxy=${OMR_TRACKER_PROXY:-127.0.0.1:1111} hosts=${OMR_TRACKER_HOSTS:-1.1.1.1 1.0.0.1} +hosts6=${OMR_TRACKER_HOSTS6} wait_test=${OMR_TRACKER_WAIT_TEST:-0} server=${OMR_TRACKER_SERVER:-sss0} type=${OMR_TRACKER_SS_TYPE:-libev} @@ -101,7 +102,7 @@ while true; do nocontact="" [ "${last}" -ge "${retry}" ] || [ "$(uci -q get openmptcprouter.omr.ss_${server})" = "" ] && { _log "Shadowsocks ${server} is up (can contact via http ${host})" - OMR_TRACKER_STATUS_MSG="Shadowsocks ${server} is up (can contact via http ${host})" + OMR_TRACKER_STATUS_MSG="Shadowsocks $type ${server} is up (can contact via http ${host})" uci -q set openmptcprouter.omr.ss_${server}="up" uci -q commit openmptcprouter.omr mail_alert="$(uci -q get omr-tracker.proxy.mail_alert)" @@ -141,7 +142,7 @@ while true; do [ "${last}" -ge "${retry}" ] && { if [ "$OMR_TRACKER_PREV_STATUS" != "ERROR" ] && [ -n "$($IPTABLES -w -t nat -L -n 2>/dev/null | grep ssr)" ] || [ -n "$(nft list ruleset 2>/dev/null | grep ss_r)" ] || [ -n "$(nft list ruleset 2>/dev/null | grep ssr_r)" ]; then _log "Shadowsocks ${server} is down (can't contact via http ${nocontact})" - OMR_TRACKER_STATUS_MSG="Shadowsocks ${server} is down (can't contact via http ${nocontact})" + OMR_TRACKER_STATUS_MSG="Shadowsocks $type ${server} is down (can't contact via http ${nocontact})" uci -q set openmptcprouter.omr.ss_${server}="down" uci -q commit openmptcprouter.omr if [ "$(uci show openmptcprouter.omr | grep ss_ | grep up)" = "" ]; then