initiate trapped CHILD_SAs with same reqid

This commit is contained in:
Martin Willi
2009-05-08 10:04:00 +02:00
parent fda97f2140
commit c3626c2ce6
8 changed files with 27 additions and 32 deletions
+1 -1
View File
@@ -201,7 +201,7 @@ static status_t destroy_and_reestablish(private_child_delete_t *this)
{
case ACTION_RESTART:
child_cfg->get_ref(child_cfg);
status = this->ike_sa->initiate(this->ike_sa, child_cfg);
status = this->ike_sa->initiate(this->ike_sa, child_cfg, 0);
break;
case ACTION_ROUTE:
charon->traps->install(charon->traps,
+2 -2
View File
@@ -98,7 +98,7 @@ static status_t process_i(private_ike_reauth_t *this, message_t *message)
/* we initiate the new IKE_SA of the mediation connection without CHILD_SA */
if (peer_cfg->is_mediation(peer_cfg))
{
if (new->initiate(new, NULL) == DESTROY_ME)
if (new->initiate(new, NULL, 0) == DESTROY_ME)
{
charon->ike_sa_manager->checkin_and_destroy(
charon->ike_sa_manager, new);
@@ -126,7 +126,7 @@ static status_t process_i(private_ike_reauth_t *this, message_t *message)
/* initiate/queue all child SAs */
child_cfg_t *child_cfg = child_sa->get_config(child_sa);
child_cfg->get_ref(child_cfg);
if (new->initiate(new, child_cfg) == DESTROY_ME)
if (new->initiate(new, child_cfg, 0) == DESTROY_ME)
{
iterator->destroy(iterator);
charon->ike_sa_manager->checkin_and_destroy(