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

Display less errors

This commit is contained in:
Ycarus (Yannick Chabanois) 2021-03-18 15:48:45 +01:00
parent 3dab748b13
commit 87a6e44ff1

View file

@ -206,7 +206,7 @@ interface_multipath_settings() {
commit network commit network
EOF EOF
else else
ip rule del table $id > /dev/null 2>&1 [ -n "$(ip rule list | grep $id)" ] && 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
fi fi
@ -239,10 +239,10 @@ interface_multipath_settings() {
else else
#echo "Add routes for $ipaddr table $id" #echo "Add routes for $ipaddr table $id"
ip rule add from $ipaddr table $id pref 0 ip rule add from $ipaddr table $id pref 0
ip route replace $network/$netmask dev $iface scope link metric $id 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 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 ip route replace default via $gateway dev $iface table $id 2>&1 >/dev/null
ip route replace default via $gateway dev $iface metric $id ip route replace default via $gateway dev $iface metric $id 2>&1 >/dev/null
#ip route flush $id #ip route flush $id
fi fi
@ -250,7 +250,7 @@ interface_multipath_settings() {
#[ "$mode" = "" ] && mode="$(uci -q get openmptcprouter.${config}.multipath)" #[ "$mode" = "" ] && mode="$(uci -q get openmptcprouter.${config}.multipath)"
[ "$mode" = "master" ] && { [ "$mode" = "master" ] && {
#echo "ip route replace default via $gateway dev $iface" #echo "ip route replace default via $gateway dev $iface"
ip route replace default via $gateway dev $iface ip route replace default via $gateway dev $iface 2>&1 >/dev/null
} }
if [ "$txqueuelen" != "" ]; then if [ "$txqueuelen" != "" ]; then
ifconfig $iface txqueuelen $txqueuelen > /dev/null 2>&1 ifconfig $iface txqueuelen $txqueuelen > /dev/null 2>&1
@ -294,7 +294,7 @@ interface_multipath_settings() {
commit network commit network
EOF EOF
else else
ip -6 rule del table 6$id > /dev/null 2>&1 [ -n "$(ip -6 rule list | grep 6$id)" ] && 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
fi fi
if [ -n "$ip6addr" ] && [ -n "$gateway6" ] && [ -n "$network6" ]; then if [ -n "$ip6addr" ] && [ -n "$gateway6" ] && [ -n "$network6" ]; then
@ -322,17 +322,17 @@ interface_multipath_settings() {
commit network commit network
EOF EOF
else else
ip -6 rule add from $ip6addr table 6$id pref 0 ip -6 rule add from $ip6addr table 6$id pref 0 2>&1 >/dev/null
ip -6 route replace $network6/$netmask6 dev $iface scope link metric 6$id ip -6 route replace $network6/$netmask6 dev $iface scope link metric 6$id 2>&1 >/dev/null
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 2>&1 >/dev/null
ip -6 route replace default via $gateway6 dev $iface table 6$id ip -6 route replace default via $gateway6 dev $iface table 6$id 2>&1 >/dev/null
ip -6 route replace default via $gateway6 dev $iface metric $id ip -6 route replace default via $gateway6 dev $iface metric 6$id 2>&1 >/dev/null
ip -6 route flush 6$id ip -6 route flush 6$id 2>&1 >/dev/null
fi fi
#config_get mode "$config" multipath "off" #config_get mode "$config" multipath "off"
[ "$mode" = "master" ] && { [ "$mode" = "master" ] && {
ip -6 route replace default via $gateway6 dev $iface ip -6 route replace default via $gateway6 dev $iface 2>&1 >/dev/null
} }
#[ "$mode" = "off" ] && { #[ "$mode" = "off" ] && {
# ifconfig $iface txqueuelen 50 > /dev/null 2>&1 # ifconfig $iface txqueuelen 50 > /dev/null 2>&1
@ -386,7 +386,7 @@ add_route() {
[ -n "$(echo $iface | grep '@')" ] && iface=$(ifstatus "$interface" | jsonfilter -q -e '@["device"]') [ -n "$(echo $iface | grep '@')" ] && iface=$(ifstatus "$interface" | jsonfilter -q -e '@["device"]')
routeset="$routeset dev $iface" routeset="$routeset dev $iface"
logger -t "MPTCP" "Add route $routeset" logger -t "MPTCP" "Add route $routeset"
ip route replace $routeset ip route replace $routeset 2>&1 >/dev/null
} }
add_route6() { add_route6() {
@ -407,7 +407,7 @@ add_route6() {
[ -n "$(echo $iface | grep '@')" ] && iface=$(ifstatus "$interface" | jsonfilter -q -e '@["device"]') [ -n "$(echo $iface | grep '@')" ] && iface=$(ifstatus "$interface" | jsonfilter -q -e '@["device"]')
routeset="$routeset dev $iface" routeset="$routeset dev $iface"
logger -t "MPTCP" "Add IPv6 route $routeset" logger -t "MPTCP" "Add IPv6 route $routeset"
ip -6 route replace $routeset ip -6 route replace $routeset 2>&1 >/dev/null
} }
remove() { remove() {