diff options
author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2019-07-10 15:01:41 +0100 |
---|---|---|
committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2019-07-12 15:18:17 +0100 |
commit | 9aa104f6a709198527538c6553a0a96db1ecc5e9 (patch) | |
tree | b5973624d406f88ea4c179d2bc6e7b17965572d8 /src/libmime/mime_headers.h | |
parent | 4c1013fbdd26d37a31ac5895e0ecefb248fa4c6d (diff) | |
download | rspamd-9aa104f6a709198527538c6553a0a96db1ecc5e9.tar.gz rspamd-9aa104f6a709198527538c6553a0a96db1ecc5e9.zip |
[Project] Start mime structures refactoring
Diffstat (limited to 'src/libmime/mime_headers.h')
-rw-r--r-- | src/libmime/mime_headers.h | 72 |
1 files changed, 37 insertions, 35 deletions
diff --git a/src/libmime/mime_headers.h b/src/libmime/mime_headers.h index 5cb300978..60fd7b697 100644 --- a/src/libmime/mime_headers.h +++ b/src/libmime/mime_headers.h @@ -31,20 +31,22 @@ enum rspamd_rfc2047_encoding { RSPAMD_RFC2047_BASE64, }; -enum rspamd_mime_header_special_type { - RSPAMD_HEADER_GENERIC = 0, - RSPAMD_HEADER_RECEIVED = 1 << 0, - RSPAMD_HEADER_TO = 1 << 2, - RSPAMD_HEADER_CC = 1 << 3, - RSPAMD_HEADER_BCC = 1 << 4, - RSPAMD_HEADER_FROM = 1 << 5, - RSPAMD_HEADER_MESSAGE_ID = 1 << 6, - RSPAMD_HEADER_SUBJECT = 1 << 7, - RSPAMD_HEADER_RETURN_PATH = 1 << 8, - RSPAMD_HEADER_DELIVERED_TO = 1 << 9, - RSPAMD_HEADER_SENDER = 1 << 10, - RSPAMD_HEADER_RCPT = 1 << 11, - RSPAMD_HEADER_UNIQUE = 1 << 12 +enum rspamd_mime_header_flags { + RSPAMD_HEADER_GENERIC = 0u, + RSPAMD_HEADER_RECEIVED = 1u << 0u, + RSPAMD_HEADER_TO = 1u << 2u, + RSPAMD_HEADER_CC = 1u << 3u, + RSPAMD_HEADER_BCC = 1u << 4u, + RSPAMD_HEADER_FROM = 1u << 5u, + RSPAMD_HEADER_MESSAGE_ID = 1u << 6u, + RSPAMD_HEADER_SUBJECT = 1u << 7u, + RSPAMD_HEADER_RETURN_PATH = 1u << 8u, + RSPAMD_HEADER_DELIVERED_TO = 1u << 9u, + RSPAMD_HEADER_SENDER = 1u << 10u, + RSPAMD_HEADER_RCPT = 1u << 11u, + RSPAMD_HEADER_UNIQUE = 1u << 12u, + RSPAMD_HEADER_EMPTY_SEPARATOR = 1u << 13u, + RSPAMD_HEADER_TAB_SEPARATED = 1u << 14u, }; struct rspamd_mime_header { @@ -52,32 +54,31 @@ struct rspamd_mime_header { gchar *value; const gchar *raw_value; /* As it is in the message (unfolded and unparsed) */ gsize raw_len; - gboolean tab_separated; - gboolean empty_separator; guint order; - enum rspamd_mime_header_special_type type; + int flags; /* see enum rspamd_mime_header_flags */ gchar *separator; gchar *decoded; + struct rspamd_mime_header *prev, *next; /* Headers with the same name */ + struct rspamd_mime_header *ord_prev, *ord_next; /* Overall order of headers */ }; enum rspamd_received_type { RSPAMD_RECEIVED_SMTP = 0, - RSPAMD_RECEIVED_ESMTP, - RSPAMD_RECEIVED_ESMTPA, - RSPAMD_RECEIVED_ESMTPS, - RSPAMD_RECEIVED_ESMTPSA, - RSPAMD_RECEIVED_LMTP, - RSPAMD_RECEIVED_IMAP, - RSPAMD_RECEIVED_LOCAL, - RSPAMD_RECEIVED_HTTP, - RSPAMD_RECEIVED_MAPI, - RSPAMD_RECEIVED_UNKNOWN + RSPAMD_RECEIVED_ESMTP = 1u << 0u, + RSPAMD_RECEIVED_ESMTPA = 1u << 1u, + RSPAMD_RECEIVED_ESMTPS = 1u << 2u, + RSPAMD_RECEIVED_ESMTPSA = 1u << 3u, + RSPAMD_RECEIVED_LMTP = 1u << 4u, + RSPAMD_RECEIVED_IMAP = 1u << 5u, + RSPAMD_RECEIVED_LOCAL = 1u << 6u, + RSPAMD_RECEIVED_HTTP = 1u << 7u, + RSPAMD_RECEIVED_MAPI = 1u << 8u, + RSPAMD_RECEIVED_UNKNOWN = 1u << 9u, + RSPAMD_RECEIVED_FLAG_ARTIFICIAL = (1u << 10u), + RSPAMD_RECEIVED_FLAG_SSL = (1u << 11u), + RSPAMD_RECEIVED_FLAG_AUTHENTICATED = (1u << 12u), }; -#define RSPAMD_RECEIVED_FLAG_ARTIFICIAL (1 << 0) -#define RSPAMD_RECEIVED_FLAG_SSL (1 << 1) -#define RSPAMD_RECEIVED_FLAG_AUTHENTICATED (1 << 2) - struct received_header { const gchar *from_hostname; const gchar *from_ip; @@ -88,8 +89,8 @@ struct received_header { rspamd_inet_addr_t *addr; struct rspamd_mime_header *hdr; time_t timestamp; - enum rspamd_received_type type; - gint flags; + gint flags; /* See enum rspamd_received_type */ + struct received_header *prev, *next; }; /** @@ -100,8 +101,9 @@ struct received_header { * @param len * @param check_newlines */ -void rspamd_mime_headers_process (struct rspamd_task *task, GHashTable *target, - GQueue *order, +void rspamd_mime_headers_process (struct rspamd_task *task, + GHashTable *target, + struct rspamd_mime_header **order_ptr, const gchar *in, gsize len, gboolean check_newlines); |