summaryrefslogtreecommitdiff
path: root/print.c
diff options
context:
space:
mode:
authorChris Maynard <Christopher.Maynard@GTECH.COM>2011-12-14 21:13:06 +0000
committerChris Maynard <Christopher.Maynard@GTECH.COM>2011-12-14 21:13:06 +0000
commit0a1072b08333167bc0955cedfb1997621d336d4b (patch)
tree884b95a372bc6a4e46c058086bb32458bc0d661b /print.c
parent586ea8d092d70b7ffa3ffa7c3ddc26a75aa60ee7 (diff)
downloadwireshark-0a1072b08333167bc0955cedfb1997621d336d4b.tar.gz
Treat expert info as a <field> instead of a <proto> when exporting to pdml.
svn path=/trunk/; revision=40204
Diffstat (limited to 'print.c')
-rw-r--r--print.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/print.c b/print.c
index 647a8d4e0b..0f0014cbb0 100644
--- a/print.c
+++ b/print.c
@@ -38,6 +38,7 @@
#include <epan/tvbuff.h>
#include <epan/packet.h>
#include <epan/emem.h>
+#include <epan/expert.h>
#include "packet-range.h"
#include "print.h"
@@ -364,7 +365,7 @@ proto_tree_write_node_pdml(proto_node *node, gpointer data)
}
/* Normal protocols and fields */
else {
- if (fi->hfinfo->type == FT_PROTOCOL) {
+ if (fi->hfinfo->type == FT_PROTOCOL && fi->hfinfo->id != proto_expert) {
fputs("<proto name=\"", pdata->fh);
}
else {
@@ -493,7 +494,8 @@ proto_tree_write_node_pdml(proto_node *node, gpointer data)
fputs(" ", pdata->fh);
}
/* Close off current element */
- if (fi->hfinfo->id != proto_data) { /* Data protocol uses simple tags */
+ /* Data and expert "protocols" use simple tags */
+ if (fi->hfinfo->id != proto_data && fi->hfinfo->id != proto_expert) {
if (fi->hfinfo->type == FT_PROTOCOL) {
fputs("</proto>\n", pdata->fh);
}