diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-11-06 14:31:29 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-11-06 14:31:29 +0000 |
| commit | 22760b2d2a065249b21b7cf4be892aba71827279 (patch) | |
| tree | d2806f1e93d9d29d1d042185340a27fd23eaf296 /epan/dissectors/packet-dcerpc-mgmt.c | |
| parent | 440ac8370fae681dd2e55c669226720b12491481 (diff) | |
Remove pinfo->private_data from DCERPC dissectors and instead have dcerpc_info* infomation be passed in as a function parameter. Bug 9387 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9387)
All "generated" source was manually modified (with the power of search/replace), but I believe the "source input" files have been adjusted (checked into revs 53098 and 53099) to reflect the necessary changes (with possible whitespace formatting differences).
The Microsoft compiler doesn't flag "unused function parameters", so I apologize in advance if I may have missed a few. The "dcerpc_info* di" parameter is used in almost every function.
svn path=/trunk/; revision=53100
Diffstat (limited to 'epan/dissectors/packet-dcerpc-mgmt.c')
| -rw-r--r-- | epan/dissectors/packet-dcerpc-mgmt.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-dcerpc-mgmt.c b/epan/dissectors/packet-dcerpc-mgmt.c index 9794e34138..190557bf47 100644 --- a/epan/dissectors/packet-dcerpc-mgmt.c +++ b/epan/dissectors/packet-dcerpc-mgmt.c @@ -45,22 +45,22 @@ static e_uuid_t uuid_mgmt = { 0xafa8bd80, 0x7d8a, 0x11c9, { 0xbe, 0xf4, 0x08, 0x static guint16 ver_mgmt = 1; static int -mgmtrpc_dissect_inq_princ_name_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_) +mgmtrpc_dissect_inq_princ_name_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info *di _U_, guint8 *drep _U_) { - offset = dissect_ndr_cvstring(tvb, offset, pinfo, tree, drep, + offset = dissect_ndr_cvstring(tvb, offset, pinfo, tree, di, drep, sizeof(guint8), hf_mgmt_princ_name, TRUE, NULL); - offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_mgmt_rc, NULL); + offset = dissect_ntstatus(tvb, offset, pinfo, tree, di, drep, hf_mgmt_rc, NULL); return offset; } static int -mgmtrpc_dissect_inq_princ_name_request(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_) +mgmtrpc_dissect_inq_princ_name_request(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info *di _U_, guint8 *drep _U_) { - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_mgmt_proto, NULL); - offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_mgmt_princ_size, NULL); + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, di, drep, hf_mgmt_proto, NULL); + offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, di, drep, hf_mgmt_princ_size, NULL); return offset; } |