webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-26 10:52:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x

Browse Source
This commit is contained in:
Arne Fitzenreiter
2009-03-24 17:59:43 +01:00
parent 6f22aa07b7 23e368ab73
commit e730040279
3 changed files with 27 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
html/cgi-bin/wlanap.cgi
View File

@@ -56,6 +56,7 @@ my $txpower = '';
&General::readhash("/var/ipfire/ethernet/settings", \%netsettings);
$wlanapsettings{'APMODE'} = 'on';
$wlanapsettings{'ACTION'} = '';
$wlanapsettings{'MACMODE'} = '0';
$wlanapsettings{'INTERFACE'} = '';
$wlanapsettings{'SSID'} = 'IPFire';
@@ -69,37 +70,20 @@ $wlanapsettings{'DEBUG'} = '4';
$wlanapsettings{'DRIVER'} = 'MADWIFI';
&General::readhash("/var/ipfire/wlanap/settings", \%wlanapsettings);
&Header::getcgihash(\%wlanapsettings);
my %cgiparams=();
$cgiparams{'ACTION'} = '';
$cgiparams{'APMODE'} = 'on';
$cgiparams{'MACMODE'} = '0';
$cgiparams{'SSID'} = 'IPFire';
$cgiparams{'HIDESSID'} = 'off';
$cgiparams{'ENC'} = 'wpa2'; # none / wep / wpa / wep+wpa
$cgiparams{'TXPOWER'} = 'auto';
$cgiparams{'CHANNEL'} = '05';
$cgiparams{'PWD'} = 'IPFire-2.x';
$cgiparams{'SYSLOGLEVEL'} = '0';
$cgiparams{'DEBUG'} = '4';
&Header::getcgihash(\%cgiparams);
my @macs = $wlanapsettings{'MACS'};
delete $wlanapsettings{'__CGI__'};
delete $wlanapsettings{'x'};
delete $wlanapsettings{'y'};
delete $wlanapsettings{'MACS'};
delete $wlanapsettings{'ACCEPT_MACS'};
delete $wlanapsettings{'DENY_MACS'};
&Header::showhttpheaders();
if ( $cgiparams{'ACTION'} eq "$Lang::tr{'save'}" ){
$wlanapsettings{'SSID'} = $cgiparams{'SSID'};
$wlanapsettings{'MACMODE'} = $cgiparams{'MACMODE'};
$wlanapsettings{'MACS'} = $cgiparams{'MACS'};
$wlanapsettings{'HIDESSID'} = $cgiparams{'HIDESSID'};
$wlanapsettings{'ENC'} = $cgiparams{'ENC'};
$wlanapsettings{'CHANNEL'} = $cgiparams{'CHANNEL'};
$wlanapsettings{'TXPOWER'} = $cgiparams{'TXPOWER'};
$wlanapsettings{'PWD'} = $cgiparams{'PWD'};
$wlanapsettings{'SYSLOGLEVEL'} = $cgiparams{'SYSLOGLEVEL'};
$wlanapsettings{'DEBUG'} = $cgiparams{'DEBUG'};
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.<br />";
@@ -111,20 +95,18 @@ if ( $cgiparams{'ACTION'} eq "$Lang::tr{'save'}" ){
system("/usr/local/bin/wlanapctrl restart >/dev/null 2>&1");
}
}elsif ( $cgiparams{'ACTION'} eq "$Lang::tr{'interface'}" ){
$wlanapsettings{'INTERFACE'} = $cgiparams{'INTERFACE'};
}elsif ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'interface'}" ){
&General::writehash("/var/ipfire/wlanap/settings", \%wlanapsettings);
}elsif ( $cgiparams{'ACTION'} eq 'Start' ){
}elsif ( $wlanapsettings{'ACTION'} eq 'Start' ){
system("/usr/local/bin/wlanapctrl start >/dev/null 2>&1");
}elsif ( $cgiparams{'ACTION'} eq 'Stop' ){
}elsif ( $wlanapsettings{'ACTION'} eq 'Stop' ){
system("/usr/local/bin/wlanapctrl stop >/dev/null 2>&1");
}elsif ( $cgiparams{'ACTION'} eq 'Restart' ){
}elsif ( $wlanapsettings{'ACTION'} eq 'Restart' ){
system("/usr/local/bin/wlanapctrl restart >/dev/null 2>&1");
}
&Header::openpage('WLAN', 1, '', '');
&Header::openbigbox('100%', 'left', '', $errormessage);
print "<form method='post' action='$ENV{'SCRIPT_NAME'}'>";
if ( $errormessage ){
&Header::openbox('100%', 'center', $Lang::tr{'error messages'});
@@ -141,8 +123,8 @@ if ( $errormessage ){
if ( $debug ){
&Header::openbox('100%', 'center', 'DEBUG');
my $debugCount = 0;
foreach my $line (sort keys %cgiparams) {
print "$line = '$cgiparams{$line}'<br />\n";
foreach my $line (sort keys %wlanapsettings) {
print "$line = '$wlanapsettings{$line}'<br />\n";
$debugCount++;
}
print "&nbsp;Count: $debugCount\n";
@@ -278,6 +260,7 @@ if ( $wlan_card_status eq '' ){
}
print <<END
<br />
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<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>
@@ -435,12 +418,11 @@ END
}
close CONFIGFILE;
$wlanapsettings{'MACS'} =~ s/\r//gi;
chomp($wlanapsettings{'MACS'});
open (MACFILE, ">/var/ipfire/wlanap/macfile");
print MACFILE <<END
$wlanapsettings{'MACS'}
END
;
foreach(@macs){
$_ =~ s/\r//gi;
chomp($_);
if ( $_ ne "" ){print MACFILE $_;}
}
close MACFILE;
}

2
lfs/hostapd
View File

@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = hostapd
PAK_VER = 10
PAK_VER = 11
DEPS = ""

8
lfs/qemu
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2009 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 #
@@ -24,7 +24,7 @@
include Config
VER = 0.10.0
VER = 0.10.1
THISAPP = qemu-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = qemu
PAK_VER = 4
PAK_VER = 5
DEPS = "sdl"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 8dc50b834fa3f5f6a17d7bc3d0559e53
$(DL_FILE)_MD5 = 99b6da099343f6a32e02211aa5925154
install : $(TARGET)