diff --git a/src/pflib/NATCompiler_pf.cpp b/src/pflib/NATCompiler_pf.cpp index c71c70a83..ce124c895 100644 --- a/src/pflib/NATCompiler_pf.cpp +++ b/src/pflib/NATCompiler_pf.cpp @@ -714,7 +714,7 @@ bool NATCompiler_pf::AssignInterface::processNext() NATCompiler_pf *pf_comp = dynamic_cast(compiler); NATRule *rule = getNext(); if (rule==NULL) return false; - if (rule->getInterfaceStr() == "nil") + if (rule->getStr(".iface") == "nil") { tmp_queue.push_back(rule); return true; @@ -832,10 +832,10 @@ bool NATCompiler_pf::ReplaceFirewallObjectsODst::processNext() } /* * update for ticket 1397 If firewall object is in ODst, do not assign - * the rule to any interface. I use attribute set by - * setInterfaceStr() to signal AssignInterface that it should not do anything. + * the rule to any interface. I use attribute ".iface" to signal + * AssignInterface that it should not do anything. */ - rule->setInterfaceStr("nil"); + rule->setStr(".iface", "nil"); } return true; diff --git a/src/pflib/NATCompiler_pf_writers.cpp b/src/pflib/NATCompiler_pf_writers.cpp index 8c184ae2a..eb5320954 100644 --- a/src/pflib/NATCompiler_pf_writers.cpp +++ b/src/pflib/NATCompiler_pf_writers.cpp @@ -160,10 +160,8 @@ bool NATCompiler_pf::PrintRule::processNext() compiler->abort(rule, errstr); } -// string iface_name = rule->getInterfaceStr(); -// if (iface_name=="nil") iface_name=""; - - switch ( rule->getRuleType() ) { + switch ( rule->getRuleType() ) + { case NATRule::Continue: case NATRule::NONAT: { diff --git a/test/pf/pf_cluster_4_rc.conf.local b/test/pf/pf_cluster_4_rc.conf.local index 62d0f4c7e..c9aa88539 100755 --- a/test/pf/pf_cluster_4_rc.conf.local +++ b/test/pf/pf_cluster_4_rc.conf.local @@ -1,9 +1,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3480 +# Firewall Builder fwb_pf v4.2.0.3482 # -# Generated Thu Feb 17 17:53:23 2011 PST by vadim +# Generated Fri Feb 18 18:53:30 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