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

Fix for omr-tracker

This commit is contained in:
Ycarus (Yannick Chabanois) 2020-03-27 10:22:43 +01:00
parent 1420974bbf
commit 78e665faa7
2 changed files with 4 additions and 2 deletions

View file

@ -207,7 +207,7 @@ while true; do
fi fi
fi fi
if [ -z "$OMR_TRACKER_DEVICE_GATEWAY" ]; then if [ -z "$OMR_TRACKER_DEVICE_GATEWAY" ]; then
OMR_TRACKER_DEVICE_ROUTE=$(ip -4 r list dev "$OMR_TRACKER_DEVICE" | grep via | grep -v default | grep -v metric | grep -v / | awk '{print $1}' | tr -d "\n") OMR_TRACKER_DEVICE_ROUTE=$(ip -4 r list dev "$OMR_TRACKER_DEVICE" | grep via | grep -v default | grep -v metric | grep -v / | awk '{print $1; exit}' | tr -d "\n")
fi fi
if [ -z "$OMR_TRACKER_DEVICE_GATEWAY" ]; then if [ -z "$OMR_TRACKER_DEVICE_GATEWAY" ]; then
OMR_TRACKER_DEVICE_GATEWAY=$(ip -4 r list dev "$OMR_TRACKER_DEVICE" | grep kernel | awk '/proto kernel/ {print $1}' | tr -d "\n") OMR_TRACKER_DEVICE_GATEWAY=$(ip -4 r list dev "$OMR_TRACKER_DEVICE" | grep kernel | awk '/proto kernel/ {print $1}' | tr -d "\n")

View file

@ -118,7 +118,7 @@ _initialize_shadowsocks_tracker() {
} }
_launch_shadowsocks_tracker() { _launch_shadowsocks_tracker() {
local hosts timeout tries interval local_port enabled local hosts timeout tries interval local_port enabled server
[ "$1" = "tracker" ] || return [ "$1" = "tracker" ] || return
@ -127,8 +127,10 @@ _launch_shadowsocks_tracker() {
config_get local_port "$1" local_port config_get local_port "$1" local_port
local disabled local disabled
config_get disabled "$1" disabled 0 config_get disabled "$1" disabled 0
config_get server "$1" server
[ "$enabled" = "0" ] || [ "$disabled" = "1" ] || [ -z "$hosts" ] && return [ "$enabled" = "0" ] || [ "$disabled" = "1" ] || [ -z "$hosts" ] && return
[ -z "$server" ] || [ "$(uci -q get shadowsocks-libev.$server.server)" = "192.168.1.3" ] || [ "$(uci -q get shadowsocks-libev.$server.server)" = "" ] && return
procd_open_instance procd_open_instance
# shellcheck disable=SC2086 # shellcheck disable=SC2086