diff --git a/src/pflib/RoutingCompiler_freebsd.cpp b/src/pflib/RoutingCompiler_freebsd.cpp index a38dde3a9..6ebdb64c3 100644 --- a/src/pflib/RoutingCompiler_freebsd.cpp +++ b/src/pflib/RoutingCompiler_freebsd.cpp @@ -91,17 +91,15 @@ void RoutingCompiler_freebsd::compile() // add(new classifyRoutingRules( // "Classify into single path or part of a multi path rule")); -#ifdef ECMP_SUPPORT_OLD_STYLE add(new optimize3( "Eliminate duplicate rules generated from a single gui-rule")); add(new eliminateDuplicateRules( "Eliminate duplicate rules over the whole table")); -#endif add( new checkForObjectsWithErrors( "check if we have objects with errors in rule elements")); - add(new PrintRule("generate ip code")); + add(printRule=new PrintRule("generate ip code")); add(new simplePrintProgress()); runRuleProcessors(); diff --git a/src/pflib/RoutingCompiler_freebsd.h b/src/pflib/RoutingCompiler_freebsd.h index 26a02f895..29f3beb8b 100644 --- a/src/pflib/RoutingCompiler_freebsd.h +++ b/src/pflib/RoutingCompiler_freebsd.h @@ -72,7 +72,8 @@ namespace fwcompiler PrintRule(const std::string &name); virtual bool processNext(); - virtual std::string RoutingRuleToString(libfwbuilder::RoutingRule *r); + virtual std::string RoutingRuleToString(libfwbuilder::RoutingRule *r, + bool add_decorations=true); }; friend class RoutingCompiler_freebsd::PrintRule; diff --git a/src/pflib/RoutingCompiler_freebsd_writers.cpp b/src/pflib/RoutingCompiler_freebsd_writers.cpp index 5b08817e5..3c4a98965 100644 --- a/src/pflib/RoutingCompiler_freebsd_writers.cpp +++ b/src/pflib/RoutingCompiler_freebsd_writers.cpp @@ -111,7 +111,8 @@ bool RoutingCompiler_freebsd::PrintRule::processNext() } -string RoutingCompiler_freebsd::PrintRule::RoutingRuleToString(RoutingRule *rule) +string RoutingCompiler_freebsd::PrintRule::RoutingRuleToString(RoutingRule *rule, + bool add_decorations) { RoutingCompiler_freebsd* routing_comp = dynamic_cast(compiler); @@ -138,11 +139,19 @@ string RoutingCompiler_freebsd::PrintRule::RoutingRuleToString(RoutingRule *rule if (gtw != NULL) command_line << _printRGtw(rule).c_str(); if (itf != NULL) command_line << _printRItf(rule).c_str(); - return QString("route_%1=\"%2\"").arg( - routing_comp->routing_rules_ids[rule->getId()]) - .arg(command_line.join(" ")).toStdString(); + QString rule_code = command_line.join(" "); + + if (add_decorations) + { + rule_code = QString("route_%1=\"%2\"") + .arg(routing_comp->routing_rules_ids[rule->getId()]) + .arg(rule_code); + } + + return rule_code.toUtf8().constData(); } else - return RoutingCompiler_openbsd::PrintRule::RoutingRuleToString(rule); + return RoutingCompiler_openbsd::PrintRule::RoutingRuleToString( + rule, add_decorations); } diff --git a/src/pflib/RoutingCompiler_openbsd.cpp b/src/pflib/RoutingCompiler_openbsd.cpp index a030b77d9..95650b5aa 100644 --- a/src/pflib/RoutingCompiler_openbsd.cpp +++ b/src/pflib/RoutingCompiler_openbsd.cpp @@ -105,6 +105,71 @@ bool RoutingCompiler_openbsd::FindDefaultRoute::processNext() return true; } +/* + * this processor eliminates duplicate routing rules, generated from the same + * rule in the GUI + */ +bool RoutingCompiler_openbsd::optimize3::processNext() +{ + RoutingCompiler_openbsd *bsd_comp = dynamic_cast(compiler); + RoutingRule *rule = getNext(); if (rule==NULL) return false; + + if (rule->isFallback() || rule->isHidden()) + { + tmp_queue.push_back(rule); + return true; + } + + assert (bsd_comp->printRule!=NULL); + + string thisRule = rule->getLabel() + " " + + bsd_comp->printRule->RoutingRuleToString(rule, false); + + if (rules_seen_so_far.count(thisRule)!=0) return true; + + tmp_queue.push_back(rule); + rules_seen_so_far[thisRule] = true; + + return true; +} + +/* + * this processor eliminates duplicate atomic routing rules in one routing table + */ +bool RoutingCompiler_openbsd::eliminateDuplicateRules::processNext() +{ + RoutingCompiler_openbsd *bsd_comp = dynamic_cast(compiler); + RoutingRule *rule = getNext(); if (rule==NULL) return false; + + if (rule->isFallback() || rule->isHidden()) + { + tmp_queue.push_back(rule); + return true; + } + + assert (bsd_comp->printRule!=NULL); + + string thisRule = bsd_comp->printRule->RoutingRuleToString(rule, false); + + map::iterator rules_it = rules_seen_so_far.find(thisRule); + + if (rules_it != rules_seen_so_far.end()) + { + QString msg = QObject::tr("Two of the routing commands created from the gui " + "routing rules %1 and %2 " + "are identical, skipping the second. " + "Revise them to avoid this warning"); + compiler->warning( + rule, + msg.arg(rules_it->second.c_str()).arg(rule->getLabel().c_str()).toStdString()); + return true; + } + + tmp_queue.push_back(rule); + rules_seen_so_far[thisRule] = rule->getLabel(); + return true; +} + /** *----------------------------------------------------------------------- @@ -164,17 +229,15 @@ void RoutingCompiler_openbsd::compile() // add(new classifyRoutingRules( // "Classify into single path or part of a multi path rule")); -#ifdef ECMP_SUPPORT_OLD_STYLE add(new optimize3( "Eliminate duplicate rules generated from a single gui-rule")); add(new eliminateDuplicateRules( "Eliminate duplicate rules over the whole table")); -#endif add( new checkForObjectsWithErrors( "check if we have objects with errors in rule elements")); - add(new PrintRule("generate ip code")); + add(printRule=new PrintRule("generate ip code")); add(new simplePrintProgress()); runRuleProcessors(); @@ -183,44 +246,12 @@ void RoutingCompiler_openbsd::compile() string RoutingCompiler_openbsd::debugPrintRule(Rule *r) { - RoutingRule *rule=RoutingRule::cast(r); - - string s= RoutingCompiler::debugPrintRule(rule); - - return s; + RoutingRule *rule = RoutingRule::cast(r); + return RoutingCompiler::debugPrintRule(rule); } void RoutingCompiler_openbsd::epilog() { - ///int total = ecmp_comments_buffer.size(); - int nb = 0; - - // ecmp roules can only be generated after all the rules have been - // parsed, that is the reason for putting this code in the epilog - // function - if (ecmp_rules_buffer.size() > 0) - { - output << "\n#\n# ============== EQUAL COST MULTI PATH ============\n#" - << endl; - - output << "echo \"Activating ecmp routing rules...\"" << endl; - - for (map::iterator - ecmp_comments_buffer_it = ecmp_comments_buffer.begin(); - ecmp_comments_buffer_it != ecmp_comments_buffer.end(); - ++ecmp_comments_buffer_it) - { - output << ecmp_comments_buffer_it->second << "#\n" << flush; - - output << ecmp_rules_buffer[ecmp_comments_buffer_it->first] << flush; - - output << " \\\n|| route_command_error " << "\"" << ++nb << "\"" << endl; - - //echo \"Error: The ECMP routing rule #" << ++nb <<" couldn't be activated! Please make sure your kernel is compiled with the CONFIG_IP_ROUTE_MULTIPATH option.\"" << endl; - - } - } - if (!inSingleRuleCompileMode() && defined_restore_script_output) { // function restore_script_output may not be defined if we diff --git a/src/pflib/RoutingCompiler_openbsd.h b/src/pflib/RoutingCompiler_openbsd.h index 59208aff7..268f843db 100644 --- a/src/pflib/RoutingCompiler_openbsd.h +++ b/src/pflib/RoutingCompiler_openbsd.h @@ -63,6 +63,34 @@ namespace fwcompiler */ DECLARE_ROUTING_RULE_PROCESSOR(FindDefaultRoute); + /** + * remove duplicate rules + */ + class PrintRule; + class optimize3 : public RoutingRuleProcessor + { + std::map rules_seen_so_far; + + public: + + optimize3(const std::string &name) : RoutingRuleProcessor(name) {} + virtual bool processNext(); + }; + + /** + * eliminates duplicate rules + */ + class eliminateDuplicateRules : public RoutingRuleProcessor + { + std::map rules_seen_so_far; + + public: + + eliminateDuplicateRules(const std::string &name) : + RoutingRuleProcessor(name) {} + virtual bool processNext(); + }; + /** * prints single policy rule, assuming all groups have been * expanded, destination holds exactly one object, and this @@ -86,7 +114,8 @@ namespace fwcompiler PrintRule(const std::string &name); virtual bool processNext(); - virtual std::string RoutingRuleToString(libfwbuilder::RoutingRule *r); + virtual std::string RoutingRuleToString(libfwbuilder::RoutingRule *r, + bool add_decorations=true); virtual std::string _printRGtw(libfwbuilder::RoutingRule *r); virtual std::string _printRItf(libfwbuilder::RoutingRule *r); virtual std::string _printRDst(libfwbuilder::RoutingRule *r); @@ -96,18 +125,10 @@ namespace fwcompiler virtual std::string myPlatformName(); - // These buffers are needed to collect output generated from - // the single ECMP rules belonging to one destination, - // because all these routes have to be activated with a single - // ip command. So ECMP ip commands are built up gradually - // during compilation and inserted in the shell script after - // all rules are processed. - - - std::map< std::string, std::string> ecmp_rules_buffer; // sortedDstId+metric-->nexthops - std::map< std::string, std::string> ecmp_comments_buffer; // sortedDstId+metric-->rule's info for the fw script bool have_default_route; bool defined_restore_script_output; + + PrintRule *printRule; public: @@ -118,6 +139,7 @@ namespace fwcompiler { have_default_route = false; defined_restore_script_output = false; + printRule = NULL; } virtual void verifyOS(); diff --git a/src/pflib/RoutingCompiler_openbsd_writers.cpp b/src/pflib/RoutingCompiler_openbsd_writers.cpp index da10d51a7..fb75d845f 100644 --- a/src/pflib/RoutingCompiler_openbsd_writers.cpp +++ b/src/pflib/RoutingCompiler_openbsd_writers.cpp @@ -204,7 +204,8 @@ bool RoutingCompiler_openbsd::PrintRule::processNext() } -string RoutingCompiler_openbsd::PrintRule::RoutingRuleToString(RoutingRule *rule) +string RoutingCompiler_openbsd::PrintRule::RoutingRuleToString(RoutingRule *rule, + bool add_decorations) { RuleElementRDst *dstrel = rule->getRDst(); Address *dst = Address::cast(FWReference::getObject(dstrel->front())); @@ -228,23 +229,10 @@ string RoutingCompiler_openbsd::PrintRule::RoutingRuleToString(RoutingRule *rule // to make generated script more readable in single rule compile mode, // skip the part that rolls back in case of an error - if (!compiler->inSingleRuleCompileMode()) + if (!compiler->inSingleRuleCompileMode() && add_decorations) { - command_line << "|| "; - - FWObject *opt_dummy = - rule->getFirstByType(RoutingRuleOptions::TYPENAME); - RoutingRuleOptions *opt = - opt_dummy ? RoutingRuleOptions::cast(opt_dummy) : 0; - if ( opt && opt->getBool("no_fail") ) - { - command_line << "echo \"*** Warning: routing rule " - << rule->getLabel() << " failed. ignored. ***\"\n"; - } else - { - command_line << "route_command_error " - << "\"" << rule->getLabel() << "\"" << endl;; - } + command_line << "|| route_command_error " + << "\"" << rule->getLabel() << "\"" << endl;; } command_line << endl; diff --git a/test/pf/firewall-base-rulesets.fw.orig b/test/pf/firewall-base-rulesets.fw.orig index a03403dde..f750414c0 100755 --- a/test/pf/firewall-base-rulesets.fw.orig +++ b/test/pf/firewall-base-rulesets.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:42 2011 PST by vadim +# Generated Mon Feb 7 17:03:03 2011 PST by vadim # # files: * firewall-base-rulesets.fw /etc/fw/firewall-base-rulesets.fw # files: firewall-base-rulesets.conf /etc/fw/firewall-base-rulesets.conf @@ -163,7 +163,7 @@ configure_interfaces() { update_addresses_of_interface "en2 192.168.100.1/0xffffff00" "" } -log "Activating firewall script generated Mon Feb 7 15:16:42 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:03:03 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall-ipv6-1.fw.orig b/test/pf/firewall-ipv6-1.fw.orig index cfe82e8cf..81ca0fc2a 100755 --- a/test/pf/firewall-ipv6-1.fw.orig +++ b/test/pf/firewall-ipv6-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:41 2011 PST by vadim +# Generated Mon Feb 7 17:03:03 2011 PST by vadim # # files: * firewall-ipv6-1.fw pf-ipv6.fw # files: firewall-ipv6-1-Policy_ipv4.conf /etc/fw/pf-ipv6.conf @@ -175,7 +175,7 @@ configure_interfaces() { update_addresses_of_interface "lo ::1/128 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Mon Feb 7 15:16:41 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:03:03 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall-ipv6-2.fw.orig b/test/pf/firewall-ipv6-2.fw.orig index 3d9e2e251..b2e2e5c7d 100755 --- a/test/pf/firewall-ipv6-2.fw.orig +++ b/test/pf/firewall-ipv6-2.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:42 2011 PST by vadim +# Generated Mon Feb 7 17:03:04 2011 PST by vadim # # files: * firewall-ipv6-2.fw pf.fw # files: firewall-ipv6-2.conf pf.conf @@ -179,7 +179,7 @@ configure_interfaces() { update_addresses_of_interface "lo ::1/128 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Mon Feb 7 15:16:42 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:03:04 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall-ipv6-3.fw.orig b/test/pf/firewall-ipv6-3.fw.orig index f5542bada..1b355fba6 100755 --- a/test/pf/firewall-ipv6-3.fw.orig +++ b/test/pf/firewall-ipv6-3.fw.orig @@ -3,7 +3,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:42 2011 PST by vadim +# Generated Mon Feb 7 17:03:04 2011 PST by vadim # # files: * firewall-ipv6-3.fw /etc/firewall-ipv6-3.fw # files: firewall-ipv6-3-Policy_ipv4.conf /etc/firewall-ipv6-3-Policy_ipv4.conf diff --git a/test/pf/firewall.fw.orig b/test/pf/firewall.fw.orig index 0656f8136..5338e5634 100755 --- a/test/pf/firewall.fw.orig +++ b/test/pf/firewall.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:09 2011 PST by vadim +# Generated Mon Feb 7 17:02:32 2011 PST by vadim # # files: * firewall.fw /etc/pf.fw # files: firewall.conf /etc/pf.conf @@ -167,7 +167,7 @@ configure_interfaces() { update_addresses_of_interface "lo 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Mon Feb 7 15:16:09 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:02:32 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall1.fw.orig b/test/pf/firewall1.fw.orig index c5a8fb43d..10505a8b1 100755 --- a/test/pf/firewall1.fw.orig +++ b/test/pf/firewall1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:09 2011 PST by vadim +# Generated Mon Feb 7 17:02:32 2011 PST by vadim # # files: * firewall1.fw /etc/fw/firewall1.fw # files: firewall1.conf /etc/fw/firewall1.conf @@ -79,7 +79,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Feb 7 15:16:09 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:02:32 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall10-1.fw.orig b/test/pf/firewall10-1.fw.orig index ec7dd2c84..69583ca11 100755 --- a/test/pf/firewall10-1.fw.orig +++ b/test/pf/firewall10-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:12 2011 PST by vadim +# Generated Mon Feb 7 17:02:35 2011 PST by vadim # # files: * firewall10-1.fw /etc/fw/firewall10-1.fw # files: firewall10-1.conf /etc/fw/firewall10-1.conf @@ -74,7 +74,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Feb 7 15:16:12 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:02:35 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall10-2.fw.orig b/test/pf/firewall10-2.fw.orig index 2d1ff22bb..1e4fd3b7e 100755 --- a/test/pf/firewall10-2.fw.orig +++ b/test/pf/firewall10-2.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:12 2011 PST by vadim +# Generated Mon Feb 7 17:02:35 2011 PST by vadim # # files: * firewall10-2.fw /etc/fw/firewall10-2.fw # files: firewall10-2.conf /etc/fw/firewall10-2.conf @@ -74,7 +74,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Feb 7 15:16:12 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:02:35 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall10-3.fw.orig b/test/pf/firewall10-3.fw.orig index d23186ecd..9fc4ee65e 100755 --- a/test/pf/firewall10-3.fw.orig +++ b/test/pf/firewall10-3.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:14 2011 PST by vadim +# Generated Mon Feb 7 17:02:37 2011 PST by vadim # # files: * firewall10-3.fw /etc/fw/firewall10-3.fw # files: firewall10-3.conf /etc/fw/firewall10-3.conf @@ -76,7 +76,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Feb 7 15:16:14 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:02:37 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall10-4.fw.orig b/test/pf/firewall10-4.fw.orig index e67573c33..ce465308b 100755 --- a/test/pf/firewall10-4.fw.orig +++ b/test/pf/firewall10-4.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:14 2011 PST by vadim +# Generated Mon Feb 7 17:02:37 2011 PST by vadim # # files: * firewall10-4.fw /etc/fw/firewall10-4.fw # files: firewall10-4.conf /etc/fw/firewall10-4.conf @@ -76,7 +76,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Feb 7 15:16:14 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:02:37 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall10-5.fw.orig b/test/pf/firewall10-5.fw.orig index 5e142b01b..2e23c237c 100755 --- a/test/pf/firewall10-5.fw.orig +++ b/test/pf/firewall10-5.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:17 2011 PST by vadim +# Generated Mon Feb 7 17:02:40 2011 PST by vadim # # files: * firewall10-5.fw /etc/fw/firewall10-5.fw # files: firewall10-5.conf /etc/fw/firewall10-5.conf @@ -77,7 +77,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Feb 7 15:16:17 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:02:40 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall10-6.fw.orig b/test/pf/firewall10-6.fw.orig index 50fc204dd..58992c731 100755 --- a/test/pf/firewall10-6.fw.orig +++ b/test/pf/firewall10-6.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:17 2011 PST by vadim +# Generated Mon Feb 7 17:02:40 2011 PST by vadim # # files: * firewall10-6.fw /etc/fw/firewall10-6.fw # files: firewall10-6.conf /etc/fw/firewall10-6.conf @@ -77,7 +77,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Feb 7 15:16:17 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:02:40 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall100.fw.orig b/test/pf/firewall100.fw.orig index 64cb681a4..f3dfa0b71 100755 --- a/test/pf/firewall100.fw.orig +++ b/test/pf/firewall100.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:09 2011 PST by vadim +# Generated Mon Feb 7 17:02:32 2011 PST by vadim # # files: * firewall100.fw /etc/fw/pf.fw # files: firewall100.conf /etc/fw/path\ with\ space/pf.conf @@ -15,6 +15,7 @@ # firewall100:Routing:1: error: Gateway and interface are both empty in the rule # firewall100:Routing:1: error: Rules 0 (main) and 1 (main) define routes to the same destination 0.0.0.0/0.0.0.0 via different gateways. This configuration is not supported for openbsd +# firewall100:Routing:4: warning: Two of the routing rules created from the gui routing rules 3 (main) and 4 (main) are identical, skipping the second. Revise them to avoid this warning @@ -159,7 +160,7 @@ configure_interfaces() { update_addresses_of_interface "em1 10.1.1.81/0xffffff00" "" } -log "Activating firewall script generated Mon Feb 7 15:16:09 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:02:32 2011 by vadim" set_kernel_vars configure_interfaces @@ -256,8 +257,6 @@ route add 22.22.22.0/24 10.1.1.1 || route_command_error "3 (main)" # echo "Routing rule 4 (main)" # -route add 22.22.22.0/24 10.1.1.1 || route_command_error "4 (main)" - route add 33.33.33.0/24 10.1.1.1 || route_command_error "4 (main)" diff --git a/test/pf/firewall101.fw.orig b/test/pf/firewall101.fw.orig index f9346ac76..20f5a4811 100755 --- a/test/pf/firewall101.fw.orig +++ b/test/pf/firewall101.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:10 2011 PST by vadim +# Generated Mon Feb 7 17:02:33 2011 PST by vadim # # files: * firewall101.fw /etc/fw/pf.fw # files: firewall101.conf /etc/fw/path\ with\ space/pf.conf @@ -15,6 +15,7 @@ # firewall101:Routing:1: error: Gateway and interface are both empty in the rule # firewall101:Routing:1: error: Rules 0 (main) and 1 (main) define routes to the same destination 0.0.0.0/0.0.0.0 via different gateways. This configuration is not supported for freebsd +# firewall101:Routing:4: warning: Two of the routing rules created from the gui routing rules 3 (main) and 4 (main) are identical, skipping the second. Revise them to avoid this warning @@ -162,7 +163,7 @@ configure_interfaces() { update_addresses_of_interface "em1 10.1.1.81/0xffffff00" "" } -log "Activating firewall script generated Mon Feb 7 15:16:10 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:02:33 2011 by vadim" set_kernel_vars configure_interfaces @@ -259,8 +260,6 @@ route add 22.22.22.0/24 10.1.1.1 || route_command_error "3 (main)" # echo "Routing rule 4 (main)" # -route add 22.22.22.0/24 10.1.1.1 || route_command_error "4 (main)" - route add 33.33.33.0/24 10.1.1.1 || route_command_error "4 (main)" diff --git a/test/pf/firewall102.fw.orig b/test/pf/firewall102.fw.orig index 6f87e60ba..999c586dd 100755 --- a/test/pf/firewall102.fw.orig +++ b/test/pf/firewall102.fw.orig @@ -3,7 +3,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:12 2011 PST by vadim +# Generated Mon Feb 7 17:02:35 2011 PST by vadim # # files: * firewall102.fw /etc/fw/pf.fw # files: firewall102.conf /etc/fw/path\ with\ space/pf.conf @@ -14,6 +14,7 @@ # firewall102:Routing:1: error: Gateway and interface are both empty in the rule # firewall102:Routing:1: error: Rules 0 (main) and 1 (main) define routes to the same destination 0.0.0.0/0.0.0.0 via different gateways. This configuration is not supported for freebsd +# firewall102:Routing:4: warning: Two of the routing rules created from the gui routing rules 3 (main) and 4 (main) are identical, skipping the second. Revise them to avoid this warning gateway_enable="YES" @@ -26,11 +27,10 @@ ifconfig_em1="10.1.1.81 netmask 0xffffff00" pf_enable="YES" pf_rules="/etc/fw/path\ with\ space/pf.conf" -static_routes="route_0 route_1 route_2 route_3 route_4 route_5" +static_routes="route_0 route_1 route_2 route_3 route_4" route_route_0="default 10.1.1.1 " route_route_1="default " route_route_2="192.168.171.2 10.1.1.1 " route_route_3="22.22.22.0/24 10.1.1.1 " -route_route_4="22.22.22.0/24 10.1.1.1 " -route_route_5="33.33.33.0/24 10.1.1.1 " +route_route_4="33.33.33.0/24 10.1.1.1 " diff --git a/test/pf/firewall103.fw.orig b/test/pf/firewall103.fw.orig index 7cf1ef406..7116efb29 100755 --- a/test/pf/firewall103.fw.orig +++ b/test/pf/firewall103.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:12 2011 PST by vadim +# Generated Mon Feb 7 17:02:35 2011 PST by vadim # # files: * firewall103.fw /etc/fw/pf.fw # files: firewall103.conf /etc/fw/path\ with\ space/pf.conf @@ -291,7 +291,7 @@ configure_interfaces() { update_addresses_of_interface "em3" "" } -log "Activating firewall script generated Mon Feb 7 15:16:12 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:02:35 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall104.fw.orig b/test/pf/firewall104.fw.orig index 460befc9b..6ad1645be 100755 --- a/test/pf/firewall104.fw.orig +++ b/test/pf/firewall104.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:14 2011 PST by vadim +# Generated Mon Feb 7 17:02:37 2011 PST by vadim # # files: * firewall104.fw /etc/fw/pf.fw # files: firewall104.conf /etc/fw/path\ with\ space/pf.conf @@ -291,7 +291,7 @@ configure_interfaces() { update_addresses_of_interface "em3" "" } -log "Activating firewall script generated Mon Feb 7 15:16:14 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:02:37 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall105.fw.orig b/test/pf/firewall105.fw.orig index 2c0e4ca76..0eb0a892f 100755 --- a/test/pf/firewall105.fw.orig +++ b/test/pf/firewall105.fw.orig @@ -3,7 +3,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:15 2011 PST by vadim +# Generated Mon Feb 7 17:02:38 2011 PST by vadim # # files: * firewall105.fw /etc/fw/pf.fw # files: firewall105.conf /etc/fw/path\ with\ space/pf.conf diff --git a/test/pf/firewall106.fw.orig b/test/pf/firewall106.fw.orig index df56908cc..bf2785abb 100755 --- a/test/pf/firewall106.fw.orig +++ b/test/pf/firewall106.fw.orig @@ -3,7 +3,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:17 2011 PST by vadim +# Generated Mon Feb 7 17:02:40 2011 PST by vadim # # files: * firewall106.fw /etc/fw/pf.fw # files: firewall106.conf /etc/fw/path\ with\ space/pf.conf @@ -14,6 +14,7 @@ # firewall106:Routing:1: error: Gateway and interface are both empty in the rule # firewall106:Routing:1: error: Rules 0 (main) and 1 (main) define routes to the same destination 0.0.0.0/0.0.0.0 via different gateways. This configuration is not supported for freebsd +# firewall106:Routing:4: warning: Two of the routing rules created from the gui routing rules 3 (main) and 4 (main) are identical, skipping the second. Revise them to avoid this warning gateway_enable="YES" @@ -32,11 +33,10 @@ ifconfig_em3="up" pf_enable="YES" pf_rules="/etc/fw/path\ with\ space/pf.conf" -static_routes="route_0 route_1 route_2 route_3 route_4 route_5" +static_routes="route_0 route_1 route_2 route_3 route_4" route_route_0="default 10.1.1.1 " route_route_1="default " route_route_2="192.168.171.2 10.1.1.1 " route_route_3="22.22.22.0/24 10.1.1.1 " -route_route_4="22.22.22.0/24 10.1.1.1 " -route_route_5="33.33.33.0/24 10.1.1.1 " +route_route_4="33.33.33.0/24 10.1.1.1 " diff --git a/test/pf/firewall107.fw.orig b/test/pf/firewall107.fw.orig index 02d73387a..59e9395ce 100755 --- a/test/pf/firewall107.fw.orig +++ b/test/pf/firewall107.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:17 2011 PST by vadim +# Generated Mon Feb 7 17:02:40 2011 PST by vadim # # files: * firewall107.fw /etc/fw/pf.fw # files: firewall107.conf /etc/fw/path\ with\ space/pf.conf @@ -291,7 +291,7 @@ configure_interfaces() { update_addresses_of_interface "vlan102 192.168.102.1/0xffffff00" "" } -log "Activating firewall script generated Mon Feb 7 15:16:17 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:02:40 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall108.fw.orig b/test/pf/firewall108.fw.orig index 39218f08a..1a6b3f456 100755 --- a/test/pf/firewall108.fw.orig +++ b/test/pf/firewall108.fw.orig @@ -3,7 +3,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:19 2011 PST by vadim +# Generated Mon Feb 7 17:02:42 2011 PST by vadim # # files: * firewall108.fw /etc/fw/pf.fw # files: firewall108.conf /etc/fw/path\ with\ space/pf.conf diff --git a/test/pf/firewall11.fw.orig b/test/pf/firewall11.fw.orig index d2d19aaed..d8d44b974 100755 --- a/test/pf/firewall11.fw.orig +++ b/test/pf/firewall11.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:19 2011 PST by vadim +# Generated Mon Feb 7 17:02:43 2011 PST by vadim # # files: * firewall11.fw /etc/firewall11.fw # files: firewall11.conf /etc/firewall11.conf @@ -77,7 +77,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Feb 7 15:16:19 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:02:43 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall12.fw.orig b/test/pf/firewall12.fw.orig index df6731ecd..548f436a8 100755 --- a/test/pf/firewall12.fw.orig +++ b/test/pf/firewall12.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:19 2011 PST by vadim +# Generated Mon Feb 7 17:02:43 2011 PST by vadim # # files: * firewall12.fw /etc/fw/firewall12.fw # files: firewall12.conf /etc/fw/firewall12.conf @@ -159,7 +159,7 @@ configure_interfaces() { update_addresses_of_interface "lo0 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Mon Feb 7 15:16:19 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:02:43 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall13.fw.orig b/test/pf/firewall13.fw.orig index ad521ba65..99142cdd7 100755 --- a/test/pf/firewall13.fw.orig +++ b/test/pf/firewall13.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:20 2011 PST by vadim +# Generated Mon Feb 7 17:02:43 2011 PST by vadim # # files: * firewall13.fw /etc/fw/firewall13.fw # files: firewall13.conf /etc/fw/firewall13.conf @@ -88,7 +88,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Feb 7 15:16:20 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:02:43 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall14-1.fw.orig b/test/pf/firewall14-1.fw.orig index 1a2f2b6d9..2dbee0da2 100755 --- a/test/pf/firewall14-1.fw.orig +++ b/test/pf/firewall14-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:22 2011 PST by vadim +# Generated Mon Feb 7 17:02:46 2011 PST by vadim # # files: * firewall14-1.fw /etc/firewall14-1.fw # files: firewall14-1.conf /etc/firewall14-1.conf @@ -241,7 +241,7 @@ configure_interfaces() { update_addresses_of_interface "vlan103 10.100.103.1/0xffffff00" "" } -log "Activating firewall script generated Mon Feb 7 15:16:22 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:02:46 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall14.fw.orig b/test/pf/firewall14.fw.orig index 0ed4f0396..a9d19dd75 100755 --- a/test/pf/firewall14.fw.orig +++ b/test/pf/firewall14.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:22 2011 PST by vadim +# Generated Mon Feb 7 17:02:44 2011 PST by vadim # # files: * firewall14.fw /etc/firewall14.fw # files: firewall14.conf /etc/firewall14.conf @@ -241,7 +241,7 @@ configure_interfaces() { update_addresses_of_interface "vlan103 10.100.103.1/0xffffff00" "" } -log "Activating firewall script generated Mon Feb 7 15:16:22 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:02:44 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall2-1.fw.orig b/test/pf/firewall2-1.fw.orig index f6bed92b3..293f661b0 100755 --- a/test/pf/firewall2-1.fw.orig +++ b/test/pf/firewall2-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:25 2011 PST by vadim +# Generated Mon Feb 7 17:02:48 2011 PST by vadim # # files: * firewall2-1.fw /etc/fw/firewall2-1.fw # files: firewall2-1.conf /etc/fw/firewall2-1.conf @@ -89,7 +89,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Feb 7 15:16:25 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:02:48 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall2.fw.orig b/test/pf/firewall2.fw.orig index b6f651e66..c95a9820d 100755 --- a/test/pf/firewall2.fw.orig +++ b/test/pf/firewall2.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:22 2011 PST by vadim +# Generated Mon Feb 7 17:02:46 2011 PST by vadim # # files: * firewall2.fw /etc/fw/firewall2.fw # files: firewall2.conf /etc/fw/firewall2.conf @@ -73,7 +73,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Feb 7 15:16:22 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:02:46 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall20.fw.orig b/test/pf/firewall20.fw.orig index 1cc43ee65..a7271df13 100755 --- a/test/pf/firewall20.fw.orig +++ b/test/pf/firewall20.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:22 2011 PST by vadim +# Generated Mon Feb 7 17:02:46 2011 PST by vadim # # files: * firewall20.fw /etc/fw/firewall20.fw # files: firewall20.conf /etc/fw/firewall20.conf @@ -73,7 +73,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Feb 7 15:16:22 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:02:46 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall21.fw.orig b/test/pf/firewall21.fw.orig index a5bb3b739..397f4d163 100755 --- a/test/pf/firewall21.fw.orig +++ b/test/pf/firewall21.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:25 2011 PST by vadim +# Generated Mon Feb 7 17:02:47 2011 PST by vadim # # files: * firewall21.fw /etc/fw/firewall21.fw # files: firewall21-NAT_1.conf /etc/fw/firewall21-NAT_1.conf @@ -82,7 +82,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Feb 7 15:16:25 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:02:47 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall22.fw.orig b/test/pf/firewall22.fw.orig index 02a637acb..d630d3bbc 100755 --- a/test/pf/firewall22.fw.orig +++ b/test/pf/firewall22.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:26 2011 PST by vadim +# Generated Mon Feb 7 17:02:49 2011 PST by vadim # # files: * firewall22.fw /etc/fw/firewall22.fw # files: firewall22-NAT_1.conf /etc/fw/firewall22-NAT_1.conf @@ -80,7 +80,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Feb 7 15:16:26 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:02:49 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall3.fw.orig b/test/pf/firewall3.fw.orig index c29037956..6c1e9c022 100755 --- a/test/pf/firewall3.fw.orig +++ b/test/pf/firewall3.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:25 2011 PST by vadim +# Generated Mon Feb 7 17:02:48 2011 PST by vadim # # files: * firewall3.fw /etc/firewall3.fw # files: firewall3.conf /etc/firewall3.conf @@ -159,7 +159,7 @@ configure_interfaces() { update_addresses_of_interface "lo 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Mon Feb 7 15:16:25 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:02:48 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall33.fw.orig b/test/pf/firewall33.fw.orig index 964362266..615b879f9 100755 --- a/test/pf/firewall33.fw.orig +++ b/test/pf/firewall33.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:28 2011 PST by vadim +# Generated Mon Feb 7 17:02:49 2011 PST by vadim # # files: * firewall33.fw /etc/fw/firewall33.fw # files: firewall33.conf /etc/fw/firewall33.conf @@ -163,7 +163,7 @@ configure_interfaces() { update_addresses_of_interface "lo 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Mon Feb 7 15:16:28 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:02:49 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall34.fw.orig b/test/pf/firewall34.fw.orig index a645743b3..969475dc0 100755 --- a/test/pf/firewall34.fw.orig +++ b/test/pf/firewall34.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:28 2011 PST by vadim +# Generated Mon Feb 7 17:02:50 2011 PST by vadim # # files: * firewall34.fw /etc/fw/firewall34.fw # files: firewall34.conf /etc/fw/firewall34.conf @@ -159,7 +159,7 @@ configure_interfaces() { update_addresses_of_interface "lo 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Mon Feb 7 15:16:28 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:02:50 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall38.fw.orig b/test/pf/firewall38.fw.orig index 05f305f4e..9c7b2e0f1 100755 --- a/test/pf/firewall38.fw.orig +++ b/test/pf/firewall38.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:28 2011 PST by vadim +# Generated Mon Feb 7 17:02:51 2011 PST by vadim # # files: * firewall38.fw /etc/fw/firewall38.fw # files: firewall38.conf /etc/fw/firewall38.conf @@ -76,7 +76,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Feb 7 15:16:28 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:02:51 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall39.fw.orig b/test/pf/firewall39.fw.orig index 891735328..0aa2e0b86 100755 --- a/test/pf/firewall39.fw.orig +++ b/test/pf/firewall39.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:28 2011 PST by vadim +# Generated Mon Feb 7 17:02:52 2011 PST by vadim # # files: * firewall39.fw pf.fw # files: firewall39.conf pf.conf @@ -79,7 +79,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Feb 7 15:16:28 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:02:52 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall4.fw.orig b/test/pf/firewall4.fw.orig index b87cae94e..7e568cb5e 100755 --- a/test/pf/firewall4.fw.orig +++ b/test/pf/firewall4.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:30 2011 PST by vadim +# Generated Mon Feb 7 17:02:51 2011 PST by vadim # # files: * firewall4.fw pf.fw # files: firewall4.conf /etc/fw/pf.conf @@ -78,7 +78,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Feb 7 15:16:30 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:02:51 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall40-1.fw.orig b/test/pf/firewall40-1.fw.orig index c56f93792..f75dc48e5 100755 --- a/test/pf/firewall40-1.fw.orig +++ b/test/pf/firewall40-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:31 2011 PST by vadim +# Generated Mon Feb 7 17:02:53 2011 PST by vadim # # files: * firewall40-1.fw /etc/firewall40-1.fw # files: firewall40-1.conf /etc/firewall40-1.conf @@ -176,7 +176,7 @@ configure_interfaces() { update_addresses_of_interface "lo0 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Mon Feb 7 15:16:31 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:02:53 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall40.fw.orig b/test/pf/firewall40.fw.orig index 18ecc0e0d..1c03367be 100755 --- a/test/pf/firewall40.fw.orig +++ b/test/pf/firewall40.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:30 2011 PST by vadim +# Generated Mon Feb 7 17:02:52 2011 PST by vadim # # files: * firewall40.fw /etc/firewall40.fw # files: firewall40.conf /etc/firewall40.conf @@ -160,7 +160,7 @@ configure_interfaces() { update_addresses_of_interface "lo0 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Mon Feb 7 15:16:30 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:02:52 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall41.fw.orig b/test/pf/firewall41.fw.orig index 66abcd843..321a7b3c5 100755 --- a/test/pf/firewall41.fw.orig +++ b/test/pf/firewall41.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:31 2011 PST by vadim +# Generated Mon Feb 7 17:02:54 2011 PST by vadim # # files: * firewall41.fw /etc/firewall41.fw # files: firewall41.conf /etc/firewall41.conf @@ -163,7 +163,7 @@ configure_interfaces() { update_addresses_of_interface "eth1 2.2.2.2/0xffffff00" "" } -log "Activating firewall script generated Mon Feb 7 15:16:31 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:02:54 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall5.fw.orig b/test/pf/firewall5.fw.orig index 8ea04064b..9fb0e618f 100755 --- a/test/pf/firewall5.fw.orig +++ b/test/pf/firewall5.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:33 2011 PST by vadim +# Generated Mon Feb 7 17:02:54 2011 PST by vadim # # files: * firewall5.fw /etc/fw/firewall5.fw # files: firewall5.conf /etc/fw/firewall5.conf @@ -77,7 +77,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Feb 7 15:16:33 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:02:54 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall51.fw.orig b/test/pf/firewall51.fw.orig index b5ef6750f..a133e58f8 100755 --- a/test/pf/firewall51.fw.orig +++ b/test/pf/firewall51.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:34 2011 PST by vadim +# Generated Mon Feb 7 17:02:55 2011 PST by vadim # # files: * firewall51.fw /etc/fw/firewall51.fw # files: firewall51.conf /etc/fw/firewall51.conf @@ -80,7 +80,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Feb 7 15:16:34 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:02:55 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall6.fw.orig b/test/pf/firewall6.fw.orig index a305a4b1f..fca5cc309 100755 --- a/test/pf/firewall6.fw.orig +++ b/test/pf/firewall6.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:33 2011 PST by vadim +# Generated Mon Feb 7 17:02:56 2011 PST by vadim # # files: * firewall6.fw /etc/fw/firewall6.fw # files: firewall6.conf /etc/fw/firewall6.conf @@ -73,7 +73,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Feb 7 15:16:33 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:02:56 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall62.fw.orig b/test/pf/firewall62.fw.orig index 96efb8d7b..0dda5271f 100755 --- a/test/pf/firewall62.fw.orig +++ b/test/pf/firewall62.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:33 2011 PST by vadim +# Generated Mon Feb 7 17:02:56 2011 PST by vadim # # files: * firewall62.fw /etc/firewall62.fw # files: firewall62.conf /etc/firewall62.conf @@ -185,7 +185,7 @@ configure_interfaces() { update_addresses_of_interface "en1 222.222.222.222/0xffffff00" "" } -log "Activating firewall script generated Mon Feb 7 15:16:33 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:02:56 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall63.fw.orig b/test/pf/firewall63.fw.orig index 41afcda4f..e0a6fb5e3 100755 --- a/test/pf/firewall63.fw.orig +++ b/test/pf/firewall63.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:35 2011 PST by vadim +# Generated Mon Feb 7 17:02:57 2011 PST by vadim # # files: * firewall63.fw /etc/fw/firewall63.fw # files: firewall63.conf /etc/fw/firewall63.conf @@ -77,7 +77,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Feb 7 15:16:35 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:02:57 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall7.fw.orig b/test/pf/firewall7.fw.orig index 8a5de223b..cb944e7cc 100755 --- a/test/pf/firewall7.fw.orig +++ b/test/pf/firewall7.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:36 2011 PST by vadim +# Generated Mon Feb 7 17:02:58 2011 PST by vadim # # files: * firewall7.fw /etc/fw/firewall7.fw # files: firewall7.conf /etc/fw/firewall7.conf @@ -73,7 +73,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Feb 7 15:16:36 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:02:58 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall70.fw.orig b/test/pf/firewall70.fw.orig index 4caa2b636..d2105cc3a 100755 --- a/test/pf/firewall70.fw.orig +++ b/test/pf/firewall70.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:36 2011 PST by vadim +# Generated Mon Feb 7 17:02:58 2011 PST by vadim # # files: * firewall70.fw /etc/fw/firewall70.fw # files: firewall70.conf /etc/fw/firewall70.conf @@ -82,7 +82,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Feb 7 15:16:36 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:02:58 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall8.fw.orig b/test/pf/firewall8.fw.orig index 933f0db46..86c565c77 100755 --- a/test/pf/firewall8.fw.orig +++ b/test/pf/firewall8.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:36 2011 PST by vadim +# Generated Mon Feb 7 17:02:59 2011 PST by vadim # # files: * firewall8.fw /etc/firewall8.fw # files: firewall8.conf /etc/firewall8.conf @@ -72,7 +72,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Feb 7 15:16:36 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:02:59 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall80-4.5.fw.orig b/test/pf/firewall80-4.5.fw.orig index ce4ecf0c5..9ff6d6dfb 100755 --- a/test/pf/firewall80-4.5.fw.orig +++ b/test/pf/firewall80-4.5.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:38 2011 PST by vadim +# Generated Mon Feb 7 17:03:00 2011 PST by vadim # # files: * firewall80-4.5.fw /etc/firewall80-4.5.fw # files: firewall80-4.5.conf /etc/firewall80-4.5.conf @@ -73,7 +73,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Feb 7 15:16:38 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:03:00 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall80.fw.orig b/test/pf/firewall80.fw.orig index 82c72e6de..1be5b76d6 100755 --- a/test/pf/firewall80.fw.orig +++ b/test/pf/firewall80.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:37 2011 PST by vadim +# Generated Mon Feb 7 17:02:59 2011 PST by vadim # # files: * firewall80.fw /etc/firewall80.fw # files: firewall80.conf /etc/firewall80.conf @@ -73,7 +73,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Feb 7 15:16:37 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:02:59 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall9.fw.orig b/test/pf/firewall9.fw.orig index b2c7512bd..0fb5758c4 100755 --- a/test/pf/firewall9.fw.orig +++ b/test/pf/firewall9.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:38 2011 PST by vadim +# Generated Mon Feb 7 17:03:00 2011 PST by vadim # # files: * firewall9.fw /etc/fw/firewall9.fw # files: firewall9.conf /etc/fw/firewall9.conf @@ -76,7 +76,7 @@ configure_interfaces() { } -log "Activating firewall script generated Mon Feb 7 15:16:38 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:03:00 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall91.fw.orig b/test/pf/firewall91.fw.orig index 92947b4f9..818142094 100755 --- a/test/pf/firewall91.fw.orig +++ b/test/pf/firewall91.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:39 2011 PST by vadim +# Generated Mon Feb 7 17:03:01 2011 PST by vadim # # files: * firewall91.fw /etc/fw/pf.fw # files: firewall91.conf /etc/fw/pf.conf @@ -240,7 +240,7 @@ configure_interfaces() { update_addresses_of_interface "vlan103 10.100.103.1/0xffffff00" "" } -log "Activating firewall script generated Mon Feb 7 15:16:39 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:03:01 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall92.fw.orig b/test/pf/firewall92.fw.orig index b97b4a536..f73022706 100755 --- a/test/pf/firewall92.fw.orig +++ b/test/pf/firewall92.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:39 2011 PST by vadim +# Generated Mon Feb 7 17:03:01 2011 PST by vadim # # files: * firewall92.fw /etc/fw/pf.fw # files: firewall92.conf /etc/fw/path\ with\ space/pf.conf @@ -160,7 +160,7 @@ configure_interfaces() { update_addresses_of_interface "em1 10.1.1.81/0xffffff00" "" } -log "Activating firewall script generated Mon Feb 7 15:16:39 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:03:01 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/pf_cluster_1_openbsd-1.fw.orig b/test/pf/pf_cluster_1_openbsd-1.fw.orig index 36eb5fed5..f66f9beb0 100755 --- a/test/pf/pf_cluster_1_openbsd-1.fw.orig +++ b/test/pf/pf_cluster_1_openbsd-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:42 2011 PST by vadim +# Generated Mon Feb 7 17:03:03 2011 PST by vadim # # files: * pf_cluster_1_openbsd-1.fw /etc/pf_cluster_1_openbsd-1.fw # files: pf_cluster_1_openbsd-1.conf /etc/pf_cluster_1_openbsd-1.conf @@ -289,7 +289,7 @@ configure_interfaces() { update_addresses_of_interface "lo0 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Mon Feb 7 15:16:42 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:03:03 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/pf_cluster_1_openbsd-2.fw.orig b/test/pf/pf_cluster_1_openbsd-2.fw.orig index a6a2d9865..169485879 100755 --- a/test/pf/pf_cluster_1_openbsd-2.fw.orig +++ b/test/pf/pf_cluster_1_openbsd-2.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:42 2011 PST by vadim +# Generated Mon Feb 7 17:03:03 2011 PST by vadim # # files: * pf_cluster_1_openbsd-2.fw /etc/pf_cluster_1_openbsd-2.fw # files: pf_cluster_1_openbsd-2.conf /etc/pf_cluster_1_openbsd-2.conf @@ -186,7 +186,7 @@ configure_interfaces() { update_addresses_of_interface "lo0 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Mon Feb 7 15:16:42 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:03:03 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/pf_cluster_2_freebsd-1.fw.orig b/test/pf/pf_cluster_2_freebsd-1.fw.orig index 22c213692..13ff9a113 100755 --- a/test/pf/pf_cluster_2_freebsd-1.fw.orig +++ b/test/pf/pf_cluster_2_freebsd-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:42 2011 PST by vadim +# Generated Mon Feb 7 17:03:03 2011 PST by vadim # # files: * pf_cluster_2_freebsd-1.fw /etc/pf_cluster_2_freebsd-1.fw # files: pf_cluster_2_freebsd-1.conf /etc/pf_cluster_2_freebsd-1.conf @@ -291,7 +291,7 @@ configure_interfaces() { update_addresses_of_interface "en1 192.168.1.2/0xffffff00" "" } -log "Activating firewall script generated Mon Feb 7 15:16:42 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:03:03 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/pf_cluster_2_freebsd-2.fw.orig b/test/pf/pf_cluster_2_freebsd-2.fw.orig index f95ca2662..00691a063 100755 --- a/test/pf/pf_cluster_2_freebsd-2.fw.orig +++ b/test/pf/pf_cluster_2_freebsd-2.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:42 2011 PST by vadim +# Generated Mon Feb 7 17:03:03 2011 PST by vadim # # files: * pf_cluster_2_freebsd-2.fw /etc/pf_cluster_2_freebsd-2.fw # files: pf_cluster_2_freebsd-2.conf /etc/pf_cluster_2_freebsd-2.conf @@ -188,7 +188,7 @@ configure_interfaces() { update_addresses_of_interface "en1 192.168.1.3/0xffffff00" "" } -log "Activating firewall script generated Mon Feb 7 15:16:42 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:03:03 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/pf_cluster_3_openbsd-3.fw.orig b/test/pf/pf_cluster_3_openbsd-3.fw.orig index 0002c0059..5272343d7 100755 --- a/test/pf/pf_cluster_3_openbsd-3.fw.orig +++ b/test/pf/pf_cluster_3_openbsd-3.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:42 2011 PST by vadim +# Generated Mon Feb 7 17:03:04 2011 PST by vadim # # files: * pf_cluster_3_openbsd-3.fw /etc/pf_cluster_3_openbsd-3.fw # files: pf_cluster_3_openbsd-3.conf /etc/pf_cluster_3_openbsd-3.conf @@ -292,7 +292,7 @@ configure_interfaces() { update_addresses_of_interface "vlan100 172.20.0.2/0xffffff00" "" } -log "Activating firewall script generated Mon Feb 7 15:16:42 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:03:04 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/pf_cluster_3_openbsd-4.fw.orig b/test/pf/pf_cluster_3_openbsd-4.fw.orig index 9ba43a944..7c0319bff 100755 --- a/test/pf/pf_cluster_3_openbsd-4.fw.orig +++ b/test/pf/pf_cluster_3_openbsd-4.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:42 2011 PST by vadim +# Generated Mon Feb 7 17:03:04 2011 PST by vadim # # files: * pf_cluster_3_openbsd-4.fw /etc/pf_cluster_3_openbsd-4.fw # files: pf_cluster_3_openbsd-4.conf /etc/pf_cluster_3_openbsd-4.conf @@ -190,7 +190,7 @@ configure_interfaces() { update_addresses_of_interface "vlan100 172.20.0.3/0xffffff00" "" } -log "Activating firewall script generated Mon Feb 7 15:16:42 2011 by vadim" +log "Activating firewall script generated Mon Feb 7 17:03:04 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/pf_cluster_4_rc.conf.local b/test/pf/pf_cluster_4_rc.conf.local index 73ceff06d..ea712c1bb 100755 --- a/test/pf/pf_cluster_4_rc.conf.local +++ b/test/pf/pf_cluster_4_rc.conf.local @@ -3,7 +3,7 @@ # # Firewall Builder fwb_pf v4.2.0.3462 # -# Generated Mon Feb 7 15:16:42 2011 PST by vadim +# Generated Mon Feb 7 17:03:04 2011 PST by vadim # # files: * pf_cluster_4_rc.conf.local /etc/pf_cluster_4_rc.conf.local # files: pf_cluster_4_pf.conf /etc/pf_cluster_4_pf.conf