From af0819f942fc85919fe9e81a9e990b0f9bf50ca2 Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Sun, 10 Nov 2013 03:20:04 +0000 Subject: 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 --- epan/dissectors/packet-bootparams.c | 8 +- epan/dissectors/packet-fmp.c | 96 +++++++-------- epan/dissectors/packet-fmp_notify.c | 28 ++--- epan/dissectors/packet-gluster.h | 4 +- epan/dissectors/packet-gluster_cli.c | 34 +++--- epan/dissectors/packet-gluster_pmap.c | 14 +-- epan/dissectors/packet-glusterd.c | 60 ++++----- epan/dissectors/packet-glusterfs.c | 202 +++++++++++++++---------------- epan/dissectors/packet-glusterfs_hndsk.c | 30 ++--- epan/dissectors/packet-hclnfsd.c | 58 ++++----- epan/dissectors/packet-klm.c | 10 +- epan/dissectors/packet-mount.c | 30 +++-- epan/dissectors/packet-ndmp.c | 46 +++---- epan/dissectors/packet-nfs.c | 172 +++++++++++++------------- epan/dissectors/packet-nfsacl.c | 32 ++--- epan/dissectors/packet-nisplus.c | 57 +++++---- epan/dissectors/packet-nlm.c | 38 +++--- epan/dissectors/packet-pcnfsd.c | 12 +- epan/dissectors/packet-portmap.c | 30 ++--- epan/dissectors/packet-rpc.c | 27 +++-- epan/dissectors/packet-rpc.h | 2 +- epan/dissectors/packet-rquota.c | 6 +- epan/dissectors/packet-rwall.c | 2 +- epan/dissectors/packet-spray.c | 7 +- epan/dissectors/packet-stat-notify.c | 2 +- epan/dissectors/packet-stat.c | 16 +-- epan/dissectors/packet-teklink.c | 38 +++--- epan/dissectors/packet-vxi11.c | 32 ++--- epan/dissectors/packet-ypbind.c | 6 +- epan/dissectors/packet-yppasswd.c | 4 +- epan/dissectors/packet-ypserv.c | 44 +++---- 31 files changed, 572 insertions(+), 575 deletions(-) (limited to 'epan') diff --git a/epan/dissectors/packet-bootparams.c b/epan/dissectors/packet-bootparams.c index 41ccd9a72c..ee15781ebd 100644 --- a/epan/dissectors/packet-bootparams.c +++ b/epan/dissectors/packet-bootparams.c @@ -89,7 +89,7 @@ dissect_bp_address(tvbuff_t *tvb, int offset, proto_tree *tree, int hfindex) static int -dissect_getfile_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_getfile_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { if ( tree ) { @@ -101,7 +101,7 @@ dissect_getfile_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tr } static int -dissect_getfile_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_getfile_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { if ( tree ) { @@ -114,7 +114,7 @@ dissect_getfile_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_t } static int -dissect_whoami_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_whoami_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { if ( tree ) { @@ -125,7 +125,7 @@ dissect_whoami_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre } static int -dissect_whoami_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_whoami_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { if ( tree ) { 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; diff --git a/epan/dissectors/packet-fmp_notify.c b/epan/dissectors/packet-fmp_notify.c index e93458c266..79943ac018 100644 --- a/epan/dissectors/packet-fmp_notify.c +++ b/epan/dissectors/packet-fmp_notify.c @@ -207,7 +207,7 @@ dissect_handleList(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, static int dissect_FMP_NOTIFY_DownGrade_request(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { @@ -223,7 +223,7 @@ dissect_FMP_NOTIFY_DownGrade_request(tvbuff_t *tvb, int offset, static int dissect_FMP_NOTIFY_DownGrade_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; @@ -233,7 +233,7 @@ dissect_FMP_NOTIFY_DownGrade_reply(tvbuff_t *tvb, int offset, static int dissect_FMP_NOTIFY_RevokeList_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, @@ -248,7 +248,7 @@ dissect_FMP_NOTIFY_RevokeList_request(tvbuff_t *tvb, int offset, static int dissect_FMP_NOTIFY_RevokeList_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; @@ -258,7 +258,7 @@ dissect_FMP_NOTIFY_RevokeList_reply(tvbuff_t *tvb, int offset, static int dissect_FMP_NOTIFY_RevokeAll_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); @@ -269,7 +269,7 @@ dissect_FMP_NOTIFY_RevokeAll_request(tvbuff_t *tvb, int offset, static int dissect_FMP_NOTIFY_RevokeAll_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; @@ -279,7 +279,7 @@ dissect_FMP_NOTIFY_RevokeAll_reply(tvbuff_t *tvb, int offset, static int dissect_FMP_NOTIFY_FileSetEof_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); @@ -291,7 +291,7 @@ dissect_FMP_NOTIFY_FileSetEof_request(tvbuff_t *tvb, int offset, static int dissect_FMP_NOTIFY_FileSetEof_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; @@ -301,7 +301,7 @@ dissect_FMP_NOTIFY_FileSetEof_reply(tvbuff_t *tvb, int offset, static int dissect_FMP_NOTIFY_RequestDone_request(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree) + packet_info *pinfo, proto_tree *tree, void* data _U_) { int rval; @@ -322,7 +322,7 @@ dissect_FMP_NOTIFY_RequestDone_request(tvbuff_t *tvb, int offset, static int dissect_FMP_NOTIFY_RequestDone_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; @@ -332,7 +332,7 @@ dissect_FMP_NOTIFY_RequestDone_reply(tvbuff_t *tvb, int offset, static int dissect_FMP_NOTIFY_volFreeze_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); @@ -342,7 +342,7 @@ dissect_FMP_NOTIFY_volFreeze_request(tvbuff_t *tvb, int offset, static int dissect_FMP_NOTIFY_volFreeze_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; @@ -353,7 +353,7 @@ dissect_FMP_NOTIFY_volFreeze_reply(tvbuff_t *tvb, int offset, static int dissect_FMP_NOTIFY_revokeHandleList_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); @@ -364,7 +364,7 @@ dissect_FMP_NOTIFY_revokeHandleList_request(tvbuff_t *tvb, int offset, static int dissect_FMP_NOTIFY_revokeHandleList_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; diff --git a/epan/dissectors/packet-gluster.h b/epan/dissectors/packet-gluster.h index c147f41cd4..9d922ccd5c 100644 --- a/epan/dissectors/packet-gluster.h +++ b/epan/dissectors/packet-gluster.h @@ -434,9 +434,9 @@ gluster_rpc_dissect_dict(proto_tree *tree, tvbuff_t *tvb, int hfindex, extern int gluster_dissect_common_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree); + packet_info *pinfo, proto_tree *tree, void* data _U_); extern int glusterfs_gfs3_3_op_common_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree); + packet_info *pinfo, proto_tree *tree, void* data _U_); #endif /* __PACKET_GLUSTER_H__ */ diff --git a/epan/dissectors/packet-gluster_cli.c b/epan/dissectors/packet-gluster_cli.c index 7198668b6d..dd3dcd56dd 100644 --- a/epan/dissectors/packet-gluster_cli.c +++ b/epan/dissectors/packet-gluster_cli.c @@ -65,7 +65,7 @@ static gint ett_gluster_cli = -1; /* CLI Operations */ static int gluster_cli_2_common_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = gluster_rpc_dissect_dict(tree, tvb, hf_gluster_dict, offset); @@ -74,9 +74,9 @@ gluster_cli_2_common_call(tvbuff_t *tvb, int offset, static int gluster_cli_2_common_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { - offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree); + offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree, data); offset = dissect_rpc_string(tvb, tree, hf_gluster_op_errstr, offset, NULL); offset = gluster_rpc_dissect_dict(tree, tvb, hf_gluster_dict, offset); @@ -86,9 +86,9 @@ gluster_cli_2_common_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, static int gluster_cli_2_probe_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { - offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree); + offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree, data); offset = dissect_rpc_uint32(tvb, tree, hf_gluster_port, offset); offset = dissect_rpc_string(tvb, tree, hf_gluster_hostname, offset, NULL); @@ -100,7 +100,7 @@ gluster_cli_2_probe_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, static int gluster_cli_2_probe_call(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_gluster_hostname, offset, NULL); @@ -111,9 +111,9 @@ gluster_cli_2_probe_call(tvbuff_t *tvb, int offset, static int gluster_cli_2_deprobe_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { - offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree); + offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree, data); offset = dissect_rpc_string(tvb, tree, hf_gluster_hostname, offset, NULL); @@ -122,7 +122,7 @@ gluster_cli_2_deprobe_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, static int gluster_cli_2_deprobe_call(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_gluster_hostname, offset, NULL); @@ -134,7 +134,7 @@ gluster_cli_2_deprobe_call(tvbuff_t *tvb, int offset, static int gluster_cli_2_fsm_log_call(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_gluster_wd, offset, NULL); @@ -143,9 +143,9 @@ gluster_cli_2_fsm_log_call(tvbuff_t *tvb, int offset, static int gluster_cli_2_getwd_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { - offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree); + offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree, data); offset = dissect_rpc_string(tvb, tree, hf_gluster_wd, offset, NULL); return offset; @@ -153,7 +153,7 @@ gluster_cli_2_getwd_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, static int gluster_cli_2_getwd_call(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_gluster_unused, offset); @@ -162,7 +162,7 @@ gluster_cli_2_getwd_call(tvbuff_t *tvb, int offset, static int gluster_cli_2_mount_call(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_gluster_label, offset, NULL); @@ -173,9 +173,9 @@ gluster_cli_2_mount_call(tvbuff_t *tvb, int offset, static int gluster_cli_2_mount_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { - offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree); + offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree, data); offset = dissect_rpc_string(tvb, tree, hf_gluster_path, offset, NULL); return offset; @@ -183,7 +183,7 @@ gluster_cli_2_mount_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, static int gluster_cli_2_umount_call(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_gluster_lazy, offset); offset = dissect_rpc_string(tvb, tree, hf_gluster_path, offset, NULL); diff --git a/epan/dissectors/packet-gluster_pmap.c b/epan/dissectors/packet-gluster_pmap.c index 7d02a6b51f..5e82b1675a 100644 --- a/epan/dissectors/packet-gluster_pmap.c +++ b/epan/dissectors/packet-gluster_pmap.c @@ -67,9 +67,9 @@ static gint ett_gluster_dump_detail = -1; /* PMAP PORTBYBRICK */ static int gluster_pmap_portbybrick_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { - offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree); + offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree, data); offset = dissect_rpc_uint32(tvb, tree, hf_gluster_brick_status, offset); offset = dissect_rpc_uint32(tvb, tree, hf_gluster_brick_port, offset); @@ -78,7 +78,7 @@ gluster_pmap_portbybrick_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, static int gluster_pmap_portbybrick_call(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_gluster_brick, offset, NULL); @@ -91,7 +91,7 @@ gluster_pmap_portbybrick_call(tvbuff_t *tvb, int offset, */ static int gluster_dump_reply_detail(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { proto_item *detail_item; proto_tree *detail_tree; @@ -120,10 +120,10 @@ gluster_dump_reply_detail(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, static int gluster_dump_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = dissect_rpc_uint64(tvb, tree, hf_gluster_gfsid, offset); - offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree); + offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree, data); offset = dissect_rpc_list(tvb, pinfo, tree, offset, gluster_dump_reply_detail); @@ -134,7 +134,7 @@ gluster_dump_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, /* DUMP request */ static int gluster_dump_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = dissect_rpc_uint64(tvb, tree, hf_gluster_gfsid, offset); diff --git a/epan/dissectors/packet-glusterd.c b/epan/dissectors/packet-glusterd.c index 4317db7d2d..df6eaba220 100644 --- a/epan/dissectors/packet-glusterd.c +++ b/epan/dissectors/packet-glusterd.c @@ -116,21 +116,21 @@ gluster_gd_mgmt_dissect_uuid(tvbuff_t *tvb, proto_tree *tree, int hfindex, static int gluster_gd_mgmt_probe_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = gluster_gd_mgmt_dissect_uuid(tvb, tree, hf_glusterd_uuid, offset); offset = dissect_rpc_string(tvb, tree, hf_glusterd_hostname, offset, NULL); offset = dissect_rpc_uint32(tvb, tree, hf_glusterd_port, offset); - offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree); + offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree, data); return offset; } static int gluster_gd_mgmt_probe_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = gluster_gd_mgmt_dissect_uuid(tvb, tree, hf_glusterd_uuid, offset); @@ -143,13 +143,13 @@ gluster_gd_mgmt_probe_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, static int gluster_gd_mgmt_friend_add_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree) + packet_info *pinfo, proto_tree *tree, void* data _U_) { offset = gluster_gd_mgmt_dissect_uuid(tvb, tree, hf_glusterd_uuid, offset); offset = dissect_rpc_string(tvb, tree, hf_glusterd_hostname, offset, NULL); - offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree); + offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree, data); offset = dissect_rpc_uint32(tvb, tree, hf_glusterd_port, offset); return offset; @@ -157,7 +157,7 @@ gluster_gd_mgmt_friend_add_reply(tvbuff_t *tvb, int offset, static int gluster_gd_mgmt_friend_add_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = gluster_gd_mgmt_dissect_uuid(tvb, tree, hf_glusterd_uuid, offset); @@ -172,11 +172,11 @@ gluster_gd_mgmt_friend_add_call(tvbuff_t *tvb, int offset, /* gluster_gd_mgmt_cluster_lock_reply is used for LOCK and UNLOCK */ static int gluster_gd_mgmt_cluster_lock_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree) + packet_info *pinfo, proto_tree *tree, void* data _U_) { offset = gluster_gd_mgmt_dissect_uuid(tvb, tree, hf_glusterd_uuid, offset); - offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree); + offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree, data); return offset; } @@ -184,7 +184,7 @@ gluster_gd_mgmt_cluster_lock_reply(tvbuff_t *tvb, int offset, /* gluster_gd_mgmt_cluster_lock_call is used for LOCK and UNLOCK */ static int gluster_gd_mgmt_cluster_lock_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = gluster_gd_mgmt_dissect_uuid(tvb, tree, hf_glusterd_uuid, offset); @@ -194,11 +194,11 @@ gluster_gd_mgmt_cluster_lock_call(tvbuff_t *tvb, int offset, static int gluster_gd_mgmt_stage_op_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = gluster_gd_mgmt_dissect_uuid(tvb, tree, hf_glusterd_uuid, offset); - offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree); + offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree, data); offset = dissect_rpc_string(tvb, tree, hf_glusterd_op_errstr, offset, NULL); offset = gluster_rpc_dissect_dict(tree, tvb, hf_glusterd_dict, offset); @@ -207,7 +207,7 @@ gluster_gd_mgmt_stage_op_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, static int gluster_gd_mgmt_stage_op_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = gluster_gd_mgmt_dissect_uuid(tvb, tree, hf_glusterd_uuid, offset); @@ -219,11 +219,11 @@ gluster_gd_mgmt_stage_op_call(tvbuff_t *tvb, int offset, static int gluster_gd_mgmt_commit_op_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = gluster_gd_mgmt_dissect_uuid(tvb, tree, hf_glusterd_uuid, offset); - offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree); + offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree, data); offset = gluster_rpc_dissect_dict(tree, tvb, hf_glusterd_buf, offset); offset = dissect_rpc_string(tvb, tree, hf_glusterd_op_errstr, offset, NULL); @@ -232,7 +232,7 @@ gluster_gd_mgmt_commit_op_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, static int gluster_gd_mgmt_commit_op_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = gluster_gd_mgmt_dissect_uuid(tvb, tree, hf_glusterd_uuid, offset); @@ -245,19 +245,19 @@ gluster_gd_mgmt_commit_op_call(tvbuff_t *tvb, int offset, static int gluster_gd_mgmt_friend_update_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree) + packet_info *pinfo, proto_tree *tree, void* data _U_) { offset = gluster_gd_mgmt_dissect_uuid(tvb, tree, hf_glusterd_uuid, offset); offset = dissect_rpc_uint32(tvb, tree, hf_glusterd_op, offset); - offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree); + offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree, data); return offset; } static int gluster_gd_mgmt_friend_update_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = gluster_gd_mgmt_dissect_uuid(tvb, tree, hf_glusterd_uuid, offset); @@ -271,11 +271,11 @@ gluster_gd_mgmt_friend_update_call(tvbuff_t *tvb, int offset, /* Below procedure is used for version 2 */ static int glusterd_mgmt_2_cluster_lock_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree) + packet_info *pinfo, proto_tree *tree, void* data _U_) { offset = gluster_gd_mgmt_dissect_uuid(tvb, tree, hf_glusterd_uuid, offset); - offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree); + offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree, data); return offset; } @@ -283,7 +283,7 @@ glusterd_mgmt_2_cluster_lock_reply(tvbuff_t *tvb, int offset, /* glusterd__mgmt_2_cluster_lock_call is used for LOCK and UNLOCK */ static int glusterd_mgmt_2_cluster_lock_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = gluster_gd_mgmt_dissect_uuid(tvb, tree, hf_glusterd_uuid, offset); @@ -293,12 +293,12 @@ glusterd_mgmt_2_cluster_lock_call(tvbuff_t *tvb, int offset, static int glusterd_mgmt_2_stage_op_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = gluster_gd_mgmt_dissect_uuid(tvb, tree, hf_glusterd_uuid, offset); offset = dissect_rpc_uint32(tvb, tree, hf_glusterd_op, offset); - offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree); + offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree, data); offset = dissect_rpc_string(tvb, tree, hf_glusterd_op_errstr, offset, NULL); offset = gluster_rpc_dissect_dict(tree, tvb, hf_glusterd_dict, offset); @@ -308,7 +308,7 @@ glusterd_mgmt_2_stage_op_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, static int glusterd_mgmt_2_stage_op_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = gluster_gd_mgmt_dissect_uuid(tvb, tree, hf_glusterd_uuid, offset); @@ -320,11 +320,11 @@ glusterd_mgmt_2_stage_op_call(tvbuff_t *tvb, int offset, static int glusterd_mgmt_2_commit_op_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = gluster_gd_mgmt_dissect_uuid(tvb, tree, hf_glusterd_uuid, offset); - offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree); + offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree, data); offset = gluster_rpc_dissect_dict(tree, tvb, hf_glusterd_buf, offset); offset = dissect_rpc_string(tvb, tree, hf_glusterd_op_errstr, offset, NULL); @@ -334,7 +334,7 @@ glusterd_mgmt_2_commit_op_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, static int glusterd_mgmt_2_commit_op_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = gluster_gd_mgmt_dissect_uuid(tvb, tree, hf_glusterd_uuid, offset); @@ -348,9 +348,9 @@ glusterd_mgmt_2_commit_op_call(tvbuff_t *tvb, int offset, static int glusterd_brick_2_common_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { - offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree); + offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree, data); offset = dissect_rpc_string(tvb, tree, hf_glusterd_op_errstr, offset, NULL); offset = gluster_rpc_dissect_dict(tree, tvb, hf_glusterd_dict, offset); @@ -360,7 +360,7 @@ glusterd_brick_2_common_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, static int glusterd_brick_2_common_call(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_glusterd_name, offset, NULL); diff --git a/epan/dissectors/packet-glusterfs.c b/epan/dissectors/packet-glusterfs.c index ef93d0a3bf..a3b6230566 100644 --- a/epan/dissectors/packet-glusterfs.c +++ b/epan/dissectors/packet-glusterfs.c @@ -574,7 +574,7 @@ gluster_rpc_dissect_dict(proto_tree *tree, tvbuff_t *tvb, int hfindex, int offse int gluster_dissect_common_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { proto_item *errno_item; guint op_errno; @@ -620,7 +620,7 @@ _glusterfs_gfs3_common_readdir_reply(tvbuff_t *tvb, proto_tree *tree, int offset static int glusterfs_gfs3_op_unlink_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = glusterfs_rpc_dissect_gf_iatt(tree, tvb, hf_glusterfs_preparent_iatt, offset); @@ -632,7 +632,7 @@ glusterfs_gfs3_op_unlink_reply(tvbuff_t *tvb, int offset, static int glusterfs_gfs3_op_unlink_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_pargfid, offset); offset = dissect_rpc_string(tvb, tree, hf_glusterfs_path, offset, NULL); @@ -642,16 +642,16 @@ glusterfs_gfs3_op_unlink_call(tvbuff_t *tvb, int offset, static int glusterfs_gfs3_op_statfs_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { - offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree); + offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree, data); offset = glusterfs_rpc_dissect_statfs(tree, tvb, offset); return offset; } static int glusterfs_gfs3_op_statfs_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_gfid, offset); offset = dissect_rpc_string(tvb, tree, hf_glusterfs_path, offset, NULL); @@ -661,7 +661,7 @@ glusterfs_gfs3_op_statfs_call(tvbuff_t *tvb, int offset, static int glusterfs_gfs3_op_flush_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_gfid, offset); offset = dissect_rpc_uint64(tvb, tree, hf_glusterfs_fd, offset); @@ -670,7 +670,7 @@ glusterfs_gfs3_op_flush_call(tvbuff_t *tvb, int offset, static int glusterfs_gfs3_op_setxattr_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_gfid, offset); offset = glusterfs_rpc_dissect_flags(tree, tvb, offset); @@ -682,16 +682,16 @@ glusterfs_gfs3_op_setxattr_call(tvbuff_t *tvb, int offset, static int glusterfs_gfs3_op_opendir_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { - offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree); + offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree, data); offset = dissect_rpc_uint64(tvb, tree, hf_glusterfs_fd, offset); return offset; } static int glusterfs_gfs3_op_opendir_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_gfid, offset); offset = dissect_rpc_string(tvb, tree, hf_glusterfs_path, offset, NULL); @@ -702,9 +702,9 @@ glusterfs_gfs3_op_opendir_call(tvbuff_t *tvb, int offset, /* rpc/xdr/src/glusterfs3-xdr.c:xdr_gfs3_create_rsp */ static int glusterfs_gfs3_op_create_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { - offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree); + offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree, data); offset = glusterfs_rpc_dissect_gf_iatt(tree, tvb, hf_glusterfs_iatt, offset); offset = dissect_rpc_uint64(tvb, tree, hf_glusterfs_fd, offset); @@ -719,7 +719,7 @@ glusterfs_gfs3_op_create_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, /* rpc/xdr/src/glusterfs3-xdr.c:xdr_gfs3_create_req */ static int glusterfs_gfs3_op_create_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_pargfid, offset); offset = glusterfs_rpc_dissect_flags(tree, tvb, offset); @@ -733,9 +733,9 @@ glusterfs_gfs3_op_create_call(tvbuff_t *tvb, int offset, static int glusterfs_gfs3_op_lookup_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { - offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree); + offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree, data); offset = glusterfs_rpc_dissect_gf_iatt(tree, tvb, hf_glusterfs_iatt, offset); offset = glusterfs_rpc_dissect_gf_iatt(tree, tvb, @@ -747,7 +747,7 @@ glusterfs_gfs3_op_lookup_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, static int glusterfs_gfs3_op_lookup_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_gfid, offset); offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_pargfid, offset); @@ -761,7 +761,7 @@ glusterfs_gfs3_op_lookup_call(tvbuff_t *tvb, int offset, static int glusterfs_gfs3_op_inodelk_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { proto_item *flock_item; proto_tree *flock_tree; @@ -816,21 +816,21 @@ _glusterfs_gfs_op_readdir_entry(tvbuff_t *tvb, int offset, proto_tree *tree, static int glusterfs_gfs3_op_readdirp_entry(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { return _glusterfs_gfs_op_readdir_entry(tvb, offset, tree, TRUE, FALSE); } static int glusterfs_gfs3_3_op_readdir_entry(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { return _glusterfs_gfs_op_readdir_entry(tvb, offset, tree, FALSE, FALSE); } static int glusterfs_gfs3_3_op_readdirp_entry(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { return _glusterfs_gfs_op_readdir_entry(tvb, offset, tree, TRUE, TRUE); } @@ -839,7 +839,7 @@ glusterfs_gfs3_3_op_readdirp_entry(tvbuff_t *tvb, int offset, /* details in xlators/storage/posix/src/posix.c:posix_fill_readdir() */ static int glusterfs_gfs3_op_readdirp_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = _glusterfs_gfs3_common_readdir_reply(tvb, tree, offset); offset = dissect_rpc_list(tvb, pinfo, tree, offset, @@ -850,7 +850,7 @@ glusterfs_gfs3_op_readdirp_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, static int glusterfs_gfs3_op_readdirp_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_gfid, offset); offset = dissect_rpc_uint64(tvb, tree, hf_glusterfs_fd, offset); @@ -862,9 +862,9 @@ glusterfs_gfs3_op_readdirp_call(tvbuff_t *tvb, int offset, static int glusterfs_gfs3_op_setattr_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { - offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree); + offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree, data); offset = glusterfs_rpc_dissect_gf_iatt(tree, tvb, hf_glusterfs_preop_iatt, offset); offset = glusterfs_rpc_dissect_gf_iatt(tree, tvb, @@ -897,7 +897,7 @@ glusterfs_rpc_dissect_setattr(proto_tree *tree, tvbuff_t *tvb, int offset) } static int -glusterfs_gfs3_op_setattr_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +glusterfs_gfs3_op_setattr_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_gfid, offset); @@ -913,7 +913,7 @@ glusterfs_gfs3_op_setattr_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_ static int glusterfs_gfs3_3_op_stat_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_gfid, offset); offset = gluster_rpc_dissect_dict(tree, tvb, hf_glusterfs_dict, offset); @@ -923,9 +923,9 @@ glusterfs_gfs3_3_op_stat_call(tvbuff_t *tvb, int offset, static int glusterfs_gfs3_3_op_stat_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { - offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree); + offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree, data); offset = glusterfs_rpc_dissect_gf_iatt(tree, tvb, hf_glusterfs_iatt, offset); offset = gluster_rpc_dissect_dict(tree, tvb, hf_glusterfs_dict, @@ -937,9 +937,9 @@ glusterfs_gfs3_3_op_stat_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, /* glusterfs_gfs3_3_op_mknod_reply() is also used as a ..mkdir_reply() */ static int glusterfs_gfs3_3_op_mknod_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { - offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree); + offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree, data); offset = glusterfs_rpc_dissect_gf_iatt(tree, tvb, hf_glusterfs_iatt, offset); offset = glusterfs_rpc_dissect_gf_iatt(tree, tvb, @@ -954,7 +954,7 @@ glusterfs_gfs3_3_op_mknod_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, static int glusterfs_gfs3_3_op_mknod_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_pargfid, offset); offset = dissect_rpc_uint64(tvb, tree, hf_glusterfs_offset, offset); @@ -968,7 +968,7 @@ glusterfs_gfs3_3_op_mknod_call(tvbuff_t *tvb, int offset, static int glusterfs_gfs3_3_op_mkdir_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_pargfid, offset); offset = glusterfs_rpc_dissect_mode(tree, tvb, hf_glusterfs_mode, offset); @@ -981,9 +981,9 @@ glusterfs_gfs3_3_op_mkdir_call(tvbuff_t *tvb, int offset, static int glusterfs_gfs3_3_op_readlink_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree) + packet_info *pinfo, proto_tree *tree, void* data _U_) { - offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree); + offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree, data); offset = glusterfs_rpc_dissect_gf_iatt(tree, tvb, hf_glusterfs_iatt, offset); offset = dissect_rpc_string(tvb, tree, hf_glusterfs_path, offset, @@ -995,7 +995,7 @@ glusterfs_gfs3_3_op_readlink_reply(tvbuff_t *tvb, int offset, static int glusterfs_gfs3_3_op_readlink_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_gfid, offset); offset = dissect_rpc_uint32(tvb, tree, hf_glusterfs_size, offset); @@ -1007,9 +1007,9 @@ glusterfs_gfs3_3_op_readlink_call(tvbuff_t *tvb, int offset, /* glusterfs_gfs3_3_op_unlink_reply() is also used for ...rmdir_reply() */ static int glusterfs_gfs3_3_op_unlink_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { - offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree); + offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree, data); offset = glusterfs_rpc_dissect_gf_iatt(tree, tvb, hf_glusterfs_preparent_iatt, offset); offset = glusterfs_rpc_dissect_gf_iatt(tree, tvb, @@ -1021,7 +1021,7 @@ glusterfs_gfs3_3_op_unlink_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, static int glusterfs_gfs3_3_op_unlink_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { guint xflags; @@ -1037,7 +1037,7 @@ glusterfs_gfs3_3_op_unlink_call(tvbuff_t *tvb, int offset, static int glusterfs_gfs3_3_op_rmdir_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { guint xflags; @@ -1053,7 +1053,7 @@ glusterfs_gfs3_3_op_rmdir_call(tvbuff_t *tvb, int offset, static int glusterfs_gfs3_3_op_symlink_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_pargfid, offset); offset = dissect_rpc_string(tvb, tree, hf_glusterfs_bname, offset, NULL); @@ -1067,7 +1067,7 @@ glusterfs_gfs3_3_op_symlink_call(tvbuff_t *tvb, int offset, static int glusterfs_gfs3_3_op_rename_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_oldgfid, offset); offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_newgfid, offset); @@ -1080,13 +1080,13 @@ glusterfs_gfs3_3_op_rename_call(tvbuff_t *tvb, int offset, static int glusterfs_gfs3_3_op_rename_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { proto_tree *old_tree, *new_tree; proto_item *old_item, *new_item; int start_offset; - offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree); + offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree, data); offset = glusterfs_rpc_dissect_gf_iatt(tree, tvb, hf_glusterfs_iatt, offset); @@ -1115,7 +1115,7 @@ glusterfs_gfs3_3_op_rename_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, static int glusterfs_gfs3_3_op_link_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_oldgfid, offset); offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_newgfid, offset); @@ -1127,7 +1127,7 @@ glusterfs_gfs3_3_op_link_call(tvbuff_t *tvb, int offset, static int glusterfs_gfs3_3_op_truncate_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_gfid, offset); offset = dissect_rpc_uint64(tvb, tree, hf_glusterfs_offset, offset); @@ -1138,9 +1138,9 @@ glusterfs_gfs3_3_op_truncate_call(tvbuff_t *tvb, int offset, static int glusterfs_gfs3_3_op_open_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { - offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree); + offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree, data); offset = dissect_rpc_uint64(tvb, tree, hf_glusterfs_fd, offset); offset = gluster_rpc_dissect_dict(tree, tvb, hf_glusterfs_dict, offset); return offset; @@ -1148,7 +1148,7 @@ glusterfs_gfs3_3_op_open_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, static int glusterfs_gfs3_3_op_open_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_gfid, offset); offset = glusterfs_rpc_dissect_flags(tree, tvb, offset); @@ -1159,9 +1159,9 @@ glusterfs_gfs3_3_op_open_call(tvbuff_t *tvb, int offset, static int glusterfs_gfs3_3_op_read_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { - offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree); + offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree, data); offset = glusterfs_rpc_dissect_gf_iatt(tree, tvb, hf_glusterfs_iatt, offset); offset = dissect_rpc_uint32(tvb, tree, hf_glusterfs_size, offset); @@ -1173,7 +1173,7 @@ glusterfs_gfs3_3_op_read_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, static int glusterfs_gfs3_3_op_read_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_gfid, offset); offset = dissect_rpc_uint64(tvb, tree, hf_glusterfs_fd, offset); @@ -1187,7 +1187,7 @@ glusterfs_gfs3_3_op_read_call(tvbuff_t *tvb, int offset, static int glusterfs_gfs3_3_op_write_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_gfid, offset); offset = dissect_rpc_uint64(tvb, tree, hf_glusterfs_fd, offset); @@ -1201,9 +1201,9 @@ glusterfs_gfs3_3_op_write_call(tvbuff_t *tvb, int offset, static int glusterfs_gfs3_3_op_statfs_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { - offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree); + offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree, data); offset = glusterfs_rpc_dissect_statfs(tree, tvb, offset); offset = gluster_rpc_dissect_dict(tree, tvb, hf_glusterfs_dict, offset); @@ -1212,7 +1212,7 @@ glusterfs_gfs3_3_op_statfs_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, static int glusterfs_gfs3_3_op_statfs_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_gfid, offset); offset = gluster_rpc_dissect_dict(tree, tvb, hf_glusterfs_dict, offset); @@ -1222,7 +1222,7 @@ glusterfs_gfs3_3_op_statfs_call(tvbuff_t *tvb, int offset, static int glusterfs_gfs3_3_op_flush_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_gfid, offset); offset = dissect_rpc_uint64(tvb, tree, hf_glusterfs_fd, offset); @@ -1233,7 +1233,7 @@ glusterfs_gfs3_3_op_flush_call(tvbuff_t *tvb, int offset, static int glusterfs_gfs3_3_op_setxattr_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_gfid, offset); offset = glusterfs_rpc_dissect_flags(tree, tvb, offset); @@ -1245,7 +1245,7 @@ glusterfs_gfs3_3_op_setxattr_call(tvbuff_t *tvb, int offset, static int glusterfs_gfs3_3_op_getxattr_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_gfid, offset); offset = dissect_rpc_uint32(tvb, tree, hf_glusterfs_namelen, offset); @@ -1258,9 +1258,9 @@ glusterfs_gfs3_3_op_getxattr_call(tvbuff_t *tvb, int offset, static int glusterfs_gfs3_3_op_getxattr_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree) + packet_info *pinfo, proto_tree *tree, void* data _U_) { - offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree); + offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree, data); offset = gluster_rpc_dissect_dict(tree, tvb, hf_glusterfs_dict, offset); offset = gluster_rpc_dissect_dict(tree, tvb, hf_glusterfs_dict, offset); @@ -1269,7 +1269,7 @@ glusterfs_gfs3_3_op_getxattr_reply(tvbuff_t *tvb, int offset, static int glusterfs_gfs3_3_op_removexattr_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_gfid, offset); offset = dissect_rpc_string(tvb, tree, hf_glusterfs_name, offset, NULL); @@ -1280,7 +1280,7 @@ glusterfs_gfs3_3_op_removexattr_call(tvbuff_t *tvb, int offset, static int glusterfs_gfs3_3_op_fsync_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { static const int *flag_bits[] = { &hf_glusterfs_fsync_flag_datasync, @@ -1304,9 +1304,9 @@ glusterfs_gfs3_3_op_fsync_call(tvbuff_t *tvb, int offset, static int glusterfs_gfs3_3_op_opendir_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree) + packet_info *pinfo, proto_tree *tree, void* data _U_) { - offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree); + offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree, data); offset = dissect_rpc_uint64(tvb, tree, hf_glusterfs_fd, offset); offset = gluster_rpc_dissect_dict(tree, tvb, hf_glusterfs_dict, offset); @@ -1315,7 +1315,7 @@ glusterfs_gfs3_3_op_opendir_reply(tvbuff_t *tvb, int offset, static int glusterfs_gfs3_3_op_opendir_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_gfid, offset); offset = gluster_rpc_dissect_dict(tree, tvb, hf_glusterfs_dict, offset); @@ -1325,9 +1325,9 @@ glusterfs_gfs3_3_op_opendir_call(tvbuff_t *tvb, int offset, static int glusterfs_gfs3_3_op_create_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { - offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree); + offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree, data); offset = glusterfs_rpc_dissect_gf_iatt(tree, tvb, hf_glusterfs_iatt, offset); offset = dissect_rpc_uint64(tvb, tree, hf_glusterfs_fd, offset); @@ -1343,7 +1343,7 @@ glusterfs_gfs3_3_op_create_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, static int glusterfs_gfs3_3_op_create_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_pargfid, offset); offset = glusterfs_rpc_dissect_flags(tree, tvb, offset); @@ -1357,7 +1357,7 @@ glusterfs_gfs3_3_op_create_call(tvbuff_t *tvb, int offset, static int glusterfs_gfs3_3_op_ftruncate_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_gfid, offset); offset = dissect_rpc_uint64(tvb, tree, hf_glusterfs_fd, offset); @@ -1369,7 +1369,7 @@ glusterfs_gfs3_3_op_ftruncate_call(tvbuff_t *tvb, int offset, static int glusterfs_gfs3_3_op_fstat_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_gfid, offset); offset = dissect_rpc_uint64(tvb, tree, hf_glusterfs_fd, offset); @@ -1380,9 +1380,9 @@ glusterfs_gfs3_3_op_fstat_call(tvbuff_t *tvb, int offset, static int glusterfs_gfs3_3_op_fstat_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { - offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree); + offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree, data); offset = glusterfs_rpc_dissect_gf_iatt(tree, tvb, hf_glusterfs_iatt, offset); offset = gluster_rpc_dissect_dict(tree, tvb, hf_glusterfs_dict, @@ -1393,7 +1393,7 @@ glusterfs_gfs3_3_op_fstat_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, static int glusterfs_gfs3_3_op_lk_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_gfid, offset); offset = dissect_rpc_uint64(tvb, tree, hf_glusterfs_fd, offset); @@ -1407,9 +1407,9 @@ glusterfs_gfs3_3_op_lk_call(tvbuff_t *tvb, int offset, static int glusterfs_gfs3_3_op_lk_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { - offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree); + offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree, data); offset = glusterfs_rpc_dissect_gf_2_flock(tree, tvb, offset); offset = gluster_rpc_dissect_dict(tree, tvb, hf_glusterfs_dict, offset); @@ -1418,7 +1418,7 @@ glusterfs_gfs3_3_op_lk_reply(tvbuff_t *tvb, int offset, static int glusterfs_gfs3_3_op_access_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_gfid, offset); offset = dissect_rpc_uint32(tvb, tree, hf_glusterfs_mask, offset); @@ -1428,7 +1428,7 @@ glusterfs_gfs3_3_op_access_call(tvbuff_t *tvb, int offset, static int glusterfs_gfs3_3_op_lookup_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_gfid, offset); offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_pargfid, offset); @@ -1441,7 +1441,7 @@ glusterfs_gfs3_3_op_lookup_call(tvbuff_t *tvb, int offset, static int glusterfs_gfs3_3_op_readdir_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree) + packet_info *pinfo, proto_tree *tree, void* data _U_) { offset = _glusterfs_gfs3_common_readdir_reply(tvb, tree, offset); offset = dissect_rpc_list(tvb, pinfo, tree, offset, @@ -1453,7 +1453,7 @@ glusterfs_gfs3_3_op_readdir_reply(tvbuff_t *tvb, int offset, static int glusterfs_gfs3_3_op_readdir_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_gfid, offset); offset = dissect_rpc_uint64(tvb, tree, hf_glusterfs_fd, offset); @@ -1466,7 +1466,7 @@ glusterfs_gfs3_3_op_readdir_call(tvbuff_t *tvb, int offset, static int glusterfs_gfs3_3_op_inodelk_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_gfid, offset); offset = dissect_rpc_uint32(tvb, tree, hf_glusterfs_cmd, offset); @@ -1480,7 +1480,7 @@ glusterfs_gfs3_3_op_inodelk_call(tvbuff_t *tvb, int offset, static int glusterfs_gfs3_3_op_finodelk_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_gfid, offset); offset = dissect_rpc_uint64(tvb, tree, hf_glusterfs_fd, offset); @@ -1497,7 +1497,7 @@ glusterfs_gfs3_3_op_finodelk_call(tvbuff_t *tvb, int offset, static int glusterfs_gfs3_3_op_entrylk_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_gfid, offset); offset = dissect_rpc_uint32(tvb, tree, hf_glusterfs_cmd, offset); @@ -1512,7 +1512,7 @@ glusterfs_gfs3_3_op_entrylk_call(tvbuff_t *tvb, int offset, static int glusterfs_gfs3_3_op_fentrylk_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_gfid, offset); offset = dissect_rpc_uint64(tvb, tree, hf_glusterfs_fd, offset); @@ -1528,9 +1528,9 @@ glusterfs_gfs3_3_op_fentrylk_call(tvbuff_t *tvb, int offset, static int glusterfs_gfs3_3_op_xattrop_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree) + packet_info *pinfo, proto_tree *tree, void* data _U_) { - offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree); + offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree, data); offset = gluster_rpc_dissect_dict(tree, tvb, hf_glusterfs_dict, offset); offset = gluster_rpc_dissect_dict(tree, tvb, hf_glusterfs_dict, offset); @@ -1539,7 +1539,7 @@ glusterfs_gfs3_3_op_xattrop_reply(tvbuff_t *tvb, int offset, static int glusterfs_gfs3_3_op_xattrop_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_gfid, offset); offset = glusterfs_rpc_dissect_flags(tree, tvb, offset); @@ -1551,7 +1551,7 @@ glusterfs_gfs3_3_op_xattrop_call(tvbuff_t *tvb, int offset, static int glusterfs_gfs3_3_op_fxattrop_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_gfid, offset); offset = glusterfs_rpc_dissect_flags(tree, tvb, offset); @@ -1564,7 +1564,7 @@ glusterfs_gfs3_3_op_fxattrop_call(tvbuff_t *tvb, int offset, static int glusterfs_gfs3_3_op_fgetxattr_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_gfid, offset); offset = dissect_rpc_uint64(tvb, tree, hf_glusterfs_fd, offset); @@ -1577,7 +1577,7 @@ glusterfs_gfs3_3_op_fgetxattr_call(tvbuff_t *tvb, int offset, static int gluter_gfs3_3_op_fsetxattr_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_gfid, offset); offset = dissect_rpc_uint64(tvb, tree, hf_glusterfs_fd, offset); @@ -1590,9 +1590,9 @@ gluter_gfs3_3_op_fsetxattr_call(tvbuff_t *tvb, int offset, static int glusterfs_gfs3_3_op_setattr_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { - offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree); + offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree, data); offset = glusterfs_rpc_dissect_gf_iatt(tree, tvb, hf_glusterfs_preop_iatt, offset); offset = glusterfs_rpc_dissect_gf_iatt(tree, tvb, @@ -1604,7 +1604,7 @@ glusterfs_gfs3_3_op_setattr_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, static int glusterfs_gfs3_3_op_setattr_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_gfid, offset); @@ -1618,7 +1618,7 @@ glusterfs_gfs3_3_op_setattr_call(tvbuff_t *tvb, int offset, static int glusterfs_gfs3_3_op_readdirp_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree) + packet_info *pinfo, proto_tree *tree, void* data _U_) { offset = _glusterfs_gfs3_common_readdir_reply(tvb, tree, offset); offset = dissect_rpc_list(tvb, pinfo, tree, offset, @@ -1631,7 +1631,7 @@ glusterfs_gfs3_3_op_readdirp_reply(tvbuff_t *tvb, int offset, /* READDIRP and DISCARD both use this */ static int glusterfs_gfs3_3_op_readdirp_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_gfid, offset); offset = dissect_rpc_uint64(tvb, tree, hf_glusterfs_fd, offset); @@ -1644,7 +1644,7 @@ glusterfs_gfs3_3_op_readdirp_call(tvbuff_t *tvb, int offset, static int glusterfs_gfs3_3_op_release_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_gfid, offset); offset = dissect_rpc_uint64(tvb, tree, hf_glusterfs_fd, offset); @@ -1655,7 +1655,7 @@ glusterfs_gfs3_3_op_release_call(tvbuff_t *tvb, int offset, static int glusterfs_gfs3_3_op_releasedir_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_gfid, offset); offset = dissect_rpc_uint64(tvb, tree, hf_glusterfs_fd, offset); @@ -1666,7 +1666,7 @@ glusterfs_gfs3_3_op_releasedir_call(tvbuff_t *tvb, int offset, static int glusterfs_gfs3_3_op_fremovexattr_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_gfid, offset); offset = dissect_rpc_uint64(tvb, tree, hf_glusterfs_fd, offset); @@ -1678,7 +1678,7 @@ glusterfs_gfs3_3_op_fremovexattr_call(tvbuff_t *tvb, int offset, static int glusterfs_gfs3_3_op_fallocate_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_gfid, offset); offset = dissect_rpc_uint64(tvb, tree, hf_glusterfs_fd, offset); @@ -1694,9 +1694,9 @@ glusterfs_gfs3_3_op_fallocate_call(tvbuff_t *tvb, int offset, int glusterfs_gfs3_3_op_common_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { - offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree); + offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree, data); offset = gluster_rpc_dissect_dict(tree, tvb, hf_glusterfs_dict, offset); return offset; diff --git a/epan/dissectors/packet-glusterfs_hndsk.c b/epan/dissectors/packet-glusterfs_hndsk.c index ad83f1ab70..72957159fa 100644 --- a/epan/dissectors/packet-glusterfs_hndsk.c +++ b/epan/dissectors/packet-glusterfs_hndsk.c @@ -64,9 +64,9 @@ static gint ett_gluster_hndsk = -1; /* procedures for GLUSTER_HNDSK_PROGRAM */ static int gluster_hndsk_setvolume_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { - offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree); + offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree, data); offset = gluster_rpc_dissect_dict(tree, tvb, hf_gluster_hndsk_dict, offset); return offset; @@ -74,7 +74,7 @@ gluster_hndsk_setvolume_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, static int gluster_hndsk_setvolume_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = gluster_rpc_dissect_dict(tree, tvb, hf_gluster_hndsk_dict, offset); @@ -83,9 +83,9 @@ gluster_hndsk_setvolume_call(tvbuff_t *tvb, int offset, static int gluster_hndsk_2_setvolume_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { - offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree); + offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree, data); offset = gluster_rpc_dissect_dict(tree, tvb, hf_gluster_hndsk_dict, offset); return offset; @@ -93,7 +93,7 @@ gluster_hndsk_2_setvolume_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, static int gluster_hndsk_2_setvolume_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = gluster_rpc_dissect_dict(tree, tvb, hf_gluster_hndsk_dict, offset); @@ -102,9 +102,9 @@ gluster_hndsk_2_setvolume_call(tvbuff_t *tvb, int offset, static int gluster_hndsk_2_getspec_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { - offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree); + offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree, data); offset = dissect_rpc_string(tvb, tree, hf_gluster_hndsk_spec, offset, NULL); offset = gluster_rpc_dissect_dict(tree, tvb, hf_gluster_hndsk_dict, @@ -114,7 +114,7 @@ gluster_hndsk_2_getspec_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, static int gluster_hndsk_2_getspec_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { if (tree) proto_tree_add_item(tree, hf_gluster_hndsk_flags, tvb, offset, @@ -129,16 +129,16 @@ gluster_hndsk_2_getspec_call(tvbuff_t *tvb, int offset, static int gluster_hndsk_2_set_lk_ver_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { - offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree); + offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree, data); offset = dissect_rpc_uint32(tvb, tree,hf_gluster_hndsk_lk_ver, offset); return offset; } static int gluster_hndsk_2_set_lk_ver_call(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_gluster_hndsk_uid, offset, NULL); @@ -148,7 +148,7 @@ gluster_hndsk_2_set_lk_ver_call(tvbuff_t *tvb, int offset, static int gluster_hndsk_2_event_notify_call(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_gluster_hndsk_event_op, offset); @@ -161,9 +161,9 @@ gluster_hndsk_2_event_notify_call(tvbuff_t *tvb, int offset, static int gluster_hndsk_2_event_notify_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree) + packet_info *pinfo, proto_tree *tree, void* data _U_) { - offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree); + offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree, data); offset = gluster_rpc_dissect_dict(tree, tvb, hf_gluster_hndsk_dict, offset); return offset; diff --git a/epan/dissectors/packet-hclnfsd.c b/epan/dissectors/packet-hclnfsd.c index 80049878b0..dc4395d014 100644 --- a/epan/dissectors/packet-hclnfsd.c +++ b/epan/dissectors/packet-hclnfsd.c @@ -115,7 +115,7 @@ dissect_hclnfsd_gids(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tr } static int -dissect_hclnfsd_spool_inquire_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) +dissect_hclnfsd_spool_inquire_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { offset = dissect_rpc_uint32(tvb, tree, hf_hclnfsd_status, offset); @@ -126,7 +126,7 @@ dissect_hclnfsd_spool_inquire_call(tvbuff_t *tvb, int offset, packet_info *pinfo static int -dissect_hclnfsd_spool_file_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_hclnfsd_spool_file_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = dissect_rpc_string(tvb, tree, hf_hclnfsd_printername, offset, NULL); @@ -168,7 +168,7 @@ hclnfsd_decode_obscure(const char *ident, int ident_len) static int -dissect_hclnfsd_authorize_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_hclnfsd_authorize_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { guint32 request_type; const char *ident = NULL; @@ -237,7 +237,7 @@ dissect_hclnfsd_authorize_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_ static int -dissect_hclnfsd_authorize_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_hclnfsd_authorize_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { guint32 status; @@ -261,7 +261,7 @@ dissect_hclnfsd_authorize_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U } static int -dissect_hclnfsd_grp_name_to_numb_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_hclnfsd_grp_name_to_numb_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = dissect_rpc_string(tvb, tree, hf_hclnfsd_grpname, offset, NULL); @@ -269,7 +269,7 @@ dissect_hclnfsd_grp_name_to_numb_call(tvbuff_t *tvb, int offset, packet_info *pi } static int -dissect_hclnfsd_grp_name_to_numb_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_hclnfsd_grp_name_to_numb_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = dissect_rpc_uint32(tvb, tree, hf_hclnfsd_gid, offset); @@ -278,7 +278,7 @@ dissect_hclnfsd_grp_name_to_numb_reply(tvbuff_t *tvb, int offset, packet_info *p static int -dissect_hclnfsd_grp_to_number_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) +dissect_hclnfsd_grp_to_number_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { offset = dissect_hclnfsd_gids(tvb, offset, pinfo, tree); @@ -288,7 +288,7 @@ dissect_hclnfsd_grp_to_number_call(tvbuff_t *tvb, int offset, packet_info *pinfo static int -dissect_hclnfsd_grp_to_number_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_hclnfsd_grp_to_number_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { return dissect_rpc_string(tvb, tree, hf_hclnfsd_grpname, offset, NULL); @@ -296,7 +296,7 @@ dissect_hclnfsd_grp_to_number_reply(tvbuff_t *tvb, int offset, packet_info *pinf static int -dissect_hclnfsd_return_host_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_hclnfsd_return_host_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { proto_tree_add_item(tree, hf_hclnfsd_host_ip, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; @@ -306,7 +306,7 @@ dissect_hclnfsd_return_host_call(tvbuff_t *tvb, int offset, packet_info *pinfo _ static int -dissect_hclnfsd_return_host_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_hclnfsd_return_host_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = dissect_rpc_string(tvb, tree, hf_hclnfsd_hostname, offset, NULL); @@ -315,7 +315,7 @@ dissect_hclnfsd_return_host_reply(tvbuff_t *tvb, int offset, packet_info *pinfo static int -dissect_hclnfsd_uid_to_name_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_hclnfsd_uid_to_name_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { guint32 nuids, nuids_i; proto_tree *uidtree = NULL; @@ -343,7 +343,7 @@ dissect_hclnfsd_uid_to_name_call(tvbuff_t *tvb, int offset, packet_info *pinfo _ static int -dissect_hclnfsd_uid_to_name_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_hclnfsd_uid_to_name_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { guint32 nusers, nusers_i; proto_tree *usertree = NULL; @@ -372,7 +372,7 @@ dissect_hclnfsd_uid_to_name_reply(tvbuff_t *tvb, int offset, packet_info *pinfo static int -dissect_hclnfsd_name_to_uid_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_hclnfsd_name_to_uid_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = dissect_rpc_string(tvb, tree, hf_hclnfsd_username, offset, NULL); @@ -381,7 +381,7 @@ dissect_hclnfsd_name_to_uid_call(tvbuff_t *tvb, int offset, packet_info *pinfo _ static int -dissect_hclnfsd_name_to_uid_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_hclnfsd_name_to_uid_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = dissect_rpc_uint32(tvb, tree, hf_hclnfsd_uid, offset); @@ -390,7 +390,7 @@ dissect_hclnfsd_name_to_uid_reply(tvbuff_t *tvb, int offset, packet_info *pinfo static int -dissect_hclnfsd_share_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) +dissect_hclnfsd_share_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { guint32 request_type; @@ -419,7 +419,7 @@ dissect_hclnfsd_share_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_ static int -dissect_hclnfsd_share_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_hclnfsd_share_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { guint32 request_type; @@ -438,21 +438,21 @@ dissect_hclnfsd_share_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, p static int -dissect_hclnfsd_unshare_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) +dissect_hclnfsd_unshare_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { - return dissect_hclnfsd_share_call(tvb, offset, pinfo, tree); + return dissect_hclnfsd_share_call(tvb, offset, pinfo, tree, data); } static int -dissect_hclnfsd_unshare_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) +dissect_hclnfsd_unshare_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { - return dissect_hclnfsd_share_reply(tvb, offset, pinfo, tree); + return dissect_hclnfsd_share_reply(tvb, offset, pinfo, tree, data); } static int -dissect_hclnfsd_lock_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) +dissect_hclnfsd_lock_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { offset = dissect_rpc_uint32(tvb, tree, hf_hclnfsd_status, offset); offset = dissect_rpc_uint32(tvb, tree, hf_hclnfsd_cookie, offset); @@ -477,7 +477,7 @@ dissect_hclnfsd_lock_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t static int -dissect_hclnfsd_lock_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_hclnfsd_lock_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { guint request_type; @@ -495,7 +495,7 @@ dissect_hclnfsd_lock_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, pr static int -dissect_hclnfsd_remove_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_hclnfsd_remove_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = dissect_rpc_string(tvb, tree, hf_hclnfsd_lockname, offset, NULL); @@ -506,7 +506,7 @@ dissect_hclnfsd_remove_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, p static int -dissect_hclnfsd_unlock_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) +dissect_hclnfsd_unlock_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { offset += 4; /* skip unused */ @@ -528,14 +528,14 @@ dissect_hclnfsd_unlock_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto static int -dissect_hclnfsd_unlock_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) +dissect_hclnfsd_unlock_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { - return dissect_hclnfsd_lock_reply(tvb, offset, pinfo, tree); + return dissect_hclnfsd_lock_reply(tvb, offset, pinfo, tree, data); } static int -dissect_hclnfsd_get_printers_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_hclnfsd_get_printers_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { guint nqueues, nqueues_i; proto_item *queuesitem = NULL; @@ -572,7 +572,7 @@ dissect_hclnfsd_get_printers_reply(tvbuff_t *tvb, int offset, packet_info *pinfo static int -dissect_hclnfsd_get_printq_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_hclnfsd_get_printq_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = dissect_rpc_string(tvb, tree, hf_hclnfsd_queuename, offset, NULL); @@ -583,7 +583,7 @@ dissect_hclnfsd_get_printq_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U static int -dissect_hclnfsd_get_printq_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_hclnfsd_get_printq_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { guint datafollows, jobid; proto_item *queueitem = NULL; diff --git a/epan/dissectors/packet-klm.c b/epan/dissectors/packet-klm.c index 48652f4342..7b977f30d0 100644 --- a/epan/dissectors/packet-klm.c +++ b/epan/dissectors/packet-klm.c @@ -114,7 +114,7 @@ dissect_lock(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, int offset) } static int -dissect_klm_unlock_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) +dissect_klm_unlock_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { offset = dissect_lock(tvb, pinfo, tree, offset); @@ -122,7 +122,7 @@ dissect_klm_unlock_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tre } static int -dissect_klm_stat_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_klm_stat_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = dissect_rpc_uint32(tvb, tree, @@ -132,7 +132,7 @@ dissect_klm_stat_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_ } static int -dissect_klm_lock_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) +dissect_klm_lock_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { offset = dissect_rpc_bool( tvb, tree, hf_klm_block, offset); @@ -146,7 +146,7 @@ dissect_klm_lock_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree } static int -dissect_klm_test_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_klm_test_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { gint32 stats; @@ -163,7 +163,7 @@ dissect_klm_test_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_ } static int -dissect_klm_test_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) +dissect_klm_test_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { offset = dissect_rpc_bool( tvb, tree, hf_klm_exclusive, offset); diff --git a/epan/dissectors/packet-mount.c b/epan/dissectors/packet-mount.c index d813c7e75b..b222cd32c6 100644 --- a/epan/dissectors/packet-mount.c +++ b/epan/dissectors/packet-mount.c @@ -156,7 +156,7 @@ dissect_fhstatus(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree static int dissect_mount_dirpath_call(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { const char *mountpoint=NULL; @@ -196,7 +196,7 @@ dissect_mount_dirpath_call(tvbuff_t *tvb, int offset, packet_info *pinfo, /* RFC 1094, Page 25,26 */ static int -dissect_mount1_mnt_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) +dissect_mount1_mnt_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { offset = dissect_fhstatus(tvb,offset,pinfo,tree); @@ -208,7 +208,7 @@ dissect_mount1_mnt_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr /* RFC 1094, Page 26 */ /* RFC 1813, Page 110 */ static int -dissect_mountlist(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_mountlist(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { proto_item* lock_item = NULL; proto_tree* lock_tree = NULL; @@ -242,7 +242,7 @@ dissect_mountlist(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree /* RFC 1094, Page 26 */ /* RFC 1813, Page 110 */ static int -dissect_mount_dump_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) +dissect_mount_dump_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { offset = dissect_rpc_list(tvb, pinfo, tree, offset, dissect_mountlist); @@ -254,7 +254,7 @@ dissect_mount_dump_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr /* RFC 1094, Page 26 */ /* RFC 1813, Page 110 */ static int -dissect_group(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_group(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { int str_len; @@ -282,7 +282,7 @@ dissect_group(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tre /* RFC 1094, Page 26 */ /* RFC 1813, Page 113 */ static int -dissect_exportlist(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) +dissect_exportlist(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { proto_item* exportlist_item = NULL; proto_tree* exportlist_tree = NULL; @@ -295,10 +295,8 @@ dissect_exportlist(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr group_name_list[0]=0; group_names_len=0; if (tree) { - exportlist_item = proto_tree_add_item(tree, hf_mount_exportlist, tvb, - offset, -1, ENC_NA); - if (exportlist_item) - exportlist_tree = proto_item_add_subtree(exportlist_item, ett_mount_exportlist); + exportlist_item = proto_tree_add_item(tree, hf_mount_exportlist, tvb, offset, -1, ENC_NA); + exportlist_tree = proto_item_add_subtree(exportlist_item, ett_mount_exportlist); } offset = dissect_rpc_string(tvb, exportlist_tree, @@ -337,7 +335,7 @@ dissect_exportlist(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr /* RFC 1094, Page 26 */ /* RFC 1813, Page 113 */ static int -dissect_mount_export_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) +dissect_mount_export_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { offset = dissect_rpc_list(tvb, pinfo, tree, offset, dissect_exportlist); @@ -410,7 +408,7 @@ static const true_false_string tos_error_vdisable = { static int -dissect_mount_pathconf_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_mount_pathconf_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { guint32 pc_mask; proto_item *lock_item; @@ -539,7 +537,7 @@ dissect_mountstat3(packet_info *pinfo, tvbuff_t *tvb, proto_tree *tree, int offs /* RFC 1831, Page 109 */ static int -dissect_mount3_mnt_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) +dissect_mount3_mnt_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { guint32 status; guint32 auth_flavors; @@ -572,7 +570,7 @@ dissect_mount3_mnt_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr } static int -dissect_sgi_exportlist(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_sgi_exportlist(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { proto_item* exportlist_item = NULL; proto_tree* exportlist_tree = NULL; @@ -609,7 +607,7 @@ dissect_sgi_exportlist(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_ } static int -dissect_mount_exportlist_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) +dissect_mount_exportlist_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { offset = dissect_rpc_list(tvb, pinfo, tree, offset, dissect_sgi_exportlist); @@ -654,7 +652,7 @@ static const true_false_string tos_st_local = { }; static int -dissect_mount_statvfs_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_mount_statvfs_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { proto_item *flag_item; proto_tree *flag_tree; diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c index 24c1b68d67..08ea2de56c 100644 --- a/epan/dissectors/packet-ndmp.c +++ b/epan/dissectors/packet-ndmp.c @@ -712,7 +712,7 @@ static const value_string addr_type_vals[] = { static int dissect_ndmp_addr_type(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { proto_tree_add_item(tree, hf_ndmp_addr_type, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; @@ -725,7 +725,7 @@ dissect_ndmp_addr_msg(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint32 seq _U_) { /*address type*/ - return dissect_ndmp_addr_type(tvb, offset, pinfo, tree); + return dissect_ndmp_addr_type(tvb, offset, pinfo, tree, NULL); } static int @@ -753,7 +753,7 @@ static const value_string auth_type_vals[] = { }; static int dissect_auth_type(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { proto_tree_add_item(tree, hf_ndmp_auth_type, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; @@ -766,7 +766,7 @@ dissect_get_auth_type_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint32 seq _U_) { /* auth type */ - return dissect_auth_type(tvb, offset, pinfo, tree); + return dissect_auth_type(tvb, offset, pinfo, tree, NULL); } static int @@ -810,7 +810,7 @@ dissect_ndmp_config_get_auth_attr_reply(tvbuff_t *tvb, int offset, static int dissect_default_env(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { /* name */ offset = dissect_rpc_string(tvb, tree, @@ -899,7 +899,7 @@ dissect_butype_attrs(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, } static int -dissect_butype_info(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) +dissect_butype_info(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { /*butype name*/ offset = dissect_rpc_string(tvb, tree, @@ -981,7 +981,7 @@ dissect_fs_invalid(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, static int dissect_fs_env(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { /* name */ offset = dissect_rpc_string(tvb, tree, @@ -995,7 +995,7 @@ dissect_fs_env(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, } static int -dissect_fs_info(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) +dissect_fs_info(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { /* invalid bits */ offset=dissect_fs_invalid(tvb, offset, pinfo, tree); @@ -1091,7 +1091,7 @@ dissect_tape_attr(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, static int dissect_tape_capability(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { /* name */ offset = dissect_rpc_string(tvb, tree, @@ -1105,7 +1105,7 @@ dissect_tape_capability(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, } static int -dissect_tape_dev_cap(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) +dissect_tape_dev_cap(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { /* device */ offset = dissect_rpc_string(tvb, tree, @@ -1122,7 +1122,7 @@ dissect_tape_dev_cap(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree * } static int -dissect_tape_info(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) +dissect_tape_info(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { /* model */ offset = dissect_rpc_string(tvb, tree, @@ -1150,7 +1150,7 @@ dissect_get_tape_info_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, } static int -dissect_scsi_info(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) +dissect_scsi_info(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { /* model */ offset = dissect_rpc_string(tvb, tree, @@ -1206,7 +1206,7 @@ dissect_get_server_info_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, static int dissect_ext_version(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) { + proto_tree *tree, void* data _U_) { /* extension version */ proto_tree_add_item(tree, hf_ndmp_ext_version, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -1218,7 +1218,7 @@ dissect_ext_version(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, static int dissect_class_list(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) { + proto_tree *tree, void* data _U_) { /* class id */ proto_tree_add_item(tree, hf_ndmp_ex_class_id, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -1248,7 +1248,7 @@ dissect_get_ext_list_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, static int dissect_class_version(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) { + proto_tree *tree, void* data _U_) { /* class id */ proto_tree_add_item(tree, hf_ndmp_ex_class_id, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -1873,7 +1873,7 @@ static const value_string halt_vals[] = { }; static int -dissect_tcp_env(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_tcp_env(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { /* name */ offset = dissect_rpc_string(tvb, tree, @@ -1888,7 +1888,7 @@ dissect_tcp_env(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *t static int -dissect_ndmp_v4_tcp_addr(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) +dissect_ndmp_v4_tcp_addr(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { /* IP addr */ proto_tree_add_item(tree, hf_ndmp_addr_ip, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -2362,7 +2362,7 @@ static const value_string file_fs_type_vals[] = { }; static int -dissect_file_name(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree) +dissect_file_name(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, void* data _U_) { proto_item* item = NULL; proto_tree* tree = NULL; @@ -2474,7 +2474,7 @@ static const value_string file_type_vals[] = { }; static int -dissect_file_stats(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree) +dissect_file_stats(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, void* data _U_) { proto_item* item = NULL; proto_tree* tree = NULL; @@ -2544,7 +2544,7 @@ dissect_file_stats(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *pa static int -dissect_file(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree) +dissect_file(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, void* data _U_) { proto_item* item = NULL; proto_tree* tree = NULL; @@ -2588,7 +2588,7 @@ dissect_fh_add_file_request(tvbuff_t *tvb, int offset, packet_info *pinfo, } static int -dissect_dir(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) +dissect_dir(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { /* file names */ offset = dissect_rpc_array(tvb, pinfo, tree, offset, @@ -2617,7 +2617,7 @@ dissect_fh_add_dir_request(tvbuff_t *tvb, int offset, packet_info *pinfo, } static int -dissect_node(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) +dissect_node(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { /* file stats */ offset = dissect_rpc_array(tvb, pinfo, tree, offset, @@ -2663,7 +2663,7 @@ dissect_data_start_backup_request(tvbuff_t *tvb, int offset, packet_info *pinfo, static int dissect_nlist(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { /*original path*/ offset = dissect_rpc_string(tvb, tree, diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c index 03d8562a77..64454befc6 100644 --- a/epan/dissectors/packet-nfs.c +++ b/epan/dissectors/packet-nfs.c @@ -2488,7 +2488,7 @@ dissect_nfs2_status(tvbuff_t *tvb, int offset, proto_tree *tree, guint32 *status /* NFSv2 RFC 1094, Page 12..14 */ static int -dissect_nfs2_rmdir_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree* tree) +dissect_nfs2_rmdir_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree* tree, void* data _U_) { guint32 status; const char *err; @@ -2509,7 +2509,7 @@ dissect_nfs2_rmdir_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, prot static int -dissect_nfs2_symlink_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree* tree) +dissect_nfs2_symlink_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree* tree, void* data _U_) { guint32 status; const char *err; @@ -2530,7 +2530,7 @@ dissect_nfs2_symlink_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, pr static int -dissect_nfs2_link_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree* tree) +dissect_nfs2_link_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree* tree, void* data _U_) { guint32 status; const char *err; @@ -2551,7 +2551,7 @@ dissect_nfs2_link_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto static int -dissect_nfs2_rename_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree* tree) +dissect_nfs2_rename_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree* tree, void* data _U_) { guint32 status; const char *err; @@ -2572,7 +2572,7 @@ dissect_nfs2_rename_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, pro static int -dissect_nfs2_remove_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree* tree) +dissect_nfs2_remove_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree* tree, void* data _U_) { guint32 status; const char *err; @@ -2674,7 +2674,7 @@ dissect_fhandle(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, /* NFSv2 RFC 1094, Page 15 */ static int -dissect_nfs2_statfs_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) +dissect_nfs2_statfs_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { guint32 hash; @@ -2688,7 +2688,7 @@ dissect_nfs2_statfs_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr static int -dissect_nfs2_readlink_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) +dissect_nfs2_readlink_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { guint32 hash; @@ -2702,7 +2702,7 @@ dissect_nfs2_readlink_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_ static int -dissect_nfs2_getattr_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) +dissect_nfs2_getattr_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { guint32 hash; @@ -2947,7 +2947,7 @@ dissect_attrstat(tvbuff_t *tvb, int offset, proto_tree *tree, packet_info *pinfo /* NFSv2 RFC 1094, Page 17,18 */ static int -dissect_nfs2_write_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree* tree) +dissect_nfs2_write_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree* tree, void* data _U_) { offset = dissect_attrstat(tvb, offset, tree, pinfo, "WRITE"); @@ -2957,7 +2957,7 @@ dissect_nfs2_write_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, prot /* NFSv2 RFC 1094, Page 18 */ static int -dissect_nfs2_setattr_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree* tree) +dissect_nfs2_setattr_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree* tree, void* data _U_) { offset = dissect_attrstat(tvb, offset, tree, pinfo, "SETATTR"); @@ -2967,7 +2967,7 @@ dissect_nfs2_setattr_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, pr /* NFSv2 RFC 1094, Page 18 */ static int -dissect_nfs2_getattr_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree* tree) +dissect_nfs2_getattr_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree* tree, void* data _U_) { offset = dissect_attrstat(tvb, offset, tree, pinfo, "GETATTR"); @@ -3020,7 +3020,7 @@ dissect_diropargs(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre /* NFSv2 RFC 1094, Page 18 */ static int -dissect_nfs2_rmdir_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) +dissect_nfs2_rmdir_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { guint32 hash; const char *name=NULL; @@ -3036,7 +3036,7 @@ dissect_nfs2_rmdir_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tre /* NFSv2 RFC 1094, Page 18 */ static int -dissect_nfs2_remove_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) +dissect_nfs2_remove_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { guint32 hash; const char *name=NULL; @@ -3052,7 +3052,7 @@ dissect_nfs2_remove_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr /* NFSv2 RFC 1094, Page 18 */ static int -dissect_nfs2_lookup_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) +dissect_nfs2_lookup_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { guint32 hash; const char *name=NULL; @@ -3106,7 +3106,7 @@ dissect_nfsdata(tvbuff_t *tvb, int offset, proto_tree *tree, int hf) /* NFSv2 RFC 1094, Page 18 */ static int dissect_nfs2_mkdir_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree* tree) + proto_tree* tree, void* data _U_) { offset = dissect_diropres(tvb, offset, pinfo, tree, "MKDIR"); return offset; @@ -3115,7 +3115,7 @@ dissect_nfs2_mkdir_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, static int dissect_nfs2_create_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree* tree) + proto_tree* tree, void* data _U_) { offset = dissect_diropres(tvb, offset, pinfo, tree, "CREATE"); return offset; @@ -3124,7 +3124,7 @@ dissect_nfs2_create_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, static int dissect_nfs2_lookup_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree* tree) + proto_tree* tree, void* data _U_) { offset = dissect_diropres(tvb, offset, pinfo, tree, "LOOKUP"); return offset; @@ -3134,7 +3134,7 @@ dissect_nfs2_lookup_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, /* RFC 1094, Page 6 */ static int dissect_nfs2_setattr_call(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 hash; @@ -3150,7 +3150,7 @@ dissect_nfs2_setattr_call(tvbuff_t *tvb, int offset, packet_info *pinfo, /* NFSv2 RFC 1094, Page 6 */ static int dissect_nfs2_readlink_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 status; const char *err; @@ -3177,7 +3177,7 @@ dissect_nfs2_readlink_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, /* NFSv2 RFC 1094, Page 7 */ static int dissect_nfs2_read_call(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 offset_value; guint32 count; @@ -3210,7 +3210,7 @@ dissect_nfs2_read_call(tvbuff_t *tvb, int offset, packet_info *pinfo, /* NFSv2 RFC 1094, Page 7 */ static int dissect_nfs2_read_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree* tree) + proto_tree* tree, void* data _U_) { guint32 status; const char *err; @@ -3236,7 +3236,7 @@ dissect_nfs2_read_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, /* NFSv2 RFC 1094, Page 8 */ static int dissect_nfs2_write_call(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 beginoffset; guint32 offset_value; @@ -3271,7 +3271,7 @@ dissect_nfs2_write_call(tvbuff_t *tvb, int offset, packet_info *pinfo, /* NFSv2 RFC 1094, Page 8 */ static int dissect_nfs2_mkdir_call(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 hash; const char *name=NULL; @@ -3287,7 +3287,7 @@ dissect_nfs2_mkdir_call(tvbuff_t *tvb, int offset, packet_info *pinfo, static int dissect_nfs2_create_call(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 hash; const char *name=NULL; @@ -3305,7 +3305,7 @@ dissect_nfs2_create_call(tvbuff_t *tvb, int offset, packet_info *pinfo, /* NFSv2 RFC 1094, Page 9 */ static int dissect_nfs2_rename_call(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 from_hash; const char *from_name=NULL; @@ -3327,7 +3327,7 @@ dissect_nfs2_rename_call(tvbuff_t *tvb, int offset, packet_info *pinfo, /* NFSv2 RFC 1094, Page 9 */ static int dissect_nfs2_link_call(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 from_hash; guint32 to_hash; @@ -3348,7 +3348,7 @@ dissect_nfs2_link_call(tvbuff_t *tvb, int offset, packet_info *pinfo, /* NFSv2 RFC 1094, Page 10 */ static int dissect_nfs2_symlink_call(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 from_hash; const char *from_name=NULL; @@ -3370,7 +3370,7 @@ dissect_nfs2_symlink_call(tvbuff_t *tvb, int offset, packet_info *pinfo, /* NFSv2 RFC 1094, Page 11 */ static int dissect_nfs2_readdir_call(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 cookie; guint32 count; @@ -3397,7 +3397,7 @@ dissect_nfs2_readdir_call(tvbuff_t *tvb, int offset, packet_info *pinfo, /* NFSv2 RFC 1094, Page 11 */ static int dissect_readdir_entry(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree* tree) + proto_tree* tree, void* data _U_) { proto_item* entry_item = NULL; proto_tree* entry_tree = NULL; @@ -3442,7 +3442,7 @@ dissect_readdir_entry(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, /* NFSv2 RFC 1094, Page 11 */ static int dissect_nfs2_readdir_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree* tree) + proto_tree* tree, void* data _U_) { guint32 status; guint32 eof_value; @@ -3475,7 +3475,7 @@ dissect_nfs2_readdir_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, /* NFSv2 RFC 1094, Page 12 */ static int dissect_nfs2_statfs_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree* tree) + proto_tree* tree, void* data _U_) { guint32 status; guint32 tsize; @@ -4551,7 +4551,7 @@ dissect_diropargs3(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr static int dissect_nfs3_remove_call(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 hash = 0; const char *name=NULL; @@ -4567,7 +4567,7 @@ dissect_nfs3_remove_call(tvbuff_t *tvb, int offset, packet_info *pinfo, static int dissect_nfs3_null_call(tvbuff_t *tvb _U_, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { proto_item_append_text(tree, ", NULL Call"); @@ -4577,7 +4577,7 @@ dissect_nfs3_null_call(tvbuff_t *tvb _U_, int offset, packet_info *pinfo _U_, static int dissect_nfs3_null_reply(tvbuff_t *tvb _U_, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { proto_item_append_text(tree, ", NULL Reply"); @@ -4587,7 +4587,7 @@ dissect_nfs3_null_reply(tvbuff_t *tvb _U_, int offset, packet_info *pinfo _U_, static int dissect_nfs3_rmdir_call(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 hash = 0; const char *name=NULL; @@ -4604,7 +4604,7 @@ dissect_nfs3_rmdir_call(tvbuff_t *tvb, int offset, packet_info *pinfo, /* NFSv3 RFC 1813, Page 32,33 */ static int dissect_nfs3_getattr_call(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree* tree) + proto_tree* tree, void* data _U_) { guint32 hash = 0; @@ -4620,7 +4620,7 @@ dissect_nfs3_getattr_call(tvbuff_t *tvb, int offset, packet_info *pinfo, /* NFSv3 RFC 1813, Page 32,33 */ static int dissect_nfs3_getattr_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree* tree) + proto_tree* tree, void* data _U_) { guint32 status; const char *err; @@ -4692,7 +4692,7 @@ dissect_sattrguard3(tvbuff_t *tvb, int offset, proto_tree* tree, const char *nam /* NFSv3 RFC 1813, Page 33..36 */ static int dissect_nfs3_setattr_call(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree* tree) + proto_tree* tree, void* data _U_) { guint32 hash = 0; @@ -4710,7 +4710,7 @@ dissect_nfs3_setattr_call(tvbuff_t *tvb, int offset, packet_info *pinfo, /* NFSv3 RFC 1813, Page 33..36 */ static int dissect_nfs3_setattr_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree* tree) + proto_tree* tree, void* data _U_) { guint32 status; const char *err; @@ -4737,7 +4737,7 @@ dissect_nfs3_setattr_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, /* NFSv3 RFC 1813, Page 37..39 */ static int dissect_nfs3_lookup_call(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree* tree) + proto_tree* tree, void* data _U_) { guint32 hash = 0; const char *name=NULL; @@ -4754,7 +4754,7 @@ dissect_nfs3_lookup_call(tvbuff_t *tvb, int offset, packet_info *pinfo, /* NFSv3 RFC 1813, Page 37..39 */ static int dissect_nfs3_lookup_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree* tree) + proto_tree* tree, void* data _U_) { guint32 status; const char *err; @@ -4978,7 +4978,7 @@ dissect_access_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree* /* NFSv3 RFC 1813, Page 40..43 */ static int -dissect_nfs3_access_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree* tree) +dissect_nfs3_access_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree* tree, void* data _U_) { guint32 fhhash = 0, *acc_request, amask; rpc_call_info_value *civ; @@ -5005,7 +5005,7 @@ dissect_nfs3_access_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr /* NFSv3 RFC 1813, Page 40..43 */ static int dissect_nfs3_access_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree* tree) + proto_tree* tree, void* data _U_) { guint32 status; const char *err; @@ -5029,7 +5029,7 @@ dissect_nfs3_access_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, /* NFSv3 RFC 1813, Page 44,45 */ static int dissect_nfs3_readlink_call(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree* tree) + proto_tree* tree, void* data _U_) { guint32 hash = 0; @@ -5044,7 +5044,7 @@ dissect_nfs3_readlink_call(tvbuff_t *tvb, int offset, packet_info *pinfo, static int dissect_nfs3_readlink_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree* tree) + proto_tree* tree, void* data _U_) { guint32 status; const char *err; @@ -5078,7 +5078,7 @@ dissect_nfs3_readlink_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, /* NFSv3 RFC 1813, Page 46..48 */ static int dissect_nfs3_read_call(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree* tree) + proto_tree* tree, void* data _U_) { guint64 off; guint32 len; @@ -5105,7 +5105,7 @@ dissect_nfs3_read_call(tvbuff_t *tvb, int offset, packet_info *pinfo, /* NFSv3 RFC 1813, Page 46..48 */ static int dissect_nfs3_read_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree* tree) + proto_tree* tree, void* data _U_) { guint32 status; guint32 len; @@ -5165,7 +5165,7 @@ dissect_stable_how(tvbuff_t *tvb, int offset, proto_tree* tree, int hfindex) /* NFSv3 RFC 1813, Page 49..54 */ static int dissect_nfs3_write_call(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree* tree) + proto_tree* tree, void* data _U_) { guint64 off; guint32 len; @@ -5197,7 +5197,7 @@ dissect_nfs3_write_call(tvbuff_t *tvb, int offset, packet_info *pinfo, /* NFSv3 RFC 1813, Page 49..54 */ static int dissect_nfs3_write_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree* tree) + proto_tree* tree, void* data _U_) { guint32 status; guint32 len; @@ -5261,7 +5261,7 @@ dissect_createmode3(tvbuff_t *tvb, int offset, proto_tree* tree, guint32* mode) /* NFSv3 RFC 1813, Page 54..58 */ static int dissect_nfs3_create_call(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree* tree) + proto_tree* tree, void* data _U_) { guint32 mode; guint32 hash = 0; @@ -5291,7 +5291,7 @@ dissect_nfs3_create_call(tvbuff_t *tvb, int offset, packet_info *pinfo, /* NFSv3 RFC 1813, Page 54..58 */ static int dissect_nfs3_create_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree* tree) + proto_tree* tree, void* data _U_) { guint32 status; const char *err; @@ -5321,7 +5321,7 @@ dissect_nfs3_create_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, /* NFSv3 RFC 1813, Page 58..60 */ static int dissect_nfs3_mkdir_call(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree* tree) + proto_tree* tree, void* data _U_) { guint32 hash = 0; const char *name=NULL; @@ -5338,7 +5338,7 @@ dissect_nfs3_mkdir_call(tvbuff_t *tvb, int offset, packet_info *pinfo, static int dissect_nfs3_mkdir_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree* tree) + proto_tree* tree, void* data _U_) { guint32 status; const char *err; @@ -5368,7 +5368,7 @@ dissect_nfs3_mkdir_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, /* NFSv3 RFC 1813, Page 61..63 */ static int dissect_nfs3_symlink_call(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree* tree) + proto_tree* tree, void* data _U_) { guint32 from_hash = 0; const char *from_name=NULL; @@ -5389,7 +5389,7 @@ dissect_nfs3_symlink_call(tvbuff_t *tvb, int offset, packet_info *pinfo, static int dissect_nfs3_symlink_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree* tree) + proto_tree* tree, void* data _U_) { guint32 status; const char *err; @@ -5419,7 +5419,7 @@ dissect_nfs3_symlink_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, /* NFSv3 RFC 1813, Page 63..66 */ static int dissect_nfs3_mknod_call(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree* tree) + proto_tree* tree, void* data _U_) { guint32 type; guint32 hash = 0; @@ -5453,7 +5453,7 @@ dissect_nfs3_mknod_call(tvbuff_t *tvb, int offset, packet_info *pinfo, static int dissect_nfs3_mknod_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree* tree) + proto_tree* tree, void* data _U_) { guint32 status; const char *err; @@ -5483,7 +5483,7 @@ dissect_nfs3_mknod_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, /* NFSv3 RFC 1813, Page 67..69 */ static int dissect_nfs3_remove_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree* tree) + proto_tree* tree, void* data _U_) { guint32 status; const char *err; @@ -5508,7 +5508,7 @@ dissect_nfs3_remove_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, static int dissect_nfs3_rmdir_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree* tree) + proto_tree* tree, void* data _U_) { guint32 status; const char *err; @@ -5534,7 +5534,7 @@ dissect_nfs3_rmdir_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, /* NFSv3 RFC 1813, Page 71..74 */ static int dissect_nfs3_rename_call(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree* tree) + proto_tree* tree, void* data _U_) { guint32 from_hash = 0; const char *from_name=NULL; @@ -5556,7 +5556,7 @@ dissect_nfs3_rename_call(tvbuff_t *tvb, int offset, packet_info *pinfo, /* NFSv3 RFC 1813, Page 71..74 */ static int dissect_nfs3_rename_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree* tree) + proto_tree* tree, void* data _U_) { guint32 status; const char *err; @@ -5585,7 +5585,7 @@ dissect_nfs3_rename_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, /* NFSv3 RFC 1813, Page 74..76 */ static int dissect_nfs3_link_call(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree* tree) + proto_tree* tree, void* data _U_) { guint32 from_hash = 0; guint32 to_hash = 0; @@ -5606,7 +5606,7 @@ dissect_nfs3_link_call(tvbuff_t *tvb, int offset, packet_info *pinfo, /* NFSv3 RFC 1813, Page 74..76 */ static int dissect_nfs3_link_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree* tree) + proto_tree* tree, void* data _U_) { guint32 status; const char *err; @@ -5637,7 +5637,7 @@ dissect_nfs3_link_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, /* NFSv3 RFC 1813, Page 76..80 */ static int dissect_nfs3_readdir_call(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree* tree) + proto_tree* tree, void* data _U_) { guint32 hash = 0; @@ -5656,7 +5656,7 @@ dissect_nfs3_readdir_call(tvbuff_t *tvb, int offset, packet_info *pinfo, /* NFSv3 RFC 1813, Page 76..80 */ static int dissect_entry3(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree* tree) + proto_tree* tree, void* data _U_) { proto_item* entry_item = NULL; proto_tree* entry_tree = NULL; @@ -5690,7 +5690,7 @@ dissect_entry3(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, /* NFSv3 RFC 1813, Page 76..80 */ static int dissect_nfs3_readdir_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree* tree) + proto_tree* tree, void* data _U_) { guint32 status; guint32 eof_value; @@ -5729,7 +5729,7 @@ dissect_nfs3_readdir_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, /* NFSv3 RFC 1813, Page 80..83 */ static int dissect_nfs3_readdirplus_call(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree* tree) + proto_tree* tree, void* data _U_) { guint32 hash = 0; @@ -5751,7 +5751,7 @@ dissect_nfs3_readdirplus_call(tvbuff_t *tvb, int offset, packet_info *pinfo, /* NFSv3 RFC 1813, Page 80..83 */ static int dissect_nfs3_entryplus(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree* tree) + proto_tree* tree, void* data _U_) { proto_item* entry_item = NULL; proto_tree* entry_tree = NULL; @@ -5806,7 +5806,7 @@ dissect_nfs3_entryplus(tvbuff_t *tvb, int offset, packet_info *pinfo, /* NFSv3 RFC 1813, Page 80..83 */ static int dissect_nfs3_readdirplus_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree* tree) + proto_tree* tree, void* data _U_) { guint32 status; guint32 eof_value; @@ -5845,7 +5845,7 @@ dissect_nfs3_readdirplus_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, /* NFSv3 RFC 1813, Page 84..86 */ static int dissect_nfs3_fsstat_call(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree* tree) + proto_tree* tree, void* data _U_) { guint32 hash = 0; @@ -5859,7 +5859,7 @@ dissect_nfs3_fsstat_call(tvbuff_t *tvb, int offset, packet_info *pinfo, static int dissect_nfs3_fsstat_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree* tree) + proto_tree* tree, void* data _U_) { guint32 status; guint32 invarsec; @@ -5916,7 +5916,7 @@ static const true_false_string tfs_nfs_pathconf = /* NFSv3 RFC 1813, Page 86..90 */ static int dissect_nfs3_fsinfo_call(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree* tree) + proto_tree* tree, void* data _U_) { guint32 hash = 0; @@ -5930,7 +5930,7 @@ dissect_nfs3_fsinfo_call(tvbuff_t *tvb, int offset, packet_info *pinfo, static int dissect_nfs3_fsinfo_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree* tree) + proto_tree* tree, void* data _U_) { guint32 status; proto_item* properties_item = NULL; @@ -5997,7 +5997,7 @@ dissect_nfs3_fsinfo_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, /* NFSv3 RFC 1813, Page 90..92 */ static int dissect_nfs3_pathconf_call(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree* tree) + proto_tree* tree, void* data _U_) { guint32 hash = 0; @@ -6011,7 +6011,7 @@ dissect_nfs3_pathconf_call(tvbuff_t *tvb, int offset, packet_info *pinfo, static int dissect_nfs3_pathconf_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree* tree) + proto_tree* tree, void* data _U_) { guint32 status; guint32 linkmax; @@ -6061,7 +6061,7 @@ dissect_nfs3_pathconf_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, /* NFSv3 RFC 1813, Page 92..95 */ static int dissect_nfs3_commit_call(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree* tree) + proto_tree* tree, void* data _U_) { guint32 hash = 0; @@ -6079,7 +6079,7 @@ dissect_nfs3_commit_call(tvbuff_t *tvb, int offset, packet_info *pinfo, /* NFSv3 RFC 1813, Page 92..95 */ static int dissect_nfs3_commit_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree* tree) + proto_tree* tree, void* data _U_) { guint32 status; const char *err; @@ -6653,7 +6653,7 @@ dissect_nfs4_fh(tvbuff_t *tvb, int offset, packet_info *pinfo, static int -dissect_nfs4_server(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_nfs4_server(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { return dissect_nfs_utf8string(tvb, offset, tree, hf_nfs4_server, NULL); } @@ -6661,7 +6661,7 @@ dissect_nfs4_server(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre static int dissect_nfs4_fs_location(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { proto_tree *newftree = NULL; proto_item *fitem = NULL; @@ -8473,14 +8473,14 @@ dissect_nfs4_devices(tvbuff_t *tvb, int offset, proto_tree *tree) static int -dissect_nfs4_test_stateid_arg(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_nfs4_test_stateid_arg(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { return dissect_nfs4_stateid(tvb, offset, tree, NULL); } static int -dissect_nfs4_test_stateid_res(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_nfs4_test_stateid_res(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { return dissect_nfs4_status(tvb, offset, tree, NULL); } @@ -9410,7 +9410,7 @@ dissect_nfs4_request_op(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tre static int -dissect_nfs4_compound_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree* tree) +dissect_nfs4_compound_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree* tree, void* data _U_) { const char *tag=NULL; @@ -9430,7 +9430,7 @@ dissect_nfs4_compound_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_ static int dissect_nfs4_secinfo_res(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint flavor; proto_item *fitem = NULL; @@ -9850,7 +9850,7 @@ dissect_nfs4_response_op(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr static int dissect_nfs4_compound_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree* tree) + proto_tree* tree, void* data _U_) { guint32 status; const char *tag=NULL; @@ -10341,7 +10341,7 @@ dissect_nfs4_cb_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tre static int -dissect_nfs4_cb_compound_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree* tree) +dissect_nfs4_cb_compound_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree* tree, void* data _U_) { const char *tag=NULL; @@ -10441,7 +10441,7 @@ dissect_nfs4_cb_resp_op(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tre static int dissect_nfs4_cb_compound_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree* tree) + proto_tree* tree, void* data _U_) { guint32 status; const char *tag=NULL; diff --git a/epan/dissectors/packet-nfsacl.c b/epan/dissectors/packet-nfsacl.c index 8707027c75..15b4511095 100644 --- a/epan/dissectors/packet-nfsacl.c +++ b/epan/dissectors/packet-nfsacl.c @@ -224,7 +224,7 @@ static const value_string nfsacl1_proc_vals[] = { static int dissect_nfsacl2_getacl_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = dissect_fhandle(tvb, offset, pinfo, tree, "fhandle", NULL); offset = dissect_nfsacl_mask(tvb, offset, tree); @@ -233,7 +233,7 @@ dissect_nfsacl2_getacl_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, static int dissect_nfsacl2_getacl_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 status; @@ -254,7 +254,7 @@ dissect_nfsacl2_getacl_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, static int dissect_nfsacl2_setacl_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = dissect_fhandle(tvb, offset, pinfo, tree, "fhandle", NULL); offset = dissect_nfsacl_secattr(tvb, offset, pinfo, tree); @@ -264,7 +264,7 @@ dissect_nfsacl2_setacl_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, static int dissect_nfsacl2_setacl_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 status; @@ -282,7 +282,7 @@ dissect_nfsacl2_setacl_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, static int dissect_nfsacl2_getattr_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = dissect_fhandle(tvb, offset, pinfo, tree, "fhandle", NULL); @@ -291,7 +291,7 @@ dissect_nfsacl2_getattr_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, static int dissect_nfsacl2_getattr_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = dissect_nfs2_fattr(tvb, offset, tree, "attr"); @@ -300,7 +300,7 @@ dissect_nfsacl2_getattr_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, static int dissect_nfsacl2_access_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 *acc_request, amask; rpc_call_info_value *civ; @@ -321,7 +321,7 @@ dissect_nfsacl2_access_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, static int dissect_nfsacl2_access_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 status; @@ -342,7 +342,7 @@ dissect_nfsacl2_access_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, static int dissect_nfsacl2_getxattrdir_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = dissect_fhandle(tvb, offset, pinfo, tree, "fhandle", NULL); offset = dissect_rpc_bool(tvb, tree, hf_nfsacl_create, offset); @@ -352,7 +352,7 @@ dissect_nfsacl2_getxattrdir_call(tvbuff_t *tvb, int offset, static int dissect_nfsacl2_getxattrdir_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { guint32 status; @@ -398,7 +398,7 @@ static const value_string nfsacl2_proc_vals[] = { static int dissect_nfsacl3_getacl_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = dissect_nfs3_fh(tvb, offset, pinfo, tree, "fhandle", NULL); offset = dissect_nfsacl_mask(tvb, offset, tree); @@ -408,7 +408,7 @@ dissect_nfsacl3_getacl_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, static int dissect_nfsacl3_getacl_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 status; proto_item *entry_item = NULL; @@ -444,7 +444,7 @@ dissect_nfsacl3_getacl_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, static int dissect_nfsacl3_setacl_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { proto_item *acl_item = NULL; @@ -469,7 +469,7 @@ dissect_nfsacl3_setacl_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, static int dissect_nfsacl3_setacl_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 status = tvb_get_ntohl(tvb, offset + 0); @@ -486,7 +486,7 @@ dissect_nfsacl3_setacl_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, static int dissect_nfsacl3_getxattrdir_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = dissect_nfs3_fh(tvb, offset, pinfo, tree, "fhandle", NULL); @@ -497,7 +497,7 @@ dissect_nfsacl3_getxattrdir_call(tvbuff_t *tvb, int offset, static int dissect_nfsacl3_getxattrdir_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { guint32 status; diff --git a/epan/dissectors/packet-nisplus.c b/epan/dissectors/packet-nisplus.c index 0fdf3b14bf..a02e6d8dbe 100644 --- a/epan/dissectors/packet-nisplus.c +++ b/epan/dissectors/packet-nisplus.c @@ -274,7 +274,7 @@ dissect_nisplus_time(tvbuff_t *tvb, int offset, proto_tree *tree, int hfindex) } static int -dissect_group(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_group(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = dissect_rpc_string(tvb, tree, hf_nisplus_group_name, offset, NULL); @@ -340,7 +340,7 @@ dissect_access_rights(tvbuff_t *tvb, int offset, proto_tree *tree) } static int -dissect_table(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_table(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { proto_item* lock_item = NULL; proto_tree* lock_tree = NULL; @@ -387,7 +387,6 @@ dissect_table(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tre static int dissect_table_obj(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) - { proto_item* lock_item = NULL; proto_tree* lock_tree = NULL; @@ -418,7 +417,7 @@ dissect_table_obj(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre } static int -dissect_entry(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_entry(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { proto_item* lock_item = NULL; proto_tree* lock_tree = NULL; @@ -475,7 +474,7 @@ dissect_entry_obj(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre } static int -dissect_attr(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_attr(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { proto_item* lock_item = NULL; proto_tree* lock_tree = NULL; @@ -523,7 +522,7 @@ dissect_link_obj(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree static int -dissect_endpoint(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_endpoint(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { proto_item* lock_item = NULL; proto_tree* lock_tree = NULL; @@ -549,7 +548,7 @@ dissect_endpoint(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree * static int -dissect_directory_server(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) +dissect_directory_server(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { proto_item* lock_item = NULL; proto_tree* lock_tree = NULL; @@ -578,7 +577,7 @@ dissect_directory_server(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr static int -dissect_directory_mask(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_directory_mask(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { proto_item* lock_item = NULL; proto_tree* lock_tree = NULL; @@ -652,7 +651,7 @@ dissect_nisplus_oid(tvbuff_t *tvb, int offset, proto_tree *tree) } static int -dissect_nisplus_object(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) +dissect_nisplus_object(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { proto_item* lock_item = NULL; proto_tree* lock_tree = NULL; @@ -725,7 +724,7 @@ dissect_nisplus_object(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree static int -dissect_ns_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) +dissect_ns_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { offset = dissect_rpc_string(tvb, tree, hf_nisplus_object_name, offset, NULL); @@ -737,7 +736,7 @@ dissect_ns_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr } static int -dissect_ib_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) +dissect_ib_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { offset = dissect_rpc_string(tvb, tree, hf_nisplus_object_name, offset, NULL); @@ -764,7 +763,7 @@ dissect_ib_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr } static int -dissect_fd_args(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_fd_args(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = dissect_rpc_string(tvb, tree, hf_nisplus_fd_dirname, offset, NULL); @@ -776,7 +775,7 @@ dissect_fd_args(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *t } static int -dissect_nisplus_tag(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_nisplus_tag(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { proto_item* lock_item = NULL; proto_tree* lock_tree = NULL; @@ -798,7 +797,7 @@ dissect_nisplus_tag(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre } static int -dissect_nisplus_taglist(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) +dissect_nisplus_taglist(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { offset = dissect_rpc_array(tvb, pinfo, tree, offset, dissect_nisplus_tag, hf_nisplus_taglist); @@ -807,7 +806,7 @@ dissect_nisplus_taglist(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tre } static int -dissect_dump_args(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) +dissect_dump_args(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { offset = dissect_rpc_string(tvb, tree, hf_nisplus_dump_dir, offset, NULL); @@ -822,7 +821,7 @@ dissect_dump_args(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre } static int -dissect_netobj(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_netobj(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = dissect_rpc_data(tvb, tree, hf_nisplus_dummy, offset); @@ -831,7 +830,7 @@ dissect_netobj(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tr } static int -dissect_nisname(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_nisname(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = dissect_rpc_string(tvb, tree, hf_nisplus_object_name, offset, NULL); @@ -840,7 +839,7 @@ dissect_nisname(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *t } static int -dissect_ping_args(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_ping_args(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = dissect_rpc_string(tvb, tree, hf_nisplus_ping_dir, offset, NULL); @@ -953,7 +952,7 @@ static const value_string nis_error[] = { }; static int -dissect_nisplus_result(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) +dissect_nisplus_result(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { offset = dissect_rpc_uint32(tvb, tree, hf_nisplus_error, offset); @@ -980,7 +979,7 @@ dissect_nisplus_result(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree } static int -dissect_fd_result(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_fd_result(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = dissect_rpc_uint32(tvb, tree, hf_nisplus_error, offset); @@ -1019,7 +1018,7 @@ static const value_string entry_type[] = { { 0, NULL }, }; static int -dissect_log_entry(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) +dissect_log_entry(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { proto_item* lock_item = NULL; proto_tree* lock_tree = NULL; @@ -1045,14 +1044,14 @@ dissect_log_entry(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre offset = dissect_rpc_array(tvb, pinfo, lock_tree, offset, dissect_attr, hf_nisplus_attrs_array); - offset = dissect_nisplus_object(tvb, offset, pinfo, lock_tree); + offset = dissect_nisplus_object(tvb, offset, pinfo, lock_tree, data); proto_item_set_len(lock_item, offset-old_offset); return offset; } static int -dissect_log_result(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) +dissect_log_result(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { offset = dissect_rpc_uint32(tvb, tree, hf_nisplus_error, offset); @@ -1067,7 +1066,7 @@ dissect_log_result(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr } static int -dissect_callback_result(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_callback_result(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = dissect_rpc_bool(tvb, tree, hf_nisplus_callback_status, offset); @@ -1076,7 +1075,7 @@ dissect_callback_result(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto } static int -dissect_change_time(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_change_time(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = dissect_nisplus_time(tvb, offset, tree, hf_nisplus_log_time); @@ -1085,7 +1084,7 @@ dissect_change_time(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre } static int -dissect_cp_result(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_cp_result(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = dissect_rpc_uint32(tvb, tree, hf_nisplus_cp_status, offset); @@ -1100,7 +1099,7 @@ dissect_cp_result(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree } static int -dissect_nisplus_error(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_nisplus_error(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = dissect_rpc_uint32(tvb, tree, hf_nisplus_error, offset); @@ -1874,7 +1873,7 @@ static gint ett_nispluscb = -1; static gint ett_nispluscb_entry = -1; static int -dissect_cb_entry(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_cb_entry(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { proto_item* lock_item = NULL; /* proto_tree* lock_tree = NULL; */ @@ -1892,7 +1891,7 @@ dissect_cb_entry(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree * } static int -dissect_cback_data(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) +dissect_cback_data(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { offset = dissect_rpc_array(tvb, pinfo, tree, offset, dissect_cb_entry, hf_nispluscb_entries); diff --git a/epan/dissectors/packet-nlm.c b/epan/dissectors/packet-nlm.c index f72c330d12..874d53acc4 100644 --- a/epan/dissectors/packet-nlm.c +++ b/epan/dissectors/packet-nlm.c @@ -693,7 +693,7 @@ dissect_nlm_freeall(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, /* This function is identical for all NLM protocol versions (1-4)*/ static int dissect_nlm_gen_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 nlm_stat; @@ -729,14 +729,14 @@ dissect_nlm_gen_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, static int dissect_nlm1_test(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { return dissect_nlm_test(tvb,offset,pinfo,tree,1); } static int dissect_nlm4_test(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { return dissect_nlm_test(tvb,offset,pinfo,tree,4); } @@ -744,14 +744,14 @@ dissect_nlm4_test(tvbuff_t *tvb, int offset, packet_info *pinfo, static int dissect_nlm1_lock(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { return dissect_nlm_lock(tvb,offset,pinfo,tree,1); } static int dissect_nlm4_lock(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { return dissect_nlm_lock(tvb,offset,pinfo,tree,4); } @@ -759,14 +759,14 @@ dissect_nlm4_lock(tvbuff_t *tvb, int offset, packet_info *pinfo, static int dissect_nlm1_cancel(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { return dissect_nlm_cancel(tvb,offset,pinfo,tree,1); } static int dissect_nlm4_cancel(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { return dissect_nlm_cancel(tvb,offset,pinfo,tree,4); } @@ -774,14 +774,14 @@ dissect_nlm4_cancel(tvbuff_t *tvb, int offset, packet_info *pinfo, static int dissect_nlm1_unlock(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { return dissect_nlm_unlock(tvb,offset,pinfo,tree,1); } static int dissect_nlm4_unlock(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { return dissect_nlm_unlock(tvb,offset,pinfo,tree,4); } @@ -789,14 +789,14 @@ dissect_nlm4_unlock(tvbuff_t *tvb, int offset, packet_info *pinfo, static int dissect_nlm1_granted(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { return dissect_nlm_granted(tvb,offset,pinfo,tree,1); } static int dissect_nlm4_granted(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { return dissect_nlm_granted(tvb,offset,pinfo,tree,4); } @@ -804,56 +804,56 @@ dissect_nlm4_granted(tvbuff_t *tvb, int offset, packet_info *pinfo, static int dissect_nlm1_test_res(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { return dissect_nlm_test_res(tvb,offset,pinfo,tree,1); } static int dissect_nlm4_test_res(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { return dissect_nlm_test_res(tvb,offset,pinfo,tree,4); } static int dissect_nlm3_share(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { return dissect_nlm_share(tvb,offset,pinfo,tree,3); } static int dissect_nlm4_share(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { return dissect_nlm_share(tvb,offset,pinfo,tree,4); } static int dissect_nlm3_shareres(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { return dissect_nlm_shareres(tvb,offset,pinfo,tree,3); } static int dissect_nlm4_shareres(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { return dissect_nlm_shareres(tvb,offset,pinfo,tree,4); } static int dissect_nlm3_freeall(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { return dissect_nlm_freeall(tvb,offset,pinfo,tree,3); } static int dissect_nlm4_freeall(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { return dissect_nlm_freeall(tvb,offset,pinfo,tree,4); } diff --git a/epan/dissectors/packet-pcnfsd.c b/epan/dissectors/packet-pcnfsd.c index 66d6bec0b8..e77ad40d26 100644 --- a/epan/dissectors/packet-pcnfsd.c +++ b/epan/dissectors/packet-pcnfsd.c @@ -100,7 +100,7 @@ dissect_pcnfsd_mapreq(tvbuff_t *tvb, int offset, proto_tree *tree) static int dissect_pcnfsd2_dissect_mapreq_arg_item(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = dissect_pcnfsd_mapreq(tvb, offset, tree); @@ -113,7 +113,7 @@ dissect_pcnfsd2_dissect_mapreq_arg_item(tvbuff_t *tvb, int offset, static int dissect_pcnfsd2_mapid_call(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = dissect_rpc_string(tvb, tree, hf_pcnfsd_comment, offset, NULL); @@ -137,7 +137,7 @@ static const value_string names_maprstat[] = static int dissect_pcnfsd2_dissect_mapreq_res_item(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { guint32 maprstat; @@ -160,7 +160,7 @@ dissect_pcnfsd2_dissect_mapreq_res_item(tvbuff_t *tvb, int offset, static int dissect_pcnfsd2_mapid_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = dissect_rpc_string(tvb, tree, hf_pcnfsd_comment, offset, NULL); @@ -189,7 +189,7 @@ pcnfsd_decode_obscure(const char* data, int len) /* "NFS Illustrated" 14.7.13 */ static int dissect_pcnfsd2_auth_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { int newoffset; const char *ident = NULL; @@ -275,7 +275,7 @@ dissect_pcnfsd2_auth_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, /* "NFS Illustrated" 14.7.13 */ static int dissect_pcnfsd2_auth_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { int gids_count; proto_item *gitem = NULL; diff --git a/epan/dissectors/packet-portmap.c b/epan/dissectors/packet-portmap.c index 9d7b642c67..1b482411c8 100644 --- a/epan/dissectors/packet-portmap.c +++ b/epan/dissectors/packet-portmap.c @@ -71,7 +71,7 @@ static dissector_handle_t rpc_handle; /* Dissect a getport call */ static int dissect_getport_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 proto, version; guint32 prog; @@ -127,7 +127,7 @@ dissect_getport_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, static int dissect_getport_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 portx; @@ -167,7 +167,7 @@ dissect_getport_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, /* Dissect a 'set' call */ static int dissect_set_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 proto; guint32 prog; @@ -195,7 +195,7 @@ dissect_set_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, /* Dissect a 'unset' call */ static int dissect_unset_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 proto; guint32 prog; @@ -222,7 +222,7 @@ dissect_unset_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, static int dissect_set_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = dissect_rpc_bool(tvb, tree, hf_portmap_answer, offset); @@ -231,7 +231,7 @@ dissect_set_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, static int dissect_dump_entry(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { int prog, version, proto, port; proto_item *ti, *subtree; @@ -264,7 +264,7 @@ dissect_dump_entry(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, static int dissect_dump_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = dissect_rpc_list(tvb, pinfo, tree, offset, dissect_dump_entry); @@ -274,7 +274,7 @@ dissect_dump_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, /* Dissect a callit call */ static int dissect_callit_call(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 prog, vers, proc; @@ -316,7 +316,7 @@ dissect_callit_call(tvbuff_t *tvb, int offset, packet_info *pinfo, /* Dissect a callit reply */ static int dissect_callit_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { if ( tree ) { @@ -387,7 +387,7 @@ static const value_string portmap2_proc_vals[] = { /* RFC 1833, Page 3 */ static int -dissect_rpcb(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_rpcb(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { proto_item* rpcb_item = NULL; proto_tree* rpcb_tree = NULL; @@ -430,9 +430,9 @@ dissect_rpcb(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree /* RFC 1833, Page 7 */ static int dissect_rpcb3_getaddr_call(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { - offset = dissect_rpcb(tvb, offset, pinfo, tree); + offset = dissect_rpcb(tvb, offset, pinfo, tree, data); return offset; } @@ -441,7 +441,7 @@ dissect_rpcb3_getaddr_call(tvbuff_t *tvb, int offset, packet_info *pinfo, /* RFC 1833, Page 7 */ static int dissect_rpcb3_getaddr_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = dissect_rpc_string(tvb, tree, hf_portmap_uaddr, offset, NULL); @@ -453,7 +453,7 @@ dissect_rpcb3_getaddr_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, /* RFC 1833, Page 7 */ static int dissect_rpcb3_dump_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = dissect_rpc_list(tvb, pinfo, tree, offset, dissect_rpcb); return offset; @@ -462,7 +462,7 @@ dissect_rpcb3_dump_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, /* RFC 1833, page 4 */ static int dissect_rpcb_rmtcallres(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { /* Dissect the remote universal address. */ offset = dissect_rpc_string(tvb, tree, diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c index a6b98a3b70..cb01516ecc 100644 --- a/epan/dissectors/packet-rpc.c +++ b/epan/dissectors/packet-rpc.c @@ -636,7 +636,7 @@ dissect_rpc_opaque_data(tvbuff_t *tvb, int offset, opaque_tvb = tvb_new_subset(tvb, data_offset, string_length_copy, string_length); - return (*dissect_it)(opaque_tvb, offset, pinfo, tree); + return (*dissect_it)(opaque_tvb, offset, pinfo, tree, NULL); } @@ -776,7 +776,7 @@ dissect_rpc_list(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, offset, 4, value_follows); offset += 4; if (value_follows == 1) { - offset = rpc_list_dissector(tvb, offset, pinfo, tree); + offset = rpc_list_dissector(tvb, offset, pinfo, tree, NULL); } else { break; @@ -814,7 +814,7 @@ dissect_rpc_array(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, hf_rpc_array_len, offset); while (num--) { - offset = rpc_array_dissector(tvb, offset, pinfo, lock_tree); + offset = rpc_array_dissector(tvb, offset, pinfo, lock_tree, NULL); } proto_item_set_end(lock_item, tvb, offset); @@ -1425,7 +1425,8 @@ dissect_auth_gssapi_data(tvbuff_t *tvb, proto_tree *tree, int offset) static int call_dissect_function(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, - int offset, dissect_function_t* dissect_function, const char *progname) + int offset, dissect_function_t* dissect_function, const char *progname, + rpc_call_info_value *rpc_call) { const char *saved_proto; @@ -1437,7 +1438,7 @@ call_dissect_function(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pinfo->current_proto = progname; /* call the dissector for the next level */ - offset = dissect_function(tvb, offset, pinfo, tree); + offset = dissect_function(tvb, offset, pinfo, tree, rpc_call); /* restore the protocol name */ pinfo->current_proto = saved_proto; @@ -1451,7 +1452,7 @@ static int dissect_rpc_authgss_integ_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, dissect_function_t* dissect_function, - const char *progname) + const char *progname, rpc_call_info_value *rpc_call) { guint32 length, rounded_length, seq; @@ -1474,7 +1475,7 @@ dissect_rpc_authgss_integ_data(tvbuff_t *tvb, packet_info *pinfo, if (dissect_function != NULL) { /* offset = */ call_dissect_function(tvb, pinfo, gtree, offset, - dissect_function, progname); + dissect_function, progname, rpc_call); } offset += rounded_length - 4; offset = dissect_rpc_authgss_token(tvb, tree, offset, pinfo, hf_rpc_authgss_checksum); @@ -1669,7 +1670,7 @@ dissect_rpc_indir_call(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* Dissect the arguments */ offset = call_dissect_function(tvb, pinfo, tree, offset, - dissect_function, NULL); + dissect_function, NULL, rpc_call); return offset; } @@ -1805,7 +1806,7 @@ dissect_rpc_indir_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* Dissect the return value */ offset = call_dissect_function(tvb, pinfo, tree, offset, - dissect_function, NULL); + dissect_function, NULL, rpc_call); return offset; } @@ -2752,7 +2753,7 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, * payload. */ offset = call_dissect_function(tvb, pinfo, ptree, offset, - dissect_function, progname); + dissect_function, progname, rpc_call); break; case FLAVOR_GSSAPI_NO_INFO: @@ -2790,13 +2791,13 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, offset = call_dissect_function(tvb, pinfo, ptree, offset, dissect_function, - progname); + progname, rpc_call); } else if (gss_svc == RPCSEC_GSS_SVC_INTEGRITY) { offset = dissect_rpc_authgss_integ_data(tvb, pinfo, ptree, offset, dissect_function, - progname); + progname, rpc_call); } else if (gss_svc == RPCSEC_GSS_SVC_PRIVACY) { if (pinfo->gssapi_decrypted_tvb) { @@ -2804,7 +2805,7 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pinfo->gssapi_decrypted_tvb, pinfo, ptree, 4, dissect_function, - progname); + progname, rpc_call); offset = tvb_length(pinfo->gssapi_decrypted_tvb); } } diff --git a/epan/dissectors/packet-rpc.h b/epan/dissectors/packet-rpc.h index 34571ed278..9ee7fc2fe7 100644 --- a/epan/dissectors/packet-rpc.h +++ b/epan/dissectors/packet-rpc.h @@ -133,7 +133,7 @@ typedef struct _rpc_call_info_value { } rpc_call_info_value; -typedef int (dissect_function_t)(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree* tree); +typedef int (dissect_function_t)(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree* tree, void* data); typedef struct _vsff { guint32 value; diff --git a/epan/dissectors/packet-rquota.c b/epan/dissectors/packet-rquota.c index c266d65275..1808f72771 100644 --- a/epan/dissectors/packet-rquota.c +++ b/epan/dissectors/packet-rquota.c @@ -113,7 +113,7 @@ dissect_rquota(tvbuff_t *tvb, int offset, proto_tree *tree) } static int -dissect_getquota_result(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_getquota_result(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { gint32 status; @@ -130,7 +130,7 @@ dissect_getquota_result(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto } static int -dissect_getquota_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_getquota_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = dissect_rpc_string(tvb, tree, hf_rquota_pathp, offset, NULL); @@ -165,7 +165,7 @@ static const value_string rquota1_proc_vals[] = { static int -dissect_getquota2_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_getquota2_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = dissect_rpc_string(tvb, tree, hf_rquota_pathp, offset, NULL); diff --git a/epan/dissectors/packet-rwall.c b/epan/dissectors/packet-rwall.c index a5dc305503..a26c7619fa 100644 --- a/epan/dissectors/packet-rwall.c +++ b/epan/dissectors/packet-rwall.c @@ -48,7 +48,7 @@ static header_field_info hfi_rwall_message RWALL_HFI_INIT = { static gint ett_rwall = -1; static int -dissect_rwall_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_rwall_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = dissect_rpc_string(tvb, tree, hfi_rwall_message.id, offset, NULL); diff --git a/epan/dissectors/packet-spray.c b/epan/dissectors/packet-spray.c index fbdaba14bc..0a1bdceec5 100644 --- a/epan/dissectors/packet-spray.c +++ b/epan/dissectors/packet-spray.c @@ -42,7 +42,7 @@ static gint ett_spray_clock = -1; static int -dissect_get_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_get_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { proto_item* lock_item = NULL; proto_tree* lock_tree = NULL; @@ -65,7 +65,7 @@ dissect_get_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree } static int -dissect_spray_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_spray_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = dissect_rpc_data(tvb, tree, hf_spray_sprayarr, offset); @@ -128,8 +128,7 @@ proto_register_spray(void) &ett_spray_clock, }; - proto_spray = proto_register_protocol("SPRAY", - "SPRAY", "spray"); + proto_spray = proto_register_protocol("SPRAY", "SPRAY", "spray"); proto_register_field_array(proto_spray, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); } diff --git a/epan/dissectors/packet-stat-notify.c b/epan/dissectors/packet-stat-notify.c index a5ec6f4674..c1303385c7 100644 --- a/epan/dissectors/packet-stat-notify.c +++ b/epan/dissectors/packet-stat-notify.c @@ -39,7 +39,7 @@ static gint ett_statnotify = -1; static int -dissect_statnotify_mon(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_statnotify_mon(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = dissect_rpc_string(tvb,tree,hf_statnotify_name,offset,NULL); diff --git a/epan/dissectors/packet-stat.c b/epan/dissectors/packet-stat.c index 72c2644938..771f59274a 100644 --- a/epan/dissectors/packet-stat.c +++ b/epan/dissectors/packet-stat.c @@ -164,7 +164,7 @@ mon_id_len(tvbuff_t *tvb, int offset) } static int -dissect_stat_stat(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_stat_stat(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { if (tree) { @@ -175,7 +175,7 @@ dissect_stat_stat(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree } static int -dissect_stat_stat_res(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_stat_stat_res(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { proto_item* sub_item = NULL; proto_tree* sub_tree = NULL; @@ -222,7 +222,7 @@ dissect_stat_my_id(tvbuff_t *tvb, int offset, proto_tree *tree) } static int -dissect_stat_mon_id(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_stat_mon_id(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { proto_item* sub_item = NULL; proto_tree* sub_tree = NULL; @@ -252,17 +252,17 @@ dissect_stat_priv(tvbuff_t *tvb, int offset, proto_tree *tree) } static int -dissect_stat_mon(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) +dissect_stat_mon(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { - offset = dissect_stat_mon_id(tvb,offset,pinfo,tree); + offset = dissect_stat_mon_id(tvb,offset,pinfo,tree,data); offset = dissect_stat_priv(tvb,offset,tree); return offset; } static int -dissect_stat_state(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_stat_state(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = dissect_rpc_uint32(tvb,tree,hfi_stat_state.id,offset); @@ -270,7 +270,7 @@ dissect_stat_state(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree } static int -dissect_stat_notify(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_stat_notify(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { proto_item* sub_item = NULL; proto_tree* sub_tree = NULL; @@ -294,7 +294,7 @@ dissect_stat_notify(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre } static int -dissect_stat_umon_all(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_stat_umon_all(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = dissect_stat_my_id(tvb,offset,tree); diff --git a/epan/dissectors/packet-teklink.c b/epan/dissectors/packet-teklink.c index d312d207a8..30fbeb63fd 100644 --- a/epan/dissectors/packet-teklink.c +++ b/epan/dissectors/packet-teklink.c @@ -170,7 +170,7 @@ static const value_string teklink_vtc_modes[] = { }; static int dissect_teklink_tlaframeopen_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = dissect_rpc_uint32(tvb, tree, hf_teklink_unknown_long, offset); offset = dissect_rpc_string(tvb, tree, hf_teklink_unknown_string, offset, NULL); @@ -180,21 +180,21 @@ static int dissect_teklink_tlaframeopen_call(tvbuff_t *tvb, int offset, packet_i } static int dissect_teklink_tlaframeclose_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = dissect_rpc_uint32(tvb, tree, hf_teklink_unknown_long, offset); return offset; } static int dissect_teklink_tlaframeclose_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = dissect_rpc_uint32(tvb, tree, hf_teklink_unknown_long, offset); return offset; } static int dissect_teklink_tlaframeopen_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = dissect_rpc_uint32(tvb, tree, hf_teklink_unknown_long, offset); offset = dissect_rpc_uint32(tvb, tree, hf_teklink_unknown_long, offset); @@ -203,7 +203,7 @@ static int dissect_teklink_tlaframeopen_reply(tvbuff_t *tvb, int offset, packet_ } static int dissect_teklink_get_software_version_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = dissect_rpc_uint32(tvb, tree, hf_teklink_unknown_long, offset); offset = dissect_rpc_uint32(tvb, tree, hf_teklink_unknown_long, offset); @@ -213,7 +213,7 @@ static int dissect_teklink_get_software_version_reply(tvbuff_t *tvb, int offset, } static int dissect_teklink_call65_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = dissect_rpc_uint32(tvb, tree, hf_teklink_cmd, offset); offset = dissect_rpc_uint32(tvb, tree, hf_teklink_unknown_long, offset); @@ -225,14 +225,14 @@ static int dissect_teklink_call65_call(tvbuff_t *tvb, int offset, packet_info *p } static int dissect_teklink_call65_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = dissect_rpc_uint32(tvb, tree, hf_teklink_unknown_long, offset); return offset; } static int dissect_teklink_info_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = dissect_rpc_uint32(tvb, tree, hf_teklink_locked, offset); offset = dissect_rpc_uint32(tvb, tree, hf_teklink_unknown_long, offset); @@ -247,7 +247,7 @@ static int dissect_teklink_info_reply(tvbuff_t *tvb, int offset, packet_info *pi } static int dissect_teklink_info_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = dissect_rpc_uint32(tvb, tree, hf_teklink_unknown_long, offset); offset = dissect_rpc_uint32(tvb, tree, hf_teklink_unknown_long, offset); @@ -256,7 +256,7 @@ static int dissect_teklink_info_call(tvbuff_t *tvb, int offset, packet_info *pin static int dissect_teklink_vtc_ident(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = dissect_rpc_uint32(tvb, tree, hf_teklink_unknown_long, offset); offset = dissect_rpc_uint32(tvb, tree, hf_teklink_unknown_long, offset); @@ -264,7 +264,7 @@ static int dissect_teklink_vtc_ident(tvbuff_t *tvb, int offset, packet_info *pin } static int dissect_teklink_vtc_sigstatall(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = dissect_rpc_uint32(tvb, tree, hf_teklink_unknown_long, offset); offset = dissect_rpc_uint32(tvb, tree, hf_teklink_unknown_long, offset); @@ -272,7 +272,7 @@ static int dissect_teklink_vtc_sigstatall(tvbuff_t *tvb, int offset, packet_info } static int dissect_teklink_vtc_outen(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 sig = tvb_get_ntohl(tvb, offset); guint32 sigon = tvb_get_ntohl(tvb, offset + 4); @@ -287,7 +287,7 @@ static int dissect_teklink_vtc_outen(tvbuff_t *tvb, int offset, packet_info *pin } static int dissect_teklink_vtc_map(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 src, dst; @@ -304,7 +304,7 @@ static int dissect_teklink_vtc_map(tvbuff_t *tvb, int offset, packet_info *pinfo } static int dissect_teklink_vtc_clk(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 sig, clksource, clkedge, clkmode; @@ -327,7 +327,7 @@ static int dissect_teklink_vtc_clk(tvbuff_t *tvb, int offset, packet_info *pinfo } static int dissect_teklink_vtc_mode(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 sig, edge, mode; @@ -348,7 +348,7 @@ static int dissect_teklink_vtc_mode(tvbuff_t *tvb, int offset, packet_info *pinf } static int dissect_teklink_vtc_outsetup(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 sig, en, pol, feedback; @@ -371,7 +371,7 @@ static int dissect_teklink_vtc_outsetup(tvbuff_t *tvb, int offset, packet_info * } static int dissect_teklink_vtc_res(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 sig = tvb_get_ntohl(tvb, offset); @@ -383,14 +383,14 @@ static int dissect_teklink_vtc_res(tvbuff_t *tvb, int offset, packet_info *pinfo } static int dissect_teklink_vtl_spinbits(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = dissect_rpc_uint32(tvb, tree, hf_teklink_unknown_long, offset); return offset; } static int dissect_teklink_vtl_zmode(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = dissect_rpc_uint32(tvb, tree, hf_teklink_unknown_long, offset); return offset; diff --git a/epan/dissectors/packet-vxi11.c b/epan/dissectors/packet-vxi11.c index eb043382cc..75bf295b24 100644 --- a/epan/dissectors/packet-vxi11.c +++ b/epan/dissectors/packet-vxi11.c @@ -319,7 +319,7 @@ static int dissect_create_link_parms(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { const char *str; @@ -341,7 +341,7 @@ static int dissect_create_link_resp(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 error, lid; @@ -369,7 +369,7 @@ static int dissect_device_SRQ_parms(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = dissect_rpc_opaque_data(tvb, offset, tree, NULL, hf_vxi11_intr_handle, FALSE, 0, FALSE, NULL, NULL); @@ -385,7 +385,7 @@ static int dissect_device_docmd_parms(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 lid, cmd; const gchar *cmdstr; @@ -418,7 +418,7 @@ static int dissect_device_docmd_resp(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 error; @@ -432,7 +432,7 @@ static int dissect_device_enable_SRQ_parms(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 lid = tvb_get_ntohl(tvb, offset); @@ -453,7 +453,7 @@ static int dissect_device_error(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 error; @@ -464,7 +464,7 @@ static int dissect_device_generic_parms(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 lid = tvb_get_ntohl(tvb, offset); @@ -486,7 +486,7 @@ static int dissect_device_link(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 lid = tvb_get_ntohl(tvb, offset); @@ -505,7 +505,7 @@ static int dissect_device_lock_parms(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 lid = tvb_get_ntohl(tvb, offset); @@ -526,7 +526,7 @@ static int dissect_device_read_parms(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 lid = tvb_get_ntohl(tvb, offset); @@ -550,7 +550,7 @@ static int dissect_device_read_resp(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 error; @@ -565,7 +565,7 @@ static int dissect_device_readstb_resp(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 error, stb; @@ -590,7 +590,7 @@ static int dissect_device_remote_func(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 addr, port; const gchar *addrstr; @@ -619,7 +619,7 @@ static int dissect_device_write_parms(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 lid = tvb_get_ntohl(tvb, offset); @@ -642,7 +642,7 @@ static int dissect_device_write_resp(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 error; diff --git a/epan/dissectors/packet-ypbind.c b/epan/dissectors/packet-ypbind.c index 4691f937a3..c4b97527e9 100644 --- a/epan/dissectors/packet-ypbind.c +++ b/epan/dissectors/packet-ypbind.c @@ -47,7 +47,7 @@ static gint ett_ypbind = -1; static int -dissect_ypbind_domain_v2_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_ypbind_domain_v2_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { /* domain */ offset = dissect_rpc_string(tvb, tree, @@ -77,7 +77,7 @@ static const value_string error_vals[] = { #endif static int -dissect_ypbind_domain_v2_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_ypbind_domain_v2_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { guint32 type; @@ -108,7 +108,7 @@ dissect_ypbind_domain_v2_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_ } static int -dissect_ypbind_setdomain_v2_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_ypbind_setdomain_v2_request(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { /* domain */ offset = dissect_rpc_string(tvb, tree, diff --git a/epan/dissectors/packet-yppasswd.c b/epan/dissectors/packet-yppasswd.c index 72329e8669..c3a8448400 100644 --- a/epan/dissectors/packet-yppasswd.c +++ b/epan/dissectors/packet-yppasswd.c @@ -46,7 +46,7 @@ static gint ett_yppasswd = -1; static gint ett_yppasswd_newpw = -1; static int -dissect_yppasswd_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_yppasswd_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { proto_item *lock_item = NULL; proto_tree *lock_tree = NULL; @@ -78,7 +78,7 @@ dissect_yppasswd_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_t } static int -dissect_yppasswd_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_yppasswd_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = dissect_rpc_uint32(tvb, tree, hf_yppasswd_status, offset); diff --git a/epan/dissectors/packet-ypserv.c b/epan/dissectors/packet-ypserv.c index 59559d6371..8a0faa2ae3 100644 --- a/epan/dissectors/packet-ypserv.c +++ b/epan/dissectors/packet-ypserv.c @@ -115,7 +115,7 @@ dissect_ypserv_status(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_t } static int -dissect_domain_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_domain_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { proto_item_append_text(tree, " DOMAIN call"); @@ -128,7 +128,7 @@ dissect_domain_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre } static int -dissect_domain_nonack_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_domain_nonack_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { proto_item_append_text(tree, " DOMAIN_NONACK call"); @@ -141,7 +141,7 @@ dissect_domain_nonack_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, pr } static int -dissect_maplist_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_maplist_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { proto_item_append_text(tree, " MAPLIST call"); @@ -154,7 +154,7 @@ dissect_maplist_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tr } static int -dissect_domain_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_domain_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { proto_item_append_text(tree, " DOMAIN reply"); @@ -169,7 +169,7 @@ dissect_domain_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tr } static int -dissect_domain_nonack_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_domain_nonack_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { proto_item_append_text(tree, " DOMAIN_NONACK reply"); @@ -184,7 +184,7 @@ dissect_domain_nonack_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, p } static int -dissect_match_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_match_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { const char *str; @@ -209,7 +209,7 @@ dissect_match_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree } static int -dissect_match_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) +dissect_match_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { gint32 status; const char *str; @@ -235,7 +235,7 @@ dissect_match_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *t static int -dissect_first_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_first_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { proto_item_append_text(tree, " FIRST call"); @@ -268,7 +268,7 @@ dissect_first_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree static int -dissect_first_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) +dissect_first_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { proto_item_append_text(tree, " FIRST reply"); @@ -284,7 +284,7 @@ dissect_first_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *t } static int -dissect_next_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) +dissect_next_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { proto_item_append_text(tree, " NEXT reply"); @@ -301,7 +301,7 @@ dissect_next_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr static int -dissect_next_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_next_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { proto_item_append_text(tree, " NEXT call"); @@ -316,7 +316,7 @@ dissect_next_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree } static int -dissect_xfr_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_xfr_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { proto_item *sub_item=NULL; proto_tree *sub_tree=NULL; @@ -352,7 +352,7 @@ dissect_xfr_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree * } static int -dissect_clear_call(tvbuff_t *tvb _U_, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_clear_call(tvbuff_t *tvb _U_, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { proto_item_append_text(tree, " CLEAR call"); @@ -360,7 +360,7 @@ dissect_clear_call(tvbuff_t *tvb _U_, int offset, packet_info *pinfo _U_, proto_ } static int -dissect_clear_reply(tvbuff_t *tvb _U_, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_clear_reply(tvbuff_t *tvb _U_, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { proto_item_append_text(tree, " CLEAR reply"); @@ -368,7 +368,7 @@ dissect_clear_reply(tvbuff_t *tvb _U_, int offset, packet_info *pinfo _U_, proto } static int -dissect_xfr_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_xfr_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { proto_item_append_text(tree, " XFR reply"); @@ -381,7 +381,7 @@ dissect_xfr_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree } static int -dissect_order_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_order_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { const char *str; @@ -401,7 +401,7 @@ dissect_order_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree } static int -dissect_all_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_all_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { proto_item_append_text(tree, " ALL call"); @@ -413,7 +413,7 @@ dissect_all_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree * } static int -dissect_master_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) +dissect_master_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { proto_item_append_text(tree, " MASTER call"); @@ -425,7 +425,7 @@ dissect_master_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre } static int -dissect_all_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) +dissect_all_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { guint32 more; @@ -447,7 +447,7 @@ dissect_all_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre } static int -dissect_master_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) +dissect_master_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { proto_item_append_text(tree, " MASTER reply"); @@ -460,7 +460,7 @@ dissect_master_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree * static int -dissect_order_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) +dissect_order_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { guint32 num; @@ -479,7 +479,7 @@ dissect_order_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *t static int -dissect_maplist_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) +dissect_maplist_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { proto_item_append_text(tree, " MAPLIST reply"); -- cgit v1.2.3