diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2018-10-29 12:22:46 +0000 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2018-10-29 12:22:46 +0000 |
| commit | 4929e73f2baaa0dd29759a6705ac8dd1b06beb90 (patch) | |
| tree | e5ea92f88a12cb3ad667ef92eda62b643f2adcc9 /src/plugins/spf.c | |
| parent | c16f6393333532ceeb65fdc7f62efbc14a987329 (diff) | |
| download | rspamd-4929e73f2baaa0dd29759a6705ac8dd1b06beb90.tar.gz rspamd-4929e73f2baaa0dd29759a6705ac8dd1b06beb90.zip | |
[Project] Another rework for symbols cache
Diffstat (limited to 'src/plugins/spf.c')
| -rw-r--r-- | src/plugins/spf.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/plugins/spf.c b/src/plugins/spf.c index 271fd1892..eedaf6c2e 100644 --- a/src/plugins/spf.c +++ b/src/plugins/spf.c @@ -299,38 +299,38 @@ spf_module_config (struct rspamd_config *cfg) &spf_module_ctx->whitelist_ip, NULL); } - cb_id = rspamd_symbols_cache_add_symbol (cfg->cache, - spf_module_ctx->symbol_fail, - 0, - spf_symbol_callback, - NULL, - SYMBOL_TYPE_NORMAL|SYMBOL_TYPE_FINE|SYMBOL_TYPE_EMPTY, -1); - rspamd_symbols_cache_add_symbol (cfg->cache, + cb_id = rspamd_symcache_add_symbol (cfg->cache, + spf_module_ctx->symbol_fail, + 0, + spf_symbol_callback, + NULL, + SYMBOL_TYPE_NORMAL | SYMBOL_TYPE_FINE | SYMBOL_TYPE_EMPTY, -1); + rspamd_symcache_add_symbol (cfg->cache, spf_module_ctx->symbol_softfail, 0, NULL, NULL, SYMBOL_TYPE_VIRTUAL, cb_id); - rspamd_symbols_cache_add_symbol (cfg->cache, + rspamd_symcache_add_symbol (cfg->cache, spf_module_ctx->symbol_permfail, 0, NULL, NULL, SYMBOL_TYPE_VIRTUAL, cb_id); - rspamd_symbols_cache_add_symbol (cfg->cache, + rspamd_symcache_add_symbol (cfg->cache, spf_module_ctx->symbol_na, 0, NULL, NULL, SYMBOL_TYPE_VIRTUAL, cb_id); - rspamd_symbols_cache_add_symbol (cfg->cache, + rspamd_symcache_add_symbol (cfg->cache, spf_module_ctx->symbol_neutral, 0, NULL, NULL, SYMBOL_TYPE_VIRTUAL, cb_id); - rspamd_symbols_cache_add_symbol (cfg->cache, + rspamd_symcache_add_symbol (cfg->cache, spf_module_ctx->symbol_allow, 0, NULL, NULL, SYMBOL_TYPE_VIRTUAL, cb_id); - rspamd_symbols_cache_add_symbol (cfg->cache, + rspamd_symcache_add_symbol (cfg->cache, spf_module_ctx->symbol_dnsfail, 0, NULL, NULL, SYMBOL_TYPE_VIRTUAL, @@ -596,7 +596,7 @@ spf_symbol_callback (struct rspamd_task *task, if (rspamd_match_radix_map_addr (spf_module_ctx->whitelist_ip, task->from_addr) != NULL) { - rspamd_symbols_cache_finalize_item (task, item); + rspamd_symcache_finalize_item (task, item); return; } @@ -604,7 +604,7 @@ spf_symbol_callback (struct rspamd_task *task, || (!spf_module_ctx->check_local && rspamd_inet_address_is_local (task->from_addr, TRUE))) { msg_info_task ("skip SPF checks for local networks and authorized users"); - rspamd_symbols_cache_finalize_item (task, item); + rspamd_symcache_finalize_item (task, item); return; } |