]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
just with this init and config it is possivle to start via web
authorManiacikarus <maniacikarus@ipfire.org>
Sat, 16 Aug 2008 19:52:34 +0000 (21:52 +0200)
committerManiacikarus <maniacikarus@ipfire.org>
Sat, 16 Aug 2008 19:52:34 +0000 (21:52 +0200)
html/cgi-bin/wlanap.cgi
src/initscripts/init.d/hostapd

index 476abf471acb625630cc58ba479052d9f7c7cf50..fb613de56401acfd47ce1d166970dabf73be73dc 100644 (file)
@@ -309,14 +309,14 @@ END
 ;
 
 if ( $wlanapsettings{'DRIVER'} eq 'MADWIFI' ){
-        $status =  `cat /proc/net/madwifi/$netsettings{'BLUE_DEV'}/associated_sta`;
+        $status =  `wlanconfig $netsettings{'BLUE_DEV'} list`;
 }
 print <<END
 <br />
 <table width='95%' cellspacing='0'>
 <tr><td bgcolor='$color{'color20'}' colspan='2' align='left'><b>WLAN Status</b></td></tr>
 <tr><td><pre>@channellist_cmd</pre></td><td><pre>@txpower_cmd</pre></td></tr>
-<tr><td colspan='2'><pre>Connected Stations<br />$status</pre></td></tr>
+<tr><td colspan='2'><pre>$status</pre></td></tr>
 </table>
 END
 ;
@@ -335,7 +335,7 @@ sub WriteConfig_hostapd{
        open (CONFIGFILE, ">/var/ipfire/wlanap/hostapd.conf");
        print CONFIGFILE <<END
 ######################### basic hostapd configuration ##########################
-
+#
 interface=$netsettings{'BLUE_DEV'}
 driver=$wlanapsettings{'DRIVER_HOSTAPD'}
 logger_syslog=-1
@@ -343,9 +343,6 @@ logger_syslog_level=$wlanapsettings{'SYSLOGLEVEL'}
 logger_stdout=-1
 logger_stdout_level=$wlanapsettings{'DEBUG'}
 dump_file=/tmp/hostapd.dump
-eapol_key_index_workaround=0
-eap_server=0
-own_ip_addr=127.0.0.1
 auth_algs=3
 ctrl_interface=/var/run/hostapd
 ctrl_interface_group=0
@@ -371,20 +368,20 @@ END
  if ( $wlanapsettings{'ENC'} eq 'wpa1'){
        print CONFIGFILE <<END
 ######################### wpa hostapd configuration ############################
-
+#
 wpa=1
 wpa_passphrase=$wlanapsettings{'PWD'}
-wpa_key_mgmt=WPA-PSK WPA-EAP
+wpa_key_mgmt=WPA-PSK
 wpa_pairwise=CCMP TKIP
 END
 ;
  }elsif ( $wlanapsettings{'ENC'} eq 'wpa2'){
        print CONFIGFILE <<END
 ######################### wpa hostapd configuration ############################
-
+#
 wpa=2
 wpa_passphrase=$wlanapsettings{'PWD'}
-wpa_key_mgmt=WPA-PSK WPA-EAP
+wpa_key_mgmt=WPA-PSK
 wpa_pairwise=CCMP TKIP
 END
 ;
index 0c72019142eddbc98b3870c81a71037a83a8eeea..15b4bc347facdbfbcc0cc7a5add5625e5f02d556 100644 (file)
@@ -37,8 +37,8 @@ case "${1}" in
                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
+#                /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