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 for omr-tracker

Browse source
This commit is contained in:
Ycarus 2019-05-23 19:52:39 +02:00
parent e5874cc492
commit 8730af10b9
2 changed files with 27 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
omr-tracker/files/bin/omr-tracker
View file

@ -217,7 +217,7 @@ while true; do
while ! ip route add $OMR_TRACKER_HOST via $OMR_TRACKER_DEVICE_GATEWAY dev $OMR_TRACKER_DEVICE src $OMR_TRACKER_DEVICE_IP > /dev/null 2&>1 while ! ip route add $OMR_TRACKER_HOST via $OMR_TRACKER_DEVICE_GATEWAY dev $OMR_TRACKER_DEVICE src $OMR_TRACKER_DEVICE_IP > /dev/null 2&>1
do do
logger -t "omr-tracker" "Can't create route to $OMR_TRACKER_HOST via $OMR_TRACKER_DEVICE_GATEWAY dev $OMR_TRACKER_DEVICE src $OMR_TRACKER_DEVICE_IP. waiting..." logger -t "omr-tracker" "Can't create route to $OMR_TRACKER_HOST via $OMR_TRACKER_DEVICE_GATEWAY dev $OMR_TRACKER_DEVICE src $OMR_TRACKER_DEVICE_IP. waiting..."
sleep 1 sleep 2
ip route del "$OMR_TRACKER_HOST" via "$OMR_TRACKER_DEVICE_GATEWAY" dev "$OMR_TRACKER_DEVICE" src "$OMR_TRACKER_DEVICE_IP" > /dev/null 2&>1 ip route del "$OMR_TRACKER_HOST" via "$OMR_TRACKER_DEVICE_GATEWAY" dev "$OMR_TRACKER_DEVICE" src "$OMR_TRACKER_DEVICE_IP" > /dev/null 2&>1
_restart _restart
done done

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

@ -82,28 +82,30 @@ _initialize_shadowsocks_tracker() {
config_get server $redir_tcp server config_get server $redir_tcp server
config_get tracker_server "tracker" server config_get tracker_server "tracker" server
config_get ss_disabled $server disabled 0 config_get ss_disabled $server disabled 0
[ "$server" = "$tracker_server" ] || { [ -z "$tracker_server" ] && {
[ -z "$tracker_server" ] && { logger -t "omr-tracker" "Create ShadowSock tracker ss_local..."
uci -q batch <<-EOF >/dev/null uci -q batch <<-EOF >/dev/null
set shadowsocks-libev.tracker=ss_local set shadowsocks-libev.tracker=ss_local
set shadowsocks-libev.tracker.server=$server set shadowsocks-libev.tracker.server=$server
set shadowsocks-libev.tracker.local_address="127.0.0.1" set shadowsocks-libev.tracker.local_address="127.0.0.1"
set shadowsocks-libev.tracker.local_port=1111 set shadowsocks-libev.tracker.local_port=1111
set shadowsocks-libev.tracker.mode=tcp_and_udp set shadowsocks-libev.tracker.mode=tcp_and_udp
set shadowsocks-libev.tracker.timeout=600 set shadowsocks-libev.tracker.timeout=600
set shadowsocks-libev.tracker.fast_open=1 set shadowsocks-libev.tracker.fast_open=1
set shadowsocks-libev.tracker.syslog=0 set shadowsocks-libev.tracker.syslog=0
set shadowsocks-libev.tracker.reuse_port=1 set shadowsocks-libev.tracker.reuse_port=1
set shadowsocks-libev.tracker.mptcp=1 set shadowsocks-libev.tracker.mptcp=1
set shadowsocks-libev.tracker.verbose=0 set shadowsocks-libev.tracker.verbose=0
commit shadowsocks-libev commit shadowsocks-libev
EOF EOF
} || { /etc/init.d/shadowsocks-libev restart
uci -q batch <<-EOF >/dev/null }
set shadowsocks-libev.tracker.server=$server [ -n "$tracker_server" ] && [ "$server" = "$tracker_server" ] || {
commit shadowsocks-libev logger -t "omr-tracker" "Set ShadowSock tracker to current server ($tracker_server -> $server)..."
EOF uci -q batch <<-EOF >/dev/null
} set shadowsocks-libev.tracker.server=$server
commit shadowsocks-libev
EOF
/etc/init.d/shadowsocks-libev restart /etc/init.d/shadowsocks-libev restart
} }
} }
@ -137,6 +139,7 @@ _launch_shadowsocks_tracker() {
start_service() { start_service() {
local ss_disabled local ss_disabled
logger -t "omr-tracker" "Launching..."
config_load shadowsocks-libev config_load shadowsocks-libev
_initialize_shadowsocks_tracker _initialize_shadowsocks_tracker
@ -149,6 +152,7 @@ start_service() {
else else
/etc/init.d/shadowsocks-libev rules_down /etc/init.d/shadowsocks-libev rules_down
fi fi
logger -t "omr-tracker" "Launched"
} }
service_triggers() { service_triggers() {