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

Fix interface set as backup

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2020-09-16 17:13:15 +02:00
parent b0862f2e99
commit 928d122e77
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -94,6 +94,7 @@ set_routes_intf() {
weight=1 weight=1
fi fi
if [ "$multipath_config_route" = "backup" ]; then if [ "$multipath_config_route" = "backup" ]; then
nbintfb=$((nbintfb+1))
if [ -z "$routesintfbackup" ]; then if [ -z "$routesintfbackup" ]; then
routesintfbackup="nexthop via $interface_gw dev $interface_if weight $weight" routesintfbackup="nexthop via $interface_gw dev $interface_if weight $weight"
else else
@ -133,7 +134,6 @@ set_route_balancing() {
interface_gw=$(ubus call network.interface.${INTERFACE}_4 status 2>/dev/null | jsonfilter -q -l 1 -e '@.inactive.route[@.target="0.0.0.0"].nexthop' | tr -d "\n") interface_gw=$(ubus call network.interface.${INTERFACE}_4 status 2>/dev/null | jsonfilter -q -l 1 -e '@.inactive.route[@.target="0.0.0.0"].nexthop' | tr -d "\n")
fi fi
if [ "$interface_gw" != "" ] && [ "$interface_if" != "" ]; then if [ "$interface_gw" != "" ] && [ "$interface_if" != "" ]; then
nbintf=$((nbintf+1))
if [ "$(uci -q get network.$INTERFACE.weight)" != "" ]; then if [ "$(uci -q get network.$INTERFACE.weight)" != "" ]; then
weight=$(uci -q get network.$INTERFACE.weight) weight=$(uci -q get network.$INTERFACE.weight)
elif [ "$(uci -q get openmtpcprouter.$INTERFACE.weight)" != "" ]; then elif [ "$(uci -q get openmtpcprouter.$INTERFACE.weight)" != "" ]; then
@ -144,8 +144,10 @@ set_route_balancing() {
weight=1 weight=1
fi fi
if [ "$multipath_config_route" = "backup" ]; then if [ "$multipath_config_route" = "backup" ]; then
nbintfb=$((nbintfb+1))
routesbalancingbackup="$routesbalancingbackup nexthop via $interface_gw dev $interface_if weight $weight" routesbalancingbackup="$routesbalancingbackup nexthop via $interface_gw dev $interface_if weight $weight"
else else
nbintf=$((nbintf+1))
routesbalancing="$routesbalancing nexthop via $interface_gw dev $interface_if weight $weight" routesbalancing="$routesbalancing nexthop via $interface_gw dev $interface_if weight $weight"
fi fi
fi fi
@ -168,18 +170,21 @@ set_server_all_routes() {
routesintf="" routesintf=""
routesintfbackup="" routesintfbackup=""
nbintf=0 nbintf=0
nbintfb=0
config_load network config_load network
config_foreach set_routes_intf interface config_foreach set_routes_intf interface
[ -n "$routesintf" ] && ([ "$nbintf" -gt "1" ] && [ "$(ip r show $serverip | tr -d '\t' | tr -d '\n')" != "$serverip $routesintf " ]) || ([ "$nbintf" = "1" ] && [ "$(ip r show $serverip | grep $OMR_TRACKER_DEVICE)" = "" ]) && { uintf="$(echo $routesintf | awk '{print $5}')"
uintfb="$(echo $routesintfbackup | awk '{print $5}')"
[ -n "$routesintf" ] && ([ "$nbintf" -gt "1" ] && [ "$(ip r show $serverip metric 0 | tr -d '\t' | tr -d '\n')" != "$serverip $routesintf " ]) || ([ "$nbintf" = "1" ] && [ "$(ip r show $serverip metric 0 | grep $uintf)" = "" ]) && {
while [ "$(ip r show $serverip | grep -v nexthop | sed 's/ //g' | tr -d '\n')" != "$serverip" ] && [ "$(ip r show $serverip | grep -v nexthop | sed 's/ //g' | tr -d '\n')" != "" ]; do while [ "$(ip r show $serverip | grep -v nexthop | sed 's/ //g' | tr -d '\n')" != "$serverip" ] && [ "$(ip r show $serverip | grep -v nexthop | sed 's/ //g' | tr -d '\n')" != "" ]; do
ip r del $serverip ip r del $serverip
done done
_log "Set server $server ($serverip) default route $serverip $routesintf" _log "Set server $server ($serverip) default route $serverip $routesintf nbintf $nbintf"
ip route replace $serverip scope global $routesintf ip route replace $serverip scope global $routesintf
} }
[ -n "$routesintfbackup" ] && ([ "$nbintf" -gt "1" ] && [ "$(ip r show $serverip | tr -d '\t' | tr -d '\n')" != "$serverip $routesintfbackup " ]) || ([ "$nbintf" = "1" ] && [ "$(ip r show $serverip | grep $OMR_TRACKER_DEVICE)" = "" ]) && { [ -n "$routesintfbackup" ] && ([ "$nbintfb" -gt "1" ] && [ "$(ip r show $serverip metric 999 | tr -d '\t' | tr -d '\n')" != "$serverip $routesintfbackup " ]) || ([ "$nbintfb" = "1" ] && [ "$(ip r show $serverip metric 999 | grep $uintfb)" = "" ]) && {
_log "Set server $server ($serverip) default route $serverip $routesintf" _log "Set server $server ($serverip) backup default route $serverip $routesintfbackup nbintfb $nbintfb $OMR_TRACKER_DEVICE $uintfb"
ip route replace $serverip scope global metric 999 $routesintf ip route replace $serverip scope global metric 999 $routesintfbackup
} }
fi fi
} }