Replace the 'levels' argument to dissect_ndr_pointer() with a callback

function and a void * callback args.  The callback is executed after
the dissection of the ndr pointer buffer which may be called,
depending on the number of pointers in the structure, after the return
of the dissect_ndr_pointer() call.

The callback function is of type:

void (dcerpc_callback_fnct_t)(packet_info *pinfo, proto_tree *tree,
proto_item *item, tvbuff_t *tvb, int start_offset, int end_offset,
void *callback_args);

where the proto tree and item are the tree and item created by
dissect_ndr_pointer() and the tvb plus offsets are the buffer pointed
to by the pointer.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@7015 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/packet-dcerpc.c b/packet-dcerpc.c
index dc0834063413836f8f89f43ef47a2852ad8e1035..3832f7135ae5d3c1800b0e337ce3b421174e0cda 100644 (file)
--- a/packet-dcerpc.c
+++ b/packet-dcerpc.c
@@ -2,7 +2,7 @@
  * Routines for DCERPC packet disassembly
  * Copyright 2001, Todd Sabin <tas@webspan.net>
  *
- * $Id: packet-dcerpc.c,v 1.98 2003/01/24 21:10:40 jmayer Exp $
+ * $Id: packet-dcerpc.c,v 1.99 2003/01/28 06:17:08 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -925,10 +925,12 @@ static gboolean pointers_are_top_level = TRUE;
    hoping that his will not collide with any non-ref pointers */
 typedef struct ndr_pointer_data {
        guint32 id;
-       proto_tree *tree;
+       proto_item *item;       /* proto_item for pointer */
+       proto_tree *tree;       /* subtree of above item */
        dcerpc_dissect_fnct_t *fnct; /*if non-NULL, we have not called it yet*/
        int hf_index;
-       int levels;
+       dcerpc_callback_fnct_t *callback;
+       void *callback_args;
 } ndr_pointer_data_t;
 
 static void
@@ -978,7 +980,6 @@ dissect_deferred_pointers(packet_info *pinfo, tvbuff_t *tvb, int offset, char *d
                                tnpd->fnct=NULL;
                                ndr_pointer_list_pos=i+1;
                                di->hf_index=tnpd->hf_index;
-                               di->levels=tnpd->levels;
                                /* first a run to handle any conformant
                                   array headers */
                                di->conformant_run=1;
@@ -1035,7 +1036,10 @@ dissect_deferred_pointers(packet_info *pinfo, tvbuff_t *tvb, int offset, char *d
 
                                /* now we dissect the actual pointer */
                                di->conformant_run=0;
+                               old_offset = offset;
                                offset = (*(fnct))(tvb, offset, pinfo, tnpd->tree, drep);
+                               if (tnpd->callback)
+                                       tnpd->callback(pinfo, tnpd->tree, tnpd->item, tvb, old_offset, offset, tnpd->callback_args);
                                break;
                        }
                }
