mirror of
https://github.com/novatiq/packages.git
synced 2026-04-30 07:28:39 +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
@@ -5,8 +5,13 @@ get_uptime() {
|
||||
echo "${uptime%%.*}"
|
||||
}
|
||||
|
||||
IP4="ip -4"
|
||||
IP6="ip -6"
|
||||
SCRIPTNAME="$(basename "$0")"
|
||||
MWAN3TRACK_STATUS_DIR="/var/run/mwan3track"
|
||||
|
||||
MAX_SLEEP=$(((1<<31)-1))
|
||||
|
||||
LOG()
|
||||
{
|
||||
local facility=$1; shift
|
||||
@@ -16,3 +21,132 @@ LOG()
|
||||
[ "$facility" = "debug" ] && return
|
||||
logger -t "${SCRIPTNAME}[$$]" -p $facility "$*"
|
||||
}
|
||||
mwan3_get_src_ip()
|
||||
{
|
||||
local family _src_ip true_iface device addr_cmd default_ip IP sed_str
|
||||
true_iface=$2
|
||||
unset "$1"
|
||||
config_get family "$true_iface" family ipv4
|
||||
if [ "$family" = "ipv4" ]; then
|
||||
addr_cmd='network_get_ipaddr'
|
||||
default_ip="0.0.0.0"
|
||||
sed_str='s/ *inet \([^ \/]*\).*/\1/;T; pq'
|
||||
IP="$IP4"
|
||||
elif [ "$family" = "ipv6" ]; then
|
||||
addr_cmd='network_get_ipaddr6'
|
||||
default_ip="::"
|
||||
sed_str='s/ *inet6 \([^ \/]*\).* scope.*/\1/;T; pq'
|
||||
IP="$IP6"
|
||||
fi
|
||||
|
||||
$addr_cmd _src_ip "$true_iface"
|
||||
if [ -z "$_src_ip" ]; then
|
||||
network_get_device device $true_iface
|
||||
_src_ip=$($IP address ls dev $device 2>/dev/null | sed -ne "$sed_str")
|
||||
if [ -n "$_src_ip" ]; then
|
||||
LOG warn "no src $family address found from netifd for interface '$true_iface' dev '$device' guessing $_src_ip"
|
||||
else
|
||||
_src_ip="$default_ip"
|
||||
LOG warn "no src $family address found for interface '$true_iface' dev '$device'"
|
||||
fi
|
||||
fi
|
||||
export "$1=$_src_ip"
|
||||
}
|
||||
|
||||
mwan3_get_mwan3track_status()
|
||||
{
|
||||
local track_ips pid
|
||||
mwan3_list_track_ips()
|
||||
{
|
||||
track_ips="$1 $track_ips"
|
||||
}
|
||||
config_list_foreach "$1" track_ip mwan3_list_track_ips
|
||||
|
||||
if [ -n "$track_ips" ]; then
|
||||
pid="$(pgrep -f "mwan3track $1$")"
|
||||
if [ -n "$pid" ]; then
|
||||
if [ "$(cat /proc/"$(pgrep -P $pid)"/cmdline)" = "sleep${MAX_SLEEP}" ]; then
|
||||
tracking="paused"
|
||||
else
|
||||
tracking="active"
|
||||
fi
|
||||
else
|
||||
tracking="down"
|
||||
fi
|
||||
else
|
||||
tracking="not enabled"
|
||||
fi
|
||||
echo "$tracking"
|
||||
}
|
||||
|
||||
mwan3_init()
|
||||
{
|
||||
local bitcnt
|
||||
local mmdefault
|
||||
|
||||
[ -d $MWAN3_STATUS_DIR ] || mkdir -p $MWAN3_STATUS_DIR/iface_state
|
||||
|
||||
# mwan3's MARKing mask (at least 3 bits should be set)
|
||||
if [ -e "${MWAN3_STATUS_DIR}/mmx_mask" ]; then
|
||||
MMX_MASK=$(cat "${MWAN3_STATUS_DIR}/mmx_mask")
|
||||
MWAN3_INTERFACE_MAX=$(uci_get_state mwan3 globals iface_max)
|
||||
else
|
||||
config_load mwan3
|
||||
config_get MMX_MASK globals mmx_mask '0x3F00'
|
||||
echo "$MMX_MASK"| tr 'A-F' 'a-f' > "${MWAN3_STATUS_DIR}/mmx_mask"
|
||||
LOG debug "Using firewall mask ${MMX_MASK}"
|
||||
|
||||
bitcnt=$(mwan3_count_one_bits MMX_MASK)
|
||||
mmdefault=$(((1<<bitcnt)-1))
|
||||
MWAN3_INTERFACE_MAX=$((mmdefault-3))
|
||||
uci_toggle_state mwan3 globals iface_max "$MWAN3_INTERFACE_MAX"
|
||||
LOG debug "Max interface count is ${MWAN3_INTERFACE_MAX}"
|
||||
fi
|
||||
|
||||
# mark mask constants
|
||||
bitcnt=$(mwan3_count_one_bits MMX_MASK)
|
||||
mmdefault=$(((1<<bitcnt)-1))
|
||||
MM_BLACKHOLE=$((mmdefault-2))
|
||||
MM_UNREACHABLE=$((mmdefault-1))
|
||||
|
||||
# MMX_DEFAULT should equal MMX_MASK
|
||||
MMX_DEFAULT=$(mwan3_id2mask mmdefault MMX_MASK)
|
||||
MMX_BLACKHOLE=$(mwan3_id2mask MM_BLACKHOLE MMX_MASK)
|
||||
MMX_UNREACHABLE=$(mwan3_id2mask MM_UNREACHABLE MMX_MASK)
|
||||
}
|
||||
|
||||
# maps the 1st parameter so it only uses the bits allowed by the bitmask (2nd parameter)
|
||||
# which means spreading the bits of the 1st parameter to only use the bits that are set to 1 in the 2nd parameter
|
||||
# 0 0 0 0 0 1 0 1 (0x05) 1st parameter
|
||||
# 1 0 1 0 1 0 1 0 (0xAA) 2nd parameter
|
||||
# 1 0 1 result
|
||||
mwan3_id2mask()
|
||||
{
|
||||
local bit_msk bit_val result
|
||||
bit_val=0
|
||||
result=0
|
||||
for bit_msk in $(seq 0 31); do
|
||||
if [ $((($2>>bit_msk)&1)) = "1" ]; then
|
||||
if [ $((($1>>bit_val)&1)) = "1" ]; then
|
||||
result=$((result|(1<<bit_msk)))
|
||||
fi
|
||||
bit_val=$((bit_val+1))
|
||||
fi
|
||||
done
|
||||
printf "0x%x" $result
|
||||
}
|
||||
|
||||
# counts how many bits are set to 1
|
||||
# n&(n-1) clears the lowest bit set to 1
|
||||
mwan3_count_one_bits()
|
||||
{
|
||||
local count n
|
||||
count=0
|
||||
n=$(($1))
|
||||
while [ "$n" -gt "0" ]; do
|
||||
n=$((n&(n-1)))
|
||||
count=$((count+1))
|
||||
done
|
||||
echo $count
|
||||
}
|
||||
>>>>>>> 2a4e0dc6d... review comments
|
||||
|
||||
@@ -2,8 +2,6 @@
|
||||
|
||||
. /usr/share/libubox/jshn.sh
|
||||
|
||||
IP4="ip -4"
|
||||
IP6="ip -6"
|
||||
IPS="ipset"
|
||||
IPT4="iptables -t mangle -w"
|
||||
IPT6="ip6tables -t mangle -w"
|
||||
@@ -42,8 +40,7 @@ mwan3_push_update()
|
||||
# helper function to build an update string to pass on to
|
||||
# IPTR or IPS RESTORE. Modifies the 'update' variable in
|
||||
# the local scope.
|
||||
update="$update
|
||||
$*";
|
||||
update="$update"$'\n'"$*";
|
||||
}
|
||||
|
||||
mwan3_update_dev_to_table()
|
||||
@@ -198,22 +195,6 @@ mwan3_unlock() {
|
||||
lock -u /var/run/mwan3.lock
|
||||
}
|
||||
|
||||
mwan3_get_src_ip()
|
||||
{
|
||||
local family _src_ip true_iface
|
||||
true_iface=$2
|
||||
unset "$1"
|
||||
config_get family "$true_iface" family ipv4
|
||||
if [ "$family" = "ipv4" ]; then
|
||||
network_get_ipaddr _src_ip "$true_iface"
|
||||
[ -n "$_src_ip" ] || _src_ip="0.0.0.0"
|
||||
elif [ "$family" = "ipv6" ]; then
|
||||
network_get_ipaddr6 _src_ip "$true_iface"
|
||||
[ -n "$_src_ip" ] || _src_ip="::"
|
||||
fi
|
||||
export "$1=$_src_ip"
|
||||
}
|
||||
|
||||
mwan3_get_iface_id()
|
||||
{
|
||||
local _tmp
|
||||
@@ -643,39 +624,6 @@ mwan3_delete_iface_ipset_entries()
|
||||
done
|
||||
}
|
||||
|
||||
mwan3_rtmon()
|
||||
{
|
||||
local protocol
|
||||
for protocol in "ipv4" "ipv6"; do
|
||||
pid="$(pgrep -f "mwan3rtmon $protocol")"
|
||||
[ "$protocol" = "ipv6" ] && [ $NO_IPV6 -ne 0 ] && continue
|
||||
if [ "${pid}" = "" ]; then
|
||||
[ -x /usr/sbin/mwan3rtmon ] && /usr/sbin/mwan3rtmon $protocol &
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
mwan3_track()
|
||||
{
|
||||
local track_ips pids
|
||||
|
||||
mwan3_list_track_ips()
|
||||
{
|
||||
track_ips="$track_ips $1"
|
||||
}
|
||||
config_list_foreach "$1" track_ip mwan3_list_track_ips
|
||||
|
||||
# don't match device in case it changed from last launch
|
||||
if pids=$(pgrep -f "mwan3track $1 "); then
|
||||
kill -TERM $pids > /dev/null 2>&1
|
||||
sleep 1
|
||||
kill -KILL $(pgrep -f "mwan3track $1 ") > /dev/null 2>&1
|
||||
fi
|
||||
|
||||
if [ -n "$track_ips" ]; then
|
||||
[ -x /usr/sbin/mwan3track ] && MWAN3_STARTUP=0 /usr/sbin/mwan3track "$1" "$2" "$3" "$4" $track_ips &
|
||||
fi
|
||||
}
|
||||
|
||||
mwan3_set_policy()
|
||||
{
|
||||
@@ -1066,6 +1014,83 @@ mwan3_set_user_rules()
|
||||
|
||||
}
|
||||
|
||||
mwan3_interface_hotplug_shutdown()
|
||||
{
|
||||
local interface status device ifdown
|
||||
interface="$1"
|
||||
ifdown="$2"
|
||||
[ -f $MWAN3TRACK_STATUS_DIR/$interface/STATUS ] && {
|
||||
status=$(cat $MWAN3TRACK_STATUS_DIR/$interface/STATUS)
|
||||
}
|
||||
|
||||
[ "$status" != "online" ] && [ "$ifdown" != 1 ] && return
|
||||
|
||||
if [ "$ifdown" = 1 ]; then
|
||||
env -i ACTION=ifdown \
|
||||
INTERFACE=$interface \
|
||||
DEVICE=$device \
|
||||
sh /etc/hotplug.d/iface/15-mwan3
|
||||
else
|
||||
[ "$status" = "online" ] && {
|
||||
env -i MWAN3_SHUTDOWN="1" \
|
||||
ACTION="disconnected" \
|
||||
INTERFACE="$interface" \
|
||||
DEVICE="$device" /sbin/hotplug-call iface
|
||||
}
|
||||
fi
|
||||
|
||||
}
|
||||
|
||||
mwan3_interface_shutdown()
|
||||
{
|
||||
mwan3_interface_hotplug_shutdown $1
|
||||
mwan3_track_clean $1
|
||||
}
|
||||
|
||||
mwan3_ifup()
|
||||
{
|
||||
local up l3_device status interface true_iface mwan3_startup
|
||||
|
||||
interface=$1
|
||||
mwan3_startup=$2
|
||||
|
||||
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
|
||||
/etc/init.d/mwan3 running || {
|
||||
echo 'The service mwan3 is global disabled.'
|
||||
echo 'Please execute "/etc/init.d/mwan3 start" first.'
|
||||
exit 1
|
||||
}
|
||||
config_load mwan3
|
||||
fi
|
||||
mwan3_get_true_iface true_iface $interface
|
||||
status=$(ubus -S call network.interface.$true_iface status)
|
||||
|
||||
[ -n "$status" ] && {
|
||||
json_load "$status"
|
||||
json_get_vars up l3_device
|
||||
}
|
||||
hotplug_startup()
|
||||
{
|
||||
env -i MWAN3_STARTUP=$mwan3_startup ACTION=ifup \
|
||||
INTERFACE=$interface DEVICE=$l3_device \
|
||||
sh /etc/hotplug.d/iface/15-mwan3
|
||||
}
|
||||
|
||||
if [ "$up" != "1" ] || [ -z "$l3_device" ]; then
|
||||
return
|
||||
fi
|
||||
|
||||
if [ "${mwan3_startup}" = 1 ]; then
|
||||
hotplug_startup &
|
||||
hotplug_pids="$hotplug_pids $!"
|
||||
else
|
||||
hotplug_startup
|
||||
fi
|
||||
|
||||
}
|
||||
|
||||
mwan3_set_iface_hotplug_state() {
|
||||
local iface=$1
|
||||
local state=$2
|
||||
@@ -1081,7 +1106,7 @@ mwan3_get_iface_hotplug_state() {
|
||||
|
||||
mwan3_report_iface_status()
|
||||
{
|
||||
local device result track_ips tracking IP IPT
|
||||
local device result tracking IP IPT
|
||||
|
||||
mwan3_get_iface_id id "$1"
|
||||
network_get_device device "$1"
|
||||
@@ -1129,22 +1154,7 @@ mwan3_report_iface_status()
|
||||
result="disabled"
|
||||
fi
|
||||
|
||||
mwan3_list_track_ips()
|
||||
{
|
||||
track_ips="$1 $track_ips"
|
||||
}
|
||||
config_list_foreach "$1" track_ip mwan3_list_track_ips
|
||||
|
||||
if [ -n "$track_ips" ]; then
|
||||
if [ -n "$(pgrep -f "mwan3track $1 $device")" ]; then
|
||||
tracking="active"
|
||||
else
|
||||
tracking="down"
|
||||
fi
|
||||
else
|
||||
tracking="not enabled"
|
||||
fi
|
||||
|
||||
tracking="$(mwan3_get_mwan3track_status $1)"
|
||||
echo " interface $1 is $result and tracking is $tracking"
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user