Merge pull request #13041 from aaronjg/mwan3-startup-performance

mwan3: startup performance improvements and other fixes

net/mwan3/Makefile

@@ -8,8 +8,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mwan3
-PKG_VERSION:=2.8.12
+PKG_VERSION:=2.9.0
-PKG_RELEASE:=2
+PKG_RELEASE:=1
 PKG_MAINTAINER:=Florian Eckert <fe@dev.tdt.de>
 PKG_LICENSE:=GPL-2.0
 

net/mwan3/files/etc/config/mwan3

@@ -1,7 +1,6 @@
 
 config globals 'globals'
 	option mmx_mask '0x3F00'
-	option rtmon_interval '5'
 
 config interface 'wan'
 	option enabled '1'

net/mwan3/files/etc/hotplug.d/iface/15-mwan3

@@ -4,95 +4,101 @@
 . /lib/functions/network.sh
 . /lib/mwan3/mwan3.sh
 . /usr/share/libubox/jshn.sh
+. /lib/mwan3/common.sh
 
-[ "$ACTION" == "ifup" -o "$ACTION" == "ifdown" ] || exit 1
+SCRIPTNAME="mwan3-hotplug"
+[ "$ACTION" = "ifup" ] || [ "$ACTION" = "ifdown" ] ||  [ "$ACTION" = "connected" ] || [ "$ACTION" = "disconnected" ] || exit 1
 [ -n "$INTERFACE" ] || exit 2
-
+if ( [ "$ACTION" = "ifup" ] || [ "$ACTION" = "connected" ] ) && [ -z "$DEVICE" ]; then
-if [ "$ACTION" == "ifup" ]; then
+	LOG notice "$ACTION called on $INTERFACE with no device set"
-	[ -n "$DEVICE" ] || exit 3
+	exit 3
 fi
 
-mwan3_lock "$ACTION" "$INTERFACE"
+[ "$MWAN3_STARTUP" = 1 ] || mwan3_lock "$ACTION" "$INTERFACE"
+
 config_load mwan3
 config_get_bool enabled globals 'enabled' '0'
 [ "${enabled}" -gt 0 ] || {
+	[ "$MWAN3_STARTUP" = 1 ] || mwan3_unlock "$ACTION" "$INTERFACE"
+	LOG notice "mwan3 hotplug on $INTERFACE not called because globally disabled"
+	mwan3_flush_conntrack "$INTERFACE" "$ACTION"
+	exit 0
+}
+
+$IPT4 -S mwan3_hook &>/dev/null || {
 	mwan3_unlock "$ACTION" "$INTERFACE"
+	LOG warn "hotplug called on $INTERFACE before mwan3 has been set up"
 	exit 0
 }
 
 mwan3_init
-mwan3_set_connected_iptables
+[ "$MWAN3_STARTUP" = 1 ] || {
-mwan3_set_custom_ipset
+	mwan3_set_connected_iptables
+	mwan3_set_custom_ipset
+}
+
+if [ "$MWAN3_STARTUP" != 1 ]; then
+	mwan3_set_user_iface_rules $INTERFACE $DEVICE
+fi
 
 config_get initial_state $INTERFACE initial_state "online"
 config_get_bool enabled $INTERFACE 'enabled' '0'
 [ "${enabled}" -eq 1 ] || {
-	mwan3_unlock "$ACTION" "$INTERFACE"
+	[ "$MWAN3_STARTUP" = 1 ] || mwan3_unlock "$ACTION" "$INTERFACE"
+	LOG notice "mwan3 hotplug on $INTERFACE not called because interface disabled"
 	exit 0
 }
 
-if [ "$ACTION" = "ifup" ]; then
+trackpid=$(pgrep -f "mwan3track $INTERFACE ")
-	config_get family $INTERFACE family ipv4
-	if [ "$family" = "ipv4" ]; then
-		ubus call network.interface.${INTERFACE}_4 status &>/dev/null
-		if [ "$?" -eq "0" ]; then
-			network_get_ipaddr src_ip ${INTERFACE}_4
-		else
-			network_get_ipaddr src_ip ${INTERFACE}
-		fi
-		[ -n "$src_ip" ] || src_ip="0.0.0.0"
-	elif [ "$family" = "ipv6" ]; then
-		ubus call network.interface.${INTERFACE}_6 status &>/dev/null
-		if [ "$?" -eq "0" ]; then
-			network_get_ipaddr6 src_ip ${INTERFACE}_6
-		else
-			network_get_ipaddr6 src_ip ${INTERFACE}
-		fi
-		[ -n "$src_ip" ] || src_ip="::"
-	fi
-fi
 
 if [ "$initial_state" = "offline" ]; then
-	json_load "$(ubus call mwan3 status '{"section":"interfaces"}')"
+	status=$(cat $MWAN3TRACK_STATUS_DIR/$INTERFACE/STATUS 2>/dev/null || echo unknown)
-	json_select "interfaces"
-	json_select "${INTERFACE}"
-	json_get_var running running
-	json_get_var status status
 else
 	status=online
-	running=1
 fi
 
-$LOG notice "Execute "$ACTION" event on interface $INTERFACE (${DEVICE:-unknown})"
+[ -z "$TRUE_INTERFACE" ] && mwan3_get_true_iface TRUE_INTERFACE $INTERFACE
+
+binary_status=$status
+[ "$binary_status" = "online" ] || binary_status=offline
+
+LOG notice "Execute "$ACTION" event on interface $INTERFACE (${DEVICE:-unknown})"
 
 case "$ACTION" in
