Revision: 7066
http://sourceforge.net/p/ipcop/svn/7066
Author: dotzball
Date: 2013-06-09 12:50:18 +0000 (Sun, 09 Jun 2013)
Log Message:
-----------
Show Internal Traffic rule options also if there is only red+green but with
[internal]
custom interfaces defined.
Modified Paths:
--------------
ipcop/trunk/html/cgi-bin/fwrules.cgi
ipcop/trunk/src/libs/firewall-lib.pl
ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
Modified: ipcop/trunk/html/cgi-bin/fwrules.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/fwrules.cgi 2013-06-08 20:21:14 UTC (rev
7065)
+++ ipcop/trunk/html/cgi-bin/fwrules.cgi 2013-06-09 12:50:18 UTC (rev
7066)
@@ -469,7 +469,7 @@
}
if ($printMode eq 'all' || $cgiparams{'RULETYPE'} eq 'PINHOLES') {
- if (&FW::haveBlueNet() || &FW::haveOrangeNet() || &FW::haveIPsecNet()
|| &FW::haveOpenVPNNet()) {
+ if (&FW::haveInternalNet()) {
&printCurrentRules('PINHOLES', $printMode);
print "<br />";
}
@@ -1718,7 +1718,7 @@
END
&printHiddenFormParams('addNewRule');
- if (&FW::haveBlueNet() || &FW::haveOrangeNet() || &FW::haveIPsecNet() ||
&FW::haveOpenVPNNet()) {
+ if (&FW::haveInternalNet()) {
print <<END;
</form>
</td>
Modified: ipcop/trunk/src/libs/firewall-lib.pl
===================================================================
--- ipcop/trunk/src/libs/firewall-lib.pl 2013-06-08 20:21:14 UTC (rev
7065)
+++ ipcop/trunk/src/libs/firewall-lib.pl 2013-06-09 12:50:18 UTC (rev
7066)
@@ -152,6 +152,19 @@
}
}
+sub haveInternalNet
+{
+ my %customIfaces = ();
+ my %customifacesCount = &DATA::readCustIfaces(\%customIfaces);
+
+ if (&haveBlueNet() || &haveOrangeNet() || &haveIPsecNet() ||
&haveOpenVPNNet() || $customifacesCount{'NUM_INTERNAL'} > 0) {
+ return 1;
+ }
+ else {
+ return 0;
+ }
+}
+
sub cleanService
{
my $service = $_[0];
Modified: ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
===================================================================
--- ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2013-06-08 20:21:14 UTC
(rev 7065)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2013-06-09 12:50:18 UTC
(rev 7066)
@@ -12,6 +12,7 @@
/home/httpd/cgi-bin/credits.cgi
/home/httpd/cgi-bin/ddns.cgi
/home/httpd/cgi-bin/dhcp.cgi
+/home/httpd/cgi-bin/fwrules.cgi
/home/httpd/cgi-bin/hosts.cgi
/home/httpd/cgi-bin/index.cgi
/home/httpd/cgi-bin/ipsec.cgi
@@ -31,6 +32,7 @@
/home/httpd/html/images/redirect-background.png
/sbin/mkinitramfs
/usr/lib/ipcop/DataAccess.pl
+/usr/lib/ipcop/firewall-lib.pl
/usr/lib/ipcop/header.pl
/usr/lib/ipcop/library.sh
/usr/lib/ipcop/scheduler-lib.pl
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
How ServiceNow helps IT people transform IT departments:
1. A cloud service to automate IT design, transition and operations
2. Dashboards that offer high-level views of enterprise services
3. A single system of record for all IT processes
http://p.sf.net/sfu/servicenow-d2d-j
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
