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 and less logs

Browse source
This commit is contained in:
Ycarus 2018-08-21 17:44:49 +02:00
parent 3ccf83ccae
commit 70fc753aa9
2 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
mptcp/files/usr/share/omr/post-tracking.d/post-tracking
View file

@ -113,6 +113,9 @@ default_gw=$(ip route show default | grep -v metric | awk '/default/ {print $3}'
# An interface in error will never be used in MPTCP # An interface in error will never be used in MPTCP
if [ "$OMR_TRACKER_STATUS" = "ERROR" ]; then if [ "$OMR_TRACKER_STATUS" = "ERROR" ]; then
if [ "$OMR_TRACKER_PREV_STATUS" = "$OMR_TRACKER_STATUS" ]; then
exit 0
fi
if [ -d "/sys/class/net/$OMR_TRACKER_DEVICE" ]; then if [ -d "/sys/class/net/$OMR_TRACKER_DEVICE" ]; then
[ "$multipath_status" = "off" ] || { [ "$multipath_status" = "off" ] || {
if [ "$OMR_TRACKER_STATUS_MSG" = "" ]; then if [ "$OMR_TRACKER_STATUS_MSG" = "" ]; then
@ -149,7 +152,7 @@ if [ "$OMR_TRACKER_STATUS" = "ERROR" ]; then
config_foreach set_route interface $OMR_TRACKER_INTERFACE config_foreach set_route interface $OMR_TRACKER_INTERFACE
#config_load shadowsocks-libev #config_load shadowsocks-libev
#config_foreach del_ss_route server all #config_foreach del_ss_route server all
if [ "$(uci -q show shadowsocks-libev.ss_rules.redir_udp)" = "" ] && [ "$(uci -q show shadowsocks-libev.hi2.mode)" = "tcp_and_udp" ]; then if [ "$(uci -q get shadowsocks-libev.ss_rules.redir_udp)" = "" ] && [ "$(uci -q get shadowsocks-libev.hi2.mode)" = "tcp_and_udp" ]; then
_log "Tunnel down use ShadowSocks for UDP" _log "Tunnel down use ShadowSocks for UDP"
uci -q set shadowsocks-libev.ss_rules.redir_udp='hi2' uci -q set shadowsocks-libev.ss_rules.redir_udp='hi2'
/etc/init.d/shadowsocks-libev rules_down /etc/init.d/shadowsocks-libev rules_down
@ -163,11 +166,11 @@ if [ "$OMR_TRACKER_INTERFACE" = "glorytun" ] || [ "$OMR_TRACKER_INTERFACE" = "om
if [ "$default_gw" != "$OMR_TRACKER_DEVICE_GATEWAY" ] || [ "$default_gw" = "" ]; then if [ "$default_gw" != "$OMR_TRACKER_DEVICE_GATEWAY" ] || [ "$default_gw" = "" ]; then
_log "Tunnel up : Replace default route by $OMR_TRACKER_DEVICE_GATEWAY dev $OMR_TRACKER_DEVICE" _log "Tunnel up : Replace default route by $OMR_TRACKER_DEVICE_GATEWAY dev $OMR_TRACKER_DEVICE"
ip route replace default scope global nexthop via $OMR_TRACKER_DEVICE_GATEWAY dev $OMR_TRACKER_DEVICE ip route replace default scope global nexthop via $OMR_TRACKER_DEVICE_GATEWAY dev $OMR_TRACKER_DEVICE
if [ "$(uci -q show shadowsocks-libev.ss_rules.redir_udp)" = "hi2" ]; then fi
uci -q delete shadowsocks-libev.ss_rules.redir_udp if [ "$(uci -q get shadowsocks-libev.ss_rules.redir_udp)" = "hi2" ]; then
/etc/init.d/shadowsocks-libev rules_down uci -q delete shadowsocks-libev.ss_rules.redir_udp
/etc/init.d/shadowsocks-libev rules_up /etc/init.d/shadowsocks-libev rules_down
fi /etc/init.d/shadowsocks-libev rules_up
fi fi
exit 0 exit 0
fi fi

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

@ -15,6 +15,8 @@ export OMR_TRACKER_INTERFACE
export OMR_TRACKER_HOST export OMR_TRACKER_HOST
export OMR_TRACKER_TIMEOUT export OMR_TRACKER_TIMEOUT
export OMR_TRACKER_STATUS export OMR_TRACKER_STATUS
export OMR_TRACKER_STATUS_MSG
export OMR_TRACKER_PREV_STATUS
export OMR_TRACKER_DEVICE export OMR_TRACKER_DEVICE
export OMR_TRACKER_DEVICE_IP export OMR_TRACKER_DEVICE_IP
export OMR_TRACKER_DEVICE_GATEWAY export OMR_TRACKER_DEVICE_GATEWAY
@ -133,12 +135,12 @@ _none() {
_restart _restart
OMR_TRACKER_PREV_STATUS=""
# main loop # main loop
while true; do while true; do
# setup tracker variables # setup tracker variables
OMR_TRACKER_DEVICE_IP= OMR_TRACKER_DEVICE_IP=
OMR_TRACKER_STATUS="ERROR" OMR_TRACKER_STATUS="ERROR"
OMR_TRACKER_STATUS_MSG=""
OMR_TRACKER_LATENCY= OMR_TRACKER_LATENCY=
OMR_TRACKER_TIMEOUT=$((rto / 1000 + (rto % 1000 ? 1 : 0))) OMR_TRACKER_TIMEOUT=$((rto / 1000 + (rto % 1000 ? 1 : 0)))
OMR_TRACKER_LIST_HOSTS="" OMR_TRACKER_LIST_HOSTS=""
@ -229,7 +231,9 @@ while true; do
#[ "$OMR_TRACKER_HOSTS" = "$initial_hosts" ] || [ "$OMR_TRACKER_STATUS" = "OK" ] && _post_tracking #[ "$OMR_TRACKER_HOSTS" = "$initial_hosts" ] || [ "$OMR_TRACKER_STATUS" = "OK" ] && _post_tracking
#[ "$OMR_TRACKER_STATUS" = "ERROR" ] && _restart #[ "$OMR_TRACKER_STATUS" = "ERROR" ] && _restart
#[ "$OMR_TRACKER_STATUS" != "$OMR_TRACKER_PREV_STATUS" ] && _post_tracking
_post_tracking _post_tracking
OMR_TRACKER_PREV_STATUS="$OMR_TRACKER_STATUS"
_restart _restart
sleep "$OMR_TRACKER_INTERVAL" sleep "$OMR_TRACKER_INTERVAL"