diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2016-10-02 20:52:14 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2016-10-02 19:44:53 +0000 |
| commit | 470086f059246b7f4a204def34cea130e5a3af61 (patch) | |
| tree | bc03ca8a522d42a94849384621ec4669703c8444 /epan/dissectors/asn1/x2ap/x2ap.cnf | |
| parent | 7a6610fc996940974eaafdcf8bff19298308ed72 (diff) | |
| download | wireshark-470086f059246b7f4a204def34cea130e5a3af61.tar.gz | |
X2AP: upgrade dissector to v13.5.0
Also get rid of two global variables
Change-Id: I8c20decb76f5c1773f58efd24d2e1e7d1177d358
Reviewed-on: https://code.wireshark.org/review/18029
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'epan/dissectors/asn1/x2ap/x2ap.cnf')
| -rw-r--r-- | epan/dissectors/asn1/x2ap/x2ap.cnf | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/epan/dissectors/asn1/x2ap/x2ap.cnf b/epan/dissectors/asn1/x2ap/x2ap.cnf index 52f14728dd..a35393e671 100644 --- a/epan/dissectors/asn1/x2ap/x2ap.cnf +++ b/epan/dissectors/asn1/x2ap/x2ap.cnf @@ -47,10 +47,12 @@ ProtocolIE-ContainerPair ProtocolIE-ContainerPairList #.END -#.FN_PARS ProtocolIE-ID VAL_PTR = &ProtocolIE_ID +#.FN_BODY ProtocolIE-ID VAL_PTR = &x2ap_data->protocol_ie_id + struct x2ap_private_data *x2ap_data = x2ap_get_private_data(actx->pinfo); +%(DEFAULT_BODY)s #.FN_FTR ProtocolIE-ID if (tree) { - proto_item_append_text(proto_item_get_parent_nth(actx->created_item, 2), ": %s", val_to_str_ext(ProtocolIE_ID, &x2ap_ProtocolIE_ID_vals_ext, "unknown (%d)")); + proto_item_append_text(proto_item_get_parent_nth(actx->created_item, 2), ": %s", val_to_str_ext(x2ap_data->protocol_ie_id, &x2ap_ProtocolIE_ID_vals_ext, "unknown (%d)")); } #.END @@ -58,14 +60,11 @@ ProtocolIE-ContainerPairList #.FN_PARS ProtocolExtensionField/extensionValue FN_VARIANT=_pdu_new TYPE_REF_FN=dissect_ProtocolExtensionFieldExtensionValue -#.FN_PARS ProcedureCode VAL_PTR = &ProcedureCode -#.END - -#.FN_HDR ProcedureCode - ProcedureCode = 0xFFFF; +#.FN_BODY ProcedureCode VAL_PTR = &x2ap_data->procedure_code + struct x2ap_private_data *x2ap_data = x2ap_get_private_data(actx->pinfo); +%(DEFAULT_BODY)s #.END - #.FN_PARS InitiatingMessage/value FN_VARIANT=_pdu_new TYPE_REF_FN=dissect_InitiatingMessageValue #.FN_PARS SuccessfulOutcome/value FN_VARIANT=_pdu_new TYPE_REF_FN=dissect_SuccessfulOutcomeValue @@ -136,7 +135,11 @@ Port-Number TYPE = FT_UINT16 DISPLAY = BASE_DEC return offset; subtree = proto_item_add_subtree(actx->created_item, ett_x2ap_RRC_Context); - dissect_lte_rrc_HandoverPreparationInformation_PDU(parameter_tvb, actx->pinfo, subtree, NULL); + if (g_x2ap_dissect_rrc_context_as == X2AP_RRC_CONTEXT_NBIOT) { + dissect_lte_rrc_HandoverPreparationInformation_NB_PDU(parameter_tvb, actx->pinfo, subtree, NULL); + } else { + dissect_lte_rrc_HandoverPreparationInformation_PDU(parameter_tvb, actx->pinfo, subtree, NULL); + } #.FN_BODY UE-HistoryInformationFromTheUE VAL_PTR = ¶meter_tvb tvbuff_t *parameter_tvb = NULL; |