From 7ebdc6c23847e1f7a4c3ad1765eb183cae7a0911 Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Fri, 11 Mar 2011 10:11:42 -0800 Subject: [PATCH] see #2207, #2209, fixes #2213 all objects created by compilers are placed in persistent_objects library; CompilerDriver creates and manages persistent_objects lib; changes in libfwbuilder - an object can be a child of only one parent in the tree, method FWObject::add() enforces this and FWObject::findDuplicateLinks() can be used to find objects with multiple parents --- VERSION | 2 +- VERSION.h | 2 +- doc/ChangeLog | 6 + packaging/fwbuilder-static-qt.spec | 2 +- packaging/fwbuilder.control | 2 +- packaging/fwbuilder.spec | 2 +- src/cisco_lib/CompilerDriver_iosacl_run.cpp | 35 ++-- src/cisco_lib/CompilerDriver_pix_run.cpp | 45 ++-- .../CompilerDriver_procurve_acl_run.cpp | 35 ++-- src/cisco_lib/NATCompiler_pix.h | 2 +- src/cisco_lib/NamedObject.h | 3 +- src/cisco_lib/PolicyCompiler_cisco.cpp | 21 +- src/cisco_lib/PolicyCompiler_iosacl.cpp | 27 +-- src/compiler_lib/CompilerDriver.cpp | 20 +- src/compiler_lib/CompilerDriver.h | 1 + src/iptlib/CompilerDriver_ipt_nat.cpp | 2 + src/iptlib/CompilerDriver_ipt_policy.cpp | 3 + src/iptlib/CompilerDriver_ipt_run.cpp | 9 + src/iptlib/MangleTableCompiler_ipt.cpp | 4 +- src/iptlib/NATCompiler_ipt.cpp | 19 +- src/iptlib/PolicyCompiler_ipt.cpp | 39 ++-- src/iptlib/utils.cpp | 6 +- src/iptlib/utils.h | 5 +- .../src/fwbuilder/AddressTable.cpp | 16 +- src/libfwbuilder/src/fwbuilder/DNSName.cpp | 12 ++ src/libfwbuilder/src/fwbuilder/FWObject.cpp | 194 ++++++++++++++---- src/libfwbuilder/src/fwbuilder/FWObject.h | 21 +- .../src/fwbuilder/FWObjectDatabase.cpp | 2 +- src/libfwbuilder/src/fwbuilder/RuleSet.cpp | 16 +- src/libfwbuilder/src/fwcompiler/Compiler.cpp | 142 ++++++++----- src/libfwbuilder/src/fwcompiler/Compiler.h | 11 +- .../src/fwcompiler/NATCompiler.cpp | 44 ++-- .../src/fwcompiler/PolicyCompiler.cpp | 33 ++- .../src/fwcompiler/PolicyCompiler.h | 4 +- .../src/fwcompiler/Preprocessor.cpp | 16 +- .../src/fwcompiler/RoutingCompiler.cpp | 87 +++----- .../src/fwcompiler/RoutingCompiler.h | 11 +- src/pflib/CompilerDriver_ipf_run.cpp | 33 +-- src/pflib/CompilerDriver_ipfw_run.cpp | 32 +-- src/pflib/CompilerDriver_pf_run.cpp | 45 ++-- src/pflib/NATCompiler_ipf.cpp | 21 +- src/pflib/NATCompiler_pf.cpp | 40 ++-- src/pflib/NATCompiler_pf.h | 19 +- src/pflib/OSConfigurator_bsd.cpp | 2 +- src/pflib/OSConfigurator_bsd.h | 2 +- src/pflib/OSConfigurator_bsd_interfaces.cpp | 4 +- src/pflib/PolicyCompiler_ipf.cpp | 19 +- src/pflib/PolicyCompiler_ipfw.cpp | 19 +- src/pflib/PolicyCompiler_pf.cpp | 88 ++++---- src/pflib/PolicyCompiler_pf.h | 2 + src/pflib/TableFactory.cpp | 40 ++-- src/pflib/TableFactory.h | 3 +- test/ipt/cluster1_secuwall-1.fw.orig | 6 +- test/ipt/firewall-base-rulesets.fw.orig | 6 +- test/ipt/firewall-ipv6-1.fw.orig | 6 +- test/ipt/firewall-ipv6-2.fw.orig | 6 +- test/ipt/firewall-ipv6-3.fw.orig | 6 +- test/ipt/firewall-ipv6-4-1.fw.orig | 6 +- test/ipt/firewall-ipv6-4.fw.orig | 6 +- test/ipt/firewall-ipv6-5.fw.orig | 6 +- test/ipt/firewall-ipv6-6.fw.orig | 6 +- test/ipt/firewall-ipv6-7.fw.orig | 6 +- test/ipt/firewall-ipv6-8.fw.orig | 6 +- ...-ipv6-ipt-reset-prolog-after-flush.fw.orig | 6 +- ...-ipt-reset-prolog-after-interfaces.fw.orig | 6 +- ...firewall-ipv6-ipt-reset-prolog-top.fw.orig | 6 +- .../firewall-ipv6-prolog-after-flush.fw.orig | 6 +- ...ewall-ipv6-prolog-after-interfaces.fw.orig | 6 +- test/ipt/firewall-ipv6-prolog-top.fw.orig | 6 +- test/ipt/firewall-server-1-s.fw.orig | 6 +- test/ipt/firewall.fw.orig | 6 +- test/ipt/firewall1.fw.orig | 6 +- test/ipt/firewall10.fw.orig | 6 +- test/ipt/firewall11.fw.orig | 6 +- test/ipt/firewall12.fw.orig | 6 +- test/ipt/firewall13.fw.orig | 6 +- test/ipt/firewall14.fw.orig | 6 +- test/ipt/firewall15.fw.orig | 6 +- test/ipt/firewall16.fw.orig | 6 +- test/ipt/firewall17.fw.orig | 6 +- test/ipt/firewall18.fw.orig | 6 +- test/ipt/firewall19.fw.orig | 6 +- test/ipt/firewall2-1.fw.orig | 6 +- test/ipt/firewall2-2.fw.orig | 6 +- test/ipt/firewall2-3.fw.orig | 6 +- test/ipt/firewall2-4.fw.orig | 6 +- test/ipt/firewall2-5.fw.orig | 6 +- test/ipt/firewall2-6.fw.orig | 6 +- test/ipt/firewall2-7.fw.orig | 6 +- test/ipt/firewall2.fw.orig | 6 +- test/ipt/firewall20-ipv6.fw.orig | 6 +- test/ipt/firewall20.fw.orig | 6 +- test/ipt/firewall21-1.fw.orig | 6 +- test/ipt/firewall21.fw.orig | 6 +- test/ipt/firewall22.fw.orig | 6 +- test/ipt/firewall23-1.fw.orig | 6 +- test/ipt/firewall23.fw.orig | 6 +- test/ipt/firewall24.fw.orig | 6 +- test/ipt/firewall25.fw.orig | 6 +- test/ipt/firewall26.fw.orig | 6 +- test/ipt/firewall27.fw.orig | 6 +- test/ipt/firewall28.fw.orig | 6 +- test/ipt/firewall29.fw.orig | 6 +- test/ipt/firewall3.fw.orig | 6 +- test/ipt/firewall30.fw.orig | 6 +- test/ipt/firewall31.fw.orig | 6 +- test/ipt/firewall32.fw.orig | 6 +- test/ipt/firewall33-1.fw.orig | 16 +- test/ipt/firewall33.fw.orig | 16 +- test/ipt/firewall34.fw.orig | 6 +- test/ipt/firewall35.fw.orig | 6 +- test/ipt/firewall36-1.fw.orig | 6 +- test/ipt/firewall36-2.fw.orig | 6 +- test/ipt/firewall36.fw.orig | 6 +- test/ipt/firewall37-1.fw.orig | 6 +- test/ipt/firewall37.fw.orig | 6 +- test/ipt/firewall38.fw.orig | 6 +- test/ipt/firewall39.fw.orig | 6 +- test/ipt/firewall4.fw.orig | 6 +- test/ipt/firewall40-1.fw.orig | 6 +- test/ipt/firewall40-2.fw.orig | 6 +- test/ipt/firewall40.fw.orig | 6 +- test/ipt/firewall41-1.fw.orig | 6 +- test/ipt/firewall41.fw.orig | 8 +- test/ipt/firewall42.fw.orig | 6 +- test/ipt/firewall5.fw.orig | 6 +- test/ipt/firewall50.fw.orig | 6 +- test/ipt/firewall51.fw.orig | 6 +- test/ipt/firewall6.fw.orig | 6 +- test/ipt/firewall60.fw.orig | 6 +- test/ipt/firewall61-1.2.5.fw.orig | 6 +- test/ipt/firewall61-1.2.6.fw.orig | 6 +- test/ipt/firewall61-1.3.x.fw.orig | 6 +- test/ipt/firewall61-1.4.fw.orig | 6 +- test/ipt/firewall62.fw.orig | 6 +- test/ipt/firewall63.fw.orig | 6 +- test/ipt/firewall7.fw.orig | 6 +- test/ipt/firewall70.fw.orig | 6 +- test/ipt/firewall71.fw.orig | 6 +- test/ipt/firewall72-1.3.x.fw.orig | 6 +- test/ipt/firewall72-1.4.3.fw.orig | 6 +- test/ipt/firewall73.fw.orig | 6 +- test/ipt/firewall74.fw.orig | 6 +- test/ipt/firewall8.fw.orig | 6 +- test/ipt/firewall80.fw.orig | 6 +- test/ipt/firewall81.fw.orig | 6 +- test/ipt/firewall82.fw.orig | 6 +- test/ipt/firewall82_A.fw.orig | 6 +- test/ipt/firewall82_B.fw.orig | 6 +- test/ipt/firewall9.fw.orig | 6 +- test/ipt/firewall90.fw.orig | 6 +- test/ipt/firewall91.fw.orig | 6 +- test/ipt/firewall92.fw.orig | 6 +- test/ipt/firewall93.fw.orig | 6 +- test/ipt/fw-A.fw.orig | 6 +- test/ipt/fw1.fw.orig | 6 +- test/ipt/fwbuilder.fw.orig | 6 +- .../heartbeat_cluster_1_d_linux-1-d.fw.orig | 6 +- .../heartbeat_cluster_1_d_linux-2-d.fw.orig | 6 +- test/ipt/heartbeat_cluster_1_linux-1.fw.orig | 6 +- test/ipt/heartbeat_cluster_1_linux-2.fw.orig | 6 +- test/ipt/heartbeat_cluster_2_linux-1.fw.orig | 6 +- test/ipt/heartbeat_cluster_2_linux-2.fw.orig | 6 +- test/ipt/host.fw.orig | 6 +- test/ipt/openais_cluster_1_linux-1.fw.orig | 6 +- test/ipt/openais_cluster_1_linux-2.fw.orig | 6 +- test/ipt/rc.firewall.local | 4 +- test/ipt/rh90.fw.orig | 6 +- .../ipt/secuwall_cluster_1_secuwall-1.fw.orig | 6 +- test/ipt/server-cluster-1_server-1.fw.orig | 6 +- test/ipt/server-cluster-1_server-2.fw.orig | 6 +- test/ipt/test-shadowing-1.fw.orig | 6 +- test/ipt/test-shadowing-2.fw.orig | 6 +- test/ipt/test-shadowing-3.fw.orig | 6 +- test/ipt/test_fw.fw.orig | 6 +- test/ipt/vrrp_cluster_1_linux-1.fw.orig | 6 +- test/ipt/vrrp_cluster_1_linux-2.fw.orig | 6 +- test/ipt/vrrp_cluster_2_linux-1.fw.orig | 6 +- test/ipt/vrrp_cluster_2_linux-2.fw.orig | 6 +- test/ipt/vrrp_cluster_2_linux-3.fw.orig | 6 +- 180 files changed, 1154 insertions(+), 904 deletions(-) diff --git a/VERSION b/VERSION index 4685d3e69..9f7d3083f 100644 --- a/VERSION +++ b/VERSION @@ -7,7 +7,7 @@ FWB_MICRO_VERSION=0 # build number is like "nano" version number. I am incrementing build # number during development cycle # -BUILD_NUM="3498" +BUILD_NUM="3499" VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM" diff --git a/VERSION.h b/VERSION.h index eac3f214f..35538c74f 100644 --- a/VERSION.h +++ b/VERSION.h @@ -1,2 +1,2 @@ -#define VERSION "4.2.0.3498" +#define VERSION "4.2.0.3499" #define GENERATION "4.2" diff --git a/doc/ChangeLog b/doc/ChangeLog index 01ab0d86f..899fc7f34 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,9 @@ +2011-03-10 vadim + + * libfwbuilder/src/fwcompiler/Compiler.cpp (Compiler): see #2207 + fixed memory leak in policy compilers. The impact of this leak was + especially severe on Windows with very large object databases. + 2011-03-08 vadim * CustomServiceDialog.cpp (loadFWObject): fixes #2201 "Some fields diff --git a/packaging/fwbuilder-static-qt.spec b/packaging/fwbuilder-static-qt.spec index 2af81b547..748bbdaf3 100644 --- a/packaging/fwbuilder-static-qt.spec +++ b/packaging/fwbuilder-static-qt.spec @@ -3,7 +3,7 @@ %define name fwbuilder -%define version 4.2.0.3498 +%define version 4.2.0.3499 %define release 1 %if "%_vendor" == "MandrakeSoft" diff --git a/packaging/fwbuilder.control b/packaging/fwbuilder.control index 45c46faf1..caf1fda52 100644 --- a/packaging/fwbuilder.control +++ b/packaging/fwbuilder.control @@ -4,6 +4,6 @@ Replaces: fwbuilder (<=4.1.1-1), fwbuilder-common, fwbuilder-bsd, fwbuilder-linu Priority: extra Section: checkinstall Maintainer: vadim@fwbuilder.org -Version: 4.2.0.3498-1 +Version: 4.2.0.3499-1 Depends: libqt4-gui (>= 4.3.0), libxml2, libxslt1.1, libsnmp | libsnmp15 Description: Firewall Builder GUI and policy compilers diff --git a/packaging/fwbuilder.spec b/packaging/fwbuilder.spec index 2d9f1211b..6de6afe88 100644 --- a/packaging/fwbuilder.spec +++ b/packaging/fwbuilder.spec @@ -1,6 +1,6 @@ %define name fwbuilder -%define version 4.2.0.3498 +%define version 4.2.0.3499 %define release 1 %if "%_vendor" == "MandrakeSoft" diff --git a/src/cisco_lib/CompilerDriver_iosacl_run.cpp b/src/cisco_lib/CompilerDriver_iosacl_run.cpp index 4e383ed4f..eaf4b677f 100644 --- a/src/cisco_lib/CompilerDriver_iosacl_run.cpp +++ b/src/cisco_lib/CompilerDriver_iosacl_run.cpp @@ -44,28 +44,22 @@ #include "NamedObjectsAndGroupsSupport.h" #include "NamedObjectsManagerIOS.h" -#include "fwbuilder/Resources.h" -#include "fwbuilder/FWObjectDatabase.h" -#include "fwbuilder/XMLTools.h" -#include "fwbuilder/FWException.h" -#include "fwbuilder/Firewall.h" -#include "fwbuilder/Interface.h" -#include "fwbuilder/Policy.h" -#include "fwbuilder/NAT.h" -#include "fwbuilder/Routing.h" - -#include "fwcompiler/Preprocessor.h" - -#include "fwbuilder/Resources.h" -#include "fwbuilder/FWObjectDatabase.h" -#include "fwbuilder/FWException.h" #include "fwbuilder/Cluster.h" #include "fwbuilder/ClusterGroup.h" +#include "fwbuilder/FWException.h" +#include "fwbuilder/FWObjectDatabase.h" +#include "fwbuilder/FailoverClusterGroup.h" #include "fwbuilder/Firewall.h" #include "fwbuilder/Interface.h" +#include "fwbuilder/Library.h" +#include "fwbuilder/NAT.h" #include "fwbuilder/Policy.h" +#include "fwbuilder/Resources.h" +#include "fwbuilder/Routing.h" #include "fwbuilder/StateSyncClusterGroup.h" -#include "fwbuilder/FailoverClusterGroup.h" +#include "fwbuilder/XMLTools.h" + +#include "fwcompiler/Preprocessor.h" #include #include @@ -250,6 +244,7 @@ QString CompilerDriver_iosacl::run(const std::string &cluster_id, c.setNamedObjectsManager(&named_objects_manager); c.setSourceRuleSet( policy ); c.setRuleSetName(policy->getName()); + c.setPersistentObjects(persistent_objects); c.setSingleRuleCompileMode(single_rule_id); if (inTestMode()) c.setTestMode(); @@ -301,6 +296,7 @@ QString CompilerDriver_iosacl::run(const std::string &cluster_id, r.setNamedObjectsManager(&named_objects_manager); r.setSourceRuleSet(routing); r.setRuleSetName(routing->getName()); + r.setPersistentObjects(persistent_objects); r.setSingleRuleCompileMode(single_rule_id); if (inTestMode()) r.setTestMode(); @@ -325,6 +321,13 @@ QString CompilerDriver_iosacl::run(const std::string &cluster_id, } } + /* + * compilers detach persistent objects when they finish, this + * means at this point library persistent_objects is not part + * of any object tree. + */ + objdb->reparent(persistent_objects); + if (haveErrorsAndWarnings()) { all_errors.push_front(getErrors("").c_str()); diff --git a/src/cisco_lib/CompilerDriver_pix_run.cpp b/src/cisco_lib/CompilerDriver_pix_run.cpp index f174da1c2..4843aec0c 100644 --- a/src/cisco_lib/CompilerDriver_pix_run.cpp +++ b/src/cisco_lib/CompilerDriver_pix_run.cpp @@ -48,27 +48,24 @@ #include "Helper.h" -#include "fwbuilder/Resources.h" -#include "fwbuilder/FWObjectDatabase.h" -#include "fwbuilder/XMLTools.h" -#include "fwbuilder/FWException.h" -#include "fwbuilder/Firewall.h" -#include "fwbuilder/Interface.h" -#include "fwbuilder/Policy.h" -#include "fwbuilder/NAT.h" -#include "fwbuilder/Routing.h" -#include "fwbuilder/IPv4.h" -#include "fwbuilder/IPv6.h" - -#include "fwcompiler/Preprocessor.h" - #include "fwbuilder/Cluster.h" #include "fwbuilder/ClusterGroup.h" -#include "fwbuilder/Firewall.h" -#include "fwbuilder/Interface.h" -#include "fwbuilder/Policy.h" -#include "fwbuilder/StateSyncClusterGroup.h" +#include "fwbuilder/FWException.h" +#include "fwbuilder/FWObjectDatabase.h" #include "fwbuilder/FailoverClusterGroup.h" +#include "fwbuilder/Firewall.h" +#include "fwbuilder/IPv4.h" +#include "fwbuilder/IPv6.h" +#include "fwbuilder/Interface.h" +#include "fwbuilder/Library.h" +#include "fwbuilder/NAT.h" +#include "fwbuilder/Policy.h" +#include "fwbuilder/Resources.h" +#include "fwbuilder/Routing.h" +#include "fwbuilder/StateSyncClusterGroup.h" +#include "fwbuilder/XMLTools.h" + +#include "fwcompiler/Preprocessor.h" #include #include @@ -392,6 +389,7 @@ QString CompilerDriver_pix::run(const std::string &cluster_id, n->setNamedObjectsManager(&named_objects_manager); n->setSourceRuleSet(nat); n->setRuleSetName(nat->getName()); + n->setPersistentObjects(persistent_objects); if (inTestMode()) n->setTestMode(); if (inEmbeddedMode()) n->setEmbeddedMode(); @@ -424,6 +422,7 @@ QString CompilerDriver_pix::run(const std::string &cluster_id, c->setNamedObjectsManager(&named_objects_manager); c->setSourceRuleSet(policy); c->setRuleSetName(policy->getName()); + c->setPersistentObjects(persistent_objects); if (inTestMode()) c->setTestMode(); if (inEmbeddedMode()) c->setEmbeddedMode(); @@ -456,7 +455,8 @@ QString CompilerDriver_pix::run(const std::string &cluster_id, r->setNamedObjectsManager(&named_objects_manager); r->setSourceRuleSet(routing); r->setRuleSetName(routing->getName()); - + r->setPersistentObjects(persistent_objects); + if (inTestMode()) r->setTestMode(); if (inEmbeddedMode()) r->setEmbeddedMode(); r->setSingleRuleCompileMode(single_rule_id); @@ -472,6 +472,13 @@ QString CompilerDriver_pix::run(const std::string &cluster_id, info(" Nothing to compile in Routing"); } + /* + * compilers detach persistent objects when they finish, this + * means at this point library persistent_objects is not part + * of any object tree. + */ + objdb->reparent(persistent_objects); + if (haveErrorsAndWarnings()) { all_errors.push_front(getErrors("").c_str()); diff --git a/src/cisco_lib/CompilerDriver_procurve_acl_run.cpp b/src/cisco_lib/CompilerDriver_procurve_acl_run.cpp index ea7c72158..4b7e52ea3 100644 --- a/src/cisco_lib/CompilerDriver_procurve_acl_run.cpp +++ b/src/cisco_lib/CompilerDriver_procurve_acl_run.cpp @@ -44,28 +44,22 @@ #include "NamedObjectsAndGroupsSupport.h" #include "NamedObjectsManagerIOS.h" -#include "fwbuilder/Resources.h" -#include "fwbuilder/FWObjectDatabase.h" -#include "fwbuilder/XMLTools.h" -#include "fwbuilder/FWException.h" -#include "fwbuilder/Firewall.h" -#include "fwbuilder/Interface.h" -#include "fwbuilder/Policy.h" -#include "fwbuilder/NAT.h" -#include "fwbuilder/Routing.h" - -#include "fwcompiler/Preprocessor.h" - -#include "fwbuilder/Resources.h" -#include "fwbuilder/FWObjectDatabase.h" -#include "fwbuilder/FWException.h" #include "fwbuilder/Cluster.h" #include "fwbuilder/ClusterGroup.h" +#include "fwbuilder/FWException.h" +#include "fwbuilder/FWObjectDatabase.h" +#include "fwbuilder/FailoverClusterGroup.h" #include "fwbuilder/Firewall.h" #include "fwbuilder/Interface.h" +#include "fwbuilder/Library.h" +#include "fwbuilder/NAT.h" #include "fwbuilder/Policy.h" +#include "fwbuilder/Resources.h" +#include "fwbuilder/Routing.h" #include "fwbuilder/StateSyncClusterGroup.h" -#include "fwbuilder/FailoverClusterGroup.h" +#include "fwbuilder/XMLTools.h" + +#include "fwcompiler/Preprocessor.h" #include #include @@ -238,6 +232,7 @@ QString CompilerDriver_procurve_acl::run(const std::string &cluster_id, c.setNamedObjectsManager(&named_objects_manager); c.setSourceRuleSet( policy ); c.setRuleSetName(policy->getName()); + c.setPersistentObjects(persistent_objects); c.setSingleRuleCompileMode(single_rule_id); if (inTestMode()) c.setTestMode(); @@ -289,6 +284,7 @@ QString CompilerDriver_procurve_acl::run(const std::string &cluster_id, r.setNamedObjectsManager(&named_objects_manager); r.setSourceRuleSet(routing); r.setRuleSetName(routing->getName()); + r.setPersistentObjects(persistent_objects); r.setSingleRuleCompileMode(single_rule_id); if (inTestMode()) r.setTestMode(); @@ -313,6 +309,13 @@ QString CompilerDriver_procurve_acl::run(const std::string &cluster_id, } } + /* + * compilers detach persistent objects when they finish, this + * means at this point library persistent_objects is not part + * of any object tree. + */ + objdb->reparent(persistent_objects); + if (haveErrorsAndWarnings()) { all_errors.push_front(getErrors("").c_str()); diff --git a/src/cisco_lib/NATCompiler_pix.h b/src/cisco_lib/NATCompiler_pix.h index 9e188c19c..28c4b84d7 100644 --- a/src/cisco_lib/NATCompiler_pix.h +++ b/src/cisco_lib/NATCompiler_pix.h @@ -507,7 +507,7 @@ namespace fwcompiler virtual std::string printClearCommands(); /** - * scans all rules in combined_ruleset and finds rules (if + * scans all rules in source_ruleset and finds rules (if * any) that define DNAT translation for a combination of * src,dst and srv where src matches OSrc, srv matches OSrv * and dst matches rule element defined by argument diff --git a/src/cisco_lib/NamedObject.h b/src/cisco_lib/NamedObject.h index 7ed3c9577..7eedd2e07 100644 --- a/src/cisco_lib/NamedObject.h +++ b/src/cisco_lib/NamedObject.h @@ -30,7 +30,8 @@ #include -namespace fwcompiler { +namespace fwcompiler +{ class NamedObject { diff --git a/src/cisco_lib/PolicyCompiler_cisco.cpp b/src/cisco_lib/PolicyCompiler_cisco.cpp index 42c81e78e..8726367a7 100644 --- a/src/cisco_lib/PolicyCompiler_cisco.cpp +++ b/src/cisco_lib/PolicyCompiler_cisco.cpp @@ -30,18 +30,19 @@ #include "NamedObjectsAndGroupsSupport.h" #include "NamedObjectsManager.h" +#include "fwbuilder/AddressTable.h" #include "fwbuilder/FWObjectDatabase.h" -#include "fwbuilder/RuleElement.h" -#include "fwbuilder/IPService.h" #include "fwbuilder/ICMPService.h" -#include "fwbuilder/TCPService.h" -#include "fwbuilder/UDPService.h" +#include "fwbuilder/IPService.h" +#include "fwbuilder/Interface.h" +#include "fwbuilder/Library.h" +#include "fwbuilder/Management.h" #include "fwbuilder/Network.h" #include "fwbuilder/Policy.h" -#include "fwbuilder/Interface.h" -#include "fwbuilder/Management.h" #include "fwbuilder/Resources.h" -#include "fwbuilder/AddressTable.h" +#include "fwbuilder/RuleElement.h" +#include "fwbuilder/TCPService.h" +#include "fwbuilder/UDPService.h" #include #include @@ -158,18 +159,18 @@ void PolicyCompiler_cisco::addDefaultPolicyRule() TCPService *ssh = dbcopy->createTCPService(); ssh->setDstRangeStart(22); ssh->setDstRangeEnd(22); - dbcopy->add(ssh, false); + persistent_objects->add(ssh, false); TCPService *ssh_rev = dbcopy->createTCPService(); ssh_rev->setSrcRangeStart(22); ssh_rev->setSrcRangeEnd(22); - dbcopy->add(ssh_rev, false); + persistent_objects->add(ssh_rev, false); Network *mgmt_workstation = dbcopy->createNetwork(); mgmt_workstation->setAddressNetmask( getCachedFwOpt()->getStr("mgmt_addr")); - dbcopy->add(mgmt_workstation, false); + persistent_objects->add(mgmt_workstation, false); PolicyCompiler::addMgmtRule( mgmt_workstation, fw, ssh, diff --git a/src/cisco_lib/PolicyCompiler_iosacl.cpp b/src/cisco_lib/PolicyCompiler_iosacl.cpp index 8649dd650..8f03b4a7b 100644 --- a/src/cisco_lib/PolicyCompiler_iosacl.cpp +++ b/src/cisco_lib/PolicyCompiler_iosacl.cpp @@ -28,19 +28,20 @@ #include "PolicyCompiler_iosacl.h" #include "NamedObjectsAndGroupsSupport.h" +#include "fwbuilder/AddressTable.h" #include "fwbuilder/FWObjectDatabase.h" -#include "fwbuilder/RuleElement.h" -#include "fwbuilder/IPService.h" #include "fwbuilder/ICMPService.h" +#include "fwbuilder/IPService.h" +#include "fwbuilder/Interface.h" +#include "fwbuilder/Library.h" +#include "fwbuilder/Management.h" +#include "fwbuilder/Network.h" +#include "fwbuilder/ObjectMirror.h" +#include "fwbuilder/Policy.h" +#include "fwbuilder/Resources.h" +#include "fwbuilder/RuleElement.h" #include "fwbuilder/TCPService.h" #include "fwbuilder/UDPService.h" -#include "fwbuilder/Network.h" -#include "fwbuilder/Policy.h" -#include "fwbuilder/Interface.h" -#include "fwbuilder/Management.h" -#include "fwbuilder/Resources.h" -#include "fwbuilder/AddressTable.h" -#include "fwbuilder/ObjectMirror.h" #include #if __GNUC__ > 3 || \ @@ -87,7 +88,7 @@ int PolicyCompiler_iosacl::prolog() fw->getOptionsObject()->getBool("iosacl_use_acl_remarks")); // object_groups = new Group(); - // dbcopy->add( object_groups ); + // persistent_objects->add( object_groups ); setAllNetworkZonesToNone(); @@ -109,13 +110,13 @@ void PolicyCompiler_iosacl::addDefaultPolicyRule() TCPService *ssh_rev = dbcopy->createTCPService(); ssh_rev->setSrcRangeStart(22); ssh_rev->setSrcRangeEnd(22); - dbcopy->add(ssh_rev, false); + persistent_objects->add(ssh_rev, false); Network *mgmt_workstation = dbcopy->createNetwork(); mgmt_workstation->setAddressNetmask( getCachedFwOpt()->getStr("mgmt_addr")); - dbcopy->add(mgmt_workstation, false); + persistent_objects->add(mgmt_workstation, false); PolicyCompiler::addMgmtRule( fw, mgmt_workstation, ssh_rev, @@ -209,7 +210,7 @@ bool PolicyCompiler_iosacl::mirrorRule::processNext() { Service *nobj = mirror.getMirroredService( Service::cast(FWReference::getObject(*i1))); - compiler->dbcopy->add(nobj, false); + compiler->persistent_objects->add(nobj, false); nsrv->addRef(nobj); } } diff --git a/src/compiler_lib/CompilerDriver.cpp b/src/compiler_lib/CompilerDriver.cpp index 00c6270ba..878a57ec7 100644 --- a/src/compiler_lib/CompilerDriver.cpp +++ b/src/compiler_lib/CompilerDriver.cpp @@ -46,22 +46,23 @@ #include "interfaceProperties.h" #include "interfacePropertiesObjectFactory.h" -#include "fwbuilder/FWObject.h" -#include "fwbuilder/FWObjectDatabase.h" -#include "fwbuilder/FWException.h" #include "fwbuilder/Cluster.h" #include "fwbuilder/ClusterGroup.h" +#include "fwbuilder/FWException.h" +#include "fwbuilder/FWObject.h" +#include "fwbuilder/FWObjectDatabase.h" +#include "fwbuilder/FailoverClusterGroup.h" #include "fwbuilder/Firewall.h" -#include "fwbuilder/Interface.h" #include "fwbuilder/IPv4.h" #include "fwbuilder/IPv6.h" -#include "fwbuilder/Rule.h" -#include "fwbuilder/Policy.h" +#include "fwbuilder/Interface.h" +#include "fwbuilder/Library.h" #include "fwbuilder/NAT.h" -#include "fwbuilder/Routing.h" +#include "fwbuilder/Policy.h" #include "fwbuilder/Resources.h" +#include "fwbuilder/Routing.h" +#include "fwbuilder/Rule.h" #include "fwbuilder/StateSyncClusterGroup.h" -#include "fwbuilder/FailoverClusterGroup.h" #include "fwcompiler/Compiler.h" @@ -92,6 +93,9 @@ CompilerDriver::CompilerDriver(FWObjectDatabase *db) : BaseCompiler() ipv6_run = true; fw_by_id = false; objdb = new FWObjectDatabase(*db); + persistent_objects = new Library(); + persistent_objects->setName("Persistent Objects"); + objdb->add(persistent_objects); prolog_done = false; epilog_done = false; have_filter = false; diff --git a/src/compiler_lib/CompilerDriver.h b/src/compiler_lib/CompilerDriver.h index c3daea324..4f9dc2986 100644 --- a/src/compiler_lib/CompilerDriver.h +++ b/src/compiler_lib/CompilerDriver.h @@ -132,6 +132,7 @@ protected: std::map branches; libfwbuilder::FWObjectDatabase *objdb; + libfwbuilder::Library *persistent_objects; void determineOutputFileNames(libfwbuilder::Cluster *cluster, libfwbuilder::Firewall *current_fw, diff --git a/src/iptlib/CompilerDriver_ipt_nat.cpp b/src/iptlib/CompilerDriver_ipt_nat.cpp index 85e4d27cb..6db3a0fae 100644 --- a/src/iptlib/CompilerDriver_ipt_nat.cpp +++ b/src/iptlib/CompilerDriver_ipt_nat.cpp @@ -34,6 +34,7 @@ #include "fwbuilder/Firewall.h" #include "fwbuilder/NAT.h" #include "fwbuilder/Resources.h" +#include "fwbuilder/Library.h" #include #include @@ -80,6 +81,7 @@ bool CompilerDriver_ipt::processNatRuleSet( nat_compiler->setSourceRuleSet( nat ); nat_compiler->setRuleSetName(branch_name); + nat_compiler->setPersistentObjects(persistent_objects); nat_compiler->setSingleRuleCompileMode(single_rule_id); nat_compiler->setDebugLevel( dl ); diff --git a/src/iptlib/CompilerDriver_ipt_policy.cpp b/src/iptlib/CompilerDriver_ipt_policy.cpp index df0168426..8a043d95f 100644 --- a/src/iptlib/CompilerDriver_ipt_policy.cpp +++ b/src/iptlib/CompilerDriver_ipt_policy.cpp @@ -39,6 +39,7 @@ #include "fwbuilder/Interface.h" #include "fwbuilder/Policy.h" #include "fwbuilder/Resources.h" +#include "fwbuilder/Library.h" #include #include @@ -96,6 +97,7 @@ bool CompilerDriver_ipt::processPolicyRuleSet( mangle_compiler->setSourceRuleSet( policy ); mangle_compiler->setRuleSetName(branch_name); + mangle_compiler->setPersistentObjects(persistent_objects); mangle_compiler->setSingleRuleCompileMode(single_rule_id); mangle_compiler->setDebugLevel( dl ); @@ -171,6 +173,7 @@ bool CompilerDriver_ipt::processPolicyRuleSet( policy_compiler->setSourceRuleSet( policy ); policy_compiler->setRuleSetName(branch_name); + policy_compiler->setPersistentObjects(persistent_objects); if ( (policy_rules_count=policy_compiler->prolog()) > 0 ) { diff --git a/src/iptlib/CompilerDriver_ipt_run.cpp b/src/iptlib/CompilerDriver_ipt_run.cpp index e399c1a1e..6bf322e61 100644 --- a/src/iptlib/CompilerDriver_ipt_run.cpp +++ b/src/iptlib/CompilerDriver_ipt_run.cpp @@ -66,6 +66,7 @@ #include "fwbuilder/Resources.h" #include "fwbuilder/StateSyncClusterGroup.h" #include "fwbuilder/FailoverClusterGroup.h" +#include "fwbuilder/Library.h" #include #include @@ -391,6 +392,7 @@ QString CompilerDriver_ipt::run(const std::string &cluster_id, { routing_compiler->setSourceRuleSet(routing); routing_compiler->setRuleSetName(routing->getName()); + routing_compiler->setPersistentObjects(persistent_objects); routing_compiler->setSingleRuleCompileMode(single_rule_id); routing_compiler->setDebugLevel( dl ); @@ -409,6 +411,13 @@ QString CompilerDriver_ipt::run(const std::string &cluster_id, all_errors.push_back(routing_compiler->getErrors("").c_str()); } + /* + * compilers detach persistent objects when they finish, this + * means at this point library persistent_objects is not part + * of any object tree. + */ + objdb->reparent(persistent_objects); + if (haveErrorsAndWarnings()) { all_errors.push_front(getErrors("").c_str()); diff --git a/src/iptlib/MangleTableCompiler_ipt.cpp b/src/iptlib/MangleTableCompiler_ipt.cpp index da8e39316..5b73c4bc7 100644 --- a/src/iptlib/MangleTableCompiler_ipt.cpp +++ b/src/iptlib/MangleTableCompiler_ipt.cpp @@ -51,8 +51,8 @@ int MangleTableCompiler_ipt::prolog() int n = 0; - for(FWObject::iterator i=combined_ruleset->begin(); - i!=combined_ruleset->end(); i++) + for(FWObject::iterator i=source_ruleset->begin(); + i!=source_ruleset->end(); i++) { PolicyRule *r = PolicyRule::cast( *i ); if (r == NULL) continue; // skip RuleSetOptions object diff --git a/src/iptlib/NATCompiler_ipt.cpp b/src/iptlib/NATCompiler_ipt.cpp index b5d91912f..60a389db6 100644 --- a/src/iptlib/NATCompiler_ipt.cpp +++ b/src/iptlib/NATCompiler_ipt.cpp @@ -217,7 +217,7 @@ int NATCompiler_ipt::prolog() if ( iface->isDyn()) iface->setBool("use_var_address",true); } - build_interface_groups(dbcopy, fw, ipv6, regular_interfaces); + build_interface_groups(dbcopy, persistent_objects, fw, ipv6, regular_interfaces); } string version = fw->getStr("version"); @@ -265,7 +265,7 @@ void NATCompiler_ipt::_expand_interface(Rule *rule, if (ip_addr!=NULL && use_mac && pa!=NULL) { combinedAddress *ca = new combinedAddress(); - dbcopy->add(ca); + persistent_objects->add(ca); dbcopy->addToIndex(ca); ca->setName( "CA("+iface->getName()+")" ); ca->setAddress( *ip_addr ); @@ -339,7 +339,7 @@ bool NATCompiler_ipt::ConvertLoadBalancingRules::processNext() ar->setRangeEnd( *(al.back()) ); ar->setName(string("%")+al.front()->toString() +"-"+al.back()->toString()+"%" ); - compiler->dbcopy->add(ar,false); + compiler->persistent_objects->add(ar,false); tdst->clearChildren(); tdst->addRef(ar); @@ -439,12 +439,15 @@ bool NATCompiler_ipt::splitSDNATRule::processNext() * change OSrc */ - odst=r->getODst(); + odst = r->getODst(); odst->setNeg(false); odst->clearChildren(); for (FWObject::iterator i=rule->getTDst()->begin(); i!=rule->getTDst()->end(); i++) - odst->add( *i ); + { + FWObject *obj = FWObjectReference::getObject(*i); + odst->addRef(obj); + } if ( ! rule->getTSrv()->isAny()) { @@ -478,7 +481,7 @@ bool NATCompiler_ipt::splitSDNATRule::processNext() match_service = TCPUDPService::cast( compiler->dbcopy->create(tsrv->getTypeName())); match_service->setName(tsrv->getName() + "_dport"); - compiler->dbcopy->add(match_service); + compiler->persistent_objects->add(match_service); match_service->setDstRangeStart(tu_tsrv->getDstRangeStart()); match_service->setDstRangeEnd(tu_tsrv->getDstRangeEnd()); } @@ -757,9 +760,9 @@ bool NATCompiler_ipt::convertToAtomicportForOSrv::processNext() FWObject *s; - s=r->getOSrv(); assert(s); + s = r->getOSrv(); assert(s); s->clearChildren(); - s->add( *i1 ); + s->addRef(FWReference::getObject(*i1)); tmp_queue.push_back(r); } diff --git a/src/iptlib/PolicyCompiler_ipt.cpp b/src/iptlib/PolicyCompiler_ipt.cpp index 539ea9212..37c95499a 100644 --- a/src/iptlib/PolicyCompiler_ipt.cpp +++ b/src/iptlib/PolicyCompiler_ipt.cpp @@ -368,7 +368,7 @@ void PolicyCompiler_ipt::_expand_interface(Rule *rule, if (use_mac) { combinedAddress *ca = new combinedAddress(); - dbcopy->add(ca); + persistent_objects->add(ca); ca->setName( "CA("+iface->getName()+")" ); ca->setAddress( *ip_addr ); ca->setNetmask( *ip_netm ); @@ -466,44 +466,43 @@ int PolicyCompiler_ipt::prolog() anytcp=dbcopy->createTCPService(); anytcp->setId(FWObjectDatabase::registerStringId(ANY_TCP_OBJ_ID)); anytcp->setName("AnyTCP"); - dbcopy->add(anytcp); + persistent_objects->add(anytcp); tcpsyn=dbcopy->createTCPService(); tcpsyn->setId(FWObjectDatabase::registerStringId(TCP_SYN_OBJ_ID)); tcpsyn->setName("tcpSYN"); tcpsyn->setTCPFlag(TCPService::SYN,true); tcpsyn->setAllTCPFlagMasks(); - dbcopy->add(tcpsyn); + persistent_objects->add(tcpsyn); anyudp=dbcopy->createUDPService(); anyudp->setId(FWObjectDatabase::registerStringId(ANY_UDP_OBJ_ID)); anyudp->setName("AnyUDP"); - dbcopy->add(anyudp); + persistent_objects->add(anyudp); anyicmp=dbcopy->createICMPService(); anyicmp->setId(FWObjectDatabase::registerStringId(ANY_ICMP_OBJ_ID)); anyicmp->setName("AnyICMP"); - dbcopy->add(anyicmp); + persistent_objects->add(anyicmp); anyip=dbcopy->createIPService(); anyip->setId(FWObjectDatabase::registerStringId(ANY_IP_OBJ_ID)); anyip->setName("AnyIP"); - dbcopy->add(anyip); + persistent_objects->add(anyip); bcast255=dbcopy->createIPv4(); bcast255->setId(FWObjectDatabase::registerStringId(BCAST_255_OBJ_ID)); bcast255->setName("Broadcast_addr"); bcast255->setAddress(InetAddr::getAllOnes()); bcast255->setNetmask(InetAddr(InetAddr::getAllOnes())); - dbcopy->add(bcast255); - + persistent_objects->add(bcast255); bool global_afpa = fwopt->getBool("firewall_is_part_of_any_and_networks"); int n = 0; - for(FWObject::iterator i=combined_ruleset->begin(); - i!=combined_ruleset->end(); i++) + for(FWObject::iterator i=source_ruleset->begin(); i!=source_ruleset->end(); i++) { Rule *r = Rule::cast( *i ); + if (r == NULL) continue; if (r->isDisabled()) continue; FWOptions *ruleopt = r->getOptionsObject(); @@ -532,7 +531,7 @@ int PolicyCompiler_ipt::prolog() fwopt->getBool("use_m_set")); actually_used_module_set = false; - build_interface_groups(dbcopy, fw, ipv6, regular_interfaces); + build_interface_groups(dbcopy, persistent_objects, fw, ipv6, regular_interfaces); return n; } @@ -4729,14 +4728,14 @@ void PolicyCompiler_ipt::insertConntrackRule() // Why the whole multicast adress range ? //conntrack_dst->setNetmask(InetAddr("240.0.0.0")); conntrack_dst->setComment("CONNTRACK Multicast Address"); - dbcopy->add(conntrack_dst); + persistent_objects->add(conntrack_dst); UDPService *conntrack_srv = UDPService::cast(dbcopy->create(UDPService::TYPENAME)); conntrack_srv->setName("CONNTRACK-UDP"); conntrack_srv->setDstRangeStart(atoi(port.c_str())); conntrack_srv->setDstRangeEnd(atoi(port.c_str())); conntrack_srv->setComment("CONNTRACK UDP port"); - dbcopy->add(conntrack_srv); + persistent_objects->add(conntrack_srv); /* Find conntrack interface */ Interface* conntrack_iface = Interface::cast(fw->findObjectByName(Interface::TYPENAME, conntrack_iface_name)); @@ -4866,7 +4865,7 @@ void PolicyCompiler_ipt::insertFailoverRule() vrrp_dst->setAddress(InetAddr("224.0.0.18")); vrrp_dst->setNetmask(InetAddr(InetAddr::getAllOnes())); vrrp_dst->setComment("VRRP Multicast Address"); - dbcopy->add(vrrp_dst); + persistent_objects->add(vrrp_dst); bool use_ipsec_ah = false; @@ -4882,7 +4881,7 @@ void PolicyCompiler_ipt::insertFailoverRule() dbcopy->create(IPService::TYPENAME)); vrrp_srv->setComment("VRRP service"); vrrp_srv->setProtocolNumber(112); - dbcopy->add(vrrp_srv); + persistent_objects->add(vrrp_srv); /* * Add AH-Service to database. @@ -4893,7 +4892,7 @@ void PolicyCompiler_ipt::insertFailoverRule() dbcopy->create(IPService::TYPENAME)); ah_srv->setComment("IPSEC-AH"); ah_srv->setProtocolNumber(51); - dbcopy->add(ah_srv); + persistent_objects->add(ah_srv); for (FWObjectTypedChildIterator it = failover_group->findByType(FWObjectReference::TYPENAME); @@ -4967,13 +4966,13 @@ void PolicyCompiler_ipt::insertFailoverRule() heartbeat_dst->setAddress(InetAddr(addr)); heartbeat_dst->setNetmask(InetAddr(InetAddr::getAllOnes())); heartbeat_dst->setComment("HEARTBEAT Multicast Address"); - dbcopy->add(heartbeat_dst); + persistent_objects->add(heartbeat_dst); heartbeat_srv->setName("HEARTBEAT-UDP"); heartbeat_srv->setDstRangeStart(atoi(port.c_str())); heartbeat_srv->setDstRangeEnd(atoi(port.c_str())); heartbeat_srv->setComment("HEARTBEAT UDP port"); - dbcopy->add(heartbeat_srv); + persistent_objects->add(heartbeat_srv); // Heartbeat can use either multicast or unicast for (FWObjectTypedChildIterator it = @@ -5028,7 +5027,7 @@ void PolicyCompiler_ipt::insertFailoverRule() openais_dst->setAddress(InetAddr(addr)); openais_dst->setNetmask(InetAddr(InetAddr::getAllOnes())); openais_dst->setComment("OPENAIS Multicast Address"); - dbcopy->add(openais_dst); + persistent_objects->add(openais_dst); UDPService *openais_srv = UDPService::cast( dbcopy->create(UDPService::TYPENAME)); @@ -5037,7 +5036,7 @@ void PolicyCompiler_ipt::insertFailoverRule() openais_srv->setDstRangeStart(atoi(port.c_str())); openais_srv->setDstRangeEnd(atoi(port.c_str())); openais_srv->setComment("OPENAIS UDP port"); - dbcopy->add(openais_srv); + persistent_objects->add(openais_srv); for (FWObjectTypedChildIterator it = failover_group->findByType(FWObjectReference::TYPENAME); diff --git a/src/iptlib/utils.cpp b/src/iptlib/utils.cpp index 90552a63c..23e2a05fe 100644 --- a/src/iptlib/utils.cpp +++ b/src/iptlib/utils.cpp @@ -36,12 +36,12 @@ using namespace std; void build_interface_groups( - FWObjectDatabase *dbcopy, Firewall *fw, bool ipv6, + FWObjectDatabase *dbcopy, Library *persistent_objects, Firewall *fw, bool ipv6, QMap ®ular_interfaces) { // object group that will hold all regular inetrfaces FWObject *all_itf_group = dbcopy->create(ObjectGroup::TYPENAME); - dbcopy->add(all_itf_group); + persistent_objects->add(all_itf_group); all_itf_group->setName("*"); regular_interfaces["*"] = all_itf_group; @@ -84,7 +84,7 @@ void build_interface_groups( if (regular_interfaces.count(iname) == 0) { FWObject *itf_group = dbcopy->create(ObjectGroup::TYPENAME); - dbcopy->add(itf_group); + persistent_objects->add(itf_group); itf_group->setName(iname.toStdString()); regular_interfaces[iname] = itf_group; } diff --git a/src/iptlib/utils.h b/src/iptlib/utils.h index 50625b45b..d0f7155ce 100644 --- a/src/iptlib/utils.h +++ b/src/iptlib/utils.h @@ -23,11 +23,14 @@ #include "fwbuilder/FWObjectDatabase.h" #include "fwbuilder/Firewall.h" +#include "fwbuilder/Library.h" #include #include extern void build_interface_groups( - libfwbuilder::FWObjectDatabase *dbcopy, libfwbuilder::Firewall *fw, bool ipv6, + libfwbuilder::FWObjectDatabase *dbcopy, + libfwbuilder::Library *persistent_objects, + libfwbuilder::Firewall *fw, bool ipv6, QMap ®ular_interfaces); diff --git a/src/libfwbuilder/src/fwbuilder/AddressTable.cpp b/src/libfwbuilder/src/fwbuilder/AddressTable.cpp index dc2bf74ae..900a58ae2 100644 --- a/src/libfwbuilder/src/fwbuilder/AddressTable.cpp +++ b/src/libfwbuilder/src/fwbuilder/AddressTable.cpp @@ -88,11 +88,21 @@ xmlNodePtr AddressTable::toXML(xmlNodePtr parent) throw(FWException) return me; } +/* + * read file specified by the "filename" attribute and interpret lines + * as addresses. Create corresponding address or network objects, add + * them to the object database and add references to them to @this. If + * file does not exist and we run in test mode, create dummy object + * and add it to the database and referece to it, then throw + * exception. + * + * TODO: new objects should be added to some kind of special group in + * the object tree, something with the name "tmp" or similar. + */ void AddressTable::loadFromSource(bool ipv6, bool test_mode) throw(FWException) { ifstream fs(getStr("filename").c_str()); ostringstream exmess; - FWObject *root = getParent(); string buf; size_type pos; int line = 1; @@ -160,10 +170,10 @@ void AddressTable::loadFromSource(bool ipv6, bool test_mode) throw(FWException) if (new_addr) { - root->add(new_addr); new_addr->setName(buf); if (validateChild(new_addr)) { + getRoot()->add(new_addr); addRef(new_addr); cntr++; } @@ -193,10 +203,10 @@ void AddressTable::loadFromSource(bool ipv6, bool test_mode) throw(FWException) net->setAddressNetmask("192.0.2.0/24"); new_addr = net; } - root->add(new_addr); new_addr->setName(buf); if (validateChild(new_addr)) { + getRoot()->add(new_addr); addRef(new_addr); cntr++; } diff --git a/src/libfwbuilder/src/fwbuilder/DNSName.cpp b/src/libfwbuilder/src/fwbuilder/DNSName.cpp index e70467959..aa833bf78 100644 --- a/src/libfwbuilder/src/fwbuilder/DNSName.cpp +++ b/src/libfwbuilder/src/fwbuilder/DNSName.cpp @@ -108,6 +108,16 @@ xmlNodePtr DNSName::toXML(xmlNodePtr parent) throw(FWException) } +/* + * take domain name from the "dnsrec" attribute and try to run DNS + * query. If successful, create corresponding IPv4 or IPv6 object, add + * it to the object database and add reference to it to @this. If + * unsuccessful, create dummy object and add it to the database and + * referece to it, then throw exception. + * + * TODO: new object should be added to some kind of special group in + * the object tree, something with the name "tmp" or similar. + */ void DNSName::loadFromSource(bool ipv6, bool test_mode) throw(FWException) { int af_type = (ipv6)?AF_INET6:AF_INET; @@ -122,6 +132,7 @@ void DNSName::loadFromSource(bool ipv6, bool test_mode) throw(FWException) Address *a = NULL; if (ipv6) { a = getRoot()->createIPv6(); af = AF_INET6; } else a = getRoot()->createIPv4(); + getRoot()->add(a); a->setAddress(*i); a->setNetmask(InetAddr::getAllOnes(af)); addRef(a); @@ -159,6 +170,7 @@ void DNSName::loadFromSource(bool ipv6, bool test_mode) throw(FWException) a->setAddress("192.0.2.1"); a->setNetmask(InetAddr::getAllOnes(af)); } + getRoot()->add(a); addRef(a); a->setBool(".rule_error", true); a->setStr(".error_msg", err.str()); diff --git a/src/libfwbuilder/src/fwbuilder/FWObject.cpp b/src/libfwbuilder/src/fwbuilder/FWObject.cpp index ef84eeb73..7b10ea6d6 100644 --- a/src/libfwbuilder/src/fwbuilder/FWObject.cpp +++ b/src/libfwbuilder/src/fwbuilder/FWObject.cpp @@ -215,7 +215,7 @@ FWObject::FWObject(const FWObject &c) : list(c) FWObject::~FWObject() { busy = true; // ignore read-only - destroyChildren(); + if (size() > 0) destroyChildren(); data.clear(); private_data.clear(); } @@ -517,21 +517,36 @@ FWObjectDatabase* FWObject::getRoot() const return dbroot; } -string FWObject::getPath(bool relative) const +class pathAccumulator : public string { - string res; - const FWObject *p=this; - bool first=true; + public: + void operator()(const string &s) + { + append("/" + s); + } +}; + +string FWObject::getPath(bool relative, bool detailed) const +{ + list res; + const FWObject *p = this; + + if (p == NULL) res.push_front("(0x0)"); + while (p!=NULL) { - if (relative && Library::isA(p)) return res; - if (!first) res="/"+res; - res=p->getName()+res; - p=p->getParent(); - first=false; + if (relative && Library::isA(p)) break; + ostringstream s; + s << p->getName(); + if (detailed) + { + s << "(" << p << ")"; + } + res.push_front(s.str()); + p = p->getParent(); } - res="/"+res; - return res; + + return std::for_each(res.begin(), res.end(), pathAccumulator()); } const string& FWObject::getComment() const @@ -748,7 +763,7 @@ void FWObject::_adopt(FWObject *obj) void FWObject::addAt(int where_id, FWObject *obj) { - FWObject *p=getRoot()->findInIndex( where_id ); + FWObject *p = getRoot()->findInIndex( where_id ); assert (p!=NULL); p->add(obj); } @@ -757,6 +772,38 @@ void FWObject::add(FWObject *obj, bool validate) { checkReadOnly(); + FWObject *old_parent = obj->getParent(); + if (old_parent != NULL) + { + cerr << "WARNING: object " << obj << " " + << "(name: " << obj->getName() + << " type: " << obj->getTypeName() << ") " + << "that is a child of " << old_parent << " " + << "(name: " << old_parent->getName() + << " type: " << old_parent->getTypeName() << ") " + << "is being added to the new parent " << this << " " + << "(name: " << getName() + << " type: " << getTypeName() << ") " + << endl; + + assert(old_parent == NULL); + } + + // do not allow to add the same object twice + if (old_parent == this) + { + cerr << "WARNING: object " << obj << " " + << "(name: " << obj->getName() + << " type: " << obj->getTypeName() << ") " + << "that is a child of " << old_parent << " " + << "(name: " << old_parent->getName() + << " type: " << old_parent->getTypeName() << ") " + << "is being added to the same parent again" + << endl; + + assert(old_parent != this); + } + if (!validate || validateChild(obj)) { push_back(obj); @@ -765,6 +812,15 @@ void FWObject::add(FWObject *obj, bool validate) } } +void FWObject::reparent(FWObject *obj, bool validate) +{ + FWObject *old_parent = obj->getParent(); + if (old_parent != NULL && old_parent != this) + old_parent->remove(obj, false); + add(obj, validate); + obj->fixTree(); +} + FWReference* FWObject::createRef() { // FWObjectReference *ref=new FWObjectReference(); @@ -843,7 +899,7 @@ void FWObject::swapObjects(FWObject *o1, FWObject *o2) void FWObject::remove(FWObject *obj, bool delete_if_last) { FWObject::iterator fi=std::find(begin(), end(), obj); - if(fi!=end()) + if (fi!=end()) { checkReadOnly(); @@ -851,12 +907,14 @@ void FWObject::remove(FWObject *obj, bool delete_if_last) setDirty(true); obj->unref(); - if (delete_if_last && obj->ref_counter==0) + if (delete_if_last && obj->ref_counter <= 0) { FWObjectDatabase *db = getRoot(); if (db) db->removeFromIndex(obj->getId()); delete obj; } + + obj->parent = NULL; } } @@ -948,22 +1006,9 @@ set FWObject::findAllReferences(const FWObject *obj) return res; } -bool FWObject::validateChild(FWObject *obj) +bool FWObject::validateChild(FWObject*) { return true; - - /* - * Check if object "this" is a descendant of object "obj" to avoid loops - * - * check disabled for now since we need to be able to add firewall to its - * own policy - */ - FWObject *p; - p=this; - do { - if (p==obj) return false; - } while ((p=p->getParent())!=NULL); - return true; } /* @@ -972,14 +1017,41 @@ bool FWObject::validateChild(FWObject *obj) */ void FWObject::destroyChildren() { +#ifdef DEBUG_DESTROY_CHILDREN + cerr << "destroyChildren() " << this + << " name=" << name + << " type=" << getTypeName() + << " parent=" << getParent() + << " path=" << getPath() + << endl; +#endif + FWObjectDatabase *dbr = getRoot(); while (size() > 0) { FWObject *o = front(); + +#ifdef DEBUG_DESTROY_CHILDREN + cerr << " " << this + << " size=" << size() + << " o=" << o + << " o->size=" << o->size() + << endl; +#endif + if (o) { if (o->size()) o->destroyChildren(); if (dbr && !dbr->busy) dbr->removeFromIndex( o->getId() ); + +#ifdef DEBUG_DESTROY_CHILDREN + cerr << " " << this + << " delete " << o + << " " << o->name + << " " << o->getTypeName() + << endl; +#endif + delete o; } pop_front(); @@ -990,23 +1062,65 @@ void FWObject::destroyChildren() /* * Walks the tree, looking for objects that are referenced by two parents */ -void FWObject::findDuplicateLinksInTree() +bool FWObject::verifyTree() { + bool res = false; for(list::iterator m=begin(); m!=end(); ++m) { FWObject *o = *m; - if (o->getParent() != this) + FWObject *o_parent = o->getParent(); + if (o_parent != this) { - cerr << "Object '" << o->getName() << "' (" << o->getTypeName() << ") " - << " has two parents in the tree: " - << o->getParent()->getRoot() << "::" - << o->getParent()->getPath(true) - << " and " - << getRoot() << "::" - << getPath(true) - << endl; + if (o_parent != NULL) + { + cerr << "WARNING: Object " << o << " (name: '" << o->getName() + << "' type: " << o->getTypeName() << ")" + << " has two parents in the tree:" << endl; + + cerr << " " << o_parent->getPath(false, true) << endl; + cerr << " " << getPath(false, true) << endl; + + bool o_parent_real = false; + for (FWObject::iterator k=o_parent->begin(); k!=o_parent->end(); ++k) + { + FWObject *o1 = *k; + if (o1 == o) { o_parent_real = true; break; } + } + + if ( ! o_parent_real) + { + cerr << "WARNING: Parent " << o_parent_real + << " does not have child " + << o << endl; + } + } else + { + cerr << "WARNING: Object " << o << " (name: '" << o->getName() + << "' type: " << o->getTypeName() << ")" + << " was not correctly added to its parent " + << "(getParent()==NULL):" << endl; + cerr << " " << getPath(false, true) << endl; + } + + o->dump(true, false); // recursive, not brief + + res = true; } - o->findDuplicateLinksInTree(); + res |= o->verifyTree(); + } + return res; +} + +void FWObject::fixTree() +{ + getRoot()->addToIndex(this); + for(list::iterator m=begin(); m!=end(); ++m) + { + FWObject *o = *m; + if (o->getRoot() != getRoot()) o->setRoot(getRoot()); + if (o->getParent() != this) o->setParent(this); + getRoot()->addToIndex(o); + o->fixTree(); } } diff --git a/src/libfwbuilder/src/fwbuilder/FWObject.h b/src/libfwbuilder/src/fwbuilder/FWObject.h index 637d52304..f32656547 100644 --- a/src/libfwbuilder/src/fwbuilder/FWObject.h +++ b/src/libfwbuilder/src/fwbuilder/FWObject.h @@ -354,13 +354,18 @@ public: * is true, the path is built relative to the library 'this' is * a part of (name of the library is not included). */ - std::string getPath(bool relative=false) const; + std::string getPath(bool relative=false, bool detailed=false) const; void addAt(int where_id, FWObject *obj); virtual void add(FWObject *obj,bool validate=true); virtual void insert_before(FWObject *o1,FWObject *obj); virtual void insert_after(FWObject *o1,FWObject *obj); + /** + * call add(), but first remove() object from its old parent + */ + virtual void reparent(FWObject *obj,bool validate=true); + /** * In direct children of 'this' swaps all references * to o1 with o2 and vice versa. @@ -432,8 +437,20 @@ public: /** * Walks the tree, looking for objects that are referenced by two parents + * or those with this->parent == NULL. Prints report to stderr and + * returns true if such objects have been found. */ - void findDuplicateLinksInTree(); + bool verifyTree(); + + /** + * sometimes we need to move object subtree from one object + * database to another. For example, this can be a useful + * mechanism to maintain persistent objects between compiler + * passes. However when the object and its children are added to + * the new tree, "parent" and "root" pointers in obejcts still + * point to the old object tree and need to be fixed. + */ + void fixTree(); int getChildrenCount() const; diff --git a/src/libfwbuilder/src/fwbuilder/FWObjectDatabase.cpp b/src/libfwbuilder/src/fwbuilder/FWObjectDatabase.cpp index 291972727..2b8e76287 100644 --- a/src/libfwbuilder/src/fwbuilder/FWObjectDatabase.cpp +++ b/src/libfwbuilder/src/fwbuilder/FWObjectDatabase.cpp @@ -165,7 +165,7 @@ FWObjectDatabase::FWObjectDatabase(FWObjectDatabase& d) : FWObjectDatabase::~FWObjectDatabase() { busy = true; - //findDuplicateLinksInTree(); // debugging + //verifyTree(); // debugging destroyChildren(); } diff --git a/src/libfwbuilder/src/fwbuilder/RuleSet.cpp b/src/libfwbuilder/src/fwbuilder/RuleSet.cpp index dac05b09e..3bda36b6d 100644 --- a/src/libfwbuilder/src/fwbuilder/RuleSet.cpp +++ b/src/libfwbuilder/src/fwbuilder/RuleSet.cpp @@ -170,10 +170,10 @@ Rule* RuleSet::insertRuleAtTop(bool hidden_rule) Rule* RuleSet::insertRuleBefore(int rule_n) { - Rule *old_rule=getRuleByNum(rule_n); - Rule *r=createRule(); + Rule *old_rule = getRuleByNum(rule_n); + Rule *r = createRule(); if (old_rule==NULL) add(r); - else insert_before(old_rule,r); + else insert_before(old_rule, r); renumberRules(); return(r); } @@ -182,8 +182,14 @@ Rule* RuleSet::appendRuleAtBottom(bool hidden_rule) { Rule *r = createRule(); r->setHidden(hidden_rule); - int last_rule_position = Rule::cast(back())->getPosition(); - if (hidden_rule) r->setPosition(last_rule_position + 1000); + int last_rule_position; + Rule *last_rule = Rule::cast(back()); + if (last_rule != NULL) + { + last_rule_position = last_rule->getPosition() + 1000; + } else + last_rule_position = 1000; + if (hidden_rule) r->setPosition(last_rule_position); add(r); // FWObject::add adds to the end of the list renumberRules(); return(r); diff --git a/src/libfwbuilder/src/fwcompiler/Compiler.cpp b/src/libfwbuilder/src/fwcompiler/Compiler.cpp index 464b80bde..bff1cf44d 100644 --- a/src/libfwbuilder/src/fwcompiler/Compiler.cpp +++ b/src/libfwbuilder/src/fwcompiler/Compiler.cpp @@ -29,33 +29,34 @@ #include "fwbuilder/libfwbuilder-config.h" -#include "fwbuilder/FWServiceReference.h" -#include "fwbuilder/FWObjectReference.h" #include "fwbuilder/AddressRange.h" -#include "fwbuilder/RuleElement.h" #include "fwbuilder/Cluster.h" -#include "fwbuilder/Firewall.h" -#include "fwbuilder/Network.h" -#include "fwbuilder/NetworkIPv6.h" -#include "fwbuilder/IPService.h" -#include "fwbuilder/ICMPService.h" -#include "fwbuilder/ICMP6Service.h" -#include "fwbuilder/TCPService.h" -#include "fwbuilder/UDPService.h" #include "fwbuilder/CustomService.h" -#include "fwbuilder/Policy.h" -#include "fwbuilder/Rule.h" -#include "fwbuilder/RuleSet.h" -#include "fwbuilder/Interface.h" +#include "fwbuilder/DNSName.h" +#include "fwbuilder/FWException.h" +#include "fwbuilder/FWObjectDatabase.h" +#include "fwbuilder/FWObjectReference.h" +#include "fwbuilder/FWServiceReference.h" +#include "fwbuilder/FailoverClusterGroup.h" +#include "fwbuilder/Firewall.h" +#include "fwbuilder/Group.h" +#include "fwbuilder/ICMP6Service.h" +#include "fwbuilder/ICMPService.h" +#include "fwbuilder/IPService.h" #include "fwbuilder/IPv4.h" #include "fwbuilder/IPv6.h" -#include "fwbuilder/DNSName.h" +#include "fwbuilder/Interface.h" +#include "fwbuilder/Library.h" #include "fwbuilder/MultiAddress.h" -#include "fwbuilder/FailoverClusterGroup.h" -#include "fwbuilder/FWObjectDatabase.h" +#include "fwbuilder/Network.h" +#include "fwbuilder/NetworkIPv6.h" +#include "fwbuilder/Policy.h" +#include "fwbuilder/Rule.h" +#include "fwbuilder/RuleElement.h" +#include "fwbuilder/RuleSet.h" +#include "fwbuilder/TCPService.h" +#include "fwbuilder/UDPService.h" #include "fwbuilder/XMLTools.h" -#include "fwbuilder/FWException.h" -#include "fwbuilder/Group.h" #include #include @@ -70,8 +71,6 @@ using namespace fwcompiler; using namespace std; -Compiler::~Compiler() {} - int Compiler::prolog() { temp = new Group(); @@ -141,7 +140,6 @@ void Compiler::_init(FWObjectDatabase *_db, Firewall *_fw) _cntr_ = 1; temp_ruleset = NULL; - combined_ruleset = NULL; debug = 0; debug_rule = -1; @@ -151,15 +149,23 @@ void Compiler::_init(FWObjectDatabase *_db, Firewall *_fw) single_rule_ruleset_name = ""; single_rule_position = -1; - fw_id = _fw->getId(); - fwopt = _fw->getOptionsObject(); + dbcopy = NULL; + persistent_objects = NULL; + fw = NULL; + fwopt = NULL; + fw_id = -1; - assert(_fw->getRoot() == _db); + if (_db != NULL && _fw != NULL) + { + assert(_fw->getRoot() == _db); - string fw_str_id = FWObjectDatabase::getStringId(_fw->getId()); - - dbcopy = new FWObjectDatabase(*_db); // copies entire tree - fw = Firewall::cast(dbcopy->findInIndex(FWObjectDatabase::getIntId(fw_str_id))); + string fw_str_id = FWObjectDatabase::getStringId(_fw->getId()); + dbcopy = new FWObjectDatabase(*_db); // copies entire tree + fw = Firewall::cast( + dbcopy->findInIndex(FWObjectDatabase::getIntId(fw_str_id))); + fwopt = fw->getOptionsObject(); + fw_id = fw->getId(); + } } Compiler::Compiler(FWObjectDatabase *_db, Firewall *fw, bool ipv6_policy) @@ -169,6 +175,7 @@ Compiler::Compiler(FWObjectDatabase *_db, Firewall *fw, bool ipv6_policy) osconfigurator = NULL; countIPv6Rules = 0; ipv6 = ipv6_policy; + persistent_objects = NULL; _init(_db, fw); } @@ -180,6 +187,7 @@ Compiler::Compiler(FWObjectDatabase *_db, Firewall *fw, bool ipv6_policy, osconfigurator = _oscnf; countIPv6Rules = 0; ipv6 = ipv6_policy; + persistent_objects = NULL; _init(_db, fw); } @@ -193,9 +201,9 @@ Compiler::Compiler(FWObjectDatabase*, bool ipv6_policy) ipv6 = ipv6_policy; initialized = false; _cntr_ = 1; + persistent_objects = NULL; fw = NULL; temp_ruleset = NULL; - combined_ruleset = NULL; debug = 0; debug_rule = -1; rule_debug_on = false; @@ -203,6 +211,38 @@ Compiler::Compiler(FWObjectDatabase*, bool ipv6_policy) single_rule_mode = false; } +Compiler::~Compiler() +{ + if (dbcopy) + { + if (dbcopy->verifyTree()) + { + cerr << "source_ruleset=" << source_ruleset << endl; + cerr << "temp_ruleset=" << temp_ruleset << endl; + // dbcopy->dump(true, true); + } + + if (persistent_objects != NULL) + dbcopy->remove(persistent_objects, false); + + delete dbcopy; + } + dbcopy = NULL; +} + +void Compiler::setPersistentObjects(Library* po) +{ + persistent_objects = po; + dbcopy->reparent(persistent_objects); + persistent_objects->fixTree(); +} + +void Compiler::setSourceRuleSet(RuleSet *rs) +{ + FWObject *copy_rs = dbcopy->findInIndex(rs->getId()); + source_ruleset = RuleSet::cast(copy_rs); +} + void Compiler::setSingleRuleCompileMode(const string &rule_id) { if (!rule_id.empty()) @@ -241,8 +281,6 @@ string Compiler::getUniqueRuleLabel() void Compiler::compile() { assert(fw); - assert(combined_ruleset); - } void Compiler::_expand_group_recursive(FWObject *o, list &ol) @@ -261,6 +299,7 @@ void Compiler::_expand_group_recursive(FWObject *o, list &ol) * run-time address tables */ MultiAddress *adt = MultiAddress::cast(o); + if ((Group::cast(o)!=NULL && adt==NULL) || (adt!=NULL && adt->isCompileTime())) { @@ -568,7 +607,7 @@ void Compiler::_expandAddressRanges(Rule *rule, FWObject *re) h->setName(string("%n-")+(*i).toString()+string("%") ); h->setNetmask(*(i->getNetmaskPtr())); h->setAddress(*(i->getAddressPtr())); - dbcopy->add(h,false); + persistent_objects->add(h, false); cl.push_back(h); } } @@ -592,10 +631,11 @@ void Compiler::normalizePortRange(int &rs,int &re) void Compiler::debugRule() { - for (FWObject::iterator i=combined_ruleset->begin(); - i!=combined_ruleset->end(); i++) + for (FWObject::iterator i=source_ruleset->begin(); + i!=source_ruleset->end(); i++) { Rule *rule = Rule::cast( *i ); + if (rule == NULL) continue; if (rule_debug_on && rule->getPosition()==debug_rule ) { info(debugPrintRule(rule)); @@ -667,19 +707,20 @@ bool Compiler::Begin::processNext() assert(compiler!=NULL); if (!init) { - for (FWObject::iterator i=compiler->combined_ruleset->begin(); - i!=compiler->combined_ruleset->end(); ++i) + for (FWObject::iterator i=compiler->source_ruleset->begin(); + i!=compiler->source_ruleset->end(); ++i) { Rule *rule = Rule::cast(*i); + if (rule == NULL) continue; if (rule->isDisabled()) continue; Rule *r = Rule::cast(compiler->dbcopy->create(rule->getTypeName())); compiler->temp_ruleset->add(r); r->duplicate(rule); tmp_queue.push_back( r ); } - init=true; - if (!name.empty()) - compiler->info(string(" ") + name); + init = true; + + if (!name.empty()) compiler->info(string(" ") + name); return true; } @@ -959,28 +1000,31 @@ bool Compiler::eliminateDuplicatesInRE::processNext() { Rule *rule=prev_processor->getNextRule(); if (rule==NULL) return false; - if (comparator==NULL) comparator=new equalObj(); + if (comparator==NULL) comparator = new equalObj(); - RuleElement *re=RuleElement::cast(rule->getFirstByType(re_type)); + RuleElement *re = RuleElement::cast(rule->getFirstByType(re_type)); - vector cl; + list cl; for(list::iterator i=re->begin(); i!=re->end(); ++i) { FWObject *obj = FWReference::getObject(*i); + if (obj == NULL) continue; + comparator->set(obj); - bool found=false; - for (vector::iterator i1=cl.begin(); i1!=cl.end(); ++i1) + bool found = false; + for (list::iterator i1=cl.begin(); i1!=cl.end(); ++i1) { - if ( (*comparator)( (*i1) ) ) { found=true; break; } + FWObject *o2 = *i1; + if ( (*comparator)(o2) ) { found=true; break; } } if (!found) cl.push_back(obj); } if (!cl.empty()) { re->clearChildren(); - for (vector::iterator i1=cl.begin(); i1!=cl.end(); ++i1) + for (list::iterator i1=cl.begin(); i1!=cl.end(); ++i1) re->addRef( (*i1) ); } @@ -1191,7 +1235,7 @@ bool Compiler::swapMultiAddressObjectsInRE::processNext() mart->setId( mart_id ); compiler->dbcopy->addToIndex(mart); - compiler->dbcopy->add(mart); + compiler->persistent_objects->add(mart); } re->removeRef(ma); re->addRef(mart); diff --git a/src/libfwbuilder/src/fwcompiler/Compiler.h b/src/libfwbuilder/src/fwcompiler/Compiler.h index 4029643fa..24e0caa2a 100644 --- a/src/libfwbuilder/src/fwcompiler/Compiler.h +++ b/src/libfwbuilder/src/fwcompiler/Compiler.h @@ -213,7 +213,7 @@ protected: int fw_id; libfwbuilder::FWOptions *fwopt; - public: +public: int debug; int debug_rule; @@ -226,12 +226,12 @@ protected: fwcompiler::OSConfigurator *osconfigurator; libfwbuilder::FWObjectDatabase *dbcopy; + libfwbuilder::Library *persistent_objects; libfwbuilder::Firewall *fw; std::string ruleSetName;; libfwbuilder::RuleSet *source_ruleset; - libfwbuilder::RuleSet *combined_ruleset; libfwbuilder::RuleSet *temp_ruleset; libfwbuilder::Group *temp; @@ -927,11 +927,13 @@ protected: void setSingleRuleCompileMode(const std::string &rule_id); bool inSingleRuleCompileMode() { return single_rule_mode; } - void setSourceRuleSet(libfwbuilder::RuleSet *rs) { source_ruleset = rs; } + void setSourceRuleSet(libfwbuilder::RuleSet *rs); libfwbuilder::RuleSet* getSourceRuleSet() { return source_ruleset; } void setRuleSetName(const std::string &name) { ruleSetName = name; } std::string getRuleSetName() { return ruleSetName; } + + void setPersistentObjects(libfwbuilder::Library* po); std::string getCompiledScript(); int getCompiledScriptLength(); @@ -955,8 +957,7 @@ protected: bool suppress_comment=false); /** - * prolog should pack rules into combined_ruleset and return - * number of rules found + * prolog return number of rules found */ virtual int prolog(); virtual void compile(); diff --git a/src/libfwbuilder/src/fwcompiler/NATCompiler.cpp b/src/libfwbuilder/src/fwcompiler/NATCompiler.cpp index 8a79d9f6a..23c892b17 100644 --- a/src/libfwbuilder/src/fwcompiler/NATCompiler.cpp +++ b/src/libfwbuilder/src/fwcompiler/NATCompiler.cpp @@ -56,44 +56,24 @@ int NATCompiler::prolog() NAT *nat = NAT::cast(fw->getFirstByType(NAT::TYPENAME)); assert(nat); - combined_ruleset = new NAT(); - fw->add( combined_ruleset ); + if (source_ruleset == NULL) source_ruleset = nat; + + source_ruleset->renumberRules(); temp_ruleset = new NAT(); // working copy of the policy fw->add( temp_ruleset ); + temp_ruleset->setName(source_ruleset->getName()); -/* - * build combined policy by collapsing all the rules together. - * store ID of the interface in each rule of interface policy. - * - * also calculate global numbers for all rules and store them, too. - * These are used to detect rule shadowing. - */ - int global_num=0; - - -// list l3=nat->getByType(NATRule::TYPENAME); -// for (list::iterator j=l3.begin(); j!=l3.end(); ++j) { - - RuleSet *ruleset = source_ruleset; - if (ruleset == NULL) - { - source_ruleset = RuleSet::cast(nat); - ruleset = nat; - } - - ruleset->renumberRules(); - - combined_ruleset->setName(ruleset->getName()); - temp_ruleset->setName(ruleset->getName()); + int global_num = 0; string label_prefix = ""; - if (ruleset->getName() != "NAT") label_prefix = ruleset->getName(); + if (source_ruleset->getName() != "NAT") label_prefix = source_ruleset->getName(); - for (FWObject::iterator i=ruleset->begin(); i!=ruleset->end(); i++) + int rule_counter = 0; + for (FWObject::iterator i=source_ruleset->begin(); i!=source_ruleset->end(); i++) { - Rule *r= Rule::cast(*i); + Rule *r = Rule::cast(*i); if (r == NULL) continue; // skip RuleSetOptions object /* @@ -112,12 +92,12 @@ int NATCompiler::prolog() r->setLabel( createRuleLabel(label_prefix, "NAT", r->getPosition()) ); r->setAbsRuleNumber(global_num); global_num++; r->setUniqueId( FWObjectDatabase::getStringId(r->getId()) ); - combined_ruleset->add( r ); + rule_counter++; } - initialized=true; + initialized = true; - return combined_ruleset->size(); + return rule_counter; } diff --git a/src/libfwbuilder/src/fwcompiler/PolicyCompiler.cpp b/src/libfwbuilder/src/fwcompiler/PolicyCompiler.cpp index ddaea2ed5..e7c18b6d6 100644 --- a/src/libfwbuilder/src/fwcompiler/PolicyCompiler.cpp +++ b/src/libfwbuilder/src/fwcompiler/PolicyCompiler.cpp @@ -70,29 +70,22 @@ int PolicyCompiler::prolog() Policy *policy = Policy::cast(fw->getFirstByType(Policy::TYPENAME)); assert(policy); - combined_ruleset = new Policy(); // combined ruleset (all interface policies and global policy) - fw->add( combined_ruleset ); + if (source_ruleset == NULL) source_ruleset = policy; + + source_ruleset->renumberRules(); temp_ruleset = new Policy(); // working copy of the policy fw->add( temp_ruleset ); - int global_num=0; + temp_ruleset->setName(source_ruleset->getName()); - RuleSet *ruleset = source_ruleset; - if (ruleset == NULL) - { - source_ruleset = RuleSet::cast(policy); - ruleset = policy; - } - ruleset->renumberRules(); - - combined_ruleset->setName(ruleset->getName()); - temp_ruleset->setName(ruleset->getName()); + int global_num = 0; string label_prefix = ""; - if (ruleset->getName() != "Policy") label_prefix = ruleset->getName(); + if (source_ruleset->getName() != "Policy") label_prefix = source_ruleset->getName(); - for (FWObject::iterator i=ruleset->begin(); i!=ruleset->end(); i++) + int rule_counter = 0; + for (FWObject::iterator i=source_ruleset->begin(); i!=source_ruleset->end(); i++) { PolicyRule *r = PolicyRule::cast(*i); if (r == NULL) continue; // skip RuleSetOptions object @@ -129,12 +122,12 @@ int PolicyCompiler::prolog() } r->setAbsRuleNumber(global_num); global_num++; r->setUniqueId( FWObjectDatabase::getStringId(r->getId()) ); - combined_ruleset->add( r ); + rule_counter++; } - initialized=true; + initialized = true; - return combined_ruleset->size(); + return rule_counter; } @@ -1183,7 +1176,7 @@ PolicyRule* PolicyCompiler::addMgmtRule(Address* src, const PolicyRule::Action action, const string &label) { - assert(combined_ruleset != NULL); + assert(source_ruleset != NULL); /* Insert PolicyRules at top so they do not get shadowed by other * rules. Call insertRuleAtTop() with hidden_rule argument true to @@ -1192,7 +1185,7 @@ PolicyRule* PolicyCompiler::addMgmtRule(Address* src, * rules are not considered for shadowing. */ - PolicyRule* rule = PolicyRule::cast(combined_ruleset->insertRuleAtTop(true)); + PolicyRule* rule = PolicyRule::cast(source_ruleset->insertRuleAtTop(true)); assert(rule != NULL); ostringstream str; diff --git a/src/libfwbuilder/src/fwcompiler/PolicyCompiler.h b/src/libfwbuilder/src/fwcompiler/PolicyCompiler.h index 66b537127..615ef1c68 100644 --- a/src/libfwbuilder/src/fwcompiler/PolicyCompiler.h +++ b/src/libfwbuilder/src/fwcompiler/PolicyCompiler.h @@ -50,10 +50,10 @@ namespace fwcompiler { protected: /** - * this method scans combined_ruleset looking for atomic rule + * this method scans source_ruleset looking for atomic rule * which yields non-empty intersection with atomic rule r. * - * it can start scan either from the beginning of combined_ruleset, + * it can start scan either from the beginning of source_ruleset, * or from iterator 'start_here' * * it returns iterator pointing at rule it has found (so we diff --git a/src/libfwbuilder/src/fwcompiler/Preprocessor.cpp b/src/libfwbuilder/src/fwcompiler/Preprocessor.cpp index 2904187c2..382c909e8 100644 --- a/src/libfwbuilder/src/fwcompiler/Preprocessor.cpp +++ b/src/libfwbuilder/src/fwcompiler/Preprocessor.cpp @@ -45,17 +45,27 @@ using namespace std; static int infinite_recursion_breaker = 0; string Preprocessor::myPlatformName() { return "generic_preprocessor"; } -Preprocessor::~Preprocessor() {} +Preprocessor::~Preprocessor() +{ + dbcopy = NULL; +} Preprocessor::Preprocessor(FWObjectDatabase *_db, - Firewall *fw, bool ipv6_policy) : - Compiler(_db, fw, ipv6_policy) + Firewall *_fw, bool ipv6_policy) : + Compiler(NULL, _fw, ipv6_policy) { // This is the main difference between Preprocessor and other // compilers. All compilers create a copy of the whole database // and work with it, but Preprocessor works with the original // database. Therefore it copies only pointer here. dbcopy = _db; + + fw_id = _fw->getId(); + fwopt = _fw->getOptionsObject(); + + string fw_str_id = FWObjectDatabase::getStringId(_fw->getId()); + fw = Firewall::cast( + dbcopy->findInIndex(FWObjectDatabase::getIntId(fw_str_id))); } void Preprocessor::convertObject(FWObject *obj) diff --git a/src/libfwbuilder/src/fwcompiler/RoutingCompiler.cpp b/src/libfwbuilder/src/fwcompiler/RoutingCompiler.cpp index ae36439d9..2825b3e45 100644 --- a/src/libfwbuilder/src/fwcompiler/RoutingCompiler.cpp +++ b/src/libfwbuilder/src/fwcompiler/RoutingCompiler.cpp @@ -72,48 +72,31 @@ int RoutingCompiler::prolog() Routing *routing = Routing::cast(fw->getFirstByType(Routing::TYPENAME)); assert(routing); - combined_ruleset = new Routing(); // combined ruleset - fw->add( combined_ruleset ); + if (source_ruleset == NULL) source_ruleset = routing; + + source_ruleset->renumberRules(); temp_ruleset = new Routing(); // working copy of the routing fw->add( temp_ruleset ); - combined_ruleset->setName(routing->getName()); - temp_ruleset->setName(routing->getName()); + temp_ruleset->setName(source_ruleset->getName()); - routing->renumberRules(); - - list l = routing->getByType(RoutingRule::TYPENAME); - for (list::iterator j=l.begin(); j!=l.end(); ++j) + int rule_counter = 0; + for (FWObject::iterator i=source_ruleset->begin(); i!=source_ruleset->end(); i++) { - Rule *r= Rule::cast(*j); + Rule *r = Rule::cast(*i); if (r == NULL) continue; // skip RuleSetOptions object - - /* - * do not remove disabled rules just yet because some - * compilers might use RuleSet::insertRuleAtTop() and other - * similar methods from prolog() or - * addPredefinedPolicyRules()() and these methods renumber - * rules (labels stop matching rule positions when this is - * done because labels are configured in prolog() method of - * the base class. See fwbuilder ticket 1173) - */ - // if (r->isDisabled()) continue; - - // r->setInterfaceId(-1); - r->setLabel( createRuleLabel("", "main", r->getPosition()) ); - combined_ruleset->add( r ); + rule_counter++; } - initialized=true; + initialized = true; - return combined_ruleset->size(); + return rule_counter; } -bool RoutingCompiler::cmpRules(const RoutingRule &r1, - const RoutingRule &r2) +bool RoutingCompiler::cmpRules(const RoutingRule &r1, const RoutingRule &r2) { if (r1.getRDst()!=r2.getRDst()) return false; if (r1.getRGtw()!=r2.getRGtw()) return false; @@ -125,11 +108,11 @@ bool RoutingCompiler::cmpRules(const RoutingRule &r1, string RoutingCompiler::debugPrintRule(Rule *r) { - RoutingRule *rule=RoutingRule::cast(r); + RoutingRule *rule = RoutingRule::cast(r); - RuleElementRDst *dstrel=rule->getRDst(); - RuleElementRItf *itfrel=rule->getRItf(); - RuleElementRGtw *gtwrel=rule->getRGtw(); + RuleElementRDst *dstrel = rule->getRDst(); + RuleElementRItf *itfrel = rule->getRItf(); + RuleElementRGtw *gtwrel = rule->getRGtw(); ostringstream str; @@ -138,27 +121,27 @@ string RoutingCompiler::debugPrintRule(Rule *r) string dst, itf, gtw; FWObject *obj = FWReference::getObject(itfrel->front()); - itf = obj->getName(); + itf = (obj) ? obj->getName() : "NULL"; obj = FWReference::getObject(gtwrel->front()); - gtw = obj->getName(); + gtw = (obj) ? obj->getName() : "NULL"; - int no=0; - FWObject::iterator i1=dstrel->begin(); + int no = 0; + FWObject::iterator i1 = dstrel->begin(); while ( i1!=dstrel->end()) { str << endl; dst = " "; - if (i1!=dstrel->end()) + if (i1 != dstrel->end()) { FWObject *o = FWReference::getObject(*i1); - dst = o->getName(); + dst = (o) ? o->getName() : "NULL"; } - int w=0; + int w = 0; if (no==0) { str << rule->getLabel(); @@ -174,7 +157,7 @@ string RoutingCompiler::debugPrintRule(Rule *r) ++no; - if ( i1!=dstrel->end() ) ++i1; + if ( i1 != dstrel->end() ) ++i1; } return str.str(); } @@ -199,21 +182,15 @@ bool RoutingCompiler::ConvertToAtomicForDST::processNext() //RuleElementSrc *src=rule->getSrc(); assert(src); RuleElementRDst *dst=rule->getRDst(); assert(dst); - for (FWObject::iterator it=dst->begin(); it!=dst->end(); ++it) { RoutingRule *r = compiler->dbcopy->createRoutingRule(); r->duplicate(rule); compiler->temp_ruleset->add(r); - FWObject *s; - //s=r->getSrc(); assert(s); - //s->clearChildren(); - //s->add( *i1 ); - - s=r->getRDst(); assert(s); + FWObject *s = r->getRDst(); assert(s); s->clearChildren(); - s->add( *it ); + s->addRef(FWReference::getObject(*it)); tmp_queue.push_back(r); } @@ -532,7 +509,6 @@ bool RoutingCompiler::rItfChildOfFw::processNext() if (itfrel->isAny()) return true; FWObject *o = FWReference::cast(itfrel->front())->getPointer(); - if (o->isChildOf(compiler->fw)) return true; // the interface is not a child of the firewall. Could be // cluster interface though. In that case make sure the @@ -540,14 +516,19 @@ bool RoutingCompiler::rItfChildOfFw::processNext() Interface *iface = Interface::cast(o); if (iface) { - Cluster *cluster = Cluster::cast(iface->getParentHost()); + FWObject *parent = iface->getParentHost(); + if (parent->getId() == compiler->fw->getId()) return true; + + Cluster *cluster = Cluster::cast(parent); if (cluster) { list members; cluster->getMembersList(members); - if (std::find(members.begin(), members.end(), - compiler->fw) != members.end()) - return true; + list::iterator it; + for (it=members.begin(); it!=members.end(); ++it) + { + if ((*it)->getId() == compiler->fw->getId()) return true; + } } } string msg; diff --git a/src/libfwbuilder/src/fwcompiler/RoutingCompiler.h b/src/libfwbuilder/src/fwcompiler/RoutingCompiler.h index a42b13529..cc546fb16 100644 --- a/src/libfwbuilder/src/fwcompiler/RoutingCompiler.h +++ b/src/libfwbuilder/src/fwcompiler/RoutingCompiler.h @@ -37,8 +37,8 @@ #include -namespace fwcompiler { - +namespace fwcompiler +{ using namespace std; #define DECLARE_ROUTING_RULE_PROCESSOR(_Name) \ @@ -52,12 +52,13 @@ namespace fwcompiler { }; - class RoutingCompiler : public Compiler { - + class RoutingCompiler : public Compiler + { public: RoutingCompiler(libfwbuilder::FWObjectDatabase *_db, - libfwbuilder::Firewall *fw, bool ipv6_policy, + libfwbuilder::Firewall *fw, + bool ipv6_policy, fwcompiler::OSConfigurator *_oscnf) : Compiler(_db, fw, ipv6_policy, _oscnf) {} diff --git a/src/pflib/CompilerDriver_ipf_run.cpp b/src/pflib/CompilerDriver_ipf_run.cpp index 902466bbb..5beecfdbf 100644 --- a/src/pflib/CompilerDriver_ipf_run.cpp +++ b/src/pflib/CompilerDriver_ipf_run.cpp @@ -45,27 +45,21 @@ #include "OSConfigurator_freebsd.h" #include "OSConfigurator_solaris.h" -#include "fwbuilder/Resources.h" -#include "fwbuilder/FWObjectDatabase.h" -#include "fwbuilder/XMLTools.h" -#include "fwbuilder/FWException.h" -#include "fwbuilder/Firewall.h" -#include "fwbuilder/Interface.h" -#include "fwbuilder/Policy.h" -#include "fwbuilder/NAT.h" - -#include "fwcompiler/Preprocessor.h" - -#include "fwbuilder/Resources.h" -#include "fwbuilder/FWObjectDatabase.h" -#include "fwbuilder/FWException.h" #include "fwbuilder/Cluster.h" #include "fwbuilder/ClusterGroup.h" +#include "fwbuilder/FWException.h" +#include "fwbuilder/FWObjectDatabase.h" +#include "fwbuilder/FailoverClusterGroup.h" #include "fwbuilder/Firewall.h" #include "fwbuilder/Interface.h" +#include "fwbuilder/Library.h" +#include "fwbuilder/NAT.h" #include "fwbuilder/Policy.h" +#include "fwbuilder/Resources.h" #include "fwbuilder/StateSyncClusterGroup.h" -#include "fwbuilder/FailoverClusterGroup.h" +#include "fwbuilder/XMLTools.h" + +#include "fwcompiler/Preprocessor.h" #include #include @@ -229,6 +223,7 @@ QString CompilerDriver_ipf::run(const std::string &cluster_id, c.setSourceRuleSet(Policy::cast(policy)); c.setRuleSetName(policy->getName()); + c.setPersistentObjects(persistent_objects); c.setSingleRuleCompileMode(single_rule_id); c.setDebugLevel( dl ); @@ -250,6 +245,7 @@ QString CompilerDriver_ipf::run(const std::string &cluster_id, n.setSourceRuleSet(NAT::cast(nat)); n.setRuleSetName(nat->getName()); + n.setPersistentObjects(persistent_objects); n.setSingleRuleCompileMode(single_rule_id); n.setDebugLevel( dl ); @@ -265,6 +261,13 @@ QString CompilerDriver_ipf::run(const std::string &cluster_id, n.epilog(); } + /* + * compilers detach persistent objects when they finish, this + * means at this point library persistent_objects is not part + * of any object tree. + */ + objdb->reparent(persistent_objects); + if (haveErrorsAndWarnings()) { all_errors.push_front(getErrors("").c_str()); diff --git a/src/pflib/CompilerDriver_ipfw_run.cpp b/src/pflib/CompilerDriver_ipfw_run.cpp index 6d1e05239..6a17c594d 100644 --- a/src/pflib/CompilerDriver_ipfw_run.cpp +++ b/src/pflib/CompilerDriver_ipfw_run.cpp @@ -42,26 +42,21 @@ #include "OSConfigurator_freebsd.h" #include "OSConfigurator_macosx.h" -#include "fwbuilder/Resources.h" -#include "fwbuilder/FWObjectDatabase.h" -#include "fwbuilder/XMLTools.h" -#include "fwbuilder/FWException.h" -#include "fwbuilder/Firewall.h" -#include "fwbuilder/Interface.h" -#include "fwbuilder/Policy.h" -#include "fwbuilder/NAT.h" - -#include "fwcompiler/Preprocessor.h" - -#include "fwbuilder/FWObjectDatabase.h" -#include "fwbuilder/FWException.h" #include "fwbuilder/Cluster.h" #include "fwbuilder/ClusterGroup.h" +#include "fwbuilder/FWException.h" +#include "fwbuilder/FWObjectDatabase.h" +#include "fwbuilder/FailoverClusterGroup.h" #include "fwbuilder/Firewall.h" #include "fwbuilder/Interface.h" +#include "fwbuilder/Library.h" +#include "fwbuilder/NAT.h" #include "fwbuilder/Policy.h" +#include "fwbuilder/Resources.h" #include "fwbuilder/StateSyncClusterGroup.h" -#include "fwbuilder/FailoverClusterGroup.h" +#include "fwbuilder/XMLTools.h" + +#include "fwcompiler/Preprocessor.h" #include #include @@ -238,6 +233,8 @@ QString CompilerDriver_ipfw::run(const std::string &cluster_id, c.setIPFWNumber(ipfw_rule_number); c.setSourceRuleSet( policy ); c.setRuleSetName(branch_name); + c.setPersistentObjects(persistent_objects); + c.setSingleRuleCompileMode(single_rule_id); c.setDebugLevel( dl ); if (rule_debug_on) c.setDebugRule( drp ); @@ -286,6 +283,13 @@ QString CompilerDriver_ipfw::run(const std::string &cluster_id, generated_script += c_str.str(); } + /* + * compilers detach persistent objects when they finish, this + * means at this point library persistent_objects is not part + * of any object tree. + */ + objdb->reparent(persistent_objects); + if (haveErrorsAndWarnings()) { all_errors.push_front(getErrors("").c_str()); diff --git a/src/pflib/CompilerDriver_pf_run.cpp b/src/pflib/CompilerDriver_pf_run.cpp index 282487566..de9f88a1b 100644 --- a/src/pflib/CompilerDriver_pf_run.cpp +++ b/src/pflib/CompilerDriver_pf_run.cpp @@ -50,30 +50,24 @@ #include "OSConfigurator_freebsd.h" #include "OSConfigurator_solaris.h" -#include "fwbuilder/Resources.h" -#include "fwbuilder/FWObjectDatabase.h" -#include "fwbuilder/XMLTools.h" +#include "fwbuilder/Cluster.h" +#include "fwbuilder/ClusterGroup.h" #include "fwbuilder/FWException.h" +#include "fwbuilder/FWObjectDatabase.h" +#include "fwbuilder/FailoverClusterGroup.h" #include "fwbuilder/Firewall.h" #include "fwbuilder/Interface.h" -#include "fwbuilder/Policy.h" +#include "fwbuilder/Library.h" #include "fwbuilder/NAT.h" +#include "fwbuilder/Policy.h" +#include "fwbuilder/Resources.h" #include "fwbuilder/Routing.h" +#include "fwbuilder/StateSyncClusterGroup.h" +#include "fwbuilder/XMLTools.h" #include "fwcompiler/Preprocessor.h" #include "fwcompiler/exceptions.h" -#include "fwbuilder/Resources.h" -#include "fwbuilder/FWObjectDatabase.h" -#include "fwbuilder/FWException.h" -#include "fwbuilder/Cluster.h" -#include "fwbuilder/ClusterGroup.h" -#include "fwbuilder/Firewall.h" -#include "fwbuilder/Interface.h" -#include "fwbuilder/Policy.h" -#include "fwbuilder/StateSyncClusterGroup.h" -#include "fwbuilder/FailoverClusterGroup.h" - #include #include #include @@ -459,7 +453,8 @@ QString CompilerDriver_pf::run(const std::string &cluster_id, if (table_factories.count(ruleset_name) == 0) { - table_factories[ruleset_name] = new fwcompiler::TableFactory(this); + table_factories[ruleset_name] = + new fwcompiler::TableFactory(this, persistent_objects); } NATCompiler_pf n( objdb, fw, ipv6_policy, oscnf.get(), @@ -468,6 +463,7 @@ QString CompilerDriver_pf::run(const std::string &cluster_id, n.setSourceRuleSet( nat ); n.setRuleSetName(nat->getName()); + n.setPersistentObjects(persistent_objects); n.setSingleRuleCompileMode(single_rule_id); n.setDebugLevel( dl ); @@ -532,7 +528,8 @@ QString CompilerDriver_pf::run(const std::string &cluster_id, if (table_factories.count(ruleset_name) == 0) { - table_factories[ruleset_name] = new fwcompiler::TableFactory(this); + table_factories[ruleset_name] = + new fwcompiler::TableFactory(this, persistent_objects); } PolicyCompiler_pf c( objdb, fw, ipv6_policy, oscnf.get(), @@ -542,6 +539,7 @@ QString CompilerDriver_pf::run(const std::string &cluster_id, c.setSourceRuleSet( policy ); c.setRuleSetName(policy->getName()); + c.setPersistentObjects(persistent_objects); c.setSingleRuleCompileMode(single_rule_id); c.setDebugLevel( dl ); @@ -609,6 +607,7 @@ QString CompilerDriver_pf::run(const std::string &cluster_id, { routing_compiler->setSourceRuleSet(routing); routing_compiler->setRuleSetName(routing->getName()); + routing_compiler->setPersistentObjects(persistent_objects); routing_compiler->setSingleRuleCompileMode(single_rule_id); routing_compiler->setDebugLevel( dl ); @@ -629,6 +628,12 @@ QString CompilerDriver_pf::run(const std::string &cluster_id, routing_script += routing_compiler->getCompiledScript(); } + /* + * compilers detach persistent objects when they finish, this + * means at this point library persistent_objects is not part + * of any object tree. + */ + objdb->reparent(persistent_objects); if (haveErrorsAndWarnings()) { @@ -703,7 +708,13 @@ QString CompilerDriver_pf::run(const std::string &cluster_id, if (ruleset_name == "__main__") { printStaticOptions(pf_str, fw); + + // attach persistent_tables subtree inside TableFactory object + // to the object tree + table_factories[ruleset_name]->init(objdb); + pf_str << table_factories[ruleset_name]->PrintTables(); + if (prolog_place == "pf_file_after_tables") printProlog(pf_str, pre_hook); } else diff --git a/src/pflib/NATCompiler_ipf.cpp b/src/pflib/NATCompiler_ipf.cpp index 7588c305b..d1e886435 100644 --- a/src/pflib/NATCompiler_ipf.cpp +++ b/src/pflib/NATCompiler_ipf.cpp @@ -27,19 +27,20 @@ #include "NATCompiler_ipf.h" -#include "fwbuilder/FWObjectDatabase.h" -#include "fwbuilder/RuleElement.h" -#include "fwbuilder/NAT.h" #include "fwbuilder/AddressRange.h" -#include "fwbuilder/IPService.h" +#include "fwbuilder/AddressTable.h" +#include "fwbuilder/FWObjectDatabase.h" +#include "fwbuilder/Firewall.h" +#include "fwbuilder/Host.h" #include "fwbuilder/ICMPService.h" +#include "fwbuilder/IPService.h" +#include "fwbuilder/Interface.h" +#include "fwbuilder/Library.h" +#include "fwbuilder/NAT.h" +#include "fwbuilder/Network.h" +#include "fwbuilder/RuleElement.h" #include "fwbuilder/TCPService.h" #include "fwbuilder/UDPService.h" -#include "fwbuilder/Host.h" -#include "fwbuilder/Network.h" -#include "fwbuilder/Interface.h" -#include "fwbuilder/Firewall.h" -#include "fwbuilder/AddressTable.h" #include @@ -165,7 +166,7 @@ bool NATCompiler_ipf::ExpandPortRange::processNext() newSrv->duplicate(osrv,true); TCPUDPService::cast(newSrv)->setDstRangeStart(p); TCPUDPService::cast(newSrv)->setDstRangeEnd(p); - compiler->dbcopy->add(newSrv,false); + compiler->persistent_objects->add(newSrv,false); compiler->dbcopy->addToIndex(newSrv); RuleElementOSrv *nosrv = r->getOSrv(); diff --git a/src/pflib/NATCompiler_pf.cpp b/src/pflib/NATCompiler_pf.cpp index 9b9c7b818..7b94e03ae 100644 --- a/src/pflib/NATCompiler_pf.cpp +++ b/src/pflib/NATCompiler_pf.cpp @@ -29,21 +29,22 @@ #include "fwcompiler/OSConfigurator.h" -#include "fwbuilder/RuleElement.h" -#include "fwbuilder/NAT.h" #include "fwbuilder/AddressRange.h" -#include "fwbuilder/IPService.h" +#include "fwbuilder/AddressTable.h" +#include "fwbuilder/Cluster.h" +#include "fwbuilder/FailoverClusterGroup.h" +#include "fwbuilder/Firewall.h" +#include "fwbuilder/Host.h" #include "fwbuilder/ICMPService.h" +#include "fwbuilder/IPService.h" +#include "fwbuilder/IPv4.h" +#include "fwbuilder/Interface.h" +#include "fwbuilder/Library.h" +#include "fwbuilder/NAT.h" +#include "fwbuilder/Network.h" +#include "fwbuilder/RuleElement.h" #include "fwbuilder/TCPService.h" #include "fwbuilder/UDPService.h" -#include "fwbuilder/Host.h" -#include "fwbuilder/Network.h" -#include "fwbuilder/Interface.h" -#include "fwbuilder/IPv4.h" -#include "fwbuilder/Firewall.h" -#include "fwbuilder/AddressTable.h" -#include "fwbuilder/FailoverClusterGroup.h" -#include "fwbuilder/Cluster.h" #include #include @@ -94,7 +95,7 @@ int NATCompiler_pf::prolog() IPv4::cast(loopback_address)->setAddress(InetAddr::getLoopbackAddr()); - dbcopy->add(loopback_address,false); + persistent_objects->add(loopback_address,false); if (tables) { @@ -279,7 +280,10 @@ bool NATCompiler_pf::splitSDNATRule::processNext() odst=r->getODst(); odst->clearChildren(); for (FWObject::iterator i=rule->getTDst()->begin(); i!=rule->getTDst()->end(); i++) - odst->add( *i ); + { + FWObject *o = FWReference::getObject(*i); + odst->addRef(o); + } if ( ! rule->getTSrv()->isAny()) { @@ -317,7 +321,7 @@ bool NATCompiler_pf::splitSDNATRule::processNext() match_service = TCPUDPService::cast( compiler->dbcopy->create(tsrv->getTypeName())); match_service->setName(tsrv->getName() + "_dport"); - compiler->dbcopy->add(match_service); + compiler->persistent_objects->add(match_service); match_service->setDstRangeStart(tu_tsrv->getDstRangeStart()); match_service->setDstRangeEnd(tu_tsrv->getDstRangeEnd()); } @@ -1014,7 +1018,7 @@ bool NATCompiler_pf::swapAddressTableObjectsInRE::processNext() mart->setId( mart_id ); compiler->dbcopy->addToIndex(mart); - compiler->dbcopy->add(mart); + compiler->persistent_objects->add(mart); // register this object as a table string tblname = atbl->getName(); @@ -1311,3 +1315,9 @@ void NATCompiler_pf::compile() void NATCompiler_pf::epilog() { } + +NATCompiler_pf::~NATCompiler_pf() +{ + //if (tables) tables->detach(); +} + diff --git a/src/pflib/NATCompiler_pf.h b/src/pflib/NATCompiler_pf.h index 553faf306..f5a43e339 100644 --- a/src/pflib/NATCompiler_pf.h +++ b/src/pflib/NATCompiler_pf.h @@ -63,15 +63,20 @@ namespace fwcompiler struct redirectRuleInfo { - std::string natrule_label; - libfwbuilder::FWObject *old_tdst; - libfwbuilder::FWObject *new_tdst; - libfwbuilder::Service *tsrv; + std::string natrule_label; + int old_tdst; + int new_tdst; + int tsrv; redirectRuleInfo(const std::string &rl, libfwbuilder::FWObject *oa, libfwbuilder::FWObject *na, libfwbuilder::Service *s) - { natrule_label=rl; old_tdst=oa; new_tdst=na; tsrv=s; } + { + natrule_label = rl; + old_tdst = oa->getId(); + new_tdst = na->getId(); + tsrv = s->getId(); + } }; @@ -388,12 +393,12 @@ namespace fwcompiler bool ipv6_policy, fwcompiler::OSConfigurator *_oscnf, TableFactory *tbf = NULL - ) : - NATCompiler(_db, fw, ipv6_policy, _oscnf) + ) : NATCompiler(_db, fw, ipv6_policy, _oscnf) { tables = tbf; } + virtual ~NATCompiler_pf(); virtual int prolog(); virtual void compile(); diff --git a/src/pflib/OSConfigurator_bsd.cpp b/src/pflib/OSConfigurator_bsd.cpp index 0e2a1715d..b9f894c7f 100644 --- a/src/pflib/OSConfigurator_bsd.cpp +++ b/src/pflib/OSConfigurator_bsd.cpp @@ -75,7 +75,7 @@ void OSConfigurator_bsd::addVirtualAddressForNAT(const Address *addr) FWObject *iaddr = findAddressFor(addr, fw ); if (iaddr!=NULL) { - virtual_addresses.insert(addr); + virtual_addresses.insert(addr->getId()); } else warning("Can not add virtual address " + addr->getAddressPtr()->toString() ); diff --git a/src/pflib/OSConfigurator_bsd.h b/src/pflib/OSConfigurator_bsd.h index 8e3f1e7bb..14e0ef339 100644 --- a/src/pflib/OSConfigurator_bsd.h +++ b/src/pflib/OSConfigurator_bsd.h @@ -55,7 +55,7 @@ protected: QMap interface_configuration_lines; QStringList cloned_interfaces; - std::set virtual_addresses; + std::set virtual_addresses; virtual void setKernelVariable(libfwbuilder::Firewall *fw, const std::string &var_name, diff --git a/src/pflib/OSConfigurator_bsd_interfaces.cpp b/src/pflib/OSConfigurator_bsd_interfaces.cpp index e53a2730d..9d7b6ab76 100644 --- a/src/pflib/OSConfigurator_bsd_interfaces.cpp +++ b/src/pflib/OSConfigurator_bsd_interfaces.cpp @@ -248,10 +248,10 @@ string OSConfigurator_bsd::configureInterfaces() if (ipaddr->isV6()) have_ipv6 = true; } - set::iterator it; + set::iterator it; for (it=virtual_addresses.begin(); it!=virtual_addresses.end(); ++it) { - const Address *addr = *it; + const Address *addr = Address::constcast(dbcopy->findInIndex(*it)); const InetAddr *ipaddr = addr->getAddressPtr(); FWObject *iaddr = findAddressFor(addr, fw ); if (iaddr!=NULL) diff --git a/src/pflib/PolicyCompiler_ipf.cpp b/src/pflib/PolicyCompiler_ipf.cpp index 4f19a1920..a6eaab447 100644 --- a/src/pflib/PolicyCompiler_ipf.cpp +++ b/src/pflib/PolicyCompiler_ipf.cpp @@ -28,16 +28,17 @@ #include "PolicyCompiler_ipf.h" #include "fwcompiler/Compiler.h" +#include "fwbuilder/AddressTable.h" #include "fwbuilder/FWObjectDatabase.h" -#include "fwbuilder/RuleElement.h" -#include "fwbuilder/IPService.h" +#include "fwbuilder/Firewall.h" #include "fwbuilder/ICMPService.h" +#include "fwbuilder/IPService.h" +#include "fwbuilder/Interface.h" +#include "fwbuilder/Library.h" +#include "fwbuilder/Policy.h" +#include "fwbuilder/RuleElement.h" #include "fwbuilder/TCPService.h" #include "fwbuilder/UDPService.h" -#include "fwbuilder/Policy.h" -#include "fwbuilder/Interface.h" -#include "fwbuilder/Firewall.h" -#include "fwbuilder/AddressTable.h" #include @@ -55,15 +56,15 @@ int PolicyCompiler_ipf::prolog() anytcp = dbcopy->createTCPService(); anytcp->setId(FWObjectDatabase::generateUniqueId()); //ANY_TCP_OBJ_ID); - dbcopy->add(anytcp,false); + persistent_objects->add(anytcp,false); anyudp=dbcopy->createUDPService(); anyudp->setId(FWObjectDatabase::generateUniqueId()); //ANY_UDP_OBJ_ID); - dbcopy->add(anyudp,false); + persistent_objects->add(anyudp,false); anyicmp=dbcopy->createICMPService(); anyicmp->setId(FWObjectDatabase::generateUniqueId()); //ANY_ICMP_OBJ_ID); - dbcopy->add(anyicmp,false); + persistent_objects->add(anyicmp,false); return n; } diff --git a/src/pflib/PolicyCompiler_ipfw.cpp b/src/pflib/PolicyCompiler_ipfw.cpp index b40a8d8c8..4a8b9a681 100644 --- a/src/pflib/PolicyCompiler_ipfw.cpp +++ b/src/pflib/PolicyCompiler_ipfw.cpp @@ -28,16 +28,17 @@ #include "PolicyCompiler_ipfw.h" #include "fwcompiler/Compiler.h" +#include "fwbuilder/AddressTable.h" #include "fwbuilder/FWObjectDatabase.h" -#include "fwbuilder/RuleElement.h" -#include "fwbuilder/IPService.h" +#include "fwbuilder/Firewall.h" #include "fwbuilder/ICMPService.h" +#include "fwbuilder/IPService.h" +#include "fwbuilder/Interface.h" +#include "fwbuilder/Library.h" +#include "fwbuilder/Policy.h" +#include "fwbuilder/RuleElement.h" #include "fwbuilder/TCPService.h" #include "fwbuilder/UDPService.h" -#include "fwbuilder/Policy.h" -#include "fwbuilder/Interface.h" -#include "fwbuilder/Firewall.h" -#include "fwbuilder/AddressTable.h" #include @@ -55,15 +56,15 @@ int PolicyCompiler_ipfw::prolog() anytcp=dbcopy->createTCPService(); anytcp->setId(FWObjectDatabase::generateUniqueId()); // ANY_TCP_OBJ_ID); - dbcopy->add(anytcp,false); + persistent_objects->add(anytcp,false); anyudp=dbcopy->createUDPService(); anyudp->setId(FWObjectDatabase::generateUniqueId()); //ANY_UDP_OBJ_ID); - dbcopy->add(anyudp,false); + persistent_objects->add(anyudp,false); anyicmp=dbcopy->createICMPService(); anyicmp->setId(FWObjectDatabase::generateUniqueId()); //ANY_ICMP_OBJ_ID); - dbcopy->add(anyicmp,false); + persistent_objects->add(anyicmp,false); return n; diff --git a/src/pflib/PolicyCompiler_pf.cpp b/src/pflib/PolicyCompiler_pf.cpp index 60a73fae5..b1e418f85 100644 --- a/src/pflib/PolicyCompiler_pf.cpp +++ b/src/pflib/PolicyCompiler_pf.cpp @@ -28,20 +28,21 @@ #include "PolicyCompiler_pf.h" #include "NATCompiler_pf.h" -#include "fwbuilder/FWObjectDatabase.h" -#include "fwbuilder/RuleElement.h" -#include "fwbuilder/IPService.h" -#include "fwbuilder/ICMPService.h" -#include "fwbuilder/TCPService.h" -#include "fwbuilder/UDPService.h" -#include "fwbuilder/TagService.h" -#include "fwbuilder/Policy.h" -#include "fwbuilder/Interface.h" -#include "fwbuilder/Firewall.h" -#include "fwbuilder/Network.h" #include "fwbuilder/AddressTable.h" +#include "fwbuilder/FWObjectDatabase.h" #include "fwbuilder/FailoverClusterGroup.h" +#include "fwbuilder/Firewall.h" +#include "fwbuilder/ICMPService.h" +#include "fwbuilder/IPService.h" +#include "fwbuilder/Interface.h" +#include "fwbuilder/Library.h" +#include "fwbuilder/Network.h" +#include "fwbuilder/Policy.h" +#include "fwbuilder/RuleElement.h" #include "fwbuilder/StateSyncClusterGroup.h" +#include "fwbuilder/TCPService.h" +#include "fwbuilder/TagService.h" +#include "fwbuilder/UDPService.h" #include #include @@ -156,7 +157,7 @@ bool PolicyCompiler_pf::swapAddressTableObjectsInRE::processNext() mart->setId( mart_id ); compiler->dbcopy->addToIndex(mart); - compiler->dbcopy->add(mart); + compiler->persistent_objects->add(mart); // register this object as a table string tblname = atbl->getName(); @@ -418,7 +419,7 @@ void PolicyCompiler_pf::addDefaultPolicyRule() ssh->setDstRangeEnd(22); ssh->setName("mgmt_ssh"); - dbcopy->add(ssh,false); + persistent_objects->add(ssh,false); string mgmt_addr = getCachedFwOpt()->getStr("mgmt_addr"); InetAddr addr; @@ -452,12 +453,13 @@ void PolicyCompiler_pf::addDefaultPolicyRule() mgmt_workstation->setName("mgmt_addr"); mgmt_workstation->setAddress(addr); mgmt_workstation->setNetmask(netmask); -// IPv4 *mgmt_workstation = IPv4::cast(dbcopy->create(IPv4::TYPENAME)); -// mgmt_workstation->setAddress(getCachedFwOpt()->getStr("mgmt_addr")); - dbcopy->add(mgmt_workstation,false); + persistent_objects->add(mgmt_workstation,false); + + // r = dbcopy->createPolicyRule(); + // source_ruleset->push_front(r); + + r = PolicyRule::cast(source_ruleset->insertRuleAtTop(true)); - r = dbcopy->createPolicyRule(); - temp_ruleset->add(r); r->setAction(PolicyRule::Accept); r->setLogging(false); r->setDirection(PolicyRule::Inbound); @@ -479,17 +481,17 @@ void PolicyCompiler_pf::addDefaultPolicyRule() RuleElement *srv = r->getSrv(); assert(srv!=NULL); srv->addRef(ssh); - - combined_ruleset->push_front(r); - } insertCarpRule(); insertPfsyncRule(); - PolicyRule *r = dbcopy->createPolicyRule(); + // PolicyRule *r = dbcopy->createPolicyRule(); + // source_ruleset->push_back(r); + + PolicyRule *r = PolicyRule::cast(source_ruleset->appendRuleAtBottom(true)); + FWOptions *ruleopt; - temp_ruleset->add(r); r->setAction(PolicyRule::Deny); r->setLogging(getCachedFwOpt()->getBool("fallback_log")); r->setDirection(PolicyRule::Both); @@ -500,7 +502,6 @@ void PolicyCompiler_pf::addDefaultPolicyRule() r->setLabel("fallback rule"); ruleopt = r->getOptionsObject(); ruleopt->setBool("stateless", true); - combined_ruleset->push_back(r); } } @@ -749,12 +750,11 @@ bool PolicyCompiler_pf::doSrvNegation::processNext() bool PolicyCompiler_pf::addLoopbackForRedirect::processNext() { - PolicyRule *rule=getNext(); if (rule==NULL) return false; - PolicyCompiler_pf *pf_comp=dynamic_cast(compiler); + PolicyRule *rule = getNext(); if (rule==NULL) return false; + PolicyCompiler_pf *pf_comp = dynamic_cast(compiler); -// RuleElementSrc *src=rule->getSrc(); - RuleElementDst *dst=rule->getDst(); - RuleElementSrv *srv=rule->getSrv(); + RuleElementDst *dst = rule->getDst(); + RuleElementSrv *srv = rule->getSrv(); if (pf_comp->redirect_rules_info==NULL) compiler->abort( @@ -764,19 +764,8 @@ bool PolicyCompiler_pf::addLoopbackForRedirect::processNext() tmp_queue.push_back(rule); - //const list lst = - // pf_comp->natcmp->getRedirRulesInfo(); - if (pf_comp->redirect_rules_info->empty()) return true; -/* - * struct redirectRuleInfo { - * string natrule_label; - * Address *tdst; - * Service *tsrv; - * }; - */ - for (FWObject::iterator i=srv->begin(); i!=srv->end(); i++) { FWObject *o1= *i; @@ -788,17 +777,21 @@ bool PolicyCompiler_pf::addLoopbackForRedirect::processNext() { FWObject *o2= *j; if (FWReference::cast(o2)!=NULL) o2=FWReference::cast(o2)->getPointer(); - Address *a=Address::cast( o2 ); + Address *a = Address::cast( o2 ); assert(a); list::const_iterator k; for (k=pf_comp->redirect_rules_info->begin(); k!=pf_comp->redirect_rules_info->end(); ++k) { - if ( *a == *(k->old_tdst) && *s == *(k->tsrv) ) + FWObject *old_tdst_obj = compiler->dbcopy->findInIndex(k->old_tdst); + FWObject *tsrv_obj = compiler->dbcopy->findInIndex(k->tsrv); + + if ( *a == *(old_tdst_obj) && *s == *(tsrv_obj) ) { // insert address used for redirection in the NAT rule. - dst->addRef( k->new_tdst ); + FWObject *new_tdst_obj = compiler->dbcopy->findInIndex(k->new_tdst); + dst->addRef(new_tdst_obj); return true; } } @@ -1124,7 +1117,7 @@ void PolicyCompiler_pf::insertCarpRule() IPService* carp_service = IPService::cast(dbcopy->create(IPService::TYPENAME)); carp_service->setComment("CARP service"); carp_service->setProtocolNumber(112); - dbcopy->add(carp_service); + persistent_objects->add(carp_service); FWObjectTypedChildIterator interfaces = fw->findByType(Interface::TYPENAME); for (; interfaces != interfaces.end(); ++interfaces) @@ -1170,7 +1163,7 @@ void PolicyCompiler_pf::insertPfsyncRule() IPService* pfsync_service = IPService::cast(dbcopy->create(IPService::TYPENAME)); pfsync_service->setComment("pfsync service"); pfsync_service->setProtocolNumber(240); - dbcopy->add(pfsync_service); + persistent_objects->add(pfsync_service); FWObjectTypedChildIterator interfaces = fw->findByType(Interface::TYPENAME); for (; interfaces != interfaces.end(); ++interfaces) @@ -1211,4 +1204,7 @@ bool PolicyCompiler_pf::checkForShadowingPlatformSpecific(PolicyRule *, return true; } - +PolicyCompiler_pf::~PolicyCompiler_pf() +{ + // if (tables) tables->detach(); +} diff --git a/src/pflib/PolicyCompiler_pf.h b/src/pflib/PolicyCompiler_pf.h index c9a4840bc..de7fc0a5d 100644 --- a/src/pflib/PolicyCompiler_pf.h +++ b/src/pflib/PolicyCompiler_pf.h @@ -443,6 +443,8 @@ namespace fwcompiler tables = tbf; } + virtual ~PolicyCompiler_pf(); + virtual int prolog(); virtual void compile(); virtual void epilog(); diff --git a/src/pflib/TableFactory.cpp b/src/pflib/TableFactory.cpp index 1cb4b29cd..a8824c95e 100644 --- a/src/pflib/TableFactory.cpp +++ b/src/pflib/TableFactory.cpp @@ -27,13 +27,14 @@ #include "TableFactory.h" -#include "fwbuilder/FWObjectDatabase.h" -#include "fwbuilder/RuleElement.h" -#include "fwbuilder/Interface.h" -#include "fwbuilder/Firewall.h" -#include "fwbuilder/Rule.h" -#include "fwbuilder/DNSName.h" #include "fwbuilder/AddressTable.h" +#include "fwbuilder/DNSName.h" +#include "fwbuilder/FWObjectDatabase.h" +#include "fwbuilder/Firewall.h" +#include "fwbuilder/Interface.h" +#include "fwbuilder/Library.h" +#include "fwbuilder/Rule.h" +#include "fwbuilder/RuleElement.h" #include #include @@ -47,23 +48,26 @@ using namespace libfwbuilder; using namespace fwcompiler; using namespace std; -TableFactory::TableFactory(BaseCompiler *comp) +TableFactory::TableFactory(BaseCompiler *comp, Library *persistent_objects) { compiler = comp; ruleSetName = ""; dbroot = NULL; persistent_tables = new ObjectGroup(); + persistent_tables->setName("PF Tables"); + persistent_objects->add(persistent_tables); } void TableFactory::init(FWObjectDatabase *_dbr) { dbroot = _dbr; - dbroot->add(persistent_tables); - dbroot->addToIndex(persistent_tables); - for (FWObject::iterator i=persistent_tables->begin(); i!=persistent_tables->end(); i++) - { - dbroot->addToIndex(*i); - } + // dbroot->add(persistent_tables); + // persistent_tables->fixTree(); +} + +void TableFactory::detach() +{ + // dbroot->remove(persistent_tables, false); } struct joinIDs : public unary_function @@ -149,8 +153,7 @@ void TableFactory::createTablesForRE(RuleElement *re,Rule *rule) for (FWObject::iterator i=re->begin(); i!=re->end(); i++) { - FWObject *o= *i; - if (FWReference::cast(o)!=NULL) o=FWReference::cast(o)->getPointer(); + FWObject *o = FWReference::getObject(*i); tblgrp->addRef( o ); } } @@ -190,11 +193,8 @@ string TableFactory::PrintTables() for (FWObject::iterator i=grp->begin(); i!=grp->end(); i++) { if (i!=grp->begin()) output << ", "; - FWObject *o= *i; - if (FWReference::cast(o)!=NULL) o=FWReference::cast(o)->getPointer(); - if (o==NULL) - compiler->abort("broken table object "); - + FWObject *o = FWReference::getObject(*i); + if (o==NULL) compiler->abort("broken table object "); MultiAddressRunTime *atrt = MultiAddressRunTime::cast(o); if (atrt!=NULL) diff --git a/src/pflib/TableFactory.h b/src/pflib/TableFactory.h index 65b9c615a..7b4295392 100644 --- a/src/pflib/TableFactory.h +++ b/src/pflib/TableFactory.h @@ -53,9 +53,10 @@ namespace fwcompiler { std::string ruleSetName; public: - TableFactory(BaseCompiler *comp); + TableFactory(BaseCompiler *comp, libfwbuilder::Library *persistent_objects); void init(libfwbuilder::FWObjectDatabase *_dbroot); + void detach(); void setRuleSetName(const std::string &rsn="") { ruleSetName=rsn; } diff --git a/test/ipt/cluster1_secuwall-1.fw.orig b/test/ipt/cluster1_secuwall-1.fw.orig index 3bc1b19fc..d5394136c 100755 --- a/test/ipt/cluster1_secuwall-1.fw.orig +++ b/test/ipt/cluster1_secuwall-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:59:33 2011 PST by vadim +# Generated Thu Mar 10 21:52:44 2011 PST by vadim # # files: * cluster1_secuwall-1.fw /etc/cluster1_secuwall-1.fw # @@ -588,7 +588,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:59:33 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:52:44 2011 by vadim" log "Database was cluster-tests.fwb" check_tools check_run_time_address_table_files diff --git a/test/ipt/firewall-base-rulesets.fw.orig b/test/ipt/firewall-base-rulesets.fw.orig index 8e1d7cf39..c398a3db7 100755 --- a/test/ipt/firewall-base-rulesets.fw.orig +++ b/test/ipt/firewall-base-rulesets.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:58:32 2011 PST by vadim +# Generated Thu Mar 10 21:51:50 2011 PST by vadim # # files: * firewall-base-rulesets.fw /etc/fw/firewall-base-rulesets.fw # @@ -445,7 +445,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:58:32 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:51:50 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall-ipv6-1.fw.orig b/test/ipt/firewall-ipv6-1.fw.orig index 05f9d69a0..f8b912283 100755 --- a/test/ipt/firewall-ipv6-1.fw.orig +++ b/test/ipt/firewall-ipv6-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:58:39 2011 PST by vadim +# Generated Thu Mar 10 21:51:55 2011 PST by vadim # # files: * firewall-ipv6-1.fw /etc/firewall-ipv6-1.fw # @@ -702,7 +702,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:58:39 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:51:55 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall-ipv6-2.fw.orig b/test/ipt/firewall-ipv6-2.fw.orig index dde23541b..b80aabd45 100755 --- a/test/ipt/firewall-ipv6-2.fw.orig +++ b/test/ipt/firewall-ipv6-2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:58:43 2011 PST by vadim +# Generated Thu Mar 10 13:14:16 2011 PST by vadim # # files: * firewall-ipv6-2.fw /etc/firewall-ipv6-2.fw # @@ -966,7 +966,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:58:43 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 13:14:16 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall-ipv6-3.fw.orig b/test/ipt/firewall-ipv6-3.fw.orig index 56bf68800..5b2e27ea4 100755 --- a/test/ipt/firewall-ipv6-3.fw.orig +++ b/test/ipt/firewall-ipv6-3.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:58:50 2011 PST by vadim +# Generated Thu Mar 10 21:52:04 2011 PST by vadim # # files: * firewall-ipv6-3.fw /etc/firewall-ipv6-3.fw # @@ -596,7 +596,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:58:50 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:52:04 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall-ipv6-4-1.fw.orig b/test/ipt/firewall-ipv6-4-1.fw.orig index b6d84960e..eb014c311 100755 --- a/test/ipt/firewall-ipv6-4-1.fw.orig +++ b/test/ipt/firewall-ipv6-4-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:59:00 2011 PST by vadim +# Generated Thu Mar 10 21:52:13 2011 PST by vadim # # files: * firewall-ipv6-4-1.fw /etc/firewall-ipv6-4-1.fw # @@ -545,7 +545,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:59:00 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:52:13 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall-ipv6-4.fw.orig b/test/ipt/firewall-ipv6-4.fw.orig index 32ca8555a..1aa47e895 100755 --- a/test/ipt/firewall-ipv6-4.fw.orig +++ b/test/ipt/firewall-ipv6-4.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:58:52 2011 PST by vadim +# Generated Thu Mar 10 21:52:08 2011 PST by vadim # # files: * firewall-ipv6-4.fw /etc/firewall-ipv6-4.fw # @@ -581,7 +581,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:58:52 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:52:08 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall-ipv6-5.fw.orig b/test/ipt/firewall-ipv6-5.fw.orig index 61ba153b2..f885319f8 100755 --- a/test/ipt/firewall-ipv6-5.fw.orig +++ b/test/ipt/firewall-ipv6-5.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:58:55 2011 PST by vadim +# Generated Thu Mar 10 21:52:11 2011 PST by vadim # # files: * firewall-ipv6-5.fw /etc/firewall-ipv6-5.fw # @@ -412,7 +412,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:58:55 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:52:11 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall-ipv6-6.fw.orig b/test/ipt/firewall-ipv6-6.fw.orig index 55e496f4d..185b4d65d 100755 --- a/test/ipt/firewall-ipv6-6.fw.orig +++ b/test/ipt/firewall-ipv6-6.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:58:59 2011 PST by vadim +# Generated Thu Mar 10 21:52:15 2011 PST by vadim # # files: * firewall-ipv6-6.fw /etc/firewall-ipv6-6.fw # @@ -399,7 +399,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:58:59 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:52:15 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall-ipv6-7.fw.orig b/test/ipt/firewall-ipv6-7.fw.orig index de79d31ac..77e5db205 100755 --- a/test/ipt/firewall-ipv6-7.fw.orig +++ b/test/ipt/firewall-ipv6-7.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:59:03 2011 PST by vadim +# Generated Thu Mar 10 21:52:16 2011 PST by vadim # # files: * firewall-ipv6-7.fw /etc/firewall-ipv6-7.fw # @@ -443,7 +443,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:59:03 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:52:16 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall-ipv6-8.fw.orig b/test/ipt/firewall-ipv6-8.fw.orig index 3dab36154..830b409f2 100755 --- a/test/ipt/firewall-ipv6-8.fw.orig +++ b/test/ipt/firewall-ipv6-8.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:59:05 2011 PST by vadim +# Generated Thu Mar 10 21:52:19 2011 PST by vadim # # files: * firewall-ipv6-8.fw /etc/firewall-ipv6-8.fw # @@ -484,7 +484,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:59:05 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:52:19 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall-ipv6-ipt-reset-prolog-after-flush.fw.orig b/test/ipt/firewall-ipv6-ipt-reset-prolog-after-flush.fw.orig index 2bdf17eee..1f890a608 100755 --- a/test/ipt/firewall-ipv6-ipt-reset-prolog-after-flush.fw.orig +++ b/test/ipt/firewall-ipv6-ipt-reset-prolog-after-flush.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:59:07 2011 PST by vadim +# Generated Thu Mar 10 21:52:20 2011 PST by vadim # # files: * firewall-ipv6-ipt-reset-prolog-after-flush.fw /etc/firewall-ipv6-ipt-reset-prolog-after-flush.fw # @@ -450,7 +450,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:59:07 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:52:20 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall-ipv6-ipt-reset-prolog-after-interfaces.fw.orig b/test/ipt/firewall-ipv6-ipt-reset-prolog-after-interfaces.fw.orig index f65875999..c9526badd 100755 --- a/test/ipt/firewall-ipv6-ipt-reset-prolog-after-interfaces.fw.orig +++ b/test/ipt/firewall-ipv6-ipt-reset-prolog-after-interfaces.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:59:09 2011 PST by vadim +# Generated Thu Mar 10 21:52:22 2011 PST by vadim # # files: * firewall-ipv6-ipt-reset-prolog-after-interfaces.fw /etc/firewall-ipv6-ipt-reset-prolog-after-interfaces.fw # @@ -450,7 +450,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:59:09 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:52:22 2011 by vadim" check_tools check_run_time_address_table_files diff --git a/test/ipt/firewall-ipv6-ipt-reset-prolog-top.fw.orig b/test/ipt/firewall-ipv6-ipt-reset-prolog-top.fw.orig index e255210c5..279fc5ce5 100755 --- a/test/ipt/firewall-ipv6-ipt-reset-prolog-top.fw.orig +++ b/test/ipt/firewall-ipv6-ipt-reset-prolog-top.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:59:11 2011 PST by vadim +# Generated Thu Mar 10 21:52:24 2011 PST by vadim # # files: * firewall-ipv6-ipt-reset-prolog-top.fw /etc/firewall-ipv6-ipt-reset-prolog-top.fw # @@ -450,7 +450,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:59:11 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:52:24 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall-ipv6-prolog-after-flush.fw.orig b/test/ipt/firewall-ipv6-prolog-after-flush.fw.orig index 131544514..7e2385012 100755 --- a/test/ipt/firewall-ipv6-prolog-after-flush.fw.orig +++ b/test/ipt/firewall-ipv6-prolog-after-flush.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:59:13 2011 PST by vadim +# Generated Thu Mar 10 21:52:26 2011 PST by vadim # # files: * firewall-ipv6-prolog-after-flush.fw /etc/firewall-ipv6-prolog-after-flush.fw # @@ -420,7 +420,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:59:13 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:52:26 2011 by vadim" check_tools check_run_time_address_table_files diff --git a/test/ipt/firewall-ipv6-prolog-after-interfaces.fw.orig b/test/ipt/firewall-ipv6-prolog-after-interfaces.fw.orig index b26909eda..5b6bb0a83 100755 --- a/test/ipt/firewall-ipv6-prolog-after-interfaces.fw.orig +++ b/test/ipt/firewall-ipv6-prolog-after-interfaces.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:59:15 2011 PST by vadim +# Generated Thu Mar 10 21:52:27 2011 PST by vadim # # files: * firewall-ipv6-prolog-after-interfaces.fw /etc/firewall-ipv6-prolog-after-interfaces.fw # @@ -420,7 +420,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:59:15 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:52:27 2011 by vadim" check_tools check_run_time_address_table_files diff --git a/test/ipt/firewall-ipv6-prolog-top.fw.orig b/test/ipt/firewall-ipv6-prolog-top.fw.orig index 8c88fff64..caf9bc8b1 100755 --- a/test/ipt/firewall-ipv6-prolog-top.fw.orig +++ b/test/ipt/firewall-ipv6-prolog-top.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:59:17 2011 PST by vadim +# Generated Thu Mar 10 21:52:29 2011 PST by vadim # # files: * firewall-ipv6-prolog-top.fw /etc/firewall-ipv6-prolog-top.fw # @@ -420,7 +420,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:59:17 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:52:29 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall-server-1-s.fw.orig b/test/ipt/firewall-server-1-s.fw.orig index b18d5e929..a173dc644 100755 --- a/test/ipt/firewall-server-1-s.fw.orig +++ b/test/ipt/firewall-server-1-s.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:59:18 2011 PST by vadim +# Generated Thu Mar 10 21:52:30 2011 PST by vadim # # files: * firewall-server-1-s.fw /etc/fw/firewall-server-1-s.fw # @@ -393,7 +393,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:59:18 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:52:30 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall.fw.orig b/test/ipt/firewall.fw.orig index a543d3d7c..ecfa37338 100755 --- a/test/ipt/firewall.fw.orig +++ b/test/ipt/firewall.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:55:56 2011 PST by vadim +# Generated Thu Mar 10 21:49:22 2011 PST by vadim # # files: * firewall.fw /etc/fw/firewall.fw # @@ -1361,7 +1361,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:55:56 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:49:22 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall1.fw.orig b/test/ipt/firewall1.fw.orig index 78e1fbee7..a38f01669 100755 --- a/test/ipt/firewall1.fw.orig +++ b/test/ipt/firewall1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:55:58 2011 PST by vadim +# Generated Thu Mar 10 21:49:24 2011 PST by vadim # # files: * firewall1.fw /etc/fw/firewall1.fw # @@ -1252,7 +1252,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:55:58 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:49:24 2011 by vadim" check_tools check_run_time_address_table_files diff --git a/test/ipt/firewall10.fw.orig b/test/ipt/firewall10.fw.orig index 2a3d046eb..d2cf9939e 100755 --- a/test/ipt/firewall10.fw.orig +++ b/test/ipt/firewall10.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:55:59 2011 PST by vadim +# Generated Thu Mar 10 21:49:25 2011 PST by vadim # # files: * firewall10.fw /etc/fw/firewall10.fw # @@ -473,7 +473,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:55:59 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:49:25 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall11.fw.orig b/test/ipt/firewall11.fw.orig index cdf1b7455..9e82883fe 100755 --- a/test/ipt/firewall11.fw.orig +++ b/test/ipt/firewall11.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:56:01 2011 PST by vadim +# Generated Thu Mar 10 21:49:27 2011 PST by vadim # # files: * firewall11.fw /etc/fw/firewall11.fw # @@ -589,7 +589,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:56:01 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:49:27 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall12.fw.orig b/test/ipt/firewall12.fw.orig index 260f169a1..d6335011c 100755 --- a/test/ipt/firewall12.fw.orig +++ b/test/ipt/firewall12.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:56:02 2011 PST by vadim +# Generated Thu Mar 10 21:49:28 2011 PST by vadim # # files: * firewall12.fw /etc/fw/firewall12.fw # @@ -511,7 +511,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:56:02 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:49:28 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall13.fw.orig b/test/ipt/firewall13.fw.orig index f879a5530..44c46010d 100755 --- a/test/ipt/firewall13.fw.orig +++ b/test/ipt/firewall13.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:56:04 2011 PST by vadim +# Generated Thu Mar 10 21:49:29 2011 PST by vadim # # files: * firewall13.fw /etc/fw/firewall13.fw # @@ -385,7 +385,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:56:04 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:49:29 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall14.fw.orig b/test/ipt/firewall14.fw.orig index 20918d4b1..b6bea7777 100755 --- a/test/ipt/firewall14.fw.orig +++ b/test/ipt/firewall14.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:56:05 2011 PST by vadim +# Generated Thu Mar 10 21:49:30 2011 PST by vadim # # files: * firewall14.fw /etc/fw/firewall14.fw # @@ -404,7 +404,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:56:05 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:49:30 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall15.fw.orig b/test/ipt/firewall15.fw.orig index fe839fcd8..3853be846 100755 --- a/test/ipt/firewall15.fw.orig +++ b/test/ipt/firewall15.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:56:07 2011 PST by vadim +# Generated Thu Mar 10 21:49:32 2011 PST by vadim # # files: * firewall15.fw /etc/fw/firewall15.fw # @@ -388,7 +388,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:56:07 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:49:32 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall16.fw.orig b/test/ipt/firewall16.fw.orig index ab8d8516d..ae8eaaa80 100755 --- a/test/ipt/firewall16.fw.orig +++ b/test/ipt/firewall16.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:56:08 2011 PST by vadim +# Generated Thu Mar 10 21:49:33 2011 PST by vadim # # files: * firewall16.fw /etc/fw/firewall16.fw # @@ -492,7 +492,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:56:08 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:49:33 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall17.fw.orig b/test/ipt/firewall17.fw.orig index 1bcac840a..5e4ed592c 100755 --- a/test/ipt/firewall17.fw.orig +++ b/test/ipt/firewall17.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:56:10 2011 PST by vadim +# Generated Thu Mar 10 21:49:35 2011 PST by vadim # # files: * firewall17.fw /etc/fw/firewall17.fw # @@ -471,7 +471,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:56:10 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:49:35 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall18.fw.orig b/test/ipt/firewall18.fw.orig index d8ee9f83f..02a4241c3 100755 --- a/test/ipt/firewall18.fw.orig +++ b/test/ipt/firewall18.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:56:11 2011 PST by vadim +# Generated Thu Mar 10 21:49:36 2011 PST by vadim # # files: * firewall18.fw /etc/fw/firewall18.fw # @@ -504,7 +504,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:56:11 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:49:36 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall19.fw.orig b/test/ipt/firewall19.fw.orig index 206daa53e..377a8a48e 100755 --- a/test/ipt/firewall19.fw.orig +++ b/test/ipt/firewall19.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:56:13 2011 PST by vadim +# Generated Thu Mar 10 21:49:38 2011 PST by vadim # # files: * firewall19.fw /etc/fw/firewall19.fw # @@ -508,7 +508,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:56:13 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:49:38 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall2-1.fw.orig b/test/ipt/firewall2-1.fw.orig index e853b0f1c..b46555dba 100755 --- a/test/ipt/firewall2-1.fw.orig +++ b/test/ipt/firewall2-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:56:24 2011 PST by vadim +# Generated Thu Mar 10 21:49:47 2011 PST by vadim # # files: * firewall2-1.fw /etc/fw/firewall2-1.fw # @@ -1430,7 +1430,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:56:24 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:49:47 2011 by vadim" check_tools check_run_time_address_table_files diff --git a/test/ipt/firewall2-2.fw.orig b/test/ipt/firewall2-2.fw.orig index e14bca2b8..8061cc43d 100755 --- a/test/ipt/firewall2-2.fw.orig +++ b/test/ipt/firewall2-2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:56:28 2011 PST by vadim +# Generated Thu Mar 10 21:49:51 2011 PST by vadim # # files: * firewall2-2.fw /etc/fw/firewall2-2.fw # @@ -1259,7 +1259,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:56:28 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:49:51 2011 by vadim" check_tools check_run_time_address_table_files diff --git a/test/ipt/firewall2-3.fw.orig b/test/ipt/firewall2-3.fw.orig index 9849a418d..ba8ddc5fd 100755 --- a/test/ipt/firewall2-3.fw.orig +++ b/test/ipt/firewall2-3.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:56:31 2011 PST by vadim +# Generated Thu Mar 10 21:49:55 2011 PST by vadim # # files: * firewall2-3.fw /etc/fw/firewall2-3.fw # @@ -1118,7 +1118,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:56:31 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:49:55 2011 by vadim" check_tools check_run_time_address_table_files diff --git a/test/ipt/firewall2-4.fw.orig b/test/ipt/firewall2-4.fw.orig index b4f125dba..cb1af92d4 100755 --- a/test/ipt/firewall2-4.fw.orig +++ b/test/ipt/firewall2-4.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:56:35 2011 PST by vadim +# Generated Thu Mar 10 21:49:59 2011 PST by vadim # # files: * firewall2-4.fw /etc/fw/firewall2-4.fw # @@ -424,7 +424,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:56:35 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:49:59 2011 by vadim" check_tools check_run_time_address_table_files diff --git a/test/ipt/firewall2-5.fw.orig b/test/ipt/firewall2-5.fw.orig index ff69fdf0d..cfd2f0404 100755 --- a/test/ipt/firewall2-5.fw.orig +++ b/test/ipt/firewall2-5.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:56:38 2011 PST by vadim +# Generated Thu Mar 10 21:50:02 2011 PST by vadim # # files: * firewall2-5.fw /etc/fw/firewall2-5.fw # @@ -455,7 +455,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:56:38 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:50:02 2011 by vadim" check_tools check_run_time_address_table_files diff --git a/test/ipt/firewall2-6.fw.orig b/test/ipt/firewall2-6.fw.orig index 4c3b2df1c..fdd964449 100755 --- a/test/ipt/firewall2-6.fw.orig +++ b/test/ipt/firewall2-6.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:56:43 2011 PST by vadim +# Generated Thu Mar 10 21:50:05 2011 PST by vadim # # files: * firewall2-6.fw /etc/fw/firewall2-6.fw # @@ -482,7 +482,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:56:43 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:50:05 2011 by vadim" check_tools check_run_time_address_table_files diff --git a/test/ipt/firewall2-7.fw.orig b/test/ipt/firewall2-7.fw.orig index 2e37aba33..83d228d3e 100755 --- a/test/ipt/firewall2-7.fw.orig +++ b/test/ipt/firewall2-7.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:56:46 2011 PST by vadim +# Generated Thu Mar 10 21:50:09 2011 PST by vadim # # files: * firewall2-7.fw /etc/fw/firewall2-7.fw # @@ -424,7 +424,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:56:46 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:50:09 2011 by vadim" check_tools check_run_time_address_table_files diff --git a/test/ipt/firewall2.fw.orig b/test/ipt/firewall2.fw.orig index e5c280c76..612616576 100755 --- a/test/ipt/firewall2.fw.orig +++ b/test/ipt/firewall2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:56:16 2011 PST by vadim +# Generated Thu Mar 10 21:49:40 2011 PST by vadim # # files: * firewall2.fw /etc/fw/firewall2.fw # @@ -1482,7 +1482,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:56:16 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:49:40 2011 by vadim" check_tools check_run_time_address_table_files diff --git a/test/ipt/firewall20-ipv6.fw.orig b/test/ipt/firewall20-ipv6.fw.orig index 1fe56f354..e8149716a 100755 --- a/test/ipt/firewall20-ipv6.fw.orig +++ b/test/ipt/firewall20-ipv6.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:56:19 2011 PST by vadim +# Generated Thu Mar 10 21:49:43 2011 PST by vadim # # files: * firewall20-ipv6.fw /etc/fw/firewall20-ipv6.fw # @@ -456,7 +456,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:56:19 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:49:43 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall20.fw.orig b/test/ipt/firewall20.fw.orig index 2cafa38e1..da74488c5 100755 --- a/test/ipt/firewall20.fw.orig +++ b/test/ipt/firewall20.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:56:16 2011 PST by vadim +# Generated Thu Mar 10 21:49:41 2011 PST by vadim # # files: * firewall20.fw /etc/fw/firewall20.fw # @@ -674,7 +674,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:56:16 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:49:41 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall21-1.fw.orig b/test/ipt/firewall21-1.fw.orig index 149936b0f..287e5bbb3 100755 --- a/test/ipt/firewall21-1.fw.orig +++ b/test/ipt/firewall21-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:56:23 2011 PST by vadim +# Generated Thu Mar 10 21:49:47 2011 PST by vadim # # files: * firewall21-1.fw /etc/fw/firewall21-1.fw # @@ -470,7 +470,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:56:23 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:49:47 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall21.fw.orig b/test/ipt/firewall21.fw.orig index 51f0a7299..3005e67f7 100755 --- a/test/ipt/firewall21.fw.orig +++ b/test/ipt/firewall21.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:56:20 2011 PST by vadim +# Generated Thu Mar 10 21:49:44 2011 PST by vadim # # files: * firewall21.fw /etc/fw/firewall21.fw # @@ -469,7 +469,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:56:20 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:49:44 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall22.fw.orig b/test/ipt/firewall22.fw.orig index 06ccfe4dd..b597adbe9 100755 --- a/test/ipt/firewall22.fw.orig +++ b/test/ipt/firewall22.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:56:26 2011 PST by vadim +# Generated Thu Mar 10 21:49:50 2011 PST by vadim # # files: * firewall22.fw /etc/fw/firewall22.fw # @@ -390,7 +390,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:56:26 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:49:50 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall23-1.fw.orig b/test/ipt/firewall23-1.fw.orig index e66e776f0..5e6263f11 100755 --- a/test/ipt/firewall23-1.fw.orig +++ b/test/ipt/firewall23-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:56:32 2011 PST by vadim +# Generated Thu Mar 10 21:49:56 2011 PST by vadim # # files: * firewall23-1.fw /etc/fw/firewall23-1.fw # @@ -561,7 +561,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:56:32 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:49:56 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall23.fw.orig b/test/ipt/firewall23.fw.orig index d08eadd4e..d28947a0b 100755 --- a/test/ipt/firewall23.fw.orig +++ b/test/ipt/firewall23.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:56:29 2011 PST by vadim +# Generated Thu Mar 10 21:49:53 2011 PST by vadim # # files: * firewall23.fw /etc/fw/firewall23.fw # @@ -476,7 +476,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:56:29 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:49:53 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall24.fw.orig b/test/ipt/firewall24.fw.orig index e8bb44e14..154eedd83 100755 --- a/test/ipt/firewall24.fw.orig +++ b/test/ipt/firewall24.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:56:35 2011 PST by vadim +# Generated Thu Mar 10 21:49:58 2011 PST by vadim # # files: * firewall24.fw /etc/fw/firewall24.fw # @@ -493,7 +493,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:56:35 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:49:58 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall25.fw.orig b/test/ipt/firewall25.fw.orig index 089ce49d2..3efa89d71 100755 --- a/test/ipt/firewall25.fw.orig +++ b/test/ipt/firewall25.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:56:39 2011 PST by vadim +# Generated Thu Mar 10 21:50:02 2011 PST by vadim # # files: * firewall25.fw /etc/fw/firewall25.fw # @@ -689,7 +689,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:56:39 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:50:02 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall26.fw.orig b/test/ipt/firewall26.fw.orig index 70400bcac..bb32e7f7a 100755 --- a/test/ipt/firewall26.fw.orig +++ b/test/ipt/firewall26.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:56:42 2011 PST by vadim +# Generated Thu Mar 10 21:50:05 2011 PST by vadim # # files: * firewall26.fw /etc/fw/firewall26.fw # @@ -562,7 +562,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:56:42 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:50:05 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall27.fw.orig b/test/ipt/firewall27.fw.orig index f88fdf97d..412b720c1 100755 --- a/test/ipt/firewall27.fw.orig +++ b/test/ipt/firewall27.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:56:45 2011 PST by vadim +# Generated Thu Mar 10 21:50:08 2011 PST by vadim # # files: * firewall27.fw /etc/fw/firewall27.fw # @@ -546,7 +546,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:56:45 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:50:08 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall28.fw.orig b/test/ipt/firewall28.fw.orig index a73eb26d0..c5413f2b3 100755 --- a/test/ipt/firewall28.fw.orig +++ b/test/ipt/firewall28.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:56:48 2011 PST by vadim +# Generated Thu Mar 10 21:50:11 2011 PST by vadim # # files: * firewall28.fw /etc/fw/firewall28.fw # @@ -409,7 +409,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:56:48 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:50:11 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall29.fw.orig b/test/ipt/firewall29.fw.orig index 35ca810cd..5af1ca96f 100755 --- a/test/ipt/firewall29.fw.orig +++ b/test/ipt/firewall29.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:56:49 2011 PST by vadim +# Generated Thu Mar 10 21:50:12 2011 PST by vadim # # files: * firewall29.fw /etc/fw/firewall29.fw # @@ -440,7 +440,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:56:49 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:50:12 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall3.fw.orig b/test/ipt/firewall3.fw.orig index ef8224dc1..d367c6e2f 100755 --- a/test/ipt/firewall3.fw.orig +++ b/test/ipt/firewall3.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:56:51 2011 PST by vadim +# Generated Thu Mar 10 21:50:14 2011 PST by vadim # # files: * firewall3.fw /etc/fw/firewall3.fw # @@ -578,7 +578,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:56:51 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:50:14 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall30.fw.orig b/test/ipt/firewall30.fw.orig index 5036737fa..bab600d8e 100755 --- a/test/ipt/firewall30.fw.orig +++ b/test/ipt/firewall30.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:56:52 2011 PST by vadim +# Generated Thu Mar 10 21:50:15 2011 PST by vadim # # files: * firewall30.fw /etc/fw/firewall30.fw # @@ -375,7 +375,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:56:52 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:50:15 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall31.fw.orig b/test/ipt/firewall31.fw.orig index 1722399fc..998bd6125 100755 --- a/test/ipt/firewall31.fw.orig +++ b/test/ipt/firewall31.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:56:54 2011 PST by vadim +# Generated Thu Mar 10 21:50:17 2011 PST by vadim # # files: * firewall31.fw /etc/fw/firewall31.fw # @@ -445,7 +445,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:56:54 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:50:17 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall32.fw.orig b/test/ipt/firewall32.fw.orig index 7660c652d..addfa1e1d 100755 --- a/test/ipt/firewall32.fw.orig +++ b/test/ipt/firewall32.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:56:55 2011 PST by vadim +# Generated Thu Mar 10 21:50:18 2011 PST by vadim # # files: * firewall32.fw /etc/fw/firewall32.fw # @@ -416,7 +416,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:56:55 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:50:18 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall33-1.fw.orig b/test/ipt/firewall33-1.fw.orig index ff9d3caed..09c2fc2ed 100755 --- a/test/ipt/firewall33-1.fw.orig +++ b/test/ipt/firewall33-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:57:02 2011 PST by vadim +# Generated Thu Mar 10 21:50:24 2011 PST by vadim # # files: * firewall33-1.fw /etc/fw/firewall33-1.fw # @@ -395,11 +395,11 @@ script_body() { # $IPTABLES -N Cid438728A918346.0 $IPTABLES -A Policy -m state --state NEW -j Cid438728A918346.0 - $IPTABLES -A Cid438728A918346.0 -d 74.125.224.80 -j RETURN - $IPTABLES -A Cid438728A918346.0 -d 74.125.224.81 -j RETURN - $IPTABLES -A Cid438728A918346.0 -d 74.125.224.82 -j RETURN - $IPTABLES -A Cid438728A918346.0 -d 74.125.224.83 -j RETURN - $IPTABLES -A Cid438728A918346.0 -d 74.125.224.84 -j RETURN + $IPTABLES -A Cid438728A918346.0 -d 74.125.224.16 -j RETURN + $IPTABLES -A Cid438728A918346.0 -d 74.125.224.17 -j RETURN + $IPTABLES -A Cid438728A918346.0 -d 74.125.224.18 -j RETURN + $IPTABLES -A Cid438728A918346.0 -d 74.125.224.19 -j RETURN + $IPTABLES -A Cid438728A918346.0 -d 74.125.224.20 -j RETURN $IPTABLES -A Cid438728A918346.0 -d 157.166.224.25 -j RETURN $IPTABLES -A Cid438728A918346.0 -d 157.166.224.26 -j RETURN $IPTABLES -A Cid438728A918346.0 -d 157.166.226.25 -j RETURN @@ -525,7 +525,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:57:02 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:50:24 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall33.fw.orig b/test/ipt/firewall33.fw.orig index b659cb694..ebb880c7f 100755 --- a/test/ipt/firewall33.fw.orig +++ b/test/ipt/firewall33.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:57:02 2011 PST by vadim +# Generated Thu Mar 10 21:50:24 2011 PST by vadim # # files: * firewall33.fw /etc/fw/firewall33.fw # @@ -443,11 +443,11 @@ script_body() { $IPTABLES -A OUTPUT -m state --state NEW -j Cid438728A918346.0 $IPTABLES -A INPUT -m state --state NEW -j Cid438728A918346.0 $IPTABLES -A FORWARD -m state --state NEW -j Cid438728A918346.0 - $IPTABLES -A Cid438728A918346.0 -d 74.125.224.80 -j RETURN - $IPTABLES -A Cid438728A918346.0 -d 74.125.224.81 -j RETURN - $IPTABLES -A Cid438728A918346.0 -d 74.125.224.82 -j RETURN - $IPTABLES -A Cid438728A918346.0 -d 74.125.224.83 -j RETURN - $IPTABLES -A Cid438728A918346.0 -d 74.125.224.84 -j RETURN + $IPTABLES -A Cid438728A918346.0 -d 74.125.224.16 -j RETURN + $IPTABLES -A Cid438728A918346.0 -d 74.125.224.17 -j RETURN + $IPTABLES -A Cid438728A918346.0 -d 74.125.224.18 -j RETURN + $IPTABLES -A Cid438728A918346.0 -d 74.125.224.19 -j RETURN + $IPTABLES -A Cid438728A918346.0 -d 74.125.224.20 -j RETURN $IPTABLES -A Cid438728A918346.0 -d 157.166.224.25 -j RETURN $IPTABLES -A Cid438728A918346.0 -d 157.166.224.26 -j RETURN $IPTABLES -A Cid438728A918346.0 -d 157.166.226.25 -j RETURN @@ -572,7 +572,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:57:02 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:50:24 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall34.fw.orig b/test/ipt/firewall34.fw.orig index cf9a083a1..385405454 100755 --- a/test/ipt/firewall34.fw.orig +++ b/test/ipt/firewall34.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:57:06 2011 PST by vadim +# Generated Thu Mar 10 21:50:28 2011 PST by vadim # # files: * firewall34.fw /etc/fw/firewall34.fw # @@ -648,7 +648,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:57:06 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:50:28 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall35.fw.orig b/test/ipt/firewall35.fw.orig index ee7033e7d..0743ac300 100755 --- a/test/ipt/firewall35.fw.orig +++ b/test/ipt/firewall35.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:57:06 2011 PST by vadim +# Generated Thu Mar 10 21:50:28 2011 PST by vadim # # files: * firewall35.fw /etc/fw/firewall35.fw # @@ -540,7 +540,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:57:06 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:50:28 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall36-1.fw.orig b/test/ipt/firewall36-1.fw.orig index 705fcebc7..284aba934 100755 --- a/test/ipt/firewall36-1.fw.orig +++ b/test/ipt/firewall36-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:57:09 2011 PST by vadim +# Generated Thu Mar 10 21:50:31 2011 PST by vadim # # files: * firewall36-1.fw /etc/firewall36-1.fw # @@ -433,7 +433,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:57:09 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:50:31 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall36-2.fw.orig b/test/ipt/firewall36-2.fw.orig index 1b582a26f..c8cca7b9c 100755 --- a/test/ipt/firewall36-2.fw.orig +++ b/test/ipt/firewall36-2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:57:13 2011 PST by vadim +# Generated Thu Mar 10 21:50:34 2011 PST by vadim # # files: * firewall36-2.fw /etc/firewall36-2.fw # @@ -433,7 +433,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:57:13 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:50:34 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall36.fw.orig b/test/ipt/firewall36.fw.orig index 739401798..82c193728 100755 --- a/test/ipt/firewall36.fw.orig +++ b/test/ipt/firewall36.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:57:09 2011 PST by vadim +# Generated Thu Mar 10 21:50:31 2011 PST by vadim # # files: * firewall36.fw /etc/firewall36.fw # @@ -535,7 +535,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:57:09 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:50:31 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall37-1.fw.orig b/test/ipt/firewall37-1.fw.orig index 9967c2d62..5aa632fb7 100755 --- a/test/ipt/firewall37-1.fw.orig +++ b/test/ipt/firewall37-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:57:16 2011 PST by vadim +# Generated Thu Mar 10 21:50:37 2011 PST by vadim # # files: * firewall37-1.fw /etc/fw/firewall37-1.fw # @@ -769,7 +769,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:57:16 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:50:37 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall37.fw.orig b/test/ipt/firewall37.fw.orig index 708564f00..bc27c009a 100755 --- a/test/ipt/firewall37.fw.orig +++ b/test/ipt/firewall37.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:57:18 2011 PST by vadim +# Generated Thu Mar 10 21:50:39 2011 PST by vadim # # files: * firewall37.fw /etc/fw/firewall37.fw # @@ -1050,7 +1050,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:57:18 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:50:39 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall38.fw.orig b/test/ipt/firewall38.fw.orig index 64ebe6f55..c5dbf8a85 100755 --- a/test/ipt/firewall38.fw.orig +++ b/test/ipt/firewall38.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:57:19 2011 PST by vadim +# Generated Thu Mar 10 21:50:40 2011 PST by vadim # # files: * firewall38.fw /etc/fw/firewall38.fw # @@ -498,7 +498,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:57:19 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:50:40 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall39.fw.orig b/test/ipt/firewall39.fw.orig index 6af5a36de..612aedc19 100755 --- a/test/ipt/firewall39.fw.orig +++ b/test/ipt/firewall39.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:57:25 2011 PST by vadim +# Generated Thu Mar 10 21:50:46 2011 PST by vadim # # files: * firewall39.fw /etc/fw/firewall39.fw # @@ -895,7 +895,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:57:25 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:50:46 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall4.fw.orig b/test/ipt/firewall4.fw.orig index 419e5e69a..397329955 100755 --- a/test/ipt/firewall4.fw.orig +++ b/test/ipt/firewall4.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:57:23 2011 PST by vadim +# Generated Thu Mar 10 21:50:43 2011 PST by vadim # # files: * firewall4.fw /etc/fw/firewall4.fw # @@ -710,7 +710,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:57:23 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:50:43 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall40-1.fw.orig b/test/ipt/firewall40-1.fw.orig index 7db3582e8..98a91ec1a 100755 --- a/test/ipt/firewall40-1.fw.orig +++ b/test/ipt/firewall40-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:57:29 2011 PST by vadim +# Generated Thu Mar 10 21:50:50 2011 PST by vadim # # files: * firewall40-1.fw /etc/firewall40-1.fw # @@ -450,7 +450,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:57:29 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:50:50 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall40-2.fw.orig b/test/ipt/firewall40-2.fw.orig index a185eb653..ff62cb379 100755 --- a/test/ipt/firewall40-2.fw.orig +++ b/test/ipt/firewall40-2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:57:29 2011 PST by vadim +# Generated Thu Mar 10 21:50:50 2011 PST by vadim # # files: * firewall40-2.fw /etc/firewall40-2.fw # @@ -437,7 +437,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:57:29 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:50:50 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall40.fw.orig b/test/ipt/firewall40.fw.orig index 0a834d6ae..9e0cabb6a 100755 --- a/test/ipt/firewall40.fw.orig +++ b/test/ipt/firewall40.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:57:26 2011 PST by vadim +# Generated Thu Mar 10 21:50:46 2011 PST by vadim # # files: * firewall40.fw /etc/firewall40.fw # @@ -439,7 +439,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:57:26 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:50:46 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall41-1.fw.orig b/test/ipt/firewall41-1.fw.orig index 4d4e51f59..ce551129d 100755 --- a/test/ipt/firewall41-1.fw.orig +++ b/test/ipt/firewall41-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:57:33 2011 PST by vadim +# Generated Thu Mar 10 21:50:53 2011 PST by vadim # # files: * firewall41-1.fw /etc/firewall41-1.fw # @@ -575,7 +575,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:57:33 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:50:53 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall41.fw.orig b/test/ipt/firewall41.fw.orig index 6ae4f97aa..f3b6d186f 100755 --- a/test/ipt/firewall41.fw.orig +++ b/test/ipt/firewall41.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:57:32 2011 PST by vadim +# Generated Thu Mar 10 21:50:53 2011 PST by vadim # # files: * firewall41.fw /etc/firewall41.fw # @@ -393,7 +393,7 @@ script_body() { echo "Rule 6 (global)" # $IPTABLES -N RULE_6 - $IPTABLES -A OUTPUT -d 208.68.143.50 -j RULE_6 + $IPTABLES -A OUTPUT -d 208.68.139.38 -j RULE_6 $IPTABLES -A RULE_6 -j LOG --log-level info --log-prefix "RULE 6 -- DENY " $IPTABLES -A RULE_6 -j DROP } @@ -451,7 +451,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:57:32 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:50:53 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall42.fw.orig b/test/ipt/firewall42.fw.orig index 11ac7c523..5ff85aa43 100755 --- a/test/ipt/firewall42.fw.orig +++ b/test/ipt/firewall42.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:57:36 2011 PST by vadim +# Generated Thu Mar 10 21:50:57 2011 PST by vadim # # files: * firewall42.fw /etc/fw/firewall42.fw # @@ -382,7 +382,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:57:36 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:50:57 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall5.fw.orig b/test/ipt/firewall5.fw.orig index be1810a4d..538d71fe1 100755 --- a/test/ipt/firewall5.fw.orig +++ b/test/ipt/firewall5.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:57:39 2011 PST by vadim +# Generated Thu Mar 10 21:51:00 2011 PST by vadim # # files: * firewall5.fw /etc/fw/firewall5.fw # @@ -622,7 +622,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:57:39 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:51:00 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall50.fw.orig b/test/ipt/firewall50.fw.orig index e35ede8e6..41406d09a 100755 --- a/test/ipt/firewall50.fw.orig +++ b/test/ipt/firewall50.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:57:40 2011 PST by vadim +# Generated Thu Mar 10 21:51:01 2011 PST by vadim # # files: * firewall50.fw /etc/fw/firewall50.fw # @@ -407,7 +407,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:57:40 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:51:01 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall51.fw.orig b/test/ipt/firewall51.fw.orig index 8c3328408..f1b4dcb98 100755 --- a/test/ipt/firewall51.fw.orig +++ b/test/ipt/firewall51.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:57:46 2011 PST by vadim +# Generated Thu Mar 10 21:51:06 2011 PST by vadim # # files: * firewall51.fw /etc/fw/firewall51.fw # @@ -491,7 +491,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:57:46 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:51:06 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall6.fw.orig b/test/ipt/firewall6.fw.orig index ce0acf09f..002c85fec 100755 --- a/test/ipt/firewall6.fw.orig +++ b/test/ipt/firewall6.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:57:43 2011 PST by vadim +# Generated Thu Mar 10 21:51:04 2011 PST by vadim # # files: * firewall6.fw /etc/fw/firewall6.fw # @@ -513,7 +513,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:57:43 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:51:04 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall60.fw.orig b/test/ipt/firewall60.fw.orig index c55bb8c0d..0db46b85f 100755 --- a/test/ipt/firewall60.fw.orig +++ b/test/ipt/firewall60.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:57:46 2011 PST by vadim +# Generated Thu Mar 10 21:51:07 2011 PST by vadim # # files: * firewall60.fw /etc/firewall60.fw # @@ -419,7 +419,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:57:46 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:51:07 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall61-1.2.5.fw.orig b/test/ipt/firewall61-1.2.5.fw.orig index c49641a52..622c57ca9 100755 --- a/test/ipt/firewall61-1.2.5.fw.orig +++ b/test/ipt/firewall61-1.2.5.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:57:49 2011 PST by vadim +# Generated Thu Mar 10 21:51:10 2011 PST by vadim # # files: * firewall61-1.2.5.fw /etc/firewall61-1.2.5.fw # @@ -499,7 +499,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:57:49 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:51:10 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall61-1.2.6.fw.orig b/test/ipt/firewall61-1.2.6.fw.orig index 157024c91..56cb6bd85 100755 --- a/test/ipt/firewall61-1.2.6.fw.orig +++ b/test/ipt/firewall61-1.2.6.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:57:51 2011 PST by vadim +# Generated Thu Mar 10 21:51:11 2011 PST by vadim # # files: * firewall61-1.2.6.fw /etc/firewall61-1.2.6.fw # @@ -505,7 +505,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:57:51 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:51:11 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall61-1.3.x.fw.orig b/test/ipt/firewall61-1.3.x.fw.orig index d9c8f702e..91bbd67ca 100755 --- a/test/ipt/firewall61-1.3.x.fw.orig +++ b/test/ipt/firewall61-1.3.x.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:57:54 2011 PST by vadim +# Generated Thu Mar 10 21:51:14 2011 PST by vadim # # files: * firewall61-1.3.x.fw /etc/firewall61-1.3.x.fw # @@ -492,7 +492,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:57:54 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:51:14 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall61-1.4.fw.orig b/test/ipt/firewall61-1.4.fw.orig index 291cfc26b..60db55eaf 100755 --- a/test/ipt/firewall61-1.4.fw.orig +++ b/test/ipt/firewall61-1.4.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:57:55 2011 PST by vadim +# Generated Thu Mar 10 21:51:14 2011 PST by vadim # # files: * firewall61-1.4.fw /etc/firewall61-1.4.fw # @@ -493,7 +493,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:57:55 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:51:14 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall62.fw.orig b/test/ipt/firewall62.fw.orig index 587b3462f..af7cc2deb 100755 --- a/test/ipt/firewall62.fw.orig +++ b/test/ipt/firewall62.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:57:57 2011 PST by vadim +# Generated Thu Mar 10 21:51:17 2011 PST by vadim # # files: * firewall62.fw /etc/firewall62.fw # @@ -569,7 +569,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:57:57 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:51:17 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall63.fw.orig b/test/ipt/firewall63.fw.orig index 1fcce2f23..4e5e50fda 100755 --- a/test/ipt/firewall63.fw.orig +++ b/test/ipt/firewall63.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:57:58 2011 PST by vadim +# Generated Thu Mar 10 21:51:17 2011 PST by vadim # # files: * firewall63.fw /etc/firewall63.fw # @@ -389,7 +389,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:57:58 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:51:17 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall7.fw.orig b/test/ipt/firewall7.fw.orig index b152cd17d..2f8f0ee5d 100755 --- a/test/ipt/firewall7.fw.orig +++ b/test/ipt/firewall7.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:58:00 2011 PST by vadim +# Generated Thu Mar 10 21:51:19 2011 PST by vadim # # files: * firewall7.fw /etc/fw/firewall7.fw # @@ -473,7 +473,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:58:00 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:51:19 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall70.fw.orig b/test/ipt/firewall70.fw.orig index 9debc993d..93d3837f3 100755 --- a/test/ipt/firewall70.fw.orig +++ b/test/ipt/firewall70.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:58:02 2011 PST by vadim +# Generated Thu Mar 10 21:51:21 2011 PST by vadim # # files: * firewall70.fw iptables.sh # @@ -412,7 +412,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:58:02 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:51:21 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall71.fw.orig b/test/ipt/firewall71.fw.orig index 6fb9fda73..352df2855 100755 --- a/test/ipt/firewall71.fw.orig +++ b/test/ipt/firewall71.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:58:04 2011 PST by vadim +# Generated Thu Mar 10 21:51:23 2011 PST by vadim # # files: * firewall71.fw /etc/fw/firewall71.fw # @@ -428,7 +428,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:58:04 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:51:23 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall72-1.3.x.fw.orig b/test/ipt/firewall72-1.3.x.fw.orig index 33938f893..82cac0e40 100755 --- a/test/ipt/firewall72-1.3.x.fw.orig +++ b/test/ipt/firewall72-1.3.x.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:58:05 2011 PST by vadim +# Generated Thu Mar 10 21:51:24 2011 PST by vadim # # files: * firewall72-1.3.x.fw /etc/fw/firewall72-1.3.x.fw # @@ -560,7 +560,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:58:05 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:51:24 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall72-1.4.3.fw.orig b/test/ipt/firewall72-1.4.3.fw.orig index 381b38c09..e0b957fe4 100755 --- a/test/ipt/firewall72-1.4.3.fw.orig +++ b/test/ipt/firewall72-1.4.3.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:58:07 2011 PST by vadim +# Generated Thu Mar 10 21:51:26 2011 PST by vadim # # files: * firewall72-1.4.3.fw /etc/fw/firewall72-1.4.3.fw # @@ -560,7 +560,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:58:07 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:51:26 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall73.fw.orig b/test/ipt/firewall73.fw.orig index 5b350741c..ec4a7f18e 100755 --- a/test/ipt/firewall73.fw.orig +++ b/test/ipt/firewall73.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:58:08 2011 PST by vadim +# Generated Thu Mar 10 21:51:27 2011 PST by vadim # # files: * firewall73.fw /etc/fw/firewall73.fw # @@ -523,7 +523,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:58:08 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:51:27 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall74.fw.orig b/test/ipt/firewall74.fw.orig index 254f43c74..d3d9bfba6 100755 --- a/test/ipt/firewall74.fw.orig +++ b/test/ipt/firewall74.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:58:10 2011 PST by vadim +# Generated Thu Mar 10 21:51:29 2011 PST by vadim # # files: * firewall74.fw /etc/fw/firewall74.fw # @@ -375,7 +375,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:58:10 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:51:29 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall8.fw.orig b/test/ipt/firewall8.fw.orig index 9f03f6116..df0811f1d 100755 --- a/test/ipt/firewall8.fw.orig +++ b/test/ipt/firewall8.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:58:11 2011 PST by vadim +# Generated Thu Mar 10 21:51:30 2011 PST by vadim # # files: * firewall8.fw /etc/fw/firewall8.fw # @@ -358,7 +358,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:58:11 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:51:30 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall80.fw.orig b/test/ipt/firewall80.fw.orig index 8d2e09db1..c3d44af7b 100755 --- a/test/ipt/firewall80.fw.orig +++ b/test/ipt/firewall80.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:58:13 2011 PST by vadim +# Generated Thu Mar 10 21:51:32 2011 PST by vadim # # files: * firewall80.fw /etc/fw/firewall80.fw # @@ -399,7 +399,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:58:13 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:51:32 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall81.fw.orig b/test/ipt/firewall81.fw.orig index c76fb8a68..69a2caba6 100755 --- a/test/ipt/firewall81.fw.orig +++ b/test/ipt/firewall81.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:58:15 2011 PST by vadim +# Generated Thu Mar 10 21:51:34 2011 PST by vadim # # files: * firewall81.fw /etc/fw/firewall81.fw # @@ -420,7 +420,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:58:15 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:51:34 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall82.fw.orig b/test/ipt/firewall82.fw.orig index 32b497989..03a240b2f 100755 --- a/test/ipt/firewall82.fw.orig +++ b/test/ipt/firewall82.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:58:17 2011 PST by vadim +# Generated Thu Mar 10 21:51:36 2011 PST by vadim # # files: * firewall82.fw /etc/firewall82.fw # @@ -411,7 +411,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:58:17 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:51:36 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall82_A.fw.orig b/test/ipt/firewall82_A.fw.orig index 3b6ffe32b..9ea603ccb 100755 --- a/test/ipt/firewall82_A.fw.orig +++ b/test/ipt/firewall82_A.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:58:19 2011 PST by vadim +# Generated Thu Mar 10 21:51:37 2011 PST by vadim # # files: * firewall82_A.fw /etc/fw/firewall82_A.fw # @@ -400,7 +400,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:58:19 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:51:37 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall82_B.fw.orig b/test/ipt/firewall82_B.fw.orig index 2fd7f181b..cc5e36dd3 100755 --- a/test/ipt/firewall82_B.fw.orig +++ b/test/ipt/firewall82_B.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:58:20 2011 PST by vadim +# Generated Thu Mar 10 21:51:39 2011 PST by vadim # # files: * firewall82_B.fw /etc/fw/firewall82_B.fw # @@ -363,7 +363,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:58:20 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:51:39 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall9.fw.orig b/test/ipt/firewall9.fw.orig index b6d878047..d4f5a85d2 100755 --- a/test/ipt/firewall9.fw.orig +++ b/test/ipt/firewall9.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:58:23 2011 PST by vadim +# Generated Thu Mar 10 21:51:40 2011 PST by vadim # # files: * firewall9.fw /etc/fw/firewall9.fw # @@ -621,7 +621,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:58:23 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:51:40 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall90.fw.orig b/test/ipt/firewall90.fw.orig index a31766baf..a3382d8f4 100755 --- a/test/ipt/firewall90.fw.orig +++ b/test/ipt/firewall90.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:58:24 2011 PST by vadim +# Generated Thu Mar 10 21:51:41 2011 PST by vadim # # files: * firewall90.fw /etc/fw/firewall90.fw # @@ -383,7 +383,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:58:24 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:51:41 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall91.fw.orig b/test/ipt/firewall91.fw.orig index feafda749..e9f82d53b 100755 --- a/test/ipt/firewall91.fw.orig +++ b/test/ipt/firewall91.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:58:26 2011 PST by vadim +# Generated Thu Mar 10 21:51:43 2011 PST by vadim # # files: * firewall91.fw /etc/fw/firewall91.fw # @@ -383,7 +383,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:58:26 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:51:43 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall92.fw.orig b/test/ipt/firewall92.fw.orig index adb8888eb..dc71a4c31 100755 --- a/test/ipt/firewall92.fw.orig +++ b/test/ipt/firewall92.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:58:27 2011 PST by vadim +# Generated Thu Mar 10 21:51:45 2011 PST by vadim # # files: * firewall92.fw /etc/fw/firewall92.fw # @@ -419,7 +419,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:58:27 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:51:45 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall93.fw.orig b/test/ipt/firewall93.fw.orig index ef8e39de3..cbcbd0e66 100755 --- a/test/ipt/firewall93.fw.orig +++ b/test/ipt/firewall93.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:58:29 2011 PST by vadim +# Generated Thu Mar 10 21:51:47 2011 PST by vadim # # files: * firewall93.fw /etc/fw/firewall93.fw # @@ -458,7 +458,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:58:29 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:51:47 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/fw-A.fw.orig b/test/ipt/fw-A.fw.orig index 326ff8c3e..39ad7b25e 100755 --- a/test/ipt/fw-A.fw.orig +++ b/test/ipt/fw-A.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:59:21 2011 PST by vadim +# Generated Thu Mar 10 21:52:33 2011 PST by vadim # # files: * fw-A.fw /sw/FWbuilder/fw-A.fw # @@ -724,7 +724,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:59:21 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:52:33 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/fw1.fw.orig b/test/ipt/fw1.fw.orig index 86c663080..08e8f0c5c 100755 --- a/test/ipt/fw1.fw.orig +++ b/test/ipt/fw1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:59:20 2011 PST by vadim +# Generated Thu Mar 10 21:52:33 2011 PST by vadim # # files: * fw1.fw /etc/fw1.fw # @@ -525,7 +525,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:59:20 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:52:33 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/fwbuilder.fw.orig b/test/ipt/fwbuilder.fw.orig index d84168d6f..1444fc920 100755 --- a/test/ipt/fwbuilder.fw.orig +++ b/test/ipt/fwbuilder.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:57:36 2011 PST by vadim +# Generated Thu Mar 10 21:50:57 2011 PST by vadim # # files: * fwbuilder.fw /etc/init.d/fwbuilder.fw # @@ -483,7 +483,7 @@ status_action() { } start() { - log "Activating firewall script generated Tue Mar 8 18:57:36 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:50:57 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/heartbeat_cluster_1_d_linux-1-d.fw.orig b/test/ipt/heartbeat_cluster_1_d_linux-1-d.fw.orig index ee364f09c..1d90f1a1d 100755 --- a/test/ipt/heartbeat_cluster_1_d_linux-1-d.fw.orig +++ b/test/ipt/heartbeat_cluster_1_d_linux-1-d.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:59:35 2011 PST by vadim +# Generated Thu Mar 10 21:52:45 2011 PST by vadim # # files: * heartbeat_cluster_1_d_linux-1-d.fw firewall.sh # @@ -722,7 +722,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:59:35 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:52:45 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/heartbeat_cluster_1_d_linux-2-d.fw.orig b/test/ipt/heartbeat_cluster_1_d_linux-2-d.fw.orig index 72f1d76ae..2e761a274 100755 --- a/test/ipt/heartbeat_cluster_1_d_linux-2-d.fw.orig +++ b/test/ipt/heartbeat_cluster_1_d_linux-2-d.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:59:35 2011 PST by vadim +# Generated Thu Mar 10 21:52:46 2011 PST by vadim # # files: * heartbeat_cluster_1_d_linux-2-d.fw firewall.sh # @@ -726,7 +726,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:59:35 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:52:46 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/heartbeat_cluster_1_linux-1.fw.orig b/test/ipt/heartbeat_cluster_1_linux-1.fw.orig index bcdb77475..19b37c19f 100755 --- a/test/ipt/heartbeat_cluster_1_linux-1.fw.orig +++ b/test/ipt/heartbeat_cluster_1_linux-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:59:34 2011 PST by vadim +# Generated Thu Mar 10 21:52:44 2011 PST by vadim # # files: * heartbeat_cluster_1_linux-1.fw /etc/heartbeat_cluster_1_linux-1.fw # @@ -843,7 +843,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:59:34 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:52:44 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/heartbeat_cluster_1_linux-2.fw.orig b/test/ipt/heartbeat_cluster_1_linux-2.fw.orig index 754d51d7c..0dc783fbb 100755 --- a/test/ipt/heartbeat_cluster_1_linux-2.fw.orig +++ b/test/ipt/heartbeat_cluster_1_linux-2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:59:34 2011 PST by vadim +# Generated Thu Mar 10 21:52:45 2011 PST by vadim # # files: * heartbeat_cluster_1_linux-2.fw /etc/heartbeat_cluster_1_linux-2.fw # @@ -741,7 +741,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:59:34 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:52:45 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/heartbeat_cluster_2_linux-1.fw.orig b/test/ipt/heartbeat_cluster_2_linux-1.fw.orig index dc5f2e5c5..4e1b8dfc6 100755 --- a/test/ipt/heartbeat_cluster_2_linux-1.fw.orig +++ b/test/ipt/heartbeat_cluster_2_linux-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:59:36 2011 PST by vadim +# Generated Thu Mar 10 21:52:46 2011 PST by vadim # # files: * heartbeat_cluster_2_linux-1.fw /etc/heartbeat_cluster_2_linux-1.fw # @@ -707,7 +707,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:59:36 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:52:46 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/heartbeat_cluster_2_linux-2.fw.orig b/test/ipt/heartbeat_cluster_2_linux-2.fw.orig index fb77c3c25..8355f47fa 100755 --- a/test/ipt/heartbeat_cluster_2_linux-2.fw.orig +++ b/test/ipt/heartbeat_cluster_2_linux-2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:59:36 2011 PST by vadim +# Generated Thu Mar 10 21:52:46 2011 PST by vadim # # files: * heartbeat_cluster_2_linux-2.fw /etc/heartbeat_cluster_2_linux-2.fw # @@ -620,7 +620,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:59:36 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:52:46 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/host.fw.orig b/test/ipt/host.fw.orig index 2202735ff..21da12c1d 100755 --- a/test/ipt/host.fw.orig +++ b/test/ipt/host.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:59:23 2011 PST by vadim +# Generated Thu Mar 10 21:52:36 2011 PST by vadim # # files: * host.fw /etc/fw/host.fw # @@ -422,7 +422,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:59:23 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:52:36 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/openais_cluster_1_linux-1.fw.orig b/test/ipt/openais_cluster_1_linux-1.fw.orig index de166f90a..6ec57496c 100755 --- a/test/ipt/openais_cluster_1_linux-1.fw.orig +++ b/test/ipt/openais_cluster_1_linux-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:59:36 2011 PST by vadim +# Generated Thu Mar 10 21:52:47 2011 PST by vadim # # files: * openais_cluster_1_linux-1.fw /etc/openais_cluster_1_linux-1.fw # @@ -707,7 +707,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:59:36 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:52:47 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/openais_cluster_1_linux-2.fw.orig b/test/ipt/openais_cluster_1_linux-2.fw.orig index a6fde4918..902a555bf 100755 --- a/test/ipt/openais_cluster_1_linux-2.fw.orig +++ b/test/ipt/openais_cluster_1_linux-2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:59:36 2011 PST by vadim +# Generated Thu Mar 10 21:52:47 2011 PST by vadim # # files: * openais_cluster_1_linux-2.fw /etc/openais_cluster_1_linux-2.fw # @@ -611,7 +611,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:59:36 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:52:47 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/rc.firewall.local b/test/ipt/rc.firewall.local index aac6da480..93be1ccf7 100755 --- a/test/ipt/rc.firewall.local +++ b/test/ipt/rc.firewall.local @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:59:25 2011 PST by vadim +# Generated Thu Mar 10 22:01:28 2011 PST by vadim # # files: * rc.firewall.local /etc/rc.d//rc.firewall.local # diff --git a/test/ipt/rh90.fw.orig b/test/ipt/rh90.fw.orig index 04420a0bf..438fe6501 100755 --- a/test/ipt/rh90.fw.orig +++ b/test/ipt/rh90.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:59:26 2011 PST by vadim +# Generated Thu Mar 10 21:52:39 2011 PST by vadim # # files: * rh90.fw /etc/rh90.fw # @@ -421,7 +421,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:59:26 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:52:39 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/secuwall_cluster_1_secuwall-1.fw.orig b/test/ipt/secuwall_cluster_1_secuwall-1.fw.orig index 887b02812..272865351 100755 --- a/test/ipt/secuwall_cluster_1_secuwall-1.fw.orig +++ b/test/ipt/secuwall_cluster_1_secuwall-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:59:36 2011 PST by vadim +# Generated Thu Mar 10 21:52:47 2011 PST by vadim # # files: * secuwall_cluster_1_secuwall-1.fw /etc/secuwall_cluster_1_secuwall-1.fw # @@ -405,7 +405,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:59:36 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:52:47 2011 by vadim" log "Database was cluster-tests.fwb" check_tools check_run_time_address_table_files diff --git a/test/ipt/server-cluster-1_server-1.fw.orig b/test/ipt/server-cluster-1_server-1.fw.orig index ad2ea1945..32773b498 100755 --- a/test/ipt/server-cluster-1_server-1.fw.orig +++ b/test/ipt/server-cluster-1_server-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:59:37 2011 PST by vadim +# Generated Thu Mar 10 21:52:48 2011 PST by vadim # # files: * server-cluster-1_server-1.fw /etc/fw/server-cluster-1_server-1.fw # @@ -400,7 +400,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:59:37 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:52:48 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/server-cluster-1_server-2.fw.orig b/test/ipt/server-cluster-1_server-2.fw.orig index 8ae9e65cd..28c523f78 100755 --- a/test/ipt/server-cluster-1_server-2.fw.orig +++ b/test/ipt/server-cluster-1_server-2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:59:37 2011 PST by vadim +# Generated Thu Mar 10 21:52:48 2011 PST by vadim # # files: * server-cluster-1_server-2.fw /etc/fw/server-cluster-1_server-2.fw # @@ -397,7 +397,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:59:37 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:52:48 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/test-shadowing-1.fw.orig b/test/ipt/test-shadowing-1.fw.orig index 48250b440..d8bda75be 100755 --- a/test/ipt/test-shadowing-1.fw.orig +++ b/test/ipt/test-shadowing-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:59:29 2011 PST by vadim +# Generated Thu Mar 10 21:52:42 2011 PST by vadim # # files: * test-shadowing-1.fw /etc/test-shadowing-1.fw # @@ -471,7 +471,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:59:29 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:52:42 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/test-shadowing-2.fw.orig b/test/ipt/test-shadowing-2.fw.orig index 33c2af8b2..05a5b4628 100755 --- a/test/ipt/test-shadowing-2.fw.orig +++ b/test/ipt/test-shadowing-2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:59:33 2011 PST by vadim +# Generated Thu Mar 10 21:52:43 2011 PST by vadim # # files: * test-shadowing-2.fw /etc/test-shadowing-2.fw # @@ -429,7 +429,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:59:33 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:52:43 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/test-shadowing-3.fw.orig b/test/ipt/test-shadowing-3.fw.orig index e4ae827c4..e8fc559b6 100755 --- a/test/ipt/test-shadowing-3.fw.orig +++ b/test/ipt/test-shadowing-3.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:59:35 2011 PST by vadim +# Generated Thu Mar 10 21:52:47 2011 PST by vadim # # files: * test-shadowing-3.fw /etc/test-shadowing-3.fw # @@ -478,7 +478,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:59:35 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:52:47 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/test_fw.fw.orig b/test/ipt/test_fw.fw.orig index 9a95837b1..9f084302d 100755 --- a/test/ipt/test_fw.fw.orig +++ b/test/ipt/test_fw.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:59:29 2011 PST by vadim +# Generated Thu Mar 10 21:52:40 2011 PST by vadim # # files: * test_fw.fw /etc/test_fw.fw # @@ -570,7 +570,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:59:29 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:52:40 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/vrrp_cluster_1_linux-1.fw.orig b/test/ipt/vrrp_cluster_1_linux-1.fw.orig index 45e8e5434..820d4b56f 100755 --- a/test/ipt/vrrp_cluster_1_linux-1.fw.orig +++ b/test/ipt/vrrp_cluster_1_linux-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:59:37 2011 PST by vadim +# Generated Thu Mar 10 21:52:48 2011 PST by vadim # # files: * vrrp_cluster_1_linux-1.fw /etc/vrrp_cluster_1_linux-1.fw # @@ -710,7 +710,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:59:37 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:52:48 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/vrrp_cluster_1_linux-2.fw.orig b/test/ipt/vrrp_cluster_1_linux-2.fw.orig index 20eb40a4c..327145689 100755 --- a/test/ipt/vrrp_cluster_1_linux-2.fw.orig +++ b/test/ipt/vrrp_cluster_1_linux-2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:59:37 2011 PST by vadim +# Generated Thu Mar 10 21:52:48 2011 PST by vadim # # files: * vrrp_cluster_1_linux-2.fw /etc/vrrp_cluster_1_linux-2.fw # @@ -615,7 +615,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:59:37 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:52:48 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/vrrp_cluster_2_linux-1.fw.orig b/test/ipt/vrrp_cluster_2_linux-1.fw.orig index c3ef422b6..33072c915 100755 --- a/test/ipt/vrrp_cluster_2_linux-1.fw.orig +++ b/test/ipt/vrrp_cluster_2_linux-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:59:37 2011 PST by vadim +# Generated Thu Mar 10 21:52:48 2011 PST by vadim # # files: * vrrp_cluster_2_linux-1.fw /etc/vrrp_cluster_2_linux-1.fw # @@ -642,7 +642,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:59:37 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:52:48 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/vrrp_cluster_2_linux-2.fw.orig b/test/ipt/vrrp_cluster_2_linux-2.fw.orig index 9f181e7b3..8eb223d59 100755 --- a/test/ipt/vrrp_cluster_2_linux-2.fw.orig +++ b/test/ipt/vrrp_cluster_2_linux-2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:59:38 2011 PST by vadim +# Generated Thu Mar 10 21:52:49 2011 PST by vadim # # files: * vrrp_cluster_2_linux-2.fw /etc/vrrp_cluster_2_linux-2.fw # @@ -547,7 +547,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:59:38 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:52:49 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/vrrp_cluster_2_linux-3.fw.orig b/test/ipt/vrrp_cluster_2_linux-3.fw.orig index c87394c1d..793c02aa8 100755 --- a/test/ipt/vrrp_cluster_2_linux-3.fw.orig +++ b/test/ipt/vrrp_cluster_2_linux-3.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v4.2.0.3498 +# Firewall Builder fwb_ipt v4.2.0.3499 # -# Generated Tue Mar 8 18:59:38 2011 PST by vadim +# Generated Thu Mar 10 21:52:49 2011 PST by vadim # # files: * vrrp_cluster_2_linux-3.fw /etc/vrrp_cluster_2_linux-3.fw # @@ -523,7 +523,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Mar 8 18:59:38 2011 by vadim" + log "Activating firewall script generated Thu Mar 10 21:52:49 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files