mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-02-15 03:51:51 +00:00
Code Issues Releases Wiki Activity

sync (#483)

Browse source
This commit is contained in:
suyuan 2024-05-07 17:36:31 +08:00 committed by GitHub
commit a4b326fd2d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
omr-tracker/files/bin/omr-tracker-server
View file

@ -249,7 +249,7 @@ _check_master() {
[ -n "$script_alert_up" ] && eval $script_alert_up [ -n "$script_alert_up" ] && eval $script_alert_up
count=$((count+1)) count=$((count+1))
else 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" OMR_TRACKER_STATUS_MSG="No answer to ping and API check"
servername="" servername=""
config_load shadowsocks-libev config_load shadowsocks-libev
@ -428,7 +428,7 @@ _check_backup() {
[ -n "$script_alert_up" ] && eval $script_alert_up [ -n "$script_alert_up" ] && eval $script_alert_up
count=$((count+1)) count=$((count+1))
else 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 uci -q batch <<-EOF >/dev/null
set openmptcprouter.${name}.current='0' set openmptcprouter.${name}.current='0'
commit openmptcprouter commit openmptcprouter

5
omr-tracker/files/bin/omr-tracker-ss
View file

@ -79,6 +79,7 @@ interval=${OMR_TRACKER_INTERVAL:-10}
retry=${OMR_TRACKER_TRIES:-4} retry=${OMR_TRACKER_TRIES:-4}
proxy=${OMR_TRACKER_PROXY:-127.0.0.1:1111} proxy=${OMR_TRACKER_PROXY:-127.0.0.1:1111}
hosts=${OMR_TRACKER_HOSTS:-1.1.1.1 1.0.0.1} hosts=${OMR_TRACKER_HOSTS:-1.1.1.1 1.0.0.1}
hosts6=${OMR_TRACKER_HOSTS6}
wait_test=${OMR_TRACKER_WAIT_TEST:-0} wait_test=${OMR_TRACKER_WAIT_TEST:-0}
server=${OMR_TRACKER_SERVER:-sss0} server=${OMR_TRACKER_SERVER:-sss0}
type=${OMR_TRACKER_SS_TYPE:-libev} type=${OMR_TRACKER_SS_TYPE:-libev}
@ -101,7 +102,7 @@ while true; do
nocontact="" nocontact=""
[ "${last}" -ge "${retry}" ] || [ "$(uci -q get openmptcprouter.omr.ss_${server})" = "" ] && { [ "${last}" -ge "${retry}" ] || [ "$(uci -q get openmptcprouter.omr.ss_${server})" = "" ] && {
_log "Shadowsocks ${server} is up (can contact via http ${host})" _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 set openmptcprouter.omr.ss_${server}="up"
uci -q commit openmptcprouter.omr uci -q commit openmptcprouter.omr
mail_alert="$(uci -q get omr-tracker.proxy.mail_alert)" mail_alert="$(uci -q get omr-tracker.proxy.mail_alert)"
@ -141,7 +142,7 @@ while true; do
[ "${last}" -ge "${retry}" ] && { [ "${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 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})" _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 set openmptcprouter.omr.ss_${server}="down"
uci -q commit openmptcprouter.omr uci -q commit openmptcprouter.omr
if [ "$(uci show openmptcprouter.omr | grep ss_ | grep up)" = "" ]; then if [ "$(uci show openmptcprouter.omr | grep ss_ | grep up)" = "" ]; then

1
shadowsocks-rust/files/shadowsocks-rust.init-nft
View file

@ -166,6 +166,7 @@ ss_rules_nft_gen() {
max_ss_redir_ports="0" max_ss_redir_ports="0"
config_load shadowsocks-rust config_load shadowsocks-rust
config_foreach ss_redir_ports ss_redir $cfgrulesserver 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 if [ "$min_ss_redir_ports" != "$max_ss_redir_ports" ]; then
all_ss_redir_ports=$min_ss_redir_ports-$max_ss_redir_ports all_ss_redir_ports=$min_ss_redir_ports-$max_ss_redir_ports
else else