onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-19 17:57:22 +01:00
Code Issues Releases Wiki Activity

see #153 #133 got rid of getInterfaceStr and getInterfaceId in policy and nat compilers for PF

Browse Source
This commit is contained in:
Vadim Kurland 2011-02-18 18:54:21 -08:00
parent 2542b082f3
commit 66681b9695
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pflib/NATCompiler_pf.cpp
View File

@ -714,7 +714,7 @@ bool NATCompiler_pf::AssignInterface::processNext()
NATCompiler_pf *pf_comp = dynamic_cast<NATCompiler_pf*>(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;

6
src/pflib/NATCompiler_pf_writers.cpp
View File

@ -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:
{

4
test/pf/pf_cluster_4_rc.conf.local
View File

@ -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