This fixes bug #0000562

[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 123ca79..f084fc6
--- a/html/cgi-bin/wlanap.cgi
+++ b/html/cgi-bin/wlanap.cgi
@@ -64,6 +64,7 @@ $wlanapsettings{'HIDESSID'} = 'off';
 $wlanapsettings{'ENC'} = 'wpa2';               # none / wpa1 /wpa2
 $wlanapsettings{'TXPOWER'} = 'auto';
 $wlanapsettings{'CHANNEL'} = '05';
+$wlanapsettings{'HW_MODE'} = 'g';
 $wlanapsettings{'PWD'} = 'IPFire-2.x';
 $wlanapsettings{'SYSLOGLEVEL'} = '0';
 $wlanapsettings{'DEBUG'} = '4';
@@ -188,12 +189,14 @@ END
        }
 }
 
-my $checked_hidessid = '';
-$checked_hidessid = "checked='checked'" if ( $wlanapsettings{'HIDESSID'} eq 'on' );
+$checked{'HIDESSID'}{'off'} = '';
+$checked{'HIDESSID'}{'on'} = '';
+$checked{'HIDESSID'}{$wlanapsettings{'HIDESSID'}} = "checked='checked'";
 
 $selected{'ENC'}{$wlanapsettings{'ENC'}} = "selected='selected'";
 $selected{'CHANNEL'}{$wlanapsettings{'CHANNEL'}} = "selected='selected'";
 $selected{'TXPOWER'}{$wlanapsettings{'TXPOWER'}} = "selected='selected'";
+$selected{'HW_MODE'}{$wlanapsettings{'HW_MODE'}} = "selected='selected'";
 $selected{'MACMODE'}{$wlanapsettings{'MACMODE'}} = "selected='selected'";
 
 my @channellist_cmd = `iwlist $wlanapsettings{'INTERFACE'} channel`;
@@ -264,7 +267,17 @@ print <<END
 <table width='95%' cellspacing='0'>
 <tr><td bgcolor='$color{'color20'}' colspan='4' align='left'><b>WLAN Settings</b>
 <tr><td width='25%' class='base'>SSID:&nbsp;</td><td class='base' colspan='3'><input type='text' name='SSID' size='40' value='$wlanapsettings{'SSID'}' /></td></tr>
-<tr><td width='25%' class='base'>Disable SSID broadcast:&nbsp;</td><td class='base' colspan='3'><input type='checkbox' name='HIDESSID' $checked_hidessid /></td></tr>
+<tr><td width='25%' class='base'>Disable SSID broadcast:&nbsp;</td><td class='base' colspan='3'>on <input type='radio' name='HIDESSID' value='on' $checked{'HIDESSID'}{'on'} />/
+                       <input type='radio' name='HIDESSID' value='off' $checked{'HIDESSID'}{'off'} /> off</td></tr>
+<tr><td width='25%' class='base'>HW Mode:&nbsp;</td><td class='base' colspan='3'>
+       <select name='HW_MODE'>
+               <option value='a' $selected{'HW_MODE'}{'a'}>a</option>
+               <option value='b' $selected{'HW_MODE'}{'b'}>b</option>
+               <option value='g' $selected{'HW_MODE'}{'g'}>g</option>
+               <option value='n' $selected{'HW_MODE'}{'n'}>n</option>
+       </select>
+</td></tr>
+
 <tr><td width='25%' class='base'>Encryption:&nbsp;</td><td class='base' colspan='3'>
        <select name='ENC'>
                <option value='none' $selected{'ENC'}{'none'}>none</option>
@@ -346,6 +359,9 @@ END
 if ( $wlanapsettings{'DRIVER'} eq 'MADWIFI' ){
         $status =  `wlanconfig $wlanapsettings{'INTERFACE'} list`;
 }
+if ( $wlanapsettings{'DRIVER'} eq 'NL80211' ){
+        $status =  `iw dev $wlanapsettings{'INTERFACE'} station dump`;
+}
 print <<END
 <br />
 <table width='95%' cellspacing='0'>
@@ -369,12 +385,31 @@ sub WriteConfig_hostapd{
 #
 interface=$wlanapsettings{'INTERFACE'}
 driver=$wlanapsettings{'DRIVER_HOSTAPD'}
+channel=$wlanapsettings{'CHANNEL'}
+END
+;
+ if ( $wlanapsettings{'HW_MODE'} eq 'n' ){
+       print CONFIGFILE <<END
+hw_mode=g
+ieee80211n=1
+END
+;
+
+ }else{
+       print CONFIGFILE <<END
+hw_mode=$wlanapsettings{'HW_MODE'}
+END
+;
+
+ }
+
+print CONFIGFILE <<END
 logger_syslog=-1
 logger_syslog_level=$wlanapsettings{'SYSLOGLEVEL'}
 logger_stdout=-1
 logger_stdout_level=$wlanapsettings{'DEBUG'}
 dump_file=/tmp/hostapd.dump
-auth_algs=3
+auth_algs=1
 ctrl_interface=/var/run/hostapd
 ctrl_interface_group=0
 END