diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ipsec/_ipsec.in | 4 | ||||
| -rw-r--r-- | src/libcharon/plugins/stroke/stroke_counter.c | 2 | ||||
| -rw-r--r-- | src/libcharon/plugins/stroke/stroke_socket.c | 4 | ||||
| -rw-r--r-- | src/stroke/stroke.c | 5 | ||||
| -rw-r--r-- | src/stroke/stroke_keywords.h | 1 | ||||
| -rw-r--r-- | src/stroke/stroke_keywords.txt | 1 | ||||
| -rw-r--r-- | src/stroke/stroke_msg.h | 4 |
7 files changed, 16 insertions, 5 deletions
diff --git a/src/ipsec/_ipsec.in b/src/ipsec/_ipsec.in index 2acf5a3f6..8b6ad660d 100644 --- a/src/ipsec/_ipsec.in +++ b/src/ipsec/_ipsec.in @@ -59,7 +59,7 @@ case "$1" in echo " listalgs|listpubkeys|listcerts [--utc]" echo " listcacerts|listaacerts|listocspcerts [--utc]" echo " listacerts|listgroups|listcainfos [--utc]" - echo " listcrls|listocsp|listcards|listplugins|listall [--utc]" + echo " listcrls|listocsp|listcards|listplugins|listcounters|listall [--utc]" echo " leases [<poolname> [<address>]]" echo " rereadsecrets|rereadgroups" echo " rereadcacerts|rereadaacerts|rereadocspcerts" @@ -149,7 +149,7 @@ leases) listalgs|listpubkeys|listplugins|\ listcerts|listcacerts|listaacerts|\ listacerts|listgroups|listocspcerts|\ -listcainfos|listcrls|listocsp|listall|\ +listcainfos|listcrls|listocsp|listcounters|listall|\ rereadsecrets|rereadcacerts|rereadaacerts|\ rereadacerts|rereadocspcerts|rereadcrls|\ rereadall|purgeocsp) diff --git a/src/libcharon/plugins/stroke/stroke_counter.c b/src/libcharon/plugins/stroke/stroke_counter.c index 6e30a9f02..56eda945a 100644 --- a/src/libcharon/plugins/stroke/stroke_counter.c +++ b/src/libcharon/plugins/stroke/stroke_counter.c @@ -213,6 +213,8 @@ METHOD(stroke_counter_t, print, void, } this->lock->unlock(this->lock); + fprintf(out, "\nList of IKE counters:\n\n"); + /* but do blocking write without the lock. */ for (i = 0; i < countof(this->counter); i++) { diff --git a/src/libcharon/plugins/stroke/stroke_socket.c b/src/libcharon/plugins/stroke/stroke_socket.c index 777378ac5..14f36cde5 100644 --- a/src/libcharon/plugins/stroke/stroke_socket.c +++ b/src/libcharon/plugins/stroke/stroke_socket.c @@ -395,6 +395,10 @@ static void stroke_list(private_stroke_socket_t *this, stroke_msg_t *msg, FILE * this->ca->list(this->ca, msg, out); } this->list->list(this->list, msg, out); + if (msg->list.flags & LIST_COUNTERS) + { + this->counter->print(this->counter, out); + } } /** diff --git a/src/stroke/stroke.c b/src/stroke/stroke.c index 03890b517..5dae53ea2 100644 --- a/src/stroke/stroke.c +++ b/src/stroke/stroke.c @@ -265,6 +265,7 @@ static int list_flags[] = { LIST_OCSP, LIST_ALGS, LIST_PLUGINS, + LIST_COUNTERS, LIST_ALL }; @@ -363,7 +364,6 @@ static int user_credentials(char *name, char *user, char *pass) return send_stroke_msg(&msg); } - static int set_loglevel(char *type, u_int level) { stroke_msg_t msg; @@ -418,7 +418,7 @@ static void exit_usage(char *error) printf(" Show list of authority and attribute certificates:\n"); printf(" stroke listcacerts|listocspcerts|listaacerts|listacerts\n"); printf(" Show list of end entity certificates, ca info records and crls:\n"); - printf(" stroke listcerts|listcainfos|listcrls|listall\n"); + printf(" stroke listcerts|listcainfos|listcrls|listcounters|listall\n"); printf(" Show list of supported algorithms:\n"); printf(" stroke listalgs\n"); printf(" Reload authority and attribute certificates:\n"); @@ -552,6 +552,7 @@ int main(int argc, char *argv[]) case STROKE_LIST_OCSP: case STROKE_LIST_ALGS: case STROKE_LIST_PLUGINS: + case STROKE_LIST_COUNTERS: case STROKE_LIST_ALL: res = list(token->kw, argc > 2 && strcmp(argv[2], "--utc") == 0); break; diff --git a/src/stroke/stroke_keywords.h b/src/stroke/stroke_keywords.h index 554d071f3..0ad87b705 100644 --- a/src/stroke/stroke_keywords.h +++ b/src/stroke/stroke_keywords.h @@ -42,6 +42,7 @@ typedef enum { STROKE_LIST_OCSP, STROKE_LIST_ALGS, STROKE_LIST_PLUGINS, + STROKE_LIST_COUNTERS, STROKE_LIST_ALL, STROKE_REREAD_SECRETS, STROKE_REREAD_CACERTS, diff --git a/src/stroke/stroke_keywords.txt b/src/stroke/stroke_keywords.txt index 1d7ab8a45..95b2981d9 100644 --- a/src/stroke/stroke_keywords.txt +++ b/src/stroke/stroke_keywords.txt @@ -49,6 +49,7 @@ listcrls, STROKE_LIST_CRLS listocsp, STROKE_LIST_OCSP listalgs, STROKE_LIST_ALGS listplugins, STROKE_LIST_PLUGINS +listcounters, STROKE_LIST_COUNTERS listall, STROKE_LIST_ALL rereadsecrets, STROKE_REREAD_SECRETS rereadcacerts, STROKE_REREAD_CACERTS diff --git a/src/stroke/stroke_msg.h b/src/stroke/stroke_msg.h index 662feed69..1ce44f9eb 100644 --- a/src/stroke/stroke_msg.h +++ b/src/stroke/stroke_msg.h @@ -67,8 +67,10 @@ enum list_flag_t { LIST_ALGS = 0x0400, /** list plugin information */ LIST_PLUGINS = 0x0800, + /** list IKE counters */ + LIST_COUNTERS = 0x1000, /** all list options */ - LIST_ALL = 0x0FFF, + LIST_ALL = 0x1FFF, }; typedef enum reread_flag_t reread_flag_t; |