Remove pinfo->private_data from DCERPC dissectors and instead have dcerpc_info* infomation be passed in as a function parameter. Bug 9387 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9387)

All "generated" source was manually modified (with the power of search/replace), but I believe the "source input" files have been adjusted (checked into revs 53098 and 53099) to reflect the necessary changes (with possible whitespace formatting differences).

The Microsoft compiler doesn't flag "unused function parameters", so I apologize in advance if I may have missed a few.  The "dcerpc_info* di" parameter is used in almost every function.

svn path=/trunk/; revision=53100

1 files changed, 27 insertions, 27 deletions

diff --git a/epan/dissectors/packet-dcom.h b/epan/dissectors/packet-dcom.h
index 39b98fe17c..da69196446 100644
--- a/epan/dissectors/packet-dcom.h
+++ b/epan/dissectors/packet-dcom.h
@@ -70,7 +70,7 @@ typedef struct dcom_interface_s {
 } dcom_interface_t;
 
 typedef int (*dcom_dissect_fn_t) (tvbuff_t *tvb, gint offset, packet_info *pinfo,
-                       proto_tree *tree, guint8 *drep, gint size);
+                       proto_tree *tree, dcerpc_info *di, guint8 *drep, gint size);
 
 typedef struct dcom_marshaler_s {
     dcom_object_t   *parent;
@@ -92,10 +92,10 @@ extern dcom_dissect_fn_t dcom_get_rountine_by_uuid(const e_uuid_t* uuid);
 /* the essential DCOM this and that, starting every call */
 WS_DLL_PUBLIC int
 dissect_dcom_this(tvbuff_t *tvb, int offset,
-	packet_info *pinfo, proto_tree *tree, guint8 *drep);
+	packet_info *pinfo, proto_tree *tree, dcerpc_info *di, guint8 *drep);
 WS_DLL_PUBLIC int
 dissect_dcom_that(tvbuff_t *tvb, int offset,
-	packet_info *pinfo, proto_tree *tree, guint8 *drep);
+	packet_info *pinfo, proto_tree *tree, dcerpc_info *di, guint8 *drep);
 
 
 /* dissection of somewhat more simple data types */
