Add data parameter to dissect_function_t in vsff structure. The intention here is to use it to replace some pinfo->private_data.

I didn't realize how expansive this change would be, so committing it now before replacing the pinfo->private_data, so if something needs to be reverted, all of this is not lost.

svn path=/trunk/; revision=53213

1 files changed, 48 insertions, 48 deletions

diff --git a/epan/dissectors/packet-fmp.c b/epan/dissectors/packet-fmp.c
index 825aa06918..e44e139465 100644
--- a/epan/dissectors/packet-fmp.c
+++ b/epan/dissectors/packet-fmp.c
@@ -875,7 +875,7 @@ dissect_fmp_attrs(tvbuff_t *tvb, int offset, proto_tree *tree)
 
 static int
 dissect_FMP_SessionCreate_request(tvbuff_t *tvb, int offset, packet_info *pinfo,
-                                  proto_tree *tree)
+                                  proto_tree *tree, void* data _U_)
 {
     offset = dissect_rpc_string(tvb, tree, hf_fmp_hostID,
                                 offset, NULL);
@@ -888,7 +888,7 @@ dissect_FMP_SessionCreate_request(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 static int
 dissect_FMP_SessionCreate_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
-                                proto_tree *tree)
+                                proto_tree *tree, void* data _U_)
 {
     int rval;
 
@@ -909,7 +909,7 @@ dissect_FMP_SessionCreate_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 static int
 dissect_FMP_HeartBeat_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
-                              proto_tree *tree)
+                              proto_tree *tree, void* data _U_)
 {
     offset = dissect_rpc_data(tvb, tree, hf_fmp_sessionHandle,
                               offset);
@@ -919,7 +919,7 @@ dissect_FMP_HeartBeat_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
 
 static int
 dissect_FMP_HeartBeat_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
-                            proto_tree *tree)
+                            proto_tree *tree, void* data _U_)
 {
     int rval;
     offset = dissect_fmp_status(tvb, offset,tree, &rval);
@@ -928,7 +928,7 @@ dissect_FMP_HeartBeat_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
 
 static int
 dissect_FMP_Mount_request(tvbuff_t *tvb, int offset, packet_info *pinfo,
-                          proto_tree *tree)
+                          proto_tree *tree, void* data _U_)
 {
     offset = dissect_rpc_data(tvb,  tree, hf_fmp_sessionHandle,
                               offset);
@@ -939,7 +939,7 @@ dissect_FMP_Mount_request(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 static int
 dissect_FMP_Mount_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
-                        proto_tree *tree)
+                        proto_tree *tree, void* data _U_)
 {
     int rval;
 
@@ -957,7 +957,7 @@ dissect_FMP_Mount_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 static int
 dissect_FMP_Open_request(tvbuff_t *tvb, int offset, packet_info *pinfo,
-                         proto_tree *tree)
+                         proto_tree *tree, void* data _U_)
 {
     offset = dissect_rpc_data(tvb, tree, hf_fmp_sessionHandle,
                               offset);
@@ -967,7 +967,7 @@ dissect_FMP_Open_request(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 static int
 dissect_FMP_Open_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
-                       proto_tree *tree)
+                       proto_tree *tree, void* data _U_)
 {
     int rval;
 
@@ -988,7 +988,7 @@ dissect_FMP_Open_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
 
 static int
 dissect_FMP_Close_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
-                          proto_tree *tree)
+                          proto_tree *tree, void* data _U_)
 {
     offset = dissect_rpc_data(tvb, tree, hf_fmp_fmpFHandle, offset);
     offset = dissect_rpc_uint32(tvb, tree, hf_fmp_msgNum, offset);
@@ -997,7 +997,7 @@ dissect_FMP_Close_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
 
 static int
 dissect_FMP_Close_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
-                        proto_tree *tree)
+                        proto_tree *tree, void* data _U_)
 {
     int rval;
 
@@ -1011,7 +1011,7 @@ dissect_FMP_Close_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
 }
 
 static int
