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

Use named instance in omr-tracker interfaces

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2024-07-16 09:48:29 +02:00
parent 98b3f85638
commit 7fc99ca3bd
1 changed files with 50 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -79,8 +79,8 @@ _launch_tracker() {
_validate_section "interface" "$1"
local ifname ip4table
network_get_device ifname $1
[ -z "$ifname" ] && network_get_physdev ifname $1
#network_get_device ifname $1
#[ -z "$ifname" ] && network_get_physdev ifname $1
[ -z "$ifname" ] && ifname=$(ifstatus "$1" | jsonfilter -q -e '@["l3_device"]')
[ -z "$ifname" ] && ifname=$(ifstatus "$1_4" | jsonfilter -q -e '@["l3_device"]')
#[ -z "$ifname" ] && config_get ifname "$1" device
@ -116,7 +116,7 @@ _launch_tracker() {
[ -z "${family}" ] && family='ipv4'
#[ -z "${failure_interval}" ] && failure_interval=5
procd_open_instance
procd_open_instance "$1"
# shellcheck disable=SC2086
procd_set_param command /bin/omr-tracker "$1" $options
procd_append_param env "OMR_TRACKER_HOSTS=$hosts"
@ -416,49 +416,55 @@ start_interface() {
start_service() {
local ss_enable=0
local ss_rust_enable=0
logger -t "omr-tracker" "Launching..."
count=1111
config_load shadowsocks-libev
config_foreach _initialize_shadowsocks_tracker server
count=1111
config_load shadowsocks-rust
config_foreach _initialize_shadowsocks_rust_tracker server
config_load network
config_foreach _launch_tracker interface
if [ "$ss_enable" = "1" ]; then
local instance="$1"
if [ -z "$instance" ]; then
logger -t "omr-tracker" "Launching..."
count=1111
config_load shadowsocks-libev
config_foreach _launch_shadowsocks_tracker ss_local
#elif [ "$(uci -q get shadowsocks-libev.sss0.disabled)" != "1" ]; then
# /etc/init.d/shadowsocks-libev rules_down
fi
if [ "$ss_rust_enable" = "1" ]; then
config_load shadowsocks-rust
config_foreach _launch_shadowsocks_rust_tracker ss_local
fi
config_load v2ray
config_get v2rayenabled main enabled
if [ "$v2rayenabled" = "1" ]; then
_launch_v2ray_tracker
fi
config_load xray
config_get xrayenabled main enabled
if [ "$xrayenabled" = "1" ]; then
_launch_xray_tracker
fi
config_foreach _initialize_shadowsocks_tracker server
multiserver=false
config_load openmptcprouter
config_foreach _multi_server server
[ "$multiserver" = true ] && _launch_server_tracker
gretunnel=false
config_load network
config_foreach _gre_tunnel interface
[ "$gretunnel" = true ] && _launch_gre_tracker
logger -t "omr-tracker" "Launched"
count=1111
config_load shadowsocks-rust
config_foreach _initialize_shadowsocks_rust_tracker server
config_load network
config_foreach _launch_tracker interface
if [ "$ss_enable" = "1" ]; then
config_load shadowsocks-libev
config_foreach _launch_shadowsocks_tracker ss_local
#elif [ "$(uci -q get shadowsocks-libev.sss0.disabled)" != "1" ]; then
# /etc/init.d/shadowsocks-libev rules_down
fi
if [ "$ss_rust_enable" = "1" ]; then
config_load shadowsocks-rust
config_foreach _launch_shadowsocks_rust_tracker ss_local
fi
config_load v2ray
config_get v2rayenabled main enabled
if [ "$v2rayenabled" = "1" ]; then
_launch_v2ray_tracker
fi
config_load xray
config_get xrayenabled main enabled
if [ "$xrayenabled" = "1" ]; then
_launch_xray_tracker
fi
multiserver=false
config_load openmptcprouter
config_foreach _multi_server server
[ "$multiserver" = true ] && _launch_server_tracker
gretunnel=false
config_load network
config_foreach _gre_tunnel interface
[ "$gretunnel" = true ] && _launch_gre_tracker
logger -t "omr-tracker" "Launched"
else
config_load network
_launch_tracker ${instance}
fi
}
service_triggers() {