]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blobdiff - html/cgi-bin/wlanap.cgi
remote.cgi: Fix splitting output from ssh-keygen.
[people/pmueller/ipfire-2.x.git] / html / cgi-bin / wlanap.cgi
index 79bd0251bb973ec1e3475ac21ffbf53d1614ef9b..eba5fe774e14e04b40461dd03d46b35bf566bbba 100644 (file)
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2005-2013  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2014  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # 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        #
@@ -54,7 +54,7 @@ my $country = '';
 my $txpower = '';
 
 &General::readhash("${General::swroot}/main/settings", \%mainsettings);
-&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
+&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", \%color);
 &General::readhash("/var/ipfire/ethernet/settings", \%netsettings);
 
 $wlanapsettings{'APMODE'} = 'on';
@@ -65,18 +65,25 @@ $wlanapsettings{'SSID'} = 'IPFire';
 $wlanapsettings{'HIDESSID'} = 'off';
 $wlanapsettings{'ENC'} = 'wpa2';               # none / wpa1 /wpa2
 $wlanapsettings{'TXPOWER'} = 'auto';
-$wlanapsettings{'CHANNEL'} = '05';
+$wlanapsettings{'CHANNEL'} = '6';
 $wlanapsettings{'COUNTRY'} = '00';
 $wlanapsettings{'HW_MODE'} = 'g';
 $wlanapsettings{'PWD'} = 'IPFire-2.x';
 $wlanapsettings{'SYSLOGLEVEL'} = '0';
 $wlanapsettings{'DEBUG'} = '4';
-$wlanapsettings{'DRIVER'} = 'MADWIFI';
+$wlanapsettings{'DRIVER'} = 'NL80211';
 $wlanapsettings{'HTCAPS'} = '';
+$wlanapsettings{'VHTCAPS'} = '';
+$wlanapsettings{'NOSCAN'} = 'off';
+$wlanapsettings{'CLIENTISOLATION'} = 'off';
+$wlanapsettings{'IEEE80211W'} = 'off';
 
 &General::readhash("/var/ipfire/wlanap/settings", \%wlanapsettings);
 &Header::getcgihash(\%wlanapsettings);
 
+# Find the selected interface
+my $INTF = &Network::get_intf_by_address($wlanapsettings{'INTERFACE'});
+
 my @macs = $wlanapsettings{'MACS'};
 
 delete $wlanapsettings{'__CGI__'};
@@ -126,7 +133,7 @@ if ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'wlanap del interface'}" ){
 
 if ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'save'}" ){
        # verify WPA Passphrase - only with enabled enc
-       if (($wlanapsettings{'ENC'} eq "wpa1") || ($wlanapsettings{'ENC'} eq "wpa2") || ($wlanapsettings{'ENC'} eq "wpa1+2")){
+       if ($wlanapsettings{'ENC'} ne "none") {
                # must be 8 .. 63 characters
                if ( (length($wlanapsettings{'PWD'}) < 8) || (length($wlanapsettings{'PWD'}) > 63)){
                        $errormessage .= "$Lang::tr{'wlanap invalid wpa'}<br />";
@@ -141,20 +148,20 @@ if ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'save'}" ){
                &General::writehash("/var/ipfire/wlanap/settings", \%wlanapsettings);
                &WriteConfig_hostapd();
 
-               system("/usr/local/bin/wlanapctrl restart >/dev/null 2>&1");
+               &General::system("/usr/local/bin/wlanapctrl", "restart");
                pid();
        }
 }elsif ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'wlanap interface'}" ){
        &General::writehash("/var/ipfire/wlanap/settings", \%wlanapsettings);
 }elsif ( ($wlanapsettings{'ACTION'} eq "$Lang::tr{'start'}") && ($memory == 0) ){
-       system("/usr/local/bin/wlanapctrl start >/dev/null 2>&1");
+       &General::system("/usr/local/bin/wlanapctrl", "start");
        pid();
 }elsif ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'stop'}" ){
