Merge pull request #4825 from nxhack/node-hid_fix_depends

[feed/packages.git] / net / mwan3 / files / etc / hotplug.d / iface / 15-mwan3

diff --git a/net/mwan3/files/etc/hotplug.d/iface/15-mwan3 b/net/mwan3/files/etc/hotplug.d/iface/15-mwan3
index a13ff832452d07b555596c3538798153ca4873f4..27033d582df09afba7014f3d1ed7aae5db4e85ae 100644 (file)
--- a/net/mwan3/files/etc/hotplug.d/iface/15-mwan3
+++ b/net/mwan3/files/etc/hotplug.d/iface/15-mwan3
@@ -3,6 +3,7 @@
 . /lib/functions.sh
 . /lib/functions/network.sh
 . /lib/mwan3/mwan3.sh
+. /usr/share/libubox/jshn.sh
 
 [ "$ACTION" == "ifup" -o "$ACTION" == "ifdown" ] || exit 1
 [ -n "$INTERFACE" ] || exit 2
@@ -11,16 +12,13 @@ if [ "$ACTION" == "ifup" ]; then
         [ -n "$DEVICE" ] || exit 3
 fi
 
-[ -x /usr/bin/ip ] || exit 4
-[ -x /usr/sbin/ipset ] || exit 5
-[ -x /usr/sbin/iptables ] || exit 6
-[ -x /usr/sbin/ip6tables ] || exit 7
-[ -x /usr/bin/logger ] || exit 8
-
+mwan3_lock
 mwan3_set_connected_iptables
+mwan3_unlock
 
 config_load mwan3
 config_get enabled $INTERFACE enabled 0
+config_get initial_state $INTERFACE initial_state "online"
 [ "$enabled" == "1" ] || exit 0
 
 if [ "$ACTION" == "ifup" ]; then
@@ -29,39 +27,61 @@ if [ "$ACTION" == "ifup" ]; then
                ubus call network.interface.${INTERFACE}_4 status &>/dev/null
                if [ "$?" -eq "0" ]; then
                        network_get_gateway gateway ${INTERFACE}_4
+                       network_get_ipaddr src_ip ${INTERFACE}_4
                else
                        network_get_gateway gateway $INTERFACE
+                       network_get_ipaddr src_ip ${INTERFACE}
                fi
        elif [ "$family" = "ipv6" ]; then
                ubus call network.interface.${INTERFACE}_6 status &>/dev/null
                if [ "$?" -eq "0" ]; then
                        network_get_gateway6 gateway ${INTERFACE}_6
+                       network_get_ipaddr6 src_ip ${INTERFACE}_6
                else
                        network_get_gateway6 gateway ${INTERFACE}
+                       network_get_ipaddr6 src_ip ${INTERFACE}
                fi
        fi
 
        [ -n "$gateway" ] || exit 9
 fi
 
-$LOG notice "$ACTION interface $INTERFACE (${DEVICE:-unknown})"
+if [ "$initial_state" = "offline" ]; then
+       json_load "$(ubus call mwan3 status '{"section":"interfaces"}')"
+       json_select "interfaces"
+       json_select "${INTERFACE}"
+       json_get_var running running
+       json_get_var status status
+else
+       status=online
+       running=1
+fi
+
+mwan3_lock
+$LOG notice "Execute "$ACTION" event on interface $INTERFACE (${DEVICE:-unknown})"
 
 case "$ACTION" in
        ifup)
                mwan3_set_general_rules
                mwan3_set_general_iptables
-               mwan3_create_iface_rules $INTERFACE $DEVICE
                mwan3_create_iface_iptables $INTERFACE $DEVICE
+               mwan3_create_iface_rules $INTERFACE $DEVICE
                mwan3_create_iface_route $INTERFACE $DEVICE
-               mwan3_track $INTERFACE $DEVICE
-               mwan3_set_policies_iptables
-               mwan3_set_user_rules
-               mwan3_flush_conntrack $INTERFACE $DEVICE "ifup"
+               if [ ${running} -eq 1 -a "${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"
+                       mwan3_set_policies_iptables
+                       mwan3_set_user_rules
+                       mwan3_flush_conntrack $INTERFACE $DEVICE "ifup"
+               else
+                       $LOG notice "Starting tracker on interface $INTERFACE (${DEVICE:-unknown})"
+                       mwan3_set_iface_hotplug_state $INTERFACE "offline"
+                       mwan3_track $INTERFACE $DEVICE "unknown" "$src_ip"
+               fi
        ;;
        ifdown)
-               mwan3_delete_iface_rules $INTERFACE
-               mwan3_delete_iface_iptables $INTERFACE
-               mwan3_delete_iface_route $INTERFACE
+               mwan3_set_iface_hotplug_state $INTERFACE "offline"
                mwan3_delete_iface_ipset_entries $INTERFACE
                mwan3_track_signal $INTERFACE $DEVICE
                mwan3_set_policies_iptables
@@ -70,4 +90,6 @@ case "$ACTION" in
        ;;
 esac
 
+mwan3_unlock
+
 exit 0