diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2015-10-19 16:05:47 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2015-11-10 10:43:24 +0100 |
| commit | bdb8b76515df7dc86955a06581239596f60194d2 (patch) | |
| tree | ee38c2154a8f0c388f176d3fcddac09a8c315ccb /src/libcharon/plugins/vici/vici_query.c | |
| parent | 0ddec0760aafdc96fd6b7c2e8c6420c318ebfa60 (diff) | |
| download | strongswan-bdb8b76515df7dc86955a06581239596f60194d2.tar.bz2 strongswan-bdb8b76515df7dc86955a06581239596f60194d2.tar.xz | |
vici: Return local and remote virtual IPs when listing SAs
Diffstat (limited to 'src/libcharon/plugins/vici/vici_query.c')
| -rw-r--r-- | src/libcharon/plugins/vici/vici_query.c | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/src/libcharon/plugins/vici/vici_query.c b/src/libcharon/plugins/vici/vici_query.c index 265a17e52..9a3d832da 100644 --- a/src/libcharon/plugins/vici/vici_query.c +++ b/src/libcharon/plugins/vici/vici_query.c @@ -234,6 +234,33 @@ static void add_condition(vici_builder_t *b, ike_sa_t *ike_sa, } /** + * List virtual IPs + */ +static void list_vips(private_vici_query_t *this, vici_builder_t *b, + ike_sa_t *ike_sa, bool local, char *name) +{ + enumerator_t *enumerator; + bool has = FALSE; + host_t *vip; + + enumerator = ike_sa->create_virtual_ip_enumerator(ike_sa, local); + while (enumerator->enumerate(enumerator, &vip)) + { + if (!has) + { + b->begin_list(b, name); + has = TRUE; + } + b->add_li(b, "%H", vip); + } + enumerator->destroy(enumerator); + if (has) + { + b->end_list(b); + } +} + +/** * List details of an IKE_SA */ static void list_ike(private_vici_query_t *this, vici_builder_t *b, @@ -327,6 +354,9 @@ static void list_ike(private_vici_query_t *this, vici_builder_t *b, } } + list_vips(this, b, ike_sa, TRUE, "local-vips"); + list_vips(this, b, ike_sa, FALSE, "remote-vips"); + list_task_queue(this, b, ike_sa, TASK_QUEUE_QUEUED, "tasks-queued"); list_task_queue(this, b, ike_sa, TASK_QUEUE_ACTIVE, "tasks-active"); list_task_queue(this, b, ike_sa, TASK_QUEUE_PASSIVE, "tasks-passive"); |