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

fixes #1925

Browse Source
This commit is contained in:
Vadim Kurland 2011-01-13 18:03:32 -08:00
parent 0d522e04dc
commit a04135be61
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/cisco_lib/ASA8TwiceNatLogic.cpp
View File

@ -38,15 +38,32 @@ ASA8TwiceNatStaticLogic::ASA8TwiceNatStaticLogic(NATRule *_rule)
rule = _rule;
}
int ASA8TwiceNatStaticLogic::countAddresses(FWObject *re)
{
int res = 0;
for (FWObject::iterator i1=re->begin(); i1!=re->end(); ++i1)
{
FWObject *o = FWReference::getObject(*i1);
if (Group::cast(o) != NULL) res += countAddresses(o);
else
{
Address *addr = Address::cast(o);
assert(addr);
res += addr->dimension();
}
}
return res;
}
ASA8TwiceNatStaticLogic::TwiceNatRuleType ASA8TwiceNatStaticLogic::getAutomaticType()
{
RuleElementOSrc *osrc_re = rule->getOSrc();
assert(osrc_re!=NULL);
Address *osrc = Address::cast(FWReference::getObject(osrc_re->front()));
//Address *osrc = Address::cast(FWReference::getObject(osrc_re->front()));
RuleElementTSrc *tsrc_re = rule->getTSrc();
assert(tsrc_re!=NULL);
Address *tsrc = Address::cast(FWReference::getObject(tsrc_re->front()));
//Address *tsrc = Address::cast(FWReference::getObject(tsrc_re->front()));
if (tsrc_re->isAny()) return STATIC;
else
@ -59,8 +76,9 @@ ASA8TwiceNatStaticLogic::TwiceNatRuleType ASA8TwiceNatStaticLogic::getAutomaticT
* back to dynamic
*/
if (tsrc_re->size() > 1) return DYNAMIC;
if (tsrc == NULL) return DYNAMIC;
if (osrc->dimension() == tsrc->dimension()) return STATIC;
//if (tsrc == NULL) return DYNAMIC;
if (countAddresses(osrc_re) == countAddresses(tsrc_re)) return STATIC;
else return DYNAMIC;
}
return DYNAMIC;

2
src/cisco_lib/ASA8TwiceNatLogic.h
View File

@ -30,6 +30,8 @@
class ASA8TwiceNatStaticLogic
{
libfwbuilder::NATRule *rule;
int countAddresses(libfwbuilder::FWObject *re);
public:
enum TwiceNatRuleType {STATIC, DYNAMIC};