diff --git a/build_num b/build_num index 69c58ae96..0112e5218 100644 --- a/build_num +++ b/build_num @@ -1 +1 @@ -#define BUILD_NUM 1744 +#define BUILD_NUM 1745 diff --git a/src/cisco_lib/PolicyCompiler_pix_v6_acls.cpp b/src/cisco_lib/PolicyCompiler_pix_v6_acls.cpp index 52a60cf24..4ed392538 100644 --- a/src/cisco_lib/PolicyCompiler_pix_v6_acls.cpp +++ b/src/cisco_lib/PolicyCompiler_pix_v6_acls.cpp @@ -292,8 +292,8 @@ bool PolicyCompiler_pix::assignRuleToInterface_v6::processNext() int iface1_id = helper.findInterfaceByNetzone(a); rule->setInterfaceId(iface1_id); tmp_queue.push_back(rule); - } else { - + } else + { Address *a=compiler->getFirstDst(rule); if ( ! dst->isAny() && compiler->complexMatch(a,compiler->fw)) { @@ -304,14 +304,17 @@ bool PolicyCompiler_pix::assignRuleToInterface_v6::processNext() return true; } - list l2=compiler->fw->getByType(Interface::TYPENAME); + list l2 = compiler->fw->getByTypeDeep(Interface::TYPENAME); for (list::iterator i=l2.begin(); i!=l2.end(); ++i) { - PolicyRule *r= compiler->dbcopy->createPolicyRule(); + Interface *intf = Interface::cast(*i); + if (intf->isUnprotected()) continue; + + PolicyRule *r = compiler->dbcopy->createPolicyRule(); compiler->temp_ruleset->add(r); r->duplicate(rule); - r->setInterfaceId((*i)->getId()); + r->setInterfaceId(intf->getId()); r->setStr("direction","Inbound"); tmp_queue.push_back(r); diff --git a/test/pix/cluster-tests.fwb b/test/pix/cluster-tests.fwb index 951701c66..cf39e2aab 100644 --- a/test/pix/cluster-tests.fwb +++ b/test/pix/cluster-tests.fwb @@ -1,6 +1,6 @@ - + @@ -103,22 +103,191 @@ - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + @@ -142,7 +311,7 @@ - + @@ -160,7 +329,7 @@ - + @@ -181,7 +350,7 @@ - + @@ -214,7 +383,7 @@ - + @@ -250,43 +419,224 @@ - + - - - + + + - + - + + - + - + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -309,6 +659,7 @@ + @@ -325,36 +676,26 @@ - + - + + - - - - - - - - - - - - - + + - - + + @@ -480,36 +821,316 @@ - - - - - + + + + + + - - - - - - - - - - - - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +