diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2020-04-14 11:35:52 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2020-04-14 11:35:52 +0100 |
| commit | b80e8b8477dd019ad9384541d499b57f5432393a (patch) | |
| tree | 6d7e2da28b6a87b6e25acb0693659b9ace19aff7 /src/libserver | |
| parent | 13724fefdc9dbc31609938c06d6c99ba47d1729d (diff) | |
| download | rspamd-b80e8b8477dd019ad9384541d499b57f5432393a.tar.gz rspamd-b80e8b8477dd019ad9384541d499b57f5432393a.zip | |
[Project] Rework some more functions to work with shadow results
Diffstat (limited to 'src/libserver')
| -rw-r--r-- | src/libserver/protocol.c | 4 | ||||
| -rw-r--r-- | src/libserver/roll_history.c | 2 | ||||
| -rw-r--r-- | src/libserver/task.c | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/libserver/protocol.c b/src/libserver/protocol.c index 35d50b909..9d1276064 100644 --- a/src/libserver/protocol.c +++ b/src/libserver/protocol.c @@ -1182,7 +1182,7 @@ rspamd_scan_result_ucl (struct rspamd_task *task, const gchar *subject; struct rspamd_passthrough_result *pr = NULL; - action = rspamd_check_action_metric (task, &pr); + action = rspamd_check_action_metric (task, &pr, NULL); is_spam = !(action->flags & RSPAMD_ACTION_HAM); if (task->cmd == CMD_CHECK) { @@ -1761,7 +1761,7 @@ end: if (metric_res != NULL) { - action = rspamd_check_action_metric (task, NULL); + action = rspamd_check_action_metric (task, NULL, NULL); /* TODO: handle custom actions in stats */ if (action->action_type == METRIC_ACTION_SOFT_REJECT && (task->flags & RSPAMD_TASK_FLAG_GREYLISTED)) { diff --git a/src/libserver/roll_history.c b/src/libserver/roll_history.c index 6add06e62..8f50de693 100644 --- a/src/libserver/roll_history.c +++ b/src/libserver/roll_history.c @@ -160,7 +160,7 @@ rspamd_roll_history_update (struct roll_history *history, } else { row->score = metric_res->score; - action = rspamd_check_action_metric (task, NULL); + action = rspamd_check_action_metric (task, NULL, NULL); row->action = action->action_type; row->required_score = rspamd_task_get_required_score (task, metric_res); cbdata.pos = row->symbols; diff --git a/src/libserver/task.c b/src/libserver/task.c index 30ba0f195..12f20f393 100644 --- a/src/libserver/task.c +++ b/src/libserver/task.c @@ -1077,7 +1077,7 @@ rspamd_task_log_metric_res (struct rspamd_task *task, khiter_t k; mres = task->result; - act = rspamd_check_action_metric (task, NULL); + act = rspamd_check_action_metric (task, NULL, NULL); if (mres != NULL) { switch (lf->type) { @@ -1876,7 +1876,7 @@ rspamd_task_timeout (EV_P_ ev_timer *w, int revents) if (task->cfg->soft_reject_on_timeout) { struct rspamd_action *action, *soft_reject; - action = rspamd_check_action_metric (task, NULL); + action = rspamd_check_action_metric (task, NULL, NULL); if (action->action_type != METRIC_ACTION_REJECT) { soft_reject = rspamd_config_get_action_by_type (task->cfg, @@ -1887,7 +1887,7 @@ rspamd_task_timeout (EV_P_ ev_timer *w, int revents) NAN, "timeout processing message", "task timeout", - 0); + 0, NULL); } } @@ -1905,7 +1905,7 @@ rspamd_task_timeout (EV_P_ ev_timer *w, int revents) if (task->cfg->soft_reject_on_timeout) { struct rspamd_action *action, *soft_reject; - action = rspamd_check_action_metric (task, NULL); + action = rspamd_check_action_metric (task, NULL, NULL); if (action->action_type != METRIC_ACTION_REJECT) { soft_reject = rspamd_config_get_action_by_type (task->cfg, @@ -1916,7 +1916,7 @@ rspamd_task_timeout (EV_P_ ev_timer *w, int revents) NAN, "timeout post-processing message", "task timeout", - 0); + 0, NULL); } } |