diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2015-04-29 15:43:27 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2015-04-29 15:43:27 +0100 |
| commit | 2aabcddd7434e73bff07170ce5260201d348005d (patch) | |
| tree | 55fc32fe9141f53a7116dbc13e8bf4cd29054ec0 | |
| parent | 9803c45058f5e7671a6686249c31ba32228df5a0 (diff) | |
| download | rspamd-2aabcddd7434e73bff07170ce5260201d348005d.tar.gz rspamd-2aabcddd7434e73bff07170ce5260201d348005d.zip | |
Store mime objects inside part structures.
| -rw-r--r-- | src/libmime/message.c | 13 | ||||
| -rw-r--r-- | src/libmime/message.h | 2 |
2 files changed, 11 insertions, 4 deletions
diff --git a/src/libmime/message.c b/src/libmime/message.c index c7b01a7a0..e6f0d0a2b 100644 --- a/src/libmime/message.c +++ b/src/libmime/message.c @@ -1234,7 +1234,7 @@ static void process_text_part (struct rspamd_task *task, GByteArray *part_content, GMimeContentType *type, - GMimeObject *part, + struct mime_part *mime_part, GMimeObject *parent, gboolean is_empty) { @@ -1244,7 +1244,7 @@ process_text_part (struct rspamd_task *task, /* Skip attachements */ #ifndef GMIME24 - cd = g_mime_part_get_content_disposition (GMIME_PART (part)); + cd = g_mime_part_get_content_disposition (GMIME_PART (mime_part->mime)); if (cd && g_ascii_strcasecmp (cd, "attachment") == 0 && !task->cfg->check_text_attachements) { @@ -1252,7 +1252,7 @@ process_text_part (struct rspamd_task *task, return; } #else - cd = g_mime_object_get_disposition (GMIME_OBJECT (part)); + cd = g_mime_object_get_disposition (GMIME_OBJECT (mime_part->mime)); if (cd && g_ascii_strcasecmp (cd, GMIME_DISPOSITION_ATTACHMENT) == 0 && @@ -1283,6 +1283,7 @@ process_text_part (struct rspamd_task *task, text_part); text_part->html_nodes = NULL; text_part->parent = parent; + text_part->mime_part = mime_part; text_part->flags |= RSPAMD_MIME_PART_FLAG_BALANCED; text_part->content = strip_html_tags (task, @@ -1309,6 +1310,8 @@ process_text_part (struct rspamd_task *task, rspamd_mempool_alloc0 (task->task_pool, sizeof (struct mime_text_part)); text_part->parent = parent; + text_part->mime_part = mime_part; + if (is_empty) { text_part->flags |= RSPAMD_MIME_PART_FLAG_EMPTY; text_part->orig = NULL; @@ -1316,6 +1319,7 @@ process_text_part (struct rspamd_task *task, task->text_parts = g_list_prepend (task->text_parts, text_part); return; } + text_part->content = convert_text_to_utf (task, part_content, type, @@ -1484,6 +1488,7 @@ mime_foreach_callback (GMimeObject * part, gpointer user_data) mime_part->parent = task->parser_parent_part; mime_part->filename = g_mime_part_get_filename (GMIME_PART ( part)); + mime_part->mime = part; debug_task ("found part with content-type: %s/%s", type->type, @@ -1493,7 +1498,7 @@ mime_foreach_callback (GMimeObject * part, gpointer user_data) process_text_part (task, part_content, type, - part, + mime_part, task->parser_parent_part, (part_content->len <= 0)); } diff --git a/src/libmime/message.h b/src/libmime/message.h index c751fc226..90a6f7844 100644 --- a/src/libmime/message.h +++ b/src/libmime/message.h @@ -16,6 +16,7 @@ struct mime_part { GMimeContentType *type; GByteArray *content; GMimeObject *parent; + GMimeObject *mime; GHashTable *raw_headers; gchar *checksum; const gchar *filename; @@ -44,6 +45,7 @@ struct mime_text_part { rspamd_fuzzy_t *fuzzy; rspamd_fuzzy_t *double_fuzzy; GMimeObject *parent; + struct mime_part *mime_part; rspamd_fstring_t *diff_str; GArray *words; GArray *normalized_words; |