ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

Reuse reqid when restarting CHILD_SAs for dpd|closeaction=restart

This commit is contained in:
Tobias Brunner 2013-06-29 18:47:02 +02:00 committed by Andreas Steffen
parent 4c74fa664b
commit c949a4d501
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/libcharon/sa/ike_sa.c
View File

@ -1675,7 +1675,8 @@ METHOD(ike_sa_t, reestablish, status_t,
DBG1(DBG_IKE, "restarting CHILD_SA %s",
child_cfg->get_name(child_cfg));
child_cfg->get_ref(child_cfg);
status = new->initiate(new, child_cfg, 0, NULL, NULL);
status = new->initiate(new, child_cfg,
child_sa->get_reqid(child_sa), NULL, NULL);
break;
default:
continue;

4
src/libcharon/sa/ikev2/tasks/child_delete.c
View File

@ -222,8 +222,8 @@ 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, 0,
NULL, NULL);
status = this->ike_sa->initiate(this->ike_sa, child_cfg,
child_sa->get_reqid(child_sa), NULL, NULL);
break;
case ACTION_ROUTE:
charon->traps->install(charon->traps,