diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-11-05 18:47:26 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-11-05 18:47:26 +0000 |
| commit | b6b78d69dbae80ea0a0efc39400e3e88d5f9e337 (patch) | |
| tree | 3b236e73ee8f1d83c07ecc5ab7a67af8bb19cc85 /asn1/acse/acse.cnf | |
| parent | 389423aaaac460f5b0fcbaf37b4f3d5cd7941c5b (diff) | |
| download | wireshark-b6b78d69dbae80ea0a0efc39400e3e88d5f9e337.tar.gz | |
In an effort to reduce the use of pinfo->private_data (and some true global variables), I converted the ASN.1 dissectors that use pinfo->private_data to exchange a SESSION_DATA_STRUCTURE to instead only exchange it in the context of ASN.1. This meant converting dissectors to the "new" style to pass the SESSION_DATA_STRUCTURE as well as providing a pointer to it in asn1_ctx_t.private_data. Yes, it's still "private data", but it's not used by all dissectors like pinfo->private data is.
svn path=/trunk/; revision=53090
Diffstat (limited to 'asn1/acse/acse.cnf')
| -rw-r--r-- | asn1/acse/acse.cnf | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/asn1/acse/acse.cnf b/asn1/acse/acse.cnf index b3d815032d..ec0d8c0063 100644 --- a/asn1/acse/acse.cnf +++ b/asn1/acse/acse.cnf @@ -46,7 +46,7 @@ PDV-list/presentation-data-values/octet-aligned pDVList_octet_aligned FN_VARIANT = _str VAL_PTR = &object_identifier_id #.FN_BODY Authentication-value-other/other-mechanism-value - offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, top_tree, NULL); + offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, top_tree, actx->private_data); #.FN_BODY PDV-list/presentation-data-values/simple-ASN1-type /*XXX not implemented yet */ @@ -69,6 +69,8 @@ PDV-list/presentation-data-values/octet-aligned pDVList_octet_aligned #.FN_BODY EXTERNALt/_untag/indirect-reference char *oid; + struct SESSION_DATA_STRUCTURE* session = actx->private_data; + offset = dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_acse_indirect_reference, &indir_ref); @@ -85,10 +87,10 @@ PDV-list/presentation-data-values/octet-aligned pDVList_octet_aligned FN_VARIANT = _str VAL_PTR = &object_identifier_id #.FN_BODY EXTERNALt/_untag/encoding/single-ASN1-type - offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, top_tree ? top_tree : tree, NULL); + offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, top_tree ? top_tree : tree, actx->private_data); #.FN_BODY EXTERNALt/_untag/encoding/octet-aligned - offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, top_tree ? top_tree : tree, NULL); + offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, top_tree ? top_tree : tree, actx->private_data); #.FN_BODY AARQ-apdu col_append_str(actx->pinfo->cinfo, COL_INFO, "A-Associate-Request"); |