From c7884e217045477a949af26a547fa5ecc83dcad5 Mon Sep 17 00:00:00 2001 From: Pascal Quantin Date: Fri, 19 Jul 2019 14:15:32 +0200 Subject: XnAP: upgrade dissector to v15.4.0 Change-Id: Ia26593e7895709671a7a9d4a51bb6788e4059c94 Reviewed-on: https://code.wireshark.org/review/34015 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin --- epan/dissectors/packet-lte-rrc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'epan/dissectors/packet-lte-rrc.c') diff --git a/epan/dissectors/packet-lte-rrc.c b/epan/dissectors/packet-lte-rrc.c index 9aadca03d9..7107501ea4 100644 --- a/epan/dissectors/packet-lte-rrc.c +++ b/epan/dissectors/packet-lte-rrc.c @@ -307,7 +307,7 @@ static int hf_lte_rrc_lte_rrc_SCG_Config_r12_PDU = -1; /* SCG_Config_r12 */ static int hf_lte_rrc_lte_rrc_SCG_ConfigInfo_r12_PDU = -1; /* SCG_ConfigInfo_r12 */ static int hf_lte_rrc_lte_rrc_UEPagingCoverageInformation_PDU = -1; /* UEPagingCoverageInformation */ static int hf_lte_rrc_UERadioAccessCapabilityInformation_PDU = -1; /* UERadioAccessCapabilityInformation */ -static int hf_lte_rrc_UERadioPagingInformation_PDU = -1; /* UERadioPagingInformation */ +static int hf_lte_rrc_lte_rrc_UERadioPagingInformation_PDU = -1; /* UERadioPagingInformation */ static int hf_lte_rrc_BCCH_BCH_Message_PDU = -1; /* BCCH_BCH_Message */ static int hf_lte_rrc_BCCH_BCH_Message_MBMS_PDU = -1; /* BCCH_BCH_Message_MBMS */ static int hf_lte_rrc_BCCH_DL_SCH_Message_PDU = -1; /* BCCH_DL_SCH_Message */ @@ -110827,13 +110827,13 @@ static int dissect_UERadioAccessCapabilityInformation_PDU(tvbuff_t *tvb _U_, pac offset += 7; offset >>= 3; return offset; } -static int dissect_UERadioPagingInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { +int dissect_lte_rrc_UERadioPagingInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA); proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); - offset = dissect_lte_rrc_UERadioPagingInformation(tvb, offset, &asn1_ctx, tree, hf_lte_rrc_UERadioPagingInformation_PDU); + offset = dissect_lte_rrc_UERadioPagingInformation(tvb, offset, &asn1_ctx, tree, hf_lte_rrc_lte_rrc_UERadioPagingInformation_PDU); offset += 7; offset >>= 3; return offset; } @@ -111902,7 +111902,7 @@ void proto_register_lte_rrc(void) { { "UERadioAccessCapabilityInformation", "lte-rrc.UERadioAccessCapabilityInformation_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_lte_rrc_UERadioPagingInformation_PDU, + { &hf_lte_rrc_lte_rrc_UERadioPagingInformation_PDU, { "UERadioPagingInformation", "lte-rrc.UERadioPagingInformation_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -145369,7 +145369,7 @@ void proto_register_lte_rrc(void) { /*--- Included file: packet-lte-rrc-dis-reg.c ---*/ #line 1 "./asn1/lte-rrc/packet-lte-rrc-dis-reg.c" register_dissector("lte-rrc.ue_radio_access_cap_info", dissect_UERadioAccessCapabilityInformation_PDU, proto_lte_rrc); - register_dissector("lte-rrc.ue_radio_paging_info", dissect_UERadioPagingInformation_PDU, proto_lte_rrc); + register_dissector("lte-rrc.ue_radio_paging_info", dissect_lte_rrc_UERadioPagingInformation_PDU, proto_lte_rrc); register_dissector("lte-rrc.bcch.bch", dissect_BCCH_BCH_Message_PDU, proto_lte_rrc); register_dissector("lte-rrc.bcch.bch.mbms", dissect_BCCH_BCH_Message_MBMS_PDU, proto_lte_rrc); register_dissector("lte-rrc.bcch.dl.sch", dissect_BCCH_DL_SCH_Message_PDU, proto_lte_rrc); -- cgit v1.2.3