diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2015-02-03 17:39:03 +0000 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2015-02-03 17:39:03 +0000 |
| commit | b4c0e9b59d3985726d9a346085172394a0495ce6 (patch) | |
| tree | f03a48c2206d37299f26c87f9ecd85d394a39271 /src/plugins | |
| parent | aa8b1c618148c2ead44e1cc643e9eb23423a4843 (diff) | |
| download | rspamd-b4c0e9b59d3985726d9a346085172394a0495ce6.tar.gz rspamd-b4c0e9b59d3985726d9a346085172394a0495ce6.zip | |
Remove old crap functions from url parser code.
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/regexp.c | 2 | ||||
| -rw-r--r-- | src/plugins/surbl.c | 14 | ||||
| -rw-r--r-- | src/plugins/surbl.h | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/plugins/regexp.c b/src/plugins/regexp.c index 74ab46ab5..15eed1674 100644 --- a/src/plugins/regexp.c +++ b/src/plugins/regexp.c @@ -378,7 +378,7 @@ static gboolean tree_url_callback (gpointer key, gpointer value, void *data) { struct url_regexp_param *param = data; - struct uri *url = value; + struct rspamd_url *url = value; GError *err = NULL; if (g_regex_match_full (param->regexp, struri (url), -1, 0, 0, NULL, diff --git a/src/plugins/surbl.c b/src/plugins/surbl.c index b7a3a8337..df9227c08 100644 --- a/src/plugins/surbl.c +++ b/src/plugins/surbl.c @@ -576,7 +576,7 @@ format_surbl_request (rspamd_mempool_t * pool, GError ** err, gboolean forced, GTree *tree, - struct uri *url) + struct rspamd_url *url) { GHashTable *t; gchar *result = NULL, *dots[MAX_LEVELS], @@ -753,7 +753,7 @@ format_surbl_request (rspamd_mempool_t * pool, } static void -make_surbl_requests (struct uri *url, struct rspamd_task *task, +make_surbl_requests (struct rspamd_url *url, struct rspamd_task *task, struct suffix_item *suffix, gboolean forced, GTree *tree) { gchar *surbl_req; @@ -953,7 +953,7 @@ redirector_callback (gint fd, short what, void *arg) struri (param->url), c); r = - parse_uri (param->url, + rspamd_url_parse (param->url, rspamd_mempool_strdup (param->task->task_pool, c), param->task->task_pool); if (r == URI_ERRNO_OK || r == URI_ERRNO_NO_SLASHES || r == @@ -985,7 +985,7 @@ redirector_callback (gint fd, short what, void *arg) static void -register_redirector_call (struct uri *url, struct rspamd_task *task, +register_redirector_call (struct rspamd_url *url, struct rspamd_task *task, struct suffix_item *suffix, const gchar *rule, GTree *tree) { gint s = -1; @@ -1042,7 +1042,7 @@ surbl_tree_url_callback (gpointer key, gpointer value, void *data) { struct redirector_param *param = data; struct rspamd_task *task; - struct uri *url = value; + struct rspamd_url *url = value; gchar *red_domain; const gchar *pos; GRegex *re; @@ -1134,7 +1134,7 @@ static gboolean calculate_buflen_cb (gpointer key, gpointer value, gpointer cbdata) { struct urls_tree_cb_data *cb = cbdata; - struct uri *url = value; + struct rspamd_url *url = value; cb->len += strlen (struri (url)) + url->hostlen + sizeof (" <\"\">, ") - 1; @@ -1145,7 +1145,7 @@ static gboolean write_urls_buffer (gpointer key, gpointer value, gpointer cbdata) { struct urls_tree_cb_data *cb = cbdata; - struct uri *url = value; + struct rspamd_url *url = value; rspamd_fstring_t f; gchar *urlstr; gsize len; diff --git a/src/plugins/surbl.h b/src/plugins/surbl.h index 7701c8304..959a730de 100644 --- a/src/plugins/surbl.h +++ b/src/plugins/surbl.h @@ -46,14 +46,14 @@ struct suffix_item { }; struct dns_param { - struct uri *url; + struct rspamd_url *url; struct rspamd_task *task; gchar *host_resolve; struct suffix_item *suffix; }; struct redirector_param { - struct uri *url; + struct rspamd_url *url; struct rspamd_task *task; struct upstream *redirector; enum { |