diff options
| author | kukosa <kukosa@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-05-22 11:49:50 +0000 |
|---|---|---|
| committer | kukosa <kukosa@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-05-22 11:49:50 +0000 |
| commit | d61553e9e5ae28d76feeb80730b67bd70a24345f (patch) | |
| tree | d9fe17598a0585424c3b54245fdde78750e764b8 /asn1/rrlp | |
| parent | 8938d6b2c0e661229e8e92cb6a6950dc8d3dcf5d (diff) | |
- fix bugs in dissect_per_octet_string() introduced with unaligned variant
- step to new ASN.1 API - pass asn_ctx_t* through PER dissectors instead of packet_info*
- PER ALIGNED/UNALIGNED flag moved to asn_ctx_t
- PER created tree item pointer moved to asn_ctx_t
- add nbap into PER dissectors in asn1/Makefile.nmake
- use add_oid_str_name() instead of register_ber_oid_name() in H.225 and H.245
- export asn_ctx_init from library
- PER dissectors regenerated
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@18209 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'asn1/rrlp')
| -rw-r--r-- | asn1/rrlp/rrlp.cnf | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/asn1/rrlp/rrlp.cnf b/asn1/rrlp/rrlp.cnf index 7c93c8a0ea..096e4bed63 100644 --- a/asn1/rrlp/rrlp.cnf +++ b/asn1/rrlp/rrlp.cnf @@ -10,10 +10,10 @@ PDU proto_tree_add_item(tree, proto_rrlp, tvb, 0, -1, FALSE); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, PSNAME); - if (check_col(pinfo->cinfo, COL_INFO)) - col_clear(pinfo->cinfo, COL_INFO); + if (check_col(%(ACTX)s->pinfo->cinfo, COL_PROTOCOL)) + col_set_str(%(ACTX)s->pinfo->cinfo, COL_PROTOCOL, PSNAME); + if (check_col(%(ACTX)s->pinfo->cinfo, COL_INFO)) + col_clear(%(ACTX)s->pinfo->cinfo, COL_INFO); %(DEFAULT_BODY)s #.END @@ -26,4 +26,4 @@ tvbuff_t *parameter_tvb = NULL; %(DEFAULT_BODY)s if(parameter_tvb) - dissect_geographical_description(parameter_tvb, pinfo, tree); + dissect_geographical_description(parameter_tvb, %(ACTX)s->pinfo, tree); |