diff options
| author | Florian Eckert <fe@dev.tdt.de> | 2020-07-27 10:24:59 +0200 |
|---|---|---|
| committer | Florian Eckert <fe@dev.tdt.de> | 2020-07-28 06:53:24 +0200 |
| commit | 981d1eb83a3b0676c71559ac8b514c4f8ff56e1b (patch) | |
| tree | d379f3dd80bfe1695ddf9538c4c53bc707764541 /net/mwan3 | |
| parent | ab747fe0fb3b60c0bd42ea2c4fc045273eb46f6f (diff) | |
mwan3: unify variable check
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Diffstat (limited to 'net/mwan3')
| -rw-r--r-- | net/mwan3/files/etc/hotplug.d/iface/15-mwan3 | 12 | ||||
| -rw-r--r-- | net/mwan3/files/etc/hotplug.d/iface/16-mwan3 | 8 | ||||
| -rw-r--r-- | net/mwan3/files/etc/hotplug.d/iface/16-mwan3-user | 6 |
3 files changed, 13 insertions, 13 deletions
diff --git a/net/mwan3/files/etc/hotplug.d/iface/15-mwan3 b/net/mwan3/files/etc/hotplug.d/iface/15-mwan3 index db2dc237a..645cdd3e4 100644 --- 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 d68401fed..dd09358eb 100644 --- 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 ef490e183..af28b1f4f 100644 --- 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 } |