-	ifup)
+	ifup|connected)
-		mwan3_set_general_rules
-		mwan3_set_general_iptables
 		mwan3_create_iface_iptables $INTERFACE $DEVICE
 		mwan3_create_iface_rules $INTERFACE $DEVICE
 		mwan3_create_iface_route $INTERFACE $DEVICE
-		if [ "${running}" -eq 1 ] && [ "${status}" = "online" ]; then
+		[ "$MWAN3_STARTUP" != 1 ] && mwan3_add_non_default_iface_route $INTERFACE $DEVICE
-			$LOG notice "Starting tracker on interface $INTERFACE (${DEVICE:-unknown})"
+		mwan3_set_iface_hotplug_state $INTERFACE "$binary_status"
-			mwan3_set_iface_hotplug_state $INTERFACE "online"
+
-			mwan3_track $INTERFACE $DEVICE "online" "$src_ip"
+		mwan3_get_src_ip src_ip "$TRUE_INTERFACE"
+		if [ -n "${trackpid}" ]; then
+			device_pid=$(pgrep -f "mwan3track $INTERFACE $DEVICE ")
+			if [ "$device_pid" = "$trackpid" ]; then
+				[ "$ACTION" = ifup ] && kill -USR2 "$trackpid"
+			else
+				mwan3_track $INTERFACE $DEVICE "$binary_status" "$src_ip"
+				LOG notice "Restarted tracker [$!] on interface $INTERFACE (${DEVICE:-unknown})"
+			fi
 		else
-			$LOG notice "Starting tracker on interface $INTERFACE (${DEVICE:-unknown})"
+			mwan3_track $INTERFACE $DEVICE "$binary_status" "$src_ip"
-			mwan3_set_iface_hotplug_state $INTERFACE "offline"
+			LOG notice "Started tracker [$!] on interface $INTERFACE (${DEVICE:-unknown})"
-			mwan3_track $INTERFACE $DEVICE "offline" "$src_ip"
 		fi
-		mwan3_set_policies_iptables
+		[ "$MWAN3_STARTUP" != 1 ] && [ "$binary_status" == "online" ] && mwan3_set_policies_iptables
-		mwan3_set_user_rules
+
 	;;
-	ifdown)
+	ifdown|disconnected)
 		mwan3_set_iface_hotplug_state $INTERFACE "offline"
 		mwan3_delete_iface_ipset_entries $INTERFACE
-		mwan3_track_signal $INTERFACE $DEVICE
+		mwan3_delete_iface_rules $INTERFACE
+		mwan3_delete_iface_route $INTERFACE
+		mwan3_delete_iface_iptables $INTERFACE
+		if [ "$ACTION" = "ifdown" ]; then
+			[ -n "$trackpid" ] && kill -USR1 "$trackpid"
+		fi
 		mwan3_set_policies_iptables
-		mwan3_set_user_rules
 	;;
 esac
-
+[ "$MWAN3_STARTUP" = 1 ] || mwan3_unlock "$ACTION" "$INTERFACE"
-mwan3_unlock "$ACTION" "$INTERFACE"
-
 exit 0

net/mwan3/files/etc/hotplug.d/iface/16-mwan3

@@ -1,27 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-. /lib/functions/network.sh
-. /lib/mwan3/mwan3.sh
-
-mwan3_lock "$ACTION" "mwan3rtmon"
-
-config_load mwan3
-config_get_bool enabled globals 'enabled' '0'
-[ "${enabled}" -gt 0 ] || {
-	mwan3_unlock "$ACTION" "mwan3rtmon"
-	exit 0
-}
-
-if [ "$ACTION" = "ifup" ]; then
-	mwan3_rtmon
-fi
-
-config_get_bool enabled "$INTERFACE" 'enabled' '0'
-[ "${enabled}" -eq 0 ] || {
-	mwan3_flush_conntrack "$INTERFACE" "$ACTION"
-}
-
-mwan3_unlock "$ACTION" "mwan3rtmon"
-
-exit 0

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

@@ -4,22 +4,22 @@
 	. /lib/functions.sh
 	. /lib/mwan3/mwan3.sh
 
-	mwan3_lock "$ACTION" "user"
+	[ "$MWAN3_STARTUP" = 1 ] || mwan3_lock "$ACTION" "$DEVICE-user"
 
 	config_load mwan3
 	config_get_bool enabled globals 'enabled' '0'
 	[ "${enabled}" -gt 0 ] || {
-		mwan3_unlock "$ACTION" "user"
+		[ "$MWAN3_STARTUP" = 1 ] || mwan3_unlock "$ACTION" "$DEVICE-user"
 		exit 0
 	}
 
 	config_get_bool enabled "$INTERFACE" enabled 0
 	[ "${enabled}" -eq 1 ] || {
-		mwan3_unlock "$ACTION" "user"
+		[ "$MWAN3_STARTUP" = 1 ] || mwan3_unlock "$ACTION" "$DEVICE-user"
 		exit 0
 	}
 