@@ -1046,8 +1050,9 @@ dissect_deferred_pointers(packet_info *pinfo, tvbuff_t *tvb, int offset, char *d
 
 
 static void
-add_pointer_to_list(packet_info *pinfo, proto_tree *tree,
-               dcerpc_dissect_fnct_t *fnct, guint32 id, int hf_index, int levels)
+add_pointer_to_list(packet_info *pinfo, proto_tree *tree, proto_item *item,
+                   dcerpc_dissect_fnct_t *fnct, guint32 id, int hf_index, 
+                   dcerpc_callback_fnct_t *callback, void *callback_args)
 {
        ndr_pointer_data_t *npd;
 
@@ -1084,9 +1089,11 @@ add_pointer_to_list(packet_info *pinfo, proto_tree *tree,
        npd=g_malloc(sizeof(ndr_pointer_data_t));
        npd->id=id;
        npd->tree=tree;
+       npd->item=item;
        npd->fnct=fnct;
        npd->hf_index=hf_index;
-       npd->levels=levels;
+       npd->callback=callback;
+       npd->callback_args=callback_args;
        ndr_pointer_list = g_slist_insert(ndr_pointer_list, npd,
                                        ndr_pointer_list_pos);
        ndr_pointer_list_pos++;
@@ -1125,15 +1132,17 @@ find_pointer_index(guint32 id)
  *   hf_index is what hf value we want to pass to the callback function when
  *   it is called, the callback can later pich this one up from di->hf_index.
  *
- *   levels is a generic int we want to pass to teh callback function.  the
- *   callback can later pick it up from di->levels
+ *   callback is executed after the pointer has been dereferenced.
+ *
+ *   callback_args is passed as an argument to the callback function
  *
  * See packet-dcerpc-samr.c for examples
  */
 int
-dissect_ndr_pointer(tvbuff_t *tvb, gint offset, packet_info *pinfo,
+dissect_ndr_pointer_cb(tvbuff_t *tvb, gint offset, packet_info *pinfo,
                    proto_tree *tree, char *drep, dcerpc_dissect_fnct_t *fnct,
-                   int type, char *text, int hf_index, int levels)
+                   int type, char *text, int hf_index, 
+                   dcerpc_callback_fnct_t *callback, void *callback_args)
 {
        dcerpc_info *di;
 
@@ -1157,7 +1166,8 @@ dissect_ndr_pointer(tvbuff_t *tvb, gint offset, packet_info *pinfo,
                        "%s", text);
                tr=proto_item_add_subtree(item,ett_dcerpc_pointer_data);
 
-               add_pointer_to_list(pinfo, tr, fnct, 0xffffffff, hf_index, levels);
+               add_pointer_to_list(pinfo, tr, item, fnct, 0xffffffff, 
+                                   hf_index, callback, callback_args);
                goto after_ref_id;
        }
 
@@ -1194,7 +1204,8 @@ dissect_ndr_pointer(tvbuff_t *tvb, gint offset, packet_info *pinfo,
                        "%s", text);
                tr=proto_item_add_subtree(item,ett_dcerpc_pointer_data);
                proto_tree_add_uint(tr, hf_dcerpc_referent_id, tvb, offset-4, 4, id);
-               add_pointer_to_list(pinfo, tr, fnct, id, hf_index, levels);
+               add_pointer_to_list(pinfo, tr, item, fnct, id, hf_index, 
+                                   callback, callback_args);
                goto after_ref_id;
        }
        /*TOP LEVEL UNIQUE POINTER*/
@@ -1219,7 +1230,8 @@ dissect_ndr_pointer(tvbuff_t *tvb, gint offset, packet_info *pinfo,
                        "%s", text);
                tr=proto_item_add_subtree(item,ett_dcerpc_pointer_data);
                proto_tree_add_uint(tr, hf_dcerpc_referent_id, tvb, offset-4, 4, id);
-               add_pointer_to_list(pinfo, tr, fnct, 0xffffffff, hf_index, levels);
+               add_pointer_to_list(pinfo, tr, item, fnct, 0xffffffff, 
+                                   hf_index, callback, callback_args);
                goto after_ref_id;
        }
 
@@ -1238,7 +1250,8 @@ dissect_ndr_pointer(tvbuff_t *tvb, gint offset, packet_info *pinfo,
                        "%s",text);
                tr=proto_item_add_subtree(item,ett_dcerpc_pointer_data);
                proto_tree_add_uint(tr, hf_dcerpc_referent_id, tvb, offset-4, 4, id);
-               add_pointer_to_list(pinfo, tr, fnct, 0xffffffff, hf_index, levels);
+               add_pointer_to_list(pinfo, tr, item, fnct, 0xffffffff, 
+                                   hf_index, callback, callback_args);
                goto after_ref_id;
        }
 
@@ -1264,7 +1277,8 @@ dissect_ndr_pointer(tvbuff_t *tvb, gint offset, packet_info *pinfo,
                        "%s",text);
                tr=proto_item_add_subtree(item,ett_dcerpc_pointer_data);
                proto_tree_add_uint(tr, hf_dcerpc_referent_id, tvb, offset-4, 4, id);
