cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 15:38:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

net/mwan3: fix mwan3track kill execution

Browse Source 
If two interface have the same prefix "wan" for example "wan" and "wan1"
pgrep returns the PID for wan1 also "pgrep -f mwan3track wan".

Before this fix "wan1" was also killed! This is not what we want.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
This commit is contained in:
Florian Eckert
2017-07-31 11:46:21 +02:00
parent 487278dcd1
commit 0b44ca505b
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/mwan3/files/lib/mwan3/mwan3.sh
+3 -3
View File
@@ -449,7 +449,7 @@ mwan3_track()
} }
config_list_foreach $1 track_ip mwan3_list_track_ips config_list_foreach $1 track_ip mwan3_list_track_ips
kill $(pgrep -f "mwan3track $1") &> /dev/null kill $(pgrep -f "mwan3track $1 $2") &> /dev/null
if [ -n "$track_ips" ]; then if [ -n "$track_ips" ]; then
[ -x /usr/sbin/mwan3track ] && /usr/sbin/mwan3track "$1" "$2" "$3" $track_ips & [ -x /usr/sbin/mwan3track ] && /usr/sbin/mwan3track "$1" "$2" "$3" $track_ips &
fi fi
@@ -459,7 +459,7 @@ mwan3_track_signal()
{ {
local pid local pid
pid="$(pgrep -f "mwan3track $1")" pid="$(pgrep -f "mwan3track $1 $2")"
if [ "${pid}" != "" ]; then if [ "${pid}" != "" ]; then
kill -USR1 "${pid}" kill -USR1 "${pid}"
else else
@@ -789,7 +789,7 @@ mwan3_report_iface_status()
config_list_foreach $1 track_ip mwan3_list_track_ips config_list_foreach $1 track_ip mwan3_list_track_ips
if [ -n "$track_ips" ]; then if [ -n "$track_ips" ]; then
if [ -n "$(pgrep -f "mwan3track $1")" ]; then if [ -n "$(pgrep -f "mwan3track $1 $device")" ]; then
tracking="active" tracking="active"
else else
tracking="down" tracking="down"
net/mwan3/files/usr/libexec/rpcd/mwan3
+5 -2
View File
@@ -1,6 +1,7 @@
#!/bin/sh #!/bin/sh
. /lib/functions.sh . /lib/functions.sh
. /lib/functions/network.sh
. /usr/share/libubox/jshn.sh . /usr/share/libubox/jshn.sh
MWAN3_STATUS_DIR="/var/run/mwan3track" MWAN3_STATUS_DIR="/var/run/mwan3track"
@@ -34,10 +35,12 @@ get_mwan3_status() {
local iface="${1}" local iface="${1}"
local iface_select="${2}" local iface_select="${2}"
local running="0" local running="0"
local pid local pid device
network_get_device device $1
if [ "${iface}" = "${iface_select}" ] || [ "${iface_select}" = "" ]; then if [ "${iface}" = "${iface_select}" ] || [ "${iface_select}" = "" ]; then
pid="$(pgrep -f "mwan3track $iface")" pid="$(pgrep -f "mwan3track $iface $device")"
if [ "${pid}" != "" ]; then if [ "${pid}" != "" ]; then
running="1" running="1"
fi fi
net/mwan3/files/usr/sbin/mwan3
+1 -1
View File
@@ -36,7 +36,7 @@ ifdown()
ACTION=ifdown INTERFACE=$1 /sbin/hotplug-call iface ACTION=ifdown INTERFACE=$1 /sbin/hotplug-call iface
kill $(pgrep -f "mwan3track $1") &> /dev/null kill $(pgrep -f "mwan3track $1 $2") &> /dev/null
} }
ifup() ifup()
net/mwan3/files/usr/sbin/mwan3track
+1 -1
View File
@@ -10,7 +10,7 @@ IFDOWN_EVENT=0
clean_up() { clean_up() {
$LOG notice "Stopping mwan3track for interface \"${INTERFACE}\"" $LOG notice "Stopping mwan3track for interface \"${INTERFACE}\""
if [ "$(pgrep -f "mwan3track ${INTERFACE}")" = "" ]; then if [ "$(pgrep -f "mwan3track ${INTERFACE} ${DEVICE}")" = "" ]; then
rm -rf "/var/run/mwan3track/${INTERFACE}" &> /dev/null rm -rf "/var/run/mwan3track/${INTERFACE}" &> /dev/null
fi fi
if [ -z "$(ls -A "/var/run/mwan3track")" ]; then if [ -z "$(ls -A "/var/run/mwan3track")" ]; then