diff --git a/src/libcharon/plugins/vici/vici_control.c b/src/libcharon/plugins/vici/vici_control.c index f74f1d8c1..c4a74000b 100644 --- a/src/libcharon/plugins/vici/vici_control.c +++ b/src/libcharon/plugins/vici/vici_control.c @@ -176,6 +176,9 @@ CALLBACK(initiate, vici_message_t*, { return send_reply(this, "missing configuration name"); } + + DBG1(DBG_CFG, "vici initiate '%s'", child); + child_cfg = find_child_cfg(child, &peer_cfg); if (!child_cfg) { @@ -222,6 +225,23 @@ CALLBACK(terminate, vici_message_t*, return send_reply(this, "missing terminate selector"); } + if (ike_id) + { + DBG1(DBG_CFG, "vici terminate IKE_SA #%d", ike_id); + } + if (child_id) + { + DBG1(DBG_CFG, "vici terminate CHILD_SA #%d", child_id); + } + if (ike) + { + DBG1(DBG_CFG, "vici terminate IKE_SA '%s'", ike); + } + if (child) + { + DBG1(DBG_CFG, "vici terminate CHILD_SA '%s'", child); + } + ids = array_create(sizeof(u_int), 0); isas = charon->controller->create_ike_sa_enumerator(charon->controller, TRUE); @@ -359,6 +379,9 @@ CALLBACK(install, vici_message_t*, { return send_reply(this, "missing configuration name"); } + + DBG1(DBG_CFG, "vici install '%s'", child); + child_cfg = find_child_cfg(child, &peer_cfg); if (!child_cfg) { @@ -394,6 +417,9 @@ CALLBACK(uninstall, vici_message_t*, { return send_reply(this, "missing configuration name"); } + + DBG1(DBG_CFG, "vici uninstall '%s'", child); + if (charon->shunts->uninstall(charon->shunts, child)) { return send_reply(this, NULL); diff --git a/src/libcharon/plugins/vici/vici_dispatcher.c b/src/libcharon/plugins/vici/vici_dispatcher.c index 4245898cb..4fd8028a6 100644 --- a/src/libcharon/plugins/vici/vici_dispatcher.c +++ b/src/libcharon/plugins/vici/vici_dispatcher.c @@ -138,7 +138,7 @@ static void register_event(private_vici_dispatcher_t *this, char *name, if (event) { - DBG1(DBG_CFG, "vici client %u registered for: %s", id, name); + DBG2(DBG_CFG, "vici client %u registered for: %s", id, name); send_op(this, id, VICI_EVENT_CONFIRM, NULL, NULL); } else @@ -177,7 +177,7 @@ static void unregister_event(private_vici_dispatcher_t *this, char *name, } this->mutex->unlock(this->mutex); - DBG1(DBG_CFG, "vici client %u unregistered for: %s", id, name); + DBG2(DBG_CFG, "vici client %u unregistered for: %s", id, name); if (found) { @@ -241,7 +241,7 @@ void process_request(private_vici_dispatcher_t *this, char *name, u_int id, .cmd = cmd, ); - DBG1(DBG_CFG, "vici client %u requests: %s", id, name); + DBG2(DBG_CFG, "vici client %u requests: %s", id, name); thread_cleanup_push(release_command, release); @@ -330,7 +330,7 @@ CALLBACK(inbound, void, CALLBACK(connect_, void, private_vici_dispatcher_t *this, u_int id) { - DBG1(DBG_CFG, "vici client %u connected", id); + DBG2(DBG_CFG, "vici client %u connected", id); } CALLBACK(disconnect, void, @@ -358,7 +358,7 @@ CALLBACK(disconnect, void, events->destroy(events); this->mutex->unlock(this->mutex); - DBG1(DBG_CFG, "vici client %u disconnected", id); + DBG2(DBG_CFG, "vici client %u disconnected", id); } METHOD(vici_dispatcher_t, manage_command, void,