From: Martin Willi Date: Wed, 16 Apr 2014 10:07:14 +0000 (+0200) Subject: swanctl: Add a list-pools command to summarize pool status X-Git-Tag: 5.2.0dr3~8^2~13 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43306afe8e84b36c99c9e56580649bda99a987ba;p=thirdparty%2Fstrongswan.git swanctl: Add a list-pools command to summarize pool status --- diff --git a/src/swanctl/Makefile.am b/src/swanctl/Makefile.am index bacd65fe21..1f702e1538 100644 --- a/src/swanctl/Makefile.am +++ b/src/swanctl/Makefile.am @@ -9,6 +9,7 @@ swanctl_SOURCES = \ commands/list_pols.c \ commands/list_conns.c \ commands/list_certs.c \ + commands/list_pools.c \ commands/load_conns.c \ commands/load_creds.c \ commands/load_pools.c \ diff --git a/src/swanctl/command.h b/src/swanctl/command.h index fc6c82cd5b..a394796d15 100644 --- a/src/swanctl/command.h +++ b/src/swanctl/command.h @@ -27,7 +27,7 @@ /** * Maximum number of commands (+1). */ -#define MAX_COMMANDS 14 +#define MAX_COMMANDS 15 /** * Maximum number of options in a command (+3) diff --git a/src/swanctl/commands/list_pools.c b/src/swanctl/commands/list_pools.c new file mode 100644 index 0000000000..beff65b96b --- /dev/null +++ b/src/swanctl/commands/list_pools.c @@ -0,0 +1,96 @@ +/* + * Copyright (C) 2014 Martin Willi + * Copyright (C) 2014 revosec AG + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. See . + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + */ + +#define _GNU_SOURCE +#include +#include + +#include "command.h" + +CALLBACK(list_pool, int, + linked_list_t *list, vici_res_t *res, char *name) +{ + char pool[64], leases[32]; + + snprintf(pool, sizeof(pool), "%s:", name); + snprintf(leases, sizeof(leases), "%s / %s / %s", + vici_find_str(res, "", "%s.online", name), + vici_find_str(res, "", "%s.offline", name), + vici_find_str(res, "", "%s.size", name)); + + printf("%-20s %-30s %16s\n", + name, vici_find_str(res, "", "%s.base", name), leases); + + return 0; +} + +static int list_pools(vici_conn_t *conn) +{ + vici_req_t *req; + vici_res_t *res; + bool raw = FALSE; + char *arg; + int ret = 0; + + while (TRUE) + { + switch (command_getopt(&arg)) + { + case 'h': + return command_usage(NULL); + case 'r': + raw = TRUE; + continue; + case EOF: + break; + default: + return command_usage("invalid --list-pools option"); + } + break; + } + + req = vici_begin("get-pools"); + res = vici_submit(req, conn); + if (!res) + { + fprintf(stderr, "get-pools request failed: %s\n", strerror(errno)); + return errno; + } + if (raw) + { + vici_dump(res, "get-pools reply", stdout); + } + else + { + ret = vici_parse_cb(res, list_pool, NULL, NULL, NULL); + } + vici_free_res(res); + return ret; +} + +/** + * Register the command. + */ +static void __attribute__ ((constructor))reg() +{ + command_register((command_t) { + list_pools, 'A', "list-pools", "list loaded pool configurations", + {"[--raw]"}, + { + {"help", 'h', 0, "show usage information"}, + {"raw", 'r', 0, "dump raw response message"}, + } + }); +}