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

Show virtual interface in `--list-running'

Browse Source
This commit is contained in:
oblique 2015-06-09 22:16:11 +03:00
parent c04cce072c
commit 33ed352b5c
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
create_ap
View File

@ -766,7 +766,7 @@ list_running_conf() {
local x local x
mutex_lock mutex_lock
for x in /tmp/create_ap.*; do for x in /tmp/create_ap.*; do
if [[ -f $x/pid && -d /proc/$(cat $x/pid) ]]; then if [[ -f $x/pid && -f $x/wifi_iface && -d /proc/$(cat $x/pid) ]]; then
echo $x echo $x
fi fi
done done
@ -774,12 +774,18 @@ list_running_conf() {
} }
list_running() { list_running() {
local IFACE x local IFACE wifi_iface x
mutex_lock mutex_lock
for x in $(list_running_conf); do for x in $(list_running_conf); do
IFACE=${x#*.} IFACE=${x#*.}
IFACE=${IFACE%%.*} IFACE=${IFACE%%.*}
echo $(cat $x/pid) $IFACE wifi_iface=$(cat $x/wifi_iface)
if [[ $IFACE == $wifi_iface ]]; then
echo $(cat $x/pid) $IFACE
else
echo $(cat $x/pid) $IFACE '('$(cat $x/wifi_iface)')'
fi
done done
mutex_unlock mutex_unlock
} }
@ -892,7 +898,7 @@ send_stop() {
fi fi
# send stop signal to specific interface # send stop signal to specific interface
for x in $(list_running | grep -E " ${1}\$" | cut -f1 -d' '); do for x in $(list_running | grep -E " \(?${1}( |\)?\$)" | cut -f1 -d' '); do
kill -USR1 $x kill -USR1 $x
done done
mutex_unlock mutex_unlock
@ -1435,6 +1441,11 @@ else
OLD_MACADDR=$(get_macaddr ${WIFI_IFACE}) OLD_MACADDR=$(get_macaddr ${WIFI_IFACE})
fi fi
mutex_lock
echo $WIFI_IFACE > $CONFDIR/wifi_iface
chmod 444 $CONFDIR/wifi_iface
mutex_unlock
can_transmit_to_channel ${WIFI_IFACE} ${CHANNEL} || die "Your adapter can not transmit to channel ${CHANNEL}, frequency band ${FREQ_BAND}GHz." can_transmit_to_channel ${WIFI_IFACE} ${CHANNEL} || die "Your adapter can not transmit to channel ${CHANNEL}, frequency band ${FREQ_BAND}GHz."
if networkmanager_is_running && ! networkmanager_iface_is_unmanaged ${WIFI_IFACE}; then if networkmanager_is_running && ! networkmanager_iface_is_unmanaged ${WIFI_IFACE}; then