Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

[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 b629d32b71c16ba79f16b11efb917a3233b57357..8200c2d353a32373b26772b020a3f3797cb50e74 100644 (file)
--- a/src/initscripts/init.d/hostapd
+++ b/src/initscripts/init.d/hostapd
@@ -8,71 +8,71 @@ INTERFACE="blue0"
 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
+               if [ "$(/usr/sbin/iwconfig $INTERFACE | /bin/grep "Mode:Master")" == "" ]; then
+
+               boot_mesg "Setting wlan $INTERFACE to Master mode... "
 
                # Set Atheros Cards to master mode
+               if [ -d /proc/net/madwifi/ath0/ ]; then
+                       /usr/bin/wlanconfig ath0 destroy > /dev/null
+               fi
+
                /usr/bin/wlanconfig $INTERFACE destroy > /dev/null
-                /usr/bin/wlanconfig $INTERFACE create wlandev wifi0 wlanmode ap > /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
+               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 1;
                else
-                   /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 &
-                   evaluate_retval
-               fi
+                       # enable wlan module of collectd
+                       sed -i -e "s|#LoadPlugin wireless|LoadPlugin wireless|g" /etc/collectd.conf
 
-               # Bring blue up (but not at boot)
-               if [ "$(basename $0)" == "hostapd" ]; then
-                       
-                       if [ "$(INTERFACE)" == "blue0" ]; then
-                               /etc/rc.d/init.d/networking/blue start
-                       elif [ "$(INTERFACE)" == "green0" ]; then
-                               /etc/rc.d/init.d/networking/green start
-                       fi
-                       
-                       if [ -f /var/ipfire/dhcp/enable_blue || -f /var/ipfire/dhcp/enable_green ]; then
-                               /etc/rc.d/init.d/dhcp restart
-                       fi
+                       boot_mesg "Starting hostapd... "
+                       /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 &
+                       evaluate_retval
                fi
-;;
 
-        stop)
-               boot_mesg "Stopping hostapd..."
+               iwpriv $INTERFACE maccmd 3
+               if [ $MACMODE != 0 ]; then
+                       FILE="/var/ipfire/wlanap/macfile"
+                       exec < $FILE
+                       while read LINE
+                       do
+                               iwpriv $INTERFACE addmac $LINE
+                       done
 
-               # Set Atheros Card to managed mode
-                /usr/bin/wlanconfig $INTERFACE destroy > /dev/null
-                /usr/bin/wlanconfig $INTERFACE create wlandev wifi0 wlanmode sta > /dev/null
+                       iwpriv $INTERFACE maccmd $MACMODE
+               fi
+               ;;
 
-               # Set other cards to managed mode
-               #/usr/sbin/iwconfig blue0 mode Managed
+       stop)
+               boot_mesg "Stopping hostapd..."
 
-                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