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

ike: Use correct format string for unique Child SA identifiers

Browse Source 
Analogous to the previous commit.
This commit is contained in:
Tobias Brunner
2026-04-16 15:32:54 +02:00
parent 2a8fd3e4bf
commit e1a11e2c1c
12 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/ha/ha_child.c
+1 -1
View File
@@ -141,7 +141,7 @@ METHOD(listener_t, child_keys, bool,
ike_sa->get_my_host(ike_sa), child_sa->get_spi(child_sa, TRUE));
seg_o = this->kernel->get_segment_spi(this->kernel,
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 "
DBG1(DBG_CFG, "handling HA CHILD_SA %s{%u} %#R === %#R "
"(segment in: %d%s, out: %d%s)", child_sa->get_name(child_sa),
child_sa->get_unique_id(child_sa), local_ts, remote_ts,
seg_i, this->segments->is_active(this->segments, seg_i) ? "*" : "",
src/libcharon/plugins/ha/ha_dispatcher.c
+1 -1
View File
@@ -946,7 +946,7 @@ static void process_child_add(private_ha_dispatcher_t *this,
ike_sa->get_my_host(ike_sa), inbound_spi);
seg_o = this->kernel->get_segment_spi(this->kernel,
ike_sa->get_other_host(ike_sa), outbound_spi);
DBG1(DBG_CFG, "installed HA CHILD_SA %s{%d} %#R === %#R "
DBG1(DBG_CFG, "installed HA CHILD_SA %s{%u} %#R === %#R "
"(segment in: %d%s, out: %d%s)", child_sa->get_name(child_sa),
child_sa->get_unique_id(child_sa), local_ts, remote_ts,
seg_i, this->segments->is_active(this->segments, seg_i) ? "*" : "",
src/libcharon/plugins/selinux/selinux_listener.c
+2 -2
View File
@@ -96,7 +96,7 @@ static bool install_generic_trap(ike_sa_t *ike_sa, child_sa_t *child_sa)
#if DEBUG_LEVEL >= 1
sec_label_t *label = child_sa->get_label(child_sa);
DBG1(DBG_IKE, "installing trap %s{%d} with generic security label '%s'",
DBG1(DBG_IKE, "installing trap %s{%u} with generic security label '%s'",
child_sa->get_name(child_sa), child_sa->get_unique_id(child_sa),
label->get_string(label));
#endif
@@ -173,7 +173,7 @@ METHOD(listener_t, ike_updown, bool,
{
#if DEBUG_LEVEL >= 1
sec_label_t *label = child_sa->get_label(child_sa);
DBG1(DBG_IKE, "uninstalling trap %s{%d} with generic security "
DBG1(DBG_IKE, "uninstalling trap %s{%u} with generic security "
"label '%s'", child_sa->get_name(child_sa),
child_sa->get_unique_id(child_sa),
label->get_string(label));
src/libcharon/plugins/stroke/stroke_list.c
+3 -3
View File
@@ -213,7 +213,7 @@ static void log_child_sa(FILE *out, child_sa_t *child_sa, bool all)
config = child_sa->get_config(child_sa);
now = time_monotonic(NULL);
fprintf(out, "%12s{%d}: %N, %N%s, reqid %u",
fprintf(out, "%12s{%u}: %N, %N%s, reqid %u",
child_sa->get_name(child_sa), child_sa->get_unique_id(child_sa),
child_sa_state_names, child_sa->get_state(child_sa),
ipsec_mode_names, child_sa->get_mode(child_sa),
@@ -237,7 +237,7 @@ static void log_child_sa(FILE *out, child_sa_t *child_sa, bool all)
if (all)
{
fprintf(out, "\n%12s{%d}: ", child_sa->get_name(child_sa),
fprintf(out, "\n%12s{%u}: ", child_sa->get_name(child_sa),
child_sa->get_unique_id(child_sa));
proposal = child_sa->get_proposal(child_sa);
@@ -329,7 +329,7 @@ static void log_child_sa(FILE *out, child_sa_t *child_sa, bool all)
child_sa->create_ts_enumerator(child_sa, TRUE));
other_ts = linked_list_create_from_enumerator(
child_sa->create_ts_enumerator(child_sa, FALSE));
fprintf(out, "\n%12s{%d}: %#R === %#R\n",
fprintf(out, "\n%12s{%u}: %#R === %#R\n",
child_sa->get_name(child_sa), child_sa->get_unique_id(child_sa),
my_ts, other_ts);
my_ts->destroy(my_ts);