diff options
| author | sfisher <sfisher@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-09-24 23:05:30 +0000 |
|---|---|---|
| committer | sfisher <sfisher@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-09-24 23:05:30 +0000 |
| commit | f5924d0c7963ecade7b4b78ea7775a2e090894bc (patch) | |
| tree | a7c5a7f236c466ac53077412c020688f5d8e6427 /epan/dissectors/packet-data.c | |
| parent | 17251e924c1f53ce9e66268359464d3a2edd0783 (diff) | |
Add option to generate MD5 hash for payload in data dissector. Useful for
tracking the same data when the headers are different (NAT, TCP seq #
randomization, etc). Copied from packet-frame.c.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34245 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-data.c')
| -rw-r--r-- | epan/dissectors/packet-data.c | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/epan/dissectors/packet-data.c b/epan/dissectors/packet-data.c index 91be73be11..9224c44cae 100644 --- a/epan/dissectors/packet-data.c +++ b/epan/dissectors/packet-data.c @@ -30,6 +30,7 @@ #include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> +#include <epan/crypt/crypt-md5.h> #include "packet-data.h" /* proto_data cannot be static because it's referenced in the @@ -40,9 +41,11 @@ int proto_data = -1; static int hf_data_data = -1; static int hf_data_text = -1; static int hf_data_len = -1; +static int hf_data_md5_hash = -1; static gboolean new_pane = FALSE; static gboolean show_as_text = FALSE; +static gboolean generate_md5_hash = FALSE; static gint ett_data = -1; @@ -79,6 +82,23 @@ dissect_data(tvbuff_t *tvb, packet_info *pinfo _U_ , proto_tree *tree) proto_tree_add_item(data_tree, hf_data_text, data_tvb, 0, bytes, FALSE); } + if(generate_md5_hash) { + const guint8 *cp; + md5_state_t md_ctx; + md5_byte_t digest[16]; + gchar *digest_string; + + cp = tvb_get_ptr(tvb, 0, bytes); + + md5_init(&md_ctx); + md5_append(&md_ctx, cp, bytes); + md5_finish(&md_ctx, digest); + + digest_string = bytestring_to_str(digest, 16, '\0'); + ti = proto_tree_add_string(data_tree, hf_data_md5_hash, tvb, 0, 0, digest_string); + PROTO_ITEM_SET_GENERATED(ti); + } + ti = proto_tree_add_int(data_tree, hf_data_len, data_tvb, 0, 0, bytes); PROTO_ITEM_SET_GENERATED (ti); } @@ -93,6 +113,8 @@ proto_register_data(void) { "Data", "data.data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_data_text, { "Text", "data.text", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, + { &hf_data_md5_hash, + { "Payload MD5 hash", "data.md5_hash", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_data_len, { "Length", "data.len", FT_INT32, BASE_DEC, NULL, 0x0, NULL, HFILL } } }; @@ -125,6 +147,12 @@ proto_register_data(void) "Show data as text", "Show data as text in the Packet Details pane", &show_as_text); + prefs_register_bool_preference(module_data, + "md5_hash", + "Generate MD5 hash", + "Whether or not MD5 hashes should be generated and shown for each payload.", + &generate_md5_hash); + /* * "Data" is used to dissect something whose normal dissector * is disabled, so it cannot itself be disabled. |