aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-meta.c
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2009-11-05 21:54:06 +0000
committerAnders Broman <anders.broman@ericsson.com>2009-11-05 21:54:06 +0000
commit54aa776069b8e66d222ef3a9721249e97d02b287 (patch)
tree52abded55d5e57d0d26a73773e1785c32b95fe29 /epan/dissectors/packet-meta.c
parent110a5be310239218a3015999a0ec979ece02d1bc (diff)
From Tobias Witek:
w protocols: UMTS RLC (ETSI TS 125 322), UMTS MAC (ETSI TS 125 321) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3495 svn path=/trunk/; revision=30838
Diffstat (limited to 'epan/dissectors/packet-meta.c')
-rw-r--r--epan/dissectors/packet-meta.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/epan/dissectors/packet-meta.c b/epan/dissectors/packet-meta.c
index cfbbde6cc2..893a080ad4 100644
--- a/epan/dissectors/packet-meta.c
+++ b/epan/dissectors/packet-meta.c
@@ -26,6 +26,7 @@
#endif
#include <string.h>
+#include <stdio.h>
#include <glib.h>
#include <epan/packet.h>
@@ -409,6 +410,7 @@ static dissector_handle_t *dxt_get_dissector(guint16 proto, packet_info *pinfo)
default:
next_dissector = &data_handle;
}
+ if (!*next_dissector) next_dissector = &data_handle;
return next_dissector;
}
@@ -482,7 +484,7 @@ proto_register_meta(void)
{ &hf_meta_item_id, { "Item ID", "meta.item.id", FT_UINT16, BASE_HEX, VALS(meta_id_vals), 0x0, NULL, HFILL } },
{ &hf_meta_item_type, { "Item Type", "meta.item.type", FT_UINT8, BASE_HEX, VALS(meta_type_vals), 0x0, NULL, HFILL } },
{ &hf_meta_item_len, { "Item Length", "meta.item.len", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL } },
- { &hf_meta_item_data, { "Item Data", "meta.item.data", FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL } },
+ { &hf_meta_item_data, { "Item Data", "meta.item.data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } },
/* specific meta items */
{ &hf_meta_item_direction, { "Direction", "meta.direction", FT_UINT8, BASE_DEC, VALS(meta_direction_vals), 0, NULL, HFILL } },