diff options
Diffstat (limited to 'nanohttp/nanohttp-mime.c')
| -rwxr-xr-x | nanohttp/nanohttp-mime.c | 621 |
1 files changed, 320 insertions, 301 deletions
diff --git a/nanohttp/nanohttp-mime.c b/nanohttp/nanohttp-mime.c index f4ff487..3f17d38 100755 --- a/nanohttp/nanohttp-mime.c +++ b/nanohttp/nanohttp-mime.c @@ -3,7 +3,7 @@ * | \/ | | | | \/ | | _/ * |_''_| |_| |_''_| |_'/ PARSER * -* $Id: nanohttp-mime.c,v 1.7 2005/05/27 19:28:15 snowdrop Exp $ +* $Id: nanohttp-mime.c,v 1.8 2006/01/10 11:21:55 snowdrop Exp $ * * CSOAP Project: A http client/server library in C * Copyright (C) 2003-2004 Ferhat Ayaz @@ -45,32 +45,32 @@ Buffered Reader. A helper object to read bytes from a source /* ------------------------------------------------------------------ MIME Parser ------------------------------------------------------------------*/ -typedef void (*MIME_part_begin) (void*); -typedef void (*MIME_part_end) (void*); -typedef void (*MIME_parse_begin) (void*); -typedef void (*MIME_parse_end) (void*); -typedef void (*MIME_ERROR_bytes) (void*, - const unsigned char*, int); - -typedef enum _MIME_parser_status +typedef void (*MIME_part_begin) (void *); +typedef void (*MIME_part_end) (void *); +typedef void (*MIME_parse_begin) (void *); +typedef void (*MIME_parse_end) (void *); +typedef void (*MIME_ERROR_bytes) (void *, const unsigned char *, int); + +typedef enum _MIME_parser_status { MIME_PARSER_INCOMPLETE_MESSAGE, MIME_PARSER_READ_ERROR, MIME_PARSER_OK -}MIME_parser_status; +} MIME_parser_status; typedef enum _MIME_read_status { MIME_READ_OK, MIME_READ_EOF, MIME_READ_ERROR -}MIME_read_status; +} MIME_read_status; #define MIME_READER_MAX_BUFFER_SIZE 1054 #define MIME_PARSER_BUFFER_SIZE 1054 -typedef MIME_read_status (*MIME_read_function) (void*, unsigned char*, int*); +typedef MIME_read_status (*MIME_read_function) (void *, unsigned char *, + int *); /** @@ -85,36 +85,35 @@ typedef struct _MIME_reader MIME_read_function read_function; char buffer[MIME_READER_MAX_BUFFER_SIZE]; void *userdata; -}MIME_reader; +} MIME_reader; -MIME_read_status MIME_filereader_function(void* userdata, - unsigned char* dest, int* size); +MIME_read_status MIME_filereader_function (void *userdata, + unsigned char *dest, int *size); typedef struct _MIME_callbacks { - MIME_part_begin part_begin_cb; - MIME_part_end part_end_cb; - MIME_parse_begin parse_begin_cb; - MIME_parse_end parse_end_cb; + MIME_part_begin part_begin_cb; + MIME_part_end part_end_cb; + MIME_parse_begin parse_begin_cb; + MIME_parse_end parse_end_cb; MIME_ERROR_bytes received_bytes_cb; -}MIME_callbacks; +} MIME_callbacks; -MIME_parser_status MIME_parse( - MIME_read_function reader_function, - void *reader_userdata, - const char* user_boundary, - const MIME_callbacks* callbacks, - void *callbacks_userdata -); +MIME_parser_status MIME_parse (MIME_read_function reader_function, + void *reader_userdata, + const char *user_boundary, + const MIME_callbacks * callbacks, + void *callbacks_userdata); /** Initialize a reader */ -void MIME_reader_init(MIME_reader *reader, - MIME_read_function reader_function,void *userdata) +void +MIME_reader_init (MIME_reader * reader, + MIME_read_function reader_function, void *userdata) { reader->size = 0; reader->marker = -1; @@ -127,8 +126,8 @@ void MIME_reader_init(MIME_reader *reader, /** Read data from a reader source. */ -MIME_read_status MIME_reader_read(MIME_reader *reader, - unsigned char *buffer, int size) +MIME_read_status +MIME_reader_read (MIME_reader * reader, unsigned char *buffer, int size) { MIME_read_status status; int readed_size; @@ -145,64 +144,66 @@ MIME_read_status MIME_reader_read(MIME_reader *reader, { if (reader->marker != 0) { - memcpy(tempBuffer, reader->buffer + reader->marker, - reader->size - reader->marker); - memcpy(reader->buffer, tempBuffer, + memcpy (tempBuffer, reader->buffer + reader->marker, reader->size - reader->marker); + memcpy (reader->buffer, tempBuffer, reader->size - reader->marker); reader->current = reader->size - reader->marker; } - else if (reader->current == MIME_READER_MAX_BUFFER_SIZE-1) + else if (reader->current == MIME_READER_MAX_BUFFER_SIZE - 1) { - fprintf(stderr, "Marker error"); - return MIME_READ_ERROR; + fprintf (stderr, "Marker error"); + return MIME_READ_ERROR; } reader->marker = 0; } else reader->current = 0; - - readed_size = MIME_READER_MAX_BUFFER_SIZE - reader->current -1; - status = reader->read_function(reader->userdata, - reader->buffer + reader->current, &readed_size); + + readed_size = MIME_READER_MAX_BUFFER_SIZE - reader->current - 1; + status = reader->read_function (reader->userdata, + reader->buffer + reader->current, + &readed_size); if (status == MIME_READ_OK) { reader->size = readed_size + reader->current; - } + } else return status; } if (size <= reader->size - reader->current) { - memcpy(buffer, reader->buffer + reader->current, size); + memcpy (buffer, reader->buffer + reader->current, size); reader->current += size; return MIME_READ_OK; - } + } else { /* Fill rest data */ rest_size = reader->size - reader->current; - memcpy(buffer, reader->buffer + reader->current, rest_size); + memcpy (buffer, reader->buffer + reader->current, rest_size); reader->current = reader->size; - return MIME_reader_read(reader, buffer + rest_size, - size - rest_size); + return MIME_reader_read (reader, buffer + rest_size, size - rest_size); } } -void MIME_reader_set_marker(MIME_reader *reader) +void +MIME_reader_set_marker (MIME_reader * reader) { reader->marker = reader->current; } -void MIME_reader_unset_marker(MIME_reader *reader) +void +MIME_reader_unset_marker (MIME_reader * reader) { reader->marker = -1; } -void MIME_reader_jump_marker(MIME_reader *reader) +void +MIME_reader_jump_marker (MIME_reader * reader) { reader->current = reader->marker; } @@ -213,85 +214,89 @@ typedef struct _MIME_buffer { unsigned char data[MIME_PARSER_BUFFER_SIZE]; int size; -}MIME_buffer; +} MIME_buffer; -void MIME_buffer_init(MIME_buffer *buffer) +void +MIME_buffer_init (MIME_buffer * buffer) { buffer->size = 0; } -void MIME_buffer_add(MIME_buffer *buffer, unsigned char ch) +void +MIME_buffer_add (MIME_buffer * buffer, unsigned char ch) { buffer->data[buffer->size++] = ch; } -void MIME_buffer_add_bytes(MIME_buffer *buffer, unsigned char *bytes, int size) +void +MIME_buffer_add_bytes (MIME_buffer * buffer, unsigned char *bytes, int size) { - memcpy(buffer->data, bytes, size); + memcpy (buffer->data, bytes, size); buffer->size += size; } -int MIME_buffer_is_full(MIME_buffer *buffer) +int +MIME_buffer_is_full (MIME_buffer * buffer) { return buffer->size + 150 >= MIME_PARSER_BUFFER_SIZE; } -int MIME_buffer_is_empty(MIME_buffer *buffer) +int +MIME_buffer_is_empty (MIME_buffer * buffer) { return buffer->size == 0; } -void MIME_buffer_clear(MIME_buffer *buffer) +void +MIME_buffer_clear (MIME_buffer * buffer) { buffer->size = 0; } -MIME_parser_status MIME_parse( - MIME_read_function reader_function, - void *reader_userdata, - const char* user_boundary, - const MIME_callbacks* callbacks, - void *callbacks_userdata -) +MIME_parser_status +MIME_parse (MIME_read_function reader_function, + void *reader_userdata, + const char *user_boundary, + const MIME_callbacks * callbacks, void *callbacks_userdata) { - char boundary[150]; + char boundary[150]; unsigned char ch[153]; - int boundary_length, n, ignore = 0; + int boundary_length, n, ignore = 0; MIME_reader reader; MIME_buffer buffer; MIME_read_status status; /* Init reader */ - MIME_reader_init(&reader, reader_function, reader_userdata); + MIME_reader_init (&reader, reader_function, reader_userdata); /* Init buffer */ - MIME_buffer_init(&buffer); + MIME_buffer_init (&buffer); /* Set boundary related stuff */ - sprintf(boundary, "\n--%s", user_boundary); - boundary_length = strlen(boundary); + sprintf (boundary, "\n--%s", user_boundary); + boundary_length = strlen (boundary); /* Call parse begin callback */ - callbacks->parse_begin_cb(callbacks_userdata); + callbacks->parse_begin_cb (callbacks_userdata); while (1) { -set_marker: + set_marker: /* Set marker */ - MIME_reader_set_marker(&reader); + MIME_reader_set_marker (&reader); -read_byte: + read_byte: /* Read 1 byte */ - status = MIME_reader_read(&reader, ch, 1); - _log_str("buffer.log", ch,1); + status = MIME_reader_read (&reader, ch, 1); + _log_str ("buffer.log", ch, 1); if (status == MIME_READ_EOF) - return MIME_PARSER_INCOMPLETE_MESSAGE; + return MIME_PARSER_INCOMPLETE_MESSAGE; else if (status == MIME_READ_ERROR) - return MIME_PARSER_READ_ERROR; + return MIME_PARSER_READ_ERROR; if (ch[0] == '\r' && !ignore) { @@ -299,181 +304,181 @@ read_byte: while (n < boundary_length) { /* Read 1 byte */ - status = MIME_reader_read(&reader, ch, 1); - _log_str("buffer.log", ch,1); + status = MIME_reader_read (&reader, ch, 1); + _log_str ("buffer.log", ch, 1); if (status == MIME_READ_EOF) - return MIME_PARSER_INCOMPLETE_MESSAGE; + return MIME_PARSER_INCOMPLETE_MESSAGE; else if (status == MIME_READ_ERROR) - return MIME_PARSER_READ_ERROR; - - /* Check if byte is in boundary */ - if (ch[0] == boundary[n]) + return MIME_PARSER_READ_ERROR; + + /* Check if byte is in boundary */ + if (ch[0] == boundary[n]) { n = n + 1; - continue; + continue; } else { - MIME_reader_jump_marker(&reader); + MIME_reader_jump_marker (&reader); ignore = 1; goto read_byte; } - - } /* while n < boundary_length*/ + + } /* while n < boundary_length */ /* Read 1 byte */ - status = MIME_reader_read(&reader, ch, 1); - _log_str("buffer.log", ch,1); + status = MIME_reader_read (&reader, ch, 1); + _log_str ("buffer.log", ch, 1); if (status == MIME_READ_EOF) - return MIME_PARSER_INCOMPLETE_MESSAGE; + return MIME_PARSER_INCOMPLETE_MESSAGE; else if (status == MIME_READ_ERROR) - return MIME_PARSER_READ_ERROR; - + return MIME_PARSER_READ_ERROR; + /* Show if byte is '\r' */ if (ch[0] == '\r') { /* Read 1 byte */ - status = MIME_reader_read(&reader, ch, 1); - _log_str("buffer.log", ch,1); + status = MIME_reader_read (&reader, ch, 1); + _log_str ("buffer.log", ch, 1); if (status == MIME_READ_EOF) - return MIME_PARSER_INCOMPLETE_MESSAGE; + return MIME_PARSER_INCOMPLETE_MESSAGE; else if (status == MIME_READ_ERROR) - return MIME_PARSER_READ_ERROR; + return MIME_PARSER_READ_ERROR; - /* Check if byte is '\n' */ + /* Check if byte is '\n' */ if (ch[0] == '\n') { - if (!MIME_buffer_is_empty(&buffer)) + if (!MIME_buffer_is_empty (&buffer)) { /* Invoke callback */ - callbacks->received_bytes_cb( - callbacks_userdata, buffer.data, buffer.size); + callbacks->received_bytes_cb (callbacks_userdata, buffer.data, + buffer.size); /* Empty the buffer */ - MIME_buffer_clear(&buffer); - + MIME_buffer_clear (&buffer); + /* Invoke End Part */ - callbacks->part_end_cb(callbacks_userdata); + callbacks->part_end_cb (callbacks_userdata); } - + /* Invoke start new Part */ - callbacks->part_begin_cb(callbacks_userdata); + callbacks->part_begin_cb (callbacks_userdata); goto set_marker; - } /* if (ch[0] == '\n') */ + } /* if (ch[0] == '\n') */ else { /* Jump to marker and read bytes */ - MIME_reader_jump_marker(&reader); - MIME_reader_read(&reader, ch, boundary_length+2); - _log_str("buffer.log", ch,1); + MIME_reader_jump_marker (&reader); + MIME_reader_read (&reader, ch, boundary_length + 2); + _log_str ("buffer.log", ch, 1); - MIME_buffer_add_bytes(&buffer, ch, boundary_length+2); - - if (MIME_buffer_is_full(&buffer)) + MIME_buffer_add_bytes (&buffer, ch, boundary_length + 2); + + if (MIME_buffer_is_full (&buffer)) { /* Invoke callback */ - callbacks->received_bytes_cb( - callbacks_userdata, buffer.data, buffer.size); - + callbacks->received_bytes_cb (callbacks_userdata, buffer.data, + buffer.size); + /* Empty the buffer */ - MIME_buffer_clear(&buffer); + MIME_buffer_clear (&buffer); } - } /* else of if (ch[0] == '\n') */ + } /* else of if (ch[0] == '\n') */ - } /* if (ch[0] == '\r') */ + } /* if (ch[0] == '\r') */ else { if (ch[0] == '-') { /* Read 1 byte */ - status = MIME_reader_read(&reader, ch, 1); - _log_str("buffer.log", ch,1); + status = MIME_reader_read (&reader, ch, 1); + _log_str ("buffer.log", ch, 1); if (status == MIME_READ_EOF) - return MIME_PARSER_INCOMPLETE_MESSAGE; + return MIME_PARSER_INCOMPLETE_MESSAGE; else if (status == MIME_READ_ERROR) - return MIME_PARSER_READ_ERROR; + return MIME_PARSER_READ_ERROR; if (ch[0] == '-') { - if (!MIME_buffer_is_empty(&buffer)) + if (!MIME_buffer_is_empty (&buffer)) { /* Invoke callback */ - callbacks->received_bytes_cb( - callbacks_userdata, buffer.data, buffer.size); - + callbacks->received_bytes_cb (callbacks_userdata, buffer.data, + buffer.size); + /* Empty the buffer */ - MIME_buffer_clear(&buffer); + MIME_buffer_clear (&buffer); /* Invoke End Part */ - callbacks->part_end_cb(callbacks_userdata); + callbacks->part_end_cb (callbacks_userdata); } - + /* Invoke start new Part */ - callbacks->parse_end_cb(callbacks_userdata); + callbacks->parse_end_cb (callbacks_userdata); + + /* Finish parsing */ + /* TODO (#1#): We assume that after -- comes \r\n This is not + always correct */ - /* Finish parsing*/ - /* TODO (#1#): We assume that after -- comes \r\n - This is not always correct */ - return MIME_PARSER_OK; - } /* if (ch[0] == '-') */ + } /* if (ch[0] == '-') */ else { - MIME_reader_jump_marker(&reader); + MIME_reader_jump_marker (&reader); ignore = 1; goto read_byte; - } /* else of if (ch[0] == '-') */ - - } /* if (ch[0] == '-') */ + } /* else of if (ch[0] == '-') */ + + } /* if (ch[0] == '-') */ else { - MIME_reader_jump_marker(&reader); + MIME_reader_jump_marker (&reader); ignore = 1; goto read_byte; - } /* else of if (ch[0] == '-') */ + } /* else of if (ch[0] == '-') */ - } /* else of if (ch[0] == '\r') */ + } /* else of if (ch[0] == '\r') */ - } /* if ch[0] == '\r' && !ignore */ + } /* if ch[0] == '\r' && !ignore */ else { ignore = 0; - MIME_buffer_add(&buffer, ch[0]); + MIME_buffer_add (&buffer, ch[0]); - /* Chec if buffer is full*/ - if (MIME_buffer_is_full(&buffer)) + /* Chec if buffer is full */ + if (MIME_buffer_is_full (&buffer)) { /* Invoke callback */ - callbacks->received_bytes_cb( - callbacks_userdata, buffer.data, buffer.size); - + callbacks->received_bytes_cb (callbacks_userdata, buffer.data, + buffer.size); + /* Empty the buffer */ - MIME_buffer_clear(&buffer); + MIME_buffer_clear (&buffer); } - } /* else of if ch[0] == '\r' && !ignore */ - } /* while (1) */ + } /* else of if ch[0] == '\r' && !ignore */ + } /* while (1) */ } -MIME_read_status MIME_filereader_function(void* userdata, - unsigned char* dest, int* size) +MIME_read_status +MIME_filereader_function (void *userdata, unsigned char *dest, int *size) { - FILE *f = (FILE*)userdata; + FILE *f = (FILE *) userdata; - if (feof(f)) + if (feof (f)) return MIME_READ_EOF; - *size = fread(dest, 1, *size, f); + *size = fread (dest, 1, *size, f); return MIME_READ_OK; } @@ -487,44 +492,45 @@ MIME_read_status MIME_filereader_function(void* userdata, */ typedef struct _mime_callback_data { - int part_id; + int part_id; attachments_t *message; - part_t *current_part; - int buffer_capacity; - char header[4064]; - char root_id[256]; - int header_index; - int header_search; - FILE *current_fd; - char root_dir[512]; -}mime_callback_data_t; + part_t *current_part; + int buffer_capacity; + char header[4064]; + char root_id[256]; + int header_index; + int header_search; + FILE *current_fd; + char root_dir[512]; +} mime_callback_data_t; -MIME_read_status mime_streamreader_function(void* userdata, - unsigned char* dest, int* size) +MIME_read_status +mime_streamreader_function (void *userdata, unsigned char *dest, int *size) { - int readed=0; - http_input_stream_t *in = (http_input_stream_t*)userdata; + int readed = 0; + http_input_stream_t *in = (http_input_stream_t *) userdata; - if (!http_input_stream_is_ready(in)) + if (!http_input_stream_is_ready (in)) return MIME_READ_EOF; - readed = http_input_stream_read(in, dest, *size); - /* - log_info1("http_input_stream_read() returned 0"); - */ - if (readed == -1) { - log_error4("[%d] %s():%s ", herror_code(in->err), herror_func(in->err), herror_message(in->err)); + readed = http_input_stream_read (in, dest, *size); + /* + log_info1("http_input_stream_read() returned 0"); */ + if (readed == -1) + { + log_error4 ("[%d] %s():%s ", herror_code (in->err), herror_func (in->err), + herror_message (in->err)); } *size = readed; - if (*size!=-1) { - /* - _log_str("reader.log", dest, *size); - */ - return MIME_READ_OK; - } + if (*size != -1) + { + /* + _log_str("reader.log", dest, *size); */ + return MIME_READ_OK; + } return MIME_READ_ERROR; } @@ -532,35 +538,35 @@ MIME_read_status mime_streamreader_function(void* userdata, /* Start Callback functions */ -static -void _mime_parse_begin(void *data) +static void +_mime_parse_begin (void *data) { /* Nothing to do mime_callback_data_t *cbdata = (mime_callback_data_t)data; */ - log_verbose2("Begin parse (%p)", data); + log_verbose2 ("Begin parse (%p)", data); } -static -void _mime_parse_end(void *data) +static void +_mime_parse_end (void *data) { /* Nothing to do mime_callback_data_t *cbdata = (mime_callback_data_t)data; */ - log_verbose2("End parse (%p)", data); + log_verbose2 ("End parse (%p)", data); } -static -void _mime_part_begin(void *data) +static void +_mime_part_begin (void *data) { char buffer[1054]; - mime_callback_data_t *cbdata = (mime_callback_data_t*)data; + mime_callback_data_t *cbdata = (mime_callback_data_t *) data; part_t *part; - log_verbose2("Begin Part (%p)", data); - part = (part_t *)malloc(sizeof(part_t)); + log_verbose2 ("Begin Part (%p)", data); + part = (part_t *) malloc (sizeof (part_t)); part->next = NULL; @@ -577,40 +583,40 @@ void _mime_part_begin(void *data) cbdata->header_search = 0; #ifdef WIN32 - sprintf(buffer, "%s\\mime_%p_%d.part", cbdata->root_dir, - cbdata, cbdata->part_id++); + sprintf (buffer, "%s\\mime_%p_%d.part", cbdata->root_dir, + cbdata, cbdata->part_id++); #else - sprintf(buffer, "%s/mime_%p_%d.part", cbdata->root_dir, - cbdata, cbdata->part_id++); + sprintf (buffer, "%s/mime_%p_%d.part", cbdata->root_dir, + cbdata, cbdata->part_id++); #endif /* log_info2("Creating FILE ('%s') deleteOnExit=1", buffer);*/ part->deleteOnExit = 1; - cbdata->current_fd = fopen(buffer, "wb"); + cbdata->current_fd = fopen (buffer, "wb"); if (cbdata->current_fd) - strcpy(cbdata->current_part->filename, buffer); + strcpy (cbdata->current_part->filename, buffer); else - log_error2("Can not open file for write '%s'", buffer); + log_error2 ("Can not open file for write '%s'", buffer); } -static -void _mime_part_end(void *data) +static void +_mime_part_end (void *data) { - mime_callback_data_t *cbdata = (mime_callback_data_t*)data; - log_verbose2("End Part (%p)", data); + mime_callback_data_t *cbdata = (mime_callback_data_t *) data; + log_verbose2 ("End Part (%p)", data); if (cbdata->current_fd) { - fclose(cbdata->current_fd); + fclose (cbdata->current_fd); cbdata->current_fd = NULL; } } -static -hpair_t *_mime_process_header(char *buffer) +static hpair_t * +_mime_process_header (char *buffer) { - int i=0, c=0, proc_key, begin=0; + int i = 0, c = 0, proc_key, begin = 0; hpair_t *first = NULL, *last = NULL; char key[1054], value[1054]; @@ -620,22 +626,22 @@ hpair_t *_mime_process_header(char *buffer) while (buffer[i] != '\0') { - if (buffer[i] == '\r' && buffer[i+1] == '\n') + if (buffer[i] == '\r' && buffer[i + 1] == '\n') { value[c] = '\0'; if (last) { - last->next = hpairnode_new(key, value, NULL); - last = last->next; + last->next = hpairnode_new (key, value, NULL); + last = last->next; } else { - first = last = hpairnode_new(key, value, NULL); + first = last = hpairnode_new (key, value, NULL); } proc_key = 1; c = 0; i++; - } + } else if (buffer[i] == ':') { key[c] = '\0'; @@ -643,7 +649,7 @@ hpair_t *_mime_process_header(char *buffer) begin = 0; proc_key = 0; } - else + else { if (proc_key) key[c++] = buffer[i]; @@ -661,19 +667,23 @@ hpair_t *_mime_process_header(char *buffer) } -static -void _mime_received_bytes(void *data, const unsigned char* bytes, int size) +static void +_mime_received_bytes (void *data, const unsigned char *bytes, int size) { - int i=0; + int i = 0; char *id, *type, *location; - mime_callback_data_t *cbdata = (mime_callback_data_t*)data; + mime_callback_data_t *cbdata = (mime_callback_data_t *) data; - if (!cbdata ) { - log_error1("MIME transport error Called <received bytes> without initializing\n"); + if (!cbdata) + { + log_error1 + ("MIME transport error Called <received bytes> without initializing\n"); return; } - if (!cbdata->current_part) { - log_error1("MIME transport error Called <received bytes> without initializing\n"); + if (!cbdata->current_part) + { + log_error1 + ("MIME transport error Called <received bytes> without initializing\n"); return; } /* log_verbose4("Received %d bytes (%p), header_search = %d", @@ -682,7 +692,7 @@ void _mime_received_bytes(void *data, const unsigned char* bytes, int size) if (cbdata->header_search < 4) { /* Find \r\n\r\n in bytes */ - for (i=0;i<size;i++) + for (i = 0; i < size; i++) { if (cbdata->header_search == 0) { @@ -728,25 +738,30 @@ void _mime_received_bytes(void *data, const unsigned char* bytes, int size) cbdata->header[cbdata->header_index++] = '\n'; cbdata->header[cbdata->header_index++] = '\0'; cbdata->header_search = 4; - cbdata->current_part->header = _mime_process_header(cbdata->header); - hpairnode_dump_deep(cbdata->current_part->header); + cbdata->current_part->header = + _mime_process_header (cbdata->header); + hpairnode_dump_deep (cbdata->current_part->header); /* set id */ - id = hpairnode_get(cbdata->current_part->header, HEADER_CONTENT_ID); + id = + hpairnode_get (cbdata->current_part->header, HEADER_CONTENT_ID); if (id != NULL) { - strcpy(cbdata->current_part->id, id); - if (!strcmp(id, cbdata->root_id)) + strcpy (cbdata->current_part->id, id); + if (!strcmp (id, cbdata->root_id)) cbdata->message->root_part = cbdata->current_part; } - location = hpairnode_get(cbdata->current_part->header, HEADER_CONTENT_LOCATION); + location = + hpairnode_get (cbdata->current_part->header, + HEADER_CONTENT_LOCATION); if (location != NULL) { - strcpy(cbdata->current_part->location, location); + strcpy (cbdata->current_part->location, location); } - type = hpairnode_get(cbdata->current_part->header, HEADER_CONTENT_TYPE); + type = + hpairnode_get (cbdata->current_part->header, HEADER_CONTENT_TYPE); if (type != NULL) { - strcpy(cbdata->current_part->content_type, type); + strcpy (cbdata->current_part->content_type, type); } i++; break; @@ -761,17 +776,17 @@ void _mime_received_bytes(void *data, const unsigned char* bytes, int size) } } /* TODO (#1#): Check for cbdata->header overflow */ - - } /* for (i=0;i<size;i++) */ - } /* if (cbdata->header_search < 4) */ - if (i >= size-1) + } /* for (i=0;i<size;i++) */ + } /* if (cbdata->header_search < 4) */ + + if (i >= size - 1) return; - /* Write remaining bytes into the file or buffer (if root) - (buffer is disabled in this version) */ + /* Write remaining bytes into the file or buffer (if root) (buffer is + disabled in this version) */ if (cbdata->current_fd) - fwrite(&(bytes[i]), 1, size - i, cbdata->current_fd); + fwrite (&(bytes[i]), 1, size - i, cbdata->current_fd); } @@ -780,25 +795,25 @@ void _mime_received_bytes(void *data, const unsigned char* bytes, int size) */ attachments_t * -mime_message_parse(http_input_stream_t *in, const char* root_id, - const char* boundary, const char* dest_dir) +mime_message_parse (http_input_stream_t * in, const char *root_id, + const char *boundary, const char *dest_dir) { MIME_parser_status status; MIME_callbacks callbacks; - attachments_t* message; + attachments_t *message; - mime_callback_data_t *cbdata = (mime_callback_data_t*) - malloc(sizeof(mime_callback_data_t)); + mime_callback_data_t *cbdata = (mime_callback_data_t *) + malloc (sizeof (mime_callback_data_t)); cbdata->part_id = 100; cbdata->buffer_capacity = 0; - cbdata-> current_fd = NULL; + cbdata->current_fd = NULL; cbdata->current_part = NULL; cbdata->header_index = 0; cbdata->header_search = 0; - strcpy(cbdata->root_id, root_id); - strcpy(cbdata->root_dir, dest_dir); - message = (attachments_t*)malloc(sizeof(attachments_t)); + strcpy (cbdata->root_id, root_id); + strcpy (cbdata->root_dir, dest_dir); + message = (attachments_t *) malloc (sizeof (attachments_t)); cbdata->message = message; cbdata->message->parts = NULL; cbdata->message->root_part = NULL; @@ -809,42 +824,43 @@ mime_message_parse(http_input_stream_t *in, const char* root_id, callbacks.part_end_cb = _mime_part_end; callbacks.received_bytes_cb = _mime_received_bytes; - status = MIME_parse(mime_streamreader_function, - in, boundary, &callbacks, cbdata); + status = MIME_parse (mime_streamreader_function, + in, boundary, &callbacks, cbdata); if (status == MIME_PARSER_OK) { - free(cbdata); + free (cbdata); return message; } else { - log_error2("MIME parser error '%s'!", - status == MIME_PARSER_READ_ERROR ? "read error" : "Incomplete message"); + log_error2 ("MIME parser error '%s'!", + status == + MIME_PARSER_READ_ERROR ? "read error" : "Incomplete message"); return NULL; } } attachments_t * -mime_message_parse_from_file(FILE *in, const char* root_id, - const char* boundary, const char* dest_dir) +mime_message_parse_from_file (FILE * in, const char *root_id, + const char *boundary, const char *dest_dir) { MIME_parser_status status; MIME_callbacks callbacks; - attachments_t* message; + attachments_t *message; - mime_callback_data_t *cbdata = (mime_callback_data_t*) - malloc(sizeof(mime_callback_data_t)); + mime_callback_data_t *cbdata = (mime_callback_data_t *) + malloc (sizeof (mime_callback_data_t)); cbdata->part_id = 100; cbdata->buffer_capacity = 0; - cbdata-> current_fd = NULL; + cbdata->current_fd = NULL; cbdata->current_part = NULL; cbdata->header_index = 0; cbdata->header_search = 0; - strcpy(cbdata->root_id, root_id); - strcpy(cbdata->root_dir, dest_dir); - message = (attachments_t*)malloc(sizeof(attachments_t)); + strcpy (cbdata->root_id, root_id); + strcpy (cbdata->root_dir, dest_dir); + message = (attachments_t *) malloc (sizeof (attachments_t)); cbdata->message = message; cbdata->message->parts = NULL; cbdata->message->root_part = NULL; @@ -855,77 +871,82 @@ mime_message_parse_from_file(FILE *in, const char* root_id, callbacks.part_end_cb = _mime_part_end; callbacks.received_bytes_cb = _mime_received_bytes; - status = MIME_parse(MIME_filereader_function, - in, boundary, &callbacks, cbdata); + status = MIME_parse (MIME_filereader_function, + in, boundary, &callbacks, cbdata); if (status == MIME_PARSER_OK) { - free(cbdata); + free (cbdata); return message; } else { /* TODO (#1#): Free objects */ - log_error2("MIME parser error '%s'!", - status == MIME_PARSER_READ_ERROR ? "general error" : "Incomplete message"); + log_error2 ("MIME parser error '%s'!", + status == + MIME_PARSER_READ_ERROR ? "general error" : + "Incomplete message"); return NULL; } } -herror_t mime_get_attachments(content_type_t *ctype, http_input_stream_t *in, attachments_t **dest) +herror_t +mime_get_attachments (content_type_t * ctype, http_input_stream_t * in, + attachments_t ** dest) { /* MIME variables */ - attachments_t *mimeMessage; - part_t *part, *tmp_part=NULL; - char *boundary, *root_id; + attachments_t *mimeMessage; + part_t *part, *tmp_part = NULL; + char *boundary, *root_id; /* Check for MIME message */ - if (!(ctype && - !strcmp(ctype->type, "multipart/related"))) - return herror_new("mime_get_attachments", MIME_ERROR_NOT_MIME_MESSAGE, - "Not a MIME message '%s'", ctype->type); + if (!(ctype && !strcmp (ctype->type, "multipart/related"))) + return herror_new ("mime_get_attachments", MIME_ERROR_NOT_MIME_MESSAGE, + "Not a MIME message '%s'", ctype->type); - boundary = hpairnode_get(ctype->params, "boundary"); - root_id = hpairnode_get(ctype->params, "start"); + boundary = hpairnode_get (ctype->params, "boundary"); + root_id = hpairnode_get (ctype->params, "start"); if (boundary == NULL) { - /* TODO (#1#): Handle Error in http form */ - log_error1("'boundary' not set for multipart/related"); - return herror_new("mime_get_attachments", MIME_ERROR_NO_BOUNDARY_PARAM, - "'boundary' not set for multipart/related"); + /* TODO (#1#): Handle Error in http form */ + log_error1 ("'boundary' not set for multipart/related"); + return herror_new ("mime_get_attachments", MIME_ERROR_NO_BOUNDARY_PARAM, + "'boundary' not set for multipart/related"); } if (root_id == NULL) { - /* TODO (#1#): Handle Error in http form */ - log_error1("'start' not set for multipart/related"); - return herror_new("mime_get_attachments", MIME_ERROR_NO_START_PARAM, - "'start' not set for multipart/related"); + /* TODO (#1#): Handle Error in http form */ + log_error1 ("'start' not set for multipart/related"); + return herror_new ("mime_get_attachments", MIME_ERROR_NO_START_PARAM, + "'start' not set for multipart/related"); } - mimeMessage = mime_message_parse(in, root_id, boundary, hoption_get(HOPTION_TMP_DIR)); + mimeMessage = + mime_message_parse (in, root_id, boundary, hoption_get (HOPTION_TMP_DIR)); if (mimeMessage == NULL) { - /* TODO (#1#): Handle Error in http form */ - log_error1("MIME Parse Error"); - return herror_new("mime_get_attachments", MIME_ERROR_PARSE_ERROR, - "MIME Parse Error"); + /* TODO (#1#): Handle Error in http form */ + log_error1 ("MIME Parse Error"); + return herror_new ("mime_get_attachments", MIME_ERROR_PARSE_ERROR, + "MIME Parse Error"); } /* Find root */ if (!mimeMessage->root_part) { - attachments_free(mimeMessage); - return herror_new("mime_get_attachments", MIME_ERROR_NO_ROOT_PART, - "No root part found!"); + attachments_free (mimeMessage); + return herror_new ("mime_get_attachments", MIME_ERROR_NO_ROOT_PART, + "No root part found!"); } /* delete root_part from list */ part = mimeMessage->parts; - while (part) { + while (part) + { if (part == mimeMessage->root_part) { if (tmp_part) @@ -941,5 +962,3 @@ herror_t mime_get_attachments(content_type_t *ctype, http_input_stream_t *in, at *dest = mimeMessage; return H_OK; } - - |