diff options
| author | Tomas Kukosa <tomas.kukosa@siemens.com> | 2006-05-22 11:49:50 +0000 |
|---|---|---|
| committer | Tomas Kukosa <tomas.kukosa@siemens.com> | 2006-05-22 11:49:50 +0000 |
| commit | fbd2a3fe3e6829304daba4ada278246f343e5f4b (patch) | |
| tree | d9fe17598a0585424c3b54245fdde78750e764b8 /asn1/ranap/ranap.cnf | |
| parent | 18ffc28bb1811b808c853ac2f649e5b1e3ba8306 (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
svn path=/trunk/; revision=18209
Diffstat (limited to 'asn1/ranap/ranap.cnf')
| -rw-r--r-- | asn1/ranap/ranap.cnf | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/asn1/ranap/ranap.cnf b/asn1/ranap/ranap.cnf index 6b7087e822..26aeb6c406 100644 --- a/asn1/ranap/ranap.cnf +++ b/asn1/ranap/ranap.cnf @@ -30,8 +30,8 @@ VAL_PTR = &type_of_message VAL_PTR = &ProcedureCode #.FN_FTR ProcedureCode - if (check_col(pinfo->cinfo, COL_INFO)) - col_add_fstr(pinfo->cinfo, COL_INFO, "%s ", + if (check_col(actx->pinfo->cinfo, COL_INFO)) + col_add_fstr(actx->pinfo->cinfo, COL_INFO, "%s ", val_to_str(ProcedureCode, ranap_ProcedureCode_vals, "unknown message")); #.FN_PARS ProtocolIE-ID @@ -44,11 +44,11 @@ VAL_PTR = &ProtocolIE_ID #.FN_BODY Value - offset = dissect_ranap_messages(tvb, offset, pinfo, tree); + offset = dissect_ranap_messages(tvb, offset, %(ACTX)s, tree); #.FN_BODY RANAP_PROTOCOL_IES_Value - offset = dissect_ranap_ies(tvb, offset, pinfo, tree); + offset = dissect_ranap_ies(tvb, offset, %(ACTX)s, tree); #.FN_BODY NAS-PDU VAL_PTR = &nas_pdu_tvb @@ -57,17 +57,17 @@ tvbuff_t *nas_pdu_tvb=NULL; %(DEFAULT_BODY)s if (nas_pdu_tvb) - dissector_try_port(nas_pdu_dissector_table, 0x1, nas_pdu_tvb, pinfo, top_tree); + dissector_try_port(nas_pdu_dissector_table, 0x1, nas_pdu_tvb, %(ACTX)s->pinfo, top_tree); #.FN_BODY SecondValue - offset = dissect_ranap_SecondValue_ies(tvb, offset, pinfo, tree); + offset = dissect_ranap_SecondValue_ies(tvb, offset, %(ACTX)s, tree); #.FN_BODY FirstValue - offset = dissect_ranap_FirstValue_ies(tvb, offset, pinfo, tree); + offset = dissect_ranap_FirstValue_ies(tvb, offset, %(ACTX)s, tree); #.FN_BODY Extension - offset = dissect_ranap_ies(tvb, offset, pinfo, tree); + offset = dissect_ranap_ies(tvb, offset, %(ACTX)s, tree); #.FN_BODY RANAP_PRIVATE_IES_Value /* FIX ME */ |