diff options
author | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2005-01-30 13:00:35 +0000 |
---|---|---|
committer | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2005-01-30 13:00:35 +0000 |
commit | bb7160249d0684c0b9b57c891f0d21498b68afac (patch) | |
tree | f2d518dbf0ca4145d7831c313f7b0085d9f0d54a /epan/dissectors/packet-dcerpc-lsa.c | |
parent | 7fc663c7380c166343f729f867200b0cfed0a3ca (diff) |
rename lsa_dissect_LSA_SECURITY_DESCRIPTOR to lsa_dissect_sec_desc_buf
change its signature to match the autogenerated signatures.
add a small wrapper function so tha tthe handwritten lsa can still call the
function through dissect_ndr_pointer()
no changes in functionality, essentially just a rename of a function and signature change
svn path=/trunk/; revision=13207
Diffstat (limited to 'epan/dissectors/packet-dcerpc-lsa.c')
-rw-r--r-- | epan/dissectors/packet-dcerpc-lsa.c | 39 |
1 files changed, 29 insertions, 10 deletions
diff --git a/epan/dissectors/packet-dcerpc-lsa.c b/epan/dissectors/packet-dcerpc-lsa.c index f29d2a4fea..49c99d1b55 100644 --- a/epan/dissectors/packet-dcerpc-lsa.c +++ b/epan/dissectors/packet-dcerpc-lsa.c @@ -390,11 +390,30 @@ lsa_dissect_sec_desc_buf_data(tvbuff_t *tvb, int offset, return offset; } -int -lsa_dissect_LSA_SECURITY_DESCRIPTOR(tvbuff_t *tvb, int offset, + +/* call a sec_desc_buf through a pointer. + this is just temporary function until all + interfaces are autogenerated */ +static int +pointer_lsa_dissect_sec_desc_buf(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, guint8 *drep) { + offset=lsa_dissect_sec_desc_buf(tvb, offset, + pinfo, parent_tree, + drep, 0, 0); + return offset; +} + + + + +/* dummy1,2 to make signature compatible with autogenerated dissector */ +int +lsa_dissect_sec_desc_buf(tvbuff_t *tvb, int offset, + packet_info *pinfo, proto_tree *parent_tree, + guint8 *drep, int dummy1 _U_, guint32 dummy2 _U_) +{ proto_item *item=NULL; proto_tree *tree=NULL; int old_offset=offset; @@ -502,7 +521,7 @@ lsa_dissect_LSA_OBJECT_ATTRIBUTES(tvbuff_t *tvb, int offset, /* security descriptor */ offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, - lsa_dissect_LSA_SECURITY_DESCRIPTOR, NDR_POINTER_UNIQUE, + pointer_lsa_dissect_sec_desc_buf, NDR_POINTER_UNIQUE, "LSA_SECURITY_DESCRIPTOR pointer: ", -1); /* security quality of service */ @@ -1179,7 +1198,7 @@ lsa_dissect_lsarquerysecurityobject_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, - lsa_dissect_LSA_SECURITY_DESCRIPTOR, NDR_POINTER_UNIQUE, + pointer_lsa_dissect_sec_desc_buf, NDR_POINTER_UNIQUE, "LSA_SECURITY_DESCRIPTOR pointer: sec_info", -1); offset = dissect_ntstatus( @@ -1200,7 +1219,7 @@ lsa_dissect_lsarsetsecurityobject_rqst(tvbuff_t *tvb, int offset, hf_lsa_info_type, NULL); offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, - lsa_dissect_LSA_SECURITY_DESCRIPTOR, NDR_POINTER_REF, + pointer_lsa_dissect_sec_desc_buf, NDR_POINTER_REF, "LSA_SECURITY_DESCRIPTOR: sec_info", -1); return offset; @@ -2651,14 +2670,14 @@ lsa_dissect_TRUSTED_DOMAIN_INFORMATION(tvbuff_t *tvb, int offset, offset = lsa_dissect_LSA_TRUSTED_DOMAIN_AUTH_INFORMATION(tvb, offset, pinfo, tree, drep); break; case 9: - offset = lsa_dissect_LSA_SECURITY_DESCRIPTOR(tvb, offset, pinfo, tree, drep); + offset = lsa_dissect_sec_desc_buf(tvb, offset, pinfo, tree, drep, 0, 0); break; case 10: offset = lsa_dissect_LSA_TRUST_INFORMATION_EX(tvb, offset, pinfo, tree, drep); offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_lsa_rid_offset, NULL); - offset = lsa_dissect_LSA_SECURITY_DESCRIPTOR(tvb, offset, pinfo, tree, drep); + offset = lsa_dissect_sec_desc_buf(tvb, offset, pinfo, tree, drep, 0, 0); break; } @@ -3812,7 +3831,7 @@ lsa_dissect_lsartestcall_rqst(tvbuff_t *tvb, int offset, /* [in, ref] LSA_SECURITY_DESCRIPTOR *sd */ offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, - lsa_dissect_LSA_SECURITY_DESCRIPTOR, NDR_POINTER_REF, + pointer_lsa_dissect_sec_desc_buf, NDR_POINTER_REF, "LSA_SECURITY_DESCRIPTOR pointer: sd", -1); return offset; @@ -3825,7 +3844,7 @@ lsa_dissect_lsartestcall_reply(tvbuff_t *tvb, int offset, { /* [out, ref] LSA_SECURITY_DESCRIPTOR **psd) */ offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, - lsa_dissect_LSA_SECURITY_DESCRIPTOR, NDR_POINTER_UNIQUE, + pointer_lsa_dissect_sec_desc_buf, NDR_POINTER_UNIQUE, "LSA_SECURITY_DESCRIPTOR pointer: psd)", -1); offset = dissect_ntstatus( @@ -3849,7 +3868,7 @@ lsa_dissect_lsarcreatetrusteddomainex2_rqst(tvbuff_t *tvb, int offset, /* [in, ref] LSA_SECURITY_DESCRIPTOR *sd */ offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, - lsa_dissect_LSA_SECURITY_DESCRIPTOR, NDR_POINTER_REF, + pointer_lsa_dissect_sec_desc_buf, NDR_POINTER_REF, "LSA_SECURITY_DESCRIPTOR pointer: sd", -1); /* [in] ULONG unknown */ |