ike: Consistently log CHILD_SAs with their unique_id instead of their reqid

diff --git a/src/frontends/android/jni/libandroidbridge/backend/android_service.c b/src/frontends/android/jni/libandroidbridge/backend/android_service.c
index 64a79077e878c8e31fd9305aa4134d12d8564ebf..896bb0940f7f033991d80756a987116b9a5bf6d5 100644 (file)
--- a/src/frontends/android/jni/libandroidbridge/backend/android_service.c
+++ b/src/frontends/android/jni/libandroidbridge/backend/android_service.c
@@ -285,7 +285,7 @@ static bool setup_tun_device(private_android_service_t *this,
        int tunfd;
 
        DBG1(DBG_DMN, "setting up TUN device for CHILD_SA %s{%u}",
-                child_sa->get_name(child_sa), child_sa->get_reqid(child_sa));
+                child_sa->get_name(child_sa), child_sa->get_unique_id(child_sa));
 
        builder = charonservice->get_vpnservice_builder(charonservice);
 

diff --git a/src/libcharon/plugins/ha/ha_child.c b/src/libcharon/plugins/ha/ha_child.c
index c166d72ac9e08966c50d411cad2b95b22a515223..ed6ca71960e032caa1d2983dff46214ea5c3e160 100644 (file)
--- a/src/libcharon/plugins/ha/ha_child.c
+++ b/src/libcharon/plugins/ha/ha_child.c
@@ -128,7 +128,7 @@ METHOD(listener_t, child_keys, bool,
                        ike_sa->get_other_host(ike_sa), child_sa->get_spi(child_sa, FALSE));
        DBG1(DBG_CFG, "handling HA CHILD_SA %s{%d} %#R=== %#R "
                "(segment in: %d%s, out: %d%s)", child_sa->get_name(child_sa),
-               child_sa->get_reqid(child_sa), local_ts, remote_ts,
+               child_sa->get_unique_id(child_sa), local_ts, remote_ts,
                seg_i, this->segments->is_active(this->segments, seg_i) ? "*" : "",
                seg_o, this->segments->is_active(this->segments, seg_o) ? "*" : "");
 

diff --git a/src/libcharon/plugins/ha/ha_dispatcher.c b/src/libcharon/plugins/ha/ha_dispatcher.c
index 6e02733f9e686826e6f01e9d645733538a7e3a8b..983f9d8fc188c2f12981599cf801bf6cc4677571 100644 (file)
--- a/src/libcharon/plugins/ha/ha_dispatcher.c
+++ b/src/libcharon/plugins/ha/ha_dispatcher.c
@@ -836,7 +836,7 @@ static void process_child_add(private_ha_dispatcher_t *this,
 
        DBG1(DBG_CFG, "installed HA CHILD_SA %s{%d} %#R=== %#R "
                "(segment in: %d%s, out: %d%s)", child_sa->get_name(child_sa),
-               child_sa->get_reqid(child_sa), local_ts, remote_ts,
+               child_sa->get_unique_id(child_sa), local_ts, remote_ts,
                seg_i, this->segments->is_active(this->segments, seg_i) ? "*" : "",
                seg_o, this->segments->is_active(this->segments, seg_o) ? "*" : "");
        child_sa->add_policies(child_sa, local_ts, remote_ts);

diff --git a/src/libcharon/sa/ikev1/task_manager_v1.c b/src/libcharon/sa/ikev1/task_manager_v1.c
index 3184db4eec7c1ce7b73c60f0d21b5268a393307d..cb22bf606972358cad2d68066e5a46a26ffa8fb5 100644 (file)
--- a/src/libcharon/sa/ikev1/task_manager_v1.c
+++ b/src/libcharon/sa/ikev1/task_manager_v1.c
@@ -1596,7 +1596,8 @@ static bool is_redundant(private_task_manager_t *this, child_sa_t *child_sa)
                                child_sa->get_lifetime(child_sa, FALSE))
                {
                        DBG1(DBG_IKE, "deleting redundant CHILD_SA %s{%d}",
-                                child_sa->get_name(child_sa), child_sa->get_reqid(child_sa));
+                                child_sa->get_name(child_sa),
+                                child_sa->get_unique_id(child_sa));
                        redundant = TRUE;
                        break;
                }

