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-windows-common.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-windows-common.c')
| -rw-r--r-- | epan/dissectors/packet-windows-common.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-windows-common.c b/epan/dissectors/packet-windows-common.c index 6f3bca5f54..2fc6da55e2 100644 --- a/epan/dissectors/packet-windows-common.c +++ b/epan/dissectors/packet-windows-common.c @@ -1830,7 +1830,7 @@ static void map_standard_access(guint32 *access_mask, int dissect_nt_access_mask(tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, guint8 *drep, int hfindex, + proto_tree *tree, dcerpc_info *di, guint8 *drep, int hfindex, struct access_mask_info *ami, guint32 *perms) { proto_item *item; @@ -1844,7 +1844,7 @@ dissect_nt_access_mask(tvbuff_t *tvb, gint offset, packet_info *pinfo, * an NT access mask; extract the access mask * with an NDR call. */ - offset = dissect_ndr_uint32(tvb, offset, pinfo, NULL, drep, + offset = dissect_ndr_uint32(tvb, offset, pinfo, NULL, di, drep, hfindex, &access); } else { /* @@ -2315,7 +2315,7 @@ dissect_nt_v2_ace(tvbuff_t *tvb, int offset, packet_info *pinfo, case ACE_TYPE_SYSTEM_MANDATORY_LABEL: /* access mask */ offset = dissect_nt_access_mask( - tvb, offset, pinfo, tree, drep, + tvb, offset, pinfo, tree, NULL, drep, hf_nt_access_mask, ami, &perms); /* these aces contain an extra object */ |