diff options
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/chartable.c | 2 | ||||
-rw-r--r-- | src/plugins/dkim_check.c | 10 | ||||
-rw-r--r-- | src/plugins/fuzzy_check.c | 2 | ||||
-rw-r--r-- | src/plugins/regexp.c | 6 | ||||
-rw-r--r-- | src/plugins/spf.c | 6 | ||||
-rw-r--r-- | src/plugins/surbl.c | 6 |
6 files changed, 16 insertions, 16 deletions
diff --git a/src/plugins/chartable.c b/src/plugins/chartable.c index 8e5bfac5a..bb0113a8b 100644 --- a/src/plugins/chartable.c +++ b/src/plugins/chartable.c @@ -217,7 +217,7 @@ chartable_symbol_callback (struct rspamd_task *task, void *unused) while (cur) { part = cur->data; if (!part->is_empty && check_part (part, task->cfg->raw_mode)) { - insert_result (task, chartable_module_ctx->symbol, 1, NULL); + rspamd_task_insert_result (task, chartable_module_ctx->symbol, 1, NULL); } cur = g_list_next (cur); } diff --git a/src/plugins/dkim_check.c b/src/plugins/dkim_check.c index 74168bcf0..2a5ac2203 100644 --- a/src/plugins/dkim_check.c +++ b/src/plugins/dkim_check.c @@ -308,13 +308,13 @@ dkim_module_check (struct rspamd_task *task, } if (res == DKIM_REJECT) { - insert_result (task, dkim_module_ctx->symbol_reject, score_deny, NULL); + rspamd_task_insert_result (task, dkim_module_ctx->symbol_reject, score_deny, NULL); } else if (res == DKIM_TRYAGAIN) { - insert_result (task, dkim_module_ctx->symbol_tempfail, 1, NULL); + rspamd_task_insert_result (task, dkim_module_ctx->symbol_tempfail, 1, NULL); } else if (res == DKIM_CONTINUE) { - insert_result (task, dkim_module_ctx->symbol_allow, score_allow, NULL); + rspamd_task_insert_result (task, dkim_module_ctx->symbol_allow, score_allow, NULL); } } @@ -339,13 +339,13 @@ dkim_module_key_handler (rspamd_dkim_key_t *key, /* Insert tempfail symbol */ msg_info ("cannot get key for domain %s", ctx->dns_key); if (err != NULL) { - insert_result (task, dkim_module_ctx->symbol_tempfail, 1, + rspamd_task_insert_result (task, dkim_module_ctx->symbol_tempfail, 1, g_list_prepend (NULL, rspamd_mempool_strdup (task->task_pool, err->message))); } else { - insert_result (task, dkim_module_ctx->symbol_tempfail, 1, NULL); + rspamd_task_insert_result (task, dkim_module_ctx->symbol_tempfail, 1, NULL); } } diff --git a/src/plugins/fuzzy_check.c b/src/plugins/fuzzy_check.c index 87b9b629c..0eddab3b3 100644 --- a/src/plugins/fuzzy_check.c +++ b/src/plugins/fuzzy_check.c @@ -610,7 +610,7 @@ fuzzy_io_callback (gint fd, short what, void *arg) flag, value, nval); - insert_result_single (session->task, + rspamd_task_insert_result_single (session->task, symbol, nval, g_list_prepend (NULL, diff --git a/src/plugins/regexp.c b/src/plugins/regexp.c index 228f3f08b..76a8b8af5 100644 --- a/src/plugins/regexp.c +++ b/src/plugins/regexp.c @@ -1018,7 +1018,7 @@ process_regexp_item_threaded (gpointer data, gpointer user_data) if (process_regexp_expression (ud->item->expr, ud->item->symbol, ud->task, NULL, nL)) { g_mutex_lock (workers_mtx); - insert_result (ud->task, ud->item->symbol, 1, NULL); + rspamd_task_insert_result (ud->task, ud->item->symbol, 1, NULL); g_mutex_unlock (workers_mtx); } remove_async_thread (ud->task->s); @@ -1085,14 +1085,14 @@ process_regexp_item (struct rspamd_task *task, void *user_data) /* Just call function */ if (rspamd_lua_call_expression_func (item->lua_function, task, NULL, &res) && res) { - insert_result (task, item->symbol, 1, NULL); + rspamd_task_insert_result (task, item->symbol, 1, NULL); } } else { /* Process expression */ if (process_regexp_expression (item->expr, item->symbol, task, NULL, NULL)) { - insert_result (task, item->symbol, 1, NULL); + rspamd_task_insert_result (task, item->symbol, 1, NULL); } } } diff --git a/src/plugins/spf.c b/src/plugins/spf.c index 106b5f019..11303b33a 100644 --- a/src/plugins/spf.c +++ b/src/plugins/spf.c @@ -243,7 +243,7 @@ spf_check_element (struct spf_addr *addr, struct rspamd_task *task) if (res) { switch (addr->mech) { case SPF_FAIL: - insert_result (task, + rspamd_task_insert_result (task, spf_module_ctx->symbol_fail, 1, g_list_prepend (NULL, addr->spf_string)); @@ -251,7 +251,7 @@ spf_check_element (struct spf_addr *addr, struct rspamd_task *task) break; case SPF_SOFT_FAIL: case SPF_NEUTRAL: - insert_result (task, + rspamd_task_insert_result (task, spf_module_ctx->symbol_softfail, 1, g_list_prepend (NULL, addr->spf_string)); @@ -259,7 +259,7 @@ spf_check_element (struct spf_addr *addr, struct rspamd_task *task) "(SPF): spf softfail"); break; default: - insert_result (task, + rspamd_task_insert_result (task, spf_module_ctx->symbol_allow, 1, g_list_prepend (NULL, addr->spf_string)); diff --git a/src/plugins/surbl.c b/src/plugins/surbl.c index 289c30d01..ee54cace8 100644 --- a/src/plugins/surbl.c +++ b/src/plugins/surbl.c @@ -825,7 +825,7 @@ process_dns_results (struct rspamd_task *task, (gint)ntohl (bit->bit), (gint)bit->bit & (gint)ntohl (addr)); if (((gint)bit->bit & (gint)ntohl (addr)) != 0) { - insert_result (task, bit->symbol, 1, + rspamd_task_insert_result (task, bit->symbol, 1, g_list_prepend (NULL, rspamd_mempool_strdup (task->task_pool, url))); } @@ -833,7 +833,7 @@ process_dns_results (struct rspamd_task *task, } } else { - insert_result (task, suffix->symbol, 1, + rspamd_task_insert_result (task, suffix->symbol, 1, g_list_prepend (NULL, rspamd_mempool_strdup (task->task_pool, url))); } @@ -1108,7 +1108,7 @@ surbl_tree_url_callback (gpointer key, gpointer value, void *data) g_regex_match (re, url->string, 0, NULL))) { /* If no regexp found or founded regexp matches url string register redirector's call */ if (surbl_module_ctx->redirector_symbol != NULL) { - insert_result (param->task, + rspamd_task_insert_result (param->task, surbl_module_ctx->redirector_symbol, 1, g_list_prepend (NULL, red_domain)); |