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

vici: Return number of matching and closed SAs in terminate command

Browse Source
This commit is contained in:
Martin Willi
2014-05-07 14:13:38 +02:00
parent 021a14b7a4
commit bc006ac1f4
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/vici/vici_control.c
+12 -9
View File
@@ -202,12 +202,12 @@ CALLBACK(terminate, vici_message_t*,
private_vici_control_t *this, char *name, u_int id, vici_message_t *request) private_vici_control_t *this, char *name, u_int id, vici_message_t *request)
{ {
enumerator_t *enumerator, *isas, *csas; enumerator_t *enumerator, *isas, *csas;
char *child, *ike; char *child, *ike, *errmsg = NULL;
u_int timeout, child_id, ike_id, current, *del, done = 0; u_int timeout, child_id, ike_id, current, *del, done = 0;
ike_sa_t *ike_sa; ike_sa_t *ike_sa;
child_sa_t *child_sa; child_sa_t *child_sa;
array_t *ids; array_t *ids;
vici_message_t *reply; vici_builder_t *builder;
log_info_t log = { log_info_t log = {
.dispatcher = this->dispatcher, .dispatcher = this->dispatcher,
.id = id, .id = id,
@@ -307,28 +307,31 @@ CALLBACK(terminate, vici_message_t*,
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
builder = vici_builder_create();
if (array_count(ids) == 0) if (array_count(ids) == 0)
{ {
reply = send_reply(this, "no matching SAs to terminate found"); errmsg = "no matching SAs to terminate found";
} }
else if (done < array_count(ids)) else if (done < array_count(ids))
{ {
if (array_count(ids) == 1) if (array_count(ids) == 1)
{ {
reply = send_reply(this, "terminating SA failed"); errmsg = "terminating SA failed";
} }
else else
{ {
reply = send_reply(this, "terminated %u of %u SAs", errmsg = "not all matching SAs could be terminated";
done, array_count(ids));
} }
} }
else builder->add_kv(builder, "success", errmsg ? "no" : "yes");
builder->add_kv(builder, "matches", "%u", array_count(ids));
builder->add_kv(builder, "terminated", "%u", done);
if (errmsg)
{ {
reply = send_reply(this, NULL); builder->add_kv(builder, "errmsg", "%s", errmsg);
} }
array_destroy(ids); array_destroy(ids);
return reply; return builder->finalize(builder);
} }
/** /**