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

controller: Add parameter for maximum log level to initiate/terminate_*()

Browse Source 
Previously, the logger installed by the controller always announced
LEVEL_PRIVATE(4), which produced completely useless logging calls with
the common clients (vici/stroke) whose default log level is LEVEL_CTRL(1).
This can produce quite some overhead if there are e.g. a lot of concurrent
initiate() calls.
This commit is contained in:
Tobias Brunner
2023-04-27 13:52:34 +02:00
parent 77b9f3abb0
commit d96d15b588
18 changed files with 60 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/stroke/stroke_control.c
+8 -7
View File
@@ -109,7 +109,7 @@ static void charon_initiate(private_stroke_control_t *this, peer_cfg_t *peer_cfg
if (msg->output_verbosity < 0)
{
charon->controller->initiate(charon->controller, peer_cfg, child_cfg,
NULL, NULL, 0, FALSE);
NULL, NULL, 0, 0, FALSE);
}
else
{
@@ -118,7 +118,7 @@ static void charon_initiate(private_stroke_control_t *this, peer_cfg_t *peer_cfg
status = charon->controller->initiate(charon->controller,
peer_cfg, child_cfg, (controller_cb_t)stroke_log,
&info, this->timeout, FALSE);
&info, msg->output_verbosity, this->timeout, FALSE);
switch (status)
{
case SUCCESS:
@@ -312,25 +312,26 @@ static void charon_terminate(private_stroke_control_t *this, uint32_t id,
if (child)
{
status = charon->controller->terminate_child(charon->controller, id,
(controller_cb_t)stroke_log, &info, this->timeout);
(controller_cb_t)stroke_log, &info,
msg->output_verbosity, this->timeout);
}
else
{
status = charon->controller->terminate_ike(charon->controller, id,
FALSE, (controller_cb_t)stroke_log, &info,
this->timeout);
FALSE, (controller_cb_t)stroke_log, &info,
msg->output_verbosity, this->timeout);
}
report_terminate_status(this, status, out, id, child);
}
else if (child)
{
charon->controller->terminate_child(charon->controller, id,
NULL, NULL, 0);
NULL, NULL, 0, 0);
}
else
{
charon->controller->terminate_ike(charon->controller, id, FALSE,
NULL, NULL, 0);
NULL, NULL, 0, 0);
}
}