Add NL80211 driver config to wlanap.cgi

[people/pmueller/ipfire-2.x.git] / src / initscripts / init.d / hostapd

diff --git a/src/initscripts/init.d/hostapd b/src/initscripts/init.d/hostapd
index 5fdb7057b213b64819af0a741cbc0ddd824fb8e1..aa5e13d37a092d16d973d33228d7a81530a95c08 100644 (file)
--- a/src/initscripts/init.d/hostapd
+++ b/src/initscripts/init.d/hostapd
@@ -5,124 +5,78 @@
 CHANNEL="05"
 TXPOWER="auto"
 INTERFACE="blue0"
-eval $(/usr/local/bin/readhash /var/ipfire/wlanpap/settings)
+MACMODE="0"
+DRIVER="MADWIFI"
+
+eval $(/usr/local/bin/readhash /var/ipfire/wlanap/settings)
 
 case "${1}" in
-        start)
-               boot_mesg "Starting hostapd... "
+       start)
                mkdir -p /var/run/hostapd
-               # enable wlan module of collectd
-               sed -i -e "s|#LoadPlugin wireless|LoadPlugin wireless|g" /etc/collectd.conf
-
-               # Set Atheros Card to master mode
-                /usr/bin/wlanconfig $INTERFACE destroy > /dev/null
-                /usr/bin/wlanconfig $INTERFACE create wlandev wifi0 wlanmode ap > /dev/null
-
-               # Set other cards to master mode
-               #/usr/sbin/iwconfig blue0 mode master
 
-               if [ "$(/usr/sbin/iwconfig $INTERFACE | /bin/grep "Mode:Master")" == "" ]; then
-                   boot_mesg "Error! Can't set wlan master mode"
-                   echo_failure;
-                   exit 1;
-               else
-                   /usr/sbin/iwconfig $INTERFACE channel $CHANNEL
-                   /usr/sbin/iwconfig $INTERFACE channel $TXPOWER
-                   /usr/bin/hostapd -P /var/run/hostapd /etc/hostapd.conf </dev/tty12 >/dev/tty12 2>&1 &
-                   evaluate_retval
+               if [ "$DRIVER" == "MADWIFI" ]; then
+                       if [ "$(/usr/sbin/iwconfig $INTERFACE | /bin/grep "Mode:Master")" == "" ]; then
+                               boot_mesg "Setting MADWIFI wlan $INTERFACE to Master mode... "
+                               # Set Atheros Cards to master mode
+                               /usr/bin/wlanconfig $INTERFACE destroy > /dev/null
+                               /usr/bin/wlanconfig $INTERFACE create wlandev wifi0 wlanmode ap > /dev/null
+                       fi
                fi
-                ;;
-
-        stop)
-               boot_mesg "Stopping hostapd..."
-
-               # Set Atheros Card to Managed mode
-                /usr/bin/wlanconfig $INTERFACE destroy > /dev/null
-                /usr/bin/wlanconfig #!/bin/sh
-. /etc/sysconfig/rc
-. ${rc_functions}
-
-CHANNEL="05"
-TXPOWER="auto"
-INTERFACE="blue0"
-eval $(/usr/local/bin/readhash /var/ipfire/wlanpap/settings)
 
-case "${1}" in
-        start)
                boot_mesg "Starting hostapd... "
-               mkdir -p /var/run/hostapd
-               # enable wlan module of collectd
-               sed -i -e "s|#LoadPlugin wireless|LoadPlugin wireless|g" /etc/collectd.conf
-
-               # Set Atheros Card to master mode
-                /usr/bin/wlanconfig $INTERFACE destroy > /dev/null
-                /usr/bin/wlanconfig $INTERFACE create wlandev wifi0 wlanmode ap > /dev/null
-
-               # Set other cards to master mode
-               #/usr/sbin/iwconfig blue0 mode master
+               /usr/sbin/iwconfig $INTERFACE channel $CHANNEL
+               /usr/sbin/iwconfig $INTERFACE txpower $TXPOWER
+               /usr/bin/hostapd -P /var/run/hostapd /etc/hostapd.conf </dev/tty12 >/dev/tty12 2>&1 &
+
+               if [ $DRIVER == "MADWIFI" ]; then
+
+                       iwpriv $INTERFACE maccmd 3
+                       if [ $MACMODE != 0 ]; then
+                               FILE="/var/ipfire/wlanap/macfile"
+                               exec < $FILE
+                               while read LINE
+                               do
+                                       iwpriv $INTERFACE addmac $LINE
+                               done
+
+                               iwpriv $INTERFACE maccmd $MACMODE
+                       fi
+                       # Disable background scann
+                       iwpriv $INTERFACE bgscan 0
+                       # Set beacon interval to 500
+                       iwpriv $INTERFACE bintval 500
+               fi
 
                if [ "$(/usr/sbin/iwconfig $INTERFACE | /bin/grep "Mode:Master")" == "" ]; then
-                   boot_mesg "Error! Can't set wlan master mode"
-                   echo_failure;
-                   exit 1;
+                       boot_mesg "Error! Can't set wlan master mode"
+                       echo_failure;
+                       exit 0;
                else
-                   /usr/sbin/iwconfig $INTERFACE channel $CHANNEL
-                   /usr/sbin/iwconfig $INTERFACE channel $TXPOWER
-                   /usr/bin/hostapd -P /var/run/hostapd /etc/hostapd.conf </dev/tty12 >/dev/tty12 2>&1 &
-                   evaluate_retval
+                       # enable wlan module of collectd
+                       sed -i -e "s|#LoadPlugin wireless|LoadPlugin wireless|g" /etc/collectd.conf
+                       echo_ok
                fi
-                ;;
+               ;;
 
-        stop)
+       stop)
                boot_mesg "Stopping hostapd..."
 
-               # Set Atheros Card to Managed mode
-                /usr/bin/wlanconfig $INTERFACE destroy > /dev/null
-                /usr/bin/wlanconfig $INTERFACE create wlandev wifi0 wlanmode sta > /dev/null
-
-               # Set other cards to master mode
-               #/usr/sbin/iwconfig blue0 mode Managed
-
-                killproc /usr/bin/hostapd
-                evaluate_retval
-                ;;
-
-        restart)
-                ${0} stop
-                sleep 1
-                ${0} start
-                ;;
-
-        status)
-                statusproc /usr/bin/hostapd
-                ;;
-
-        *)
-                echo "Usage: ${0} {start|stop|restart|status}"
-                exit 1
-                ;;
-esac
- create wlandev wifi0 wlanmode sta > /dev/null
-
-               # Set other cards to master mode
-               #/usr/sbin/iwconfig blue0 mode Managed
-
-                killproc /usr/bin/hostapd
-                evaluate_retval
-                ;;
+               killproc /usr/bin/hostapd
+               evaluate_retval
+               ;;
 
-        restart)
-                ${0} stop
-                sleep 1
-                ${0} start
-                ;;
+       restart)
+               ${0} stop
+               sleep 1
+               ${0} start
+               ;;
 
-        status)
-                statusproc /usr/bin/hostapd
-                ;;
+       status)
+               statusproc /usr/bin/hostapd
+               ;;
 
-        *)
-                echo "Usage: ${0} {start|stop|restart|status}"
-                exit 1
-                ;;
+       *)
+               echo "Usage: ${0} {start|stop|restart|status}"
+               exit 1
+               ;;
 esac