Fix fwhits graph

[people/pmueller/ipfire-2.x.git] / html / cgi-bin / wlanap.cgi

diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi
old mode 100755 (executable)
new mode 100644 (file)
index aca9e35..4c053db
--- a/html/cgi-bin/wlanap.cgi
+++ b/html/cgi-bin/wlanap.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2008  Michael Tremer & Christian Schmidt                      #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -59,9 +59,9 @@ $wlanapsettings{'APMODE'} = 'on';
 $wlanapsettings{'INTERFACE'} = $netsettings{'BLUE_DEV'};
 $wlanapsettings{'SSID'} = 'IPFire';
 $wlanapsettings{'HIDESSID'} = 'off';
-$wlanapsettings{'ENC'} = 'wpa';               # none / wpa1 /wpa2
+$wlanapsettings{'ENC'} = 'wpa2';               # none / wpa1 /wpa2
 $wlanapsettings{'TXPOWER'} = 'auto';
-$wlanapsettings{'CHAN'} = '05';
+$wlanapsettings{'CHANNEL'} = '05';
 $wlanapsettings{'PWD'} = 'IPFire-2.x';
 $wlanapsettings{'SYSLOGLEVEL'} = '0';
 $wlanapsettings{'DEBUG'} = '4';
@@ -74,9 +74,9 @@ $cgiparams{'ACTION'} = '';
 $cgiparams{'APMODE'} = 'on';
 $cgiparams{'SSID'} = 'IPFire';
 $cgiparams{'HIDESSID'} = 'off';
-$cgiparams{'ENC'} = 'wpa';               # none / wep / wpa / wep+wpa
+$cgiparams{'ENC'} = 'wpa2';               # none / wep / wpa / wep+wpa
 $cgiparams{'TXPOWER'} = 'auto';
-$cgiparams{'CHAN'} = '05';
+$cgiparams{'CHANNEL'} = '05';
 $cgiparams{'PWD'} = 'IPFire-2.x';
 $cgiparams{'SYSLOGLEVEL'} = '0';
 $cgiparams{'DEBUG'} = '4';
@@ -89,7 +89,7 @@ if ( $cgiparams{'ACTION'} eq "$Lang::tr{'save'}" ){
        $wlanapsettings{'SSID'}       = $cgiparams{'SSID'};
        $wlanapsettings{'HIDESSID'}   = $cgiparams{'HIDESSID'};
        $wlanapsettings{'ENC'}        = $cgiparams{'ENC'};
-       $wlanapsettings{'CHAN'}       = $cgiparams{'CHAN'};
+       $wlanapsettings{'CHANNEL'}       = $cgiparams{'CHANNEL'};
        $wlanapsettings{'TXPOWER'}    = $cgiparams{'TXPOWER'};
 
        $wlanapsettings{'PWD'}        = $cgiparams{'PWD'};
@@ -105,7 +105,7 @@ if ( $cgiparams{'ACTION'} eq "$Lang::tr{'save'}" ){
                &WriteConfig();
                &WriteConfig_hostapd();
 
-               system("/usr/local/bin/wlanapctrl restart >/dev/null 2>&1")
+               system("/usr/local/bin/wlanapctrl restart >/dev/null 2>&1");
        }
 }elsif ( $cgiparams{'ACTION'} eq 'Start' ){
        system("/usr/local/bin/wlanapctrl start >/dev/null 2>&1");
@@ -177,7 +177,7 @@ $selected{'ENC'}{'none'} = '';
 $selected{'ENC'}{'wpa1'} = '';
 $selected{'ENC'}{'wpa2'} = '';
 $selected{'ENC'}{$wlanapsettings{'ENC'}} = "selected='selected'";
-$selected{'CHAN'}{$wlanapsettings{'CHAN'}} = "selected='selected'";
+$selected{'CHANNEL'}{$wlanapsettings{'CHANNEL'}} = "selected='selected'";
 $selected{'TXPOWER'}{$wlanapsettings{'TXPOWER'}} = "selected='selected'";
 
 my @channellist_cmd = `iwlist $netsettings{'BLUE_DEV'} channel`;
@@ -261,11 +261,11 @@ print <<END
        </select>
 </td></tr>
 <tr><td width='25%' class='base'>Channel:&nbsp;</td><td class='base' colspan='3'>
-       <select name='CHAN'>
+       <select name='CHANNEL'>
 END
 ;
 foreach $channel (@channellist){
-       print "<option $selected{'CHAN'}{$channel}>$channel</option>";
+       print "<option $selected{'CHANNEL'}{$channel}>$channel</option>";
 }
 
 print <<END
@@ -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,10 +343,6 @@ logger_syslog_level=$wlanapsettings{'SYSLOGLEVEL'}
 logger_stdout=-1
 logger_stdout_level=$wlanapsettings{'DEBUG'}
 dump_file=/tmp/hostapd.dump
-ignore_broadcast_ssid=0
-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
@@ -372,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
 ;