-	mwan3_unlock "$ACTION" "user"
+	[ "$MWAN3_STARTUP" = 1 ] || mwan3_unlock "$ACTION" "$DEVICE-user"
 
 	env -i ACTION="$ACTION" INTERFACE="$INTERFACE" DEVICE="$DEVICE" \
 		/bin/sh /etc/mwan3.user

net/mwan3/files/etc/init.d/mwan3

@@ -5,8 +5,9 @@ USE_PROCD=1
 
 boot() {
 	. /lib/config/uci.sh
-	uci_toggle_state mwan3 globals enabled "1"
+	# disabled until mwan3 start runs so hotplug scripts
-	mwan3_boot=1
+	# do not start prematurely
+	uci_toggle_state mwan3 globals enabled "0"
 	rc_procd start_service
 }
 
@@ -20,7 +21,6 @@ reload_service() {
 }
 
 start_service() {
-	[ -n "${mwan3_boot}" ] && return 0
 	/usr/sbin/mwan3 start 1000>&-
 }
 

net/mwan3/files/lib/mwan3/common.sh

@@ -4,3 +4,14 @@ get_uptime() {
 	local uptime=$(cat /proc/uptime)
 	echo "${uptime%%.*}"
 }
+
+SCRIPTNAME="$(basename "$0")"
+LOG()
+{
+	local facility=$1; shift
+	# in development, we want to show 'debug' level logs
+	# when this release is out of beta, the comment in the line below
+	# should be removed
+	[ "$facility" = "debug" ] && return
+	logger -t "$SCRIPTNAME[$$]" -p $facility "$*"
+}

net/mwan3/files/usr/sbin/mwan3

@@ -4,6 +4,7 @@
 . /usr/share/libubox/jshn.sh
 . /lib/functions/network.sh
 . /lib/mwan3/mwan3.sh
+. /lib/mwan3/common.sh
 
 help()
 {
@@ -37,52 +38,64 @@ ifdown()
 
 	ACTION=ifdown INTERFACE=$1 /sbin/hotplug-call iface
 
-	kill $(pgrep -f "mwan3track $1 $2") &> /dev/null
+	kill $(pgrep -f "mwan3track $1 ") &> /dev/null
 	mwan3_track_clean $1
 }
 
 ifup()
 {
-	local device enabled up l3_device status
+	local device enabled up l3_device status interface true_iface
-
-	mwan3_lock "command" "mwan3"
-
-	config_load mwan3
-	config_get_bool enabled globals 'enabled' 0
-
-	[ ${enabled} -gt 0 ] || {
-		echo "The service mwan3 is global disabled."
-		echo "Please execute \"/etc/init.d/mwan3 start\" first."
-		mwan3_unlock "command" "mwan3"
-		exit 1
-	}
 
 	if [ -z "$1" ]; then
 		echo "Expecting interface. Usage: mwan3 ifup <interface>"
-		mwan3_unlock "command" "mwan3"
 		exit 0
 	fi
 
 	if [ -n "$2" ]; then
 		echo "Too many arguments. Usage: mwan3 ifup <interface>"
-		mwan3_unlock "command" "mwan3"
 		exit 0
 	fi
 
-	config_get enabled "$1" enabled 0
+	interface=$1
-	mwan3_unlock "command" "mwan3"
+
+	if [ "${MWAN3_STARTUP}" != 1 ]; then
+		# It is not necessary to obtain a lock here, because it is obtained in the hotplug
+		# script, but we still want to do the check to print a useful error message
+		config_load mwan3
+		config_get_bool enabled globals 'enabled' 0
+
+		[ ${enabled} -gt 0 ] || {
+			echo "The service mwan3 is global disabled."
+			echo "Please execute \"/etc/init.d/mwan3 start\" first."
+			exit 1
+		}
+	else
+		enabled=1
+	fi
+	mwan3_get_true_iface true_iface $interface
+	status=$(ubus -S call network.interface.$true_iface status)
 
-	status=$(ubus -S call network.interface.$1 status)
 	[ -n "$status" ] && {
 		json_load "$status"
 		json_get_vars up l3_device
 	}
+	hotplug_startup()
+	{
+		MWAN3_STARTUP=$MWAN3_STARTUP ACTION=ifup INTERFACE=$interface DEVICE=$l3_device TRUE_INTERFACE=$true_iface sh /etc/hotplug.d/iface/15-mwan3
+		MWAN3_STARTUP=$MWAN3_STARTUP ACTION=ifup INTERFACE=$interface DEVICE=$l3_device TRUE_INTERFACE=$true_iface sh /etc/hotplug.d/iface/16-mwan3-user
+	}
 
-	if [ "$up" = "1" ] \
+	if [ "$up" != "1" ] || [ -z "$l3_device" ] || [ "$enabled" != "1" ]; then
-		&& [ -n "$l3_device" ] \
+		return
-		&& [ "$enabled" = "1" ]; then
-		ACTION=ifup INTERFACE=$1 DEVICE=$l3_device /sbin/hotplug-call iface
 	fi
+
+	if [ "${MWAN3_STARTUP}" = 1 ]; then
+		hotplug_startup &
+		hotplug_pids="$hotplug_pids $!"
+	else
+		hotplug_startup
+	fi
+
 }
 
 interfaces()
