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

Fix issue when server disabled for Shadowsocks* and fix IPv6 support in OMR-Tracker

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2024-02-22 18:35:26 +01:00
parent df025467e0
commit 7e64ecd41d
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
omr-tracker/files/etc/init.d/omr-tracker
View file

@ -283,7 +283,7 @@ _launch_shadowsocks_tracker() {
[ "$enabled" = "0" ] || [ "$disabled" = "1" ] || [ -z "$hosts" ] && return [ "$enabled" = "0" ] || [ "$disabled" = "1" ] || [ -z "$hosts" ] && return
[ -z "$server" ] && return [ -z "$server" ] && return
[ "$server" = "192.168.1.3" ] || [ "$server" = "" ] && return [ "$(uci -q get shadowsocks-libev.${server}.disabled)" = "1" ] && return
procd_open_instance procd_open_instance
# shellcheck disable=SC2086 # shellcheck disable=SC2086
@ -317,7 +317,7 @@ _launch_shadowsocks_rust_tracker() {
[ "$enabled" = "0" ] || [ "$disabled" = "1" ] || [ -z "$hosts" ] && return [ "$enabled" = "0" ] || [ "$disabled" = "1" ] || [ -z "$hosts" ] && return
[ -z "$server" ] && return [ -z "$server" ] && return
[ "$server" = "192.168.1.3" ] || [ "$server" = "" ] && return [ "$(uci -q get shadowsocks-rust.${server}.disabled)" = "1" ] && return
procd_open_instance procd_open_instance
# shellcheck disable=SC2086 # shellcheck disable=SC2086
@ -385,12 +385,17 @@ _dns_server() {
local ip=$1 local ip=$1
resolv=$(resolveip -4 ${ip} | head -n 1) resolv=$(resolveip -4 ${ip} | head -n 1)
[ -n "${resolv}" ] && [ "${resolv}" != "${ip}" ] && multiserver=true [ -n "${resolv}" ] && [ "${resolv}" != "${ip}" ] && multiserver=true
resolv=$(resolveip -6 ${ip} | head -n 1)
[ -n "${resolv}" ] && [ "${resolv}" != "${ip}" ] && multiserver=true
ipcount=$((ipcount+1))
} }
_multi_server() { _multi_server() {
local ipcount=0
config_get backup $1 backup config_get backup $1 backup
[ "$backup" = "1" ] && multiserver=true [ "$backup" = "1" ] && multiserver=true
config_list_foreach $1 ip _dns_server config_list_foreach $1 ip _dns_server
[ "$ipcount" != "0" ] && [ "$ipcount" != "1" ] && multiserver=true
} }
_gre_tunnel() { _gre_tunnel() {