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

stroke: List CHILD_SA unique ID as the primary identifier, but print reqid, too

Browse Source
This commit is contained in:
Martin Willi
2015-02-20 13:34:50 +01:00
parent adc1885bf7
commit 53cf7fa60a
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/stroke/stroke_list.c
+6 -5
View File
@@ -214,11 +214,12 @@ static void log_child_sa(FILE *out, child_sa_t *child_sa, bool all)
config = child_sa->get_config(child_sa); config = child_sa->get_config(child_sa);
now = time_monotonic(NULL); now = time_monotonic(NULL);
fprintf(out, "%12s{%d}: %N, %N%s", fprintf(out, "%12s{%d}: %N, %N%s, reqid %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),
child_sa_state_names, child_sa->get_state(child_sa), child_sa_state_names, child_sa->get_state(child_sa),
ipsec_mode_names, child_sa->get_mode(child_sa), ipsec_mode_names, child_sa->get_mode(child_sa),
config->use_proxy_mode(config) ? "_PROXY" : ""); config->use_proxy_mode(config) ? "_PROXY" : "",
child_sa->get_reqid(child_sa));
if (child_sa->get_state(child_sa) == CHILD_INSTALLED) if (child_sa->get_state(child_sa) == CHILD_INSTALLED)
{ {
@@ -238,7 +239,7 @@ static void log_child_sa(FILE *out, child_sa_t *child_sa, bool all)
if (all) if (all)
{ {
fprintf(out, "\n%12s{%d}: ", child_sa->get_name(child_sa), fprintf(out, "\n%12s{%d}: ", child_sa->get_name(child_sa),
child_sa->get_reqid(child_sa)); child_sa->get_unique_id(child_sa));
proposal = child_sa->get_proposal(child_sa); proposal = child_sa->get_proposal(child_sa);
if (proposal) if (proposal)
@@ -333,7 +334,7 @@ static void log_child_sa(FILE *out, child_sa_t *child_sa, bool all)
other_ts = linked_list_create_from_enumerator( other_ts = linked_list_create_from_enumerator(
child_sa->create_ts_enumerator(child_sa, FALSE)); child_sa->create_ts_enumerator(child_sa, FALSE));
fprintf(out, "\n%12s{%d}: %#R=== %#R\n", fprintf(out, "\n%12s{%d}: %#R=== %#R\n",
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),
my_ts, other_ts); my_ts, other_ts);
my_ts->destroy(my_ts); my_ts->destroy(my_ts);
other_ts->destroy(other_ts); other_ts->destroy(other_ts);