aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Gotthard <petr.gotthard@honeywell.com>2015-06-12 16:57:07 -0700
committerPascal Quantin <pascal.quantin@gmail.com>2015-06-12 13:18:50 +0000
commita7f2b7f1de4648c1adff50b4ac735329b994acaf (patch)
treec68116a32cd03f9c2efcc014b4082fc3649c742f
parent70fa77f1a39202b1d622cc2091288b51d4f1091e (diff)
AMQP 1.0: Fix dissection of UUID datatypes
Set a correct data length: 16-bytes, not 1-byte. And use the standard function to print the uuid. Change-Id: Ic4cc8d8de3f469e43664fbd7f6eb89083dc83be6 Reviewed-on: https://code.wireshark.org/review/8905 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-rw-r--r--epan/dissectors/packet-amqp.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/epan/dissectors/packet-amqp.c b/epan/dissectors/packet-amqp.c
index d8a9b7b4ee..bd137a51bf 100644
--- a/epan/dissectors/packet-amqp.c
+++ b/epan/dissectors/packet-amqp.c
@@ -43,6 +43,7 @@
#include <epan/exceptions.h>
#include <epan/expert.h>
#include <epan/prefs.h>
+#include <epan/to_str.h>
#include "packet-tcp.h"
#include "packet-ssl.h"
@@ -10989,8 +10990,8 @@ format_amqp_1_0_uuid(tvbuff_t *tvb,
{
e_guid_t uuid;
tvb_get_guid(tvb, offset, &uuid, ENC_BIG_ENDIAN);
- *value = tvb_format_text(tvb, offset, 16);
- return 1;
+ *value = guid_to_str(wmem_packet_scope(), &uuid);
+ return 16;
}
static int