diff options
author | Vsevolod Stakhov <vsevolod@rambler-co.ru> | 2009-06-02 19:32:34 +0400 |
---|---|---|
committer | Vsevolod Stakhov <vsevolod@rambler-co.ru> | 2009-06-02 19:32:34 +0400 |
commit | 7bae787900fea17ca82393886217c6287d7e8cea (patch) | |
tree | 4f358b3624d7b2ba6c86a25057d4ba7db10965ae /src/protocol.c | |
parent | 4eb2985d1ef3631fca82cbf18cc2e8d7aab9b096 (diff) | |
download | rspamd-7bae787900fea17ca82393886217c6287d7e8cea.tar.gz rspamd-7bae787900fea17ca82393886217c6287d7e8cea.zip |
* Rework url parsing algorithms
* Adopt all parts of rspamd for new url parser
* Improve url-extracter utility by avoiding cut&paste of mime parsing
* Small fixes to rspamc client
* Bump version to 0.1.3
Diffstat (limited to 'src/protocol.c')
-rw-r--r-- | src/protocol.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/protocol.c b/src/protocol.c index 2cd025287..c551bb783 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -369,10 +369,13 @@ show_url_header (struct worker_task *task) int r = 0; char outbuf[OUTBUFSIZ], c; struct uri *url; + GList *cur; f_str_t host; r = snprintf (outbuf, sizeof (outbuf), "Urls: "); - TAILQ_FOREACH (url, &task->urls, next) { + cur = task->urls; + while (cur) { + url = cur->data; host.begin = url->host; host.len = url->hostlen; /* Skip long hosts to avoid protocol coollisions */ @@ -386,7 +389,7 @@ show_url_header (struct worker_task *task) r = 0; } /* Write url host to buf */ - if (TAILQ_NEXT (url, next) != NULL) { + if (g_list_next (cur) != NULL) { c = *(host.begin + host.len); *(host.begin + host.len) = '\0'; msg_debug ("show_url_header: write url: %s", host.begin); @@ -400,6 +403,7 @@ show_url_header (struct worker_task *task) r += snprintf (outbuf + r, sizeof (outbuf) - r, "%s" CRLF, host.begin); *(host.begin + host.len) = c; } + cur = g_list_next (cur); } rspamd_dispatcher_write (task->dispatcher, outbuf, r, FALSE); } |