denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vici: Be less verbose about client connections

Browse Source 
Instead, log the explicit commands at a higher level.
This commit is contained in:
Martin Willi
2014-05-07 14:13:37 +02:00
parent 101dba01ce
commit 2676ffdb9f
2 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/vici/vici_control.c
+26
View File
@@ -176,6 +176,9 @@ CALLBACK(initiate, vici_message_t*,
{ {
return send_reply(this, "missing configuration name"); return send_reply(this, "missing configuration name");
} }
DBG1(DBG_CFG, "vici initiate '%s'", child);
child_cfg = find_child_cfg(child, &peer_cfg); child_cfg = find_child_cfg(child, &peer_cfg);
if (!child_cfg) if (!child_cfg)
{ {
@@ -222,6 +225,23 @@ CALLBACK(terminate, vici_message_t*,
return send_reply(this, "missing terminate selector"); 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); ids = array_create(sizeof(u_int), 0);
isas = charon->controller->create_ike_sa_enumerator(charon->controller, TRUE); 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"); return send_reply(this, "missing configuration name");
} }
DBG1(DBG_CFG, "vici install '%s'", child);
child_cfg = find_child_cfg(child, &peer_cfg); child_cfg = find_child_cfg(child, &peer_cfg);
if (!child_cfg) if (!child_cfg)
{ {
@@ -394,6 +417,9 @@ CALLBACK(uninstall, vici_message_t*,
{ {
return send_reply(this, "missing configuration name"); return send_reply(this, "missing configuration name");
} }
DBG1(DBG_CFG, "vici uninstall '%s'", child);
if (charon->shunts->uninstall(charon->shunts, child)) if (charon->shunts->uninstall(charon->shunts, child))
{ {
return send_reply(this, NULL); return send_reply(this, NULL);
src/libcharon/plugins/vici/vici_dispatcher.c
+5 -5
View File
@@ -138,7 +138,7 @@ static void register_event(private_vici_dispatcher_t *this, char *name,
if (event) 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); send_op(this, id, VICI_EVENT_CONFIRM, NULL, NULL);
} }
else else
@@ -177,7 +177,7 @@ static void unregister_event(private_vici_dispatcher_t *this, char *name,
} }
this->mutex->unlock(this->mutex); 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) if (found)
{ {
@@ -241,7 +241,7 @@ void process_request(private_vici_dispatcher_t *this, char *name, u_int id,
.cmd = cmd, .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); thread_cleanup_push(release_command, release);
@@ -330,7 +330,7 @@ CALLBACK(inbound, void,
CALLBACK(connect_, void, CALLBACK(connect_, void,
private_vici_dispatcher_t *this, u_int id) 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, CALLBACK(disconnect, void,
@@ -358,7 +358,7 @@ CALLBACK(disconnect, void,
events->destroy(events); events->destroy(events);
this->mutex->unlock(this->mutex); 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, METHOD(vici_dispatcher_t, manage_command, void,