mirror of
https://github.com/novatiq/packages.git
synced 2026-04-30 15:38:40 +01:00
mwan3: use procd for mwan3rtmon and mwan3track
start all mwan3mon and mwan3track instances on mwan3 start if an interface is down when mwan3track starts, it waits for a signal from the hotplug script to start procd can then handle stopping all of the scripts when mwan3 is halted Signed-off-by: Aaron Goodman <aaronjg@stanford.edu>
This commit is contained in:
Aaron Goodman
@@ -9,6 +9,8 @@
|
||||
SCRIPTNAME="mwan3-hotplug"
|
||||
[ "$ACTION" = "ifup" ] || [ "$ACTION" = "ifdown" ] || [ "$ACTION" = "connected" ] || [ "$ACTION" = "disconnected" ] || exit 1
|
||||
[ -n "$INTERFACE" ] || exit 2
|
||||
[ "$FIRSTCONNECT" = "1" ] || [ "$MWAN3_SHUTDOWN" = "1" ] && exit 0
|
||||
|
||||
if { [ "$ACTION" = "ifup" ] || [ "$ACTION" = "connected" ] ; } && [ -z "$DEVICE" ]; then
|
||||
LOG notice "$ACTION called on $INTERFACE with no device set"
|
||||
exit 3
|
||||
@@ -17,10 +19,9 @@ fi
|
||||
[ "$MWAN3_STARTUP" = 1 ] || mwan3_lock "$ACTION" "$INTERFACE"
|
||||
|
||||
config_load mwan3
|
||||
config_get_bool enabled globals 'enabled' '0'
|
||||
[ "${enabled}" -gt 0 ] || {
|
||||
/etc/init.d/mwan3 running || {
|
||||
[ "$MWAN3_STARTUP" = 1 ] || mwan3_unlock "$ACTION" "$INTERFACE"
|
||||
LOG notice "mwan3 hotplug on $INTERFACE not called because globally disabled"
|
||||
LOG notice "mwan3 hotplug $ACTION on $INTERFACE not called because globally disabled"
|
||||
mwan3_flush_conntrack "$INTERFACE" "$ACTION"
|
||||
exit 0
|
||||
}
|
||||
@@ -41,7 +42,6 @@ if [ "$MWAN3_STARTUP" != 1 ] && [ "$ACTION" = "ifup" ]; 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_STARTUP" = 1 ] || mwan3_unlock "$ACTION" "$INTERFACE"
|
||||
@@ -49,53 +49,47 @@ config_get_bool enabled $INTERFACE 'enabled' '0'
|
||||
exit 0
|
||||
}
|
||||
|
||||
trackpid=$(pgrep -f "mwan3track $INTERFACE ")
|
||||
|
||||
config_get initial_state $INTERFACE initial_state "online"
|
||||
if [ "$initial_state" = "offline" ]; then
|
||||
status=$(cat $MWAN3TRACK_STATUS_DIR/$INTERFACE/STATUS 2>/dev/null || echo unknown)
|
||||
[ "$status" = "online" ] || status=offline
|
||||
else
|
||||
status=online
|
||||
fi
|
||||
|
||||
[ -z "$TRUE_INTERFACE" ] && mwan3_get_true_iface TRUE_INTERFACE $INTERFACE
|
||||
|
||||
binary_status=$status
|
||||
[ "$binary_status" = "online" ] || binary_status=offline
|
||||
if [ "$ACTION" = ifup ] || [ "$ACTION" = ifdown ]; then
|
||||
initscript=/etc/init.d/mwan3
|
||||
. /lib/functions/procd.sh
|
||||
fi
|
||||
|
||||
LOG notice "Execute $ACTION event on interface $INTERFACE (${DEVICE:-unknown})"
|
||||
|
||||
case "$ACTION" in
|
||||
ifup|connected)
|
||||
connected)
|
||||
mwan3_set_iface_hotplug_state $INTERFACE "online"
|
||||
mwan3_set_policies_iptables
|
||||
;;
|
||||
ifup)
|
||||
mwan3_create_iface_iptables $INTERFACE $DEVICE
|
||||
mwan3_create_iface_rules $INTERFACE $DEVICE
|
||||
[ "$MWAN3_STARTUP" != 1 ] && mwan3_create_iface_route $INTERFACE $DEVICE
|
||||
mwan3_set_iface_hotplug_state $INTERFACE "$binary_status"
|
||||
|
||||
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
|
||||
mwan3_track $INTERFACE $DEVICE "$binary_status" "$src_ip"
|
||||
LOG notice "Started tracker [$!] on interface $INTERFACE (${DEVICE:-unknown})"
|
||||
mwan3_set_iface_hotplug_state $INTERFACE "$status"
|
||||
if [ "$MWAN3_STARTUP" != 1 ]; then
|
||||
mwan3_create_iface_route $INTERFACE $DEVICE
|
||||
[ "$status" = "online" ] && mwan3_set_policies_iptables
|
||||
fi
|
||||
[ "$MWAN3_STARTUP" != 1 ] && [ "$binary_status" == "online" ] && mwan3_set_policies_iptables
|
||||
|
||||
;;
|
||||
ifdown|disconnected)
|
||||
[ "$ACTION" = ifup ] && procd_running mwan3 "track_$INTERFACE" && procd_send_signal mwan3 "track_$INTERFACE" USR2
|
||||
;;
|
||||
disconnected)
|
||||
mwan3_set_iface_hotplug_state $INTERFACE "offline"
|
||||
mwan3_set_policies_iptables
|
||||
;;
|
||||
ifdown)
|
||||
mwan3_set_iface_hotplug_state $INTERFACE "offline"
|
||||
mwan3_delete_iface_ipset_entries $INTERFACE
|
||||
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
|
||||
procd_running mwan3 "track_$INTERFACE" && procd_send_signal mwan3 "track_$INTERFACE" USR1
|
||||
mwan3_set_policies_iptables
|
||||
;;
|
||||
esac
|
||||
|
||||
@@ -4,22 +4,22 @@
|
||||
. /lib/functions.sh
|
||||
. /lib/mwan3/mwan3.sh
|
||||
|
||||
[ "$MWAN3_STARTUP" = 1 ] || mwan3_lock "$ACTION" "$DEVICE-user"
|
||||
[ "$MWAN3_SHUTDOWN" != 1 ] && mwan3_lock "$ACTION" "$DEVICE-user"
|
||||
|
||||
config_load mwan3
|
||||
config_get_bool enabled globals 'enabled' '0'
|
||||
[ "${enabled}" -gt 0 ] || {
|
||||
[ "$MWAN3_STARTUP" = 1 ] || mwan3_unlock "$ACTION" "$DEVICE-user"
|
||||
[ "$MWAN3_SHUTDOWN" != 1 ] && ! /etc/init.d/mwan3 running && {
|
||||
mwan3_unlock "$ACTION" "$DEVICE-user"
|
||||
exit 0
|
||||
}
|
||||
|
||||
config_load mwan3
|
||||
|
||||
config_get_bool enabled "$INTERFACE" enabled 0
|
||||
[ "${enabled}" -eq 1 ] || {
|
||||
[ "$MWAN3_STARTUP" = 1 ] || mwan3_unlock "$ACTION" "$DEVICE-user"
|
||||
[ "$MWAN3_SHUTDOWN" != 1 ] && mwan3_unlock "$ACTION" "$DEVICE-user"
|
||||
exit 0
|
||||
}
|
||||
|
||||
[ "$MWAN3_STARTUP" = 1 ] || mwan3_unlock "$ACTION" "$DEVICE-user"
|
||||
[ "$MWAN3_SHUTDOWN" != 1 ] && mwan3_unlock "$ACTION" "$DEVICE-user"
|
||||
|
||||
env -i ACTION="$ACTION" INTERFACE="$INTERFACE" DEVICE="$DEVICE" \
|
||||
/bin/sh /etc/mwan3.user
|
||||
|
||||
@@ -1,31 +1,114 @@
|
||||
#!/bin/sh /etc/rc.common
|
||||
|
||||
. /lib/functions.sh
|
||||
. /lib/mwan3/common.sh
|
||||
. /lib/functions/network.sh
|
||||
. /lib/mwan3/mwan3.sh
|
||||
|
||||
START=19
|
||||
USE_PROCD=1
|
||||
|
||||
boot() {
|
||||
. /lib/config/uci.sh
|
||||
# disabled until mwan3 start runs so hotplug scripts
|
||||
# do not start prematurely
|
||||
uci_toggle_state mwan3 globals enabled "0"
|
||||
rc_procd start_service
|
||||
service_running() {
|
||||
[ -d "$MWAN3_STATUS_DIR" ]
|
||||
}
|
||||
|
||||
# FIXME
|
||||
# fd 1000 is an inherited lock file descriptor for preventing concurrent
|
||||
# init script executions. Close it here to prevent the mwan3 daemon from
|
||||
# inheriting it further to avoid holding the lock indefinitely.
|
||||
start_tracker() {
|
||||
local enabled interface
|
||||
interface=$1
|
||||
config_get_bool enabled $interface 'enabled' '0'
|
||||
[ $enabled -eq 0 ] && return
|
||||
|
||||
reload_service() {
|
||||
/usr/sbin/mwan3 restart 1000>&-
|
||||
procd_open_instance "track_${1}"
|
||||
procd_set_param command /usr/sbin/mwan3track $interface
|
||||
procd_set_param respawn
|
||||
procd_close_instance
|
||||
}
|
||||
|
||||
start_service() {
|
||||
/usr/sbin/mwan3 start 1000>&-
|
||||
local enabled hotplug_pids
|
||||
|
||||
config_load mwan3
|
||||
mwan3_init
|
||||
config_foreach start_tracker interface
|
||||
|
||||
mwan3_lock "command" "mwan3"
|
||||
|
||||
mwan3_update_iface_to_table
|
||||
mwan3_set_connected_ipset
|
||||
mwan3_set_custom_ipset
|
||||
mwan3_set_general_rules
|
||||
mwan3_set_general_iptables
|
||||
config_foreach mwan3_ifup interface 1
|
||||
wait $hotplug_pids
|
||||
mwan3_set_policies_iptables
|
||||
mwan3_set_user_rules
|
||||
|
||||
mwan3_unlock "command" "mwan3"
|
||||
|
||||
procd_open_instance rtmon_ipv4
|
||||
procd_set_param command /usr/sbin/mwan3rtmon ipv4
|
||||
procd_set_param respawn
|
||||
procd_close_instance
|
||||
|
||||
if command -v ip6tables > /dev/null; then
|
||||
procd_open_instance rtmon_ipv6
|
||||
procd_set_param command /usr/sbin/mwan3rtmon ipv6
|
||||
procd_set_param respawn
|
||||
procd_close_instance
|
||||
fi
|
||||
}
|
||||
|
||||
stop_service() {
|
||||
/usr/sbin/mwan3 stop 1000>&-
|
||||
local ipset rule IP IPTR IPT family table tid
|
||||
|
||||
mwan3_lock "command" "mwan3"
|
||||
|
||||
config_load mwan3
|
||||
mwan3_init
|
||||
config_foreach mwan3_interface_shutdown interface
|
||||
|
||||
for family in ipv4 ipv6; do
|
||||
if [ "$family" = "ipv4" ]; then
|
||||
IPT="$IPT4"
|
||||
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 | grep -E '^[1-3][0-9]{3}\:' | cut -d ':' -f 1); do
|
||||
$IP rule del pref $rule &> /dev/null
|
||||
done
|
||||
table="$($IPT -S)"
|
||||
{
|
||||
echo "*mangle";
|
||||
[ -z "${table##*PREROUTING -j mwan3_hook*}" ] && echo "-D PREROUTING -j mwan3_hook"
|
||||
[ -z "${table##*OUTPUT -j mwan3_hook*}" ] && echo "-D OUTPUT -j mwan3_hook"
|
||||
echo "$table" | awk '{print "-F "$2}' | grep mwan3 | sort -u
|
||||
echo "$table" | awk '{print "-X "$2}' | grep mwan3 | sort -u
|
||||
echo "COMMIT"
|
||||
} | $IPTR
|
||||
done
|
||||
|
||||
for ipset in $($IPS -n list | grep mwan3_); do
|
||||
$IPS -q destroy $ipset
|
||||
done
|
||||
|
||||
for ipset in $($IPS -n list | grep mwan3 | grep -E '_v4|_v6'); do
|
||||
$IPS -q destroy $ipset
|
||||
done
|
||||
|
||||
rm -rf $MWAN3_STATUS_DIR $MWAN3TRACK_STATUS_DIR
|
||||
|
||||
mwan3_unlock "command" "mwan3"
|
||||
}
|
||||
|
||||
service_triggers() {
|
||||
|
||||
Reference in New Issue
Block a user