X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=html%2Fcgi-bin%2Fwlanap.cgi;h=58c6376feac996a2bdb018370bdc0e63ce9cf48e;hb=44ed2a42f02738b7955614461f868eda655eebbd;hp=f084fc664b1eb11af89cf55def2800b295931be4;hpb=b89903559e6bf2d31dc38be898d6d21b15eec7c0;p=people%2Fteissler%2Fipfire-2.x.git diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi index f084fc664..58c6376fe 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) 2009 Michael Tremer & Christian Schmidt # +# Copyright (C) 2005-2013 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,8 +35,8 @@ 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'}"; # get rid of used only once warnings my @onlyonce = ( $Header::colourgreen, $Header::colourred ); @@ -49,6 +49,7 @@ my %mainsettings = (); my %netsettings=(); my %wlanapsettings=(); my $channel = ''; +my $country = ''; my $txpower = ''; &General::readhash("${General::swroot}/main/settings", \%mainsettings); @@ -64,11 +65,13 @@ $wlanapsettings{'HIDESSID'} = 'off'; $wlanapsettings{'ENC'} = 'wpa2'; # none / wpa1 /wpa2 $wlanapsettings{'TXPOWER'} = 'auto'; $wlanapsettings{'CHANNEL'} = '05'; +$wlanapsettings{'COUNTRY'} = '00'; $wlanapsettings{'HW_MODE'} = 'g'; $wlanapsettings{'PWD'} = 'IPFire-2.x'; $wlanapsettings{'SYSLOGLEVEL'} = '0'; $wlanapsettings{'DEBUG'} = '4'; $wlanapsettings{'DRIVER'} = 'MADWIFI'; +$wlanapsettings{'HTCAPS'} = ''; &General::readhash("/var/ipfire/wlanap/settings", \%wlanapsettings); &Header::getcgihash(\%wlanapsettings); @@ -84,10 +87,53 @@ delete $wlanapsettings{'DENY_MACS'}; &Header::showhttpheaders(); +my $string=(); +my $status=(); +my $errormessage = ''; +my $memory = 0; +my @memory=(); +my @pid=(); +my @hostapd=(); +sub pid +{ +# for pid and memory + open(FILE, '/usr/local/bin/addonctrl hostapd status | '); + @hostapd = ; + close(FILE); + $string = join("", @hostapd); + $string =~ s/[a-z_]//gi; + $string =~ s/\[[0-1]\;[0-9]+//gi; + $string =~ s/[\(\)\.]//gi; + $string =~ s/ //gi; + $string =~ s///gi; + @pid = split(/\s/,$string); + if (open(FILE, "/proc/$pid[0]/statm")){ + my $temp = ; + @memory = split(/ /,$temp); + close(FILE); + } + $memory+=$memory[0]; +} +pid(); + + + +if ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'wlanap del interface'}" ){ + delete $wlanapsettings{'INTERFACE'}; + &General::writehash("/var/ipfire/wlanap/settings", \%wlanapsettings); +} + if ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'save'}" ){ - # verify WPA Passphrase, must be 8 .. 63 characters - if ( (length($wlanapsettings{'PWD'}) < 8) || (length($wlanapsettings{'PWD'}) > 63) ){ - $errormessage .= "Invalid length in WPA Passphrase. Must be between 8 and 63 characters.
"; + # 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 '' ){ @@ -95,18 +141,22 @@ if ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'save'}" ){ &WriteConfig_hostapd(); system("/usr/local/bin/wlanapctrl restart >/dev/null 2>&1"); + pid(); } -}elsif ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'interface'}" ){ +}elsif ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'wlanap interface'}" ){ &General::writehash("/var/ipfire/wlanap/settings", \%wlanapsettings); -}elsif ( $wlanapsettings{'ACTION'} eq 'Start' ){ +}elsif ( ($wlanapsettings{'ACTION'} eq "$Lang::tr{'start'}") && ($memory == 0) ){ system("/usr/local/bin/wlanapctrl start >/dev/null 2>&1"); -}elsif ( $wlanapsettings{'ACTION'} eq 'Stop' ){ + pid(); +}elsif ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'stop'}" ){ system("/usr/local/bin/wlanapctrl stop >/dev/null 2>&1"); -}elsif ( $wlanapsettings{'ACTION'} eq 'Restart' ){ + $memory=0; +}elsif ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'restart'}" ){ system("/usr/local/bin/wlanapctrl restart >/dev/null 2>&1"); + pid(); } -&Header::openpage('WLAN', 1, '', ''); +&Header::openpage('Wireless LAN', 1, '', ''); &Header::openbigbox('100%', 'left', '', $errormessage); if ( $errormessage ){ @@ -146,23 +196,23 @@ $selected{'INTERFACE'}{'blue0'} = ''; $selected{'ENC'}{$wlanapsettings{'INTERFACE'}} = "selected='selected'"; if ( ($wlanapsettings{'INTERFACE'} eq '') ){ - $message = "No WLan Interface selected."; + $message = $Lang::tr{'wlanap select interface'}; &Header::openbox('100%', 'center', "WLAN AP"); print <
-
- -
+

+
+ END ; &Header::closebox(); @@ -173,7 +223,7 @@ END my $cmd_out = `/usr/sbin/iwconfig $wlanapsettings{'INTERFACE'} 2>/dev/null`; if ( $cmd_out eq '' ){ - $message = "Interface is not a WLAN card."; + $message = "$Lang::tr{'wlanap no interface'}"; $wlan_card_status = ''; }else{ $cmd_out = `/sbin/ifconfig | /bin/grep $wlanapsettings{'INTERFACE'}`; @@ -189,17 +239,28 @@ END } } +# Change old "n" to "gn" +if ( $wlanapsettings{'HW_MODE'} eq 'n' ) { + $wlanapsettings{'HW_MODE'}='gn'; +} + $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{'COUNTRY'}{$wlanapsettings{'COUNTRY'}} = "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`; +my $monwlaninterface = $wlanapsettings{'INTERFACE'}; +if ( -d '/sys/class/net/mon.'.$wlanapsettings{'INTERFACE'} ) { + $monwlaninterface = 'mon.'.$wlanapsettings{'INTERFACE'}; +} + +my @channellist_cmd = `iwlist $monwlaninterface channel 2>/dev/null`; # get available channels my @temp; @@ -210,8 +271,23 @@ if ( $channel =~ /\d+/ ){push(@temp,$channel);} } my @channellist = @temp; -my @txpower_cmd = `iwlist $wlanapsettings{'INTERFACE'} txpower`; -# get available channels +my @countrylist_cmd = `regdbdump /usr/lib/crda/regulatory.bin 2>/dev/null`; +# get available country codes + +my @temp; +foreach (@countrylist_cmd){ +$_ =~ /country (.*):/; +$country = $1;chomp $country; +if ( $country =~ /[0,A-Z][0,A-Z]/ ) {push(@temp,$country);} +} +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 + @txpower_cmd = `iwlist txpower 2>/dev/null | sed -e "s|unknown transmit-power information.||g"`; +} +# get available power my @temp; foreach (@txpower_cmd){ @@ -231,29 +307,62 @@ $selected{'DEBUG'}{$wlanapsettings{'DEBUG'}} = "selected='selected'"; &Header::openbox('100%', 'center', "WLAN AP"); print < -WLAN Services END ; + if ( $wlan_card_status ne '' ){ - print "WLAN card ($wlanapsettings{'DRIVER'})"; + print "$Lang::tr{'wlanap wlan services'}"; + print "$Lang::tr{'wlanap wlan card'} ($wlanapsettings{'DRIVER'})"; print $wlan_card_status eq 'up' ? $status_started : $status_stopped; - print "Access Point"; + print "$Lang::tr{'wlanap access point'}"; print $wlan_ap_status eq 'up' ? $status_started : $status_stopped; + }else{ - print "$message"; + print "$message"; +} + print ""; + +if ( ($memory != 0) && (@pid[0] ne "///") && ($wlan_card_status ne '') ){ + print ""; + print ""; + print ""; + print ""; + print ""; + print ""; + print ""; + print ""; + print ""; + print ""; + print ""; + print "
PID$Lang::tr{'memory'}
hostapd    @pid[0]$memory KB
"; } -print ""; -print < - - - - -
-
-END -; +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(); @@ -265,61 +374,93 @@ print <
- - + + - -" +} else { + print < +END +; +} + +print < -"; +} else { + print "" } print < +
WLAN Settings +
$Lang::tr{'wlanap wlan settings'}
SSID: 
Disable SSID broadcast: on / - off
SSID Broadcast: on | off
HW Mode: 
Encryption:  +
$Lang::tr{'wlanap encryption'}: 
Channel:  +END +; + +if ( scalar @channellist > 0 ){ + print <$Lang::tr{'wlanap channel'}: 
$Lang::tr{'wlanap channel'}:  + +
$Lang::tr{'wlanap country'}:  +
Tx Power: 
Tx Power:  END ; -foreach $txpower (@txpower){ - print " dBm"; + +if ( $wlanapsettings{'DRIVER'} eq 'MADWIFI' ){ + print "
Passphrase: 
HT Caps: 
Loglevel (hostapd):  Debuglevel (hostapd): 
@@ -347,10 +488,11 @@ END } print < - - +
- -
+
+
+ +
END @@ -365,10 +507,16 @@ if ( $wlanapsettings{'DRIVER'} eq 'NL80211' ){ print < - +
WLAN Status
$Lang::tr{'wlanap wlan status'}
@channellist_cmd
@txpower_cmd
$status
+
+ + + + +
WLan Clients
 $Lang::tr{'wlanap link wireless'}
 $Lang::tr{'wlanap link dhcp'}
END ; &Header::closebox(); @@ -381,17 +529,30 @@ sub WriteConfig_hostapd{ open (CONFIGFILE, ">/var/ipfire/wlanap/hostapd.conf"); print CONFIGFILE <