Inherit virtual IP and attributes from old to new, not from new to old

This commit is contained in:
Martin Willi 2012-12-10 17:01:00 +01:00
parent caccc0e8cc
commit 43b4c2ea75
1 changed files with 5 additions and 5 deletions

View File

@ -1979,14 +1979,14 @@ METHOD(ike_sa_t, inherit, void,
this->other_id = other->other_id->clone(other->other_id);
/* apply assigned virtual IPs... */
while (this->my_vips->remove_last(this->my_vips, (void**)&vip) == SUCCESS)
while (other->my_vips->remove_last(other->my_vips, (void**)&vip) == SUCCESS)
{
other->my_vips->insert_first(other->my_vips, vip);
this->my_vips->insert_first(this->my_vips, vip);
}
while (this->other_vips->remove_last(this->other_vips,
(void**)&vip) == SUCCESS)
while (other->other_vips->remove_last(other->other_vips,
(void**)&vip) == SUCCESS)
{
other->other_vips->insert_first(other->other_vips, vip);
this->other_vips->insert_first(this->other_vips, vip);
}
/* authentication information */