aboutsummaryrefslogtreecommitdiffstats
path: root/src/libcharon/plugins/vici/libvici.c
diff options
context:
space:
mode:
authorMartin Willi <martin@revosec.ch>2014-10-10 11:42:28 +0200
committerMartin Willi <martin@revosec.ch>2014-10-10 11:43:43 +0200
commitef90d5ab1598cd5d81556ddb18845a7d4dc75d8c (patch)
tree4838a830bb5a1e5b9079655a768e3ee6c2f6587c /src/libcharon/plugins/vici/libvici.c
parent05db0f97e3051150a38511fdb35c9d58bb6e989b (diff)
parent7431ad0de54d25c5ac08054972896a48d75f9f70 (diff)
downloadstrongswan-ef90d5ab1598cd5d81556ddb18845a7d4dc75d8c.tar.bz2
strongswan-ef90d5ab1598cd5d81556ddb18845a7d4dc75d8c.tar.xz
Merge branch 'vici-ruby'
Adds a ruby gem for the VICI protocol, along with some documentation improvements and some minor fixes to vici and swanctl.
Diffstat (limited to 'src/libcharon/plugins/vici/libvici.c')
-rw-r--r--src/libcharon/plugins/vici/libvici.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/libcharon/plugins/vici/libvici.c b/src/libcharon/plugins/vici/libvici.c
index a2cbb3082..c0205ccb6 100644
--- a/src/libcharon/plugins/vici/libvici.c
+++ b/src/libcharon/plugins/vici/libvici.c
@@ -438,7 +438,7 @@ void vici_free_req(vici_req_t *req)
free(req);
}
-int vici_dump(vici_res_t *res, char *label, bool pretty, FILE *out)
+int vici_dump(vici_res_t *res, char *label, int pretty, FILE *out)
{
if (res->message->dump(res->message, label, pretty, out))
{
@@ -754,11 +754,14 @@ void vici_init()
library_init(NULL, "vici");
if (lib->processor->get_total_threads(lib->processor) < 4)
{
+ dbg_default_set_level(0);
lib->processor->set_threads(lib->processor, 4);
+ dbg_default_set_level(1);
}
}
void vici_deinit()
{
+ lib->processor->cancel(lib->processor);
library_deinit();
}