# Try to link with gmime24
IF(NOT GMIME2_FOUND)
pkg_check_modules(GMIME2 REQUIRED gmime-2.4)
+ SET(GMIME24 "yes")
ENDIF(NOT GMIME2_FOUND)
IF(NOT GLIB2_FOUND OR NOT GMIME2_FOUND)
#cmakedefine DEBUG_MODE 1
+#cmakedefine GMIME24 1
+
#define RVERSION "${RSPAMD_VERSION}"
#define RSPAMD_MASTER_SITE_URL "${RSPAMD_MASTER_SITE_URL}"
} local_GMimeHeader;
/* enums */
-typedef GMimePartEncodingType Mail__Rspamd__PartEncodingType;
+#ifdef GMIME24
+typedef GMimeContentEncoding Mail__Rspamd__PartEncodingType;
+typedef int Mail__Rspamd__InternetAddressType;
+#else
typedef InternetAddressType Mail__Rspamd__InternetAddressType;
+typedef GMimePartEncodingType Mail__Rspamd__PartEncodingType;
+#endif
/* C types */
typedef GMimeObject * Mail__Rspamd__Object;
typedef GMimeMessagePart * Mail__Rspamd__MessagePart;
typedef GMimeMessagePartial * Mail__Rspamd__MessagePartial;
typedef InternetAddress * Mail__Rspamd__InternetAddress;
+#ifdef GMIME24
+typedef GMimeContentDisposition * Mail__Rspamd__Disposition;
+#else
typedef GMimeDisposition * Mail__Rspamd__Disposition;
+#endif
typedef GMimeContentType * Mail__Rspamd__ContentType;
typedef GMimeCharset * Mail__Rspamd__Charset;
static GList *
local_message_get_header(GMimeMessage *message, const char *field)
{
- struct raw_header *h;
GList * gret = NULL;
+#ifndef GMIME24
+ struct raw_header *h;
if (field == NULL) {
return NULL;
h = h->next;
}
return gret;
+#else
+ GMimeHeaderList *ls;
+ GMimeHeaderIter *iter;
+ const char *name;
+
+ ls = GMIME_OBJECT(message)->headers;
+
+ if (g_mime_header_list_get_iter (ls, iter)) {
+ while (g_mime_header_iter_is_valid (iter)) {
+ name = g_mime_header_iter_get_name (iter);
+ if (!g_strncasecmp (field, name, strlen (name))) {
+ gret = g_list_prepend (gret, g_strdup (g_mime_header_iter_get_value (iter)));
+ }
+ if (!g_mime_header_iter_next (iter)) {
+ break;
+ }
+ }
+ }
+
+ return gret;
+#endif
}
/**
g_mime_message_set_date (message, date, offset);
}
+#ifdef GMIME24
+
+#define ADD_RECIPIENT_TEMPLATE(type,def) \
+static void \
+local_message_add_recipients_from_string_##type (GMimeMessage *message, const gchar *string, const gchar *value) \
+{ \
+ InternetAddressList *il, *new; \
+ \
+ il = g_mime_message_get_recipients (message, (def)); \
+ new = internet_address_list_parse_string (string); \
+ internet_address_list_append (il, new); \
+} \
+
+ADD_RECIPIENT_TEMPLATE(to, GMIME_RECIPIENT_TYPE_TO)
+ADD_RECIPIENT_TEMPLATE(cc, GMIME_RECIPIENT_TYPE_CC)
+ADD_RECIPIENT_TEMPLATE(bcc, GMIME_RECIPIENT_TYPE_BCC)
+
+#define GET_RECIPIENT_TEMPLATE(type,def) \
+static InternetAddressList* \
+local_message_get_recipients_##type (GMimeMessage *message, const char *unused) \
+{ \
+ return g_mime_message_get_recipients (message, (def)); \
+}
+
+GET_RECIPIENT_TEMPLATE(to, GMIME_RECIPIENT_TYPE_TO)
+GET_RECIPIENT_TEMPLATE(cc, GMIME_RECIPIENT_TYPE_CC)
+GET_RECIPIENT_TEMPLATE(bcc, GMIME_RECIPIENT_TYPE_BCC)
+
+#endif
/* different declarations for different types of set and get functions */
} fieldfunc[] = {
{ "From", g_mime_message_get_sender, NULL, NULL, g_mime_message_set_sender, NULL, FUNC_CHARPTR },
{ "Reply-To", g_mime_message_get_reply_to, NULL, NULL, g_mime_message_set_reply_to, NULL, FUNC_CHARPTR },
+#ifndef GMIME24
{ "To", NULL, g_mime_message_get_recipients, NULL, NULL, g_mime_message_add_recipients_from_string, FUNC_IA },
{ "Cc", NULL, g_mime_message_get_recipients, NULL, NULL, g_mime_message_add_recipients_from_string, FUNC_IA },
{ "Bcc", NULL, g_mime_message_get_recipients, NULL, NULL, g_mime_message_add_recipients_from_string, FUNC_IA },
- { "Subject", g_mime_message_get_subject, NULL, NULL, g_mime_message_set_subject, NULL, FUNC_CHARPTR },
{ "Date", g_mime_message_get_date_string, NULL, NULL, local_mime_message_set_date_from_string, NULL, FUNC_CHARFREEPTR },
+#else
+ { "To", NULL, local_message_get_recipients_to, NULL, NULL, local_message_add_recipients_from_string_to, FUNC_IA },
+ { "Cc", NULL, local_message_get_recipients_cc, NULL, NULL, local_message_add_recipients_from_string_cc, FUNC_IA },
+ { "Bcc", NULL, local_message_get_recipients_bcc, NULL, NULL, local_message_add_recipients_from_string_bcc, FUNC_IA },
+ { "Date", g_mime_message_get_date_as_string, NULL, NULL, local_mime_message_set_date_from_string, NULL, FUNC_CHARFREEPTR },
+#endif
+ { "Subject", g_mime_message_get_subject, NULL, NULL, g_mime_message_set_subject, NULL, FUNC_CHARPTR },
{ "Message-Id", g_mime_message_get_message_id, NULL, NULL, g_mime_message_set_message_id, NULL, FUNC_CHARPTR },
+#ifndef GMIME24
{ NULL, NULL, NULL, local_message_get_header, NULL, g_mime_message_add_header, FUNC_LIST }
+#else
+ { NULL, NULL, NULL, local_message_get_header, NULL, g_mime_object_append_header, FUNC_LIST }
+#endif
};
+
+
/**
* message_set_header: set header of any type excluding special (Content- and MIME-Version:)
**/
GList *
message_get_header(GMimeMessage *message, const char *field) {
gint i;
- char * ret = NULL;
+ char * ret = NULL, *ia_string;
GList * gret = NULL;
InternetAddressList *ia_list = NULL, *ia;
ia_list = (*(fieldfunc[i].rcptfunc))(message, field);
gret = g_list_alloc();
ia = ia_list;
+#ifndef GMIME24
while (ia && ia->address) {
- char *ia_string;
ia_string = internet_address_to_string ((InternetAddress *)ia->address, FALSE);
gret = g_list_append (gret, ia_string);
ia = ia->next;
}
+#else
+ i = internet_address_list_length (ia);
+ while (i > 0) {
+ ia_string = internet_address_to_string (internet_address_list_get_address (ia, i), FALSE);
+ gret = g_list_append (gret, ia_string);
+ -- i;
+ }
+#endif
break;
case FUNC_LIST:
gret = (*(fieldfunc[i].getlistfunc))(message, field);
ALIAS:
Mail::Rspamd::Hash::Header::FIRSTKEY = 1
PREINIT:
- char * key = NULL;
- char * value = NULL;
+ const char * key = NULL;
+ const char * value = NULL;
Mail__Rspamd__Message msg;
I32 gimme = GIMME_V;
gint i, j, found;
+#ifdef GMIME24
+ GMimeHeaderList *hl;
+ GMimeHeaderIter *iter;
+#else
local_GMimeHeader * header;
+#endif
struct raw_header *h;
INIT:
if (ix == 1) {
msg = obj->objptr;
++obj->keyindex;
i = obj->keyindex;
+#ifdef GMIME24
+ hl = g_mime_object_get_header_list (GMIME_OBJECT (msg));
+ j = 0;
+ found = 0;
+ if (g_mime_header_list_get_iter (hl, iter)) {
+ while (g_mime_header_iter_is_valid (iter)) {
+ if (j >= i) {
+ key = g_mime_header_iter_get_name (iter);
+ value = g_mime_header_iter_get_value (iter);
+ found = 1;
+ break;
+ }
+ if (!g_mime_header_iter_next (iter)) {
+ break;
+ }
+ }
+ }
+#else
header = GMIME_OBJECT(msg)->headers;
h = header->headers;
j++;
h = h->next;
}
+#endif
if (!found && key == NULL) {
obj->keyindex = -1;
XPUSHs (sv_2mortal (newSVpv (value, 0)));
}
/* THE HACK - FETCH method would get value indirectly */
- obj->fetchvalue = value;
+ obj->fetchvalue = (char *)value;
}
+#ifndef GMIME24
+
void
hash_CLEAR(obj)
Mail::Rspamd::Hash::Header obj
g_mime_header_destroy (header);
GMIME_OBJECT(message)->headers = g_mime_header_new ();
-
+#endif
CASE: items <= 1
char * Class
CODE:
+#ifdef GMIME24
+ XSRETURN_UNDEF;
+#else
RETVAL = internet_address_new ();
plist = g_list_prepend (plist, RETVAL);
+#endif
OUTPUT:
RETVAL
CASE: items == 2
char * Class
char * name
CODE:
+#ifdef GMIME24
+ RETVAL = internet_address_group_new (name);
+#else
RETVAL = internet_address_new_group (name);
+#endif
plist = g_list_prepend (plist, RETVAL);
OUTPUT:
RETVAL
char * name
char * address
CODE:
+#ifdef GMIME24
+ RETVAL = internet_address_mailbox_new (name, address);
+#else
RETVAL = internet_address_new_name (name, address);
+#endif
plist = g_list_prepend (plist, RETVAL);
OUTPUT:
RETVAL
PREINIT:
InternetAddressList * addrlist;
AV * retav;
+ int i;
CODE:
+#ifdef GMIME24
+ addrlist = internet_address_list_parse_string (str);
+#else
addrlist = internet_address_parse_string (str);
+#endif
retav = newAV ();
+#ifdef GMIME24
+ i = internet_address_list_length (addrlist);
+ while (i > 0) {
+ SV * address = newSViv(0);
+ sv_setref_pv (address, "Mail::Rspamd::InternetAddress", (Mail__Rspamd__InternetAddress)internet_address_list_get_address (addrlist, i));
+ av_push (retav, address);
+ -- i;
+ }
+#else
while (addrlist) {
SV * address = newSViv (0);
sv_setref_pv (address, "Mail::Rspamd::InternetAddress", (Mail__Rspamd__InternetAddress)(addrlist->address));
av_push (retav, address);
addrlist = addrlist->next;
}
+#endif
RETVAL = retav;
OUTPUT:
RETVAL
+#ifdef GMIME24
+
+void
+interface_ia_set (ia, value)
+ Mail::Rspamd::InternetAddress ia
+ char * value
+ INTERFACE_MACRO:
+ XSINTERFACE_FUNC
+ XSINTERFACE_FUNC_RSPAMD_IA_SET
+ INTERFACE:
+ set_name
+
+#else
+
void
interface_ia_set (ia, value)
Mail::Rspamd::InternetAddress ia
set_name
set_addr
+#endif
+
SV *
rspamd_internet_address_to_string (ia, encode = TRUE)
Mail::Rspamd::InternetAddress ia
addr = INT2PTR (Mail__Rspamd__InternetAddress, tmp);
}
if (addr) {
+#ifdef GMIME24
+ internet_address_list_add (addrlist, addr);
+#else
internet_address_list_append (addrlist, addr);
+#endif
}
}
if (addrlist) {
rspamd_internet_address_type (ia)
Mail::Rspamd::InternetAddress ia
CODE:
+#ifndef GMIME24
RETVAL = ia->type;
+#else
+ XSRETURN_UNDEF;
+#endif
OUTPUT:
RETVAL
-
const char * name
const char * address
CODE:
+#ifndef GMIME24
g_mime_message_add_recipient (message, type, name, address);
+#else
+ if (!g_strcasecmp (type, "to")) {
+ g_mime_message_add_recipient (message, GMIME_RECIPIENT_TYPE_TO, name, address);
+ }
+ else if (!g_strcasecmp (type, "cc")) {
+ g_mime_message_add_recipient (message, GMIME_RECIPIENT_TYPE_CC, name, address);
+ }
+ else if (!g_strcasecmp (type, "bcc")) {
+ g_mime_message_add_recipient (message, GMIME_RECIPIENT_TYPE_BCC, name, address);
+ }
+#endif
void
rspamd_message_add_recipients_from_string(message, type, recipients)
char * type
const char * recipients
CODE:
+#ifndef GMIME24
g_mime_message_add_recipients_from_string (message, type, recipients);
+#else
+ /* XXX: add code here */
+ XSRETURN_UNDEF;
+#endif
+
AV *
rspamd_message_get_recipients(message, type)
Mail::Rspamd::Message message
const char * type
PREINIT:
- const InternetAddressList * rcpt;
+ InternetAddressList * rcpt;
AV * retav;
+ int i;
CODE:
retav = newAV();
+#ifndef GMIME24
rcpt = g_mime_message_get_recipients (message, type);
while (rcpt) {
SV * address = newSViv(0);
av_push(retav, address);
rcpt = rcpt->next;
}
+#else
+ if (!g_strcasecmp (type, "to")) {
+ rcpt = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_TO);
+ }
+ else if (!g_strcasecmp (type, "cc")) {
+ rcpt = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_CC);
+ }
+ else if (!g_strcasecmp (type, "bcc")) {
+ rcpt = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_BCC);
+ }
+ i = internet_address_list_length (rcpt);
+ while (i > 0) {
+ SV * address = newSViv(0);
+ sv_setref_pv(address, "Mail::Rspamd::InternetAddress", (Mail__Rspamd__InternetAddress)internet_address_list_get_address(rcpt, i));
+ av_push(retav, address);
+ -- i;
+ }
+#endif
RETVAL = retav;
OUTPUT:
RETVAL
char * str;
PPCODE:
if (gimme == G_SCALAR) {
+#ifdef GMIME24
+ str = g_mime_message_get_date_as_string (message);
+#else
str = g_mime_message_get_date_string (message);
+#endif
if (str) {
XPUSHs (sv_2mortal (newSVpv (str,0)));
g_free (str);
const char * field
const char * value
CODE:
+#ifdef GMIME24
+ g_mime_object_set_header (GMIME_OBJECT (message), field, value);
+#else
g_mime_message_set_header (message, field, value);
+#endif
void
rspamd_message_remove_header (message, field)
Mail::Rspamd::Message message
const char * field
CODE:
+#ifdef GMIME24
g_mime_object_remove_header (GMIME_OBJECT (message), field);
+#else
+ g_mime_message_remove_header (message, field);
+#endif
+
void
rspamd_message_add_header (message, field, value)
const char * field
const char * value
CODE:
+#ifdef GMIME24
+ g_mime_object_set_header (GMIME_OBJECT (message), field, value);
+#else
g_mime_message_set_header (message, field, value);
+#endif
const char *
rspamd_message_get_header (message, field)
Mail::Rspamd::Message message
const char * field
CODE:
+#ifdef GMIME24
+ RETVAL = g_mime_object_get_header (GMIME_OBJECT (message), field);
+#else
RETVAL = g_mime_message_get_header (message, field);
+#endif
OUTPUT:
RETVAL
g_mime_message_set_mime_part (message, GMIME_OBJECT (mime_part));
plist = g_list_remove (plist, mime_part);
+#if !defined(GMIME24)
SV *
rspamd_message_get_body (message, want_plain = 1, is_html = 0)
CASE: items == 1
OUTPUT:
is_html
RETVAL
+
+#endif
SV *
rspamd_message_get_headers(message)
PREINIT:
char * textdata;
CODE:
+#ifdef GMIME24
+ textdata = g_mime_object_get_headers (GMIME_OBJECT (message));
+#else
textdata = g_mime_message_get_headers (message);
+#endif
if (textdata == NULL) {
RETVAL = &PL_sv_undef;
}
Mail::Rspamd::Object mime_object
PREINIT:
char * textdata;
- const GMimeContentType *ct;
+ GMimeContentType *ct;
CODE:
ct = g_mime_object_get_content_type (mime_object);
textdata = g_mime_content_type_to_string (ct);
lsize = (mime_part->content && mime_part->content->stream) ?
g_mime_stream_length (mime_part->content->stream) : 0;
if (lsize) {
+#ifdef GMIME24
+ GMimeContentEncoding enc;
+
+ enc = _mime_part_get_encoding (mime_part);
+ switch (enc) {
+ case GMIME_CONTENT_ENCODING_BASE64:
+ lsize = BASE64_ENCODE_LEN (lsize);
+ break;
+ case GMIME_CONTENT_ENCODING_QUOTEDPRINTABLE:
+ lsize = QP_ENCODE_LEN (lsize);
+ break;
+ }
+#else
GMimePartEncodingType enc;
enc = g_mime_part_get_encoding (mime_part);
lsize = QP_ENCODE_LEN (lsize);
break;
}
+#endif
}
}
}
set_content_description
set_content_md5
set_content_location
- set_content_disposition
set_filename
get_content_description
get_content_md5
get_content_location
- get_content_disposition
get_filename
+#if !defined(GMIME24)
+
void
rspamd_part_set_content_header (mime_part, field, value)
Mail::Rspamd::Part mime_part
OUTPUT:
RETVAL
+#endif
+
void
rspamd_part_set_content_type (mime_part, content_type)
Mail::Rspamd::Part mime_part
const char *
rspamd_part_encoding_to_string (encoding)
Mail::Rspamd::PartEncodingType encoding
+ PREINIT:
CODE:
+#ifdef GMIME24
+ RETVAL = g_mime_content_encoding_to_string (encoding);
+#else
RETVAL = g_mime_part_encoding_to_string (encoding);
+#endif
OUTPUT:
RETVAL
rspamd_part_encoding_from_string (encoding)
const char * encoding
CODE:
- RETVAL = g_mime_part_encoding_from_string(encoding);
+#ifdef GMIME24
+ RETVAL = g_mime_content_encoding_from_string (encoding);
+#else
+ RETVAL = g_mime_part_encoding_from_string (encoding);
+#endif
OUTPUT:
RETVAL
const char * name
const char * value
CODE:
+#ifdef GMIME24
+ g_mime_object_add_content_disposition_parameter (GMIME_OBJECT (mime_part), name, value);
+#else
g_mime_part_add_content_disposition_parameter (mime_part, name, value);
+#endif
const char *
rspamd_part_get_content_disposition_parameter (mime_part, name)
Mail::Rspamd::Part mime_part
const char * name
CODE:
+#ifdef GMIME24
+ RETVAL = g_mime_object_get_content_disposition_parameter (GMIME_OBJECT (mime_part), name);
+#else
RETVAL = g_mime_part_get_content_disposition_parameter (mime_part, name);
+#endif
OUTPUT:
RETVAL
rspamd_part_get_content(mime_part)
Mail::Rspamd::Part mime_part
PREINIT:
+#ifdef GMIME24
+ GMimeDataWrapper *wrapper;
+ GMimeStream *part_stream;
+ GByteArray *part_content;
+#else
guint len;
const char * content_char;
+#endif
SV * content;
CODE:
ST(0) = &PL_sv_undef;
+#ifdef GMIME24
+ if (!(mime_part->content) || !(mime_part->content->stream) ||
+ (wrapper = g_mime_part_get_content_object (mime_part)) == NULL) {
+#else
if (!(mime_part->content) || !(mime_part->content->stream) ||
- (content_char = g_mime_part_get_content(mime_part, &len)) == NULL) {
+ (content_char = g_mime_part_get_content (mime_part, &len)) == NULL) {
+#endif
return;
}
content = sv_newmortal ();
SvUPGRADE (content, SVt_PV);
SvREADONLY_on (content);
+#ifdef GMIME24
+ part_stream = g_mime_stream_mem_new ();
+ g_mime_data_wrapper_write_to_stream (wrapper, part_stream);
+ part_content = g_mime_stream_mem_get_byte_array (GMIME_STREAM_MEM (part_stream));
+ SvPVX(content) = (char *) (part_content->data);
+ SvCUR_set (content, part_content->len);
+#else
SvPVX(content) = (char *) (content_char);
SvCUR_set (content, len);
+#endif
SvLEN_set (content, 0);
SvPOK_only (content);
ST(0) = content;
cur = g_list_next (cur);
}
g_list_free (symbols);
+#ifdef GMIME24
+ g_mime_object_append_header (GMIME_OBJECT (task->message), header_name, outbuf);
+#else
g_mime_message_add_header (task->message, header_name, outbuf);
+#endif
}
g_byte_array_free (arr, TRUE);
}
+#ifdef GMIME24
+static void
+mime_foreach_callback (GMimeObject *parent, GMimeObject *part, gpointer user_data)
+#else
static void
mime_foreach_callback (GMimeObject *part, gpointer user_data)
+#endif
{
struct worker_task *task = (struct worker_task *)user_data;
struct mime_part *mime_part;
g_mime_message_foreach_part() again here. */
message = g_mime_message_part_get_message ((GMimeMessagePart *) part);
+#ifdef GMIME24
+ g_mime_message_foreach (message, mime_foreach_callback, task);
+#else
g_mime_message_foreach_part (message, mime_foreach_callback, task);
+#endif
g_object_unref (message);
} else if (GMIME_IS_MESSAGE_PARTIAL (part)) {
/* message/partial */
/* we'll get to finding out if this is a signed/encrypted multipart later... */
} else if (GMIME_IS_PART (part)) {
/* a normal leaf part, could be text/plain or image/jpeg etc */
+#ifdef GMIME24
+ type = (GMimeContentType *)g_mime_object_get_content_type (GMIME_OBJECT (part));
+#else
type = (GMimeContentType *)g_mime_part_get_content_type (GMIME_PART (part));
+#endif
if (type == NULL) {
msg_warn ("mime_foreach_callback: type of part is unknown, assume text/plain");
type = g_mime_content_type_new ("text", "plain");
task->message = message;
memory_pool_add_destructor (task->task_pool, (pool_destruct_func)g_object_unref, task->message);
+#ifdef GMIME24
+ g_mime_message_foreach (message, mime_foreach_callback, task);
+#else
g_mime_message_foreach_part (message, mime_foreach_callback, task);
+#endif
msg_info ("process_message: found %d parts in message", task->parts_count);
return 0;
}
+#ifdef GMIME24
+static void
+mime_learn_foreach_callback (GMimeObject *parent, GMimeObject *part, gpointer user_data)
+#else
static void
mime_learn_foreach_callback (GMimeObject *part, gpointer user_data)
+#endif
{
struct controller_session *session = (struct controller_session *)user_data;
struct mime_part *mime_part;
child message parts, so if we want to count any
subparts of this child message, we'll have to call
g_mime_message_foreach_part() again here. */
-
message = g_mime_message_part_get_message ((GMimeMessagePart *) part);
+#ifdef GMIME24
+ g_mime_message_foreach (message, mime_learn_foreach_callback, session);
+#else
g_mime_message_foreach_part (message, mime_learn_foreach_callback, session);
+#endif
g_object_unref (message);
} else if (GMIME_IS_MESSAGE_PARTIAL (part)) {
/* message/partial */
part_stream = g_mime_stream_mem_new ();
if (g_mime_data_wrapper_write_to_stream (wrapper, part_stream) != -1) {
part_content = g_mime_stream_mem_get_byte_array (GMIME_STREAM_MEM (part_stream));
+#ifdef GMIME24
+ type = (GMimeContentType *)g_mime_object_get_content_type (GMIME_OBJECT (part));
+#else
type = (GMimeContentType *)g_mime_part_get_content_type (GMIME_PART (part));
+#endif
mime_part = memory_pool_alloc (session->session_pool, sizeof (struct mime_part));
mime_part->type = type;
mime_part->content = part_content;
/* free the parser (and the stream) */
g_object_unref (parser);
+#ifdef GMIME24
+ g_mime_message_foreach (message, mime_learn_foreach_callback, session);
+#else
g_mime_message_foreach_part (message, mime_learn_foreach_callback, session);
+#endif
return 0;
}
return 0;
}
msg_debug ("process_regexp: checking header regexp: %s = /%s/", re->header, re->regexp_text);
+#ifdef GMIME24
+ headerv = (char *)g_mime_object_get_header (GMIME_OBJECT (task->message), re->header);
+#else
headerv = (char *)g_mime_message_get_header (task->message, re->header);
+#endif
if (headerv == NULL) {
return 0;
}
#include "../src/url.h"
#include "../src/message.h"
+#ifdef GMIME24
+static void
+mime_foreach_callback (GMimeObject *parent, GMimeObject *part, gpointer user_data)
+#else
static void
mime_foreach_callback (GMimeObject *part, gpointer user_data)
+#endif
{
struct worker_task *task = (struct worker_task *)user_data;
struct mime_part *mime_part;
g_mime_message_foreach_part() again here. */
message = g_mime_message_part_get_message ((GMimeMessagePart *) part);
+#ifdef GMIME24
+ g_mime_message_foreach (message, mime_foreach_callback, task);
+#else
g_mime_message_foreach_part (message, mime_foreach_callback, task);
+#endif
g_object_unref (message);
} else if (GMIME_IS_MESSAGE_PARTIAL (part)) {
/* message/partial */
if (g_mime_data_wrapper_write_to_stream (wrapper, part_stream) != -1) {
printf ("Write wrapper to stream\n");
part_content = g_mime_stream_mem_get_byte_array (GMIME_STREAM_MEM (part_stream));
+#ifdef GMIME24
+ type = (GMimeContentType *)g_mime_object_get_content_type (GMIME_OBJECT (part));
+#else
type = (GMimeContentType *)g_mime_part_get_content_type (GMIME_PART (part));
+#endif
mime_part = g_malloc (sizeof (struct mime_part));
mime_part->type = type;
mime_part->content = part_content;
/* free the parser (and the stream) */
g_object_unref (parser);
+#ifdef GMIME24
+ g_mime_message_foreach (message, mime_foreach_callback, &task);
+#else
g_mime_message_foreach_part (message, mime_foreach_callback, &task);
+#endif
TAILQ_FOREACH (url, &task.urls, next) {
printf ("Found url: %s, hostname: %s, data: %s\n", struri (url), url->host, url->data);
projects / thirdparty / rspamd.git / commitdiff
