mwan3: unify variable check

Signed-off-by: Florian Eckert <fe@dev.tdt.de>

diff --git a/net/mwan3/files/etc/hotplug.d/iface/15-mwan3 b/net/mwan3/files/etc/hotplug.d/iface/15-mwan3
index db2dc237a94147d6a381124d56073b9b7f14ed95..645cdd3e41e421e4ca4b13dc1b20bb1e07d4506c 100644 (file)
--- a/net/mwan3/files/etc/hotplug.d/iface/15-mwan3
+++ b/net/mwan3/files/etc/hotplug.d/iface/15-mwan3
@@ -9,13 +9,13 @@
 [ -n "$INTERFACE" ] || exit 2
 
 if [ "$ACTION" == "ifup" ]; then
-        [ -n "$DEVICE" ] || exit 3
+       [ -n "$DEVICE" ] || exit 3
 fi
 
 mwan3_lock "$ACTION" "$INTERFACE"
 config_load mwan3
 config_get_bool enabled globals 'enabled' '0'
-[ ${enabled} -gt 0 ] || {
+[ "${enabled}" -gt 0 ] || {
        mwan3_unlock "$ACTION" "$INTERFACE"
        exit 0
 }
@@ -24,14 +24,14 @@ mwan3_init
 mwan3_set_connected_iptables
 mwan3_set_custom_ipset
 
-config_get enabled $INTERFACE enabled 0
 config_get initial_state $INTERFACE initial_state "online"
-[ "${enabled}" == "1" ] || {
+config_get_bool enabled $INTERFACE 'enabled' '0'
+[ "${enabled}" -eq 1 ] || {
        mwan3_unlock "$ACTION" "$INTERFACE"
        exit 0
 }
 
-if [ "$ACTION" == "ifup" ]; then
+if [ "$ACTION" = "ifup" ]; then
        config_get family $INTERFACE family ipv4
        if [ "$family" = "ipv4" ]; then
                ubus call network.interface.${INTERFACE}_4 status &>/dev/null
@@ -72,7 +72,7 @@ case "$ACTION" in
                mwan3_create_iface_iptables $INTERFACE $DEVICE
                mwan3_create_iface_rules $INTERFACE $DEVICE
                mwan3_create_iface_route $INTERFACE $DEVICE
-               if [ ${running} -eq 1 -a "${status}" = "online" ]; then
+               if [ "${running}" -eq 1 ] && [ "${status}" = "online" ]; then
                        $LOG notice "Starting tracker on interface $INTERFACE (${DEVICE:-unknown})"
                        mwan3_set_iface_hotplug_state $INTERFACE "online"
                        mwan3_track $INTERFACE $DEVICE "online" "$src_ip"

diff --git a/net/mwan3/files/etc/hotplug.d/iface/16-mwan3 b/net/mwan3/files/etc/hotplug.d/iface/16-mwan3
index d68401fedc91030a2fdad0bbbad1250d6cd5485b..dd09358ebe978baa952703fe2f48c21ea89f4c39 100644 (file)
--- a/net/mwan3/files/etc/hotplug.d/iface/16-mwan3
+++ b/net/mwan3/files/etc/hotplug.d/iface/16-mwan3
@@ -8,17 +8,17 @@ mwan3_lock "$ACTION" "mwan3rtmon"
 
 config_load mwan3
 config_get_bool enabled globals 'enabled' '0'
-[ ${enabled} -gt 0 ] || {
+[ "${enabled}" -gt 0 ] || {
        mwan3_unlock "$ACTION" "mwan3rtmon"
        exit 0
 }
 
-if [ "$ACTION" == "ifup" ]; then
+if [ "$ACTION" = "ifup" ]; then
        mwan3_rtmon
 fi
 
-config_get enabled $INTERFACE enabled 0
-[ "${enabled}" = "0" ] || {
+config_get_bool enabled "$INTERFACE" 'enabled' '0'
+[ "${enabled}" -eq 0 ] || {
        mwan3_flush_conntrack "$INTERFACE" "$ACTION"
 }
 

diff --git a/net/mwan3/files/etc/hotplug.d/iface/16-mwan3-user b/net/mwan3/files/etc/hotplug.d/iface/16-mwan3-user
index ef490e183303f406f0fd16de884ae251333d250b..af28b1f4f22c83244853812d36638a78b3ba9a66 100644 (file)
--- a/net/mwan3/files/etc/hotplug.d/iface/16-mwan3-user
+++ b/net/mwan3/files/etc/hotplug.d/iface/16-mwan3-user
@@ -8,13 +8,13 @@
 
        config_load mwan3
        config_get_bool enabled globals 'enabled' '0'
-       [ ${enabled} -gt 0 ] || {
+       [ "${enabled}" -gt 0 ] || {
                mwan3_unlock "$ACTION" "user"
                exit 0
        }
 
-       config_get enabled "$INTERFACE" enabled 0
-       [ "${enabled}" = "1" ] || {
+       config_get_bool enabled "$INTERFACE" enabled 0
+       [ "${enabled}" -eq 1 ] || {
                mwan3_unlock "$ACTION" "user"
                exit 0
        }