Revision: 2770
http://ipcop.svn.sourceforge.net/ipcop/?rev=2770&view=rev
Author: riddles
Date: 2009-05-02 15:31:27 +0000 (Sat, 02 May 2009)
Log Message:
-----------
Merged /ipcop/trunk:r2760-2769
Modified Paths:
--------------
ipcop/branches/template-branch/html/cgi-bin/dhcp.cgi
ipcop/branches/template-branch/html/cgi-bin/ovpnmain.cgi
ipcop/branches/template-branch/html/cgi-bin/updates.cgi
ipcop/branches/template-branch/html/html/pages/updates.tpl
ipcop/branches/template-branch/lfs/acpid
Property Changed:
----------------
ipcop/branches/template-branch/
Property changes on: ipcop/branches/template-branch
___________________________________________________________________
Added: svn:mergeinfo
+ /ipcop/trunk:2760-2769
Modified: ipcop/branches/template-branch/html/cgi-bin/dhcp.cgi
===================================================================
--- ipcop/branches/template-branch/html/cgi-bin/dhcp.cgi 2009-05-02
15:20:58 UTC (rev 2769)
+++ ipcop/branches/template-branch/html/cgi-bin/dhcp.cgi 2009-05-02
15:31:27 UTC (rev 2770)
@@ -57,8 +57,8 @@
my %checked = ();
my $debug = 0;
-my $disable_main = 0;
-my $disable_fixed = 1;
+my $disable_main = 0; # 1 = only show (non-editable) some vital
information in the main box
+my $disable_fixed = 1; # 1 = only show fixed leases, 0 = fields to
add fixed lease become usable
# get IPCop settings
&General::readhash('/var/ipcop/ethernet/settings', \%netsettings);
@@ -429,17 +429,17 @@
<td width='25%' class='base'>$Lang::tr{'enabled'}:<input type='checkbox'
name='ENABLED_${interface}_${counter}' $checked{'ENABLED'}{'on'} $disable_text
/></td>
<td width='25%' class='base'>$Lang::tr{'ip
address'}/$Lang::tr{'netmask'}:</td>
<td width='25%'
class='base'><b>$netsettings{"${interface}_${counter}_ADDRESS"}/$netsettings{"${interface}_${counter}_NETMASK"}</b></td>
+</tr><tr>
+ <td width='25%' class='base'>$Lang::tr{'start address'}: <img
src='/blob.gif' alt='*' /></td>
+ <td width='25%'><input type='text'
name='START_ADDR_${interface}_${counter}'
value='$dhcpsettings{"START_ADDR_${interface}_${counter}"}' $disable_text
/></td>
+ <td width='25%' class='base'>$Lang::tr{'end address'}: <img
src='/blob.gif' alt='*' /></td>
+ <td width='25%'><input type='text' name='END_ADDR_${interface}_${counter}'
value='$dhcpsettings{"END_ADDR_${interface}_${counter}"}' $disable_text /></td>
</tr>
END
;
if ($disable_main == 0) {
print <<END
<tr>
- <td width='25%' class='base'>$Lang::tr{'start address'}: <img
src='/blob.gif' alt='*' /></td>
- <td width='25%'><input type='text'
name='START_ADDR_${interface}_${counter}'
value='$dhcpsettings{"START_ADDR_${interface}_${counter}"}' /></td>
- <td width='25%' class='base'>$Lang::tr{'end address'}: <img
src='/blob.gif' alt='*' /></td>
- <td width='25%'><input type='text' name='END_ADDR_${interface}_${counter}'
value='$dhcpsettings{"END_ADDR_${interface}_${counter}"}' /></td>
-</tr><tr>
<td class='base'>$Lang::tr{'default lease time'}:</td>
<td><input type='text' name='DEFAULT_LEASE_TIME_${interface}_${counter}'
value='$dhcpsettings{"DEFAULT_LEASE_TIME_${interface}_${counter}"}' size='5'
/></td>
<td class='base'>$Lang::tr{'domain name suffix'}: <img
src='/blob.gif' alt='*' /></td>
Modified: ipcop/branches/template-branch/html/cgi-bin/ovpnmain.cgi
===================================================================
--- ipcop/branches/template-branch/html/cgi-bin/ovpnmain.cgi 2009-05-02
15:20:58 UTC (rev 2769)
+++ ipcop/branches/template-branch/html/cgi-bin/ovpnmain.cgi 2009-05-02
15:31:27 UTC (rev 2770)
@@ -22,6 +22,7 @@
require '/usr/lib/ipcop/lang.pl';
require '/usr/lib/ipcop/header.pl';
require '/usr/lib/ipcop/countries.pl';
+require '/usr/lib/ipcop/DataAccess.pl';
# enable only the following on debugging purpose
use warnings;
@@ -111,143 +112,6 @@
}
}
-sub checkportfw {
- my $KEY2 = $_[0]; # key2
- my $SRC_PORT = $_[1]; # src_port
- my $PROTOCOL = $_[2]; # protocol
- my $SRC_IP = $_[3]; # sourceip
-
- my $pfwfilename = "/var/ipcop/portfw/config";
- open(FILE, $pfwfilename) or die 'Unable to open config file.';
- my @pfwcurrent = <FILE>;
- close(FILE);
- my $pfwkey1 = 0; # used for finding last sequence number used
- foreach my $pfwline (@pfwcurrent)
- {
- my @pfwtemp = split(/\,/,$pfwline);
-
- chomp ($pfwtemp[8]);
- if ($KEY2 eq "0") {
- # if key2 is 0 then it is a portfw addition
- if ( $SRC_PORT eq $pfwtemp[3] && $PROTOCOL eq $pfwtemp[2] &&
$SRC_IP eq $pfwtemp[7]) {
- $errormessage = "$Lang::tr{'source port in use'}: $SRC_PORT";
- }
-
- # Check if key2 = 0, if it is then it is a port forward entry and
we want the sequence number
- if ( $pfwtemp[1] eq "0") {
- $pfwkey1=$pfwtemp[0];
- }
-
- # Darren Critchley - Duplicate or overlapping Port range check
- if ($pfwtemp[1] eq "0" && $PROTOCOL eq $pfwtemp[2] && $SRC_IP eq
$pfwtemp[7] && $errormessage eq '')
- {
- &portchecks($SRC_PORT, $pfwtemp[5]);
- }
- }
- }
- return;
-}
-
-sub checkportoverlap
-{
- my $portrange1 = $_[0]; # New port range
- my $portrange2 = $_[1]; # existing port range
- my @tempr1 = split(/\:/,$portrange1);
- my @tempr2 = split(/\:/,$portrange2);
-
- unless (&checkportinc($tempr1[0], $portrange2)){ return 0;}
- unless (&checkportinc($tempr1[1], $portrange2)){ return 0;}
-
- unless (&checkportinc($tempr2[0], $portrange1)){ return 0;}
- unless (&checkportinc($tempr2[1], $portrange1)){ return 0;}
-
- return 1; # Everything checks out!
-}
-
-# Darren Critchley - we want to make sure that a port entry is not within an
already existing range
-sub checkportinc
-{
- my $port1 = $_[0]; # Port
- my $portrange2 = $_[1]; # Port range
- my @tempr1 = split(/\:/,$portrange2);
-
- if ($port1 < $tempr1[0] || $port1 > $tempr1[1]) {
- return 1;
- } else {
- return 0;
- }
-}
-# Darren Critchley - Duplicate or overlapping Port range check
-sub portchecks
-{
- my $p1 = $_[0]; # New port range
- my $p2 = $_[1]; # existing port range
-# $_ = $_[0];
- our ($prtrange1, $prtrange2);
- $prtrange1 = 0;
-# if (m/:/ && $prtrange1 == 1) { # comparing two port ranges
-# unless (&checkportoverlap($p1,$p2)) {
-# $errormessage = "$Lang::tr{'source port overlaps'} $p1";
-# }
-# }
- if (m/:/ && $prtrange1 == 0 && $errormessage eq '') { # compare one port
to a range
- unless (&checkportinc($p2,$p1)) {
- $errormessage = "$Lang::tr{'srcprt within existing'} $p1";
- }
- }
- $prtrange1 = 1;
- if (! m/:/ && $prtrange1 == 1 && $errormessage eq '') { # compare one port
to a range
- unless (&checkportinc($p1,$p2)) {
- $errormessage = "$Lang::tr{'srcprt range overlaps'} $p2";
- }
- }
- return;
-}
-
-# Darren Critchley - certain ports are reserved for Ipcop
-# TCP 67,68,81,222,445
-# UDP 67,68
-# Params passed in -> port, rangeyn, protocol
-sub disallowreserved
-{
- # port 67 and 68 same for tcp and udp, don't bother putting in an array
- my $msg = "";
- my @tcp_reserved = (81,222,445);
- my $prt = $_[0]; # the port or range
- my $ryn = $_[1]; # tells us whether or not it is a port range
- my $prot = $_[2]; # protocol
- my $srcdst = $_[3]; # source or destination
- if ($ryn) { # disect port range
- if ($srcdst eq "src") {
- $msg = "$Lang::tr{'rsvd src port overlap'}:";
- } else {
- $msg = "$Lang::tr{'rsvd dst port overlap'}:";
- }
- my @tmprng = split(/\:/,$prt);
- unless (67 < $tmprng[0] || 67 > $tmprng[1]) { $errormessage="$msg 67";
return; }
- unless (68 < $tmprng[0] || 68 > $tmprng[1]) { $errormessage="$msg 68";
return; }
- if ($prot eq "tcp") {
- foreach my $prange (@tcp_reserved) {
- unless ($prange < $tmprng[0] || $prange > $tmprng[1]) {
$errormessage="$msg $prange"; return; }
- }
- }
- } else {
- if ($srcdst eq "src") {
- $msg = "$Lang::tr{'reserved src port'}:";
- } else {
- $msg = "$Lang::tr{'reserved dst port'}:";
- }
- if ($prt == 67) { $errormessage="$msg 67"; return; }
- if ($prt == 68) { $errormessage="$msg 68"; return; }
- if ($prot eq "tcp") {
- foreach my $prange (@tcp_reserved) {
- if ($prange == $prt) { $errormessage="$msg $prange"; return; }
- }
- }
- }
- return;
-}
-
sub writeserverconf {
my %sovpnsettings = ();
&General::readhash('/var/ipcop/ovpn/settings', \%sovpnsettings);
@@ -520,19 +384,15 @@
goto SETTINGS_ERROR;
}
}
- if ($cgiparams{'ENABLED_RED_1'} eq 'on') {
-
&disallowreserved($cgiparams{'DDEST_PORT'},0,$cgiparams{'DPROTOCOL'},"dest");
+ if (($cgiparams{'DPROTOCOL'} ne $vpnsettings{'DPROTOCOL'}) ||
($cgiparams{'DDEST_PORT'} ne $vpnsettings{'DDEST_PORT'})) {
+ # Verify port (usually udp/1994) only if want to change it.
+ if
(&DATA::isReservedPort($cgiparams{'DPROTOCOL'},$cgiparams{'DDEST_PORT'})) {
+ $errormessage = $Lang::tr{'reserved dst port'};
+ goto SETTINGS_ERROR;
+ }
}
- if ($errormessage) {
- goto SETTINGS_ERROR;
- }
- if ($cgiparams{'ENABLED_RED_1'} eq 'on') {
-
&checkportfw(0,$cgiparams{'DDEST_PORT'},$cgiparams{'DPROTOCOL'},'0.0.0.0');
- }
- if ($errormessage) {
- goto SETTINGS_ERROR;
- }
+ # TODO: checking for portforwards will need to be done differently.
if (! &General::validipandmask($cgiparams{'DOVPN_SUBNET'})) {
$errormessage = $Lang::tr{'ovpn subnet is invalid'};
Modified: ipcop/branches/template-branch/html/cgi-bin/updates.cgi
===================================================================
--- ipcop/branches/template-branch/html/cgi-bin/updates.cgi 2009-05-02
15:20:58 UTC (rev 2769)
+++ ipcop/branches/template-branch/html/cgi-bin/updates.cgi 2009-05-02
15:31:27 UTC (rev 2770)
@@ -274,29 +274,36 @@
my $patchsize = 0;
$patchsize = (stat('/var/patches/patch.tgz.gpg'))[7] / 1024 / 1024 if (-e
'/var/patches/patch.tgz.gpg');
- # alert on rootfs available < 20MB, on boot 1MB, on /var/log 1MB
- my @alert = (20 - $patchsize, 1, 1);
- for (my $count = 0; $count <= $#df; $count++) {
- my $tmp = ((@df))[$count];
- $tmp =~ /([\w\/]+)\s+(\d+)M\s+(\d+)M\s+(\d+)M\s+(\d+)%\s+([\w\/]+)/;
- my ($dev, $mount, $size, $used, $free, $percent) = ($1, $6, $2, $3,
$4, $5);
- if (! $mount) {
- $dev = $tmp;
- $count++;
- $tmp = ((@df))[$count];
- $tmp =~ /(\d+)M\s+(\d+)M\s+(\d+)M\s+(\d+)%\s+([\w\/]+)/;
- ($mount, $size, $used, $free, $percent) = ($5, $1, $2, $3, $4);
- }
- my $alert = 0;
- $alert = 1 if ($free <= $alert[$count]);
+ # merge all lines to one single line separated by spaces
+ my $all_inOneLine = join(' ', @df);
+
+ # now get all entries in an array
+ my @all_entries = split(' ', $all_inOneLine);
+
+ # alert on rootfs available < 32MB, on /var/log 1MB
+ my @alert = (32 - $patchsize, 1);
+
+ my $count = 0;
+ # loop over all entries. Six entries belong together.
+ while (@all_entries > 0) {
+
+ my $dev = shift(@all_entries);
+ my $size = shift(@all_entries);
+ my $used = shift(@all_entries);
+ my $free = shift(@all_entries);
+ my $percent = shift(@all_entries);
+ my $mount = shift(@all_entries);
+
+ my $lalert = 1 if ($free <= $alert[$count]);
$diskspace{$dev} = {
'mount' => $mount,
'size' => $size,
'used' => $used,
'free' => $free,
'percent' => $percent,
- 'alert' => $alert,
+ 'alert' => $lalert,
};
+ $count++;
}
}
Modified: ipcop/branches/template-branch/html/html/pages/updates.tpl
===================================================================
--- ipcop/branches/template-branch/html/html/pages/updates.tpl 2009-05-02
15:20:58 UTC (rev 2769)
+++ ipcop/branches/template-branch/html/html/pages/updates.tpl 2009-05-02
15:31:27 UTC (rev 2770)
@@ -111,17 +111,17 @@
</tr>
[% FOREACH d IN diskspace %]
[% IF d.value.alert %]
- [% alertstyle = "style='background-color: #FF0000;'" %]
+ [% alertstyle = "class='ipcop_error'" %]
[% ELSE %]
[% alertstyle = '' %]
[%END %]
- <tr>
- <td valign='top' [% alertstyle %]>[% d.key %]</td>
- <td valign='top' [% alertstyle %]>[% d.value.mount %]</td>
- <td valign='top' [% alertstyle %]>[% d.value.size %]</td>
- <td valign='top' [% alertstyle %]>[% d.value.used %]</td>
- <td valign='top' [% alertstyle %]>[% d.value.free %]</td>
- <td valign='top' [% alertstyle %]>[% d.value.perdent %]</td>
+ <tr [% alertstyle %]>
+ <td>[% d.key %]</td>
+ <td>[% d.value.mount %]</td>
+ <td align='right'>[% d.value.size %]</td>
+ <td align='right'>[% d.value.used %]</td>
+ <td align='right'>[% d.value.free %]</td>
+ <td align='right'>[% d.value.perdent %]</td>
</tr>
[% END %]
</table>
Modified: ipcop/branches/template-branch/lfs/acpid
===================================================================
--- ipcop/branches/template-branch/lfs/acpid 2009-05-02 15:20:58 UTC (rev
2769)
+++ ipcop/branches/template-branch/lfs/acpid 2009-05-02 15:31:27 UTC (rev
2770)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = acpid
-VER = 1.0.8
+VER = 1.0.10
HOST_ARCH = i486
OTHER_SRC = yes
@@ -43,7 +43,7 @@
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
-PATCH1 = $(PKG_NAME)_$(VER)-7.diff.gz
+PATCH1 = $(PKG_NAME)_$(VER)-1.diff.gz
###############################################################################
# Top-level Rules
@@ -55,8 +55,8 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(PATCH1) = $(URL_DEBIAN)/a/acpid/$(PATCH1)
-$(DL_FILE)_MD5 = 1d9c52fe2c0b51f8463f357c2a3d3ddb
-$(PATCH1)_MD5 = 4ab863f863188684383dee1d20aeb767
+$(DL_FILE)_MD5 = 61156ef32015c56dc0f2e3317f4ae09e
+$(PATCH1)_MD5 = 5ac5e06f123fdfbd7d1e1e0a71c752f3
install : $(TARGET)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Register Now & Save for Velocity, the Web Performance & Operations
Conference from O'Reilly Media. Velocity features a full day of
expert-led, hands-on workshops and two days of sessions from industry
leaders in dedicated Performance & Operations tracks. Use code vel09scf
and Save an extra 15% before 5/3. http://p.sf.net/sfu/velocityconf
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
