X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=src%2Finitscripts%2Finit.d%2Fhostapd;h=02b8915f4d0e1ff1399ac0ec19ab79a740dbec54;hp=2d228b3037b35ff6320f3863cae7af4abb346285;hb=611607600f3ea9c953c96c342e5705e4656c0180;hpb=5f785e716cab32edb6cbc8d859bb6475e670f834

diff --git a/src/initscripts/init.d/hostapd b/src/initscripts/init.d/hostapd
index 2d228b3037..02b8915f4d 100644
--- a/src/initscripts/init.d/hostapd
+++ b/src/initscripts/init.d/hostapd
@@ -2,57 +2,122 @@
 . /etc/sysconfig/rc
 . ${rc_functions}
 
+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 Card to master mode
-                /usr/bin/wlanconfig blue0 destroy > /dev/null
-                /usr/bin/wlanconfig blue0 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 does'nt 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 blue0 | /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 blue0 channel 05
-		    /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
-                ;;
 
-        stop)
-		boot_mesg "Stopping hostapd..."
+		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
+		fi
 
-		# Set Atheros Card to Managed mode
-                /usr/bin/wlanconfig blue0 destroy > /dev/null
-                /usr/bin/wlanconfig blue0 create wlandev wifi0 wlanmode sta > /dev/null
+		/usr/sbin/iwconfig $INTERFACE channel $CHANNEL
+		/usr/sbin/iwconfig $INTERFACE txpower $TXPOWER
 
-		# Set other cards to master mode
-		#/usr/sbin/iwconfig blue0 mode Managed
+		/usr/bin/hostapd -P /var/run/hostapd /etc/hostapd.conf >/dev/null 2>&1 &
+
+		sleep 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
+		fi
+
+		sleep 1
+
+		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
+		;;
+
+	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