-               add_pointer_to_list(pinfo, tr, fnct, 0xffffffff, hf_index, levels);
+               add_pointer_to_list(pinfo, tr, item, fnct, 0xffffffff, 
+                                   hf_index, callback, callback_args);
                goto after_ref_id;
        }
 
@@ -1301,7 +1315,8 @@ dissect_ndr_pointer(tvbuff_t *tvb, gint offset, packet_info *pinfo,
                        "%s", text);
                tr=proto_item_add_subtree(item,ett_dcerpc_pointer_data);
                proto_tree_add_uint(tr, hf_dcerpc_referent_id, tvb, offset-4, 4, id);
-               add_pointer_to_list(pinfo, tr, fnct, id, hf_index, levels);
+               add_pointer_to_list(pinfo, tr, item, fnct, id, hf_index, 
+                                   callback, callback_args);
                goto after_ref_id;
        }
 
@@ -1319,7 +1334,15 @@ after_ref_id:
        return offset;
 }
 
-
+int
+dissect_ndr_pointer(tvbuff_t *tvb, gint offset, packet_info *pinfo,
+                   proto_tree *tree, char *drep, dcerpc_dissect_fnct_t *fnct,
+                   int type, char *text, int hf_index)
+{
+       return dissect_ndr_pointer_cb(
+               tvb, offset, pinfo, tree, drep, fnct, type, text, hf_index,
+               NULL, NULL);
+}
 
 static int
 dcerpc_try_handoff (packet_info *pinfo, proto_tree *tree,

diff --git a/packet-dcerpc.h b/packet-dcerpc.h
index 7419dbe585afcbbca13e34d7caa621b752dc2e0f..af26b9c90861f267d5c63f73514a2b310ee7b120 100644 (file)
--- a/packet-dcerpc.h
+++ b/packet-dcerpc.h
@@ -1,7 +1,7 @@
 /* packet-dcerpc.h
  * Copyright 2001, Todd Sabin <tas@webspan.net>
  *
- * $Id: packet-dcerpc.h,v 1.25 2002/11/02 22:14:21 sahlberg Exp $
+ * $Id: packet-dcerpc.h,v 1.26 2003/01/28 06:17:09 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -162,13 +162,22 @@ int dissect_ndr_ctx_hnd (tvbuff_t *tvb, gint offset, packet_info *pinfo,
 
 typedef int (dcerpc_dissect_fnct_t)(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep);
 
+typedef void (dcerpc_callback_fnct_t)(packet_info *pinfo, proto_tree *tree, proto_item *item, tvbuff_t *tvb, int start_offset, int end_offset, void *callback_args);
+
 #define NDR_POINTER_REF                1
 #define NDR_POINTER_UNIQUE     2
 #define NDR_POINTER_PTR                3
 
-int dissect_ndr_pointer (tvbuff_t *tvb, gint offset, packet_info *pinfo,
-                        proto_tree *tree, char *drep,
-                        dcerpc_dissect_fnct_t *fnct, int type, char *text, int hf_index, int levels);
+int dissect_ndr_pointer_cb(tvbuff_t *tvb, gint offset, packet_info *pinfo,
+                          proto_tree *tree, char *drep,
+                          dcerpc_dissect_fnct_t *fnct, int type, char *text, 
+                          int hf_index, dcerpc_callback_fnct_t *callback,
+                          void *callback_args);
+
+int dissect_ndr_pointer(tvbuff_t *tvb, gint offset, packet_info *pinfo,
+                       proto_tree *tree, char *drep,
+                       dcerpc_dissect_fnct_t *fnct, int type, char *text, 
+                       int hf_index);
 
 /* dissect a NDR unidimensional conformant array */
 int dissect_ndr_ucarray(tvbuff_t *tvb, gint offset, packet_info *pinfo,
@@ -237,7 +246,6 @@ typedef struct _dcerpc_info {
        guint32 array_actual_count;
        guint32 array_actual_count_offset;
        int hf_index;
-       int levels;                    /* number of levels upwards in the tree to append text*/
        dcerpc_call_value *call_data;
        void *private_data;
 } dcerpc_info;