*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* References for "media-type multipart/mixed :
* http://www.iana.org/assignments/media-types/index.html
- * http://www.rfc-editor.org/rfc/rfc2045.txt
+ * http://www.ietf.org/rfc/rfc2045.txt?number=2045
* http://www.rfc-editor.org/rfc/rfc2046.txt
* http://www.rfc-editor.org/rfc/rfc2047.txt
* http://www.rfc-editor.org/rfc/rfc2048.txt
* Part of the code is modeled from the SIP and HTTP dissectors
*
* General format of a MIME multipart document:
- * [ preamble line-end ]
- * dash-boundary transport-padding line-end
- * body-part
- * *encapsulation
- * close-delimiter transport-padding
- * [ line-end epilogue ]
+ * [ preamble line-end ]
+ * dash-boundary transport-padding line-end
+ * body-part
+ * *encapsulation
+ * close-delimiter transport-padding
+ * [ line-end epilogue ]
*
* Where:
- * dash-boundary := "--" boundary
- * encapsulation := delimiter transport-padding line-end body-part
- * delimiter := line-end body-part
- * close-delimiter := delimiter "--"
- * body-part := MIME-part-headers [ line-end *OCTET ]
- * transport-padding := *LWSP-char
- *
+ * dash-boundary := "--" boundary
+ * encapsulation := delimiter transport-padding line-end body-part
+ * delimiter := line-end body-part
+ * close-delimiter := delimiter "--"
+ * body-part := MIME-part-headers [ line-end *OCTET ]
+ * transport-padding := *LWSP-char
+ *
* Note that line-end is often a LF instead of a CRLF.
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
-#include <stdio.h>
-#include <stdlib.h>
#include <string.h>
-#include <epan/prefs.h>
-#include <glib.h>
#include <ctype.h>
-#include <epan/base64.h>
-#include <epan/emem.h>
+
+#include <glib.h>
#include <epan/packet.h>
+#include <epan/prefs.h>
+#include <epan/base64.h>
+#include <epan/wmem/wmem.h>
#include "packet-imf.h"
} multipart_header_t;
static const multipart_header_t multipart_headers[] = {
- { "Unknown-header", NULL }, /* Pad so that the real headers start at index 1 */
- { "Content-Disposition", NULL },
- { "Content-Encoding", "e" },
- { "Content-Id", NULL },
- { "Content-Language", NULL },
- { "Content-Length", "l" },
- { "Content-Transfer-Encoding", NULL },
- { "Content-Type", "c" },
+ { "Unknown-header", NULL }, /* Pad so that the real headers start at index 1 */
+ { "Content-Disposition", NULL },
+ { "Content-Encoding", "e" },
+ { "Content-Id", NULL },
+ { "Content-Language", NULL },
+ { "Content-Length", "l" },
+ { "Content-Transfer-Encoding", NULL },
+ { "Content-Type", "c" },
};
-#define POS_CONTENT_DISPOSITION 1
-#define POS_CONTENT_ENCODING 2
-#define POS_CONTENT_ID 3
-#define POS_CONTENT_LANGUAGE 4
-#define POS_CONTENT_LENGTH 5
-#define POS_CONTENT_TRANSFER_ENCODING 6
-#define POS_CONTENT_TYPE 7
+#define POS_CONTENT_DISPOSITION 1
+#define POS_CONTENT_ENCODING 2
+#define POS_CONTENT_ID 3
+#define POS_CONTENT_LANGUAGE 4
+#define POS_CONTENT_LENGTH 5
+#define POS_CONTENT_TRANSFER_ENCODING 6
+#define POS_CONTENT_TYPE 7
/* Initialize the header fields */
static gint hf_multipart_type = -1;
static gint hf_multipart_part = -1;
static gint hf_header_array[] = {
- -1, /* "Unknown-header" - Pad so that the real headers start at index 1 */
- -1, /* "Content-Disposition" */
- -1, /* "Content-Encoding" */
- -1, /* "Content-Id" */
- -1, /* "Content-Language" */
- -1, /* "Content-Length" */
- -1, /* "Content-Transfer-Encoding" */
- -1, /* "Content-Type" */
+ -1, /* "Unknown-header" - Pad so that the real headers start at index 1 */
+ -1, /* "Content-Disposition" */
+ -1, /* "Content-Encoding" */
+ -1, /* "Content-Id" */
+ -1, /* "Content-Language" */
+ -1, /* "Content-Length" */
+ -1, /* "Content-Transfer-Encoding" */
+ -1, /* "Content-Type" */
};
/* Define media_type/Content type table */
static dissector_handle_t data_handle;
static dissector_handle_t media_handle;
-/* Determins if bodies with no media type dissector shoud be displayed
+/* Determins if bodies with no media type dissector shoud be displayed
* as raw text, may cause problems with images sound etc
* TODO improve to check for different content types ?
*/
typedef struct {
- const char *type; /* Type of multipart */
- char *boundary; /* Boundary string (enclosing quotes removed if any) */
- guint boundary_length; /* Length of the boundary string */
+ const char *type; /* Type of multipart */
+ char *boundary; /* Boundary string (enclosing quotes removed if any) */
+ guint boundary_length; /* Length of the boundary string */
} multipart_info_t;
static gint
find_first_boundary(tvbuff_t *tvb, gint start, const guint8 *boundary,
- gint boundary_len, gint *boundary_line_len, gboolean *last_boundary);
+ gint boundary_len, gint *boundary_line_len, gboolean *last_boundary);
static gint
find_next_boundary(tvbuff_t *tvb, gint start, const guint8 *boundary,
- gint boundary_len, gint *boundary_line_len, gboolean *last_boundary);
+ gint boundary_len, gint *boundary_line_len, gboolean *last_boundary);
static gint
process_preamble(proto_tree *tree, tvbuff_t *tvb, const guint8 *boundary,
- gint boundary_len, gboolean *last_boundary);
+ gint boundary_len, gboolean *last_boundary);
static gint
process_body_part(proto_tree *tree, tvbuff_t *tvb, const guint8 *boundary,
- gint boundary_len, packet_info *pinfo, gint start,
- gboolean *last_boundary);
+ gint boundary_len, packet_info *pinfo, gint start,
+ gboolean *last_boundary);
static gint
is_known_multipart_header(const char *header_str, guint len);
static gint
index_of_char(const char *str, const char c);
-char *
-unfold_and_compact_mime_header(const char *lines, gint *first_colon_offset);
/* Return a tvb that contains the binary representation of a base64
static tvbuff_t *
base64_decode(packet_info *pinfo, tvbuff_t *b64_tvb, char *name)
{
- tvbuff_t *tvb;
- char *data;
- size_t len;
-
- data = g_strdup(tvb_get_ephemeral_string(b64_tvb, 0, tvb_length_remaining(b64_tvb, 0)));
-
- len = epan_base64_decode(data);
- tvb = tvb_new_real_data((const guint8 *)data, len, len);
+ char *data;
+ tvbuff_t *tvb;
+ data = tvb_get_string(wmem_packet_scope(), b64_tvb, 0, tvb_length(b64_tvb));
- tvb_set_free_cb(tvb, g_free);
+ tvb = base64_to_tvb(b64_tvb, data);
+ add_new_data_source(pinfo, tvb, name);
- add_new_data_source(pinfo, tvb, name);
-
- return tvb;
+ return tvb;
}
/*
* Unfold and clean up a MIME-like header, and process LWS as follows:
- * o Preserves LWS in quoted text
- * o Remove LWS before and after a separator
- * o Remove trailing LWS
- * o Replace other LWS with a single space
- * Set value to the start of the value
+ * o Preserves LWS in quoted text
+ * o Remove LWS before and after a separator
+ * o Remove trailing LWS
+ * o Replace other LWS with a single space
+ * Set value to the start of the value
* Return the cleaned-up RFC2822 header (buffer must be freed).
*/
-char *
+static char *
unfold_and_compact_mime_header(const char *lines, gint *first_colon_offset)
{
- const char *p = lines;
- char c;
- char *ret, *q;
- char sep_seen = 0; /* Did we see a separator ":;," */
- char lws = FALSE; /* Did we see LWS (incl. folding) */
- gint colon = -1;
-
- if (! lines) return NULL;
-
- c = *p;
- ret = g_malloc(strlen(lines) + 1);
- q = ret;
-
- while (c) {
- if (c == ':') {
- lws = FALSE; /* Prevent leading LWS from showing up */
- if (colon == -1) {/* First colon */
- colon = q - ret;
- }
- *(q++) = sep_seen = c;
- p++;
- } else if (c == ';' || c == ',' || c == '=') {
- lws = FALSE; /* Prevent leading LWS from showing up */
- *(q++) = sep_seen = c;
- p++;
- } else if (c == ' ' || c == '\t') {
- lws = TRUE;
- p++;
- } else if (c == '\n') {
- lws = FALSE; /* Skip trailing LWS */
- if ((c = *(p+1))) {
- if (c == ' ' || c == '\t') { /* Header unfolding */
- lws = TRUE;
- p += 2;
- } else {
- *q = c = 0; /* Stop */
- }
- }
- } else if (c == '\r') {
- lws = FALSE;
- if ((c = *(p+1))) {
- if (c == '\n') {
- if ((c = *(p+2))) {
- if (c == ' ' || c == '\t') { /* Header unfolding */
- lws = TRUE;
- p += 3;
- } else {
- *q = c = 0; /* Stop */
- }
- }
- } else if (c == ' ' || c == '\t') { /* Header unfolding */
- lws = TRUE;
- p += 2;
- } else {
- *q = c = 0; /* Stop */
- }
- }
- } else if (c == '"') { /* Start of quoted-string */
- lws = FALSE;
- *(q++) = c;
- while (c) {
- c = *(q++) = *(++p);
- if (c == '"') {
- p++; /* Skip closing quote */
- break;
- }
- }
- /* if already zero terminated now, rewind one char to avoid an "off by one" */
- if(c == 0) {
- q--;
- }
- } else { /* Regular character */
- if (sep_seen) {
- sep_seen = 0;
- lws = FALSE;
- } else {
- if (lws) {
- *(q++) = ' ';
- lws = FALSE;
- }
- }
- lws = FALSE;
- *(q++) = c;
- p++; /* OK */
- }
-
- if (c) {
- c = *p;
- }
- }
- *q = 0;
-
- *first_colon_offset = colon;
- return (ret);
+ const char *p = lines;
+ char c;
+ char *ret, *q;
+ char sep_seen = 0; /* Did we see a separator ":;," */
+ char lws = FALSE; /* Did we see LWS (incl. folding) */
+ gint colon = -1;
+
+ if (! lines) return NULL;
+
+ c = *p;
+ ret = (char *)wmem_alloc(wmem_packet_scope(), strlen(lines) + 1);
+ q = ret;
+
+ while (c) {
+ if (c == ':') {
+ lws = FALSE; /* Prevent leading LWS from showing up */
+ if (colon == -1) {/* First colon */
+ colon = (gint) (q - ret);
+ }
+ *(q++) = sep_seen = c;
+ p++;
+ } else if (c == ';' || c == ',' || c == '=') {
+ lws = FALSE; /* Prevent leading LWS from showing up */
+ *(q++) = sep_seen = c;
+ p++;
+ } else if (c == ' ' || c == '\t') {
+ lws = TRUE;
+ p++;
+ } else if (c == '\n') {
+ lws = FALSE; /* Skip trailing LWS */
+ if ((c = *(p+1))) {
+ if (c == ' ' || c == '\t') { /* Header unfolding */
+ lws = TRUE;
+ p += 2;
+ } else {
+ *q = c = 0; /* Stop */
+ }
+ }
+ } else if (c == '\r') {
+ lws = FALSE;
+ if ((c = *(p+1))) {
+ if (c == '\n') {
+ if ((c = *(p+2))) {
+ if (c == ' ' || c == '\t') { /* Header unfolding */
+ lws = TRUE;
+ p += 3;
+ } else {
+ *q = c = 0; /* Stop */
+ }
+ }
+ } else if (c == ' ' || c == '\t') { /* Header unfolding */
+ lws = TRUE;
+ p += 2;
+ } else {
+ *q = c = 0; /* Stop */
+ }
+ }
+ } else if (c == '"') { /* Start of quoted-string */
+ lws = FALSE;
+ *(q++) = c;
+ while (c) {
+ c = *(q++) = *(++p);
+ if (c == '"') {
+ p++; /* Skip closing quote */
+ break;
+ }
+ }
+ /* if already zero terminated now, rewind one char to avoid an "off by one" */
+ if(c == 0) {
+ q--;
+ }
+ } else { /* Regular character */
+ if (sep_seen) {
+ sep_seen = 0;
+ } else {
+ if (lws) {
+ *(q++) = ' ';
+ }
+ }
+ lws = FALSE;
+ *(q++) = c;
+ p++; /* OK */
+ }
+
+ if (c) {
+ c = *p;
+ }
+ }
+ *q = 0;
+
+ *first_colon_offset = colon;
+ return (ret);
}
/* Return the index of a given char in the given string,
static gint
index_of_char(const char *str, const char c)
{
- gint len = 0;
- const char *p = str;
+ gint len = 0;
+ const char *p = str;
- while (*p && *p != c) {
- p++;
- len++;
- }
+ while (*p && *p != c) {
+ p++;
+ len++;
+ }
- if (*p)
- return len;
- return -1;
+ if (*p)
+ return len;
+ return -1;
}
static char *find_parameter(char *parameters, const char *key, int *retlen)
{
- char *start, *p;
- int keylen = 0;
- int len = 0;
-
- if(!parameters || !*parameters || !key || !(keylen = strlen(key)))
- /* we won't be able to find anything */
- return NULL;
-
- p = parameters;
-
- while (*p) {
-
- while ((*p) && isspace((guchar)*p))
- p++; /* Skip white space */
-
- if (strncasecmp(p, key, keylen) == 0)
- break;
- /* Skip to next parameter */
- p = strchr(p, ';');
- if (p == NULL)
- {
- return NULL;
- }
- p++; /* Skip semicolon */
-
- }
- start = p + keylen;
- if (start[0] == 0) {
- return NULL;
- }
-
- /*
- * Process the parameter value
- */
- if (start[0] == '"') {
- /*
- * Parameter value is a quoted-string
- */
- start++; /* Skip the quote */
- len = index_of_char(start, '"');
- if (len < 0) {
- /*
- * No closing quote
- */
- return NULL;
- }
- } else {
- /*
- * Look for end of boundary
- */
- p = start;
- while (*p) {
- if (*p == ';' || isspace((guchar)*p))
- break;
- p++;
- len++;
- }
- }
-
- if(retlen)
- (*retlen) = len;
-
- return start;
+ char *start, *p;
+ int keylen = 0;
+ int len = 0;
+
+ if(!parameters || !*parameters || !key || strlen(key) == 0)
+ /* we won't be able to find anything */
+ return NULL;
+
+ keylen = (int) strlen(key);
+ p = parameters;
+
+ while (*p) {
+
+ while ((*p) && isspace((guchar)*p))
+ p++; /* Skip white space */
+
+ if (g_ascii_strncasecmp(p, key, keylen) == 0)
+ break;
+ /* Skip to next parameter */
+ p = strchr(p, ';');
+ if (p == NULL)
+ {
+ return NULL;
+ }
+ p++; /* Skip semicolon */
+
+ }
+ start = p + keylen;
+ if (start[0] == 0) {
+ return NULL;
+ }
+
+ /*
+ * Process the parameter value
+ */
+ if (start[0] == '"') {
+ /*
+ * Parameter value is a quoted-string
+ */
+ start++; /* Skip the quote */
+ len = index_of_char(start, '"');
+ if (len < 0) {
+ /*
+ * No closing quote
+ */
+ return NULL;
+ }
+ } else {
+ /*
+ * Look for end of boundary
+ */
+ p = start;
+ while (*p) {
+ if (*p == ';' || isspace((guchar)*p))
+ break;
+ p++;
+ len++;
+ }
+ }
+
+ if(retlen)
+ (*retlen) = len;
+
+ return start;
}
/* Retrieve the media information from pinfo->private_data,
* and compute the boundary string and its length.
* Return a pointer to a filled-in multipart_info_t, or NULL on failure.
- *
+ *
* Boundary delimiters must not appear within the encapsulated material,
* and must be no longer than 70 characters, not counting the two
* leading hyphens. (quote from rfc2046)
static multipart_info_t *
get_multipart_info(packet_info *pinfo)
{
- const char *start;
- int len = 0;
- multipart_info_t *m_info = NULL;
- const char *type = pinfo->match_string;
- char *parameters;
- gint dummy;
-
- if ((type == NULL) || (pinfo->private_data == NULL)) {
- /*
- * We need both a content type AND parameters
- * for multipart dissection.
- */
- return NULL;
- }
-
- /* Clean up the parameters */
- parameters = unfold_and_compact_mime_header(pinfo->private_data, &dummy);
-
- start = find_parameter(parameters, "boundary=", &len);
-
- if(!start) {
- g_free(parameters);
- return NULL;
- }
-
- /*
- * There is a value for the boundary string
- */
- m_info = g_malloc(sizeof(multipart_info_t));
- m_info->type = type;
- m_info->boundary = g_strndup(start, len);
- m_info->boundary_length = len;
- g_free(parameters);
-
- return m_info;
+ const char *start;
+ int len = 0;
+ multipart_info_t *m_info = NULL;
+ const char *type = pinfo->match_string;
+ char *parameters;
+ gint dummy;
+
+ if ((type == NULL) || (pinfo->private_data == NULL)) {
+ /*
+ * We need both a content type AND parameters
+ * for multipart dissection.
+ */
+ return NULL;
+ }
+
+ /* Clean up the parameters */
+ parameters = unfold_and_compact_mime_header((const char *)pinfo->private_data, &dummy);
+
+ start = find_parameter(parameters, "boundary=", &len);
+
+ if(!start) {
+ return NULL;
+ }
+
+ /*
+ * There is a value for the boundary string
+ */
+ m_info = (multipart_info_t *)g_malloc(sizeof(multipart_info_t));
+ m_info->type = type;
+ m_info->boundary = g_strndup(start, len);
+ m_info->boundary_length = len;
+
+ return m_info;
}
static void
cleanup_multipart_info(void *data)
{
- multipart_info_t *m_info = data;
- if (m_info) {
- if (m_info->boundary)
- g_free(m_info->boundary);
- g_free(m_info);
- }
+ multipart_info_t *m_info = (multipart_info_t *)data;
+ if (m_info) {
+ g_free(m_info->boundary);
+ g_free(m_info);
+ }
}
/*
*/
static gint
find_first_boundary(tvbuff_t *tvb, gint start, const guint8 *boundary,
- gint boundary_len, gint *boundary_line_len, gboolean *last_boundary)
+ gint boundary_len, gint *boundary_line_len, gboolean *last_boundary)
{
- gint offset = start, next_offset, line_len, boundary_start;
-
- while (tvb_length_remaining(tvb, offset + 2 + boundary_len) > 0) {
- boundary_start = offset;
- if (((tvb_strneql(tvb, offset, (const guint8 *)"--", 2) == 0)
- && (tvb_strneql(tvb, offset + 2, boundary, boundary_len) == 0)))
- {
- /* Boundary string; now check if last */
- if ((tvb_length_remaining(tvb, offset + 2 + boundary_len + 2) >= 0)
- && (tvb_strneql(tvb, offset + 2 + boundary_len,
- (const guint8 *)"--", 2) == 0)) {
- *last_boundary = TRUE;
- } else {
- *last_boundary = FALSE;
- }
- /* Look for line end of the boundary line */
- line_len = tvb_find_line_end(tvb, offset, -1, &offset, FALSE);
- if (line_len == -1) {
- *boundary_line_len = -1;
- } else {
- *boundary_line_len = offset - boundary_start;
- }
- return boundary_start;
- }
- line_len = tvb_find_line_end(tvb, offset, -1, &next_offset, FALSE);
- if (line_len == -1) {
- return -1;
- }
- offset = next_offset;
- }
-
- return -1;
+ gint offset = start, next_offset, line_len, boundary_start;
+
+ while (tvb_length_remaining(tvb, offset + 2 + boundary_len) > 0) {
+ boundary_start = offset;
+ if (((tvb_strneql(tvb, offset, (const guint8 *)"--", 2) == 0)
+ && (tvb_strneql(tvb, offset + 2, boundary, boundary_len) == 0)))
+ {
+ /* Boundary string; now check if last */
+ if ((tvb_length_remaining(tvb, offset + 2 + boundary_len + 2) >= 0)
+ && (tvb_strneql(tvb, offset + 2 + boundary_len,
+ (const guint8 *)"--", 2) == 0)) {
+ *last_boundary = TRUE;
+ } else {
+ *last_boundary = FALSE;
+ }
+ /* Look for line end of the boundary line */
+ line_len = tvb_find_line_end(tvb, offset, -1, &offset, FALSE);
+ if (line_len == -1) {
+ *boundary_line_len = -1;
+ } else {
+ *boundary_line_len = offset - boundary_start;
+ }
+ return boundary_start;
+ }
+ line_len = tvb_find_line_end(tvb, offset, -1, &next_offset, FALSE);
+ if (line_len == -1) {
+ return -1;
+ }
+ offset = next_offset;
+ }
+
+ return -1;
}
/*
*/
static gint
find_next_boundary(tvbuff_t *tvb, gint start, const guint8 *boundary,
- gint boundary_len, gint *boundary_line_len, gboolean *last_boundary)
+ gint boundary_len, gint *boundary_line_len, gboolean *last_boundary)
{
- gint offset = start, next_offset, line_len, boundary_start;
-
- while (tvb_length_remaining(tvb, offset + 2 + boundary_len) > 0) {
- line_len = tvb_find_line_end(tvb, offset, -1, &next_offset, FALSE);
- if (line_len == -1) {
- return -1;
- }
- boundary_start = offset + line_len;
- if (((tvb_strneql(tvb, next_offset, (const guint8 *)"--", 2) == 0)
- && (tvb_strneql(tvb, next_offset + 2, boundary, boundary_len) == 0)))
- {
- /* Boundary string; now check if last */
- if ((tvb_length_remaining(tvb, next_offset + 2 + boundary_len + 2) >= 0)
- && (tvb_strneql(tvb, next_offset + 2 + boundary_len,
- (const guint8 *)"--", 2) == 0)) {
- *last_boundary = TRUE;
- } else {
- *last_boundary = FALSE;
- }
- /* Look for line end of the boundary line */
- line_len = tvb_find_line_end(tvb, next_offset, -1, &offset, FALSE);
- if (line_len == -1) {
- *boundary_line_len = -1;
- } else {
- *boundary_line_len = offset - boundary_start;
- }
- return boundary_start;
- }
- offset = next_offset;
- }
-
- return -1;
+ gint offset = start, next_offset, line_len, boundary_start;
+
+ while (tvb_length_remaining(tvb, offset + 2 + boundary_len) > 0) {
+ line_len = tvb_find_line_end(tvb, offset, -1, &next_offset, FALSE);
+ if (line_len == -1) {
+ return -1;
+ }
+ boundary_start = offset + line_len;
+ if (((tvb_strneql(tvb, next_offset, (const guint8 *)"--", 2) == 0)
+ && (tvb_strneql(tvb, next_offset + 2, boundary, boundary_len) == 0)))
+ {
+ /* Boundary string; now check if last */
+ if ((tvb_length_remaining(tvb, next_offset + 2 + boundary_len + 2) >= 0)
+ && (tvb_strneql(tvb, next_offset + 2 + boundary_len,
+ (const guint8 *)"--", 2) == 0)) {
+ *last_boundary = TRUE;
+ } else {
+ *last_boundary = FALSE;
+ }
+ /* Look for line end of the boundary line */
+ line_len = tvb_find_line_end(tvb, next_offset, -1, &offset, FALSE);
+ if (line_len == -1) {
+ *boundary_line_len = -1;
+ } else {
+ *boundary_line_len = offset - boundary_start;
+ }
+ return boundary_start;
+ }
+ offset = next_offset;
+ }
+
+ return -1;
}
/*
* Process the multipart preamble:
- * [ preamble line-end ] dashed-boundary transport-padding line-end
+ * [ preamble line-end ] dashed-boundary transport-padding line-end
*
* Return the offset to the start of the first body-part.
*/
static gint
process_preamble(proto_tree *tree, tvbuff_t *tvb, const guint8 *boundary,
- gint boundary_len, gboolean *last_boundary)
+ gint boundary_len, gboolean *last_boundary)
{
- gint boundary_start, boundary_line_len, body_part_start;
-
- body_part_start = 0;
- boundary_start = find_first_boundary(tvb, 0, boundary, boundary_len,
- &boundary_line_len, last_boundary);
- if (boundary_start == 0) {
- if (tree) {
- proto_tree_add_text(tree, tvb, boundary_start, boundary_line_len,
- "First boundary: %s",
- tvb_format_text(tvb, boundary_start, boundary_line_len));
- }
- return boundary_start + boundary_line_len;
- } else if (boundary_start > 0) {
- if (boundary_line_len > 0) {
- gint body_part_start = boundary_start + boundary_line_len;
-
- if (tree) {
- if (body_part_start > 0) {
- proto_tree_add_text(tree, tvb, 0, body_part_start,
- "Preamble");
- }
- proto_tree_add_text(tree, tvb, boundary_start,
- boundary_line_len, "First boundary: %s",
- tvb_format_text(tvb, boundary_start,
- boundary_line_len));
- }
- return body_part_start;
- }
- }
- return -1;
+ gint boundary_start, boundary_line_len;
+
+ boundary_start = find_first_boundary(tvb, 0, boundary, boundary_len,
+ &boundary_line_len, last_boundary);
+ if (boundary_start == 0) {
+ if (tree) {
+ proto_tree_add_text(tree, tvb, boundary_start, boundary_line_len,
+ "First boundary: %s",
+ tvb_format_text(tvb, boundary_start, boundary_line_len));
+ }
+ return boundary_start + boundary_line_len;
+ } else if (boundary_start > 0) {
+ if (boundary_line_len > 0) {
+ gint body_part_start = boundary_start + boundary_line_len;
+
+ if (tree) {
+ if (body_part_start > 0) {
+ proto_tree_add_text(tree, tvb, 0, body_part_start,
+ "Preamble");
+ }
+ proto_tree_add_text(tree, tvb, boundary_start,
+ boundary_line_len, "First boundary: %s",
+ tvb_format_text(tvb, boundary_start,
+ boundary_line_len));
+ }
+ return body_part_start;
+ }
+ }
+ return -1;
}
/*
* Process a multipart body-part:
- * MIME-part-headers [ line-end *OCTET ]
- * line-end dashed-boundary transport-padding line-end
+ * MIME-part-headers [ line-end *OCTET ]
+ * line-end dashed-boundary transport-padding line-end
*
* If applicable, call a media subdissector.
*
*/
static gint
process_body_part(proto_tree *tree, tvbuff_t *tvb, const guint8 *boundary,
- gint boundary_len, packet_info *pinfo, gint start,
- gboolean *last_boundary)
+ gint boundary_len, packet_info *pinfo, gint start,
+ gboolean *last_boundary)
{
- proto_tree *subtree = NULL;
- proto_item *ti = NULL;
- gint offset = start, next_offset;
- char *parameters = NULL;
- gint body_start, boundary_start, boundary_line_len;
-
- char *content_type_str = NULL;
- char *content_encoding_str = NULL;
- char *filename = NULL;
- char *typename = NULL;
- int len = 0;
- gboolean last_field = FALSE;
-
- if (tree) {
- ti = proto_tree_add_item(tree, hf_multipart_part, tvb, start, 0, FALSE);
- subtree = proto_item_add_subtree(ti, ett_multipart_body);
- }
- /*
- * Process the MIME-part-headers
- */
-
- while (!last_field)
- {
- gint colon_offset;
- char *hdr_str;
- char *header_str;
-
- next_offset = imf_find_field_end(tvb, offset, tvb_length_remaining(tvb, offset), &last_field);
-
- hdr_str = tvb_get_ephemeral_string(tvb, offset, next_offset - offset);
-
- header_str = unfold_and_compact_mime_header(hdr_str, &colon_offset);
- if (colon_offset <= 0) {
- if (tree) {
- proto_tree_add_text(subtree, tvb, offset, next_offset - offset,
- "%s",
- tvb_format_text(tvb, offset, next_offset - offset));
- }
- } else {
- gint hf_index;
-
- /* Split header name from header value */
- header_str[colon_offset] = '\0';
- hf_index = is_known_multipart_header(header_str, colon_offset);
-
- if (hf_index == -1) {
- if (tree) {
- proto_tree_add_text(subtree, tvb, offset,
- next_offset - offset,
- "%s",
- tvb_format_text(tvb, offset, next_offset - offset));
- }
- } else {
- char *value_str = header_str + colon_offset + 1;
-
- if (tree) {
- proto_tree_add_string_format(subtree,
- hf_header_array[hf_index], tvb,
- offset, next_offset - offset,
- (const char *)value_str, "%s",
- tvb_format_text(tvb, offset, next_offset - offset));
- }
-
- switch (hf_index) {
- case POS_CONTENT_TYPE:
- {
- /* The Content-Type starts at colon_offset + 1 */
- gint semicolon_offset = index_of_char(
- value_str, ';');
-
- if (semicolon_offset > 0) {
- value_str[semicolon_offset] = '\0';
- parameters = ep_strdup(value_str + semicolon_offset + 1);
- } else {
- parameters = NULL;
- }
-#if GLIB_MAJOR_VERSION < 2
- content_type_str = g_strdup(value_str);
- g_strdown(content_type_str);
-#else
- content_type_str = g_ascii_strdown(value_str, -1);
-#endif
- /* Show content-type in root 'part' label */
- proto_item_append_text(ti, " (%s)", content_type_str);
-
- /* find the "name" parameter in case we don't find a content disposition "filename" */
- if((typename = find_parameter(parameters, "name=", &len)) != NULL) {
- typename = g_strndup(typename, len);
- }
- }
-
-
- break;
- case POS_CONTENT_TRANSFER_ENCODING:
- {
- /* The Content-Transfeing starts at colon_offset + 1 */
- gint cr_offset = index_of_char(value_str, '\r');
-
- if (cr_offset > 0) {
- value_str[cr_offset] = '\0';
- }
-#if GLIB_MAJOR_VERSION < 2
- content_encoding_str = g_strdup(value_str);
- g_strdown(content_encoding_str);
-#else
- content_encoding_str = g_ascii_strdown(value_str, -1);
-#endif
- }
- break;
- case POS_CONTENT_DISPOSITION:
- {
- /* find the "filename" parameter */
- if((filename = find_parameter(value_str, "filename=", &len)) != NULL) {
- filename = g_strndup(filename, len);
- }
- }
- break;
- default:
- break;
- }
- }
- }
- g_free(header_str);
- offset = next_offset;
- }
-
- body_start = next_offset;
-
- /*
- * Process the body
- */
-
- boundary_start = find_next_boundary(tvb, body_start, boundary, boundary_len,
- &boundary_line_len, last_boundary);
- if (boundary_start > 0) {
- gint body_len = boundary_start - body_start;
- tvbuff_t *tmp_tvb = tvb_new_subset(tvb, body_start,
- body_len, body_len);
-
- if (content_type_str) {
-
- /*
- * subdissection
- */
- void *save_private_data = pinfo->private_data;
- gboolean dissected;
-
- /*
- * Try and remove any content transfer encoding so that each sub-dissector
- * doesn't have to do it itself
- *
- */
-
- if(content_encoding_str && remove_base64_encoding) {
-
- if(!strncasecmp(content_encoding_str, "base64", 6))
- tmp_tvb = base64_decode(pinfo, tmp_tvb, filename ? filename : (typename ? typename : content_type_str));
-
- }
-
- pinfo->private_data = parameters;
- /*
- * First try the dedicated multipart dissector table
- */
- dissected = dissector_try_string(multipart_media_subdissector_table,
- content_type_str, tmp_tvb, pinfo, subtree);
- if (! dissected) {
- /*
- * Fall back to the default media dissector table
- */
- dissected = dissector_try_string(media_type_dissector_table,
- content_type_str, tmp_tvb, pinfo, subtree);
- }
- if (! dissected) {
- const char *save_match_string = pinfo->match_string;
- pinfo->match_string = content_type_str;
- call_dissector(media_handle, tmp_tvb, pinfo, subtree);
- pinfo->match_string = save_match_string;
- }
- pinfo->private_data = save_private_data;
- g_free(content_type_str);
- content_type_str = NULL;
- parameters = NULL; /* Shares same memory as content_type_str */
- } else {
- call_dissector(data_handle, tmp_tvb, pinfo, subtree);
- }
- if (tree) {
- proto_item_set_len(ti, boundary_start - start);
- if (*last_boundary == TRUE) {
- proto_tree_add_text(tree, tvb,
- boundary_start, boundary_line_len,
- "Last boundary: %s",
- tvb_format_text(tvb, boundary_start,
- boundary_line_len));
- } else {
- proto_tree_add_text(tree, tvb,
- boundary_start, boundary_line_len,
- "Boundary: %s",
- tvb_format_text(tvb, boundary_start,
- boundary_line_len));
- }
- }
-
- if(filename)
- g_free(filename);
- if(typename)
- g_free(typename);
-
- return boundary_start + boundary_line_len;
- }
-
- return -1;
+ proto_tree *subtree = NULL;
+ proto_item *ti = NULL;
+ gint offset = start, next_offset = 0;
+ char *parameters = NULL;
+ gint body_start, boundary_start, boundary_line_len;
+
+ char *content_type_str = NULL;
+ char *content_encoding_str = NULL;
+ char *filename = NULL;
+ char *mimetypename = NULL;
+ int len = 0;
+ gboolean last_field = FALSE;
+
+ if (tree) {
+ ti = proto_tree_add_item(tree, hf_multipart_part, tvb, start, 0, ENC_ASCII|ENC_NA);
+ subtree = proto_item_add_subtree(ti, ett_multipart_body);
+ }
+ /*
+ * Process the MIME-part-headers
+ */
+
+ while (!last_field)
+ {
+ gint colon_offset;
+ char *hdr_str;
+ char *header_str;
+
+ /* Look for the end of the header (denoted by cr)
+ * 3:d argument to imf_find_field_end() maxlen; must be last offset in the tvb.
+ */
+ next_offset = imf_find_field_end(tvb, offset, tvb_length_remaining(tvb, offset)+offset, &last_field);
+ /* If cr not found, won't have advanced - get out to avoid infinite loop! */
+ if (next_offset == offset) {
+ break;
+ }
+
+ hdr_str = tvb_get_string(wmem_packet_scope(), tvb, offset, next_offset - offset);
+
+ header_str = unfold_and_compact_mime_header(hdr_str, &colon_offset);
+ if (colon_offset <= 0) {
+ if (tree) {
+ proto_tree_add_text(subtree, tvb, offset, next_offset - offset,
+ "%s",
+ tvb_format_text(tvb, offset, next_offset - offset));
+ }
+ } else {
+ gint hf_index;
+
+ /* Split header name from header value */
+ header_str[colon_offset] = '\0';
+ hf_index = is_known_multipart_header(header_str, colon_offset);
+
+ if (hf_index == -1) {
+ if (tree) {
+ proto_tree_add_text(subtree, tvb, offset,
+ next_offset - offset,
+ "%s",
+ tvb_format_text(tvb, offset, next_offset - offset));
+ }
+ } else {
+ char *value_str = header_str + colon_offset + 1;
+
+ if (tree) {
+ proto_tree_add_string_format(subtree,
+ hf_header_array[hf_index], tvb,
+ offset, next_offset - offset,
+ (const char *)value_str, "%s",
+ tvb_format_text(tvb, offset, next_offset - offset));
+ }
+
+ switch (hf_index) {
+ case POS_CONTENT_TYPE:
+ {
+ /* The Content-Type starts at colon_offset + 1 */
+ gint semicolon_offset = index_of_char(
+ value_str, ';');
+
+ if (semicolon_offset > 0) {
+ value_str[semicolon_offset] = '\0';
+ parameters = wmem_strdup(wmem_packet_scope(), value_str + semicolon_offset + 1);
+ } else {
+ parameters = NULL;
+ }
+
+ content_type_str = g_ascii_strdown(value_str, -1);
+
+ /* Show content-type in root 'part' label */
+ proto_item_append_text(ti, " (%s)", content_type_str);
+
+ /* find the "name" parameter in case we don't find a content disposition "filename" */
+ if((mimetypename = find_parameter(parameters, "name=", &len)) != NULL) {
+ mimetypename = g_strndup(mimetypename, len);
+ }
+ }
+
+
+ break;
+ case POS_CONTENT_TRANSFER_ENCODING:
+ {
+ /* The Content-Transfeing starts at colon_offset + 1 */
+ gint cr_offset = index_of_char(value_str, '\r');
+
+ if (cr_offset > 0) {
+ value_str[cr_offset] = '\0';
+ }
+
+ content_encoding_str = g_ascii_strdown(value_str, -1);
+ }
+ break;
+ case POS_CONTENT_DISPOSITION:
+ {
+ /* find the "filename" parameter */
+ if((filename = find_parameter(value_str, "filename=", &len)) != NULL) {
+ filename = g_strndup(filename, len);
+ }
+ }
+ break;
+ default:
+ break;
+ }
+ }
+ }
+ offset = next_offset;
+ }
+
+ body_start = next_offset;
+
+ /*
+ * Process the body
+ */
+
+ boundary_start = find_next_boundary(tvb, body_start, boundary, boundary_len,
+ &boundary_line_len, last_boundary);
+ if (boundary_start > 0) {
+ gint body_len = boundary_start - body_start;
+ tvbuff_t *tmp_tvb = tvb_new_subset(tvb, body_start,
+ body_len, body_len);
+
+ if (content_type_str) {
+
+ /*
+ * subdissection
+ */
+ void *save_private_data = pinfo->private_data;
+ gboolean dissected;
+
+ /*
+ * Try and remove any content transfer encoding so that each sub-dissector
+ * doesn't have to do it itself
+ *
+ */
+
+ if(content_encoding_str && remove_base64_encoding) {
+
+ if(!g_ascii_strncasecmp(content_encoding_str, "base64", 6))
+ tmp_tvb = base64_decode(pinfo, tmp_tvb, filename ? filename : (mimetypename ? mimetypename : content_type_str));
+
+ }
+
+ pinfo->private_data = parameters;
+ /*
+ * First try the dedicated multipart dissector table
+ */
+ dissected = dissector_try_string(multipart_media_subdissector_table,
+ content_type_str, tmp_tvb, pinfo, subtree);
+ if (! dissected) {
+ /*
+ * Fall back to the default media dissector table
+ */
+ dissected = dissector_try_string(media_type_dissector_table,
+ content_type_str, tmp_tvb, pinfo, subtree);
+ }
+ if (! dissected) {
+ const char *save_match_string = pinfo->match_string;
+ pinfo->match_string = content_type_str;
+ call_dissector(media_handle, tmp_tvb, pinfo, subtree);
+ pinfo->match_string = save_match_string;
+ }
+ pinfo->private_data = save_private_data;
+ g_free(content_type_str);
+ content_type_str = NULL;
+ parameters = NULL; /* Shares same memory as content_type_str */
+ } else {
+ call_dissector(data_handle, tmp_tvb, pinfo, subtree);
+ }
+ if (tree) {
+ proto_item_set_len(ti, boundary_start - start);
+ if (*last_boundary == TRUE) {
+ proto_tree_add_text(tree, tvb,
+ boundary_start, boundary_line_len,
+ "Last boundary: %s",
+ tvb_format_text(tvb, boundary_start,
+ boundary_line_len));
+ } else {
+ proto_tree_add_text(tree, tvb,
+ boundary_start, boundary_line_len,
+ "Boundary: %s",
+ tvb_format_text(tvb, boundary_start,
+ boundary_line_len));
+ }
+ }
+
+ g_free(filename);
+ g_free(mimetypename);
+
+ return boundary_start + boundary_line_len;
+ }
+
+ g_free(filename);
+ g_free(mimetypename);
+
+ return -1;
}
/*
* Call this method to actually dissect the multipart body.
* NOTE - Only do so if a boundary string has been found!
*/
-static void dissect_multipart(tvbuff_t *tvb, packet_info *pinfo,
- proto_tree *tree)
+static int dissect_multipart(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
{
- proto_tree *subtree = NULL;
- proto_item *ti = NULL;
- multipart_info_t *m_info = get_multipart_info(pinfo);
- gint header_start = 0;
- guint8 *boundary;
- gint boundary_len;
- gint offset = 0;
- gboolean last_boundary = FALSE;
-
- if (m_info == NULL) {
- /*
- * We can't get the required multipart information
- */
- proto_tree_add_text(tree, tvb, 0, -1,
- "The multipart dissector could not find "
- "the required boundary parameter.");
- call_dissector(data_handle, tvb, pinfo, tree);
- return;
- }
- boundary = (guint8 *)m_info->boundary;
- boundary_len = m_info->boundary_length;
- /* Clean up the memory if an exception is thrown */
- /* CLEANUP_PUSH(cleanup_multipart_info, m_info); */
-
- /* Add stuff to the protocol tree */
- if (tree) {
- proto_item *type_ti;
- ti = proto_tree_add_item(tree, proto_multipart,
- tvb, 0, -1, FALSE);
- subtree = proto_item_add_subtree(ti, ett_multipart);
- proto_item_append_text(ti, ", Type: %s, Boundary: \"%s\"",
- m_info->type, m_info->boundary);
-
- /* Show multi-part type as a generated field */
- type_ti = proto_tree_add_string(subtree, hf_multipart_type,
- tvb, 0, 0, pinfo->match_string);
- PROTO_ITEM_SET_GENERATED(type_ti);
- }
-
- /*
- * Make no entries in Protocol column and Info column on summary display,
- * but stop sub-dissectors from clearing entered text in summary display.
- */
- if (check_col(pinfo->cinfo, COL_INFO))
- col_set_fence(pinfo->cinfo, COL_INFO);
-
- offset = 0;
-
- /*
- * Process the multipart preamble
- */
- header_start = process_preamble(subtree, tvb, boundary,
- boundary_len, &last_boundary);
- if (header_start == -1) {
- call_dissector(data_handle, tvb, pinfo, subtree);
- /* Clean up the dynamically allocated memory */
- cleanup_multipart_info(m_info);
- return;
- }
- /*
- * Process the encapsulated bodies
- */
- while (last_boundary == FALSE) {
- header_start = process_body_part(subtree, tvb, boundary, boundary_len,
- pinfo, header_start, &last_boundary);
- if (header_start == -1) {
- /* Clean up the dynamically allocated memory */
- cleanup_multipart_info(m_info);
- return;
- }
- }
- /*
- * Process the multipart trailer
- */
- if (tree) {
- if (tvb_length_remaining(tvb, header_start) > 0) {
- proto_tree_add_text(subtree, tvb, header_start, -1, "Trailer");
- }
- }
- /* Clean up the dynamically allocated memory */
- cleanup_multipart_info(m_info);
- return;
+ proto_tree *subtree = NULL;
+ proto_item *ti = NULL;
+ multipart_info_t *m_info = get_multipart_info(pinfo);
+ gint header_start = 0;
+ guint8 *boundary;
+ gint boundary_len;
+ gboolean last_boundary = FALSE;
+
+ if (m_info == NULL) {
+ /*
+ * We can't get the required multipart information
+ */
+ proto_tree_add_text(tree, tvb, 0, -1,
+ "The multipart dissector could not find "
+ "the required boundary parameter.");
+ call_dissector(data_handle, tvb, pinfo, tree);
+ return tvb_length(tvb);
+ }
+ boundary = (guint8 *)m_info->boundary;
+ boundary_len = m_info->boundary_length;
+ /* Clean up the memory if an exception is thrown */
+ /* CLEANUP_PUSH(cleanup_multipart_info, m_info); */
+
+ /* Add stuff to the protocol tree */
+ if (tree) {
+ proto_item *type_ti;
+ ti = proto_tree_add_item(tree, proto_multipart,
+ tvb, 0, -1, ENC_NA);
+ subtree = proto_item_add_subtree(ti, ett_multipart);
+ proto_item_append_text(ti, ", Type: %s, Boundary: \"%s\"",
+ m_info->type, m_info->boundary);
+
+ /* Show multi-part type as a generated field */
+ type_ti = proto_tree_add_string(subtree, hf_multipart_type,
+ tvb, 0, 0, pinfo->match_string);
+ PROTO_ITEM_SET_GENERATED(type_ti);
+ }
+
+ /*
+ * Make no entries in Protocol column and Info column on summary display,
+ * but stop sub-dissectors from clearing entered text in summary display.
+ */
+ col_set_fence(pinfo->cinfo, COL_INFO);
+
+ /*
+ * Process the multipart preamble
+ */
+ header_start = process_preamble(subtree, tvb, boundary,
+ boundary_len, &last_boundary);
+ if (header_start == -1) {
+ call_dissector(data_handle, tvb, pinfo, subtree);
+ /* Clean up the dynamically allocated memory */
+ cleanup_multipart_info(m_info);
+ return tvb_length(tvb);
+ }
+ /*
+ * Process the encapsulated bodies
+ */
+ while (last_boundary == FALSE) {
+ header_start = process_body_part(subtree, tvb, boundary, boundary_len,
+ pinfo, header_start, &last_boundary);
+ if (header_start == -1) {
+ /* Clean up the dynamically allocated memory */
+ cleanup_multipart_info(m_info);
+ return tvb_length(tvb);
+ }
+ }
+ /*
+ * Process the multipart trailer
+ */
+ if (tree) {
+ if (tvb_length_remaining(tvb, header_start) > 0) {
+ proto_tree_add_text(subtree, tvb, header_start, -1, "Trailer");
+ }
+ }
+ /* Clean up the dynamically allocated memory */
+ cleanup_multipart_info(m_info);
+ return tvb_length(tvb);
}
/* Returns index of method in multipart_headers */
static gint
is_known_multipart_header(const char *header_str, guint len)
{
- guint i;
-
- for (i = 1; i < array_length(multipart_headers); i++) {
- if (len == strlen(multipart_headers[i].name) &&
- strncasecmp(header_str, multipart_headers[i].name, len) == 0)
- return i;
- if (multipart_headers[i].compact_name != NULL &&
- len == strlen(multipart_headers[i].compact_name) &&
- strncasecmp(header_str, multipart_headers[i].compact_name, len) == 0)
- return i;
- }
-
- return -1;
+ guint i;
+
+ for (i = 1; i < array_length(multipart_headers); i++) {
+ if (len == strlen(multipart_headers[i].name) &&
+ g_ascii_strncasecmp(header_str, multipart_headers[i].name, len) == 0)
+ return i;
+ if (multipart_headers[i].compact_name != NULL &&
+ len == strlen(multipart_headers[i].compact_name) &&
+ g_ascii_strncasecmp(header_str, multipart_headers[i].compact_name, len) == 0)
+ return i;
+ }
+
+ return -1;
}
/*
{
/* Setup list of header fields See Section 1.6.1 for details */
- static hf_register_info hf[] = {
- { &hf_multipart_type,
- { "Type",
- "mime_multipart.type",
- FT_STRING, BASE_NONE, NULL, 0x00,
- "MIME multipart encapsulation type", HFILL
- }
- },
- { &hf_multipart_part,
- { "Encapsulated multipart part",
- "mime_multipart.part",
- FT_STRING, BASE_NONE, NULL, 0x00,
- "Encapsulated multipart part", HFILL
- }
- },
- { &hf_header_array[POS_CONTENT_DISPOSITION],
- { "Content-Disposition",
- "mime_multipart.header.content-disposition",
- FT_STRING, BASE_NONE, NULL, 0x00,
- "RFC 2183: Content-Disposition Header", HFILL
- }
- },
- { &hf_header_array[POS_CONTENT_ENCODING],
- { "Content-Encoding",
- "mime_multipart.header.content-encoding",
- FT_STRING, BASE_NONE, NULL, 0x00,
- "Content-Encoding Header", HFILL
- }
- },
- { &hf_header_array[POS_CONTENT_ID],
- { "Content-Id",
- "mime_multipart.header.content-id",
- FT_STRING, BASE_NONE, NULL, 0x00,
- "RFC 2045: Content-Id Header", HFILL
- }
- },
- { &hf_header_array[POS_CONTENT_LANGUAGE],
- { "Content-Language",
- "mime_multipart.header.content-language",
- FT_STRING, BASE_NONE, NULL, 0x00,
- "Content-Language Header", HFILL
- }
- },
- { &hf_header_array[POS_CONTENT_LENGTH],
- { "Content-Length",
- "mime_multipart.header.content-length",
- FT_STRING, BASE_NONE, NULL, 0x0,
- "Content-Length Header", HFILL
- }
- },
- { &hf_header_array[POS_CONTENT_TRANSFER_ENCODING],
- { "Content-Transfer-Encoding",
- "mime_multipart.header.content-transfer-encoding",
- FT_STRING, BASE_NONE, NULL, 0x00,
- "RFC 2045: Content-Transfer-Encoding Header", HFILL
- }
- },
- { &hf_header_array[POS_CONTENT_TYPE],
- { "Content-Type",
- "mime_multipart.header.content-type",
- FT_STRING, BASE_NONE,NULL,0x0,
- "Content-Type Header", HFILL
- }
- },
- };
-
- /*
- * Preferences
- */
- module_t *multipart_module;
-
- /*
- * Setup protocol subtree array
- */
- static gint *ett[] = {
- &ett_multipart,
- &ett_multipart_main,
- &ett_multipart_body,
- };
-
- /*
- * Register the protocol name and description
- */
- proto_multipart = proto_register_protocol(
- "MIME Multipart Media Encapsulation",
- "MIME multipart",
- "mime_multipart");
-
- /*
- * Required function calls to register
- * the header fields and subtrees used.
- */
- proto_register_field_array(proto_multipart, hf, array_length(hf));
- proto_register_subtree_array(ett, array_length(ett));
-
- /*
- * Get the content type and Internet media type table
- */
- media_type_dissector_table = find_dissector_table("media_type");
-
- multipart_module = prefs_register_protocol(proto_multipart, NULL);
-
- prefs_register_bool_preference(multipart_module,
- "display_unknown_body_as_text",
- "Display bodies without media type as text",
- "Display multipart bodies with no media type dissector"
- " as raw text (may cause problems with binary data).",
- &display_unknown_body_as_text);
-
- prefs_register_bool_preference(multipart_module,
- "remove_base64_encoding",
- "Remove base64 encoding from bodies",
- "Remove any base64 content-transfer encoding from bodies. "
- "This supports export of the body and its further dissection.",
- &remove_base64_encoding);
-
- /*
- * Dissectors requiring different behavior in cases where the media
- * is contained in a multipart entity should register their multipart
- * dissector in the dissector table below, which is similar to the
- * "media_type" dissector table defined in the HTTP dissector code.
- */
- multipart_media_subdissector_table = register_dissector_table(
- "multipart_media_type",
- "Internet media type (for multipart processing)",
- FT_STRING, BASE_NONE);
+ static hf_register_info hf[] = {
+ { &hf_multipart_type,
+ { "Type",
+ "mime_multipart.type",
+ FT_STRING, BASE_NONE, NULL, 0x00,
+ "MIME multipart encapsulation type", HFILL
+ }
+ },
+ { &hf_multipart_part,
+ { "Encapsulated multipart part",
+ "mime_multipart.part",
+ FT_STRING, BASE_NONE, NULL, 0x00,
+ NULL, HFILL
+ }
+ },
+ { &hf_header_array[POS_CONTENT_DISPOSITION],
+ { "Content-Disposition",
+ "mime_multipart.header.content-disposition",
+ FT_STRING, BASE_NONE, NULL, 0x00,
+ "RFC 2183: Content-Disposition Header", HFILL
+ }
+ },
+ { &hf_header_array[POS_CONTENT_ENCODING],
+ { "Content-Encoding",
+ "mime_multipart.header.content-encoding",
+ FT_STRING, BASE_NONE, NULL, 0x00,
+ "Content-Encoding Header", HFILL
+ }
+ },
+ { &hf_header_array[POS_CONTENT_ID],
+ { "Content-Id",
+ "mime_multipart.header.content-id",
+ FT_STRING, BASE_NONE, NULL, 0x00,
+ "RFC 2045: Content-Id Header", HFILL
+ }
+ },
+ { &hf_header_array[POS_CONTENT_LANGUAGE],
+ { "Content-Language",
+ "mime_multipart.header.content-language",
+ FT_STRING, BASE_NONE, NULL, 0x00,
+ "Content-Language Header", HFILL
+ }
+ },
+ { &hf_header_array[POS_CONTENT_LENGTH],
+ { "Content-Length",
+ "mime_multipart.header.content-length",
+ FT_STRING, BASE_NONE, NULL, 0x0,
+ "Content-Length Header", HFILL
+ }
+ },
+ { &hf_header_array[POS_CONTENT_TRANSFER_ENCODING],
+ { "Content-Transfer-Encoding",
+ "mime_multipart.header.content-transfer-encoding",
+ FT_STRING, BASE_NONE, NULL, 0x00,
+ "RFC 2045: Content-Transfer-Encoding Header", HFILL
+ }
+ },
+ { &hf_header_array[POS_CONTENT_TYPE],
+ { "Content-Type",
+ "mime_multipart.header.content-type",
+ FT_STRING, BASE_NONE,NULL,0x0,
+ "Content-Type Header", HFILL
+ }
+ },
+ };
+
+ /*
+ * Preferences
+ */
+ module_t *multipart_module;
+
+ /*
+ * Setup protocol subtree array
+ */
+ static gint *ett[] = {
+ &ett_multipart,
+ &ett_multipart_main,
+ &ett_multipart_body,
+ };
+
+ /*
+ * Register the protocol name and description
+ */
+ proto_multipart = proto_register_protocol(
+ "MIME Multipart Media Encapsulation",
+ "MIME multipart",
+ "mime_multipart");
+
+ /*
+ * Required function calls to register
+ * the header fields and subtrees used.
+ */
+ proto_register_field_array(proto_multipart, hf, array_length(hf));
+ proto_register_subtree_array(ett, array_length(ett));
+
+ multipart_module = prefs_register_protocol(proto_multipart, NULL);
+
+ prefs_register_bool_preference(multipart_module,
+ "display_unknown_body_as_text",
+ "Display bodies without media type as text",
+ "Display multipart bodies with no media type dissector"
+ " as raw text (may cause problems with binary data).",
+ &display_unknown_body_as_text);
+
+ prefs_register_bool_preference(multipart_module,
+ "remove_base64_encoding",
+ "Remove base64 encoding from bodies",
+ "Remove any base64 content-transfer encoding from bodies. "
+ "This supports export of the body and its further dissection.",
+ &remove_base64_encoding);
+
+ /*
+ * Dissectors requiring different behavior in cases where the media
+ * is contained in a multipart entity should register their multipart
+ * dissector in the dissector table below, which is similar to the
+ * "media_type" dissector table defined in the HTTP dissector code.
+ */
+ multipart_media_subdissector_table = register_dissector_table(
+ "multipart_media_type",
+ "Internet media type (for multipart processing)",
+ FT_STRING, BASE_NONE);
}
void
proto_reg_handoff_multipart(void)
{
- dissector_handle_t multipart_handle;
-
- /*
- * When we cannot display the data, call the data dissector.
- * When there is no dissector for the given media, call the media dissector.
- */
- data_handle = find_dissector("data");
- media_handle = find_dissector("media");
-
- /*
- * Handle for multipart dissection
- */
- multipart_handle = create_dissector_handle(
- dissect_multipart, proto_multipart);
-
- dissector_add_string("media_type",
- "multipart/mixed", multipart_handle);
- dissector_add_string("media_type",
- "multipart/related", multipart_handle);
- dissector_add_string("media_type",
- "multipart/alternative", multipart_handle);
- dissector_add_string("media_type",
- "multipart/form-data", multipart_handle);
-
+ dissector_handle_t multipart_handle;
+
+ /*
+ * When we cannot display the data, call the data dissector.
+ * When there is no dissector for the given media, call the media dissector.
+ */
+ data_handle = find_dissector("data");
+ media_handle = find_dissector("media");
+
+ /*
+ * Get the content type and Internet media type table
+ */
+ media_type_dissector_table = find_dissector_table("media_type");
+
+ /*
+ * Handle for multipart dissection
+ */
+ multipart_handle = new_create_dissector_handle(
+ dissect_multipart, proto_multipart);
+
+ dissector_add_string("media_type",
+ "multipart/mixed", multipart_handle);
+ dissector_add_string("media_type",
+ "multipart/related", multipart_handle);
+ dissector_add_string("media_type",
+ "multipart/alternative", multipart_handle);
+ dissector_add_string("media_type",
+ "multipart/form-data", multipart_handle);
+ dissector_add_string("media_type",
+ "multipart/report", multipart_handle);
+
+ /*
+ * Supply an entry to use for unknown multipart subtype.
+ * See RFC 2046, section 5.1.3
+ */
+ dissector_add_string("media_type",
+ "multipart/", multipart_handle);
}
git.samba.org / metze / wireshark / wip.git / blobdiff