diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2016-02-15 15:15:11 +0100 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2016-02-15 17:45:51 +0000 |
| commit | a6a358ef96f1fd381b124f9e5935328a18dad3ca (patch) | |
| tree | 1e434984ea7764fe188e72ca74fe0e39a4fbcac6 /epan/dissectors/packet-multipart.c | |
| parent | 614751da536295ec84b1bb8677725a9adf4587dd (diff) | |
multipart: Add Content-Description header
Change-Id: I10432e813832cf6facc33bf3c06872bd9611a4c5
Reviewed-on: https://code.wireshark.org/review/13954
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-multipart.c')
| -rw-r--r-- | epan/dissectors/packet-multipart.c | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/epan/dissectors/packet-multipart.c b/epan/dissectors/packet-multipart.c index fcf8aa6bf3..c801df78bd 100644 --- a/epan/dissectors/packet-multipart.c +++ b/epan/dissectors/packet-multipart.c @@ -103,6 +103,7 @@ typedef struct { static const multipart_header_t multipart_headers[] = { { "Unknown-header", NULL }, /* Pad so that the real headers start at index 1 */ + { "Content-Description", NULL }, { "Content-Disposition", NULL }, { "Content-Encoding", "e" }, { "Content-Id", NULL }, @@ -113,14 +114,15 @@ static const multipart_header_t multipart_headers[] = { { "OriginalContent", NULL } }; -#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_ORIGINALCONTENT 8 +#define POS_CONTENT_DESCRIPTION 1 +#define POS_CONTENT_DISPOSITION 2 +#define POS_CONTENT_ENCODING 3 +#define POS_CONTENT_ID 4 +#define POS_CONTENT_LANGUAGE 5 +#define POS_CONTENT_LENGTH 6 +#define POS_CONTENT_TRANSFER_ENCODING 7 +#define POS_CONTENT_TYPE 8 +#define POS_ORIGINALCONTENT 9 /* Initialize the header fields */ static gint hf_multipart_type = -1; @@ -129,6 +131,7 @@ static gint hf_multipart_sec_token_len = -1; static gint hf_header_array[] = { -1, /* "Unknown-header" - Pad so that the real headers start at index 1 */ + -1, /* "Content-Description" */ -1, /* "Content-Disposition" */ -1, /* "Content-Encoding" */ -1, /* "Content-Id" */ @@ -1041,6 +1044,13 @@ proto_register_multipart(void) "Length of the Kerberos BLOB which follows this token", HFILL } }, + { &hf_header_array[POS_CONTENT_DESCRIPTION], + { "Content-Description", + "mime_multipart.header.content-description", + FT_STRING, BASE_NONE, NULL, 0x00, + "Content-Description Header", HFILL + } + }, { &hf_header_array[POS_CONTENT_DISPOSITION], { "Content-Disposition", "mime_multipart.header.content-disposition", |