@@ -137,67 +150,78 @@ status()
 
 start()
 {
-	local enabled
+	local enabled hotplug_pids MWAN3_STARTUP
-
+	MWAN3_STARTUP=1
 	mwan3_lock "command" "mwan3"
 	uci_toggle_state mwan3 globals enabled "1"
-	mwan3_unlock "command" "mwan3"
-
 	config_load mwan3
+
+	mwan3_update_iface_to_table
+	mwan3_set_connected_iptables
+	mwan3_set_custom_ipset
+	mwan3_set_general_rules
+	mwan3_set_general_iptables
 	config_foreach ifup interface
+	wait $hotplug_pids
+	mwan3_add_all_nondefault_routes
+	mwan3_set_policies_iptables
+	mwan3_set_user_rules
+
+
+	mwan3_unlock "command" "mwan3"
+	mwan3_rtmon
+	unset MWAN3_STARTUP
 }
 
 stop()
 {
-	local ipset route rule table IP IPT pid
+	local ipset rule IP IPTR IPT kill_pid family table tid
 
 	mwan3_lock "command" "mwan3"
 	uci_toggle_state mwan3 globals enabled "0"
 
-	for pid in $(pgrep -f "mwan3rtmon"); do
+	{
-		kill -TERM "$pid" > /dev/null 2>&1
+		kill -TERM $(pgrep -f "mwan3rtmon") > /dev/null 2>&1
-	done
+		kill -TERM $(pgrep -f "mwan3track") > /dev/null 2>&1
 
-	for pid in $(pgrep -f "mwan3track"); do
+		sleep 1
-		kill -TERM "$pid" > /dev/null 2>&1
-	done
-
-	sleep 1
-
-	for pid in $(pgrep -f "mwan3rtmon"); do
-		kill -KILL "$pid" > /dev/null 2>&1
-	done
-
-	for pid in $(pgrep -f "mwan3track"); do
-		kill -KILL "$pid" > /dev/null 2>&1
-	done
 
+		kill -KILL $(pgrep -f "mwan3rtmon") > /dev/null 2>&1
+		kill -KILL $(pgrep -f "mwan3track") > /dev/null 2>&1
+	} &
+	kill_pid=$!
 	config_load mwan3
 	config_foreach mwan3_track_clean interface
 
-	for IP in "$IP4" "$IP6"; do
+	for family in ipv4 ipv6; do
-		[ "$IP" = "$IP6" ] && [ $NO_IPV6 -ne 0 ] && continue
+		if [ "$family" = "ipv4" ]; then
-		for route in $(seq 1 $MWAN3_INTERFACE_MAX); do
+			IPT="$IPT4"
-			$IP route flush table $route &> /dev/null
+			IPTR="$IPT4R"
+			IP="$IP4"
+		elif [ "$family" = "ipv6" ]; then
+			[ $NO_IPV6 -ne 0 ] && continue
+			IPT="$IPT6"
+			IPTR="$IPT6R"
+			IP="$IP6"
+		fi
+
+		for tid in $(ip route list table all | sed -ne  's/.*table \([0-9]\+\).*/\1/p'|sort -u); do
+			[ $tid -gt $MWAN3_INTERFACE_MAX ] && continue
+			$IP route flush table $tid &> /dev/null
 		done
 
 		for rule in $($IP rule list | egrep '^[1-2][0-9]{3}\:' | cut -d ':' -f 1); do
 			$IP rule del pref $rule &> /dev/null
 		done
-	done
+		table="$($IPT -S)"
-
+		{
-	for IPT in "$IPT4" "$IPT6"; do
+			echo "*mangle";
-		[ "$IPT" = "$IPT6" ] && [ $NO_IPV6 -ne 0 ] && continue
+			[ -z "${table##*PREROUTING -j mwan3_hook*}" ] && echo "-D PREROUTING -j mwan3_hook"
-		$IPT -D PREROUTING -j mwan3_hook &> /dev/null
+			[ -z "${table##*OUTPUT -j mwan3_hook*}" ] && echo "-D OUTPUT -j mwan3_hook"
-		$IPT -D OUTPUT -j mwan3_hook &> /dev/null
+			echo "$table" | awk '{print "-F "$2}' | grep mwan3 | sort -u
-
+			echo "$table" | awk '{print "-X "$2}' | grep mwan3 | sort -u
-		for table in $($IPT -S | awk '{print $2}' | grep mwan3 | sort -u); do
+			echo "COMMIT"
-			$IPT -F $table &> /dev/null
+		} | $IPTR
-		done
-
-		for table in $($IPT -S | awk '{print $2}' | grep mwan3 | sort -u); do
-			$IPT -X $table &> /dev/null
-		done
 	done
 
 	for ipset in $($IPS -n list | grep mwan3_); do
@@ -208,9 +232,19 @@ stop()
 		$IPS -q destroy $ipset
 	done
 
+	if ! pgrep -f "mwan3track" >/dev/null && ! pgrep -f "mwan3rtmon" >/dev/null; then
+		# mwan3track has already exited, no need to send
+		# TERM signal
+		kill $kill_pid 2>/dev/null
+	else
+		# mwan3track has not exited, wait for the killer
+		# to do its work
+		wait $kill_pid
+	fi
+	rm -rf $MWAN3_STATUS_DIR $MWAN3TRACK_STATUS_DIR
+
 	mwan3_unlock "command" "mwan3"
 
-	rm -rf $MWAN3_STATUS_DIR $MWAN3TRACK_STATUS_DIR
 }
 
 restart() {

net/mwan3/files/usr/sbin/mwan3rtmon

@@ -1,38 +1,110 @@
 #!/bin/sh
 
 . /lib/functions.sh
+. /lib/functions/network.sh
 . /lib/mwan3/mwan3.sh
+. /lib/mwan3/common.sh
 
-LOG="logger -t $(basename "$0")[$$] -p"
+mwan3_rtmon_route_handle()
+{
+	config_load mwan3
+	local section action route_line family tbl device metric tos dst line
+	local route_device tid
+	route_line=${1##"Deleted "}
+	route_family=$2
 
-clean_up() {
+	if [ "$route_family" = "ipv4" ]; then
-	$LOG notice "Stopping mwan3rtmon..."
+		IP="$IP4"
-	exit 0
+	elif [ "$route_family" = "ipv6" ] && [ $NO_IPV6 -eq 0 ]; then
+		IP="$IP6"
+	else
+		return
+	fi
+
+	if [ "$route_line" == "$1" ]; then
+		action="add"
+	else
+		action="del"
+	fi
+
+	# never add default route lines, since this is handled elsewhere
+	[ -z "${route_line##default*}" ] && return
+	[ -z "${route_line##::/0*}" ] && return
+	route_line=${route_line%% linkdown*}
+	route_line=${route_line%% unreachable*}
+	mwan3_update_dev_to_table
+	mwan3_route_line_dev "tid" "$route_line" "$route_family"
+	handle_route() {
+		tbl=$($IP route list table $tid)
+		if [ $action = "add" ]; then
+			echo "$tbl" | grep -q "^default\|^::/0" || return
+		else
+			[ -z "$tbl" ] && return
+		fi
+		# check that action needs to be performed. May not need to take action if:
+		# Got a route update on ipv6 where route is already in the table
+		# Got a delete event, but table was already flushed
+
+		[ $action = "add" ] && [ -z "${tbl##*$route_line*}" ] && return
+		[ $action = "del" ] && [ -n "${tbl##*$route_line*}" ] && return
+		network_get_device device "$section"
+		LOG debug "adjusting route $device: $IP route "$action" table $tid $route_line"
+		$IP route "$action" table $tid $route_line ||
+			LOG warn "failed: $IP route $action table $tid $route_line"
+	}
+	handle_route_cb(){
+		let tid++
+		config_get family "$section" family ipv4
+		[ "$family" != "$route_family" ] && return
+		handle_route
+	}
+
+	if [ $action = "add" ]; then
+		## handle old routes from 'change' or 'replace'
+		metric=${route_line##*metric }
+		[ "$metric" = "$route_line" ] && unset metric || metric=${metric%% *}
+
+		tos=${route_line##*tos }
+		[ "$tos" = "$route_line" ] && unset tos || tos=${tos%% *}
+
+		dst=${route_line%% *}
+		grep_line="$dst ${tos:+tos $tos}.*table [0-9].*${metric:+metric $metric}"
+		$IP route list table all | grep "$grep_line" | while read line; do
+			tbl=${line##*table }
+			tbl=${tbl%% *}
+			[ $tbl -gt $MWAN3_INTERFACE_MAX ] && continue
+			LOG debug "removing route on ip route change/replace: $line"
+			$IP route del $line
+		done
+	fi
+
+	if [ -n "$tid" ]; then
+		handle_route
+	else
+		config_foreach handle_route_cb interface
+	fi
 }
 
-rtchange() {
+main()
-	$LOG info "Detect rtchange event."
+{
-}
+	local IP family
-
-main() {
-	local rtmon_interval
-	trap clean_up TERM
-	trap rtchange USR1
 
 	config_load mwan3
-	config_get rtmon_interval globals rtmon_interval '5'
+	family=$1
+	[ -z $family ] && family=ipv4
+	if [ "$family" = ipv6 ]; then
+		IP="$IP6"
+	else
+		IP="$IP4"
+	fi
+	mwan3_init
 
-	sleep 3
+	$IP monitor route | while read line; do
-	while true; do
+		[ -z "${line##*table*}" ] && continue
+		LOG debug "handling route update $family $line"
 		mwan3_lock "service" "mwan3rtmon"
-		mwan3_rtmon_ipv4 || mwan3_rtmon_ipv6
+		mwan3_rtmon_route_handle "$line" "$family"
-		ret=$?
 		mwan3_unlock "service" "mwan3rtmon"
-		[ "$ret" = "0" ] || break
-		[ "$rtmon_interval" = "0" ] && break
-		sleep "$rtmon_interval" &
-		wait
 	done
 }
-
 main "$@"

net/mwan3/files/usr/sbin/mwan3track

@@ -3,60 +3,107 @@
 . /lib/functions.sh
 . /lib/mwan3/common.sh
 
-LOG="logger -t $(basename "$0")[$$] -p"
 INTERFACE=""
 DEVICE=""
 PING="/bin/ping"
 
 IFDOWN_EVENT=0
+IFUP_EVENT=0
 
 clean_up() {
-	$LOG notice "Stopping mwan3track for interface \"${INTERFACE}\""
+	LOG notice "Stopping mwan3track for interface \"${INTERFACE}\""
 	exit 0
 }
 
 if_down() {
-	$LOG info "Detect ifdown event on interface ${INTERFACE} (${DEVICE})"
+	LOG info "Detect ifdown event on interface ${INTERFACE} (${DEVICE})"
 	IFDOWN_EVENT=1
 }
 
+if_up() {
+	LOG info "Detect ifup event on interface ${INTERFACE} (${DEVICE})"
+	IFUP_EVENT=1
+}
+
 validate_track_method() {
 	case "$1" in
 		ping)
-			command -v ping 1>/dev/null 2>&1 || {
+			[ -x "$PING" ] || {
-				$LOG warn "Missing ping. Please install iputils-ping package or enable ping util and recompile busybox."
+				LOG warn "Missing ping. Please enable ping util and recompile busybox."
 				return 1
 			}
 			;;
 		arping)
 			command -v arping 1>/dev/null 2>&1 || {
-				$LOG warn "Missing arping. Please install iputils-arping package."
+				LOG warn "Missing arping. Please install iputils-arping package."
 				return 1
 			}
 			;;
 		httping)
 			command -v httping 1>/dev/null 2>&1 || {
-				$LOG warn "Missing httping. Please install httping package."
+				LOG warn "Missing httping. Please install httping package."
 				return 1
 			}
 			[ -n "$2" -a "$2" != "0.0.0.0" -a "$2" != "::" ] || {
-				$LOG warn "Cannot determine source IP for the interface which is required by httping."
+				LOG warn "Cannot determine source IP for the interface which is required by httping."
 				return 1
 			}
 			;;
 		nping-*)
 			command -v nping 1>/dev/null 2>&1 || {
-				$LOG warn "Missing nping. Please install nping package."
+				LOG warn "Missing nping. Please install nping package."
 				return 1
 			}
 			;;
 		*)
-			$LOG warn "Unsupported tracking method: $track_method"
+			LOG warn "Unsupported tracking method: $track_method"
 			return 2
 			;;
 	esac
 }
 
+disconnected() {
+	echo "offline" > /var/run/mwan3track/$INTERFACE/STATUS
+	echo "$(get_uptime)" > /var/run/mwan3track/$INTERFACE/OFFLINE
+	echo "0" > /var/run/mwan3track/$INTERFACE/ONLINE
+	score=0
+	[ "$1" == 1 ] && return
+	LOG notice "Interface $INTERFACE ($DEVICE) is offline"
+	env -i ACTION="disconnected" INTERFACE="$INTERFACE" DEVICE="$DEVICE" /sbin/hotplug-call iface
+}
+
+connected() {
+	echo "online" > /var/run/mwan3track/$INTERFACE/STATUS
+	echo "0" > /var/run/mwan3track/$INTERFACE/OFFLINE
+	echo "$(get_uptime)" > /var/run/mwan3track/$INTERFACE/ONLINE
+	host_up_count=0
+	lost=0
+	turn=0
+	loss=0
+	[ "$1" == 1 ] && return
+	LOG notice "Interface $INTERFACE ($DEVICE) is online"
+	env -i ACTION="connected" INTERFACE="$INTERFACE" DEVICE="$DEVICE" /sbin/hotplug-call iface
+}
+
+firstconnect() {
+	if [ "$STATUS" = "offline" ]; then
+		disconnected 1
+	else
+		connected 1
+	fi
+}
+
+update_status() {
+	local status track_ip
+	track_ip=$1
+	status=$2
+
+	echo "$1" > /var/run/mwan3track/$INTERFACE/TRACK_${track_ip}
+	[ -z "$3" ] && return
+	echo "$3" > /var/run/mwan3track/$INTERFACE/LATENCY_${track_ip}
+	echo "$4" > /var/run/mwan3track/$INTERFACE/LOSS_${track_ip}
+}
+
 main() {
 	local reliability count timeout interval failure_interval
 	local recovery_interval down up size
@@ -70,64 +117,49 @@ main() {
 	DEVICE=$2
 	STATUS=$3
 	SRC_IP=$4
-	mkdir -p /var/run/mwan3track/$1
+	mkdir -p /var/run/mwan3track/$INTERFACE
 	trap clean_up TERM
 	trap if_down USR1
+	trap if_up USR2
 
 	config_load mwan3
-	config_get track_method $1 track_method ping
+	config_get track_method $INTERFACE track_method ping
-	config_get_bool httping_ssl $1 httping_ssl 0
+	config_get_bool httping_ssl $INTERFACE httping_ssl 0
 	validate_track_method $track_method $SRC_IP || {
 		track_method=ping
 		if validate_track_method $track_method; then
-			$LOG warn "Using ping to track interface $INTERFACE avaliability"
+			LOG warn "Using ping to track interface $INTERFACE avaliability"
 		else
-			$LOG err "No track method avaliable"
+			LOG err "No track method avaliable"
 			exit 1
 		fi
 	}
-	config_get reliability $1 reliability 1
+	config_get reliability $INTERFACE reliability 1
-	config_get count $1 count 1
+	config_get count $INTERFACE count 1
-	config_get timeout $1 timeout 4
+	config_get timeout $INTERFACE timeout 4
-	config_get interval $1 interval 10
+	config_get interval $INTERFACE interval 10
-	config_get down $1 down 5
+	config_get down $INTERFACE down 5
-	config_get up $1 up 5
+	config_get up $INTERFACE up 5
-	config_get size $1 size 56
+	config_get size $INTERFACE size 56
-	config_get max_ttl $1 max_ttl 60
+	config_get max_ttl $INTERFACE max_ttl 60
-	config_get failure_interval $1 failure_interval $interval
+	config_get failure_interval $INTERFACE failure_interval $interval
-	config_get_bool keep_failure_interval $1 keep_failure_interval 0
+	config_get_bool keep_failure_interval $INTERFACE keep_failure_interval 0
-	config_get recovery_interval $1 recovery_interval $interval
+	config_get recovery_interval $INTERFACE recovery_interval $interval
-	config_get_bool check_quality $1 check_quality 0
+	config_get_bool check_quality $INTERFACE check_quality 0
-	config_get failure_latency $1 failure_latency 1000
+	config_get failure_latency $INTERFACE failure_latency 1000
-	config_get recovery_latency $1 recovery_latency 500
+	config_get recovery_latency $INTERFACE recovery_latency 500
-	config_get failure_loss $1 failure_loss 40
+	config_get failure_loss $INTERFACE failure_loss 40
-	config_get recovery_loss $1 recovery_loss 10
+	config_get recovery_loss $INTERFACE recovery_loss 10
 
 	local score=$(($down+$up))
 	local track_ips=$(echo $* | cut -d ' ' -f 5-99)
 	local host_up_count=0
 	local lost=0
-	local sleep_time=0
 	local turn=0
-	local result
 	local ping_protocol=4
-	local ping_result
+	local sleep_time result ping_result ping_result_raw  ping_status loss latency
-	local ping_result_raw
-	local ping_status
-	local loss=0
-	local latency=0
 
-	if [ "$STATUS" = "offline" ]; then
+	firstconnect
-		echo "offline" > /var/run/mwan3track/$1/STATUS
-		echo "0" > /var/run/mwan3track/$1/ONLINE
-		echo "$(get_uptime)" > /var/run/mwan3track/$1/OFFLINE
-		score=0
-	else
-		echo "online" > /var/run/mwan3track/$1/STATUS
-		echo "0" > /var/run/mwan3track/$1/OFFLINE
-		echo "$(get_uptime)" > /var/run/mwan3track/$1/ONLINE
-		env -i ACTION="connected" INTERFACE="$1" DEVICE="$2" /sbin/hotplug-call iface
-	fi
 	while true; do
 
 		sleep_time=$interval
@@ -139,16 +171,16 @@ main() {
 						# pinging IPv6 hosts with an interface is troublesome
 						# https://bugs.openwrt.org/index.php?do=details&task_id=2897
 						# so get the IP address of the interface and use that instead
-						if echo $track_ip | grep -q ':'; then
+						if [ -z ${track_ip##*:*} ]; then
-						        ADDR=$(ip -6 addr ls dev "$DEVICE" | sed -ne '/\/128/d' -e 's/ *inet6 \([^ \/]*\).* scope global.*/\1/p' | head -n1)
-							[ -z "$ADDR" ] && ADDR=$(ip -6 addr ls dev "$DEVICE" | sed -ne 's/ *inet6 \([^ \/]*\).* scope global.*/\1/p')
 							ping_protocol=6
+						else
+							unset SRC_IP
 						fi
 						if [ $check_quality -eq 0 ]; then
-							$PING -$ping_protocol -I ${ADDR:-$DEVICE} -c $count -W $timeout -s $size -t $max_ttl -q $track_ip &> /dev/null
+							$PING -$ping_protocol -I ${SRC_IP:-$DEVICE} -c $count -W $timeout -s $size -t $max_ttl -q $track_ip &> /dev/null
 							result=$?
 						else
-							ping_result_raw="$($PING -$ping_protocol -I ${ADDR:-$DEVICE} -c $count -W $timeout -s $size -t $max_ttl -q $track_ip 2>/dev/null)"
+							ping_result_raw="$($PING -$ping_protocol -I ${SRC_IP:-$DEVICE} -c $count -W $timeout -s $size -t $max_ttl -q $track_ip 2>/dev/null)"
 							ping_status=$?
 							ping_result=$(echo "$ping_result_raw" | tail -n2)
 							loss="$(echo "$ping_result" | grep "packet loss" |  cut -d "," -f3 | awk '{print $1}' | sed -e 's/%//')"
@@ -188,42 +220,40 @@ main() {
 				if [ $check_quality -eq 0 ]; then
 					if [ $result -eq 0 ]; then
 						let host_up_count++
-						echo "up" > /var/run/mwan3track/$1/TRACK_${track_ip}
+						update_status "$track_ip" "up"
+
 						if [ $score -le $up ]; then
-							$LOG info "Check ($track_method) success for target \"$track_ip\" on interface $1 ($2)"
+							LOG info "Check ($track_method) success for target \"$track_ip\" on interface $INTERFACE ($DEVICE). Current score: $score"
 						fi
 					else
 						let lost++
-						echo "down" > /var/run/mwan3track/$1/TRACK_${track_ip}
+						update_status "$track_ip" "down"
+
 						if [ $score -gt $up ]; then
-							$LOG info "Check ($track_method) failed for target \"$track_ip\" on interface $1 ($2)"
+							LOG info "Check ($track_method) failed for target \"$track_ip\" on interface $INTERFACE ($DEVICE). Current score: $score"
 						fi
 					fi
 				else
 					if [ "$loss" -ge "$failure_loss" -o "$latency" -ge "$failure_latency" ]; then
 						let lost++
-						echo "down" > /var/run/mwan3track/$1/TRACK_${track_ip}
+						update_status "$track_ip" "down" $latency $loss
-						echo "$latency" > /var/run/mwan3track/$1/LATENCY_${track_ip}
-						echo "$loss" > /var/run/mwan3track/$1/LOSS_${track_ip}
 
 						if [ $score -gt $up ]; then
-							$LOG info "Check (${track_method}: latency=${latency}ms loss=${loss}%) failed for target \"$track_ip\" on interface $1 ($2)"
+							LOG info "Check (${track_method}: latency=${latency}ms loss=${loss}%) failed for target \"$track_ip\" on interface $INTERFACE ($DEVICE). Current score: $score"
 						fi
 					elif [ "$loss" -le "$recovery_loss" -a "$latency" -le "$recovery_latency" ]; then
 						let host_up_count++
-						echo "up" > /var/run/mwan3track/$1/TRACK_${track_ip}
+						update_status "$track_ip" "up" $latency $loss
-						echo "$latency" > /var/run/mwan3track/$1/LATENCY_${track_ip}
-						echo "$loss" > /var/run/mwan3track/$1/LOSS_${track_ip}
 
 						if [ $score -le $up ]; then
-							$LOG info "Check (${track_method}: latency=${latency}ms loss=${loss}%) success for target \"$track_ip\" on interface $1 ($2)"
+							LOG info "Check (${track_method}: latency=${latency}ms loss=${loss}%) success for target \"$track_ip\" on interface $INTERFACE ($DEVICE). Current score: $score"
 						fi
 					else
-						echo "skipped" > /var/run/mwan3track/$1/TRACK_${track_ip}
+						echo "skipped" > /var/run/mwan3track/$INTERFACE/TRACK_${track_ip}
 					fi
 				fi
 			else
-				echo "skipped" > /var/run/mwan3track/$1/TRACK_${track_ip}
+				echo "skipped" > /var/run/mwan3track/$INTERFACE/TRACK_${track_ip}
 			fi
 		done
 
@@ -240,53 +270,50 @@ main() {
 			fi
 
 			if [ $score -eq $up ]; then
-				echo "offline" > /var/run/mwan3track/$1/STATUS
+				disconnected
-				env -i ACTION=ifdown INTERFACE=$1 DEVICE=$2 /sbin/hotplug-call iface
 				score=0
 			fi
 		else
 			if [ $score -lt $(($down+$up)) ] && [ $lost -gt 0 ]; then
-				$LOG info "Lost $(($lost*$count)) ping(s) on interface $1 ($2)"
+				LOG info "Lost $(($lost*$count)) ping(s) on interface $INTERFACE ($DEVICE). Current score: $score"
 			fi
 
 			let score++
 			lost=0
 
 			if [ $score -gt $up ]; then
-				echo "online" > /var/run/mwan3track/$1/STATUS
+				echo "online" > /var/run/mwan3track/$INTERFACE/STATUS
 				score=$(($down+$up))
 			elif [ $score -le $up ]; then
 				sleep_time=$recovery_interval
 			fi
 
 			if [ $score -eq $up ]; then
-				$LOG notice "Interface $1 ($2) is online"
+				connected $INTERFACE $DEVICE
-				echo "online" > /var/run/mwan3track/$1/STATUS
-				env -i ACTION=ifup INTERFACE=$1 DEVICE=$2 /sbin/hotplug-call iface
-				exit 0
 			fi
 		fi
 
 		let turn++
 		mkdir -p "/var/run/mwan3track/${1}"
-		echo "${lost}" > /var/run/mwan3track/$1/LOST
+		echo "${lost}" > /var/run/mwan3track/$INTERFACE/LOST
-		echo "${score}" > /var/run/mwan3track/$1/SCORE
+		echo "${score}" > /var/run/mwan3track/$INTERFACE/SCORE
-		echo "${turn}" > /var/run/mwan3track/$1/TURN
+		echo "${turn}" > /var/run/mwan3track/$INTERFACE/TURN
-		echo "$(get_uptime)" > /var/run/mwan3track/$1/TIME
+		echo "$(get_uptime)" > /var/run/mwan3track/$INTERFACE/TIME
 
 		host_up_count=0
 		sleep "${sleep_time}" &
 		wait
 
 		if [ "${IFDOWN_EVENT}" -eq 1 ]; then
-			echo "offline" > /var/run/mwan3track/$1/STATUS
+			LOG debug "Register ifdown event on interface ${INTERFACE} (${DEVICE})"
-			echo "$(get_uptime)" > /var/run/mwan3track/$1/OFFLINE
+			disconnected 1
-			echo "0" > /var/run/mwan3track/$1/ONLINE
-			$LOG notice "Interface $1 ($2) is offline"
-			env -i ACTION="disconnected" INTERFACE="$1" DEVICE="$2" /sbin/hotplug-call iface
-			score=0
 			IFDOWN_EVENT=0
 		fi
+		if [ "${IFUP_EVENT}" -eq 1 ]; then
+			LOG debug "Register ifup event on interface ${INTERFACE} (${DEVICE})"
+			firstconnect
+			IFUP_EVENT=0
+		fi
 	done
 }