diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2016-06-25 13:40:00 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2016-06-25 13:40:00 +0100 |
| commit | 9919068fcd7e999502ec62cc1fd2b794e5ced55b (patch) | |
| tree | 4dc488bf5d33a94632e958753ed1da7f97b8b809 /src/plugins | |
| parent | f0448d158b9858294a5cd54d3b2fab15193f1485 (diff) | |
| download | rspamd-9919068fcd7e999502ec62cc1fd2b794e5ced55b.tar.gz rspamd-9919068fcd7e999502ec62cc1fd2b794e5ced55b.zip | |
[Feature] Use new ip parsing API
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/dkim_check.c | 14 | ||||
| -rw-r--r-- | src/plugins/fuzzy_check.c | 18 | ||||
| -rw-r--r-- | src/plugins/spf.c | 15 |
3 files changed, 6 insertions, 41 deletions
diff --git a/src/plugins/dkim_check.c b/src/plugins/dkim_check.c index 3ea31485f..a7e09aa53 100644 --- a/src/plugins/dkim_check.c +++ b/src/plugins/dkim_check.c @@ -220,7 +220,6 @@ gint dkim_module_config (struct rspamd_config *cfg) { const ucl_object_t *value; - const gchar *str; gint res = TRUE, cb_id; guint cache_size; gboolean got_trusted = FALSE; @@ -272,17 +271,8 @@ dkim_module_config (struct rspamd_config *cfg) if ((value = rspamd_config_get_module_opt (cfg, "dkim", "whitelist")) != NULL) { - str = ucl_obj_tostring (value); - if (str && !rspamd_map_is_map (str)) { - radix_add_generic_iplist (str, - &dkim_module_ctx->whitelist_ip); - } - else { - rspamd_map_add_from_ucl (cfg, value, - "DKIM whitelist", rspamd_radix_read, rspamd_radix_fin, - (void **)&dkim_module_ctx->whitelist_ip); - - } + rspamd_config_radix_from_ucl (cfg, value, "DKIM whitelist", + &dkim_module_ctx->whitelist_ip, NULL); } if ((value = rspamd_config_get_module_opt (cfg, "dkim", "domains")) != NULL) { diff --git a/src/plugins/fuzzy_check.c b/src/plugins/fuzzy_check.c index 595df53fc..caf894bf3 100644 --- a/src/plugins/fuzzy_check.c +++ b/src/plugins/fuzzy_check.c @@ -828,7 +828,6 @@ fuzzy_check_module_config (struct rspamd_config *cfg) const ucl_object_t *value, *cur, *elt; ucl_object_iter_t it; gint res = TRUE, cb_id, nrules = 0; - const gchar *str; if (!rspamd_config_is_module_enabled (cfg, "fuzzy_check")) { return TRUE; @@ -895,21 +894,8 @@ fuzzy_check_module_config (struct rspamd_config *cfg) if ((value = rspamd_config_get_module_opt (cfg, "fuzzy_check", "whitelist")) != NULL) { - fuzzy_module_ctx->whitelist = radix_create_compressed (); - ucl_obj_tostring (value); - - str = ucl_obj_tostring (value); - - if (str && !rspamd_map_is_map (str)) { - radix_add_generic_iplist (str, - &fuzzy_module_ctx->whitelist); - } - else { - rspamd_map_add_from_ucl (cfg, value, - "Fuzzy whitelist", rspamd_radix_read, rspamd_radix_fin, - (void **)&fuzzy_module_ctx->whitelist); - - } + rspamd_config_radix_from_ucl (cfg, value, "Fuzzy whitelist", + &fuzzy_module_ctx->whitelist, NULL); } else { fuzzy_module_ctx->whitelist = NULL; diff --git a/src/plugins/spf.c b/src/plugins/spf.c index 67c8732e7..ec7540895 100644 --- a/src/plugins/spf.c +++ b/src/plugins/spf.c @@ -164,7 +164,6 @@ spf_module_config (struct rspamd_config *cfg) const ucl_object_t *value; gint res = TRUE, cb_id; guint cache_size; - const gchar *str; if (!rspamd_config_is_module_enabled (cfg, "spf")) { return TRUE; @@ -211,18 +210,8 @@ spf_module_config (struct rspamd_config *cfg) if ((value = rspamd_config_get_module_opt (cfg, "spf", "whitelist")) != NULL) { - str = ucl_obj_tostring (value); - - if (str && !rspamd_map_is_map (str)) { - radix_add_generic_iplist (str, - &spf_module_ctx->whitelist_ip); - } - else { - rspamd_map_add_from_ucl (cfg, value, - "SPF whitelist", rspamd_radix_read, rspamd_radix_fin, - (void **)&spf_module_ctx->whitelist_ip); - - } + rspamd_config_radix_from_ucl (cfg, value, "SPF whitelist", + &spf_module_ctx->whitelist_ip, NULL); } cb_id = rspamd_symbols_cache_add_symbol (cfg->cache, |