Regenerate all asn2wrs generated dissectors.

svn path=/trunk/; revision=28379

1 files changed, 25 insertions, 25 deletions

diff --git a/epan/dissectors/packet-x2ap.c b/epan/dissectors/packet-x2ap.c
index fbe6dfcd52..d367681456 100644
--- a/epan/dissectors/packet-x2ap.c
+++ b/epan/dissectors/packet-x2ap.c
@@ -1,7 +1,7 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
 /* packet-x2ap.c                                                              */
-/* ../../tools/asn2wrs.py -p x2ap -c x2ap.cnf -s packet-x2ap-template X2AP-CommonDataTypes.asn X2AP-Constants.asn X2AP-Containers.asn X2AP-IEs.asn X2AP-PDU-Contents.asn X2AP-PDU-Descriptions.asn */
+/* ../../tools/asn2wrs.py -p x2ap -c ./x2ap.cnf -s ./packet-x2ap-template -D . X2AP-CommonDataTypes.asn X2AP-Constants.asn X2AP-Containers.asn X2AP-IEs.asn X2AP-PDU-Contents.asn X2AP-PDU-Descriptions.asn */
 
 /* Input file: packet-x2ap-template.c */
 
@@ -3218,7 +3218,7 @@ void proto_register_x2ap(void) {
         FT_UINT32, BASE_DEC, VALS(x2ap_X2AP_PDU_vals), 0,
         "x2ap.X2AP_PDU", HFILL }},
     { &hf_x2ap_ProtocolIE_Container_item,
-      { "ProtocolIE-Container", "x2ap.ProtocolIE_Container_item",
+      { "ProtocolIE-Field", "x2ap.ProtocolIE_Field",
         FT_NONE, BASE_NONE, NULL, 0,
         "x2ap.ProtocolIE_Field", HFILL }},
     { &hf_x2ap_id,
@@ -3234,7 +3234,7 @@ void proto_register_x2ap(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "x2ap.ProtocolIE_Field_value", HFILL }},
     { &hf_x2ap_ProtocolExtensionContainer_item,
-      { "ProtocolExtensionContainer", "x2ap.ProtocolExtensionContainer_item",
+      { "ProtocolExtensionField", "x2ap.ProtocolExtensionField",
         FT_NONE, BASE_NONE, NULL, 0,
         "x2ap.ProtocolExtensionField", HFILL }},
     { &hf_x2ap_extension_id,
@@ -3246,7 +3246,7 @@ void proto_register_x2ap(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "x2ap.T_extensionValue", HFILL }},
     { &hf_x2ap_BroadcastPLMNs_Item_item,
-      { "BroadcastPLMNs-Item", "x2ap.BroadcastPLMNs_Item_item",
+      { "PLMN-Identity", "x2ap.PLMN_Identity",
         FT_BYTES, BASE_HEX, NULL, 0,
         "x2ap.PLMN_Identity", HFILL }},
     { &hf_x2ap_radioNetwork,
@@ -3294,7 +3294,7 @@ void proto_register_x2ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x2ap.CriticalityDiagnostics_IE_List", HFILL }},
     { &hf_x2ap_CriticalityDiagnostics_IE_List_item,
-      { "CriticalityDiagnostics-IE-List", "x2ap.CriticalityDiagnostics_IE_List_item",
+      { "CriticalityDiagnostics-IE-List item", "x2ap.CriticalityDiagnostics_IE_List_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "x2ap.CriticalityDiagnostics_IE_List_item", HFILL }},
     { &hf_x2ap_iECriticality,
@@ -3326,11 +3326,11 @@ void proto_register_x2ap(void) {
         FT_BYTES, BASE_HEX, NULL, 0,
         "x2ap.BIT_STRING_SIZE_28", HFILL }},
     { &hf_x2ap_EPLMNs_item,
-      { "EPLMNs", "x2ap.EPLMNs_item",
+      { "PLMN-Identity", "x2ap.PLMN_Identity",
         FT_BYTES, BASE_HEX, NULL, 0,
         "x2ap.PLMN_Identity", HFILL }},
     { &hf_x2ap_ForbiddenTAs_item,
-      { "ForbiddenTAs", "x2ap.ForbiddenTAs_item",
+      { "ForbiddenTAs-Item", "x2ap.ForbiddenTAs_Item",
         FT_NONE, BASE_NONE, NULL, 0,
         "x2ap.ForbiddenTAs_Item", HFILL }},
     { &hf_x2ap_forbiddenTACs,
@@ -3338,11 +3338,11 @@ void proto_register_x2ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x2ap.ForbiddenTACs", HFILL }},
     { &hf_x2ap_ForbiddenTACs_item,
-      { "ForbiddenTACs", "x2ap.ForbiddenTACs_item",
+      { "TAC", "x2ap.TAC",
         FT_BYTES, BASE_HEX, NULL, 0,
         "x2ap.TAC", HFILL }},
     { &hf_x2ap_ForbiddenLAs_item,
-      { "ForbiddenLAs", "x2ap.ForbiddenLAs_item",
+      { "ForbiddenLAs-Item", "x2ap.ForbiddenLAs_Item",
         FT_NONE, BASE_NONE, NULL, 0,
         "x2ap.ForbiddenLAs_Item", HFILL }},
     { &hf_x2ap_forbiddenLACs,
@@ -3350,7 +3350,7 @@ void proto_register_x2ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x2ap.ForbiddenLACs", HFILL }},
     { &hf_x2ap_ForbiddenLACs_item,
-      { "ForbiddenLACs", "x2ap.ForbiddenLACs_item",
+      { "LAC", "x2ap.LAC",
         FT_BYTES, BASE_HEX, NULL, 0,
         "x2ap.LAC", HFILL }},
     { &hf_x2ap_sAE_Bearer_MaximumBitrateDL,
@@ -3382,7 +3382,7 @@ void proto_register_x2ap(void) {
         FT_BYTES, BASE_HEX, NULL, 0,
         "x2ap.GTP_TEI", HFILL }},
     { &hf_x2ap_GUGroupIDList_item,
-      { "GUGroupIDList", "x2ap.GUGroupIDList_item",
+      { "GU-Group-ID", "x2ap.GU_Group_ID",
         FT_NONE, BASE_NONE, NULL, 0,
         "x2ap.GU_Group_ID", HFILL }},
     { &hf_x2ap_mME_Group_ID,
@@ -3418,7 +3418,7 @@ void proto_register_x2ap(void) {
         FT_UINT32, BASE_DEC, VALS(x2ap_ForbiddenInterRATs_vals), 0,
         "x2ap.ForbiddenInterRATs", HFILL }},
     { &hf_x2ap_InterfacesToTrace_item,
-      { "InterfacesToTrace", "x2ap.InterfacesToTrace_item",
+      { "ProtocolIE-Single-Container", "x2ap.ProtocolIE_Single_Container",
         FT_NONE, BASE_NONE, NULL, 0,
         "x2ap.ProtocolIE_Single_Container", HFILL }},
     { &hf_x2ap_traceInterface,
@@ -3482,7 +3482,7 @@ void proto_register_x2ap(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "x2ap.GBR_QosInformation", HFILL }},
     { &hf_x2ap_ServedCells_item,
-      { "ServedCells", "x2ap.ServedCells_item",
+      { "ServedCell-Information", "x2ap.ServedCell_Information",
         FT_NONE, BASE_NONE, NULL, 0,
         "x2ap.ServedCell_Information", HFILL }},
     { &hf_x2ap_phyCID,
@@ -3522,7 +3522,7 @@ void proto_register_x2ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x2ap.InterfacesToTrace", HFILL }},
     { &hf_x2ap_UE_HistoryInformation_item,
-      { "UE-HistoryInformation", "x2ap.UE_HistoryInformation_item",
+      { "LastVisitedCell-Item", "x2ap.LastVisitedCell_Item",
         FT_NONE, BASE_NONE, NULL, 0,
         "x2ap.LastVisitedCell_Item", HFILL }},
     { &hf_x2ap_uEaggregateMaximumBitRateDownlink,
@@ -3534,11 +3534,11 @@ void proto_register_x2ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "x2ap.BitRate", HFILL }},
     { &hf_x2ap_UL_InterferenceOverloadIndication_item,
-      { "UL-InterferenceOverloadIndication", "x2ap.UL_InterferenceOverloadIndication_item",
+      { "UL-InterferenceOverloadIndication-Item", "x2ap.UL_InterferenceOverloadIndication_Item",
         FT_UINT32, BASE_DEC, VALS(x2ap_UL_InterferenceOverloadIndication_Item_vals), 0,
         "x2ap.UL_InterferenceOverloadIndication_Item", HFILL }},
     { &hf_x2ap_UL_HighInterferenceIndicationInfo_item,
-      { "UL-HighInterferenceIndicationInfo", "x2ap.UL_HighInterferenceIndicationInfo_item",
+      { "UL-HighInterferenceIndicationInfo-Item", "x2ap.UL_HighInterferenceIndicationInfo_Item",
         FT_NONE, BASE_NONE, NULL, 0,
         "x2ap.UL_HighInterferenceIndicationInfo_Item", HFILL }},
     { &hf_x2ap_ul_interferenceindication,
@@ -3582,7 +3582,7 @@ void proto_register_x2ap(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "x2ap.LocationReportingInformation", HFILL }},
     { &hf_x2ap_Bearers_ToBeSetup_List_item,
-      { "Bearers-ToBeSetup-List", "x2ap.Bearers_ToBeSetup_List_item",
+      { "ProtocolIE-Single-Container", "x2ap.ProtocolIE_Single_Container",
         FT_NONE, BASE_NONE, NULL, 0,
         "x2ap.ProtocolIE_Single_Container", HFILL }},
     { &hf_x2ap_sAE_Bearer_ID,
@@ -3602,7 +3602,7 @@ void proto_register_x2ap(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "x2ap.GTPtunnelEndpoint", HFILL }},
     { &hf_x2ap_Bearers_Admitted_List_item,
-      { "Bearers-Admitted-List", "x2ap.Bearers_Admitted_List_item",
+      { "ProtocolIE-Single-Container", "x2ap.ProtocolIE_Single_Container",
         FT_NONE, BASE_NONE, NULL, 0,
         "x2ap.ProtocolIE_Single_Container", HFILL }},
     { &hf_x2ap_bearer_ID,
@@ -3618,7 +3618,7 @@ void proto_register_x2ap(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "x2ap.GTPtunnelEndpoint", HFILL }},
     { &hf_x2ap_Bearers_NotAdmitted_List_item,
-      { "Bearers-NotAdmitted-List", "x2ap.Bearers_NotAdmitted_List_item",
+      { "ProtocolIE-Single-Container", "x2ap.ProtocolIE_Single_Container",
         FT_NONE, BASE_NONE, NULL, 0,
         "x2ap.ProtocolIE_Single_Container", HFILL }},
     { &hf_x2ap_cause,
@@ -3626,7 +3626,7 @@ void proto_register_x2ap(void) {
         FT_UINT32, BASE_DEC, VALS(x2ap_Cause_vals), 0,
         "x2ap.Cause", HFILL }},
     { &hf_x2ap_Bearers_SubjectToStatusTransfer_List_item,
-      { "Bearers-SubjectToStatusTransfer-List", "x2ap.Bearers_SubjectToStatusTransfer_List_item",
+      { "ProtocolIE-Single-Container", "x2ap.ProtocolIE_Single_Container",
         FT_NONE, BASE_NONE, NULL, 0,
         "x2ap.ProtocolIE_Single_Container", HFILL }},
     { &hf_x2ap_receiveStatusofULPDCPSDUs,
@@ -3642,7 +3642,7 @@ void proto_register_x2ap(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "x2ap.COUNTvalue", HFILL }},
     { &hf_x2ap_CellInformation_List_item,
-      { "CellInformation-List", "x2ap.CellInformation_List_item",
+      { "ProtocolIE-Single-Container", "x2ap.ProtocolIE_Single_Container",
         FT_NONE, BASE_NONE, NULL, 0,
         "x2ap.ProtocolIE_Single_Container", HFILL }},
     { &hf_x2ap_cell_ID,
@@ -3662,7 +3662,7 @@ void proto_register_x2ap(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "x2ap.RelativeNarrowbandTxPower", HFILL }},
     { &hf_x2ap_ServedCellsToModify_item,
-      { "ServedCellsToModify", "x2ap.ServedCellsToModify_item",
+      { "ServedCellsToModify-Item", "x2ap.ServedCellsToModify_Item",
         FT_NONE, BASE_NONE, NULL, 0,
         "x2ap.ServedCellsToModify_Item", HFILL }},
     { &hf_x2ap_old_ecgi,
@@ -3674,15 +3674,15 @@ void proto_register_x2ap(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "x2ap.ServedCell_Information", HFILL }},
     { &hf_x2ap_Old_ECGIs_item,
-      { "Old-ECGIs", "x2ap.Old_ECGIs_item",
+      { "ECGI", "x2ap.ECGI",
         FT_NONE, BASE_NONE, NULL, 0,
         "x2ap.ECGI", HFILL }},
     { &hf_x2ap_CellToReport_List_item,
-      { "CellToReport-List", "x2ap.CellToReport_List_item",
+      { "ProtocolIE-Single-Container", "x2ap.ProtocolIE_Single_Container",
         FT_NONE, BASE_NONE, NULL, 0,
         "x2ap.ProtocolIE_Single_Container", HFILL }},
     { &hf_x2ap_CellMeasurementResult_List_item,
-      { "CellMeasurementResult-List", "x2ap.CellMeasurementResult_List_item",
+      { "ProtocolIE-Single-Container", "x2ap.ProtocolIE_Single_Container",
         FT_NONE, BASE_NONE, NULL, 0,
         "x2ap.ProtocolIE_Single_Container", HFILL }},
     { &hf_x2ap_resoureStatus,