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 static route and errors in log

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2022-07-27 13:29:30 +02:00
parent 2c57ab4d43
commit 8cde301b92
1 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

23
mptcp/files/etc/init.d/mptcp
View file

@ -170,6 +170,7 @@ interface_multipath_settings() {
[ -n "$(ifconfig | grep $iface)" ] || return 0 [ -n "$(ifconfig | grep $iface)" ] || return 0
[ "$(echo $iface | grep _dev)" != "" ] && return 0 [ "$(echo $iface | grep _dev)" != "" ] && return 0
[ "$(echo $iface | grep '^if')" != "" ] && return 0 [ "$(echo $iface | grep '^if')" != "" ] && return 0
[ "$iface" = "lo" ] && return 0
if [ "$mode" = "master" ]; then if [ "$mode" = "master" ]; then
multipath "$iface" "on" multipath "$iface" "on"
@ -262,8 +263,8 @@ interface_multipath_settings() {
EOF EOF
else else
#echo "Add routes for $ipaddr table $id" #echo "Add routes for $ipaddr table $id"
[ -n "$ipaddr" ] && ip rule add from $ipaddr table $id pref 0 [ -n "$ipaddr" ] && [ -z "$(ip rule show from $ipaddr table $id)" ] && ip rule add from $ipaddr table $id pref 0
ip rule add oif $iface table $id pref 0 [ -z "$(ip rule show oif $iface table $id)" ] && ip rule add oif $iface table $id pref 0
ip route replace $network/$netmask dev $iface scope link metric $id 2>&1 >/dev/null ip route replace $network/$netmask dev $iface scope link metric $id 2>&1 >/dev/null
ip route replace $network/$netmask dev $iface scope link table $id 2>&1 >/dev/null ip route replace $network/$netmask dev $iface scope link table $id 2>&1 >/dev/null
ip route replace default via $gateway dev $iface table $id 2>&1 >/dev/null ip route replace default via $gateway dev $iface table $id 2>&1 >/dev/null
@ -389,11 +390,15 @@ set_multipath() {
exist=1 exist=1
fi fi
done done
[ "$exist" = "0" ] && multipath $iface off [ "$exist" = "0" ] && {
multipath $iface off
}
done done
} }
add_route() { add_route() {
config_get disabled "$1" disabled
[ "$disabled" = "1" ] && return 0
config_get target "$1" target config_get target "$1" target
routeset="$target" routeset="$target"
config_get netmask "$1" netmask config_get netmask "$1" netmask
@ -417,10 +422,14 @@ add_route() {
[ -n "$(echo $iface | grep '@')" ] && iface=$(ifstatus "$interface" | jsonfilter -q -e '@["device"]') [ -n "$(echo $iface | grep '@')" ] && iface=$(ifstatus "$interface" | jsonfilter -q -e '@["device"]')
[ -n "$iface" ] && routeset="$routeset dev $iface" [ -n "$iface" ] && routeset="$routeset dev $iface"
logger -t "MPTCP" "Add route $routeset" logger -t "MPTCP" "Add route $routeset"
[ -n "$routeset" ] && ip route replace $routeset 2>&1 >/dev/null [ -n "$routeset" ] && {
ip route replace ${routeset} 2>&1 >/dev/null
}
} }
add_route6() { add_route6() {
config_get disabled "$1" disabled
[ "$disabled" = "1" ] && return 0
config_get target "$1" target config_get target "$1" target
routeset="$target" routeset="$target"
config_get gateway "$1" gateway config_get gateway "$1" gateway
@ -438,7 +447,9 @@ add_route6() {
[ -n "$(echo $iface | grep '@')" ] && iface=$(ifstatus "$interface" | jsonfilter -q -e '@["device"]') [ -n "$(echo $iface | grep '@')" ] && iface=$(ifstatus "$interface" | jsonfilter -q -e '@["device"]')
[ -n "$iface" ] && routeset="$routeset dev $iface" [ -n "$iface" ] && routeset="$routeset dev $iface"
logger -t "MPTCP" "Add IPv6 route $routeset" logger -t "MPTCP" "Add IPv6 route $routeset"
[ -n "$routeset" ] && ip -6 route replace $routeset 2>&1 >/dev/null [ -n "$routeset" ] && {
ip -6 route replace ${routeset} 2>&1 >/dev/null
}
} }
remove() { remove() {
@ -484,7 +495,7 @@ start_service() {
config_foreach interface_multipath_settings interface $intf config_foreach interface_multipath_settings interface $intf
set_multipath set_multipath
config_foreach add_route route config_foreach add_route route
config_foreach add_route route6 config_foreach add_route6 route6
# If no master is defined, one interface is defined as master # If no master is defined, one interface is defined as master
if [ "$master" = "" ] && [ "$intf" = "" ]; then if [ "$master" = "" ] && [ "$intf" = "" ]; then
intfmaster="$mptcpmintf" intfmaster="$mptcpmintf"