denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

child-rekey: Add CHILD_SA name and unique ID to collision log messages

Browse Source
This commit is contained in:
Tobias Brunner
2017-08-07 14:22:13 +02:00
parent 859dae255c
commit 663b749c9f
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ikev2/tasks/child_rekey.c
+13 -8
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2009-2016 Tobias Brunner * Copyright (C) 2009-2017 Tobias Brunner
* Copyright (C) 2005-2007 Martin Willi * Copyright (C) 2005-2007 Martin Willi
* Copyright (C) 2005 Jan Hutter * Copyright (C) 2005 Jan Hutter
* HSR Hochschule fuer Technik Rapperswil * HSR Hochschule fuer Technik Rapperswil
@@ -303,9 +303,11 @@ static child_sa_t *handle_collision(private_child_rekey_t *this,
{ {
child_sa_t *child_sa; child_sa_t *child_sa;
DBG1(DBG_IKE, "CHILD_SA rekey collision won, deleting old child");
*to_install = this->child_create->get_child(this->child_create); *to_install = this->child_create->get_child(this->child_create);
to_delete = this->child_sa; to_delete = this->child_sa;
DBG1(DBG_IKE, "CHILD_SA rekey collision won, deleting old child "
"%s{%d}", to_delete->get_name(to_delete),
to_delete->get_unique_id(to_delete));
/* don't touch child other created, it has already been deleted */ /* don't touch child other created, it has already been deleted */
if (!this->other_child_destroyed) if (!this->other_child_destroyed)
{ {
@@ -323,9 +325,10 @@ static child_sa_t *handle_collision(private_child_rekey_t *this,
} }
else else
{ {
DBG1(DBG_IKE, "CHILD_SA rekey collision lost, "
"deleting rekeyed child");
to_delete = this->child_create->get_child(this->child_create); to_delete = this->child_create->get_child(this->child_create);
DBG1(DBG_IKE, "CHILD_SA rekey collision lost, deleting redundant "
"child %s{%d}", to_delete->get_name(to_delete),
to_delete->get_unique_id(to_delete));
} }
} }
else else
@@ -336,15 +339,17 @@ static child_sa_t *handle_collision(private_child_rekey_t *this,
* the CHILD_SA the other is not deleting. */ * the CHILD_SA the other is not deleting. */
if (del->get_child(del) != this->child_sa) if (del->get_child(del) != this->child_sa)
{ {
DBG1(DBG_IKE, "CHILD_SA rekey/delete collision, "
"deleting rekeyed child");
to_delete = this->child_sa; to_delete = this->child_sa;
DBG1(DBG_IKE, "CHILD_SA rekey/delete collision, deleting old child "
"%s{%d}", to_delete->get_name(to_delete),
to_delete->get_unique_id(to_delete));
} }
else else
{ {
DBG1(DBG_IKE, "CHILD_SA rekey/delete collision, "
"deleting redundant child");
to_delete = this->child_create->get_child(this->child_create); to_delete = this->child_create->get_child(this->child_create);
DBG1(DBG_IKE, "CHILD_SA rekey/delete collision, deleting redundant "
"child %s{%d}", to_delete->get_name(to_delete),
to_delete->get_unique_id(to_delete));
} }
} }
return to_delete; return to_delete;