diff --git a/src/libcharon/sa/ikev1/tasks/quick_delete.c b/src/libcharon/sa/ikev1/tasks/quick_delete.c
index 499081caa19519b63722bdf181761d39f65e1b0d..4206182a07cd2c87adbf24f07e5ba6ddb97108be 100644 (file)
--- a/src/libcharon/sa/ikev1/tasks/quick_delete.c
+++ b/src/libcharon/sa/ikev1/tasks/quick_delete.c
@@ -116,7 +116,7 @@ static bool delete_child(private_quick_delete_t *this, protocol_id_t protocol,
        {
                DBG0(DBG_IKE, "closing expired CHILD_SA %s{%d} "
                         "with SPIs %.8x_i %.8x_o and TS %#R=== %#R",
-                        child_sa->get_name(child_sa), child_sa->get_reqid(child_sa),
+                        child_sa->get_name(child_sa), child_sa->get_unique_id(child_sa),
                         ntohl(child_sa->get_spi(child_sa, TRUE)),
                         ntohl(child_sa->get_spi(child_sa, FALSE)), my_ts, other_ts);
        }
@@ -127,7 +127,7 @@ static bool delete_child(private_quick_delete_t *this, protocol_id_t protocol,
 
                DBG0(DBG_IKE, "closing CHILD_SA %s{%d} with SPIs "
                         "%.8x_i (%llu bytes) %.8x_o (%llu bytes) and TS %#R=== %#R",
-                        child_sa->get_name(child_sa), child_sa->get_reqid(child_sa),
+                        child_sa->get_name(child_sa), child_sa->get_unique_id(child_sa),
                         ntohl(child_sa->get_spi(child_sa, TRUE)), bytes_in,
                         ntohl(child_sa->get_spi(child_sa, FALSE)), bytes_out,
                         my_ts, other_ts);

diff --git a/src/libcharon/sa/ikev1/tasks/quick_mode.c b/src/libcharon/sa/ikev1/tasks/quick_mode.c
index 8ca3ac72efa534d8d53e700a847143901d5523a4..828b166d0afc504f8ff63d72816394a047afd5fa 100644 (file)
--- a/src/libcharon/sa/ikev1/tasks/quick_mode.c
+++ b/src/libcharon/sa/ikev1/tasks/quick_mode.c
@@ -385,7 +385,7 @@ static bool install(private_quick_mode_t *this)
        DBG0(DBG_IKE, "CHILD_SA %s{%d} established "
                 "with SPIs %.8x_i %.8x_o and TS %#R=== %#R",
                 this->child_sa->get_name(this->child_sa),
-                this->child_sa->get_reqid(this->child_sa),
+                this->child_sa->get_unique_id(this->child_sa),
                 ntohl(this->child_sa->get_spi(this->child_sa, TRUE)),
                 ntohl(this->child_sa->get_spi(this->child_sa, FALSE)), my_ts, other_ts);
 
@@ -986,7 +986,8 @@ static void check_for_rekeyed_child(private_quick_mode_t *this)
                                                                                                                        FALSE).value;
                                                child_sa->set_state(child_sa, CHILD_REKEYING);
                                                DBG1(DBG_IKE, "detected rekeying of CHILD_SA %s{%u}",
-                                                        child_sa->get_name(child_sa), this->reqid);
+                                                        child_sa->get_name(child_sa),
+                                                        child_sa->get_unique_id(child_sa));
                                        }
                                        policies->destroy(policies);
                                break;

diff --git a/src/libcharon/sa/ikev2/tasks/child_create.c b/src/libcharon/sa/ikev2/tasks/child_create.c
index abee0da3c4bd428ae8ba75db5f4edf2d51ba3f2c..1bb9340022e136e532047e22e6a9de1896559dc9 100644 (file)
--- a/src/libcharon/sa/ikev2/tasks/child_create.c
+++ b/src/libcharon/sa/ikev2/tasks/child_create.c
@@ -703,7 +703,7 @@ static status_t select_and_install(private_child_create_t *this,
        DBG0(DBG_IKE, "CHILD_SA %s{%d} established "
                 "with SPIs %.8x_i %.8x_o and TS %#R=== %#R",
                 this->child_sa->get_name(this->child_sa),
-                this->child_sa->get_reqid(this->child_sa),
+                this->child_sa->get_unique_id(this->child_sa),
                 ntohl(this->child_sa->get_spi(this->child_sa, TRUE)),
                 ntohl(this->child_sa->get_spi(this->child_sa, FALSE)), my_ts, other_ts);
 

diff --git a/src/libcharon/sa/ikev2/tasks/child_delete.c b/src/libcharon/sa/ikev2/tasks/child_delete.c
index 2b1697423ff854b226e009c635532b3c0499ea07..f0b11e2910a8551e51727c6dc0c5777d10e51377 100644 (file)
--- a/src/libcharon/sa/ikev2/tasks/child_delete.c
+++ b/src/libcharon/sa/ikev2/tasks/child_delete.c
@@ -267,7 +267,7 @@ static void log_children(private_child_delete_t *this)
                {
                        DBG0(DBG_IKE, "closing expired CHILD_SA %s{%d} "
                                 "with SPIs %.8x_i %.8x_o and TS %#R=== %#R",
-                                child_sa->get_name(child_sa), child_sa->get_reqid(child_sa),
+                                child_sa->get_name(child_sa), child_sa->get_unique_id(child_sa),
                                 ntohl(child_sa->get_spi(child_sa, TRUE)),
                                 ntohl(child_sa->get_spi(child_sa, FALSE)), my_ts, other_ts);
                }
@@ -278,7 +278,7 @@ static void log_children(private_child_delete_t *this)
 
                        DBG0(DBG_IKE, "closing CHILD_SA %s{%d} with SPIs %.8x_i "
                                 "(%llu bytes) %.8x_o (%llu bytes) and TS %#R=== %#R",
-                                child_sa->get_name(child_sa), child_sa->get_reqid(child_sa),
+                                child_sa->get_name(child_sa), child_sa->get_unique_id(child_sa),
                                 ntohl(child_sa->get_spi(child_sa, TRUE)), bytes_in,
                                 ntohl(child_sa->get_spi(child_sa, FALSE)), bytes_out,
                                 my_ts, other_ts);