onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-20 02:07:23 +01:00
Code Issues Releases Wiki Activity

* Rule.cpp (removeRef): fixes #1997 "add removeRef and addRef

Browse Source 
methods to class NATRule". Now undo and redo correctly remove and
restore references to NAT rule sets in NAT rules with action
Branch.
This commit is contained in:
Vadim Kurland 2011-01-27 11:58:02 -08:00
parent 804189fb75
commit b3f34b06ac
4 changed files with 59 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/ChangeLog
View File

@ -1,5 +1,10 @@
2011-01-27 vadim <vadim@netcitadel.com>
* Rule.cpp (removeRef): fixes #1997 "add removeRef and addRef
methods to class NATRule". Now undo and redo correctly remove and
restore references to NAT rule sets in NAT rules with action
Branch.
* Rule.cpp (addRef): fixes #1991 "Undo does not restore object as
a parameter of policy rule action Branch or Tag after it was
deleted deleted". Now Undo restores references to rule sets and tag

11
src/libfwbuilder/src/fwbuilder/FWObjectDatabase_search.cpp
View File

@ -222,6 +222,17 @@ bool FWObjectDatabase::_findWhereObjectIsUsed(FWObject *o,
}
}
NATRule *nat_rule = NATRule::cast(p);
if (nat_rule && nat_rule->getAction() == NATRule::Branch)
{
FWObject *ruleset = nat_rule->getBranch();
if (o==ruleset)
{
resset.insert(p);
res = true;
}
}
if (Firewall::isA(o) && Cluster::isA(p))
{
if (Cluster::cast(p)->hasMember(Firewall::cast(o)))

31
src/libfwbuilder/src/fwbuilder/Rule.cpp
View File

@ -597,6 +597,37 @@ void NATRule::init(FWObjectDatabase *root)
}
}
/**
* Add reference to given object. In case of NATRule this only
* makes sense in terms of adding reference to this object as an
* argument for action Branch.
*/
void NATRule::addRef(FWObject *obj)
{
if (RuleSet::cast(obj))
{
setBranch(RuleSet::cast(obj));
}
}
/**
* Removes reference to given object among children of 'this'. In case
* of NATRule we should also clear reference to it if action is
* Branch. Caveat: clear reference to it even if action is not branch
* right now but was in the past and reference got stuck in options.
*/
void NATRule::removeRef(FWObject *obj)
{
if (RuleSet::cast(obj))
{
string branch_id = FWObjectDatabase::getStringId(obj->getId());
string rule_branch_id = getOptionsObject()->getStr("branch_id");
if (branch_id == rule_branch_id)
getOptionsObject()->setStr("branch_id", "");
}
FWObject::removeRef(obj);
}
RuleElementOSrc* NATRule::getOSrc()
{
if (osrc_re) return osrc_re;

12
src/libfwbuilder/src/fwbuilder/Rule.h
View File

@ -366,6 +366,18 @@ public:
virtual bool isEmpty();
/**
* Removes reference to given object among
* children of 'this'.
*/
virtual void removeRef(FWObject *obj);
/**
* Add reference to given object to 'this'. In case of a PolicyRule,
* change action and add parameter if @obj is TagService or RuleSet.
*/
virtual void addRef(FWObject *obj);
libfwbuilder::RuleElementOSrc* getOSrc();
libfwbuilder::RuleElementODst* getODst();
libfwbuilder::RuleElementOSrv* getOSrv();