diff options
| author | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2006-09-20 12:12:18 +0000 |
|---|---|---|
| committer | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2006-09-20 12:12:18 +0000 |
| commit | 6de1b28bb859a099cc499414d24f955a8fcf08f4 (patch) | |
| tree | 73830b65de1584b06375bd4385ad1b405ac5308b /epan/dissectors/packet-multipart.c | |
| parent | bf6353c7670f2ff814dad20280e0db4f8bf053de (diff) | |
Add Content-Id and Content-Transfer-Encoding headers, as described in RFC 2045/6
svn path=/trunk/; revision=19264
Diffstat (limited to 'epan/dissectors/packet-multipart.c')
| -rw-r--r-- | epan/dissectors/packet-multipart.c | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/epan/dissectors/packet-multipart.c b/epan/dissectors/packet-multipart.c index 8153944440..f71e5659d2 100644 --- a/epan/dissectors/packet-multipart.c +++ b/epan/dissectors/packet-multipart.c @@ -95,16 +95,20 @@ 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" }, }; -#define POS_CONTENT_DISPOSITION 1 -#define POS_CONTENT_ENCODING 2 -#define POS_CONTENT_LANGUAGE 3 -#define POS_CONTENT_LENGTH 4 -#define POS_CONTENT_TYPE 5 +#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; @@ -112,8 +116,10 @@ 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" */ }; @@ -837,6 +843,13 @@ proto_register_multipart(void) "RFC 3261: 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", @@ -851,6 +864,13 @@ proto_register_multipart(void) "RFC 3261: 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", |