child-create: Don't log CHILD_SA initiation until we know the unique ID

diff --git a/src/libcharon/sa/ikev2/tasks/child_create.c b/src/libcharon/sa/ikev2/tasks/child_create.c
index 9fe6929c1fab554a3d0e7829063ea35d3ddf44cc..cac3bc0a2391a51b327b07880d97b82b1f90fafc 100644 (file)
--- a/src/libcharon/sa/ikev2/tasks/child_create.c
+++ b/src/libcharon/sa/ikev2/tasks/child_create.c
@@ -1022,17 +1022,6 @@ METHOD(task_t, build_i, status_t,
                        break;
        }
 
-       if (this->reqid)
-       {
-               DBG0(DBG_IKE, "establishing CHILD_SA %s{%d}",
-                        this->config->get_name(this->config), this->reqid);
-       }
-       else
-       {
-               DBG0(DBG_IKE, "establishing CHILD_SA %s",
-                        this->config->get_name(this->config));
-       }
-
        /* check if we want a virtual IP, but don't have one */
        list = linked_list_create();
        peer_cfg = this->ike_sa->get_peer_cfg(this->ike_sa);
@@ -1085,6 +1074,19 @@ METHOD(task_t, build_i, status_t,
                        this->ike_sa->has_condition(this->ike_sa, COND_NAT_ANY),
                        this->mark_in, this->mark_out);
 
+       if (this->reqid)
+       {
+               DBG0(DBG_IKE, "establishing CHILD_SA %s{%d} reqid %d",
+                        this->child_sa->get_name(this->child_sa),
+                        this->child_sa->get_unique_id(this->child_sa), this->reqid);
+       }
+       else
+       {
+               DBG0(DBG_IKE, "establishing CHILD_SA %s{%d}",
+                        this->child_sa->get_name(this->child_sa),
+                        this->child_sa->get_unique_id(this->child_sa));
+       }
+
        if (!allocate_spi(this))
        {
                DBG1(DBG_IKE, "unable to allocate SPIs from kernel");