mirror of
https://github.com/Ysurac/openmptcprouter-feeds.git
synced 2025-03-09 15:40:03 +00:00
Add tests for empty values
This commit is contained in:
parent
c142a07ffa
commit
19a4fc8253
3 changed files with 8 additions and 8 deletions
|
@ -238,7 +238,7 @@ interface_multipath_settings() {
|
||||||
EOF
|
EOF
|
||||||
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
|
[ -n "$ipaddr" ] && ip rule add from $ipaddr 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
|
||||||
|
@ -384,9 +384,9 @@ add_route() {
|
||||||
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"]')
|
||||||
[ -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"
|
[ -n "$iface" ] && routeset="$routeset dev $iface"
|
||||||
logger -t "MPTCP" "Add route $routeset"
|
logger -t "MPTCP" "Add route $routeset"
|
||||||
ip route replace $routeset 2>&1 >/dev/null
|
[ -n "$routeset" ] && ip route replace $routeset 2>&1 >/dev/null
|
||||||
}
|
}
|
||||||
|
|
||||||
add_route6() {
|
add_route6() {
|
||||||
|
@ -405,9 +405,9 @@ add_route6() {
|
||||||
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"]')
|
||||||
[ -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"
|
[ -n "$iface" ] && routeset="$routeset dev $iface"
|
||||||
logger -t "MPTCP" "Add IPv6 route $routeset"
|
logger -t "MPTCP" "Add IPv6 route $routeset"
|
||||||
ip -6 route replace $routeset 2>&1 >/dev/null
|
[ -n "$routeset" ] && ip -6 route replace $routeset 2>&1 >/dev/null
|
||||||
}
|
}
|
||||||
|
|
||||||
remove() {
|
remove() {
|
||||||
|
|
|
@ -238,7 +238,7 @@ while true; do
|
||||||
OMR_TRACKER_DEVICE_GATEWAY6=
|
OMR_TRACKER_DEVICE_GATEWAY6=
|
||||||
serverip_ping=false
|
serverip_ping=false
|
||||||
|
|
||||||
if [ -d "/sys/class/net/$OMR_TRACKER_DEVICE" ]; then
|
if [ -n "$OMR_TRACKER_DEVICE" ] && [ -d "/sys/class/net/$OMR_TRACKER_DEVICE" ]; then
|
||||||
if [ -n "$(ip link show $OMR_TRACKER_DEVICE | grep UP)" ]; then
|
if [ -n "$(ip link show $OMR_TRACKER_DEVICE | grep UP)" ]; then
|
||||||
# retrieve iface ip and gateway
|
# retrieve iface ip and gateway
|
||||||
if [ "$OMR_TRACKER_INTERFACE_PROTO" != "dhcpv6" ]; then
|
if [ "$OMR_TRACKER_INTERFACE_PROTO" != "dhcpv6" ]; then
|
||||||
|
|
|
@ -822,8 +822,8 @@ _set_vpn_ip() {
|
||||||
vpnip_local=$(ip -4 -br addr ls dev ${vpnifname} | awk -F'[ /]+' '{print $3}')
|
vpnip_local=$(ip -4 -br addr ls dev ${vpnifname} | awk -F'[ /]+' '{print $3}')
|
||||||
vpnip_remote_current="$(echo "$vps_config" | jsonfilter -q -e '@.vpn.localip')"
|
vpnip_remote_current="$(echo "$vps_config" | jsonfilter -q -e '@.vpn.localip')"
|
||||||
vpnip_remote=$(ip -4 r list dev ${vpnifname} | grep via | grep -v default | grep -v / | grep -v metric | awk '{print $1}' | tr -d "\n")
|
vpnip_remote=$(ip -4 r list dev ${vpnifname} | grep via | grep -v default | grep -v / | grep -v metric | awk '{print $1}' | tr -d "\n")
|
||||||
[ -z "$vpnip_remote" ] && vpnip_remote=$(ip -4 r list dev ${vpnifname} | grep kernel | awk '{print $1}' | tr -d "\n")
|
[ -z "$vpnip_remote" ] && [ -n "$vpnifname" ] && vpnip_remote=$(ip -4 r list dev ${vpnifname} | grep kernel | awk '{print $1}' | tr -d "\n")
|
||||||
[ -z "$vpnip_remote" ] && vpnip_remote=$(ip -4 r list dev ${vpnifname} | grep "proto static src" | awk '{print $3}' | tr -d "\n")
|
[ -z "$vpnip_remote" ] && [ -n "$vpnifname" ] && vpnip_remote=$(ip -4 r list dev ${vpnifname} | grep "proto static src" | awk '{print $3}' | tr -d "\n")
|
||||||
[ -z "$vpnip_remote" ] && vpnip_remote=$(ifstatus omrvpn | jsonfilter -e '@.route[0].nexthop')
|
[ -z "$vpnip_remote" ] && vpnip_remote=$(ifstatus omrvpn | jsonfilter -e '@.route[0].nexthop')
|
||||||
ula="$(uci -q get network.globals.ula_prefix)"
|
ula="$(uci -q get network.globals.ula_prefix)"
|
||||||
ula_current="$(echo "$vps_config" | jsonfilter -q -e '@.ip6in4.ula')"
|
ula_current="$(echo "$vps_config" | jsonfilter -q -e '@.ip6in4.ula')"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue