Add tests for empty values

jxygit · Apr 13, 2021 · 19a4fc8 · 19a4fc8
1 parent c142a07
commit 19a4fc8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/mptcp/files/etc/init.d/mptcp b/mptcp/files/etc/init.d/mptcp
@@ -238,7 +238,7 @@ interface_multipath_settings() {
 			EOF
 		else
 			#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 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
 	iface=$(ifstatus "$interface" | jsonfilter -q -e '@["l3_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"
-	ip route replace $routeset 2>&1 >/dev/null
+	[ -n "$routeset" ] && ip route replace $routeset 2>&1 >/dev/null
 }
 
 add_route6() {
@@ -405,9 +405,9 @@ add_route6() {
 	config_get interface "$1" interface
 	iface=$(ifstatus "$interface" | jsonfilter -q -e '@["l3_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"
-	ip -6 route replace $routeset 2>&1 >/dev/null
+	[ -n "$routeset" ] && ip -6 route replace $routeset 2>&1 >/dev/null
 }
 
 remove() {

diff --git a/omr-tracker/files/bin/omr-tracker b/omr-tracker/files/bin/omr-tracker
@@ -238,7 +238,7 @@ while true; do
 	OMR_TRACKER_DEVICE_GATEWAY6=
 	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
 			# retrieve iface ip and gateway
 			if [ "$OMR_TRACKER_INTERFACE_PROTO" != "dhcpv6" ]; then

diff --git a/openmptcprouter/files/etc/init.d/openmptcprouter-vps b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
@@ -822,8 +822,8 @@ _set_vpn_ip() {
 	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=$(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" ] && 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 kernel | awk '{print $1}' | 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')
 	ula="$(uci -q get network.globals.ula_prefix)"
 	ula_current="$(echo "$vps_config" | jsonfilter -q -e '@.ip6in4.ula')"