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

Merge pull request #154 from proger/which-hostapd

Browse Source 
Try to detect hostapd early to prevent passing zero arguments to strings
This commit is contained in:
oblique
2016-04-13 14:10:53 +03:00
parent 08dd2a9792 0b87fde89c
commit b9f07ecc57
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
create_ap
View File

@ -1292,8 +1292,15 @@ if ! can_be_sta_and_ap ${WIFI_IFACE}; then
fi fi
fi fi
HOSTAPD=$(which hostapd)
if ! -x "$HOSTAPD"; then
echo "ERROR: hostapd not found." >&2
exit 1
fi
if [[ $(get_adapter_kernel_module ${WIFI_IFACE}) =~ ^(8192[cd][ue]|8723a[sue])$ ]]; then if [[ $(get_adapter_kernel_module ${WIFI_IFACE}) =~ ^(8192[cd][ue]|8723a[sue])$ ]]; then
if ! strings $(which hostapd) | grep -m1 rtl871xdrv > /dev/null 2>&1; then if ! strings "$HOSTAPD" | grep -m1 rtl871xdrv > /dev/null 2>&1; then
echo "ERROR: You need to patch your hostapd with rtl871xdrv patches." >&2 echo "ERROR: You need to patch your hostapd with rtl871xdrv patches." >&2
exit 1 exit 1
fi fi
@ -1773,7 +1780,7 @@ if [[ $NO_HAVEGED -eq 0 ]]; then
fi fi
# start hostapd (use stdbuf for no delayed output in programs that redirect stdout) # start hostapd (use stdbuf for no delayed output in programs that redirect stdout)
stdbuf -oL hostapd $HOSTAPD_DEBUG_ARGS $CONFDIR/hostapd.conf & stdbuf -oL $HOSTAPD $HOSTAPD_DEBUG_ARGS $CONFDIR/hostapd.conf &
HOSTAPD_PID=$! HOSTAPD_PID=$!
echo $HOSTAPD_PID > $CONFDIR/hostapd.pid echo $HOSTAPD_PID > $CONFDIR/hostapd.pid