r1162: Give each struct it's own subtree in the ethereal gui. Much more

readable!
(This used to be commit 1d29a4fd874a963c53546825d657b47ee3af085b)

1 files changed, 26 insertions, 28 deletions

diff --git a/source4/build/pidl/packet-dcerpc-eparser.h b/source4/build/pidl/packet-dcerpc-eparser.h
index 95514aac37..37d92293a9 100644
--- a/source4/build/pidl/packet-dcerpc-eparser.h
+++ b/source4/build/pidl/packet-dcerpc-eparser.h
@@ -35,7 +35,6 @@ struct e_ndr_pull {
 	tvbuff_t *tvb;
 	int offset;
 	packet_info *pinfo;
-	proto_tree *tree;
 	guint8 *drep;
 	struct ndr_ofs_list *ofs_list;
 	int flags;
@@ -61,36 +60,34 @@ typedef long long gHYPER_T;
 /* Create a ndr_pull structure from data stored in a tvb at a given offset. */
 
 struct e_ndr_pull *ndr_pull_init(tvbuff_t *tvb, int offset, packet_info *pinfo,
-				 proto_tree *tree, guint8 *drep);
+				 guint8 *drep);
 void ndr_pull_free(struct e_ndr_pull *ndr);
-void ndr_pull_ptr(struct e_ndr_pull *ndr, int hf, guint32 *ptr);
-void ndr_pull_level(struct e_ndr_pull *ndr, int hf, gint16 *data);
-void ndr_pull_NTSTATUS(struct e_ndr_pull *ndr, int hf);
-void ndr_pull_uint8(struct e_ndr_pull *ndr, int hf, guint8 *data);
-void ndr_pull_uint16(struct e_ndr_pull *ndr, int hf, guint16 *data);
-void ndr_pull_uint32(struct e_ndr_pull *ndr, int hf, guint32 *data);
-void ndr_pull_policy_handle(struct e_ndr_pull *ndr, int hf);
+void ndr_pull_ptr(struct e_ndr_pull *ndr, proto_tree *tree, int hf, guint32 *ptr);
+void ndr_pull_level(struct e_ndr_pull *ndr, proto_tree *tree, int hf, gint16 *data);
+void ndr_pull_NTSTATUS(struct e_ndr_pull *ndr, proto_tree *tree, int hf);
+void ndr_pull_uint8(struct e_ndr_pull *ndr, proto_tree *tree, int hf, guint8 *data);
+void ndr_pull_uint16(struct e_ndr_pull *ndr, proto_tree *tree, int hf, guint16 *data);
+void ndr_pull_uint32(struct e_ndr_pull *ndr, proto_tree *tree, int hf, guint32 *data);
 void ndr_pull_advance(struct e_ndr_pull *ndr, int offset);
-void ndr_pull_subcontext_flags_fn(struct e_ndr_pull *ndr, size_t sub_size,
+void ndr_pull_subcontext_flags_fn(struct e_ndr_pull *ndr, proto_tree *tree,
+				  size_t sub_size, 
 				  void (*fn)(struct e_ndr_pull *, 
-					     int ndr_flags));
-void ndr_pull_subcontext_header(struct e_ndr_pull *ndr, 
-				size_t sub_size,
-				struct e_ndr_pull *ndr2);
+					     proto_tree *tree, int ndr_flags));
+void ndr_pull_subcontext_header(struct e_ndr_pull *ndr, proto_tree *tree,
+				size_t sub_size, struct e_ndr_pull *ndr2);
 void ndr_pull_struct_start(struct e_ndr_pull *ndr);
 void ndr_pull_struct_end(struct e_ndr_pull *ndr);
 void ndr_pull_align(struct e_ndr_pull *ndr, int size);
-void ndr_pull_NTTIME(struct e_ndr_pull *e_ndr, int hf, gNTTIME *data);
-void ndr_pull_HYPER_T(struct e_ndr_pull *e_ndr, int hf, gHYPER_T *data);
-void ndr_pull_int64(struct e_ndr_pull *e_ndr, int hf, gint64 *data);
-void ndr_pull_uint64(struct e_ndr_pull *e_ndr, int hf, guint64 *data);
-void ndr_pull_string(struct e_ndr_pull *e_ndr, int hf);
-void ndr_pull_dom_sid2(struct e_ndr_pull *e_ndr, int flags);
-void ndr_pull_security_descriptor(struct e_ndr_pull *e_ndr, int hf);
-
-void ndr_pull_relative(struct e_ndr_pull *ndr,
-		       void (*fn)(struct e_ndr_pull *, int ndr_flags));
+void ndr_pull_NTTIME(struct e_ndr_pull *ndr, proto_tree *tree, int hf, gNTTIME *data);
+void ndr_pull_HYPER_T(struct e_ndr_pull *ndr, proto_tree *tree, int hf, gHYPER_T *data);
+void ndr_pull_int64(struct e_ndr_pull *ndr, proto_tree *tree, int hf, gint64 *data);
+void ndr_pull_uint64(struct e_ndr_pull *ndr, proto_tree *tree, int hf, guint64 *data);
+void ndr_pull_string(struct e_ndr_pull *ndr, proto_tree *tree, int hf);
+void ndr_pull_dom_sid2(struct e_ndr_pull *ndr, proto_tree *tree, int flags);
 
+void ndr_pull_relative(struct e_ndr_pull *ndr, proto_tree *tree,
+		       void (*fn)(struct e_ndr_pull *ndr, 
+				  proto_tree *tree, int ndr_flags));
 
 int lsa_dissect_LSA_SECURITY_DESCRIPTOR(tvbuff_t tvb, int offset,
 					packet_info *pinfo, proto_tree *tree, 
@@ -104,10 +101,11 @@ int lsa_dissect_POLICY_DNS_DOMAIN_INFO(tvbuff_t tvb, int offset,
 				       packet_info *pinfo, proto_tree *tree, 
 				       guint8 *drep);
 
-void ndr_pull_array_uint8(struct e_ndr_pull *ndr, int hf, int ndr_flags, guint32 n);
-void ndr_pull_array_uint32(struct e_ndr_pull *ndr, int hf, int ndr_flags, guint32 n);
+void ndr_pull_array_uint8(struct e_ndr_pull *ndr, proto_tree *tree, int hf, int ndr_flags, guint32 n);
+void ndr_pull_array_uint32(struct e_ndr_pull *ndr, proto_tree *tree, int hf, int ndr_flags, guint32 n);
 
-void ndr_pull_array(struct e_ndr_pull *ndr, int ndr_flags, guint32 n, 
-		    void (*fn)(struct e_ndr_pull *, int ndr_flags));
+void ndr_pull_array(struct e_ndr_pull *ndr, proto_tree *tree, int ndr_flags, 
+		    guint32 n, void (*fn)(struct e_ndr_pull *ndr, 
+					  proto_tree *tree, int ndr_flags));
 
 #endif /* _packet_dcerpc_eparser_h */