X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=html%2Fcgi-bin%2Fwlanap.cgi;h=72c9a129828fb845ddc654313854b57d85b3489c;hp=5eb480007b2542048256399a98bc67a911639303;hb=d823d5f07211e984489027d57c49ae16db66c7f2;hpb=fe3f3050bd0ca87b5593417e2623e92b8a9e12f7 diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi index 5eb480007b..72c9a12982 100644 --- a/html/cgi-bin/wlanap.cgi +++ b/html/cgi-bin/wlanap.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2005-2013 IPFire Team # +# Copyright (C) 2007-2014 IPFire Team # # # # 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 # @@ -35,9 +35,10 @@ require '/var/ipfire/header.pl'; my $debug = 0; my $status = ''; my $errormessage = ''; -my $status_started = "$Lang::tr{'running'}"; -my $status_stopped = "$Lang::tr{'stopped'}"; - +my $status_started = "$Lang::tr{'running'}"; +my $status_stopped = "$Lang::tr{'stopped'}"; +my $count=0; +my $col=''; # get rid of used only once warnings my @onlyonce = ( $Header::colourgreen, $Header::colourred ); undef @onlyonce; @@ -64,14 +65,16 @@ $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'; &General::readhash("/var/ipfire/wlanap/settings", \%wlanapsettings); &Header::getcgihash(\%wlanapsettings); @@ -124,11 +127,16 @@ if ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'wlanap del interface'}" ){ } if ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'save'}" ){ - # verify WPA Passphrase, must be 8 .. 63 characters - only wiht enabled enc + # verify WPA Passphrase - only with enabled enc if (($wlanapsettings{'ENC'} eq "wpa1") || ($wlanapsettings{'ENC'} eq "wpa2") || ($wlanapsettings{'ENC'} eq "wpa1+2")){ + # must be 8 .. 63 characters if ( (length($wlanapsettings{'PWD'}) < 8) || (length($wlanapsettings{'PWD'}) > 63)){ $errormessage .= "$Lang::tr{'wlanap invalid wpa'}
"; } + # only ASCII alowed + if ( !($wlanapsettings{'PWD'} !~ /[^\x00-\x7f]/) ){ + $errormessage .= "$Lang::tr{'wlanap invalid wpa'}
"; + } } if ( $errormessage eq '' ){ @@ -146,12 +154,9 @@ if ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'save'}" ){ }elsif ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'stop'}" ){ system("/usr/local/bin/wlanapctrl stop >/dev/null 2>&1"); $memory=0; -}elsif ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'restart'}" ){ - system("/usr/local/bin/wlanapctrl restart >/dev/null 2>&1"); - pid(); } -&Header::openpage('Wireless LAN', 1, '', ''); +&Header::openpage($Lang::tr{'wlanap configuration'}, 1, '', ''); &Header::openbigbox('100%', 'left', '', $errormessage); if ( $errormessage ){ @@ -243,6 +248,10 @@ $checked{'HIDESSID'}{'off'} = ''; $checked{'HIDESSID'}{'on'} = ''; $checked{'HIDESSID'}{$wlanapsettings{'HIDESSID'}} = "checked='checked'"; +$checked{'NOSCAN'}{'off'} = ''; +$checked{'NOSCAN'}{'on'} = ''; +$checked{'NOSCAN'}{$wlanapsettings{'NOSCAN'}} = "checked='checked'"; + $selected{'ENC'}{$wlanapsettings{'ENC'}} = "selected='selected'"; $selected{'CHANNEL'}{$wlanapsettings{'CHANNEL'}} = "selected='selected'"; $selected{'COUNTRY'}{$wlanapsettings{'COUNTRY'}} = "selected='selected'"; @@ -251,25 +260,44 @@ $selected{'HW_MODE'}{$wlanapsettings{'HW_MODE'}} = "selected='selected'"; $selected{'MACMODE'}{$wlanapsettings{'MACMODE'}} = "selected='selected'"; my $monwlaninterface = $wlanapsettings{'INTERFACE'}; -if ( $wlanapsettings{'DRIVER'} eq 'NL80211' ){ +if ( -d '/sys/class/net/mon.'.$wlanapsettings{'INTERFACE'} ) { $monwlaninterface = 'mon.'.$wlanapsettings{'INTERFACE'}; } -my @channellist_cmd = `iwlist $monwlaninterface channel 2>/dev/null`; +my @channellist_cmd; +my @channellist; + +if ( $wlanapsettings{'DRIVER'} eq 'NL80211' ){ +my $wiphy = `iw dev $wlanapsettings{'INTERFACE'} 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);} +} +@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);} +} +@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; @@ -284,15 +312,6 @@ if ( $wlanapsettings{'DRIVER'} eq 'NL80211' ){ } # 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'"; @@ -301,64 +320,48 @@ $selected{'DEBUG'}{$wlanapsettings{'DEBUG'}} = "selected='selected'"; # &Header::openbox('100%', 'center', "WLAN AP"); print < + END ; if ( $wlan_card_status ne '' ){ - print ""; - print ""; + print ""; + print ""; print $wlan_card_status eq 'up' ? $status_started : $status_stopped; - print ""; + print""; + print ""; print $wlan_ap_status eq 'up' ? $status_started : $status_stopped; + if ( ($memory != 0) && (@pid[0] ne "///") ){ + print ""; + print ""; + print ""; + print ""; + }else{ + print""; + print ""; + print ""; + } }else{ - print "
$Lang::tr{'wlanap wlan services'}
$Lang::tr{'wlanap wlan card'} ($wlanapsettings{'DRIVER'})
$Lang::tr{'service'}StatusPID$Lang::tr{'memory'}$Lang::tr{'action'}
$Lang::tr{'wlanap wlan card'} ($wlanapsettings{'DRIVER'})
$Lang::tr{'wlanap access point'}
$Lang::tr{'wlanap'}@pid[0]$memory KB
$message"; + print "
$message"; } print "
"; -if ( ($memory != 0) && (@pid[0] ne "///") && ($wlan_card_status ne '') ){ - print ""; - print ""; - print ""; - print ""; - print ""; +if ( $wlan_card_status eq '' ){ + print "
"; + print "
PID$Lang::tr{'memory'}
"; + print ""; + print ""; print ""; - print ""; - print ""; - print ""; - print ""; + print ""; + print ""; + print ""; + print ""; + print ""; print ""; print "
hostapd    @pid[0]$memory KB
 
"; } -if ( $wlan_card_status ne '' ){ -print "
"; -print ""; -print ""; -print ""; -print ""; -print ""; -print ""; -print ""; -print ""; -print ""; -print "
 
"; -}else{ -print "
"; -print ""; -print ""; -print ""; -print ""; -print ""; -print ""; -print ""; -print ""; -print ""; -print ""; -print "
 
"; -} - if ( $wlan_card_status eq '' ){ &Header::closebox(); &Header::closebigbox(); @@ -366,13 +369,25 @@ if ( $wlan_card_status eq '' ){ exit 0; } print < +

- - +
$Lang::tr{'wlanap wlan settings'} -
SSID: 
+ + + + + + - - END ; -# -# If channel's found use a select dropdown if not a text inputfield. if ( scalar @channellist > 0 ){ print < - + + + + END ; - -if ( $wlanapsettings{'DRIVER'} eq 'MADWIFI' ){ - print ""; -} else { - print "" -} print < - + + + +
$Lang::tr{'wlanap wlan settings'}

SSID: 
SSID Broadcast: on | off
$Lang::tr{'wlanap country'}:  +
HW Mode:  -
$Lang::tr{'wlanap encryption'}:  -
$Lang::tr{'wlanap channel'}:  @@ -414,34 +419,25 @@ END END ; } - -print <$Lang::tr{'wlanap country'}:  -
Tx Power:  +print<$Lang::tr{'wlanap neighbor scan'}: on | off$Lang::tr{'wlanap neighbor scan warning'}

$Lang::tr{'wlanap encryption'}:  + +
Passphrase: 

Passphrase: 
HT Caps: 
HT Caps: 
VHT Caps: 
Tx Power: 
Loglevel (hostapd): 

END ; if ( $wlanapsettings{'INTERFACE'} =~ /green0/ ){ print < - +
+ + +
$Lang::tr{'mac filter'}
Mac Filter:  +
@@ -494,25 +494,57 @@ print < 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 $wlanapsettings{'INTERFACE'} info && iw dev $wlanapsettings{'INTERFACE'} station dump && echo ""`; } print < - - - - -
$Lang::tr{'wlanap wlan status'}
@channellist_cmd
@txpower_cmd
$status
+ + +END +; + +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""; + if (! @status[$i]=~"^/t" ) { $count++; } +} + $count++; + +foreach my $nr (@channellist_cmd){ + if ($count % 2){ + $col="bgcolor='$color{'color20'}'"; + }else{ + $col="bgcolor='$color{'color22'}'"; + } + print""; + $count++; +} + +for (my $i=0;$i<$#txpower_cmd;$i=$i+2){ + if ($count % 2){ + $col="bgcolor='$color{'color20'}'"; + }else{ + $col="bgcolor='$color{'color22'}'"; + } + print ""; + $count++; +} +print "
$Lang::tr{'wlanap wlan status'}
@status[$i]
$nr
@txpower_cmd[$i]

"; +print < - - +
WLan Clients
+ +
$Lang::tr{'wlan clients'}
 $Lang::tr{'wlanap link wireless'}
 $Lang::tr{'wlanap link dhcp'}

END ; @@ -526,10 +558,13 @@ sub WriteConfig_hostapd{ open (CONFIGFILE, ">/var/ipfire/wlanap/hostapd.conf"); print CONFIGFILE <