Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mwan3: unify variable check

Browse source 
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 981d1eb83a)
This commit is contained in:
Florian Eckert 2020-07-27 10:24:59 +02:00
parent 138d02cfcb
commit 5f934c6678
3 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
net/mwan3/files/etc/hotplug.d/iface/15-mwan3
View file

@ -15,7 +15,7 @@ fi
mwan3_lock "$ACTION" "$INTERFACE" mwan3_lock "$ACTION" "$INTERFACE"
config_load mwan3 config_load mwan3
config_get_bool enabled globals 'enabled' '0' config_get_bool enabled globals 'enabled' '0'
[ ${enabled} -gt 0 ] || { [ "${enabled}" -gt 0 ] || {
mwan3_unlock "$ACTION" "$INTERFACE" mwan3_unlock "$ACTION" "$INTERFACE"
exit 0 exit 0
} }
@ -24,14 +24,14 @@ mwan3_init
mwan3_set_connected_iptables mwan3_set_connected_iptables
mwan3_set_custom_ipset mwan3_set_custom_ipset
config_get enabled $INTERFACE enabled 0
config_get initial_state $INTERFACE initial_state "online" config_get initial_state $INTERFACE initial_state "online"
[ "${enabled}" == "1" ] || { config_get_bool enabled $INTERFACE 'enabled' '0'
[ "${enabled}" -eq 1 ] || {
mwan3_unlock "$ACTION" "$INTERFACE" mwan3_unlock "$ACTION" "$INTERFACE"
exit 0 exit 0
} }
if [ "$ACTION" == "ifup" ]; then if [ "$ACTION" = "ifup" ]; then
config_get family $INTERFACE family ipv4 config_get family $INTERFACE family ipv4
if [ "$family" = "ipv4" ]; then if [ "$family" = "ipv4" ]; then
ubus call network.interface.${INTERFACE}_4 status &>/dev/null 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_iptables $INTERFACE $DEVICE
mwan3_create_iface_rules $INTERFACE $DEVICE mwan3_create_iface_rules $INTERFACE $DEVICE
mwan3_create_iface_route $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})" $LOG notice "Starting tracker on interface $INTERFACE (${DEVICE:-unknown})"
mwan3_set_iface_hotplug_state $INTERFACE "online" mwan3_set_iface_hotplug_state $INTERFACE "online"
mwan3_track $INTERFACE $DEVICE "online" "$src_ip" mwan3_track $INTERFACE $DEVICE "online" "$src_ip"

8
net/mwan3/files/etc/hotplug.d/iface/16-mwan3
View file

@ -8,17 +8,17 @@ mwan3_lock "$ACTION" "mwan3rtmon"
config_load mwan3 config_load mwan3
config_get_bool enabled globals 'enabled' '0' config_get_bool enabled globals 'enabled' '0'
[ ${enabled} -gt 0 ] || { [ "${enabled}" -gt 0 ] || {
mwan3_unlock "$ACTION" "mwan3rtmon" mwan3_unlock "$ACTION" "mwan3rtmon"
exit 0 exit 0
} }
if [ "$ACTION" == "ifup" ]; then if [ "$ACTION" = "ifup" ]; then
mwan3_rtmon mwan3_rtmon
fi fi
config_get enabled $INTERFACE enabled 0 config_get_bool enabled "$INTERFACE" 'enabled' '0'
[ "${enabled}" = "0" ] || { [ "${enabled}" -eq 0 ] || {
mwan3_flush_conntrack "$INTERFACE" "$ACTION" mwan3_flush_conntrack "$INTERFACE" "$ACTION"
} }

6
net/mwan3/files/etc/hotplug.d/iface/16-mwan3-user
View file

@ -8,13 +8,13 @@
config_load mwan3 config_load mwan3
config_get_bool enabled globals 'enabled' '0' config_get_bool enabled globals 'enabled' '0'
[ ${enabled} -gt 0 ] || { [ "${enabled}" -gt 0 ] || {
mwan3_unlock "$ACTION" "user" mwan3_unlock "$ACTION" "user"
exit 0 exit 0
} }
config_get enabled "$INTERFACE" enabled 0 config_get_bool enabled "$INTERFACE" enabled 0
[ "${enabled}" = "1" ] || { [ "${enabled}" -eq 1 ] || {
mwan3_unlock "$ACTION" "user" mwan3_unlock "$ACTION" "user"
exit 0 exit 0
} }