-       system("/usr/local/bin/wlanapctrl stop >/dev/null 2>&1");
+       &General::system("/usr/local/bin/wlanapctrl", "stop");
        $memory=0;
 }
 
-&Header::openpage('', 1, '', '');
+&Header::openpage($Lang::tr{'wlanap configuration'}, 1, '', '');
 &Header::openbigbox('100%', 'left', '', $errormessage);
 
 if ( $errormessage ){
@@ -189,8 +196,11 @@ my $wlan_card_status = 'dummy';
 my $wlan_ap_status = '';
 my $message = "";
 
-$selected{'INTERFACE'}{'green0'} = '';
-$selected{'INTERFACE'}{'blue0'} = '';
+my %INTERFACES = &Network::list_wireless_interfaces();
+
+foreach my $intf (keys %INTERFACES) {
+       $selected{'INTERFACE'}{$intf} = '';
+}
 $selected{'ENC'}{$wlanapsettings{'INTERFACE'}} = "selected='selected'";
 
 if ( ($wlanapsettings{'INTERFACE'} eq '') ){
@@ -202,11 +212,12 @@ $message<br />
 <select name='INTERFACE'>
 END
 ;
-       if ( $netsettings{'BLUE_DEV'} ne ''){
-               print "<option value='blue0' $selected{'INTERFACE'}{'blue0'}>blue0</option>";
+
+       foreach my $intf (sort keys %INTERFACES) {
+               print "<option value='${intf}' $selected{'INTERFACE'}{$intf}>$INTERFACES{$intf}</option>";
        }
+
 print <<END
-               <option value='green0' $selected{'INTERFACE'}{'green0'}>green0</option>
 </select>
 <br /><br />
 <hr size='1'>
@@ -218,18 +229,18 @@ END
        &Header::closepage();
        exit;
 }else{
-       my $cmd_out = `/usr/sbin/iwconfig $wlanapsettings{'INTERFACE'} 2>/dev/null`;
+       my $cmd_out = `/usr/sbin/iwconfig $INTF 2>/dev/null`;
 
        if ( $cmd_out eq '' ){
                $message = "$Lang::tr{'wlanap no interface'}";
                $wlan_card_status = '';
        }else{
-               $cmd_out = `/sbin/ifconfig | /bin/grep $wlanapsettings{'INTERFACE'}`;
+               $cmd_out = `/sbin/ifconfig $INTF`;
                if ( $cmd_out eq '' ){
                        $wlan_card_status = 'down';
                }else{
                        $wlan_card_status = 'up';
-                       $cmd_out = `/usr/sbin/iwconfig $wlanapsettings{'INTERFACE'} | /bin/grep "Mode:Master"`;
+                       $cmd_out = `/usr/sbin/iwconfig $INTF | /bin/grep "Mode:Master"`;
                        if ( $cmd_out ne '' ){
                                $wlan_ap_status = 'up';
                        }
@@ -246,6 +257,19 @@ $checked{'HIDESSID'}{'off'} = '';
 $checked{'HIDESSID'}{'on'} = '';
 $checked{'HIDESSID'}{$wlanapsettings{'HIDESSID'}} = "checked='checked'";
 
+$checked{'NOSCAN'}{'off'} = '';
+$checked{'NOSCAN'}{'on'} = '';
+$checked{'NOSCAN'}{$wlanapsettings{'NOSCAN'}} = "checked='checked'";
+
+$checked{'CLIENTISOLATION'}{'off'} = '';
+$checked{'CLIENTISOLATION'}{'on'} = '';
+$checked{'CLIENTISOLATION'}{$wlanapsettings{'CLIENTISOLATION'}} = "checked='checked'";
+
+$selected{'IEEE80211W'}{'off'} = '';
+$selected{'IEEE80211W'}{'optional'} = '';
+$selected{'IEEE80211W'}{'on'} = '';
+$selected{'IEEE80211W'}{$wlanapsettings{'IEEE80211W'}} = "selected";
+
 $selected{'ENC'}{$wlanapsettings{'ENC'}} = "selected='selected'";
 $selected{'CHANNEL'}{$wlanapsettings{'CHANNEL'}} = "selected='selected'";
 $selected{'COUNTRY'}{$wlanapsettings{'COUNTRY'}} = "selected='selected'";
@@ -253,26 +277,45 @@ $selected{'TXPOWER'}{$wlanapsettings{'TXPOWER'}} = "selected='selected'";
 $selected{'HW_MODE'}{$wlanapsettings{'HW_MODE'}} = "selected='selected'";
 $selected{'MACMODE'}{$wlanapsettings{'MACMODE'}} = "selected='selected'";
 
-my $monwlaninterface = $wlanapsettings{'INTERFACE'};
-if ( -d '/sys/class/net/mon.'.$wlanapsettings{'INTERFACE'} ) {
-       $monwlaninterface =  'mon.'.$wlanapsettings{'INTERFACE'};
+my $monwlaninterface = $INTF;
+if ( -d '/sys/class/net/mon.' . $INTF) {
+       $monwlaninterface =  'mon.' . $INTF;
 }
 
-my @channellist_cmd = `iwlist $monwlaninterface channel|tail -n +2 2>/dev/null`;
+my @channellist_cmd;
+my @channellist = (0);
+
+if ( $wlanapsettings{'DRIVER'} eq 'NL80211' ){
+my $wiphy = `iw dev $INTF info | grep wiphy | cut -d" " -f2`;
+chomp $wiphy;
+
+@channellist_cmd = `iw phy phy$wiphy info | grep " MHz \\\[" | grep -v "(disabled)" | grep -v "no IBSS" | grep -v "no IR" | grep -v "passive scanning" 2>/dev/null`;
+# get available channels
+
+my @temp;
+foreach (@channellist_cmd){
+$_ =~ /(.*) \[(\d+)(.*)\]/;
+$channel = $2;chomp $channel;
+if ( $channel =~ /\d+/ ){push(@temp,$channel + 0);}
+}
+push(@channellist, @temp);
+} else {
+@channellist_cmd = `iwlist $monwlaninterface channel|tail -n +2 2>/dev/null`;
 # get available channels
 
 my @temp;
 foreach (@channellist_cmd){
 $_ =~ /(.*)Channel (\d+)(.*):/;
 $channel = $2;chomp $channel;
-if ( $channel =~ /\d+/ ){push(@temp,$channel);}
+if ( $channel =~ /\d+/ ){push(@temp,$channel + 0);}
+}
+push(@channellist, @temp);
 }
-my @channellist = @temp;
 
 my @countrylist_cmd = `regdbdump /usr/lib/crda/regulatory.bin 2>/dev/null`;
 # get available country codes
 
-my @temp;
+my @temp = "00";
 foreach (@countrylist_cmd){
 $_ =~ /country (.*):/;
 $country = $1;chomp $country;
@@ -282,20 +325,11 @@ my @countrylist = @temp;
 
 my @txpower_cmd = `iwlist $monwlaninterface txpower 2>/dev/null`;
 if ( $wlanapsettings{'DRIVER'} eq 'NL80211' ){
-       # There is a bug with NL80211 only all devices can displayed
+       # There is a bug with NL80211 only all devices can displaye
        @txpower_cmd = `iwlist txpower 2>/dev/null | sed -e "s|unknown transmit-power information.||g"`;
 }
 # get available power
 
-my @temp;
-foreach (@txpower_cmd){
-$_ =~ /(\s)(\d+)(\s)dBm(\s)(.*)(\W)(\d+)(.*)/;
-$txpower = $7;chomp $txpower;
-if ( $txpower =~ /\d+/ ){push(@temp,$txpower."mW");}
-}
-my @txpower = @temp;
-push(@txpower,"auto");
-
 $selected{'SYSLOGLEVEL'}{$wlanapsettings{'SYSLOGLEVEL'}} = "selected='selected'";
 $selected{'DEBUG'}{$wlanapsettings{'DEBUG'}} = "selected='selected'";
 
@@ -313,7 +347,7 @@ if ( $wlan_card_status ne '' ){
        print "<tr><td class='base'>$Lang::tr{'wlanap wlan card'} ($wlanapsettings{'DRIVER'})</td>";
        print $wlan_card_status eq 'up' ? $status_started : $status_stopped;
        print"<td colspan='4'></td></tr>";
-       print "<tr><td class='base' bgcolor='$color{'color22'}'>$Lang::tr{'wlanap access point'}</td>";
+       print "<tr><td class='base' bgcolor='$color{'color22'}'>$Lang::tr{'wlanap'}</td>";
        print $wlan_ap_status eq 'up' ? $status_started : $status_stopped;
        if ( ($memory != 0) && (@pid[0] ne "///") ){
                print "<td bgcolor='$color{'color22'}' align='center'>@pid[0]</td>";
@@ -358,11 +392,10 @@ print <<END
 <table width='80%' cellspacing='0' class='tbl' border='0'>
 <tr><th bgcolor='$color{'color20'}' colspan='4' align='left'><strong>$Lang::tr{'wlanap wlan settings'}</strong></th></tr>
 <tr><td colspan='4'><br></td></tr>
-<tr><td width='25%' class='base'>SSID:&nbsp;</td><td class='base' colspan='3'><input type='text' name='SSID' size='30' value='$wlanapsettings{'SSID'}' /></td></tr>
+<tr><td width='25%' class='base'>$Lang::tr{'wlanap ssid'}:&nbsp;</td><td class='base' colspan='3'><input type='text' name='SSID' size='30' value='$wlanapsettings{'SSID'}' /></td></tr>
 <!--SSID Broadcast: on => HIDESSID: off -->
-<tr><td width='25%' class='base'>SSID Broadcast:&nbsp;</td><td class='base' colspan='3'>on <input type='radio' name='HIDESSID' value='off' $checked{'HIDESSID'}{'off'} /> | <input type='radio' name='HIDESSID' value='on' $checked{'HIDESSID'}{'on'} /> off</td></tr>
-
-
+<tr><td width='25%' class='base'>$Lang::tr{'wlanap broadcast ssid'}:&nbsp;</td><td class='base' colspan='3'>$Lang::tr{'on'} <input type='radio' name='HIDESSID' value='off' $checked{'HIDESSID'}{'off'} /> | <input type='radio' name='HIDESSID' value='on' $checked{'HIDESSID'}{'on'} /> $Lang::tr{'off'}</td></tr>
+<tr><td width='25%' class='base'>$Lang::tr{'wlanap client isolation'}:&nbsp;</td><td class='base' colspan='3'>$Lang::tr{'on'} <input type='radio' name='CLIENTISOLATION' value='on' $checked{'CLIENTISOLATION'}{'on'} /> | <input type='radio' name='CLIENTISOLATION' value='off' $checked{'CLIENTISOLATION'}{'off'} /> $Lang::tr{'off'}</td></tr>
 <tr><td width='25%' class='base'>$Lang::tr{'wlanap country'}:&nbsp;</td><td class='base' colspan='3'>
        <select name='COUNTRY'>
 END
@@ -379,6 +412,7 @@ print<<END
                <option value='g' $selected{'HW_MODE'}{'g'}>802.11g</option>
                <option value='an' $selected{'HW_MODE'}{'an'}>802.11an</option>
                <option value='gn' $selected{'HW_MODE'}{'gn'}>802.11gn</option>
+               <option value='ac' $selected{'HW_MODE'}{'ac'}>802.11ac</option>
        </select>
 </td></tr>
 END
@@ -391,7 +425,13 @@ if ( scalar @channellist > 0 ){
 END
 ;
        foreach $channel (@channellist){
-               print "<option $selected{'CHANNEL'}{$channel}>$channel</option>";
+               print "<option $selected{'CHANNEL'}{$channel}>";
+               if ($channel eq 0) {
+                       print "- $Lang::tr{'wlanap auto'} -";
+               } else {
+                       print $channel;
+               }
+               print "</option>";
        }
        print "</select></td></tr>"
 } else {
@@ -403,35 +443,36 @@ END
 ;
 }
 print<<END
+<tr><td width='25%' class='base'>$Lang::tr{'wlanap neighbor scan'}:&nbsp;</td><td class='base' >$Lang::tr{'on'} <input type='radio' name='NOSCAN' value='off' $checked{'NOSCAN'}{'off'} /> | <input type='radio' name='NOSCAN' value='on' $checked{'NOSCAN'}{'on'} /> $Lang::tr{'off'}</td><td class='base' colspan='2'>$Lang::tr{'wlanap neighbor scan warning'}</td></tr>
 <tr><td colspan='4'><br></td></tr>
 <tr><td width='25%' class='base'>$Lang::tr{'wlanap encryption'}:&nbsp;</td><td class='base' colspan='3'>
        <select name='ENC'>
                <option value='none' $selected{'ENC'}{'none'}>$Lang::tr{'wlanap none'}</option>
                <option value='wpa1' $selected{'ENC'}{'wpa1'}>WPA1</option>
                <option value='wpa2' $selected{'ENC'}{'wpa2'}>WPA2</option>
+               <option value='wpa3' $selected{'ENC'}{'wpa3'}>WPA3</option>
                <option value='wpa1+2' $selected{'ENC'}{'wpa1+2'}>WPA1+2</option>
+               <option value='wpa2+3' $selected{'ENC'}{'wpa2+3'}>WPA2+3</option>
        </select>
 </td></tr>
 <tr><td width='25%' class='base'>Passphrase:&nbsp;</td><td class='base' colspan='3'><input type='text' name='PWD' size='30' value='$wlanapsettings{'PWD'}' /></td></tr>
+<tr>
+       <td width='25%' class='base'>$Lang::tr{'wlanap management frame protection'}:&nbsp;</td>
+       <td class='base' colspan="3">
+               <select name="IEEE80211W">
+                       <option value="off" $selected{'IEEE80211W'}{'off'}>$Lang::tr{'wlanap 802.11w disabled'}</option>
+                       <option value="optional" $selected{'IEEE80211W'}{'optional'}>$Lang::tr{'wlanap 802.11w optional'}</option>
+                       <option value="on" $selected{'IEEE80211W'}{'on'}>$Lang::tr{'wlanap 802.11w enforced'}</option>
+               </select>
+       </td>
+</tr>
 <tr><td colspan='4'><br></td></tr>
 END
 ;
 print <<END
 <tr><td width='25%' class='base'>HT Caps:&nbsp;</td><td class='base' colspan='3'><input type='text' name='HTCAPS' size='30' value='$wlanapsettings{'HTCAPS'}' /></td></tr>
-<tr><td width='25%' class='base'>Tx Power:&nbsp;</td><td class='base' colspan='3'>
-END
-;
-
-if ( $wlanapsettings{'DRIVER'} eq 'MADWIFI' ){
-       print "<select name='TXPOWER'>";
-       foreach $txpower (@txpower){
-               print "<option $selected{'TXPOWER'}{$txpower}>$txpower</option>&nbsp;dBm";
-       }
-       print " </select></td></tr>";
-} else {
-       print "<input type='text' name='TXPOWER' size='10' value='$wlanapsettings{'TXPOWER'}' /></td></tr>"
-}
-print <<END
+<tr><td width='25%' class='base'>VHT Caps:&nbsp;</td><td class='base' colspan='3'><input type='text' name='VHTCAPS' size='30' value='$wlanapsettings{'VHTCAPS'}' /></td></tr>
+<tr><td width='25%' class='base'>Tx Power:&nbsp;</td><td class='base' colspan='3'><input type='text' name='TXPOWER' size='10' value='$wlanapsettings{'TXPOWER'}' /></td></tr>
 <tr><td width='25%' class='base'>Loglevel (hostapd):&nbsp;</td><td class='base' width='25%'>
        <select name='SYSLOGLEVEL'>
                <option value='0' $selected{'SYSLOGLEVEL'}{'0'}>0 ($Lang::tr{'wlanap verbose'})</option>
@@ -454,7 +495,7 @@ print <<END
 </table>
 END
 ;
-if ( $wlanapsettings{'INTERFACE'} =~ /green0/ ){
+if ( $INTF =~ /green0/ ){
        print <<END
 <br />
 <table width='80%' cellspacing='0' class='tbl' border='1'>
@@ -482,18 +523,14 @@ print <<END
 <table width='80%' cellspacing='0'>
 <tr><td align='center'>
 <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-       <input type='hidden' name='ACTION' value=$Lang::tr{'save'} />
-       <input type='image' alt='$Lang::tr{'save'}' title='$Lang::tr{'save'}' src='/images/media-floppy.png' /></form></td>
+       <input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></form></td>
 </tr>
 </table>
 END
 ;
-
-if ( $wlanapsettings{'DRIVER'} eq 'MADWIFI' ){
-        $status =  `wlanconfig $wlanapsettings{'INTERFACE'} list`;
-}
+my @status;
 if ( $wlanapsettings{'DRIVER'} eq 'NL80211' ){
-        $status =  `iw dev $wlanapsettings{'INTERFACE'} station dump`;
+        @status =  `iw dev $INTF info && iw dev $INTF station dump && echo ""`;
 }
 print <<END
 <br />
@@ -501,46 +538,40 @@ print <<END
 <tr><th colspan='3' bgcolor='$color{'color20'}' align='left'><strong>$Lang::tr{'wlanap wlan status'}</strong></th></tr>
 END
 ;
-foreach my $nr (@channellist_cmd){
-       my ($chan,$freq) = split(':',$nr);
-       if ($count % 2){
+
+for (my $i=0;$i<$#status;$i++){
+
+if (@status[$i]=~"^Station ") { $count++; }
+if ($count % 2){
                $col="bgcolor='$color{'color20'}'";
        }else{
                $col="bgcolor='$color{'color22'}'";
        }
-       print"<tr><td $col>$chan</td><td $col>:</td><td $col>$freq</td></tr>";
-       $count++;
+       print"<tr><td colspan='3' $col><pre>@status[$i]</pre></td></tr>";
+       if (! @status[$i]=~"^/t" ) { $count++; }
 }
-if ($count % 2){
+       $count++;
+
+foreach my $nr (@channellist_cmd){
+       if ($count % 2){
                $col="bgcolor='$color{'color20'}'";
        }else{
                $col="bgcolor='$color{'color22'}'";
        }
-if ($status){
-       print"<tr><td colspan='3' $col><pre>$status</pre></td></tr>";
+       print"<tr><td colspan='3' $col>$nr</td></tr>";
        $count++;
 }
-for (my $i=0;$i<$#txpower_cmd;$i=$i+4){
-       next if (@txpower_cmd[$i] =~ /mon/i);
+
+for (my $i=0;$i<$#txpower_cmd;$i=$i+2){
        if ($count % 2){
                $col="bgcolor='$color{'color20'}'";
        }else{
                $col="bgcolor='$color{'color22'}'";
        }
-       print "<tr><td $col>@txpower_cmd[$i]</td><td $col>@txpower_cmd[$i+1]</td><td $col>@txpower_cmd[$i+2]</td></tr>";
+       print "<tr><td $col>@txpower_cmd[$i]</td></tr>";
        $count++;
 }
-print "</table><br>";
-print <<END
-<br />
-<table width='80%' cellspacing='0' class='tbl' border='0'>
-<tr><td bgcolor='$color{'color20'}' align='left'><strong>$Lang::tr{'wlan clients'}</strong></td></tr>
-<tr><td>&nbsp;<a href="/cgi-bin/wireless.cgi">$Lang::tr{'wlanap link wireless'}</a></td></tr>
-<tr><td>&nbsp;<a href="/cgi-bin/dhcp.cgi">$Lang::tr{'wlanap link dhcp'}</a></td></tr>
-<tr><td><br></td></tr>
-</table>
-END
-;
+print "</table>";
 &Header::closebox();
 print "</form>";
 &Header::closebigbox();
@@ -554,9 +585,9 @@ sub WriteConfig_hostapd{
 driver=$wlanapsettings{'DRIVER_HOSTAPD'}
 ######################### basic hostapd configuration ##########################
 #
-interface=$wlanapsettings{'INTERFACE'}
 country_code=$wlanapsettings{'COUNTRY'}
 ieee80211d=1
+ieee80211h=1
 channel=$wlanapsettings{'CHANNEL'}
 END
 ;
@@ -576,6 +607,18 @@ ieee80211n=1
 wmm_enabled=1
 ht_capab=$wlanapsettings{'HTCAPS'}
 END
+;
+
+ }elsif ( $wlanapsettings{'HW_MODE'} eq 'ac' ){
+       print CONFIGFILE <<END
+hw_mode=a
+ieee80211ac=1
+ieee80211n=1
+wmm_enabled=1
+ht_capab=$wlanapsettings{'HTCAPS'}
+vht_capab=$wlanapsettings{'VHTCAPS'}
+vht_oper_chwidth=1
+END
 ;
 
  }else{
@@ -591,10 +634,10 @@ logger_syslog=-1
 logger_syslog_level=$wlanapsettings{'SYSLOGLEVEL'}
 logger_stdout=-1
 logger_stdout_level=$wlanapsettings{'DEBUG'}
-dump_file=/tmp/hostapd.dump
 auth_algs=1
 ctrl_interface=/var/run/hostapd
 ctrl_interface_group=0
+disassoc_low_ack=1
 END
 ;
  if ( $wlanapsettings{'HIDESSID'} eq 'on' ){
@@ -613,6 +656,37 @@ END
 
  }
 
+ # https://forum.ipfire.org/viewtopic.php?f=22&t=12274&p=79070#p79070
+ if ( $wlanapsettings{'CLIENTISOLATION'} eq 'on' ){
+       print CONFIGFILE <<END
+ap_isolate=1
+END
+;
+ }
+
+ if ( $wlanapsettings{'NOSCAN'} eq 'on' ){
+       print CONFIGFILE <<END
+noscan=1
+END
+;
+
+ }else{
+       print CONFIGFILE <<END
+noscan=0
+END
+;
+
+ }
+
+ # Management Frame Protection (802.11w)
+ if ($wlanapsettings{'IEEE80211W'} eq "on") {
+       print CONFIGFILE "ieee80211w=2\n";
+ } elsif ($wlanapsettings{'IEEE80211W'} eq "optional") {
+       print CONFIGFILE "ieee80211w=1\n";
+ } else {
+       print CONFIGFILE "ieee80211w=0\n";
+ }
+
  if ( $wlanapsettings{'ENC'} eq 'wpa1'){
        print CONFIGFILE <<END
 ######################### wpa hostapd configuration ############################
@@ -632,6 +706,16 @@ wpa_passphrase=$wlanapsettings{'PWD'}
 wpa_key_mgmt=WPA-PSK
 rsn_pairwise=CCMP
 END
+;
+ }elsif ( $wlanapsettings{'ENC'} eq 'wpa3'){
+       print CONFIGFILE <<END
+######################### wpa hostapd configuration ############################
+#
+wpa=2
+wpa_passphrase=$wlanapsettings{'PWD'}
+wpa_key_mgmt=SAE
+rsn_pairwise=CCMP
+END
 ;
  } elsif ( $wlanapsettings{'ENC'} eq 'wpa1+2'){
        print CONFIGFILE <<END
@@ -643,6 +727,16 @@ wpa_key_mgmt=WPA-PSK
 wpa_pairwise=TKIP
 rsn_pairwise=CCMP
 END
+;
+ }elsif ( $wlanapsettings{'ENC'} eq 'wpa2+3'){
+       print CONFIGFILE <<END
+######################### wpa hostapd configuration ############################
+#
+wpa=2
+wpa_passphrase=$wlanapsettings{'PWD'}
+wpa_key_mgmt=WPA-PSK SAE
+rsn_pairwise=CCMP
+END
 ;
  }
        close CONFIGFILE;