tangchao0503/create_ap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Send USR1 instead of INT in send_stop()

Browse Source 
If create_ap is not attached on a tty, then kill -INT does not
work. Use -USR1 instead.
This commit is contained in:
oblique
2014-12-14 15:23:44 +02:00
parent 1c89b44056
commit a1c6c411d3
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
create_ap
View File

@ -428,6 +428,7 @@ ROUTE_ADDRS=
cleanup() { cleanup() {
trap "" SIGINT trap "" SIGINT
trap "" SIGUSR1
echo echo
echo "Doing cleanup..." echo "Doing cleanup..."
@ -539,18 +540,21 @@ is_running_pid() {
} }
send_stop() { send_stop() {
# send stop signal to specific pid
if is_running_pid $1; then if is_running_pid $1; then
kill -INT $1 kill -USR1 $1
return return
fi fi
for x in /tmp/create_ap.$1.conf.*; do # send stop signal to specific interface
[[ -f $x/pid ]] && kill -INT $(cat $x/pid) for x in $(list_running | grep -E " ${1}\$" | cut -f1 -d' '); do
kill -USR1 $x
done done
} }
# if the user press ctrl+c then execute die() # if the user press ctrl+c then execute die()
trap "die" SIGINT trap "die" SIGINT
trap "die" SIGUSR1
ARGS=$(getopt -o hc:w:g:dnm: -l "help","hidden","ieee80211n","ht_capab:","driver:","no-virt","fix-unmanaged","country:","freq-band:","mac:","stop:","list" -n $(basename $0) -- "$@") ARGS=$(getopt -o hc:w:g:dnm: -l "help","hidden","ieee80211n","ht_capab:","driver:","no-virt","fix-unmanaged","country:","freq-band:","mac:","stop:","list" -n $(basename $0) -- "$@")
[[ $? -ne 0 ]] && exit 1 [[ $? -ne 0 ]] && exit 1
@ -1070,6 +1074,7 @@ echo "hostapd command-line interface: hostapd_cli -p $CONFDIR/hostapd_ctrl"
# from now on we exit with 0 on SIGINT # from now on we exit with 0 on SIGINT
trap "clean_exit" SIGINT trap "clean_exit" SIGINT
trap "clean_exit" SIGUSR1
hostapd $CONFDIR/hostapd.conf & hostapd $CONFDIR/hostapd.conf &
HOSTAPD_PID=$! HOSTAPD_PID=$!