swanctl: Add a load-pools command to (re-)load pool configurations from file
This commit is contained in:
Martin Willi
parent
4ee33b44df
commit
a77acc183a
|
|
@ -11,6 +11,7 @@ swanctl_SOURCES = \
|
|||
commands/list_certs.c \
|
||||
commands/load_conns.c \
|
||||
commands/load_creds.c \
|
||||
commands/load_pools.c \
|
||||
commands/log.c \
|
||||
commands/version.c \
|
||||
swanctl.c swanctl.h
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
/**
|
||||
* Maximum number of commands (+1).
|
||||
*/
|
||||
#define MAX_COMMANDS 13
|
||||
#define MAX_COMMANDS 14
|
||||
|
||||
/**
|
||||
* Maximum number of options in a command (+3)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,283 @@
|
|||
/*
|
||||
* 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 <http://www.fsf.org/copyleft/gpl.txt>.
|
||||
*
|
||||
* 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 <stdio.h>
|
||||
#include <errno.h>
|
||||
#include <limits.h>
|
||||
|
||||
#include "command.h"
|
||||
#include "swanctl.h"
|
||||
|
||||
/**
|
||||
* Add a vici list from a comma separated string value
|
||||
*/
|
||||
static void add_list_key(vici_req_t *req, char *key, char *value)
|
||||
{
|
||||
enumerator_t *enumerator;
|
||||
char *token;
|
||||
|
||||
vici_begin_list(req, key);
|
||||
enumerator = enumerator_create_token(value, ",", " ");
|
||||
while (enumerator->enumerate(enumerator, &token))
|
||||
{
|
||||
vici_add_list_itemf(req, "%s", token);
|
||||
}
|
||||
enumerator->destroy(enumerator);
|
||||
vici_end_list(req);
|
||||
}
|
||||
|
||||
/**
|
||||
* Translate setting key/values from a section into vici key-values/lists
|
||||
*/
|
||||
static void add_key_values(vici_req_t *req, settings_t *cfg, char *section)
|
||||
{
|
||||
enumerator_t *enumerator;
|
||||
char *key, *value;
|
||||
|
||||
enumerator = cfg->create_key_value_enumerator(cfg, section);
|
||||
while (enumerator->enumerate(enumerator, &key, &value))
|
||||
{
|
||||
/* pool subnet is encoded as key/value, all other attributes as list */
|
||||
if (streq(key, "addrs"))
|
||||
{
|
||||
vici_add_key_valuef(req, key, "%s", value);
|
||||
}
|
||||
else
|
||||
{
|
||||
add_list_key(req, key, value);
|
||||
}
|
||||
}
|
||||
enumerator->destroy(enumerator);
|
||||
}
|
||||
|
||||
/**
|
||||
* Load a pool configuration
|
||||
*/
|
||||
static bool load_pool(vici_conn_t *conn, settings_t *cfg,
|
||||
char *section, bool raw)
|
||||
{
|
||||
vici_req_t *req;
|
||||
vici_res_t *res;
|
||||
bool ret = TRUE;
|
||||
char buf[128];
|
||||
|
||||
snprintf(buf, sizeof(buf), "%s.%s", "pools", section);
|
||||
|
||||
req = vici_begin("load-pool");
|
||||
|
||||
vici_begin_section(req, section);
|
||||
add_key_values(req, cfg, buf);
|
||||
vici_end_section(req);
|
||||
|
||||
res = vici_submit(req, conn);
|
||||
if (!res)
|
||||
{
|
||||
fprintf(stderr, "load-pool request failed: %s\n", strerror(errno));
|
||||
return FALSE;
|
||||
}
|
||||
if (raw)
|
||||
{
|
||||
vici_dump(res, "load-pool reply", stdout);
|
||||
}
|
||||
else if (!streq(vici_find_str(res, "no", "success"), "yes"))
|
||||
{
|
||||
fprintf(stderr, "loading pool '%s' failed: %s\n",
|
||||
section, vici_find_str(res, "", "errmsg"));
|
||||
ret = FALSE;
|
||||
}
|
||||
else
|
||||
{
|
||||
printf("loaded pool '%s'\n", section);
|
||||
}
|
||||
vici_free_res(res);
|
||||
return ret;
|
||||
}
|
||||
|
||||
CALLBACK(list_pool, int,
|
||||
linked_list_t *list, vici_res_t *res, char *name)
|
||||
{
|
||||
list->insert_last(list, strdup(name));
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a list of currently loaded pools
|
||||
*/
|
||||
static linked_list_t* list_pools(vici_conn_t *conn, bool raw)
|
||||
{
|
||||
linked_list_t *list;
|
||||
vici_res_t *res;
|
||||
|
||||
list = linked_list_create();
|
||||
|
||||
res = vici_submit(vici_begin("get-pools"), conn);
|
||||
if (res)
|
||||
{
|
||||
if (raw)
|
||||
{
|
||||
vici_dump(res, "get-pools reply", stdout);
|
||||
}
|
||||
vici_parse_cb(res, list_pool, NULL, NULL, list);
|
||||
vici_free_res(res);
|
||||
}
|
||||
return list;
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove and free a string from a list
|
||||
*/
|
||||
static void remove_from_list(linked_list_t *list, char *str)
|
||||
{
|
||||
enumerator_t *enumerator;
|
||||
char *current;
|
||||
|
||||
enumerator = list->create_enumerator(list);
|
||||
while (enumerator->enumerate(enumerator, ¤t))
|
||||
{
|
||||
if (streq(current, str))
|
||||
{
|
||||
list->remove_at(list, enumerator);
|
||||
free(current);
|
||||
}
|
||||
}
|
||||
enumerator->destroy(enumerator);
|
||||
}
|
||||
|
||||
/**
|
||||
* Unload a pool by name
|
||||
*/
|
||||
static bool unload_pool(vici_conn_t *conn, char *name, bool raw)
|
||||
{
|
||||
vici_req_t *req;
|
||||
vici_res_t *res;
|
||||
bool ret = TRUE;
|
||||
|
||||
req = vici_begin("unload-pool");
|
||||
vici_add_key_valuef(req, "name", "%s", name);
|
||||
res = vici_submit(req, conn);
|
||||
if (!res)
|
||||
{
|
||||
fprintf(stderr, "unload-pool request failed: %s\n", strerror(errno));
|
||||
return FALSE;
|
||||
}
|
||||
if (raw)
|
||||
{
|
||||
vici_dump(res, "unload-pool reply", stdout);
|
||||
}
|
||||
else if (!streq(vici_find_str(res, "no", "success"), "yes"))
|
||||
{
|
||||
fprintf(stderr, "unloading pool '%s' failed: %s\n",
|
||||
name, vici_find_str(res, "", "errmsg"));
|
||||
ret = FALSE;
|
||||
}
|
||||
vici_free_res(res);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int load_pools(vici_conn_t *conn)
|
||||
{
|
||||
bool raw = FALSE;
|
||||
u_int found = 0, loaded = 0, unloaded = 0;
|
||||
char *arg, *section;
|
||||
enumerator_t *enumerator;
|
||||
linked_list_t *pools;
|
||||
settings_t *cfg;
|
||||
|
||||
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 --load-pools option");
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
cfg = settings_create(SWANCTL_CONF);
|
||||
if (!cfg)
|
||||
{
|
||||
fprintf(stderr, "parsing '%s' failed\n", SWANCTL_CONF);
|
||||
return EINVAL;
|
||||
}
|
||||
|
||||
pools = list_pools(conn, raw);
|
||||
|
||||
enumerator = cfg->create_section_enumerator(cfg, "pools");
|
||||
while (enumerator->enumerate(enumerator, §ion))
|
||||
{
|
||||
remove_from_list(pools, section);
|
||||
found++;
|
||||
if (load_pool(conn, cfg, section, raw))
|
||||
{
|
||||
loaded++;
|
||||
}
|
||||
}
|
||||
enumerator->destroy(enumerator);
|
||||
|
||||
cfg->destroy(cfg);
|
||||
|
||||
/* unload all pools in daemon, but not in file */
|
||||
while (pools->remove_first(pools, (void**)§ion) == SUCCESS)
|
||||
{
|
||||
if (unload_pool(conn, section, raw))
|
||||
{
|
||||
unloaded++;
|
||||
}
|
||||
free(section);
|
||||
}
|
||||
pools->destroy(pools);
|
||||
|
||||
if (raw)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
if (found == 0)
|
||||
{
|
||||
printf("no pools found, %u unloaded\n", unloaded);
|
||||
return 0;
|
||||
}
|
||||
if (loaded == found)
|
||||
{
|
||||
printf("successfully loaded %u pools, %u unloaded\n",
|
||||
loaded, unloaded);
|
||||
return 0;
|
||||
}
|
||||
fprintf(stderr, "loaded %u of %u pools, %u failed to load, "
|
||||
"%u unloaded\n", loaded, found, found - loaded, unloaded);
|
||||
return EINVAL;
|
||||
}
|
||||
|
||||
/**
|
||||
* Register the command.
|
||||
*/
|
||||
static void __attribute__ ((constructor))reg()
|
||||
{
|
||||
command_register((command_t) {
|
||||
load_pools, 'a', "load-pools", "(re-)load pool configuration",
|
||||
{"[--raw]"},
|
||||
{
|
||||
{"help", 'h', 0, "show usage information"},
|
||||
{"raw", 'r', 0, "dump raw response message"},
|
||||
}
|
||||
});
|
||||
}
|
||||
Loading…
Reference in New Issue