-dissect_FMP_OpenGetMap_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
+dissect_FMP_OpenGetMap_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_)
 {
     offset = dissect_rpc_data(tvb, tree, hf_fmp_sessionHandle,
                               offset);
@@ -1027,7 +1027,7 @@ dissect_FMP_OpenGetMap_request(tvbuff_t *tvb, int offset, packet_info *pinfo, pr
 
 static int
 dissect_FMP_OpenGetMap_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
-                             proto_tree *tree)
+                             proto_tree *tree, void* data _U_)
 {
     int rval;
 
@@ -1051,7 +1051,7 @@ dissect_FMP_OpenGetMap_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 static int
 dissect_FMP_OpenAllocSpace_request(tvbuff_t *tvb, int offset,
-                                   packet_info *pinfo, proto_tree *tree)
+                                   packet_info *pinfo, proto_tree *tree, void* data _U_)
 {
     offset = dissect_rpc_data(tvb , tree, hf_fmp_sessionHandle,
                               offset);
@@ -1066,7 +1066,7 @@ dissect_FMP_OpenAllocSpace_request(tvbuff_t *tvb, int offset,
 
 static int
 dissect_FMP_OpenAllocSpace_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
-                                 proto_tree *tree)
+                                 proto_tree *tree, void* data _U_)
 {
     int rval;
 
@@ -1089,7 +1089,7 @@ dissect_FMP_OpenAllocSpace_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 static int
 dissect_FMP_GetMap_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
-                           proto_tree *tree)
+                           proto_tree *tree, void* data _U_)
 {
     offset = dissect_rpc_data(tvb, tree, hf_fmp_fmpFHandle, offset);
     offset = dissect_rpc_uint32(tvb,  tree, hf_fmp_msgNum, offset);
@@ -1103,7 +1103,7 @@ dissect_FMP_GetMap_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
 
 static int
 dissect_FMP_GetMap_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
-                         proto_tree *tree)
+                         proto_tree *tree, void* data _U_)
 {
     int rval;
 
@@ -1123,7 +1123,7 @@ dissect_FMP_GetMap_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 static int
 dissect_FMP_AllocSpace_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
-                               proto_tree *tree)
+                               proto_tree *tree, void* data _U_)
 {
     offset = dissect_rpc_data(tvb,  tree, hf_fmp_fmpFHandle, offset);
     offset = dissect_rpc_uint32(tvb, tree, hf_fmp_msgNum, offset);
@@ -1137,7 +1137,7 @@ dissect_FMP_AllocSpace_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_
 
 static int
 dissect_FMP_AllocSpace_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
-                             proto_tree *tree)
+                             proto_tree *tree, void* data _U_)
 {
     int rval;
 
@@ -1157,7 +1157,7 @@ dissect_FMP_AllocSpace_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 static int
 dissect_FMP_Flush_request(tvbuff_t *tvb, int offset, packet_info *pinfo,
-                          proto_tree *tree)
+                          proto_tree *tree, void* data _U_)
 {
     offset = dissect_rpc_data(tvb, tree, hf_fmp_fmpFHandle, offset);
     offset = dissect_rpc_uint32(tvb, tree, hf_fmp_msgNum, offset);
@@ -1169,7 +1169,7 @@ dissect_FMP_Flush_request(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 static int
 dissect_FMP_Flush_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
-                        proto_tree *tree)
+                        proto_tree *tree, void* data _U_)
 {
     int rval;
 
@@ -1183,7 +1183,7 @@ dissect_FMP_Flush_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
 
 static int
 dissect_FMP_CancelReq_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
-                              proto_tree *tree)
+                              proto_tree *tree, void* data _U_)
 {
     offset = dissect_rpc_data(tvb, tree, hf_fmp_fmpFHandle, offset);
     offset = dissect_rpc_uint32(tvb, tree, hf_fmp_msgNum, offset);
@@ -1193,7 +1193,7 @@ dissect_FMP_CancelReq_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
 
 static int
 dissect_FMP_CancelReq_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
-                            proto_tree *tree)
+                            proto_tree *tree, void* data _U_)
 {
     int rval;
 
@@ -1207,7 +1207,7 @@ dissect_FMP_CancelReq_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
 
 static int
 dissect_FMP_PlugIn_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
-                           proto_tree *tree)
+                           proto_tree *tree, void* data _U_)
 {
     offset = dissect_plugInID(tvb, offset, tree);
     offset = dissect_rpc_data(tvb, tree, hf_fmp_plugInBuf, offset);
@@ -1216,7 +1216,7 @@ dissect_FMP_PlugIn_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
 
 static int
 dissect_FMP_PlugIn_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
-                         proto_tree *tree)
+                         proto_tree *tree, void* data _U_)
 {
     int rval;
 
@@ -1230,7 +1230,7 @@ dissect_FMP_PlugIn_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
 
 static int
 dissect_FMP_SessionTerminate_request(tvbuff_t *tvb, int offset,
-                                     packet_info *pinfo _U_, proto_tree *tree)
+                                     packet_info *pinfo _U_, proto_tree *tree, void* data _U_)
 {
     offset = dissect_rpc_data(tvb,  tree, hf_fmp_sessionHandle,
                               offset);
@@ -1239,7 +1239,7 @@ dissect_FMP_SessionTerminate_request(tvbuff_t *tvb, int offset,
 
 static int
 dissect_FMP_SessionTerminate_reply(tvbuff_t *tvb, int offset,
-                                   packet_info *pinfo _U_, proto_tree *tree)
+                                   packet_info *pinfo _U_, proto_tree *tree, void* data _U_)
 {
     int rval;
 
@@ -1248,7 +1248,7 @@ dissect_FMP_SessionTerminate_reply(tvbuff_t *tvb, int offset,
 }
 
 static int
-dissect_FMP_SessionCreateEx_request(tvbuff_t *tvb, int offset,packet_info *pinfo,  proto_tree *tree)
+dissect_FMP_SessionCreateEx_request(tvbuff_t *tvb, int offset,packet_info *pinfo,  proto_tree *tree, void* data _U_)
 {
 
     offset = dissect_rpc_string(tvb, tree, hf_fmp_hostID,
@@ -1280,7 +1280,7 @@ dissect_FMP_SessionCreateEx_request(tvbuff_t *tvb, int offset,packet_info *pinfo
 
 
 static int
-dissect_FMP_SessionCreateEx_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
+dissect_FMP_SessionCreateEx_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_)
 {
 
     int rval;
@@ -1320,7 +1320,7 @@ dissect_FMP_SessionCreateEx_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 static int
 dissect_FMP_ReportClientError_request(tvbuff_t *tvb, int offset,
-                                      packet_info *pinfo _U_, proto_tree *tree)
+                                      packet_info *pinfo _U_, proto_tree *tree, void* data _U_)
 {
     offset = dissect_rpc_string(tvb, tree, hf_fmp_description,
                                 offset, NULL);
@@ -1331,7 +1331,7 @@ dissect_FMP_ReportClientError_request(tvbuff_t *tvb, int offset,
 
 static int
 dissect_FMP_ReportClientError_reply(tvbuff_t *tvb, int offset,
-                                    packet_info *pinfo _U_, proto_tree *tree)
+                                    packet_info *pinfo _U_, proto_tree *tree, void* data _U_)
 {
     int rval;
     offset = dissect_fmp_status(tvb, offset,tree, &rval);
@@ -1341,7 +1341,7 @@ dissect_FMP_ReportClientError_reply(tvbuff_t *tvb, int offset,
 
 static int
 dissect_FMP_GetAttr_request(tvbuff_t *tvb, int offset,
-                            packet_info *pinfo _U_, proto_tree *tree)
+                            packet_info *pinfo _U_, proto_tree *tree, void* data _U_)
 {
     offset = dissect_rpc_data(tvb, tree, hf_fmp_fmpFHandle, offset);
 
@@ -1353,7 +1353,7 @@ dissect_FMP_GetAttr_request(tvbuff_t *tvb, int offset,
 
 static int
 dissect_FMP_GetAttr_reply(tvbuff_t *tvb, int offset,
-                          packet_info *pinfo _U_, proto_tree *tree)
+                          packet_info *pinfo _U_, proto_tree *tree, void* data _U_)
 {
     int rval;
     offset = dissect_fmp_status(tvb, offset,tree, &rval);
@@ -1368,7 +1368,7 @@ dissect_FMP_GetAttr_reply(tvbuff_t *tvb, int offset,
 
 static int
 dissect_FMP_OpenGetAttr_request(tvbuff_t *tvb, int offset,
-                                packet_info *pinfo, proto_tree *tree)
+                                packet_info *pinfo, proto_tree *tree, void* data _U_)
 {
 
     offset = dissect_rpc_data(tvb,  tree, hf_fmp_sessionHandle,
@@ -1382,7 +1382,7 @@ dissect_FMP_OpenGetAttr_request(tvbuff_t *tvb, int offset,
 
 static int
 dissect_FMP_OpenGetAttr_reply(tvbuff_t *tvb, int offset,
-                              packet_info *pinfo _U_, proto_tree *tree)
+                              packet_info *pinfo _U_, proto_tree *tree, void* data _U_)
 {
     int rval;
 
@@ -1403,7 +1403,7 @@ dissect_FMP_OpenGetAttr_reply(tvbuff_t *tvb, int offset,
 
 static int
 dissect_FMP_FlushGetAttr_request(tvbuff_t *tvb, int offset,
-                                 packet_info *pinfo, proto_tree *tree)
+                                 packet_info *pinfo, proto_tree *tree, void* data _U_)
 {
 
     offset = dissect_fmp_fileHandleSrc(tvb, offset, pinfo, tree);
@@ -1422,7 +1422,7 @@ dissect_FMP_FlushGetAttr_request(tvbuff_t *tvb, int offset,
 
 static int
 dissect_FMP_FlushGetAttr_reply(tvbuff_t *tvb, int offset,
-                               packet_info *pinfo _U_, proto_tree *tree)
+                               packet_info *pinfo _U_, proto_tree *tree, void* data _U_)
 {
     int rval;
 
@@ -1439,7 +1439,7 @@ dissect_FMP_FlushGetAttr_reply(tvbuff_t *tvb, int offset,
 
 static int
 dissect_FMP_GetVolumeInfo_request(tvbuff_t *tvb, int offset,
-                                  packet_info *pinfo _U_, proto_tree *tree)
+                                  packet_info *pinfo _U_, proto_tree *tree, void* data _U_)
 {
     offset = dissect_rpc_uint32(tvb, tree, hf_fmp_topVolumeId, offset);
     offset = dissect_rpc_uint32(tvb, tree, hf_fmp_cursor, offset);
@@ -1451,7 +1451,7 @@ dissect_FMP_GetVolumeInfo_request(tvbuff_t *tvb, int offset,
 
 static int
 dissect_FMP_GetVolumeInfo_reply(tvbuff_t *tvb, int offset,
-                                packet_info *pinfo _U_, proto_tree *tree)
+                                packet_info *pinfo _U_, proto_tree *tree, void* data _U_)
 {
     int rval;
 
@@ -1466,7 +1466,7 @@ dissect_FMP_GetVolumeInfo_reply(tvbuff_t *tvb, int offset,
 
 static int
 dissect_FMP_OpenGetMapEx_request(tvbuff_t *tvb, int offset,
-                                 packet_info *pinfo, proto_tree *tree)
+                                 packet_info *pinfo, proto_tree *tree, void* data _U_)
 {
     offset = dissect_rpc_data(tvb, tree, hf_fmp_sessionHandle,
                               offset);
@@ -1481,7 +1481,7 @@ dissect_FMP_OpenGetMapEx_request(tvbuff_t *tvb, int offset,
 
 static int
 dissect_FMP_OpenGetMapEx_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
-                               proto_tree *tree)
+                               proto_tree *tree, void* data _U_)
 {
     int rval;
     offset = dissect_fmp_status(tvb, offset,tree, &rval);
@@ -1505,7 +1505,7 @@ dissect_FMP_OpenGetMapEx_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_
 
 static int
 dissect_FMP_OpenAllocSpaceEx_request(tvbuff_t *tvb, int offset,
-                                     packet_info *pinfo, proto_tree *tree)
+                                     packet_info *pinfo, proto_tree *tree, void* data _U_)
 {
     offset = dissect_rpc_data(tvb , tree, hf_fmp_sessionHandle,
                               offset);
@@ -1520,7 +1520,7 @@ dissect_FMP_OpenAllocSpaceEx_request(tvbuff_t *tvb, int offset,
 
 static int
 dissect_FMP_OpenAllocSpaceEx_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
-                                   proto_tree *tree)
+                                   proto_tree *tree, void* data _U_)
 {
     int rval;
 
@@ -1543,7 +1543,7 @@ dissect_FMP_OpenAllocSpaceEx_reply(tvbuff_t *tvb, int offset, packet_info *pinfo
 
 static int
 dissect_FMP_GetMapEx_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
-                             proto_tree *tree)
+                             proto_tree *tree, void* data _U_)
 {
     offset = dissect_rpc_data(tvb, tree, hf_fmp_fmpFHandle, offset);
     offset = dissect_rpc_uint32(tvb,  tree, hf_fmp_msgNum, offset);
@@ -1557,7 +1557,7 @@ dissect_FMP_GetMapEx_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
 
 static int
 dissect_FMP_GetMapEx_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
-                           proto_tree *tree)
+                           proto_tree *tree, void* data _U_)
 {
     int rval;
 
@@ -1578,7 +1578,7 @@ dissect_FMP_GetMapEx_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 static int
 dissect_FMP_AllocSpaceEx_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
-                                 proto_tree *tree)
+                                 proto_tree *tree, void* data _U_)
 {
     offset = dissect_rpc_data(tvb,  tree, hf_fmp_fmpFHandle, offset);
     offset = dissect_rpc_uint32(tvb, tree, hf_fmp_msgNum, offset);
@@ -1592,7 +1592,7 @@ dissect_FMP_AllocSpaceEx_request(tvbuff_t *tvb, int offset, packet_info *pinfo _
 
 static int
 dissect_FMP_AllocSpaceEx_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
-                               proto_tree *tree)
+                               proto_tree *tree, void* data _U_)
 {
     int rval;
 
@@ -1612,7 +1612,7 @@ dissect_FMP_AllocSpaceEx_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 static int
 dissect_FMP_FlushEx_request(tvbuff_t *tvb, int offset, packet_info *pinfo,
-                            proto_tree *tree)
+                            proto_tree *tree, void* data _U_)
 {
     offset = dissect_rpc_data(tvb, tree, hf_fmp_fmpFHandle, offset);
     offset = dissect_rpc_uint32(tvb, tree, hf_fmp_msgNum, offset);
@@ -1624,7 +1624,7 @@ dissect_FMP_FlushEx_request(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 static int
 dissect_FMP_FlushEx_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
-                          proto_tree *tree)
+                          proto_tree *tree, void* data _U_)
 {
     int rval;