Revision: 6403
http://ipcop.svn.sourceforge.net/ipcop/?rev=6403&view=rev
Author: dotzball
Date: 2012-02-22 16:41:36 +0000 (Wed, 22 Feb 2012)
Log Message:
-----------
Fix time firewall rules, spotted by Paulo Dani. Thanks!
Modified Paths:
--------------
ipcop/trunk/src/scripts/puzzleFwRules.pl
ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
Modified: ipcop/trunk/src/scripts/puzzleFwRules.pl
===================================================================
--- ipcop/trunk/src/scripts/puzzleFwRules.pl 2012-02-21 23:32:46 UTC (rev
6402)
+++ ipcop/trunk/src/scripts/puzzleFwRules.pl 2012-02-22 16:41:36 UTC (rev
6403)
@@ -369,13 +369,23 @@
# current hour is the same as Start Hour
- # start minute is in future but nearer then switch minute
- if ( $minute < $rule->{'START_MINUTE'}
- && $rule->{'START_MINUTE'} < $switchMinute)
- {
- $update = 1;
- $switchHour = $rule->{'START_HOUR'};
- $switchMinute = $rule->{'START_MINUTE'};
+ if ($minute < $rule->{'START_MINUTE'}) {
+
+ # when switchHour is in future
+ if ($rule->{'START_HOUR'} < $switchHour)
+ {
+ $update = 1;
+ $switchHour = $rule->{'START_HOUR'};
+ $switchMinute = $rule->{'START_MINUTE'};
+ }
+
+ # start minute is in future but nearer then switch minute
+ if ($rule->{'START_MINUTE'} < $switchMinute)
+ {
+ $update = 1;
+ $switchHour = $rule->{'START_HOUR'};
+ $switchMinute = $rule->{'START_MINUTE'};
+ }
}
}
Modified: ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
===================================================================
--- ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-02-21 23:32:46 UTC
(rev 6402)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-02-22 16:41:36 UTC
(rev 6403)
@@ -14,6 +14,7 @@
/usr/lib/ipcop/general-functions.pl
/usr/lib/ipcop/library.sh
/usr/local/bin/blacklistupdate.pl
+/usr/local/bin/puzzleFwRules.pl
/usr/share/locale/af_ZA/LC_MESSAGES/ipcop.mo
/usr/share/locale/bg_BG/LC_MESSAGES/ipcop.mo
/usr/share/locale/ca_ES/LC_MESSAGES/ipcop.mo
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
