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 rules id and disable multipath for unused interface

Browse source
This commit is contained in:
Ycarus 2018-12-10 17:02:19 +01:00
parent 4cfc11147c
commit bb122c0620
1 changed files with 23 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -44,11 +44,11 @@ interface_multipath_settings() {
config_get enabled "$config" auto "1" config_get enabled "$config" auto "1"
config_get iface "$config" ifname config_get iface "$config" ifname
count=$(($count+1))
[ -z "$iface" ] && iface=$(ifstatus "$config" | jsonfilter -q -e '@["l3_device"]') [ -z "$iface" ] && iface=$(ifstatus "$config" | jsonfilter -q -e '@["l3_device"]')
[ "$enabled" = "0" ] && return 0 [ "$enabled" = "0" ] && return 0
count=$(($count+1))
id=$count id=$count
[ -n "$intf" ] && [ "$iface" != "$intf" ] && return 0 [ -n "$intf" ] && [ "$iface" != "$intf" ] && return 0
[ -z "$iface" ] && return 0 [ -z "$iface" ] && return 0
@ -57,6 +57,10 @@ interface_multipath_settings() {
config_get mode "$config" multipath "off" config_get mode "$config" multipath "off"
[ "$mode" = "master" ] && mode="on" [ "$mode" = "master" ] && mode="on"
multipath "$iface" "$mode" multipath "$iface" "$mode"
[ "$mode" != "off" ] && {
[ -z "$mptcpintf" ] && mptcpintf="$iface"
[ -n "$mptcpintf" ] && mptcpintf="$mptcpintf $iface"
}
#[ "$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
@ -87,13 +91,14 @@ interface_multipath_settings() {
if [ -z "$gateway" ] || [ "$( valid_subnet4 $gateway )" != "ok" ]; then if [ -z "$gateway" ] || [ "$( valid_subnet4 $gateway )" != "ok" ]; then
gateway=$(ubus call network.interface.${config}_4 status 2>/dev/null | jsonfilter -q -e '@.inactive.route[0].nexthop' | tr -d "\n") gateway=$(ubus call network.interface.${config}_4 status 2>/dev/null | jsonfilter -q -e '@.inactive.route[0].nexthop' | tr -d "\n")
fi fi
netmask=$(ip -4 addr show dev $iface | grep inet | awk '{print $2}' | cut -d/ -f2 | tr -d "\n") netmask=$(ip -4 addr show dev $iface | grep peer | awk '{print $4}' | cut -d/ -f2 | tr -d "\n")
[ -z "$netmask" ] && netmask=$(ip -4 addr show dev $iface | grep inet | awk '{print $2}' | cut -d/ -f2 | tr -d "\n")
network=`ipcalc.sh $ipaddr $netmask | sed -n '/NETWORK=/{;s/.*=//;s/ .*//;p;}'` network=`ipcalc.sh $ipaddr $netmask | sed -n '/NETWORK=/{;s/.*=//;s/ .*//;p;}'`
fi fi
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
if [ -n "$gateway" ] && [ -n "$network" ]; then if [ -n "$gateway" ] && [ -n "$network" ]; then
ip rule add from $ipaddr iif $iface oif $iface table $id ip rule add from $ipaddr iif $iface oif $iface table $id pref 0
ip route replace $network/$netmask dev $iface scope link table $id ip route replace $network/$netmask dev $iface scope link table $id
ip route replace default via $gateway dev $iface table $id ip route replace default via $gateway dev $iface table $id
ip route flush $id ip route flush $id
@ -141,7 +146,7 @@ interface_multipath_settings() {
ip -6 rule del table 6$id > /dev/null 2>&1 ip -6 rule del table 6$id > /dev/null 2>&1
ip -6 route flush 6$id > /dev/null 2>&1 ip -6 route flush 6$id > /dev/null 2>&1
if [ -n "$ip6addr" ] && [ -n "$gateway6" ] && [ -n "$network6" ]; then if [ -n "$ip6addr" ] && [ -n "$gateway6" ] && [ -n "$network6" ]; then
ip -6 rule add from $ip6addr iif $iface oif $iface table 6$id ip -6 rule add from $ip6addr iif $iface oif $iface table 6$id pref 0
ip -6 route replace $network6/$netmask6 dev $iface scope link table 6$id ip -6 route replace $network6/$netmask6 dev $iface scope link table 6$id
ip -6 route replace default via $gateway6 dev $iface table 6$id ip -6 route replace default via $gateway6 dev $iface table 6$id
ip -6 route flush 6$id ip -6 route flush 6$id
@ -167,14 +172,28 @@ load_interfaces() {
[ "$multipath" != "off" ] && interfaces=" ${ifname} ${interfaces}" [ "$multipath" != "off" ] && interfaces=" ${ifname} ${interfaces}"
} }
set_multipath() {
ls -1 /sys/class/net/ | while read iface; do
exist=0
for ifacemptcp in $mptcpintf; do
if [ "$iface" = "$ifacemptcp" ]; then
exist=1
fi
done
[ "$exist" = "0" ] && multipath $iface off
done
}
start_service() { start_service() {
local intf=$1 local intf=$1
local id count local id count
. /lib/functions.sh . /lib/functions.sh
. /lib/functions/network.sh . /lib/functions/network.sh
global_multipath_settings global_multipath_settings
mptcpintf=""
config_load network config_load network
config_foreach interface_multipath_settings interface $intf config_foreach interface_multipath_settings interface $intf
set_multipath
[ -n "$(ubus call system board | jsonfilter -e '@.board_name' | grep raspberry)" ] && { [ -n "$(ubus call system board | jsonfilter -e '@.board_name' | grep raspberry)" ] && {
ethtool --offload eth0 rx off tx off ethtool --offload eth0 rx off tx off
} }