summaryrefslogtreecommitdiff
path: root/epan/proto.h
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2012-08-10 20:33:01 +0000
committerGerald Combs <gerald@wireshark.org>2012-08-10 20:33:01 +0000
commitcd3cca7edca2c52fea2afce5f248370f5fdcbd4f (patch)
tree2def04abc1c80331776942f588ecae42cfe85291 /epan/proto.h
parentf464eb4b5839cc1a9a222c6a5e3f701af4cb1305 (diff)
downloadwireshark-cd3cca7edca2c52fea2afce5f248370f5fdcbd4f.tar.gz
Make the corresponding packet_info available to each tree item. This
lets us pass a NULL pinfo to expert_add_info_format() and expert_add_undecoded_item(), which makes it possible to use those routines deep in the bowels of many dissectors. As a proof of concept remove the recent pinfo additions to packet-afp.c. This should also make it easier to fix bug 3884. svn path=/trunk/; revision=44435
Diffstat (limited to 'epan/proto.h')
-rw-r--r--epan/proto.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/epan/proto.h b/epan/proto.h
index 5412125279..5a689ee846 100644
--- a/epan/proto.h
+++ b/epan/proto.h
@@ -467,9 +467,10 @@ typedef struct
* in the protocol tree points to the same copy. */
typedef struct {
GHashTable *interesting_hfids;
- gboolean visible;
- gboolean fake_protocols;
- gint count;
+ gboolean visible;
+ gboolean fake_protocols;
+ gint count;
+ struct _packet_info *pinfo;
} tree_data_t;
/** Each proto_tree, proto_item is one of these. */
@@ -697,7 +698,7 @@ extern gboolean proto_item_set_expert_flags(proto_item *ti, const int group, con
/** Creates a new proto_tree root.
@return the new tree root */
-extern proto_tree* proto_tree_create_root(void);
+extern proto_tree* proto_tree_create_root(struct _packet_info *pinfo);
/** Clear memory for entry proto_tree. Clears proto_tree struct also.
@param tree the tree to free */