Regenerate all asn2wrs generated dissectors.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28379 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 39 insertions, 39 deletions

diff --git a/epan/dissectors/packet-s1ap.c b/epan/dissectors/packet-s1ap.c
index 874b570e2a..c5997a019c 100644
--- a/epan/dissectors/packet-s1ap.c
+++ b/epan/dissectors/packet-s1ap.c
@@ -1,7 +1,7 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
 /* packet-s1ap.c                                                              */
-/* ../../tools/asn2wrs.py -p s1ap -c s1ap.cnf -s packet-s1ap-template S1AP-CommonDataTypes.asn S1AP-Constants.asn S1AP-Containers.asn S1AP-IEs.asn S1AP-PDU-Contents.asn S1AP-PDU-Descriptions.asn */
+/* ../../tools/asn2wrs.py -p s1ap -c ./s1ap.cnf -s ./packet-s1ap-template -D . S1AP-CommonDataTypes.asn S1AP-Constants.asn S1AP-Containers.asn S1AP-IEs.asn S1AP-PDU-Contents.asn S1AP-PDU-Descriptions.asn */
 
 /* Input file: packet-s1ap-template.c */
 
@@ -7733,7 +7733,7 @@ void proto_register_s1ap(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "s1ap.OBJECT_IDENTIFIER", HFILL }},
     { &hf_s1ap_ProtocolIE_Container_item,
-      { "ProtocolIE-Container", "s1ap.ProtocolIE_Container_item",
+      { "ProtocolIE-Field", "s1ap.ProtocolIE_Field",
         FT_NONE, BASE_NONE, NULL, 0,
         "s1ap.ProtocolIE_Field", HFILL }},
     { &hf_s1ap_id,
@@ -7749,11 +7749,11 @@ void proto_register_s1ap(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "s1ap.T_ie_field_value", HFILL }},
     { &hf_s1ap_ProtocolIE_ContainerList_item,
-      { "ProtocolIE-ContainerList", "s1ap.ProtocolIE_ContainerList_item",
+      { "ProtocolIE-SingleContainer", "s1ap.ProtocolIE_SingleContainer",
         FT_NONE, BASE_NONE, NULL, 0,
         "s1ap.ProtocolIE_SingleContainer", HFILL }},
     { &hf_s1ap_ProtocolExtensionContainer_item,
-      { "ProtocolExtensionContainer", "s1ap.ProtocolExtensionContainer_item",
+      { "ProtocolExtensionField", "s1ap.ProtocolExtensionField",
         FT_NONE, BASE_NONE, NULL, 0,
         "s1ap.ProtocolExtensionField", HFILL }},
     { &hf_s1ap_ext_id,
@@ -7765,7 +7765,7 @@ void proto_register_s1ap(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "s1ap.T_extensionValue", HFILL }},
     { &hf_s1ap_PrivateIE_Container_item,
-      { "PrivateIE-Container", "s1ap.PrivateIE_Container_item",
+      { "PrivateIE-Field", "s1ap.PrivateIE_Field",
         FT_NONE, BASE_NONE, NULL, 0,
         "s1ap.PrivateIE_Field", HFILL }},
     { &hf_s1ap_private_id,
@@ -7793,7 +7793,7 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "s1ap.ProtocolExtensionContainer", HFILL }},
     { &hf_s1ap_Bearers_SubjectToStatusTransferList_item,
-      { "Bearers-SubjectToStatusTransferList", "s1ap.Bearers_SubjectToStatusTransferList_item",
+      { "ProtocolIE-SingleContainer", "s1ap.ProtocolIE_SingleContainer",
         FT_NONE, BASE_NONE, NULL, 0,
         "s1ap.ProtocolIE_SingleContainer", HFILL }},
     { &hf_s1ap_e_RAB_ID,
@@ -7813,7 +7813,7 @@ void proto_register_s1ap(void) {
         FT_BYTES, BASE_HEX, NULL, 0,
         "s1ap.ReceiveStatusofULPDCPSDUs", HFILL }},
     { &hf_s1ap_BPLMNs_item,
-      { "BPLMNs", "s1ap.BPLMNs_item",
+      { "PLMNidentity", "s1ap.PLMNidentity",
         FT_BYTES, BASE_HEX, NULL, 0,
         "s1ap.PLMNidentity", HFILL }},
     { &hf_s1ap_cellID_Broadcast,
@@ -7849,7 +7849,7 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, VALS(s1ap_CauseMisc_vals), 0,
         "s1ap.CauseMisc", HFILL }},
     { &hf_s1ap_CellID_Broadcast_item,
-      { "CellID-Broadcast", "s1ap.CellID_Broadcast_item",
+      { "CellID-Broadcast-Item", "s1ap.CellID_Broadcast_Item",
         FT_NONE, BASE_NONE, NULL, 0,
         "s1ap.CellID_Broadcast_Item", HFILL }},
     { &hf_s1ap_eCGI,
@@ -7889,7 +7889,7 @@ void proto_register_s1ap(void) {
         FT_BYTES, BASE_HEX, NULL, 0,
         "s1ap.RAC", HFILL }},
     { &hf_s1ap_CSG_IdList_item,
-      { "CSG-IdList", "s1ap.CSG_IdList_item",
+      { "CSG-IdList-Item", "s1ap.CSG_IdList_Item",
         FT_NONE, BASE_NONE, NULL, 0,
         "s1ap.CSG_IdList_Item", HFILL }},
     { &hf_s1ap_cSG_Id,
@@ -7921,7 +7921,7 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "s1ap.CriticalityDiagnostics_IE_List", HFILL }},
     { &hf_s1ap_CriticalityDiagnostics_IE_List_item,
-      { "CriticalityDiagnostics-IE-List", "s1ap.CriticalityDiagnostics_IE_List_item",
+      { "CriticalityDiagnostics-IE-Item", "s1ap.CriticalityDiagnostics_IE_Item",
         FT_NONE, BASE_NONE, NULL, 0,
         "s1ap.CriticalityDiagnostics_IE_Item", HFILL }},
     { &hf_s1ap_iECriticality,
@@ -7937,15 +7937,15 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, VALS(s1ap_TypeOfError_vals), 0,
         "s1ap.TypeOfError", HFILL }},
     { &hf_s1ap_ECGIList_item,
-      { "ECGIList", "s1ap.ECGIList_item",
+      { "EUTRAN-CGI", "s1ap.EUTRAN_CGI",
         FT_NONE, BASE_NONE, NULL, 0,
         "s1ap.EUTRAN_CGI", HFILL }},
     { &hf_s1ap_EmergencyAreaIDList_item,
-      { "EmergencyAreaIDList", "s1ap.EmergencyAreaIDList_item",
+      { "EmergencyAreaID", "s1ap.EmergencyAreaID",
         FT_BYTES, BASE_HEX, NULL, 0,
         "s1ap.EmergencyAreaID", HFILL }},
     { &hf_s1ap_EmergencyAreaID_Broadcast_item,
-      { "EmergencyAreaID-Broadcast", "s1ap.EmergencyAreaID_Broadcast_item",
+      { "EmergencyAreaID-Broadcast-Item", "s1ap.EmergencyAreaID_Broadcast_Item",
         FT_NONE, BASE_NONE, NULL, 0,
         "s1ap.EmergencyAreaID_Broadcast_Item", HFILL }},
     { &hf_s1ap_emergencyAreaID,
@@ -7957,7 +7957,7 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "s1ap.CompletedCellinEAI", HFILL }},
     { &hf_s1ap_CompletedCellinEAI_item,
-      { "CompletedCellinEAI", "s1ap.CompletedCellinEAI_item",
+      { "CompletedCellinEAI-Item", "s1ap.CompletedCellinEAI_Item",
         FT_NONE, BASE_NONE, NULL, 0,
         "s1ap.CompletedCellinEAI_Item", HFILL }},
     { &hf_s1ap_macroENB_ID,
@@ -7981,11 +7981,11 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "s1ap.Bearers_SubjectToStatusTransferList", HFILL }},
     { &hf_s1ap_ENBX2TLAs_item,
-      { "ENBX2TLAs", "s1ap.ENBX2TLAs_item",
+      { "TransportLayerAddress", "s1ap.TransportLayerAddress",
         FT_BYTES, BASE_HEX, NULL, 0,
         "s1ap.TransportLayerAddress", HFILL }},
     { &hf_s1ap_EPLMNs_item,
-      { "EPLMNs", "s1ap.EPLMNs_item",
+      { "PLMNidentity", "s1ap.PLMNidentity",
         FT_BYTES, BASE_HEX, NULL, 0,
         "s1ap.PLMNidentity", HFILL }},
     { &hf_s1ap_cell_ID,
@@ -7993,7 +7993,7 @@ void proto_register_s1ap(void) {
         FT_BYTES, BASE_HEX, NULL, 0,
         "s1ap.CellIdentity", HFILL }},
     { &hf_s1ap_ForbiddenTAs_item,
-      { "ForbiddenTAs", "s1ap.ForbiddenTAs_item",
+      { "ForbiddenTAs-Item", "s1ap.ForbiddenTAs_Item",
         FT_NONE, BASE_NONE, NULL, 0,
         "s1ap.ForbiddenTAs_Item", HFILL }},
     { &hf_s1ap_pLMN_Identity,
@@ -8005,11 +8005,11 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "s1ap.ForbiddenTACs", HFILL }},
     { &hf_s1ap_ForbiddenTACs_item,
-      { "ForbiddenTACs", "s1ap.ForbiddenTACs_item",
+      { "TAC", "s1ap.TAC",
         FT_BYTES, BASE_HEX, NULL, 0,
         "s1ap.TAC", HFILL }},
     { &hf_s1ap_ForbiddenLAs_item,
-      { "ForbiddenLAs", "s1ap.ForbiddenLAs_item",
+      { "ForbiddenLAs-Item", "s1ap.ForbiddenLAs_Item",
         FT_NONE, BASE_NONE, NULL, 0,
         "s1ap.ForbiddenLAs_Item", HFILL }},
     { &hf_s1ap_forbiddenLACs,
@@ -8017,7 +8017,7 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "s1ap.ForbiddenLACs", HFILL }},
     { &hf_s1ap_ForbiddenLACs_item,
-      { "ForbiddenLACs", "s1ap.ForbiddenLACs_item",
+      { "LAC", "s1ap.LAC",
         FT_BYTES, BASE_HEX, NULL, 0,
         "s1ap.LAC", HFILL }},
     { &hf_s1ap_e_RAB_MaximumBitrateDL,
@@ -8121,7 +8121,7 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, VALS(s1ap_DL_Forwarding_vals), 0,
         "s1ap.DL_Forwarding", HFILL }},
     { &hf_s1ap_E_RABList_item,
-      { "E-RABList", "s1ap.E_RABList_item",
+      { "ProtocolIE-SingleContainer", "s1ap.ProtocolIE_SingleContainer",
         FT_NONE, BASE_NONE, NULL, 0,
         "s1ap.ProtocolIE_SingleContainer", HFILL }},
     { &hf_s1ap_cause,
@@ -8181,7 +8181,7 @@ void proto_register_s1ap(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "s1ap.TAI", HFILL }},
     { &hf_s1ap_ServedGUMMEIs_item,
-      { "ServedGUMMEIs", "s1ap.ServedGUMMEIs_item",
+      { "ServedGUMMEIsItem", "s1ap.ServedGUMMEIsItem",
         FT_NONE, BASE_NONE, NULL, 0,
         "s1ap.ServedGUMMEIsItem", HFILL }},
     { &hf_s1ap_servedPLMNs,
@@ -8197,19 +8197,19 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "s1ap.ServedMMECs", HFILL }},
     { &hf_s1ap_ServedGroupIDs_item,
-      { "ServedGroupIDs", "s1ap.ServedGroupIDs_item",
+      { "MME-Group-ID", "s1ap.MME_Group_ID",
         FT_BYTES, BASE_HEX, NULL, 0,
         "s1ap.MME_Group_ID", HFILL }},
     { &hf_s1ap_ServedMMECs_item,
-      { "ServedMMECs", "s1ap.ServedMMECs_item",
+      { "MME-Code", "s1ap.MME_Code",
         FT_BYTES, BASE_HEX, NULL, 0,
         "s1ap.MME_Code", HFILL }},
     { &hf_s1ap_ServedPLMNs_item,
-      { "ServedPLMNs", "s1ap.ServedPLMNs_item",
+      { "PLMNidentity", "s1ap.PLMNidentity",
         FT_BYTES, BASE_HEX, NULL, 0,
         "s1ap.PLMNidentity", HFILL }},
     { &hf_s1ap_SupportedTAs_item,
-      { "SupportedTAs", "s1ap.SupportedTAs_item",
+      { "SupportedTAs-Item", "s1ap.SupportedTAs_Item",
         FT_NONE, BASE_NONE, NULL, 0,
         "s1ap.SupportedTAs_Item", HFILL }},
     { &hf_s1ap_tAC,
@@ -8225,11 +8225,11 @@ void proto_register_s1ap(void) {
         FT_BYTES, BASE_HEX, NULL, 0,
         "s1ap.MME_Code", HFILL }},
     { &hf_s1ap_TAIListforWarning_item,
-      { "TAIListforWarning", "s1ap.TAIListforWarning_item",
+      { "TAI", "s1ap.TAI",
         FT_NONE, BASE_NONE, NULL, 0,
         "s1ap.TAI", HFILL }},
     { &hf_s1ap_TAI_Broadcast_item,
-      { "TAI-Broadcast", "s1ap.TAI_Broadcast_item",
+      { "TAI-Broadcast-Item", "s1ap.TAI_Broadcast_Item",
         FT_NONE, BASE_NONE, NULL, 0,
         "s1ap.TAI_Broadcast_Item", HFILL }},
     { &hf_s1ap_tAI,
@@ -8241,7 +8241,7 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "s1ap.CompletedCellinTAI", HFILL }},
     { &hf_s1ap_CompletedCellinTAI_item,
-      { "CompletedCellinTAI", "s1ap.CompletedCellinTAI_item",
+      { "CompletedCellinTAI-Item", "s1ap.CompletedCellinTAI_Item",
         FT_NONE, BASE_NONE, NULL, 0,
         "s1ap.CompletedCellinTAI_Item", HFILL }},
     { &hf_s1ap_targetRNC_ID,
@@ -8361,7 +8361,7 @@ void proto_register_s1ap(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "s1ap.E_RABLevelQoSParameters", HFILL }},
     { &hf_s1ap_E_RABToBeSetupListBearerSUReq_item,
-      { "E-RABToBeSetupListBearerSUReq", "s1ap.E_RABToBeSetupListBearerSUReq_item",
+      { "ProtocolIE-SingleContainer", "s1ap.ProtocolIE_SingleContainer",
         FT_NONE, BASE_NONE, NULL, 0,
         "s1ap.ProtocolIE_SingleContainer", HFILL }},
     { &hf_s1ap_e_RABlevelQoSParameters,
@@ -8373,11 +8373,11 @@ void proto_register_s1ap(void) {
         FT_BYTES, BASE_HEX, NULL, 0,
         "s1ap.NAS_PDU", HFILL }},
     { &hf_s1ap_E_RABSetupListBearerSURes_item,
-      { "E-RABSetupListBearerSURes", "s1ap.E_RABSetupListBearerSURes_item",
+      { "ProtocolIE-SingleContainer", "s1ap.ProtocolIE_SingleContainer",
         FT_NONE, BASE_NONE, NULL, 0,
         "s1ap.ProtocolIE_SingleContainer", HFILL }},
     { &hf_s1ap_E_RABToBeModifiedListBearerModReq_item,
-      { "E-RABToBeModifiedListBearerModReq", "s1ap.E_RABToBeModifiedListBearerModReq_item",
+      { "ProtocolIE-SingleContainer", "s1ap.ProtocolIE_SingleContainer",
         FT_NONE, BASE_NONE, NULL, 0,
         "s1ap.ProtocolIE_SingleContainer", HFILL }},
     { &hf_s1ap_e_RABLevelQoSParameters,
@@ -8385,23 +8385,23 @@ void proto_register_s1ap(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "s1ap.E_RABLevelQoSParameters", HFILL }},
     { &hf_s1ap_E_RABModifyListBearerModRes_item,
-      { "E-RABModifyListBearerModRes", "s1ap.E_RABModifyListBearerModRes_item",
+      { "ProtocolIE-SingleContainer", "s1ap.ProtocolIE_SingleContainer",
         FT_NONE, BASE_NONE, NULL, 0,
         "s1ap.ProtocolIE_SingleContainer", HFILL }},
     { &hf_s1ap_E_RABReleaseListBearerRelComp_item,
-      { "E-RABReleaseListBearerRelComp", "s1ap.E_RABReleaseListBearerRelComp_item",
+      { "ProtocolIE-SingleContainer", "s1ap.ProtocolIE_SingleContainer",
         FT_NONE, BASE_NONE, NULL, 0,
         "s1ap.ProtocolIE_SingleContainer", HFILL }},
     { &hf_s1ap_E_RABToBeSetupListCtxtSUReq_item,
-      { "E-RABToBeSetupListCtxtSUReq", "s1ap.E_RABToBeSetupListCtxtSUReq_item",
+      { "ProtocolIE-SingleContainer", "s1ap.ProtocolIE_SingleContainer",
         FT_NONE, BASE_NONE, NULL, 0,
         "s1ap.ProtocolIE_SingleContainer", HFILL }},
     { &hf_s1ap_E_RABSetupListCtxtSURes_item,
-      { "E-RABSetupListCtxtSURes", "s1ap.E_RABSetupListCtxtSURes_item",
+      { "ProtocolIE-SingleContainer", "s1ap.ProtocolIE_SingleContainer",
         FT_NONE, BASE_NONE, NULL, 0,
         "s1ap.ProtocolIE_SingleContainer", HFILL }},
     { &hf_s1ap_TAIList_item,
-      { "TAIList", "s1ap.TAIList_item",
+      { "ProtocolIE-SingleContainer", "s1ap.ProtocolIE_SingleContainer",
         FT_NONE, BASE_NONE, NULL, 0,
         "s1ap.ProtocolIE_SingleContainer", HFILL }},
     { &hf_s1ap_s1_Interface,
@@ -8413,11 +8413,11 @@ void proto_register_s1ap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "s1ap.UE_associatedLogicalS1_ConnectionListRes", HFILL }},
     { &hf_s1ap_UE_associatedLogicalS1_ConnectionListRes_item,
-      { "UE-associatedLogicalS1-ConnectionListRes", "s1ap.UE_associatedLogicalS1_ConnectionListRes_item",
+      { "ProtocolIE-SingleContainer", "s1ap.ProtocolIE_SingleContainer",
         FT_NONE, BASE_NONE, NULL, 0,
         "s1ap.ProtocolIE_SingleContainer", HFILL }},
     { &hf_s1ap_UE_associatedLogicalS1_ConnectionListResAck_item,
-      { "UE-associatedLogicalS1-ConnectionListResAck", "s1ap.UE_associatedLogicalS1_ConnectionListResAck_item",
+      { "ProtocolIE-SingleContainer", "s1ap.ProtocolIE_SingleContainer",
         FT_NONE, BASE_NONE, NULL, 0,
         "s1ap.ProtocolIE_SingleContainer", HFILL }},
     { &hf_s1ap_rIMTransfer,