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

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

@ -79,8 +79,8 @@ _launch_tracker() {
_validate_section "interface" "$1" _validate_section "interface" "$1"
local ifname ip4table local ifname ip4table
network_get_device ifname $1 #network_get_device ifname $1
[ -z "$ifname" ] && network_get_physdev ifname $1 #[ -z "$ifname" ] && network_get_physdev ifname $1
[ -z "$ifname" ] && ifname=$(ifstatus "$1" | jsonfilter -q -e '@["l3_device"]') [ -z "$ifname" ] && ifname=$(ifstatus "$1" | jsonfilter -q -e '@["l3_device"]')
[ -z "$ifname" ] && ifname=$(ifstatus "$1_4" | jsonfilter -q -e '@["l3_device"]') [ -z "$ifname" ] && ifname=$(ifstatus "$1_4" | jsonfilter -q -e '@["l3_device"]')
#[ -z "$ifname" ] && config_get ifname "$1" device #[ -z "$ifname" ] && config_get ifname "$1" device
@ -116,7 +116,7 @@ _launch_tracker() {
[ -z "${family}" ] && family='ipv4' [ -z "${family}" ] && family='ipv4'
#[ -z "${failure_interval}" ] && failure_interval=5 #[ -z "${failure_interval}" ] && failure_interval=5
procd_open_instance procd_open_instance "$1"
# shellcheck disable=SC2086 # shellcheck disable=SC2086
procd_set_param command /bin/omr-tracker "$1" $options procd_set_param command /bin/omr-tracker "$1" $options
procd_append_param env "OMR_TRACKER_HOSTS=$hosts" procd_append_param env "OMR_TRACKER_HOSTS=$hosts"
@ -416,6 +416,8 @@ start_interface() {
start_service() { start_service() {
local ss_enable=0 local ss_enable=0
local ss_rust_enable=0 local ss_rust_enable=0
local instance="$1"
if [ -z "$instance" ]; then
logger -t "omr-tracker" "Launching..." logger -t "omr-tracker" "Launching..."
count=1111 count=1111
config_load shadowsocks-libev config_load shadowsocks-libev
@ -459,6 +461,10 @@ start_service() {
config_foreach _gre_tunnel interface config_foreach _gre_tunnel interface
[ "$gretunnel" = true ] && _launch_gre_tracker [ "$gretunnel" = true ] && _launch_gre_tracker
logger -t "omr-tracker" "Launched" logger -t "omr-tracker" "Launched"
else
config_load network
_launch_tracker ${instance}
fi
} }
service_triggers() { service_triggers() {