1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-02-13 02:51:50 +00:00

Fix on multipath setting and routes

This commit is contained in:
Ycarus (Yannick Chabanois) 2020-07-22 15:43:23 +02:00
parent 836b512982
commit 93e5ff4df8

View file

@ -94,7 +94,12 @@ interface_multipath_settings() {
[ "$config" = "omrvpn" ] && return 0 [ "$config" = "omrvpn" ] && return 0
[ -n "$(ifconfig | grep $iface)" ] || return 0 [ -n "$(ifconfig | grep $iface)" ] || return 0
[ "$(echo $iface | grep _dev)" != "" ] && return 0 [ "$(echo $iface | grep _dev)" != "" ] && return 0
if [ "$mode" = "master" ]; then
multipath "$iface" "on"
else
multipath "$iface" "$mode" multipath "$iface" "$mode"
fi
#[ "$mode" = "off" ] && { #[ "$mode" = "off" ] && {
# ip rule del table $id > /dev/null 2>&1 # ip rule del table $id > /dev/null 2>&1
# ip route flush $id > /dev/null 2>&1 # ip route flush $id > /dev/null 2>&1
@ -318,8 +323,10 @@ add_route() {
[ -n "$metric" ] && routeset="$routeset metric $metric" [ -n "$metric" ] && routeset="$routeset metric $metric"
config_get mtu "$1" mtu config_get mtu "$1" mtu
[ -n "$mtu" ] && routeset="$routeset mtu $mtu" [ -n "$mtu" ] && routeset="$routeset mtu $mtu"
config_get type "$1" config_get type "$1" type
[ -n "$type" ] && routeset="$routeset type $type" [ -n "$type" ] && routeset="$routeset type $type"
config_get table "$1" table
[ -n "$table" ] && routeset="table $table"
config_get interface "$1" interface config_get interface "$1" interface
iface=$(ifstatus "$interface" | jsonfilter -q -e '@["l3_device"]') iface=$(ifstatus "$interface" | jsonfilter -q -e '@["l3_device"]')
routeset="$routeset dev $iface" routeset="$routeset dev $iface"
@ -336,8 +343,10 @@ add_route6() {
[ -n "$metric" ] && routeset="$routeset metric $metric" [ -n "$metric" ] && routeset="$routeset metric $metric"
config_get mtu "$1" mtu config_get mtu "$1" mtu
[ -n "$mtu" ] && routeset="$routeset mtu $mtu" [ -n "$mtu" ] && routeset="$routeset mtu $mtu"
config_get type "$1" config_get type "$1" type
[ -n "$type" ] && routeset="$routeset type $type" [ -n "$type" ] && routeset="$routeset type $type"
config_get table "$1" table
[ -n "$table" ] && routeset="table $table"
config_get interface "$1" interface config_get interface "$1" interface
iface=$(ifstatus "$interface" | jsonfilter -q -e '@["l3_device"]') iface=$(ifstatus "$interface" | jsonfilter -q -e '@["l3_device"]')
routeset="$routeset dev $iface" routeset="$routeset dev $iface"