@@ -113,102 +113,102 @@ dissect_dcom_that(tvbuff_t *tvb, int offset,
 
 extern int
 dissect_dcom_UUID(tvbuff_t *tvb, int offset,
-	packet_info *pinfo, proto_tree *tree, guint8 *drep,
+	packet_info *pinfo, proto_tree *tree, dcerpc_info *di, guint8 *drep,
 	int hfindex, e_uuid_t *uuid);
 
 extern int
 dissect_dcom_append_UUID(tvbuff_t *tvb, int offset,
-	packet_info *pinfo, proto_tree *tree, guint8 *drep,
+	packet_info *pinfo, proto_tree *tree, dcerpc_info *di, guint8 *drep,
 	int hfindex, int field_index, e_uuid_t *uuid);
 
 extern int
 dissect_dcom_indexed_WORD(tvbuff_t *tvb, int offset,	packet_info *pinfo,
-					 proto_tree *tree, guint8 *drep,
+					 proto_tree *tree, dcerpc_info *di, guint8 *drep,
 					 int hfindex, guint16 * pu16WORD, int field_index);
 
 WS_DLL_PUBLIC int
 dissect_dcom_indexed_DWORD(tvbuff_t *tvb, int offset,	packet_info *pinfo,
-					 proto_tree *tree, guint8 *drep,
+					 proto_tree *tree, dcerpc_info *di, guint8 *drep,
 					 int hfindex, guint32 * pu32DWORD, int field_index);
 
 WS_DLL_PUBLIC int
 dissect_dcom_HRESULT(tvbuff_t *tvb, int offset,
-	packet_info *pinfo, proto_tree *tree, guint8 *drep, guint32 * pu32hresult);
+	packet_info *pinfo, proto_tree *tree, dcerpc_info *di, guint8 *drep, guint32 * pu32hresult);
 
 WS_DLL_PUBLIC int
 dissect_dcom_HRESULT_item(tvbuff_t *tvb, int offset,	packet_info *pinfo,
-					 proto_tree *tree, guint8 *drep,
+					 proto_tree *tree, dcerpc_info *di, guint8 *drep,
 					 guint32 * pu32HResult, int field_index, proto_item **item);
 
 WS_DLL_PUBLIC int
 dissect_dcom_indexed_HRESULT(tvbuff_t *tvb, int offset,	packet_info *pinfo,
-					 proto_tree *tree, guint8 *drep,
+					 proto_tree *tree, dcerpc_info *di, guint8 *drep,
 					 guint32 * pu32hresult, int field_index);
 
 extern int
 dissect_dcom_COMVERSION(tvbuff_t *tvb, int offset,
-	packet_info *pinfo, proto_tree *tree, guint8 *drep,
+	packet_info *pinfo, proto_tree *tree, dcerpc_info *di, guint8 *drep,
 	guint16	* pu16version_major, guint16 * pu16version_minor);
 
 typedef void (*sa_callback_t) (tvbuff_t *tvb, gint offset, packet_info *pinfo,
-                       proto_tree *tree, guint8 *drep,
+                       proto_tree *tree, dcerpc_info *di, guint8 *drep,
                        guint32 u32VarType, guint32 u32ArraySize);
 
 WS_DLL_PUBLIC int
 dissect_dcom_SAFEARRAY(tvbuff_t *tvb, int offset, packet_info *pinfo,
-						proto_tree *tree, guint8 *drep, int hfindex _U_, sa_callback_t sacb);
+						proto_tree *tree, dcerpc_info *di, guint8 *drep, int hfindex _U_, sa_callback_t sacb);
 
 WS_DLL_PUBLIC int
 dissect_dcom_LPWSTR(tvbuff_t *tvb, gint offset, packet_info *pinfo,
-                       proto_tree *tree, guint8 *drep, int hfindex,
+                       proto_tree *tree, dcerpc_info *di, guint8 *drep, int hfindex,
 					   gchar *psz_buffer, guint32 u32max_buffer);
 
 WS_DLL_PUBLIC int
 dissect_dcom_indexed_LPWSTR(tvbuff_t *tvb, gint offset, packet_info *pinfo,
-                       proto_tree *tree, guint8 *drep, int hfindex,
+                       proto_tree *tree, dcerpc_info *di, guint8 *drep, int hfindex,
 					   gchar *pszStr, guint32 u32MaxStr, int field_index);
 
 WS_DLL_PUBLIC int
 dissect_dcom_BSTR(tvbuff_t *tvb, gint offset, packet_info *pinfo,
-                       proto_tree *tree, guint8 *drep, int hfindex,
+                       proto_tree *tree, dcerpc_info *di, guint8 *drep, int hfindex,
 					   gchar *psz_buffer, guint32 u32max_buffer);
 
 extern int
 dissect_dcom_DUALSTRINGARRAY(tvbuff_t *tvb, gint offset, packet_info *pinfo,
-                       proto_tree *tree, guint8 *drep, int hfindex, gchar *ip);
+                       proto_tree *tree, dcerpc_info *di, guint8 *drep, int hfindex, gchar *ip);
 
 extern int
 dissect_dcom_STDOBJREF(tvbuff_t *tvb, gint offset, packet_info *pinfo,
-                       proto_tree *tree, guint8 *drep, int hfindex,
+                       proto_tree *tree, dcerpc_info *di, guint8 *drep, int hfindex,
                        guint64 *oxid, guint64 *oid, e_uuid_t *ipid);
 extern int
 dissect_dcom_OBJREF(tvbuff_t *tvb, gint offset, packet_info *pinfo,
-                       proto_tree *tree, guint8 *drep, int hfindex, dcom_interface_t **interf);
+                       proto_tree *tree, dcerpc_info *di, guint8 *drep, int hfindex, dcom_interface_t **interf);
 
 WS_DLL_PUBLIC int
 dissect_dcom_MInterfacePointer(tvbuff_t *tvb, gint offset, packet_info *pinfo,
-                       proto_tree *tree, guint8 *drep, int hfindex, dcom_interface_t **interf);
+                       proto_tree *tree, dcerpc_info *di, guint8 *drep, int hfindex, dcom_interface_t **interf);
 WS_DLL_PUBLIC int
 dissect_dcom_PMInterfacePointer(tvbuff_t *tvb, gint offset, packet_info *pinfo,
-                       proto_tree *tree, guint8 *drep, int hfindex, dcom_interface_t **interf);
+                       proto_tree *tree, dcerpc_info *di, guint8 *drep, int hfindex, dcom_interface_t **interf);
 
 WS_DLL_PUBLIC int
 dissect_dcom_VARTYPE(tvbuff_t *tvb, int offset,
-	packet_info *pinfo, proto_tree *tree, guint8 *drep,
+	packet_info *pinfo, proto_tree *tree, dcerpc_info *di, guint8 *drep,
 	guint16 *pu16Vartype);
 
 WS_DLL_PUBLIC int
 dissect_dcom_VARIANT(tvbuff_t *tvb, int offset, packet_info *pinfo,
-					 proto_tree *tree, guint8 *drep, int hfindex);
+					 proto_tree *tree, dcerpc_info *di, guint8 *drep, int hfindex);
 
 /* dcom "dcerpc internal" unmarshalling */
 WS_DLL_PUBLIC int
 dissect_dcom_dcerpc_array_size(tvbuff_t *tvb, gint offset, packet_info *pinfo,
-                       proto_tree *tree, guint8 *drep, guint32 *pu32array_size);
+                       proto_tree *tree, dcerpc_info *di, guint8 *drep, guint32 *pu32array_size);
 
 WS_DLL_PUBLIC int
 dissect_dcom_dcerpc_pointer(tvbuff_t *tvb, gint offset, packet_info *pinfo,
-                       proto_tree *tree, guint8 *drep, guint32 *pu32pointer);
+                       proto_tree *tree, dcerpc_info *di, guint8 *drep, guint32 *pu32pointer);
 
 /* mark things as "to be done" */
 extern int
@@ -224,10 +224,10 @@ dissect_dcom_nospec_data(tvbuff_t *tvb, int offset,
 /* request: no parameters */
 WS_DLL_PUBLIC int
 dissect_dcom_simple_rqst(tvbuff_t *tvb, int offset,
-	packet_info *pinfo, proto_tree *tree, guint8 *drep);
+	packet_info *pinfo, proto_tree *tree, dcerpc_info *di, guint8 *drep);
 /* response: only HRESULT */
 WS_DLL_PUBLIC int
 dissect_dcom_simple_resp(tvbuff_t *tvb, int offset,
-	packet_info *pinfo, proto_tree *tree, guint8 *drep);
+	packet_info *pinfo, proto_tree *tree, dcerpc_info *di, guint8 *drep);
 
 #endif /* packet-dcerpc-dcom.h */