X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=src%2Finitscripts%2Finit.d%2Fhostapd;h=ae1150ed661b7490c41396372260df7a3b92cdde;hp=95c82712072163ff12b2058f69f18b7899e569ba;hb=c485b9022614268d59b70db9db2b8cf3bcb3fe79;hpb=c2cd9391f52edb4fcd68b6d3d48c7619a333e371

diff --git a/src/initscripts/init.d/hostapd b/src/initscripts/init.d/hostapd
index 95c8271207..ae1150ed66 100644
--- a/src/initscripts/init.d/hostapd
+++ b/src/initscripts/init.d/hostapd
@@ -5,74 +5,119 @@
 CHANNEL="05"
 TXPOWER="auto"
 INTERFACE="blue0"
+MACMODE="0"
+
 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 Cards to master mode
-		/usr/bin/wlanconfig $INTERFACE destroy > /dev/null
-                /usr/bin/wlanconfig $INTERFACE create wlandev wifi0 wlanmode ap > /dev/null
+		boot_mesg "Starting hostapd... "
 
-		# Set other cards to master mode
-		#/usr/sbin/iwconfig blue0 mode master
+		# Check Interface configuration
+		if ! ip link show $INTERFACE > /dev/null 2>&1; then
+			boot_mesg "Interface $INTERFACE doesn't exist." ${FAILURE}
+			echo_failure
+			exit 0
+		fi
+		if [ "$(ip link show $INTERFACE | /bin/grep "ether")" == "" ]; then
+			boot_mesg "Interface $INTERFACE is assigned to wlan master device." ${FAILURE}
+			boot_mesg "Please reboot to fix this." ${FAILURE}
+			echo_failure
+			exit 0
+		fi
+		if [ "$(iwconfig $INTERFACE | /bin/grep "IEEE")" == "" ]; then
+			boot_mesg "Interface $INTERFACE is no wireless device." ${FAILURE}
+			echo_failure
+			exit 0
+		fi
 
-		if [ "$(/usr/sbin/iwconfig $INTERFACE | /bin/grep "Mode:Master")" == "" ]; then
-		    boot_mesg "Error! Can't set wlan master mode"
-		    echo_failure;
-		    exit 1;
+		# Detect driver
+		if [ -e "/sys/class/net/$INTERFACE/phy80211" ]; then
+			DRIVER="NL80211"
+			driver="nl80211"
+		elif [ -e "/sys/class/net/$INTERFACE/madwifi_name_type" ]; then
+			DRIVER="MADWIFI"
+			driver="madwifi"
 		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
+			boot_mesg "Interface $INTERFACE is a not supported wireless device." ${FAILURE}
+			echo_failure
+			exit 0
 		fi
 
-		# 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
+		echo driver=$driver > /etc/hostapd.conf.tmp
+		grep -v "^driver=" /etc/hostapd.conf >> /etc/hostapd.conf.tmp
+		mv /etc/hostapd.conf.tmp /etc/hostapd.conf
+
+		echo DRIVER=$DRIVER > /var/ipfire/wlanap/settings.tmp
+		grep -v "^DRIVER=" /var/ipfire/wlanap/settings >> /var/ipfire/wlanap/settings.tmp
+		chown nobody:nobody /var/ipfire/wlanap/settings.tmp
+		chmod 644 /var/ipfire/wlanap/settings.tmp
+		mv /var/ipfire/wlanap/settings.tmp /var/ipfire/wlanap/settings
+
+		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
-			
-			if [ -f /var/ipfire/dhcp/enable_blue || -f -f /var/ipfire/dhcp/enable_green ]; then
-				/etc/rc.d/init.d/dhcp restart
+		fi
+
+		/usr/sbin/iwconfig $INTERFACE channel $CHANNEL
+		/usr/sbin/iwconfig $INTERFACE txpower $TXPOWER
+
+		/usr/bin/hostapd -P /var/run/hostapd /etc/hostapd.conf >/dev/null 2>&1 &
+
+		sleep 2
+
+		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
 		fi
-;;
 
-        stop)
-		boot_mesg "Stopping hostapd..."
+		sleep 2
 
-		# Set Atheros Card to managed mode
-                /usr/bin/wlanconfig $INTERFACE destroy > /dev/null
-                /usr/bin/wlanconfig $INTERFACE create wlandev wifi0 wlanmode sta > /dev/null
+		if [ "$(/usr/sbin/iwconfig $INTERFACE | /bin/grep "Mode:Master")" == "" ]; then
+			boot_mesg "Error! Can't set wlan master mode"
+			echo_failure;
+			exit 0;
+		else
+			# enable wlan module of collectd
+			sed -i -e "s|#LoadPlugin wireless|LoadPlugin wireless|g" /etc/collectd.conf
+			echo_ok
+		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