diff options
author | Stig Bjørlykke <stig@bjorlykke.org> | 2009-05-16 22:07:03 +0000 |
---|---|---|
committer | Stig Bjørlykke <stig@bjorlykke.org> | 2009-05-16 22:07:03 +0000 |
commit | c47e788c94af5656ffbc83ebbe03a8539cdcde72 (patch) | |
tree | b1055286b24404aea8078ca2430dda80e1440964 | |
parent | b4f4444202b90da79333137f5bb5166cd78bd701 (diff) |
Regenerate all asn2wrs generated dissectors.
svn path=/trunk/; revision=28379
132 files changed, 2680 insertions, 2680 deletions
diff --git a/epan/dissectors/packet-acp133.c b/epan/dissectors/packet-acp133.c index 5d8de981de..a12c28e8e3 100644 --- a/epan/dissectors/packet-acp133.c +++ b/epan/dissectors/packet-acp133.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-acp133.c */ -/* ../../tools/asn2wrs.py -b -p acp133 -c acp133.cnf -s packet-acp133-template acp133.asn MHSDirectoryObjectsAndAttributes.asn */ +/* ../../tools/asn2wrs.py -b -p acp133 -c ./acp133.cnf -s ./packet-acp133-template -D . acp133.asn MHSDirectoryObjectsAndAttributes.asn */ /* Input file: packet-acp133-template.c */ @@ -1104,7 +1104,7 @@ void proto_register_acp133(void) { FT_NONE, BASE_NONE, NULL, 0, "acp133.Capability", HFILL }}, { &hf_acp133_Addressees_item, - { "Addressees", "acp133.Addressees_item", + { "Addressees item", "acp133.Addressees_item", FT_STRING, BASE_NONE, NULL, 0, "acp133.PrintableString_SIZE_1_55", HFILL }}, { &hf_acp133_ukm_entries, @@ -1112,7 +1112,7 @@ void proto_register_acp133(void) { FT_UINT32, BASE_DEC, NULL, 0, "acp133.SEQUENCE_OF_UKMEntry", HFILL }}, { &hf_acp133_ukm_entries_item, - { "ukm-entries", "acp133.ukm_entries_item", + { "UKMEntry", "acp133.UKMEntry", FT_NONE, BASE_NONE, NULL, 0, "acp133.UKMEntry", HFILL }}, { &hf_acp133_algorithm_identifier, @@ -1124,7 +1124,7 @@ void proto_register_acp133(void) { FT_BYTES, BASE_HEX, NULL, 0, "acp133.BIT_STRING", HFILL }}, { &hf_acp133_Remarks_item, - { "Remarks", "acp133.Remarks_item", + { "Remarks item", "acp133.Remarks_item", FT_STRING, BASE_NONE, NULL, 0, "acp133.PrintableString", HFILL }}, { &hf_acp133_rI, @@ -1176,7 +1176,7 @@ void proto_register_acp133(void) { FT_UINT32, BASE_DEC, NULL, 0, "acp133.SEQUENCE_OF_GeneralNames", HFILL }}, { &hf_acp133_insteadOf_item, - { "insteadOf", "acp133.insteadOf_item", + { "GeneralNames", "acp133.GeneralNames", FT_UINT32, BASE_DEC, NULL, 0, "x509ce.GeneralNames", HFILL }}, { &hf_acp133_inAdditionTo, @@ -1184,7 +1184,7 @@ void proto_register_acp133(void) { FT_UINT32, BASE_DEC, NULL, 0, "acp133.SEQUENCE_OF_GeneralNames", HFILL }}, { &hf_acp133_inAdditionTo_item, - { "inAdditionTo", "acp133.inAdditionTo_item", + { "GeneralNames", "acp133.GeneralNames", FT_UINT32, BASE_DEC, NULL, 0, "x509ce.GeneralNames", HFILL }}, { &hf_acp133_individual, @@ -1272,7 +1272,7 @@ void proto_register_acp133(void) { FT_UINT32, BASE_DEC, NULL, 0, "acp133.SEQUENCE_OF_AlgorithmInformation", HFILL }}, { &hf_acp133_token_encryption_algorithm_preference_item, - { "token-encryption-algorithm-preference", "acp133.token_encryption_algorithm_preference_item", + { "AlgorithmInformation", "acp133.AlgorithmInformation", FT_NONE, BASE_NONE, NULL, 0, "acp133.AlgorithmInformation", HFILL }}, { &hf_acp133_token_signature_algorithm_preference, @@ -1280,7 +1280,7 @@ void proto_register_acp133(void) { FT_UINT32, BASE_DEC, NULL, 0, "acp133.SEQUENCE_OF_AlgorithmInformation", HFILL }}, { &hf_acp133_token_signature_algorithm_preference_item, - { "token-signature-algorithm-preference", "acp133.token_signature_algorithm_preference_item", + { "AlgorithmInformation", "acp133.AlgorithmInformation", FT_NONE, BASE_NONE, NULL, 0, "acp133.AlgorithmInformation", HFILL }}, { &hf_acp133_originator_certificate_selector, @@ -1304,7 +1304,7 @@ void proto_register_acp133(void) { FT_UINT32, BASE_DEC, NULL, 0, "acp133.SET_OF_Capability", HFILL }}, { &hf_acp133_capabilities_item, - { "capabilities", "acp133.capabilities_item", + { "Capability", "acp133.Capability", FT_NONE, BASE_NONE, NULL, 0, "acp133.Capability", HFILL }}, { &hf_acp133_content_types, @@ -1312,7 +1312,7 @@ void proto_register_acp133(void) { FT_UINT32, BASE_DEC, NULL, 0, "acp133.SET_OF_ExtendedContentType", HFILL }}, { &hf_acp133_content_types_item, - { "content-types", "acp133.content_types_item", + { "ExtendedContentType", "acp133.ExtendedContentType", FT_OID, BASE_NONE, NULL, 0, "x411.ExtendedContentType", HFILL }}, { &hf_acp133_maximum_content_length, diff --git a/epan/dissectors/packet-acp133.h b/epan/dissectors/packet-acp133.h index f54ed10718..3f9577b21e 100644 --- a/epan/dissectors/packet-acp133.h +++ b/epan/dissectors/packet-acp133.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-acp133.h */ -/* ../../tools/asn2wrs.py -b -p acp133 -c acp133.cnf -s packet-acp133-template acp133.asn MHSDirectoryObjectsAndAttributes.asn */ +/* ../../tools/asn2wrs.py -b -p acp133 -c ./acp133.cnf -s ./packet-acp133-template -D . acp133.asn MHSDirectoryObjectsAndAttributes.asn */ /* Input file: packet-acp133-template.h */ diff --git a/epan/dissectors/packet-acse.c b/epan/dissectors/packet-acse.c index a47f6c29a4..ff30c540e2 100644 --- a/epan/dissectors/packet-acse.c +++ b/epan/dissectors/packet-acse.c @@ -2027,7 +2027,7 @@ void proto_register_acse(void) { FT_OID, BASE_NONE, NULL, 0, "acse.AE_title_form2", HFILL }}, { &hf_acse_ASOI_tag_item, - { "ASOI-tag", "acse.ASOI_tag_item", + { "ASOI-tag item", "acse.ASOI_tag_item", FT_NONE, BASE_NONE, NULL, 0, "acse.ASOI_tag_item", HFILL }}, { &hf_acse_qualifier, @@ -2039,7 +2039,7 @@ void proto_register_acse(void) { FT_UINT32, BASE_DEC, NULL, 0, "acse.ASOI_identifier", HFILL }}, { &hf_acse_ASO_context_name_list_item, - { "ASO-context-name-list", "acse.ASO_context_name_list_item", + { "ASO-context-name", "acse.ASO_context_name", FT_OID, BASE_NONE, NULL, 0, "acse.ASO_context_name", HFILL }}, { &hf_acse_context_list, @@ -2051,7 +2051,7 @@ void proto_register_acse(void) { FT_UINT32, BASE_DEC, NULL, 0, "acse.Default_Context_List", HFILL }}, { &hf_acse_Context_list_item, - { "Context-list", "acse.Context_list_item", + { "Context-list item", "acse.Context_list_item", FT_NONE, BASE_NONE, NULL, 0, "acse.Context_list_item", HFILL }}, { &hf_acse_pci, @@ -2067,11 +2067,11 @@ void proto_register_acse(void) { FT_UINT32, BASE_DEC, NULL, 0, "acse.SEQUENCE_OF_TransferSyntaxName", HFILL }}, { &hf_acse_transfer_syntaxes_item, - { "transfer-syntaxes", "acse.transfer_syntaxes_item", + { "TransferSyntaxName", "acse.TransferSyntaxName", FT_OID, BASE_NONE, NULL, 0, "acse.TransferSyntaxName", HFILL }}, { &hf_acse_Default_Context_List_item, - { "Default-Context-List", "acse.Default_Context_List_item", + { "Default-Context-List item", "acse.Default_Context_List_item", FT_NONE, BASE_NONE, NULL, 0, "acse.Default_Context_List_item", HFILL }}, { &hf_acse_abstract_syntax_name, @@ -2083,7 +2083,7 @@ void proto_register_acse(void) { FT_OID, BASE_NONE, NULL, 0, "acse.TransferSyntaxName", HFILL }}, { &hf_acse_P_context_result_list_item, - { "P-context-result-list", "acse.P_context_result_list_item", + { "P-context-result-list item", "acse.P_context_result_list_item", FT_NONE, BASE_NONE, NULL, 0, "acse.P_context_result_list_item", HFILL }}, { &hf_acse_pcontext_result, @@ -2107,7 +2107,7 @@ void proto_register_acse(void) { FT_UINT32, BASE_DEC, VALS(acse_T_acse_service_provider_vals), 0, "acse.T_acse_service_provider", HFILL }}, { &hf_acse_Association_data_item, - { "Association-data", "acse.Association_data_item", + { "Association-data", "acse.EXTERNALt", FT_NONE, BASE_NONE, NULL, 0, "acse.EXTERNALt", HFILL }}, { &hf_acse_simply_encoded_data, diff --git a/epan/dissectors/packet-ansi_map.c b/epan/dissectors/packet-ansi_map.c index f1aa6da859..faa1cca0ff 100644 --- a/epan/dissectors/packet-ansi_map.c +++ b/epan/dissectors/packet-ansi_map.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-ansi_map.c */ -/* ../../tools/asn2wrs.py -b -p ansi_map -c ansi_map.cnf -s packet-ansi_map-template ansi_map.asn */ +/* ../../tools/asn2wrs.py -b -p ansi_map -c ./ansi_map.cnf -s ./packet-ansi_map-template -D . ansi_map.asn */ /* Input file: packet-ansi_map-template.c */ @@ -18341,7 +18341,7 @@ void proto_register_ansi_map(void) { FT_BYTES, BASE_HEX, NULL, 0, "ansi_map.CDMAPowerCombinedIndicator", HFILL }}, { &hf_ansi_map_CDMACodeChannelList_item, - { "CDMACodeChannelList", "ansi_map.CDMACodeChannelList_item", + { "CDMACodeChannelInformation", "ansi_map.CDMACodeChannelInformation", FT_NONE, BASE_NONE, NULL, 0, "ansi_map.CDMACodeChannelInformation", HFILL }}, { &hf_ansi_map_cdmaPilotStrength, @@ -18353,7 +18353,7 @@ void proto_register_ansi_map(void) { FT_BYTES, BASE_HEX, NULL, 0, "ansi_map.CDMATargetOneWayDelay", HFILL }}, { &hf_ansi_map_CDMATargetMAHOList_item, - { "CDMATargetMAHOList", "ansi_map.CDMATargetMAHOList_item", + { "CDMATargetMAHOInformation", "ansi_map.CDMATargetMAHOInformation", FT_NONE, BASE_NONE, NULL, 0, "ansi_map.CDMATargetMAHOInformation", HFILL }}, { &hf_ansi_map_cdmaSignalQuality, @@ -18361,15 +18361,15 @@ void proto_register_ansi_map(void) { FT_BYTES, BASE_HEX, NULL, 0, "ansi_map.CDMASignalQuality", HFILL }}, { &hf_ansi_map_CDMATargetMeasurementList_item, - { "CDMATargetMeasurementList", "ansi_map.CDMATargetMeasurementList_item", + { "CDMATargetMeasurementInformation", "ansi_map.CDMATargetMeasurementInformation", FT_NONE, BASE_NONE, NULL, 0, "ansi_map.CDMATargetMeasurementInformation", HFILL }}, { &hf_ansi_map_TargetMeasurementList_item, - { "TargetMeasurementList", "ansi_map.TargetMeasurementList_item", + { "TargetMeasurementInformation", "ansi_map.TargetMeasurementInformation", FT_NONE, BASE_NONE, NULL, 0, "ansi_map.TargetMeasurementInformation", HFILL }}, { &hf_ansi_map_TerminationList_item, - { "TerminationList", "ansi_map.TerminationList_item", + { "TerminationList item", "ansi_map.TerminationList_item", FT_UINT32, BASE_DEC, VALS(ansi_map_TerminationList_item_vals), 0, "ansi_map.TerminationList_item", HFILL }}, { &hf_ansi_map_intersystemTermination, @@ -18385,11 +18385,11 @@ void proto_register_ansi_map(void) { FT_NONE, BASE_NONE, NULL, 0, "ansi_map.PSTNTermination", HFILL }}, { &hf_ansi_map_CDMABandClassList_item, - { "CDMABandClassList", "ansi_map.CDMABandClassList_item", + { "CDMABandClassInformation", "ansi_map.CDMABandClassInformation", FT_NONE, BASE_NONE, NULL, 0, "ansi_map.CDMABandClassInformation", HFILL }}, { &hf_ansi_map_CDMAServiceOptionList_item, - { "CDMAServiceOptionList", "ansi_map.CDMAServiceOptionList_item", + { "CDMAServiceOption", "ansi_map.CDMAServiceOption", FT_BYTES, BASE_HEX, NULL, 0, "ansi_map.CDMAServiceOption", HFILL }}, { &hf_ansi_map_pSID_RSIDInformation1, @@ -18413,7 +18413,7 @@ void proto_register_ansi_map(void) { FT_BYTES, BASE_HEX, NULL, 0, "ansi_map.CDMAServiceOptionConnectionIdentifier", HFILL }}, { &hf_ansi_map_CDMAConnectionReferenceList_item, - { "CDMAConnectionReferenceList", "ansi_map.CDMAConnectionReferenceList_item", + { "CDMAConnectionReferenceList item", "ansi_map.CDMAConnectionReferenceList_item", FT_NONE, BASE_NONE, NULL, 0, "ansi_map.CDMAConnectionReferenceList_item", HFILL }}, { &hf_ansi_map_cdmaConnectionReferenceInformation, @@ -18429,7 +18429,7 @@ void proto_register_ansi_map(void) { FT_BYTES, BASE_HEX, NULL, 0, "ansi_map.AnalogRedirectInfo", HFILL }}, { &hf_ansi_map_CDMAChannelNumberList_item, - { "CDMAChannelNumberList", "ansi_map.CDMAChannelNumberList_item", + { "CDMAChannelNumberList item", "ansi_map.CDMAChannelNumberList_item", FT_NONE, BASE_NONE, NULL, 0, "ansi_map.CDMAChannelNumberList_item", HFILL }}, { &hf_ansi_map_cdmaChannelNumber, @@ -18457,7 +18457,7 @@ void proto_register_ansi_map(void) { FT_BYTES, BASE_HEX, NULL, 0, "ansi_map.DataValue", HFILL }}, { &hf_ansi_map_DataAccessElementList_item, - { "DataAccessElementList", "ansi_map.DataAccessElementList_item", + { "DataAccessElementList item", "ansi_map.DataAccessElementList_item", FT_NONE, BASE_NONE, NULL, 0, "ansi_map.DataAccessElementList_item", HFILL }}, { &hf_ansi_map_dataAccessElement1, @@ -18473,7 +18473,7 @@ void proto_register_ansi_map(void) { FT_UINT32, BASE_DEC, VALS(ansi_map_DataResult_vals), 0, "ansi_map.DataResult", HFILL }}, { &hf_ansi_map_DataUpdateResultList_item, - { "DataUpdateResultList", "ansi_map.DataUpdateResultList_item", + { "DataUpdateResult", "ansi_map.DataUpdateResult", FT_NONE, BASE_NONE, NULL, 0, "ansi_map.DataUpdateResult", HFILL }}, { &hf_ansi_map_globalTitle, @@ -18497,7 +18497,7 @@ void proto_register_ansi_map(void) { FT_UINT32, BASE_DEC, VALS(ansi_map_AllOrNone_vals), 0, "ansi_map.AllOrNone", HFILL }}, { &hf_ansi_map_ModificationRequestList_item, - { "ModificationRequestList", "ansi_map.ModificationRequestList_item", + { "ModificationRequest", "ansi_map.ModificationRequest", FT_NONE, BASE_NONE, NULL, 0, "ansi_map.ModificationRequest", HFILL }}, { &hf_ansi_map_serviceDataResultList, @@ -18505,11 +18505,11 @@ void proto_register_ansi_map(void) { FT_UINT32, BASE_DEC, NULL, 0, "ansi_map.ServiceDataResultList", HFILL }}, { &hf_ansi_map_ModificationResultList_item, - { "ModificationResultList", "ansi_map.ModificationResultList_item", + { "ModificationResult", "ansi_map.ModificationResult", FT_UINT32, BASE_DEC, VALS(ansi_map_ModificationResult_vals), 0, "ansi_map.ModificationResult", HFILL }}, { &hf_ansi_map_ServiceDataAccessElementList_item, - { "ServiceDataAccessElementList", "ansi_map.ServiceDataAccessElementList_item", + { "ServiceDataAccessElement", "ansi_map.ServiceDataAccessElement", FT_NONE, BASE_NONE, NULL, 0, "ansi_map.ServiceDataAccessElement", HFILL }}, { &hf_ansi_map_dataUpdateResultList, @@ -18517,7 +18517,7 @@ void proto_register_ansi_map(void) { FT_UINT32, BASE_DEC, NULL, 0, "ansi_map.DataUpdateResultList", HFILL }}, { &hf_ansi_map_ServiceDataResultList_item, - { "ServiceDataResultList", "ansi_map.ServiceDataResultList_item", + { "ServiceDataResult", "ansi_map.ServiceDataResult", FT_NONE, BASE_NONE, NULL, 0, "ansi_map.ServiceDataResult", HFILL }}, { &hf_ansi_map_triggerList, @@ -18541,7 +18541,7 @@ void proto_register_ansi_map(void) { FT_BYTES, BASE_HEX, NULL, 0, "ansi_map.WINOperationsCapability", HFILL }}, { &hf_ansi_map_CallRecoveryIDList_item, - { "CallRecoveryIDList", "ansi_map.CallRecoveryIDList_item", + { "CallRecoveryID", "ansi_map.CallRecoveryID", FT_NONE, BASE_NONE, NULL, 0, "ansi_map.CallRecoveryID", HFILL }}, { &hf_ansi_map_generalizedTime, @@ -18573,7 +18573,7 @@ void proto_register_ansi_map(void) { FT_UINT32, BASE_DEC, VALS(ansi_map_ServiceManagementSystemGapInterval_vals), 0, "ansi_map.ServiceManagementSystemGapInterval", HFILL }}, { &hf_ansi_map_CDMAPSMMList_item, - { "CDMAPSMMList", "ansi_map.CDMAPSMMList_item", + { "CDMAPSMMList item", "ansi_map.CDMAPSMMList_item", FT_NONE, BASE_NONE, NULL, 0, "ansi_map.CDMAPSMMList_item", HFILL }}, { &hf_ansi_map_cdmaTargetMAHOList2, diff --git a/epan/dissectors/packet-ansi_map.h b/epan/dissectors/packet-ansi_map.h index c84e5a1a37..af25f1ca22 100644 --- a/epan/dissectors/packet-ansi_map.h +++ b/epan/dissectors/packet-ansi_map.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-ansi_map.h */ -/* ../../tools/asn2wrs.py -b -p ansi_map -c ansi_map.cnf -s packet-ansi_map-template ansi_map.asn */ +/* ../../tools/asn2wrs.py -b -p ansi_map -c ./ansi_map.cnf -s ./packet-ansi_map-template -D . ansi_map.asn */ /* Input file: packet-ansi_map-template.h */ diff --git a/epan/dissectors/packet-ansi_tcap.c b/epan/dissectors/packet-ansi_tcap.c index 37abcf429d..2ea6b427d0 100644 --- a/epan/dissectors/packet-ansi_tcap.c +++ b/epan/dissectors/packet-ansi_tcap.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-ansi_tcap.c */ -/* ../../tools/asn2wrs.py -b -p ansi_tcap -c ansi_tcap.cnf -s packet-ansi_tcap-template TCAP-Remote-Operations-Information-Objects.asn TCAPPackage.asn */ +/* ../../tools/asn2wrs.py -b -p ansi_tcap -c ./ansi_tcap.cnf -s ./packet-ansi_tcap-template -D . TCAP-Remote-Operations-Information-Objects.asn TCAPPackage.asn */ /* Input file: packet-ansi_tcap-template.c */ @@ -1536,7 +1536,7 @@ proto_register_ansi_tcap(void) FT_NONE, BASE_NONE, NULL, 0, "ansi_tcap.Confidentiality", HFILL }}, { &hf_ansi_tcap__untag_item, - { "_untag", "ansi_tcap._untag_item", + { "_untag item", "ansi_tcap._untag_item", FT_NONE, BASE_NONE, NULL, 0, "ansi_tcap.EXTERNAL", HFILL }}, { &hf_ansi_tcap_confidentialityId, @@ -1552,7 +1552,7 @@ proto_register_ansi_tcap(void) FT_OID, BASE_NONE, NULL, 0, "ansi_tcap.OBJECT_IDENTIFIER", HFILL }}, { &hf_ansi_tcap__untag_item_01, - { "_untag", "ansi_tcap._untag_item", + { "ComponentPDU", "ansi_tcap.ComponentPDU", FT_UINT32, BASE_DEC, VALS(ansi_tcap_ComponentPDU_vals), 0, "ansi_tcap.ComponentPDU", HFILL }}, { &hf_ansi_tcap_invokeLast, diff --git a/epan/dissectors/packet-ansi_tcap.h b/epan/dissectors/packet-ansi_tcap.h index 37d293ff7a..ba905f3e73 100644 --- a/epan/dissectors/packet-ansi_tcap.h +++ b/epan/dissectors/packet-ansi_tcap.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-ansi_tcap.h */ -/* ../../tools/asn2wrs.py -b -p ansi_tcap -c ansi_tcap.cnf -s packet-ansi_tcap-template TCAP-Remote-Operations-Information-Objects.asn TCAPPackage.asn */ +/* ../../tools/asn2wrs.py -b -p ansi_tcap -c ./ansi_tcap.cnf -s ./packet-ansi_tcap-template -D . TCAP-Remote-Operations-Information-Objects.asn TCAPPackage.asn */ /* Input file: packet-ansi_tcap-template.h */ diff --git a/epan/dissectors/packet-camel.c b/epan/dissectors/packet-camel.c index 202c846dfd..3ab8bd3202 100644 --- a/epan/dissectors/packet-camel.c +++ b/epan/dissectors/packet-camel.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-camel.c */ -/* ../../tools/asn2wrs.py -b -L -p camel -c camel.cnf -s packet-camel-template TCAPMessages.asn CAP-object-identifiers.asn CAP-classes.asn CAP-datatypes.asn CAP-errorcodes.asn CAP-errortypes.asn CAP-operationcodes.asn CAP-GPRS-ReferenceNumber.asn CAP-gsmSCF-gsmSRF-ops-args.asn CAP-gsmSSF-gsmSCF-ops-args.asn CAP-gprsSSF-gsmSCF-ops-args.asn CAP-SMS-ops-args.asn CAP-U-ABORT-Data.asn ../ros/Remote-Operations-Information-Objects.asn ../ros/Remote-Operations-Generic-ROS-PDUs.asn */ +/* ../../tools/asn2wrs.py -b -L -p camel -c ./camel.cnf -s ./packet-camel-template -D . TCAPMessages.asn CAP-object-identifiers.asn CAP-classes.asn CAP-datatypes.asn CAP-errorcodes.asn CAP-errortypes.asn CAP-operationcodes.asn CAP-GPRS-ReferenceNumber.asn CAP-gsmSCF-gsmSRF-ops-args.asn CAP-gsmSSF-gsmSCF-ops-args.asn CAP-gprsSSF-gsmSCF-ops-args.asn CAP-SMS-ops-args.asn CAP-U-ABORT-Data.asn ../ros/Remote-Operations-Information-Objects.asn ../ros/Remote-Operations-Generic-ROS-PDUs.asn */ /* Input file: packet-camel-template.c */ @@ -7923,7 +7923,7 @@ void proto_register_camel(void) { FT_NONE, BASE_NONE, NULL, 0, "camel.AOCGPRS", HFILL }}, { &hf_camel_ChangeOfPositionControlInfo_item, - { "ChangeOfPositionControlInfo", "camel.ChangeOfPositionControlInfo_item", + { "ChangeOfLocation", "camel.ChangeOfLocation", FT_UINT32, BASE_DEC, VALS(camel_ChangeOfLocation_vals), 0, "camel.ChangeOfLocation", HFILL }}, { &hf_camel_cellGlobalId, @@ -8035,7 +8035,7 @@ void proto_register_camel(void) { FT_BYTES, BASE_HEX, NULL, 0, "camel.ScfID", HFILL }}, { &hf_camel_DestinationRoutingAddress_item, - { "DestinationRoutingAddress", "camel.DestinationRoutingAddress_item", + { "CalledPartyNumber", "camel.CalledPartyNumber", FT_BYTES, BASE_HEX, NULL, 0, "camel.CalledPartyNumber", HFILL }}, { &hf_camel_applicationTimer, @@ -8295,7 +8295,7 @@ void proto_register_camel(void) { FT_NONE, BASE_NONE, NULL, 0, "camel.T_t_smsDeliverySpecificInfo", HFILL }}, { &hf_camel_Extensions_item, - { "Extensions", "camel.Extensions_item", + { "ExtensionField", "camel.ExtensionField", FT_NONE, BASE_NONE, NULL, 0, "camel.ExtensionField", HFILL }}, { &hf_camel_type, @@ -8335,7 +8335,7 @@ void proto_register_camel(void) { FT_UINT32, BASE_DEC, VALS(camel_InformationToSend_vals), 0, "camel.InformationToSend", HFILL }}, { &hf_camel_GenericNumbers_item, - { "GenericNumbers", "camel.GenericNumbers_item", + { "GenericNumber", "camel.GenericNumber", FT_BYTES, BASE_HEX, NULL, 0, "camel.GenericNumber", HFILL }}, { &hf_camel_short_QoS_format, @@ -8495,7 +8495,7 @@ void proto_register_camel(void) { FT_UINT32, BASE_DEC, NULL, 0, "camel.SEQUENCE_SIZE_1_bound__numOfMessageIDs_OF_Integer4", HFILL }}, { &hf_camel_elementaryMessageIDs_item, - { "elementaryMessageIDs", "camel.elementaryMessageIDs_item", + { "Integer4", "camel.Integer4", FT_UINT32, BASE_DEC, NULL, 0, "inap.Integer4", HFILL }}, { &hf_camel_variableMessage, @@ -8507,11 +8507,11 @@ void proto_register_camel(void) { FT_UINT32, BASE_DEC, NULL, 0, "camel.SEQUENCE_SIZE_1_5_OF_VariablePart", HFILL }}, { &hf_camel_variableParts_item, - { "variableParts", "camel.variableParts_item", + { "VariablePart", "camel.VariablePart", FT_UINT32, BASE_DEC, VALS(camel_VariablePart_vals), 0, "camel.VariablePart", HFILL }}, { &hf_camel_MetDPCriteriaList_item, - { "MetDPCriteriaList", "camel.MetDPCriteriaList_item", + { "MetDPCriterion", "camel.MetDPCriterion", FT_UINT32, BASE_DEC, VALS(camel_MetDPCriterion_vals), 0, "camel.MetDPCriterion", HFILL }}, { &hf_camel_enteringCellGlobalId, @@ -8587,11 +8587,11 @@ void proto_register_camel(void) { FT_BYTES, BASE_HEX, NULL, 0, "camel.LegType", HFILL }}, { &hf_camel_RequestedInformationList_item, - { "RequestedInformationList", "camel.RequestedInformationList_item", + { "RequestedInformation", "camel.RequestedInformation", FT_NONE, BASE_NONE, NULL, 0, "camel.RequestedInformation", HFILL }}, { &hf_camel_RequestedInformationTypeList_item, - { "RequestedInformationTypeList", "camel.RequestedInformationTypeList_item", + { "RequestedInformationType", "camel.RequestedInformationType", FT_UINT32, BASE_DEC, VALS(camel_RequestedInformationType_vals), 0, "camel.RequestedInformationType", HFILL }}, { &hf_camel_requestedInformationType, @@ -9095,7 +9095,7 @@ void proto_register_camel(void) { FT_UINT32, BASE_DEC, NULL, 0, "camel.SEQUENCE_SIZE_1_bound__numOfBCSMEvents_OF_BCSMEvent", HFILL }}, { &hf_camel_bcsmEvents_item, - { "bcsmEvents", "camel.bcsmEvents_item", + { "BCSMEvent", "camel.BCSMEvent", FT_NONE, BASE_NONE, NULL, 0, "camel.BCSMEvent", HFILL }}, { &hf_camel_timerID, @@ -9171,7 +9171,7 @@ void proto_register_camel(void) { FT_UINT32, BASE_DEC, NULL, 0, "camel.SEQUENCE_SIZE_1_bound__numOfGPRSEvents_OF_GPRSEvent", HFILL }}, { &hf_camel_gPRSEvent_item, - { "gPRSEvent", "camel.gPRSEvent_item", + { "GPRSEvent", "camel.GPRSEvent", FT_NONE, BASE_NONE, NULL, 0, "camel.GPRSEvent", HFILL }}, { &hf_camel_sCIGPRSBillingChargingCharacteristics, @@ -9231,7 +9231,7 @@ void proto_register_camel(void) { FT_UINT32, BASE_DEC, NULL, 0, "camel.SEQUENCE_SIZE_1_bound__numOfSMSEvents_OF_SMSEvent", HFILL }}, { &hf_camel_sMSEvents_item, - { "sMSEvents", "camel.sMSEvents_item", + { "SMSEvent", "camel.SMSEvent", FT_NONE, BASE_NONE, NULL, 0, "camel.SMSEvent", HFILL }}, { &hf_camel_local, diff --git a/epan/dissectors/packet-camel.h b/epan/dissectors/packet-camel.h index a2b0ccbf5a..f1249ade16 100644 --- a/epan/dissectors/packet-camel.h +++ b/epan/dissectors/packet-camel.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-camel.h */ -/* ../../tools/asn2wrs.py -b -L -p camel -c camel.cnf -s packet-camel-template TCAPMessages.asn CAP-object-identifiers.asn CAP-classes.asn CAP-datatypes.asn CAP-errorcodes.asn CAP-errortypes.asn CAP-operationcodes.asn CAP-GPRS-ReferenceNumber.asn CAP-gsmSCF-gsmSRF-ops-args.asn CAP-gsmSSF-gsmSCF-ops-args.asn CAP-gprsSSF-gsmSCF-ops-args.asn CAP-SMS-ops-args.asn CAP-U-ABORT-Data.asn ../ros/Remote-Operations-Information-Objects.asn ../ros/Remote-Operations-Generic-ROS-PDUs.asn */ +/* ../../tools/asn2wrs.py -b -L -p camel -c ./camel.cnf -s ./packet-camel-template -D . TCAPMessages.asn CAP-object-identifiers.asn CAP-classes.asn CAP-datatypes.asn CAP-errorcodes.asn CAP-errortypes.asn CAP-operationcodes.asn CAP-GPRS-ReferenceNumber.asn CAP-gsmSCF-gsmSRF-ops-args.asn CAP-gsmSSF-gsmSCF-ops-args.asn CAP-gprsSSF-gsmSCF-ops-args.asn CAP-SMS-ops-args.asn CAP-U-ABORT-Data.asn ../ros/Remote-Operations-Information-Objects.asn ../ros/Remote-Operations-Generic-ROS-PDUs.asn */ /* Input file: packet-camel-template.h */ diff --git a/epan/dissectors/packet-charging_ase.c b/epan/dissectors/packet-charging_ase.c index 4f8780ef0b..a6cfedd042 100644 --- a/epan/dissectors/packet-charging_ase.c +++ b/epan/dissectors/packet-charging_ase.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-charging_ase.c */ -/* ../../tools/asn2wrs.py -b -e -p charging_ase -c charging_ase.cnf -s packet-charging_ase-template Tariffing-Data-Types.asn */ +/* ../../tools/asn2wrs.py -b -e -p charging_ase -c ./charging_ase.cnf -s ./packet-charging_ase-template -D . Tariffing-Data-Types.asn */ /* Input file: packet-charging_ase-template.c */ @@ -909,7 +909,7 @@ proto_register_charging_ase(void) FT_UINT32, BASE_DEC, NULL, 0, "charging_ase.SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField", HFILL }}, { &hf_charging_ase_extensions_item, - { "extensions", "charging_ase.extensions_item", + { "ExtensionField", "charging_ase.ExtensionField", FT_NONE, BASE_NONE, NULL, 0, "charging_ase.ExtensionField", HFILL }}, { &hf_charging_ase_originationIdentification, @@ -1005,7 +1005,7 @@ proto_register_charging_ase(void) FT_UINT32, BASE_DEC, NULL, 0, "charging_ase.SEQUENCE_SIZE_1_maxNetworkOperators_OF_NetworkIdentification", HFILL }}, { &hf_charging_ase_networkOperators_item, - { "networkOperators", "charging_ase.networkOperators_item", + { "NetworkIdentification", "charging_ase.NetworkIdentification", FT_OID, BASE_NONE, NULL, 0, "charging_ase.NetworkIdentification", HFILL }}, { &hf_charging_ase_stopIndicators, @@ -1033,7 +1033,7 @@ proto_register_charging_ase(void) FT_UINT32, BASE_DEC, NULL, 0, "charging_ase.SEQUENCE_SIZE_minCommunicationTariffNum_maxCommunicationTariffNum_OF_CommunicationChargeCurrency", HFILL }}, { &hf_charging_ase_communicationChargeSequenceCurrency_item, - { "communicationChargeSequenceCurrency", "charging_ase.communicationChargeSequenceCurrency_item", + { "CommunicationChargeCurrency", "charging_ase.CommunicationChargeCurrency", FT_NONE, BASE_NONE, NULL, 0, "charging_ase.CommunicationChargeCurrency", HFILL }}, { &hf_charging_ase_tariffControlIndicators, @@ -1065,7 +1065,7 @@ proto_register_charging_ase(void) FT_UINT32, BASE_DEC, NULL, 0, "charging_ase.SEQUENCE_SIZE_minCommunicationTariffNum_maxCommunicationTariffNum_OF_CommunicationChargePulse", HFILL }}, { &hf_charging_ase_communicationChargeSequencePulse_item, - { "communicationChargeSequencePulse", "charging_ase.communicationChargeSequencePulse_item", + { "CommunicationChargePulse", "charging_ase.CommunicationChargePulse", FT_NONE, BASE_NONE, NULL, 0, "charging_ase.CommunicationChargePulse", HFILL }}, { &hf_charging_ase_tariffControlIndicators_01, diff --git a/epan/dissectors/packet-charging_ase.h b/epan/dissectors/packet-charging_ase.h index 53a1d38065..3425785a31 100644 --- a/epan/dissectors/packet-charging_ase.h +++ b/epan/dissectors/packet-charging_ase.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-charging_ase.h */ -/* ../../tools/asn2wrs.py -b -e -p charging_ase -c charging_ase.cnf -s packet-charging_ase-template Tariffing-Data-Types.asn */ +/* ../../tools/asn2wrs.py -b -e -p charging_ase -c ./charging_ase.cnf -s ./packet-charging_ase-template -D . Tariffing-Data-Types.asn */ /* Input file: packet-charging_ase-template.h */ diff --git a/epan/dissectors/packet-cmip.c b/epan/dissectors/packet-cmip.c index 4da5a9c2a6..ed887a748d 100644 --- a/epan/dissectors/packet-cmip.c +++ b/epan/dissectors/packet-cmip.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-cmip.c */ -/* ../../tools/asn2wrs.py -b -e -p cmip -c cmip.cnf -s packet-cmip-template CMIP-1.asn CMIP-A-ABORT-Information.asn CMIP-A-ASSOCIATE-Information.asn ../x721/Attribute-ASN1Module.asn ../ros/Remote-Operations-Information-Objects.asn ../ros/Remote-Operations-Generic-ROS-PDUs.asn */ +/* ../../tools/asn2wrs.py -b -e -p cmip -c ./cmip.cnf -s ./packet-cmip-template -D . CMIP-1.asn CMIP-A-ABORT-Information.asn CMIP-A-ASSOCIATE-Information.asn ../x721/Attribute-ASN1Module.asn ../ros/Remote-Operations-Information-Objects.asn ../ros/Remote-Operations-Generic-ROS-PDUs.asn */ /* Input file: packet-cmip-template.c */ @@ -4733,7 +4733,7 @@ void proto_register_cmip(void) { FT_UINT32, BASE_DEC, NULL, 0, "cmip.WeekMask", HFILL }}, { &hf_cmip_PAR_missingAttributeValue_item, - { "PAR-missingAttributeValue", "cmip.PAR_missingAttributeValue_item", + { "AttributeId", "cmip.AttributeId", FT_UINT32, BASE_DEC, VALS(cmip_AttributeId_vals), 0, "cmip.AttributeId", HFILL }}, { &hf_cmip_managedObjectClass, @@ -4853,7 +4853,7 @@ void proto_register_cmip(void) { FT_UINT32, BASE_DEC, NULL, 0, "cmip.SET_OF_CMISFilter", HFILL }}, { &hf_cmip_and_item, - { "and", "cmip.and_item", + { "CMISFilter", "cmip.CMISFilter", FT_UINT32, BASE_DEC, VALS(cmip_CMISFilter_vals), 0, "cmip.CMISFilter", HFILL }}, { &hf_cmip_or, @@ -4861,7 +4861,7 @@ void proto_register_cmip(void) { FT_UINT32, BASE_DEC, NULL, 0, "cmip.SET_OF_CMISFilter", HFILL }}, { &hf_cmip_or_item, - { "or", "cmip.or_item", + { "CMISFilter", "cmip.CMISFilter", FT_UINT32, BASE_DEC, VALS(cmip_CMISFilter_vals), 0, "cmip.CMISFilter", HFILL }}, { &hf_cmip_not, @@ -4901,7 +4901,7 @@ void proto_register_cmip(void) { FT_UINT32, BASE_DEC, NULL, 0, "cmip.SET_OF_Attribute", HFILL }}, { &hf_cmip_attributeList_item, - { "attributeList", "cmip.attributeList_item", + { "Attribute", "cmip.Attribute", FT_NONE, BASE_NONE, NULL, 0, "cmip.Attribute", HFILL }}, { &hf_cmip_deleteErrorInfo, @@ -4941,7 +4941,7 @@ void proto_register_cmip(void) { FT_UINT32, BASE_DEC, NULL, 0, "cmip.T_substrings", HFILL }}, { &hf_cmip_substrings_item, - { "substrings", "cmip.substrings_item", + { "substrings item", "cmip.substrings_item", FT_UINT32, BASE_DEC, VALS(cmip_T_substrings_item_vals), 0, "cmip.T_substrings_item", HFILL }}, { &hf_cmip_initialString, @@ -4993,7 +4993,7 @@ void proto_register_cmip(void) { FT_UINT32, BASE_DEC, NULL, 0, "cmip.SET_OF_GetInfoStatus", HFILL }}, { &hf_cmip_getInfoList_item, - { "getInfoList", "cmip.getInfoList_item", + { "GetInfoStatus", "cmip.GetInfoStatus", FT_UINT32, BASE_DEC, VALS(cmip_GetInfoStatus_vals), 0, "cmip.GetInfoStatus", HFILL }}, { &hf_cmip_actionValue, @@ -5077,11 +5077,11 @@ void proto_register_cmip(void) { FT_NONE, BASE_NONE, NULL, 0, "cmip.SpecificErrorInfo", HFILL }}, { &hf_cmip_RDNSequence_item, - { "RDNSequence", "cmip.RDNSequence_item", + { "RelativeDistinguishedName", "cmip.RelativeDistinguishedName", FT_UINT32, BASE_DEC, NULL, 0, "cmip.RelativeDistinguishedName", HFILL }}, { &hf_cmip_RelativeDistinguishedName_item, - { "RelativeDistinguishedName", "cmip.RelativeDistinguishedName_item", + { "AttributeValueAssertion", "cmip.AttributeValueAssertion", FT_NONE, BASE_NONE, NULL, 0, "cmip.AttributeValueAssertion", HFILL }}, { &hf_cmip_namedNumbers, @@ -5105,7 +5105,7 @@ void proto_register_cmip(void) { FT_UINT32, BASE_DEC, NULL, 0, "cmip.SET_OF_SetInfoStatus", HFILL }}, { &hf_cmip_setInfoList_item, - { "setInfoList", "cmip.setInfoList_item", + { "SetInfoStatus", "cmip.SetInfoStatus", FT_UINT32, BASE_DEC, VALS(cmip_SetInfoStatus_vals), 0, "cmip.SetInfoStatus", HFILL }}, { &hf_cmip_errorId, @@ -5137,23 +5137,23 @@ void proto_register_cmip(void) { FT_NONE, BASE_NONE, NULL, 0, "cmip.EXTERNAL", HFILL }}, { &hf_cmip_AdditionalInformation_item, - { "AdditionalInformation", "cmip.AdditionalInformation_item", + { "ManagementExtension", "cmip.ManagementExtension", FT_NONE, BASE_NONE, NULL, 0, "cmip.ManagementExtension", HFILL }}, { &hf_cmip_Allomorphs_item, - { "Allomorphs", "cmip.Allomorphs_item", + { "ObjectClass", "cmip.ObjectClass", FT_UINT32, BASE_DEC, VALS(cmip_ObjectClass_vals), 0, "cmip.ObjectClass", HFILL }}, { &hf_cmip_AttributeIdentifierList_item, - { "AttributeIdentifierList", "cmip.AttributeIdentifierList_item", + { "AttributeId", "cmip.AttributeId", FT_UINT32, BASE_DEC, VALS(cmip_AttributeId_vals), 0, "cmip.AttributeId", HFILL }}, { &hf_cmip_AttributeList_item, - { "AttributeList", "cmip.AttributeList_item", + { "Attribute", "cmip.Attribute", FT_NONE, BASE_NONE, NULL, 0, "cmip.Attribute", HFILL }}, { &hf_cmip_AttributeValueChangeDefinition_item, - { "AttributeValueChangeDefinition", "cmip.AttributeValueChangeDefinition_item", + { "AttributeValueChangeDefinition item", "cmip.AttributeValueChangeDefinition_item", FT_NONE, BASE_NONE, NULL, 0, "cmip.AttributeValueChangeDefinition_item", HFILL }}, { &hf_cmip_oldAttributeValue, @@ -5165,15 +5165,15 @@ void proto_register_cmip(void) { FT_NONE, BASE_NONE, NULL, 0, "cmip.T_newAttributeValue", HFILL }}, { &hf_cmip_AlarmStatus_item, - { "AlarmStatus", "cmip.AlarmStatus_item", + { "AlarmStatus item", "cmip.AlarmStatus_item", FT_INT32, BASE_DEC, VALS(cmip_AlarmStatus_item_vals), 0, "cmip.AlarmStatus_item", HFILL }}, { &hf_cmip_AvailabilityStatus_item, - { "AvailabilityStatus", "cmip.AvailabilityStatus_item", + { "AvailabilityStatus item", "cmip.AvailabilityStatus_item", FT_INT32, BASE_DEC, VALS(cmip_AvailabilityStatus_item_vals), 0, "cmip.AvailabilityStatus_item", HFILL }}, { &hf_cmip_BackUpDestinationList_item, - { "BackUpDestinationList", "cmip.BackUpDestinationList_item", + { "AE-title", "cmip.AE_title", FT_UINT32, BASE_DEC, VALS(acse_AE_title_vals), 0, "acse.AE_title", HFILL }}, { &hf_cmip_objectName, @@ -5185,15 +5185,15 @@ void proto_register_cmip(void) { FT_NONE, BASE_NONE, NULL, 0, "cmip.NULL", HFILL }}, { &hf_cmip_CapacityAlarmThreshold_item, - { "CapacityAlarmThreshold", "cmip.CapacityAlarmThreshold_item", + { "CapacityAlarmThreshold item", "cmip.CapacityAlarmThreshold_item", FT_UINT32, BASE_DEC, NULL, 0, "cmip.INTEGER_0_100", HFILL }}, { &hf_cmip_ControlStatus_item, - { "ControlStatus", "cmip.ControlStatus_item", + { "ControlStatus item", "cmip.ControlStatus_item", FT_INT32, BASE_DEC, VALS(cmip_ControlStatus_item_vals), 0, "cmip.ControlStatus_item", HFILL }}, { &hf_cmip_CorrelatedNotifications_item, - { "CorrelatedNotifications", "cmip.CorrelatedNotifications_item", + { "CorrelatedNotifications item", "cmip.CorrelatedNotifications_item", FT_NONE, BASE_NONE, NULL, 0, "cmip.CorrelatedNotifications_item", HFILL }}, { &hf_cmip_correlatedNotifications, @@ -5201,7 +5201,7 @@ void proto_register_cmip(void) { FT_UINT32, BASE_DEC, NULL, 0, "cmip.SET_OF_NotificationIdentifier", HFILL }}, { &hf_cmip_correlatedNotifications_item, - { "correlatedNotifications", "cmip.correlatedNotifications_item", + { "NotificationIdentifier", "cmip.NotificationIdentifier", FT_INT32, BASE_DEC, NULL, 0, "cmip.NotificationIdentifier", HFILL }}, { &hf_cmip_sourceObjectInst, @@ -5217,15 +5217,15 @@ void proto_register_cmip(void) { FT_UINT32, BASE_DEC, NULL, 0, "cmip.SET_OF_AE_title", HFILL }}, { &hf_cmip_multiple_item, - { "multiple", "cmip.multiple_item", + { "AE-title", "cmip.AE_title", FT_UINT32, BASE_DEC, VALS(acse_AE_title_vals), 0, "acse.AE_title", HFILL }}, { &hf_cmip_GroupObjects_item, - { "GroupObjects", "cmip.GroupObjects_item", + { "ObjectInstance", "cmip.ObjectInstance", FT_UINT32, BASE_DEC, VALS(cmip_ObjectInstance_vals), 0, "cmip.ObjectInstance", HFILL }}, { &hf_cmip_IntervalsOfDay_item, - { "IntervalsOfDay", "cmip.IntervalsOfDay_item", + { "IntervalsOfDay item", "cmip.IntervalsOfDay_item", FT_NONE, BASE_NONE, NULL, 0, "cmip.IntervalsOfDay_item", HFILL }}, { &hf_cmip_intervalStart, @@ -5249,7 +5249,7 @@ void proto_register_cmip(void) { FT_NONE, BASE_NONE, NULL, 0, "cmip.T_information", HFILL }}, { &hf_cmip_MonitoredAttributes_item, - { "MonitoredAttributes", "cmip.MonitoredAttributes_item", + { "Attribute", "cmip.Attribute", FT_NONE, BASE_NONE, NULL, 0, "cmip.Attribute", HFILL }}, { &hf_cmip_integer, @@ -5261,11 +5261,11 @@ void proto_register_cmip(void) { FT_DOUBLE, BASE_NONE, NULL, 0, "cmip.REAL", HFILL }}, { &hf_cmip_Packages_item, - { "Packages", "cmip.Packages_item", + { "Packages item", "cmip.Packages_item", FT_OID, BASE_NONE, NULL, 0, "cmip.OBJECT_IDENTIFIER", HFILL }}, { &hf_cmip_PrioritisedObject_item, - { "PrioritisedObject", "cmip.PrioritisedObject_item", + { "PrioritisedObject item", "cmip.PrioritisedObject_item", FT_NONE, BASE_NONE, NULL, 0, "cmip.PrioritisedObject_item", HFILL }}, { &hf_cmip_object, @@ -5285,11 +5285,11 @@ void proto_register_cmip(void) { FT_INT32, BASE_DEC, NULL, 0, "cmip.INTEGER", HFILL }}, { &hf_cmip_ProceduralStatus_item, - { "ProceduralStatus", "cmip.ProceduralStatus_item", + { "ProceduralStatus item", "cmip.ProceduralStatus_item", FT_INT32, BASE_DEC, VALS(cmip_ProceduralStatus_item_vals), 0, "cmip.ProceduralStatus_item", HFILL }}, { &hf_cmip_ProposedRepairActions_item, - { "ProposedRepairActions", "cmip.ProposedRepairActions_item", + { "SpecificIdentifier", "cmip.SpecificIdentifier", FT_UINT32, BASE_DEC, VALS(cmip_SpecificIdentifier_vals), 0, "cmip.SpecificIdentifier", HFILL }}, { &hf_cmip_mechanism, @@ -5325,7 +5325,7 @@ void proto_register_cmip(void) { FT_INT32, BASE_DEC, NULL, 0, "cmip.INTEGER", HFILL }}, { &hf_cmip_SpecificProblems_item, - { "SpecificProblems", "cmip.SpecificProblems_item", + { "SpecificIdentifier", "cmip.SpecificIdentifier", FT_UINT32, BASE_DEC, VALS(cmip_SpecificIdentifier_vals), 0, "cmip.SpecificIdentifier", HFILL }}, { &hf_cmip_specific, @@ -5337,7 +5337,7 @@ void proto_register_cmip(void) { FT_NONE, BASE_NONE, NULL, 0, "cmip.NULL", HFILL }}, { &hf_cmip_SupportedFeatures_item, - { "SupportedFeatures", "cmip.SupportedFeatures_item", + { "SupportedFeatures item", "cmip.SupportedFeatures_item", FT_NONE, BASE_NONE, NULL, 0, "cmip.SupportedFeatures_item", HFILL }}, { &hf_cmip_featureIdentifier, @@ -5401,7 +5401,7 @@ void proto_register_cmip(void) { FT_NONE, BASE_NONE, NULL, 0, "cmip.T_down", HFILL }}, { &hf_cmip_WeekMask_item, - { "WeekMask", "cmip.WeekMask_item", + { "WeekMask item", "cmip.WeekMask_item", FT_NONE, BASE_NONE, NULL, 0, "cmip.WeekMask_item", HFILL }}, { &hf_cmip_daysOfWeek, @@ -5513,7 +5513,7 @@ void proto_register_cmip(void) { FT_UINT32, BASE_DEC, NULL, 0, "cmip.SET_OF_AttributeId", HFILL }}, { &hf_cmip_attributeIdList_item, - { "attributeIdList", "cmip.attributeIdList_item", + { "AttributeId", "cmip.AttributeId", FT_UINT32, BASE_DEC, VALS(cmip_AttributeId_vals), 0, "cmip.AttributeId", HFILL }}, { &hf_cmip_modificationList, @@ -5521,7 +5521,7 @@ void proto_register_cmip(void) { FT_UINT32, BASE_DEC, NULL, 0, "cmip.T_modificationList", HFILL }}, { &hf_cmip_modificationList_item, - { "modificationList", "cmip.modificationList_item", + { "modificationList item", "cmip.modificationList_item", FT_NONE, BASE_NONE, NULL, 0, "cmip.T_modificationList_item", HFILL }}, { &hf_cmip_attributevalue, diff --git a/epan/dissectors/packet-cmip.h b/epan/dissectors/packet-cmip.h index ab3276de76..68918745c6 100644 --- a/epan/dissectors/packet-cmip.h +++ b/epan/dissectors/packet-cmip.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-cmip.h */ -/* ../../tools/asn2wrs.py -b -e -p cmip -c cmip.cnf -s packet-cmip-template CMIP-1.asn CMIP-A-ABORT-Information.asn CMIP-A-ASSOCIATE-Information.asn ../x721/Attribute-ASN1Module.asn ../ros/Remote-Operations-Information-Objects.asn ../ros/Remote-Operations-Generic-ROS-PDUs.asn */ +/* ../../tools/asn2wrs.py -b -e -p cmip -c ./cmip.cnf -s ./packet-cmip-template -D . CMIP-1.asn CMIP-A-ABORT-Information.asn CMIP-A-ASSOCIATE-Information.asn ../x721/Attribute-ASN1Module.asn ../ros/Remote-Operations-Information-Objects.asn ../ros/Remote-Operations-Generic-ROS-PDUs.asn */ /* Input file: packet-cmip-template.h */ diff --git a/epan/dissectors/packet-cmp.c b/epan/dissectors/packet-cmp.c index cb4df8ad26..4c88ef087d 100644 --- a/epan/dissectors/packet-cmp.c +++ b/epan/dissectors/packet-cmp.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-cmp.c */ -/* ../../tools/asn2wrs.py -b -p cmp -c cmp.cnf -s packet-cmp-template CMP.asn */ +/* ../../tools/asn2wrs.py -b -p cmp -c ./cmp.cnf -s ./packet-cmp-template -D . CMP.asn */ /* Input file: packet-cmp-template.c */ @@ -1822,11 +1822,11 @@ void proto_register_cmp(void) { FT_UINT32, BASE_DEC, NULL, 0, "cmp.SEQUENCE_SIZE_1_MAX_OF_CMPCertificate", HFILL }}, { &hf_cmp_extraCerts_item, - { "extraCerts", "cmp.extraCerts_item", + { "CMPCertificate", "cmp.CMPCertificate", FT_UINT32, BASE_DEC, VALS(cmp_CMPCertificate_vals), 0, "cmp.CMPCertificate", HFILL }}, { &hf_cmp_PKIMessages_item, - { "PKIMessages", "cmp.PKIMessages_item", + { "PKIMessage", "cmp.PKIMessage", FT_NONE, BASE_NONE, NULL, 0, "cmp.PKIMessage", HFILL }}, { &hf_cmp_pvno, @@ -1878,11 +1878,11 @@ void proto_register_cmp(void) { FT_UINT32, BASE_DEC, NULL, 0, "cmp.SEQUENCE_SIZE_1_MAX_OF_InfoTypeAndValue", HFILL }}, { &hf_cmp_generalInfo_item, - { "generalInfo", "cmp.generalInfo_item", + { "InfoTypeAndValue", "cmp.InfoTypeAndValue", FT_NONE, BASE_NONE, NULL, 0, "cmp.InfoTypeAndValue", HFILL }}, { &hf_cmp_PKIFreeText_item, - { "PKIFreeText", "cmp.PKIFreeText_item", + { "PKIFreeText item", "cmp.PKIFreeText_item", FT_STRING, BASE_NONE, NULL, 0, "cmp.UTF8String", HFILL }}, { &hf_cmp_ir, @@ -2034,7 +2034,7 @@ void proto_register_cmp(void) { FT_BYTES, BASE_HEX, NULL, 0, "cmp.BIT_STRING", HFILL }}, { &hf_cmp_POPODecKeyChallContent_item, - { "POPODecKeyChallContent", "cmp.POPODecKeyChallContent_item", + { "Challenge", "cmp.Challenge", FT_NONE, BASE_NONE, NULL, 0, "cmp.Challenge", HFILL }}, { &hf_cmp_witness, @@ -2046,7 +2046,7 @@ void proto_register_cmp(void) { FT_BYTES, BASE_HEX, NULL, 0, "cmp.OCTET_STRING", HFILL }}, { &hf_cmp_POPODecKeyRespContent_item, - { "POPODecKeyRespContent", "cmp.POPODecKeyRespContent_item", + { "POPODecKeyRespContent item", "cmp.POPODecKeyRespContent_item", FT_INT32, BASE_DEC, NULL, 0, "cmp.INTEGER", HFILL }}, { &hf_cmp_caPubs, @@ -2054,7 +2054,7 @@ void proto_register_cmp(void) { FT_UINT32, BASE_DEC, NULL, 0, "cmp.SEQUENCE_SIZE_1_MAX_OF_CMPCertificate", HFILL }}, { &hf_cmp_caPubs_item, - { "caPubs", "cmp.caPubs_item", + { "CMPCertificate", "cmp.CMPCertificate", FT_UINT32, BASE_DEC, VALS(cmp_CMPCertificate_vals), 0, "cmp.CMPCertificate", HFILL }}, { &hf_cmp_response, @@ -2062,7 +2062,7 @@ void proto_register_cmp(void) { FT_UINT32, BASE_DEC, NULL, 0, "cmp.SEQUENCE_OF_CertResponse", HFILL }}, { &hf_cmp_response_item, - { "response", "cmp.response_item", + { "CertResponse", "cmp.CertResponse", FT_NONE, BASE_NONE, NULL, 0, "cmp.CertResponse", HFILL }}, { &hf_cmp_certReqId, @@ -2110,7 +2110,7 @@ void proto_register_cmp(void) { FT_UINT32, BASE_DEC, NULL, 0, "cmp.SEQUENCE_SIZE_1_MAX_OF_CMPCertificate", HFILL }}, { &hf_cmp_caCerts_item, - { "caCerts", "cmp.caCerts_item", + { "CMPCertificate", "cmp.CMPCertificate", FT_UINT32, BASE_DEC, VALS(cmp_CMPCertificate_vals), 0, "cmp.CMPCertificate", HFILL }}, { &hf_cmp_keyPairHist, @@ -2118,11 +2118,11 @@ void proto_register_cmp(void) { FT_UINT32, BASE_DEC, NULL, 0, "cmp.SEQUENCE_SIZE_1_MAX_OF_CertifiedKeyPair", HFILL }}, { &hf_cmp_keyPairHist_item, - { "keyPairHist", "cmp.keyPairHist_item", + { "CertifiedKeyPair", "cmp.CertifiedKeyPair", FT_NONE, BASE_NONE, NULL, 0, "cmp.CertifiedKeyPair", HFILL }}, { &hf_cmp_RevReqContent_item, - { "RevReqContent", "cmp.RevReqContent_item", + { "RevDetails", "cmp.RevDetails", FT_NONE, BASE_NONE, NULL, 0, "cmp.RevDetails", HFILL }}, { &hf_cmp_certDetails, @@ -2138,7 +2138,7 @@ void proto_register_cmp(void) { FT_UINT32, BASE_DEC, NULL, 0, "cmp.SEQUENCE_SIZE_1_MAX_OF_PKIStatusInfo", HFILL }}, { &hf_cmp_rvrpcnt_status_item, - { "status", "cmp.status_item", + { "PKIStatusInfo", "cmp.PKIStatusInfo", FT_NONE, BASE_NONE, NULL, 0, "cmp.PKIStatusInfo", HFILL }}, { &hf_cmp_revCerts, @@ -2146,7 +2146,7 @@ void proto_register_cmp(void) { FT_UINT32, BASE_DEC, NULL, 0, "cmp.SEQUENCE_SIZE_1_MAX_OF_CertId", HFILL }}, { &hf_cmp_revCerts_item, - { "revCerts", "cmp.revCerts_item", + { "CertId", "cmp.CertId", FT_NONE, BASE_NONE, NULL, 0, "crmf.CertId", HFILL }}, { &hf_cmp_crls, @@ -2154,7 +2154,7 @@ void proto_register_cmp(void) { FT_UINT32, BASE_DEC, NULL, 0, "cmp.SEQUENCE_SIZE_1_MAX_OF_CertificateList", HFILL }}, { &hf_cmp_crls_item, - { "crls", "cmp.crls_item", + { "CertificateList", "cmp.CertificateList", FT_NONE, BASE_NONE, NULL, 0, "pkix1explicit.CertificateList", HFILL }}, { &hf_cmp_oldWithNew, @@ -2182,11 +2182,11 @@ void proto_register_cmp(void) { FT_UINT32, BASE_DEC, NULL, 0, "pkix1explicit.Extensions", HFILL }}, { &hf_cmp_CRLAnnContent_item, - { "CRLAnnContent", "cmp.CRLAnnContent_item", + { "CertificateList", "cmp.CertificateList", FT_NONE, BASE_NONE, NULL, 0, "pkix1explicit.CertificateList", HFILL }}, { &hf_cmp_CertConfirmContent_item, - { "CertConfirmContent", "cmp.CertConfirmContent_item", + { "CertStatus", "cmp.CertStatus", FT_NONE, BASE_NONE, NULL, 0, "cmp.CertStatus", HFILL }}, { &hf_cmp_certHash, @@ -2206,27 +2206,27 @@ void proto_register_cmp(void) { FT_NONE, BASE_NONE, NULL, 0, "cmp.T_infoValue", HFILL }}, { &hf_cmp_SignKeyPairTypesValue_item, - { "SignKeyPairTypesValue", "cmp.SignKeyPairTypesValue_item", + { "AlgorithmIdentifier", "cmp.AlgorithmIdentifier", FT_NONE, BASE_NONE, NULL, 0, "pkix1explicit.AlgorithmIdentifier", HFILL }}, { &hf_cmp_EncKeyPairTypesValue_item, - { "EncKeyPairTypesValue", "cmp.EncKeyPairTypesValue_item", + { "AlgorithmIdentifier", "cmp.AlgorithmIdentifier", FT_NONE, BASE_NONE, NULL, 0, "pkix1explicit.AlgorithmIdentifier", HFILL }}, { &hf_cmp_UnsupportedOIDsValue_item, - { "UnsupportedOIDsValue", "cmp.UnsupportedOIDsValue_item", + { "UnsupportedOIDsValue item", "cmp.UnsupportedOIDsValue_item", FT_OID, BASE_NONE, NULL, 0, "cmp.OBJECT_IDENTIFIER", HFILL }}, { &hf_cmp_SuppLangTagsValue_item, - { "SuppLangTagsValue", "cmp.SuppLangTagsValue_item", + { "SuppLangTagsValue item", "cmp.SuppLangTagsValue_item", FT_STRING, BASE_NONE, NULL, 0, "cmp.UTF8String", HFILL }}, { &hf_cmp_GenMsgContent_item, - { "GenMsgContent", "cmp.GenMsgContent_item", + { "InfoTypeAndValue", "cmp.InfoTypeAndValue", FT_NONE, BASE_NONE, NULL, 0, "cmp.InfoTypeAndValue", HFILL }}, { &hf_cmp_GenRepContent_item, - { "GenRepContent", "cmp.GenRepContent_item", + { "InfoTypeAndValue", "cmp.InfoTypeAndValue", FT_NONE, BASE_NONE, NULL, 0, "cmp.InfoTypeAndValue", HFILL }}, { &hf_cmp_pKIStatusInfo, @@ -2242,11 +2242,11 @@ void proto_register_cmp(void) { FT_UINT32, BASE_DEC, NULL, 0, "cmp.PKIFreeText", HFILL }}, { &hf_cmp_PollReqContent_item, - { "PollReqContent", "cmp.PollReqContent_item", + { "PollReqContent item", "cmp.PollReqContent_item", FT_NONE, BASE_NONE, NULL, 0, "cmp.PollReqContent_item", HFILL }}, { &hf_cmp_PollRepContent_item, - { "PollRepContent", "cmp.PollRepContent_item", + { "PollRepContent item", "cmp.PollRepContent_item", FT_NONE, BASE_NONE, NULL, 0, "cmp.PollRepContent_item", HFILL }}, { &hf_cmp_checkAfter, diff --git a/epan/dissectors/packet-cmp.h b/epan/dissectors/packet-cmp.h index 12cd23fdca..c4e48730c4 100644 --- a/epan/dissectors/packet-cmp.h +++ b/epan/dissectors/packet-cmp.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-cmp.h */ -/* ../../tools/asn2wrs.py -b -p cmp -c cmp.cnf -s packet-cmp-template CMP.asn */ +/* ../../tools/asn2wrs.py -b -p cmp -c ./cmp.cnf -s ./packet-cmp-template -D . CMP.asn */ /* Input file: packet-cmp-template.h */ diff --git a/epan/dissectors/packet-cms.c b/epan/dissectors/packet-cms.c index 5719964d20..9d6951f9a1 100644 --- a/epan/dissectors/packet-cms.c +++ b/epan/dissectors/packet-cms.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-cms.c */ -/* ../../tools/asn2wrs.py -b -e -p cms -c cms.cnf -s packet-cms-template CryptographicMessageSyntax.asn */ +/* ../../tools/asn2wrs.py -b -e -p cms -c ./cms.cnf -s ./packet-cms-template -D . CryptographicMessageSyntax.asn */ /* Input file: packet-cms-template.c */ @@ -1687,11 +1687,11 @@ void proto_register_cms(void) { FT_UINT32, BASE_DEC, NULL, 0, "cms.SignerInfos", HFILL }}, { &hf_cms_DigestAlgorithmIdentifiers_item, - { "DigestAlgorithmIdentifiers", "cms.DigestAlgorithmIdentifiers_item", + { "DigestAlgorithmIdentifier", "cms.DigestAlgorithmIdentifier", FT_NONE, BASE_NONE, NULL, 0, "cms.DigestAlgorithmIdentifier", HFILL }}, { &hf_cms_SignerInfos_item, - { "SignerInfos", "cms.SignerInfos_item", + { "SignerInfo", "cms.SignerInfo", FT_NONE, BASE_NONE, NULL, 0, "cms.SignerInfo", HFILL }}, { &hf_cms_eContentType, @@ -1735,11 +1735,11 @@ void proto_register_cms(void) { FT_BYTES, BASE_HEX, NULL, 0, "cms.SubjectKeyIdentifier", HFILL }}, { &hf_cms_SignedAttributes_item, - { "SignedAttributes", "cms.SignedAttributes_item", + { "Attribute", "cms.Attribute", FT_NONE, BASE_NONE, NULL, 0, "cms.Attribute", HFILL }}, { &hf_cms_UnsignedAttributes_item, - { "UnsignedAttributes", "cms.UnsignedAttributes_item", + { "Attribute", "cms.Attribute", FT_NONE, BASE_NONE, NULL, 0, "cms.Attribute", HFILL }}, { &hf_cms_attrType, @@ -1751,7 +1751,7 @@ void proto_register_cms(void) { FT_UINT32, BASE_DEC, NULL, 0, "cms.SET_OF_AttributeValue", HFILL }}, { &hf_cms_attrValues_item, - { "attrValues", "cms.attrValues_item", + { "AttributeValue", "cms.AttributeValue", FT_NONE, BASE_NONE, NULL, 0, "cms.AttributeValue", HFILL }}, { &hf_cms_originatorInfo, @@ -1775,7 +1775,7 @@ void proto_register_cms(void) { FT_UINT32, BASE_DEC, NULL, 0, "cms.CertificateSet", HFILL }}, { &hf_cms_RecipientInfos_item, - { "RecipientInfos", "cms.RecipientInfos_item", + { "RecipientInfo", "cms.RecipientInfo", FT_UINT32, BASE_DEC, VALS(cms_RecipientInfo_vals), 0, "cms.RecipientInfo", HFILL }}, { &hf_cms_encryptedContentType, @@ -1791,7 +1791,7 @@ void proto_register_cms(void) { FT_BYTES, BASE_HEX, NULL, 0, "cms.EncryptedContent", HFILL }}, { &hf_cms_UnprotectedAttributes_item, - { "UnprotectedAttributes", "cms.UnprotectedAttributes_item", + { "Attribute", "cms.Attribute", FT_NONE, BASE_NONE, NULL, 0, "cms.Attribute", HFILL }}, { &hf_cms_ktri, @@ -1843,7 +1843,7 @@ void proto_register_cms(void) { FT_BYTES, BASE_HEX, NULL, 0, "cms.BIT_STRING", HFILL }}, { &hf_cms_RecipientEncryptedKeys_item, - { "RecipientEncryptedKeys", "cms.RecipientEncryptedKeys_item", + { "RecipientEncryptedKey", "cms.RecipientEncryptedKey", FT_NONE, BASE_NONE, NULL, 0, "cms.RecipientEncryptedKey", HFILL }}, { &hf_cms_rekRid, @@ -1891,15 +1891,15 @@ void proto_register_cms(void) { FT_UINT32, BASE_DEC, NULL, 0, "cms.UnauthAttributes", HFILL }}, { &hf_cms_AuthAttributes_item, - { "AuthAttributes", "cms.AuthAttributes_item", + { "Attribute", "cms.Attribute", FT_NONE, BASE_NONE, NULL, 0, "cms.Attribute", HFILL }}, { &hf_cms_UnauthAttributes_item, - { "UnauthAttributes", "cms.UnauthAttributes_item", + { "Attribute", "cms.Attribute", FT_NONE, BASE_NONE, NULL, 0, "cms.Attribute", HFILL }}, { &hf_cms_CertificateRevocationLists_item, - { "CertificateRevocationLists", "cms.CertificateRevocationLists_item", + { "CertificateList", "cms.CertificateList", FT_NONE, BASE_NONE, NULL, 0, "x509af.CertificateList", HFILL }}, { &hf_cms_certificate, @@ -1915,7 +1915,7 @@ void proto_register_cms(void) { FT_NONE, BASE_NONE, NULL, 0, "x509af.AttributeCertificate", HFILL }}, { &hf_cms_CertificateSet_item, - { "CertificateSet", "cms.CertificateSet_item", + { "CertificateChoices", "cms.CertificateChoices", FT_UINT32, BASE_DEC, VALS(cms_CertificateChoices_vals), 0, "cms.CertificateChoices", HFILL }}, { &hf_cms_issuer, @@ -1963,7 +1963,7 @@ void proto_register_cms(void) { FT_UINT32, BASE_DEC, NULL, 0, "cms.UnauthAttributes", HFILL }}, { &hf_cms_SMIMECapabilities_item, - { "SMIMECapabilities", "cms.SMIMECapabilities_item", + { "SMIMECapability", "cms.SMIMECapability", FT_NONE, BASE_NONE, NULL, 0, "cms.SMIMECapability", HFILL }}, { &hf_cms_capability, diff --git a/epan/dissectors/packet-cms.h b/epan/dissectors/packet-cms.h index c12015f23b..24e016f6a5 100644 --- a/epan/dissectors/packet-cms.h +++ b/epan/dissectors/packet-cms.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-cms.h */ -/* ../../tools/asn2wrs.py -b -e -p cms -c cms.cnf -s packet-cms-template CryptographicMessageSyntax.asn */ +/* ../../tools/asn2wrs.py -b -e -p cms -c ./cms.cnf -s ./packet-cms-template -D . CryptographicMessageSyntax.asn */ /* Input file: packet-cms-template.h */ diff --git a/epan/dissectors/packet-crmf.c b/epan/dissectors/packet-crmf.c index 224585d5af..0e5ecfdf0e 100644 --- a/epan/dissectors/packet-crmf.c +++ b/epan/dissectors/packet-crmf.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-crmf.c */ -/* ../../tools/asn2wrs.py -b -e -p crmf -c crmf.cnf -s packet-crmf-template CRMF.asn */ +/* ../../tools/asn2wrs.py -b -e -p crmf -c ./crmf.cnf -s ./packet-crmf-template -D . CRMF.asn */ /* Input file: packet-crmf-template.c */ @@ -906,7 +906,7 @@ void proto_register_crmf(void) { FT_NONE, BASE_NONE, NULL, 0, "crmf.EncKeyWithID", HFILL }}, { &hf_crmf_CertReqMessages_item, - { "CertReqMessages", "crmf.CertReqMessages_item", + { "CertReqMsg", "crmf.CertReqMsg", FT_NONE, BASE_NONE, NULL, 0, "crmf.CertReqMsg", HFILL }}, { &hf_crmf_certReq, @@ -922,7 +922,7 @@ void proto_register_crmf(void) { FT_UINT32, BASE_DEC, NULL, 0, "crmf.SEQUENCE_SIZE_1_MAX_OF_AttributeTypeAndValue", HFILL }}, { &hf_crmf_regInfo_item, - { "regInfo", "crmf.regInfo_item", + { "AttributeTypeAndValue", "crmf.AttributeTypeAndValue", FT_NONE, BASE_NONE, NULL, 0, "crmf.AttributeTypeAndValue", HFILL }}, { &hf_crmf_certReqId, @@ -986,7 +986,7 @@ void proto_register_crmf(void) { FT_UINT32, BASE_DEC, VALS(pkix1explicit_Time_vals), 0, "pkix1explicit.Time", HFILL }}, { &hf_crmf_Controls_item, - { "Controls", "crmf.Controls_item", + { "AttributeTypeAndValue", "crmf.AttributeTypeAndValue", FT_NONE, BASE_NONE, NULL, 0, "crmf.AttributeTypeAndValue", HFILL }}, { &hf_crmf_type, @@ -1090,7 +1090,7 @@ void proto_register_crmf(void) { FT_UINT32, BASE_DEC, NULL, 0, "crmf.SEQUENCE_SIZE_1_MAX_OF_SinglePubInfo", HFILL }}, { &hf_crmf_pubInfos_item, - { "pubInfos", "crmf.pubInfos_item", + { "SinglePubInfo", "crmf.SinglePubInfo", FT_NONE, BASE_NONE, NULL, 0, "crmf.SinglePubInfo", HFILL }}, { &hf_crmf_pubMethod, @@ -1182,7 +1182,7 @@ void proto_register_crmf(void) { FT_UINT32, BASE_DEC, NULL, 0, "crmf.Attributes", HFILL }}, { &hf_crmf_Attributes_item, - { "Attributes", "crmf.Attributes_item", + { "Attribute", "crmf.Attribute", FT_NONE, BASE_NONE, NULL, 0, "pkix1explicit.Attribute", HFILL }}, diff --git a/epan/dissectors/packet-crmf.h b/epan/dissectors/packet-crmf.h index 5c8afb41cc..9eba6b7a8f 100644 --- a/epan/dissectors/packet-crmf.h +++ b/epan/dissectors/packet-crmf.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-crmf.h */ -/* ../../tools/asn2wrs.py -b -e -p crmf -c crmf.cnf -s packet-crmf-template CRMF.asn */ +/* ../../tools/asn2wrs.py -b -e -p crmf -c ./crmf.cnf -s ./packet-crmf-template -D . CRMF.asn */ /* Input file: packet-crmf-template.h */ diff --git a/epan/dissectors/packet-dap.c b/epan/dissectors/packet-dap.c index 1f4034c975..1aa2f08f76 100644 --- a/epan/dissectors/packet-dap.c +++ b/epan/dissectors/packet-dap.c @@ -859,7 +859,7 @@ dissect_dap_Name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, a static const ber_sequence_t T_manageDSAITPlaneRef_sequence[] = { { &hf_dap_dsaName , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_dap_Name }, - { &hf_dap_agreementID , -1/*imported*/, -1/*imported*/, BER_FLAGS_NOOWNTAG, dissect_disp_AgreementID }, + { &hf_dap_agreementID , BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_disp_AgreementID }, { NULL, 0, 0, 0, NULL } }; @@ -5012,7 +5012,7 @@ void proto_register_dap(void) { FT_UINT32, BASE_DEC, NULL, 0, "dap.SET_OF_AttributeType", HFILL }}, { &hf_dap_select_item, - { "select", "dap.select_item", + { "AttributeType", "dap.AttributeType", FT_OID, BASE_NONE, NULL, 0, "x509if.AttributeType", HFILL }}, { &hf_dap_infoTypes, @@ -5032,7 +5032,7 @@ void proto_register_dap(void) { FT_UINT32, BASE_DEC, NULL, 0, "dap.SET_SIZE_1_MAX_OF_AttributeType", HFILL }}, { &hf_dap_extraSelect_item, - { "select", "dap.select_item", + { "AttributeType", "dap.AttributeType", FT_OID, BASE_NONE, NULL, 0, "x509if.AttributeType", HFILL }}, { &hf_dap_contextSelection, @@ -5056,7 +5056,7 @@ void proto_register_dap(void) { FT_UINT32, BASE_DEC, NULL, 0, "dap.SET_SIZE_1_MAX_OF_TypeAndContextAssertion", HFILL }}, { &hf_dap_selectedContexts_item, - { "selectedContexts", "dap.selectedContexts_item", + { "TypeAndContextAssertion", "dap.TypeAndContextAssertion", FT_NONE, BASE_NONE, NULL, 0, "dap.TypeAndContextAssertion", HFILL }}, { &hf_dap_type, @@ -5072,7 +5072,7 @@ void proto_register_dap(void) { FT_UINT32, BASE_DEC, NULL, 0, "dap.SEQUENCE_OF_ContextAssertion", HFILL }}, { &hf_dap_preference_item, - { "preference", "dap.preference_item", + { "ContextAssertion", "dap.ContextAssertion", FT_NONE, BASE_NONE, NULL, 0, "x509if.ContextAssertion", HFILL }}, { &hf_dap_all, @@ -5080,7 +5080,7 @@ void proto_register_dap(void) { FT_UINT32, BASE_DEC, NULL, 0, "dap.SET_OF_ContextAssertion", HFILL }}, { &hf_dap_all_item, - { "all", "dap.all_item", + { "ContextAssertion", "dap.ContextAssertion", FT_NONE, BASE_NONE, NULL, 0, "x509if.ContextAssertion", HFILL }}, { &hf_dap_memberSelect, @@ -5092,7 +5092,7 @@ void proto_register_dap(void) { FT_UINT32, BASE_DEC, NULL, 0, "dap.T_familySelect", HFILL }}, { &hf_dap_familySelect_item, - { "familySelect", "dap.familySelect_item", + { "familySelect item", "dap.familySelect_item", FT_OID, BASE_NONE, NULL, 0, "dap.OBJECT_IDENTIFIER", HFILL }}, { &hf_dap_name, @@ -5108,7 +5108,7 @@ void proto_register_dap(void) { FT_UINT32, BASE_DEC, NULL, 0, "dap.T_entry_information", HFILL }}, { &hf_dap_entry_information_item, - { "information", "dap.information_item", + { "information item", "dap.information_item", FT_UINT32, BASE_DEC, VALS(dap_EntryInformationItem_vals), 0, "dap.EntryInformationItem", HFILL }}, { &hf_dap_attributeType, @@ -5140,7 +5140,7 @@ void proto_register_dap(void) { FT_UINT32, BASE_DEC, NULL, 0, "dap.SEQUENCE_OF_FamilyEntry", HFILL }}, { &hf_dap_familyEntries_item, - { "familyEntries", "dap.familyEntries_item", + { "FamilyEntry", "dap.FamilyEntry", FT_NONE, BASE_NONE, NULL, 0, "dap.FamilyEntry", HFILL }}, { &hf_dap_rdn, @@ -5152,7 +5152,7 @@ void proto_register_dap(void) { FT_UINT32, BASE_DEC, NULL, 0, "dap.FamilyInformation", HFILL }}, { &hf_dap_family_information_item, - { "information", "dap.information_item", + { "information item", "dap.information_item", FT_UINT32, BASE_DEC, VALS(dap_T_family_information_item_vals), 0, "dap.T_family_information_item", HFILL }}, { &hf_dap_family_info, @@ -5160,7 +5160,7 @@ void proto_register_dap(void) { FT_UINT32, BASE_DEC, NULL, 0, "dap.SEQUENCE_SIZE_1_MAX_OF_FamilyEntries", HFILL }}, { &hf_dap_family_info_item, - { "family-info", "dap.family_info_item", + { "FamilyEntries", "dap.FamilyEntries", FT_NONE, BASE_NONE, NULL, 0, "dap.FamilyEntries", HFILL }}, { &hf_dap_filter_item, @@ -5180,7 +5180,7 @@ void proto_register_dap(void) { FT_UINT32, BASE_DEC, VALS(dap_Filter_vals), 0, "dap.Filter", HFILL }}, { &hf_dap_SetOfFilter_item, - { "SetOfFilter", "dap.SetOfFilter_item", + { "Filter", "dap.Filter", FT_UINT32, BASE_DEC, VALS(dap_Filter_vals), 0, "dap.Filter", HFILL }}, { &hf_dap_equality, @@ -5200,7 +5200,7 @@ void proto_register_dap(void) { FT_UINT32, BASE_DEC, NULL, 0, "dap.T_strings", HFILL }}, { &hf_dap_strings_item, - { "strings", "dap.strings_item", + { "strings item", "dap.strings_item", FT_UINT32, BASE_DEC, VALS(dap_T_strings_item_vals), 0, "dap.T_strings_item", HFILL }}, { &hf_dap_initial, @@ -5248,7 +5248,7 @@ void proto_register_dap(void) { FT_UINT32, BASE_DEC, NULL, 0, "dap.T_matchingRule", HFILL }}, { &hf_dap_matchingRule_item, - { "matchingRule", "dap.matchingRule_item", + { "matchingRule item", "dap.matchingRule_item", FT_OID, BASE_NONE, NULL, 0, "dap.OBJECT_IDENTIFIER", HFILL }}, { &hf_dap_matchValue, @@ -5272,7 +5272,7 @@ void proto_register_dap(void) { FT_UINT32, BASE_DEC, NULL, 0, "dap.SEQUENCE_SIZE_1_MAX_OF_SortKey", HFILL }}, { &hf_dap_sortKeys_item, - { "sortKeys", "dap.sortKeys_item", + { "SortKey", "dap.SortKey", FT_NONE, BASE_NONE, NULL, 0, "dap.SortKey", HFILL }}, { &hf_dap_reverse, @@ -5440,7 +5440,7 @@ void proto_register_dap(void) { FT_UINT32, BASE_DEC, NULL, 0, "dap.SEQUENCE_SIZE_1_MAX_OF_AlgorithmIdentifier", HFILL }}, { &hf_dap_bindIntAlgorithm_item, - { "bindIntAlgorithm", "dap.bindIntAlgorithm_item", + { "AlgorithmIdentifier", "dap.AlgorithmIdentifier", FT_NONE, BASE_NONE, NULL, 0, "x509af.AlgorithmIdentifier", HFILL }}, { &hf_dap_bindIntKeyInfo, @@ -5452,7 +5452,7 @@ void proto_register_dap(void) { FT_UINT32, BASE_DEC, NULL, 0, "dap.SEQUENCE_SIZE_1_MAX_OF_AlgorithmIdentifier", HFILL }}, { &hf_dap_bindConfAlgorithm_item, - { "bindConfAlgorithm", "dap.bindConfAlgorithm_item", + { "AlgorithmIdentifier", "dap.AlgorithmIdentifier", FT_NONE, BASE_NONE, NULL, 0, "x509af.AlgorithmIdentifier", HFILL }}, { &hf_dap_bindConfKeyInfo, @@ -5584,7 +5584,7 @@ void proto_register_dap(void) { FT_UINT32, BASE_DEC, NULL, 0, "dap.SEQUENCE_SIZE_1_MAX_OF_Attribute", HFILL }}, { &hf_dap_notification_item, - { "notification", "dap.notification_item", + { "Attribute", "dap.Attribute", FT_NONE, BASE_NONE, NULL, 0, "x509if.Attribute", HFILL }}, { &hf_dap_unsignedReadResult, @@ -5600,7 +5600,7 @@ void proto_register_dap(void) { FT_NONE, BASE_NONE, NULL, 0, "dap.ReadResultData", HFILL }}, { &hf_dap_ModifyRights_item, - { "ModifyRights", "dap.ModifyRights_item", + { "ModifyRights item", "dap.ModifyRights_item", FT_NONE, BASE_NONE, NULL, 0, "dap.ModifyRights_item", HFILL }}, { &hf_dap_item, @@ -5724,7 +5724,7 @@ void proto_register_dap(void) { FT_UINT32, BASE_DEC, NULL, 0, "dap.T_subordinates", HFILL }}, { &hf_dap_subordinates_item, - { "subordinates", "dap.subordinates_item", + { "subordinates item", "dap.subordinates_item", FT_NONE, BASE_NONE, NULL, 0, "dap.T_subordinates_item", HFILL }}, { &hf_dap_aliasEntry, @@ -5740,7 +5740,7 @@ void proto_register_dap(void) { FT_UINT32, BASE_DEC, NULL, 0, "dap.SET_OF_ListResult", HFILL }}, { &hf_dap_uncorrelatedListInfo_item, - { "uncorrelatedListInfo", "dap.uncorrelatedListInfo_item", + { "ListResult", "dap.ListResult", FT_UINT32, BASE_DEC, VALS(dap_ListResult_vals), 0, "dap.ListResult", HFILL }}, { &hf_dap_unsignedListResult, @@ -5764,7 +5764,7 @@ void proto_register_dap(void) { FT_UINT32, BASE_DEC, NULL, 0, "dap.SET_SIZE_1_MAX_OF_ContinuationReference", HFILL }}, { &hf_dap_unexplored_item, - { "unexplored", "dap.unexplored_item", + { "ContinuationReference", "dap.ContinuationReference", FT_NONE, BASE_NONE, NULL, 0, "dsp.ContinuationReference", HFILL }}, { &hf_dap_unavailableCriticalExtensions, @@ -5776,7 +5776,7 @@ void proto_register_dap(void) { FT_UINT32, BASE_DEC, NULL, 0, "dap.T_unknownErrors", HFILL }}, { &hf_dap_unknownErrors_item, - { "unknownErrors", "dap.unknownErrors_item", + { "unknownErrors item", "dap.unknownErrors_item", FT_OID, BASE_NONE, NULL, 0, "dap.OBJECT_IDENTIFIER", HFILL }}, { &hf_dap_queryReference, @@ -5856,7 +5856,7 @@ void proto_register_dap(void) { FT_UINT32, BASE_DEC, NULL, 0, "dap.SEQUENCE_SIZE_1_MAX_OF_JoinArgument", HFILL }}, { &hf_dap_joinArguments_item, - { "joinArguments", "dap.joinArguments_item", + { "JoinArgument", "dap.JoinArgument", FT_NONE, BASE_NONE, NULL, 0, "dap.JoinArgument", HFILL }}, { &hf_dap_joinType, @@ -5896,7 +5896,7 @@ void proto_register_dap(void) { FT_UINT32, BASE_DEC, NULL, 0, "dap.SEQUENCE_SIZE_1_MAX_OF_JoinAttPair", HFILL }}, { &hf_dap_joinAttributes_item, - { "joinAttributes", "dap.joinAttributes_item", + { "JoinAttPair", "dap.JoinAttPair", FT_NONE, BASE_NONE, NULL, 0, "dap.JoinAttPair", HFILL }}, { &hf_dap_joinSelection, @@ -5916,7 +5916,7 @@ void proto_register_dap(void) { FT_UINT32, BASE_DEC, NULL, 0, "dap.SEQUENCE_SIZE_1_MAX_OF_JoinContextType", HFILL }}, { &hf_dap_joinContext_item, - { "joinContext", "dap.joinContext_item", + { "JoinContextType", "dap.JoinContextType", FT_OID, BASE_NONE, NULL, 0, "dap.JoinContextType", HFILL }}, { &hf_dap_searchInfo, @@ -5928,7 +5928,7 @@ void proto_register_dap(void) { FT_UINT32, BASE_DEC, NULL, 0, "dap.SET_OF_EntryInformation", HFILL }}, { &hf_dap_entries_item, - { "entries", "dap.entries_item", + { "EntryInformation", "dap.EntryInformation", FT_NONE, BASE_NONE, NULL, 0, "dap.EntryInformation", HFILL }}, { &hf_dap_altMatching, @@ -5940,7 +5940,7 @@ void proto_register_dap(void) { FT_UINT32, BASE_DEC, NULL, 0, "dap.SET_OF_SearchResult", HFILL }}, { &hf_dap_uncorrelatedSearchInfo_item, - { "uncorrelatedSearchInfo", "dap.uncorrelatedSearchInfo_item", + { "SearchResult", "dap.SearchResult", FT_UINT32, BASE_DEC, VALS(dap_SearchResult_vals), 0, "dap.SearchResult", HFILL }}, { &hf_dap_unsignedSearchResult, @@ -5960,7 +5960,7 @@ void proto_register_dap(void) { FT_UINT32, BASE_DEC, NULL, 0, "dap.SET_OF_Attribute", HFILL }}, { &hf_dap_add_entry_item, - { "entry", "dap.entry_item", + { "Attribute", "dap.Attribute", FT_NONE, BASE_NONE, NULL, 0, "x509if.Attribute", HFILL }}, { &hf_dap_targetSystem, @@ -6028,7 +6028,7 @@ void proto_register_dap(void) { FT_UINT32, BASE_DEC, NULL, 0, "dap.SEQUENCE_OF_EntryModification", HFILL }}, { &hf_dap_changes_item, - { "changes", "dap.changes_item", + { "EntryModification", "dap.EntryModification", FT_UINT32, BASE_DEC, VALS(dap_EntryModification_vals), 0, "dap.EntryModification", HFILL }}, { &hf_dap_unsignedModifyEntryArgument, @@ -6148,7 +6148,7 @@ void proto_register_dap(void) { FT_UINT32, BASE_DEC, NULL, 0, "dap.T_problems", HFILL }}, { &hf_dap_problems_item, - { "problems", "dap.problems_item", + { "problems item", "dap.problems_item", FT_NONE, BASE_NONE, NULL, 0, "dap.T_problems_item", HFILL }}, { &hf_dap_attribute_error_problem, @@ -6252,7 +6252,7 @@ void proto_register_dap(void) { FT_UINT32, BASE_DEC, NULL, 0, "dap.T_attributeInfo", HFILL }}, { &hf_dap_attributeInfo_item, - { "attributeInfo", "dap.attributeInfo_item", + { "attributeInfo item", "dap.attributeInfo_item", FT_UINT32, BASE_DEC, VALS(dap_T_attributeInfo_item_vals), 0, "dap.T_attributeInfo_item", HFILL }}, { &hf_dap_unsignedUpdateError, diff --git a/epan/dissectors/packet-disp.c b/epan/dissectors/packet-disp.c index 3e93a661fa..389bbb4e87 100644 --- a/epan/dissectors/packet-disp.c +++ b/epan/dissectors/packet-disp.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-disp.c */ -/* ../../tools/asn2wrs.py -b -e -p disp -c disp.cnf -s packet-disp-template disp.asn */ +/* ../../tools/asn2wrs.py -b -e -p disp -c ./disp.cnf -s ./packet-disp-template -D . disp.asn */ /* Input file: packet-disp-template.c */ @@ -1666,7 +1666,7 @@ void proto_register_disp(void) { FT_UINT32, BASE_DEC, NULL, 0, "disp.SET_OF_SupplierAndConsumers", HFILL }}, { &hf_disp_modifiedSecondaryShadows_item, - { "secondaryShadows", "disp.secondaryShadows_item", + { "SupplierAndConsumers", "disp.SupplierAndConsumers", FT_NONE, BASE_NONE, NULL, 0, "dop.SupplierAndConsumers", HFILL }}, { &hf_disp_shadowSubject, @@ -1718,7 +1718,7 @@ void proto_register_disp(void) { FT_UINT32, BASE_DEC, NULL, 0, "disp.T_selectedContexts", HFILL }}, { &hf_disp_selectedContexts_item, - { "selectedContexts", "disp.selectedContexts_item", + { "selectedContexts item", "disp.selectedContexts_item", FT_OID, BASE_NONE, NULL, 0, "disp.OBJECT_IDENTIFIER", HFILL }}, { &hf_disp_contextPrefix, @@ -1738,7 +1738,7 @@ void proto_register_disp(void) { FT_BOOLEAN, 8, NULL, 0, "disp.BOOLEAN", HFILL }}, { &hf_disp_AttributeSelection_item, - { "AttributeSelection", "disp.AttributeSelection_item", + { "ClassAttributeSelection", "disp.ClassAttributeSelection", FT_NONE, BASE_NONE, NULL, 0, "disp.ClassAttributeSelection", HFILL }}, { &hf_disp_class, @@ -1762,7 +1762,7 @@ void proto_register_disp(void) { FT_UINT32, BASE_DEC, NULL, 0, "disp.AttributeTypes", HFILL }}, { &hf_disp_AttributeTypes_item, - { "AttributeTypes", "disp.AttributeTypes_item", + { "AttributeType", "disp.AttributeType", FT_OID, BASE_NONE, NULL, 0, "x509if.AttributeType", HFILL }}, { &hf_disp_supplierInitiated, @@ -1866,7 +1866,7 @@ void proto_register_disp(void) { FT_UINT32, BASE_DEC, NULL, 0, "disp.SEQUENCE_OF_Attribute", HFILL }}, { &hf_disp_notification_item, - { "notification", "disp.notification_item", + { "Attribute", "disp.Attribute", FT_NONE, BASE_NONE, NULL, 0, "x509if.Attribute", HFILL }}, { &hf_disp_unsignedInformation, @@ -1958,7 +1958,7 @@ void proto_register_disp(void) { FT_UINT32, BASE_DEC, NULL, 0, "disp.SET_OF_Subtree", HFILL }}, { &hf_disp_subtree_item, - { "subtree", "disp.subtree_item", + { "Subtree", "disp.Subtree", FT_NONE, BASE_NONE, NULL, 0, "disp.Subtree", HFILL }}, { &hf_disp_sDSEType, @@ -1978,7 +1978,7 @@ void proto_register_disp(void) { FT_UINT32, BASE_DEC, NULL, 0, "disp.SET_OF_Attribute", HFILL }}, { &hf_disp_attributes_item, - { "attributes", "disp.attributes_item", + { "Attribute", "disp.Attribute", FT_NONE, BASE_NONE, NULL, 0, "x509if.Attribute", HFILL }}, { &hf_disp_attValIncomplete, @@ -1986,7 +1986,7 @@ void proto_register_disp(void) { FT_UINT32, BASE_DEC, NULL, 0, "disp.SET_OF_AttributeType", HFILL }}, { &hf_disp_attValIncomplete_item, - { "attValIncomplete", "disp.attValIncomplete_item", + { "AttributeType", "disp.AttributeType", FT_OID, BASE_NONE, NULL, 0, "x509if.AttributeType", HFILL }}, { &hf_disp_rdn, @@ -1994,7 +1994,7 @@ void proto_register_disp(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509if.RelativeDistinguishedName", HFILL }}, { &hf_disp_IncrementalRefresh_item, - { "IncrementalRefresh", "disp.IncrementalRefresh_item", + { "IncrementalStepRefresh", "disp.IncrementalStepRefresh", FT_NONE, BASE_NONE, NULL, 0, "disp.IncrementalStepRefresh", HFILL }}, { &hf_disp_sDSEChanges, @@ -2018,7 +2018,7 @@ void proto_register_disp(void) { FT_UINT32, BASE_DEC, NULL, 0, "disp.SEQUENCE_OF_SubordinateChanges", HFILL }}, { &hf_disp_subordinateUpdates_item, - { "subordinateUpdates", "disp.subordinateUpdates_item", + { "SubordinateChanges", "disp.SubordinateChanges", FT_NONE, BASE_NONE, NULL, 0, "disp.SubordinateChanges", HFILL }}, { &hf_disp_rename, @@ -2042,7 +2042,7 @@ void proto_register_disp(void) { FT_UINT32, BASE_DEC, NULL, 0, "disp.SET_OF_Attribute", HFILL }}, { &hf_disp_replace_item, - { "replace", "disp.replace_item", + { "Attribute", "disp.Attribute", FT_NONE, BASE_NONE, NULL, 0, "x509if.Attribute", HFILL }}, { &hf_disp_changes, @@ -2050,7 +2050,7 @@ void proto_register_disp(void) { FT_UINT32, BASE_DEC, NULL, 0, "disp.SEQUENCE_OF_EntryModification", HFILL }}, { &hf_disp_changes_item, - { "changes", "disp.changes_item", + { "EntryModification", "disp.EntryModification", FT_UINT32, BASE_DEC, VALS(dap_EntryModification_vals), 0, "dap.EntryModification", HFILL }}, { &hf_disp_subordinate, diff --git a/epan/dissectors/packet-disp.h b/epan/dissectors/packet-disp.h index 06fd2b5308..436f5509c5 100644 --- a/epan/dissectors/packet-disp.h +++ b/epan/dissectors/packet-disp.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-disp.h */ -/* ../../tools/asn2wrs.py -b -e -p disp -c disp.cnf -s packet-disp-template disp.asn */ +/* ../../tools/asn2wrs.py -b -e -p disp -c ./disp.cnf -s ./packet-disp-template -D . disp.asn */ /* Input file: packet-disp-template.h */ diff --git a/epan/dissectors/packet-dop.c b/epan/dissectors/packet-dop.c index 8de4c3932b..96e0e3990b 100644 --- a/epan/dissectors/packet-dop.c +++ b/epan/dissectors/packet-dop.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-dop.c */ -/* ../../tools/asn2wrs.py -b -e -p dop -c dop.cnf -s packet-dop-template dop.asn */ +/* ../../tools/asn2wrs.py -b -e -p dop -c ./dop.cnf -s ./packet-dop-template -D . dop.asn */ /* Input file: packet-dop-template.c */ @@ -2273,7 +2273,7 @@ void proto_register_dop(void) { FT_UINT32, BASE_DEC, NULL, 0, "dop.SET_OF_ProtocolInformation", HFILL }}, { &hf_dop_protocolInformation_item, - { "protocolInformation", "dop.protocolInformation_item", + { "ProtocolInformation", "dop.ProtocolInformation", FT_NONE, BASE_NONE, NULL, 0, "x509sat.ProtocolInformation", HFILL }}, { &hf_dop_agreementID, @@ -2293,7 +2293,7 @@ void proto_register_dop(void) { FT_UINT32, BASE_DEC, NULL, 0, "dop.SET_OF_AccessPoint", HFILL }}, { &hf_dop_consumers_item, - { "consumers", "dop.consumers_item", + { "AccessPoint", "dop.AccessPoint", FT_NONE, BASE_NONE, NULL, 0, "dsp.AccessPoint", HFILL }}, { &hf_dop_bindingType, @@ -2421,7 +2421,7 @@ void proto_register_dop(void) { FT_UINT32, BASE_DEC, NULL, 0, "dop.SEQUENCE_SIZE_1_MAX_OF_Attribute", HFILL }}, { &hf_dop_notification_item, - { "notification", "dop.notification_item", + { "Attribute", "dop.Attribute", FT_NONE, BASE_NONE, NULL, 0, "x509if.Attribute", HFILL }}, { &hf_dop_modifyInitiator, @@ -2549,7 +2549,7 @@ void proto_register_dop(void) { FT_UINT32, BASE_DEC, NULL, 0, "dop.SET_OF_Attribute", HFILL }}, { &hf_dop_entryInfo_item, - { "entryInfo", "dop.entryInfo_item", + { "Attribute", "dop.Attribute", FT_NONE, BASE_NONE, NULL, 0, "x509if.Attribute", HFILL }}, { &hf_dop_immediateSuperiorInfo, @@ -2557,11 +2557,11 @@ void proto_register_dop(void) { FT_UINT32, BASE_DEC, NULL, 0, "dop.SET_OF_Attribute", HFILL }}, { &hf_dop_immediateSuperiorInfo_item, - { "immediateSuperiorInfo", "dop.immediateSuperiorInfo_item", + { "Attribute", "dop.Attribute", FT_NONE, BASE_NONE, NULL, 0, "x509if.Attribute", HFILL }}, { &hf_dop_DITcontext_item, - { "DITcontext", "dop.DITcontext_item", + { "Vertex", "dop.Vertex", FT_NONE, BASE_NONE, NULL, 0, "dop.Vertex", HFILL }}, { &hf_dop_admPointInfo, @@ -2569,7 +2569,7 @@ void proto_register_dop(void) { FT_UINT32, BASE_DEC, NULL, 0, "dop.SET_OF_Attribute", HFILL }}, { &hf_dop_admPointInfo_item, - { "admPointInfo", "dop.admPointInfo_item", + { "Attribute", "dop.Attribute", FT_NONE, BASE_NONE, NULL, 0, "x509if.Attribute", HFILL }}, { &hf_dop_subentries, @@ -2577,7 +2577,7 @@ void proto_register_dop(void) { FT_UINT32, BASE_DEC, NULL, 0, "dop.SET_OF_SubentryInfo", HFILL }}, { &hf_dop_subentries_item, - { "subentries", "dop.subentries_item", + { "SubentryInfo", "dop.SubentryInfo", FT_NONE, BASE_NONE, NULL, 0, "dop.SubentryInfo", HFILL }}, { &hf_dop_accessPoints, @@ -2589,7 +2589,7 @@ void proto_register_dop(void) { FT_UINT32, BASE_DEC, NULL, 0, "dop.SET_OF_Attribute", HFILL }}, { &hf_dop_info_item, - { "info", "dop.info_item", + { "Attribute", "dop.Attribute", FT_NONE, BASE_NONE, NULL, 0, "x509if.Attribute", HFILL }}, { &hf_dop_alias, @@ -2625,7 +2625,7 @@ void proto_register_dop(void) { FT_UINT32, BASE_DEC, NULL, 0, "dop.SET_OF_ItemPermission", HFILL }}, { &hf_dop_itemPermissions_item, - { "itemPermissions", "dop.itemPermissions_item", + { "ItemPermission", "dop.ItemPermission", FT_NONE, BASE_NONE, NULL, 0, "dop.ItemPermission", HFILL }}, { &hf_dop_userFirst, @@ -2641,7 +2641,7 @@ void proto_register_dop(void) { FT_UINT32, BASE_DEC, NULL, 0, "dop.SET_OF_UserPermission", HFILL }}, { &hf_dop_userPermissions_item, - { "userPermissions", "dop.userPermissions_item", + { "UserPermission", "dop.UserPermission", FT_NONE, BASE_NONE, NULL, 0, "dop.UserPermission", HFILL }}, { &hf_dop_entry, @@ -2657,7 +2657,7 @@ void proto_register_dop(void) { FT_UINT32, BASE_DEC, NULL, 0, "dop.SET_OF_AttributeType", HFILL }}, { &hf_dop_attributeType_item, - { "attributeType", "dop.attributeType_item", + { "AttributeType", "dop.AttributeType", FT_OID, BASE_NONE, NULL, 0, "x509if.AttributeType", HFILL }}, { &hf_dop_allAttributeValues, @@ -2665,7 +2665,7 @@ void proto_register_dop(void) { FT_UINT32, BASE_DEC, NULL, 0, "dop.SET_OF_AttributeType", HFILL }}, { &hf_dop_allAttributeValues_item, - { "allAttributeValues", "dop.allAttributeValues_item", + { "AttributeType", "dop.AttributeType", FT_OID, BASE_NONE, NULL, 0, "x509if.AttributeType", HFILL }}, { &hf_dop_allUserAttributeTypesAndValues, @@ -2677,7 +2677,7 @@ void proto_register_dop(void) { FT_UINT32, BASE_DEC, NULL, 0, "dop.SET_OF_AttributeTypeAndValue", HFILL }}, { &hf_dop_attributeValue_item, - { "attributeValue", "dop.attributeValue_item", + { "AttributeTypeAndValue", "dop.AttributeTypeAndValue", FT_NONE, BASE_NONE, NULL, 0, "crmf.AttributeTypeAndValue", HFILL }}, { &hf_dop_selfValue, @@ -2685,7 +2685,7 @@ void proto_register_dop(void) { FT_UINT32, BASE_DEC, NULL, 0, "dop.SET_OF_AttributeType", HFILL }}, { &hf_dop_selfValue_item, - { "selfValue", "dop.selfValue_item", + { "AttributeType", "dop.AttributeType", FT_OID, BASE_NONE, NULL, 0, "x509if.AttributeType", HFILL }}, { &hf_dop_rangeOfValues, @@ -2697,7 +2697,7 @@ void proto_register_dop(void) { FT_UINT32, BASE_DEC, NULL, 0, "dop.SET_OF_MaxValueCount", HFILL }}, { &hf_dop_maxValueCount_item, - { "maxValueCount", "dop.maxValueCount_item", + { "MaxValueCount", "dop.MaxValueCount", FT_NONE, BASE_NONE, NULL, 0, "dop.MaxValueCount", HFILL }}, { &hf_dop_maxImmSub, @@ -2709,7 +2709,7 @@ void proto_register_dop(void) { FT_UINT32, BASE_DEC, NULL, 0, "dop.SET_OF_RestrictedValue", HFILL }}, { &hf_dop_restrictedBy_item, - { "restrictedBy", "dop.restrictedBy_item", + { "RestrictedValue", "dop.RestrictedValue", FT_NONE, BASE_NONE, NULL, 0, "dop.RestrictedValue", HFILL }}, { &hf_dop_contexts, @@ -2717,7 +2717,7 @@ void proto_register_dop(void) { FT_UINT32, BASE_DEC, NULL, 0, "dop.SET_OF_ContextAssertion", HFILL }}, { &hf_dop_contexts_item, - { "contexts", "dop.contexts_item", + { "ContextAssertion", "dop.ContextAssertion", FT_NONE, BASE_NONE, NULL, 0, "x509if.ContextAssertion", HFILL }}, { &hf_dop_classes, @@ -2749,7 +2749,7 @@ void proto_register_dop(void) { FT_UINT32, BASE_DEC, NULL, 0, "dop.SET_OF_NameAndOptionalUID", HFILL }}, { &hf_dop_name_item, - { "name", "dop.name_item", + { "NameAndOptionalUID", "dop.NameAndOptionalUID", FT_NONE, BASE_NONE, NULL, 0, "x509sat.NameAndOptionalUID", HFILL }}, { &hf_dop_userGroup, @@ -2757,7 +2757,7 @@ void proto_register_dop(void) { FT_UINT32, BASE_DEC, NULL, 0, "dop.SET_OF_NameAndOptionalUID", HFILL }}, { &hf_dop_userGroup_item, - { "userGroup", "dop.userGroup_item", + { "NameAndOptionalUID", "dop.NameAndOptionalUID", FT_NONE, BASE_NONE, NULL, 0, "x509sat.NameAndOptionalUID", HFILL }}, { &hf_dop_subtree, @@ -2765,7 +2765,7 @@ void proto_register_dop(void) { FT_UINT32, BASE_DEC, NULL, 0, "dop.SET_OF_SubtreeSpecification", HFILL }}, { &hf_dop_subtree_item, - { "subtree", "dop.subtree_item", + { "SubtreeSpecification", "dop.SubtreeSpecification", FT_NONE, BASE_NONE, NULL, 0, "x509if.SubtreeSpecification", HFILL }}, { &hf_dop_grantsAndDenials, diff --git a/epan/dissectors/packet-dop.h b/epan/dissectors/packet-dop.h index 4df2a61a4e..416df3e56b 100644 --- a/epan/dissectors/packet-dop.h +++ b/epan/dissectors/packet-dop.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-dop.h */ -/* ../../tools/asn2wrs.py -b -e -p dop -c dop.cnf -s packet-dop-template dop.asn */ +/* ../../tools/asn2wrs.py -b -e -p dop -c ./dop.cnf -s ./packet-dop-template -D . dop.asn */ /* Input file: packet-dop-template.h */ diff --git a/epan/dissectors/packet-dsp.c b/epan/dissectors/packet-dsp.c index 132d361a1f..394cf3986a 100644 --- a/epan/dissectors/packet-dsp.c +++ b/epan/dissectors/packet-dsp.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-dsp.c */ -/* ../../tools/asn2wrs.py -b -e -p dsp -c dsp.cnf -s packet-dsp-template dsp.asn */ +/* ../../tools/asn2wrs.py -b -e -p dsp -c ./dsp.cnf -s ./packet-dsp-template -D . dsp.asn */ /* Input file: packet-dsp-template.c */ @@ -2248,7 +2248,7 @@ void proto_register_dsp(void) { FT_UINT32, BASE_DEC, NULL, 0, "dsp.SEQUENCE_OF_Attribute", HFILL }}, { &hf_dsp_notification_item, - { "notification", "dsp.notification_item", + { "Attribute", "dsp.Attribute", FT_NONE, BASE_NONE, NULL, 0, "x509if.Attribute", HFILL }}, { &hf_dsp_unsignedDSAReferral, @@ -2352,7 +2352,7 @@ void proto_register_dsp(void) { FT_UINT32, BASE_DEC, NULL, 0, "dsp.SEQUENCE_OF_CrossReference", HFILL }}, { &hf_dsp_crossReferences_item, - { "crossReferences", "dsp.crossReferences_item", + { "CrossReference", "dsp.CrossReference", FT_NONE, BASE_NONE, NULL, 0, "dsp.CrossReference", HFILL }}, { &hf_dsp_alreadySearched, @@ -2372,7 +2372,7 @@ void proto_register_dsp(void) { FT_INT32, BASE_DEC, NULL, 0, "dsp.INTEGER", HFILL }}, { &hf_dsp_TraceInformation_item, - { "TraceInformation", "dsp.TraceInformation_item", + { "TraceItem", "dsp.TraceItem", FT_NONE, BASE_NONE, NULL, 0, "dsp.TraceItem", HFILL }}, { &hf_dsp_dsa, @@ -2396,7 +2396,7 @@ void proto_register_dsp(void) { FT_UINT32, BASE_DEC, NULL, 0, "dsp.SET_OF_ProtocolInformation", HFILL }}, { &hf_dsp_protocolInformation_item, - { "protocolInformation", "dsp.protocolInformation_item", + { "ProtocolInformation", "dsp.ProtocolInformation", FT_NONE, BASE_NONE, NULL, 0, "x509sat.ProtocolInformation", HFILL }}, { &hf_dsp_access_point_category, @@ -2408,7 +2408,7 @@ void proto_register_dsp(void) { FT_BOOLEAN, 8, NULL, 0, "dsp.BOOLEAN", HFILL }}, { &hf_dsp_MasterAndShadowAccessPoints_item, - { "MasterAndShadowAccessPoints", "dsp.MasterAndShadowAccessPoints_item", + { "MasterOrShadowAccessPoint", "dsp.MasterOrShadowAccessPoint", FT_NONE, BASE_NONE, NULL, 0, "dsp.MasterOrShadowAccessPoint", HFILL }}, { &hf_dsp_category, @@ -2420,7 +2420,7 @@ void proto_register_dsp(void) { FT_UINT32, BASE_DEC, NULL, 0, "dsp.MasterAndShadowAccessPoints", HFILL }}, { &hf_dsp_Exclusions_item, - { "Exclusions", "dsp.Exclusions_item", + { "RDNSequence", "dsp.RDNSequence", FT_UINT32, BASE_DEC, NULL, 0, "x509if.RDNSequence", HFILL }}, { &hf_dsp_rdnsResolved, @@ -2432,7 +2432,7 @@ void proto_register_dsp(void) { FT_UINT32, BASE_DEC, NULL, 0, "dsp.SET_OF_AccessPointInformation", HFILL }}, { &hf_dsp_accessPoints_item, - { "accessPoints", "dsp.accessPoints_item", + { "AccessPointInformation", "dsp.AccessPointInformation", FT_NONE, BASE_NONE, NULL, 0, "dsp.AccessPointInformation", HFILL }}, { &hf_dsp_returnToDUA, diff --git a/epan/dissectors/packet-dsp.h b/epan/dissectors/packet-dsp.h index 34d65bd480..24f0a4c85e 100644 --- a/epan/dissectors/packet-dsp.h +++ b/epan/dissectors/packet-dsp.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-dsp.h */ -/* ../../tools/asn2wrs.py -b -e -p dsp -c dsp.cnf -s packet-dsp-template dsp.asn */ +/* ../../tools/asn2wrs.py -b -e -p dsp -c ./dsp.cnf -s ./packet-dsp-template -D . dsp.asn */ /* Input file: packet-dsp-template.h */ diff --git a/epan/dissectors/packet-ess.c b/epan/dissectors/packet-ess.c index f949b6723e..167692f37e 100644 --- a/epan/dissectors/packet-ess.c +++ b/epan/dissectors/packet-ess.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-ess.c */ -/* ../../tools/asn2wrs.py -b -k -p ess -c ess.cnf -s packet-ess-template ExtendedSecurityServices.asn */ +/* ../../tools/asn2wrs.py -b -k -p ess -c ./ess.cnf -s ./packet-ess-template -D . ExtendedSecurityServices.asn */ /* Input file: packet-ess-template.c */ @@ -932,7 +932,7 @@ void proto_register_ess(void) { FT_UINT32, BASE_DEC, NULL, 0, "ess.SEQUENCE_OF_GeneralNames", HFILL }}, { &hf_ess_receiptsTo_item, - { "receiptsTo", "ess.receiptsTo_item", + { "GeneralNames", "ess.GeneralNames", FT_UINT32, BASE_DEC, NULL, 0, "x509ce.GeneralNames", HFILL }}, { &hf_ess_allOrFirstTier, @@ -944,7 +944,7 @@ void proto_register_ess(void) { FT_UINT32, BASE_DEC, NULL, 0, "ess.SEQUENCE_OF_GeneralNames", HFILL }}, { &hf_ess_receiptList_item, - { "receiptList", "ess.receiptList_item", + { "GeneralNames", "ess.GeneralNames", FT_UINT32, BASE_DEC, NULL, 0, "x509ce.GeneralNames", HFILL }}, { &hf_ess_version, @@ -988,7 +988,7 @@ void proto_register_ess(void) { FT_STRING, BASE_NONE, NULL, 0, "ess.UTF8String", HFILL }}, { &hf_ess_SecurityCategories_item, - { "SecurityCategories", "ess.SecurityCategories_item", + { "SecurityCategory", "ess.SecurityCategory", FT_NONE, BASE_NONE, NULL, 0, "ess.SecurityCategory", HFILL }}, { &hf_ess_type, @@ -1012,7 +1012,7 @@ void proto_register_ess(void) { FT_UINT32, BASE_DEC, NULL, 0, "ess.SET_OF_SecurityAttribute", HFILL }}, { &hf_ess_attributeList_item, - { "attributeList", "ess.attributeList_item", + { "SecurityAttribute", "ess.SecurityAttribute", FT_INT32, BASE_DEC, NULL, 0, "ess.SecurityAttribute", HFILL }}, { &hf_ess_attributes, @@ -1028,15 +1028,15 @@ void proto_register_ess(void) { FT_UINT32, BASE_DEC, NULL, 0, "ess.SET_OF_SecurityAttribute", HFILL }}, { &hf_ess_securityAttributes_item, - { "securityAttributes", "ess.securityAttributes_item", + { "SecurityAttribute", "ess.SecurityAttribute", FT_INT32, BASE_DEC, NULL, 0, "ess.SecurityAttribute", HFILL }}, { &hf_ess_EquivalentLabels_item, - { "EquivalentLabels", "ess.EquivalentLabels_item", + { "ESSSecurityLabel", "ess.ESSSecurityLabel", FT_NONE, BASE_NONE, NULL, 0, "ess.ESSSecurityLabel", HFILL }}, { &hf_ess_MLExpansionHistory_item, - { "MLExpansionHistory", "ess.MLExpansionHistory_item", + { "MLData", "ess.MLData", FT_NONE, BASE_NONE, NULL, 0, "ess.MLData", HFILL }}, { &hf_ess_mailListIdentifier, @@ -1068,7 +1068,7 @@ void proto_register_ess(void) { FT_UINT32, BASE_DEC, NULL, 0, "ess.SEQUENCE_OF_GeneralNames", HFILL }}, { &hf_ess_insteadOf_item, - { "insteadOf", "ess.insteadOf_item", + { "GeneralNames", "ess.GeneralNames", FT_UINT32, BASE_DEC, NULL, 0, "x509ce.GeneralNames", HFILL }}, { &hf_ess_inAdditionTo, @@ -1076,7 +1076,7 @@ void proto_register_ess(void) { FT_UINT32, BASE_DEC, NULL, 0, "ess.SEQUENCE_OF_GeneralNames", HFILL }}, { &hf_ess_inAdditionTo_item, - { "inAdditionTo", "ess.inAdditionTo_item", + { "GeneralNames", "ess.GeneralNames", FT_UINT32, BASE_DEC, NULL, 0, "x509ce.GeneralNames", HFILL }}, { &hf_ess_certs, @@ -1084,7 +1084,7 @@ void proto_register_ess(void) { FT_UINT32, BASE_DEC, NULL, 0, "ess.SEQUENCE_OF_ESSCertID", HFILL }}, { &hf_ess_certs_item, - { "certs", "ess.certs_item", + { "ESSCertID", "ess.ESSCertID", FT_NONE, BASE_NONE, NULL, 0, "ess.ESSCertID", HFILL }}, { &hf_ess_policies, @@ -1092,7 +1092,7 @@ void proto_register_ess(void) { FT_UINT32, BASE_DEC, NULL, 0, "ess.SEQUENCE_OF_PolicyInformation", HFILL }}, { &hf_ess_policies_item, - { "policies", "ess.policies_item", + { "PolicyInformation", "ess.PolicyInformation", FT_NONE, BASE_NONE, NULL, 0, "x509ce.PolicyInformation", HFILL }}, { &hf_ess_certHash, diff --git a/epan/dissectors/packet-ess.h b/epan/dissectors/packet-ess.h index 87ef6f1b4b..987641d605 100644 --- a/epan/dissectors/packet-ess.h +++ b/epan/dissectors/packet-ess.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-ess.h */ -/* ../../tools/asn2wrs.py -b -k -p ess -c ess.cnf -s packet-ess-template ExtendedSecurityServices.asn */ +/* ../../tools/asn2wrs.py -b -k -p ess -c ./ess.cnf -s ./packet-ess-template -D . ExtendedSecurityServices.asn */ /* Input file: packet-ess-template.h */ diff --git a/epan/dissectors/packet-ftam.c b/epan/dissectors/packet-ftam.c index 96a4157069..585b6ea9e6 100644 --- a/epan/dissectors/packet-ftam.c +++ b/epan/dissectors/packet-ftam.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-ftam.c */ -/* ../../tools/asn2wrs.py -b -p ftam -c ftam.cnf -s packet-ftam-template ISO8571-FTAM.asn */ +/* ../../tools/asn2wrs.py -b -p ftam -c ./ftam.cnf -s ./packet-ftam-template -D . ISO8571-FTAM.asn */ /* Input file: packet-ftam-template.c */ @@ -4931,7 +4931,7 @@ void proto_register_ftam(void) { FT_UINT32, BASE_DEC, NULL, 0, "ftam.Diagnostic", HFILL }}, { &hf_ftam__untag_item, - { "_untag", "ftam._untag_item", + { "_untag item", "ftam._untag_item", FT_UINT32, BASE_DEC, VALS(ftam_Contents_Type_List_item_vals), 0, "ftam.Contents_Type_List_item", HFILL }}, { &hf_ftam_document_type_name, @@ -5135,7 +5135,7 @@ void proto_register_ftam(void) { FT_UINT32, BASE_DEC, NULL, 0, "ftam.SET_OF_Abstract_Syntax_Name", HFILL }}, { &hf_ftam_remove_contexts_item, - { "remove-contexts", "ftam.remove_contexts_item", + { "Abstract-Syntax-Name", "ftam.Abstract_Syntax_Name", FT_OID, BASE_NONE, NULL, 0, "ftam.Abstract_Syntax_Name", HFILL }}, { &hf_ftam_define_contexts, @@ -5143,7 +5143,7 @@ void proto_register_ftam(void) { FT_UINT32, BASE_DEC, NULL, 0, "ftam.SET_OF_Abstract_Syntax_Name", HFILL }}, { &hf_ftam_define_contexts_item, - { "define-contexts", "ftam.define_contexts_item", + { "Abstract-Syntax-Name", "ftam.Abstract_Syntax_Name", FT_OID, BASE_NONE, NULL, 0, "ftam.Abstract_Syntax_Name", HFILL }}, { &hf_ftam_degree_of_overlap, @@ -5355,7 +5355,7 @@ void proto_register_ftam(void) { FT_UINT32, BASE_DEC, NULL, 0, "ftam.Attribute_Extensions", HFILL }}, { &hf_ftam__untag_item_01, - { "_untag", "ftam._untag_item", + { "_untag item", "ftam._untag_item", FT_NONE, BASE_NONE, NULL, 0, "ftam.Charging_item", HFILL }}, { &hf_ftam_resource_identifier, @@ -5419,7 +5419,7 @@ void proto_register_ftam(void) { FT_UINT32, BASE_DEC, VALS(ftam_Access_Control_Attribute_vals), 0, "ftam.Access_Control_Attribute", HFILL }}, { &hf_ftam__untag_item_02, - { "_untag", "ftam._untag_item", + { "_untag item", "ftam._untag_item", FT_NONE, BASE_NONE, NULL, 0, "ftam.Diagnostic_item", HFILL }}, { &hf_ftam_diagnostic_type, @@ -5467,7 +5467,7 @@ void proto_register_ftam(void) { FT_UINT32, BASE_DEC, NULL, 0, "ftam.SEQUENCE_OF_Node_Name", HFILL }}, { &hf_ftam_name_list_item, - { "name-list", "ftam.name_list_item", + { "Node-Name", "ftam.Node_Name", FT_NONE, BASE_NONE, NULL, 0, "ftam.Node_Name", HFILL }}, { &hf_ftam_fadu_number, @@ -5539,7 +5539,7 @@ void proto_register_ftam(void) { FT_UINT32, BASE_DEC, NULL, 0, "ftam.SET_OF_Access_Control_Element", HFILL }}, { &hf_ftam_actual_values3_item, - { "actual-values", "ftam.actual_values_item", + { "Access-Control-Element", "ftam.Access_Control_Element", FT_NONE, BASE_NONE, NULL, 0, "ftam.Access_Control_Element", HFILL }}, { &hf_ftam_actual_values1, @@ -5551,7 +5551,7 @@ void proto_register_ftam(void) { FT_UINT32, BASE_DEC, NULL, 0, "ftam.SET_OF_Access_Control_Element", HFILL }}, { &hf_ftam_insert_values_item, - { "insert-values", "ftam.insert_values_item", + { "Access-Control-Element", "ftam.Access_Control_Element", FT_NONE, BASE_NONE, NULL, 0, "ftam.Access_Control_Element", HFILL }}, { &hf_ftam_delete_values, @@ -5559,7 +5559,7 @@ void proto_register_ftam(void) { FT_UINT32, BASE_DEC, NULL, 0, "ftam.SET_OF_Access_Control_Element", HFILL }}, { &hf_ftam_delete_values_item, - { "delete-values", "ftam.delete_values_item", + { "Access-Control-Element", "ftam.Access_Control_Element", FT_NONE, BASE_NONE, NULL, 0, "ftam.Access_Control_Element", HFILL }}, { &hf_ftam_action_list, @@ -5671,7 +5671,7 @@ void proto_register_ftam(void) { FT_STRING, BASE_NONE, NULL, 0, "ftam.User_Identity", HFILL }}, { &hf_ftam_Child_Objects_Attribute_item, - { "Child-Objects-Attribute", "ftam.Child_Objects_Attribute_item", + { "Child-Objects-Attribute item", "ftam.Child_Objects_Attribute_item", FT_STRING, BASE_NONE, NULL, 0, "ftam.GraphicString", HFILL }}, { &hf_ftam_f_Change_prefix_request, @@ -5863,7 +5863,7 @@ void proto_register_ftam(void) { FT_NONE, BASE_NONE, NULL, 0, "ftam.Read_Attributes", HFILL }}, { &hf_ftam_Attribute_Extension_Names_item, - { "Attribute-Extension-Names", "ftam.Attribute_Extension_Names_item", + { "Attribute-Extension-Set-Name", "ftam.Attribute_Extension_Set_Name", FT_NONE, BASE_NONE, NULL, 0, "ftam.Attribute_Extension_Set_Name", HFILL }}, { &hf_ftam_extension_set_identifier, @@ -5875,11 +5875,11 @@ void proto_register_ftam(void) { FT_UINT32, BASE_DEC, NULL, 0, "ftam.SEQUENCE_OF_Extension_Attribute_identifier", HFILL }}, { &hf_ftam_extension_attribute_names_item, - { "extension-attribute-names", "ftam.extension_attribute_names_item", + { "Extension-Attribute-identifier", "ftam.Extension_Attribute_identifier", FT_OID, BASE_NONE, NULL, 0, "ftam.Extension_Attribute_identifier", HFILL }}, { &hf_ftam_Attribute_Extensions_item, - { "Attribute-Extensions", "ftam.Attribute_Extensions_item", + { "Attribute-Extension-Set", "ftam.Attribute_Extension_Set", FT_NONE, BASE_NONE, NULL, 0, "ftam.Attribute_Extension_Set", HFILL }}, { &hf_ftam_extension_set_attributes, @@ -5887,7 +5887,7 @@ void proto_register_ftam(void) { FT_UINT32, BASE_DEC, NULL, 0, "ftam.SEQUENCE_OF_Extension_Attribute", HFILL }}, { &hf_ftam_extension_set_attributes_item, - { "extension-set-attributes", "ftam.extension_set_attributes_item", + { "Extension-Attribute", "ftam.Extension_Attribute", FT_NONE, BASE_NONE, NULL, 0, "ftam.Extension_Attribute", HFILL }}, { &hf_ftam_extension_attribute_identifier, @@ -5899,7 +5899,7 @@ void proto_register_ftam(void) { FT_NONE, BASE_NONE, NULL, 0, "ftam.T_extension_attribute", HFILL }}, { &hf_ftam__untag_item_03, - { "_untag", "ftam._untag_item", + { "_untag item", "ftam._untag_item", FT_NONE, BASE_NONE, NULL, 0, "ftam.T__untag_item", HFILL }}, { &hf_ftam_root_directory, @@ -5911,11 +5911,11 @@ void proto_register_ftam(void) { FT_INT32, BASE_DEC, VALS(ftam_T_retrieval_scope_vals), 0, "ftam.T_retrieval_scope", HFILL }}, { &hf_ftam_OR_Set_item, - { "OR-Set", "ftam.OR_Set_item", + { "AND-Set", "ftam.AND_Set", FT_UINT32, BASE_DEC, NULL, 0, "ftam.AND_Set", HFILL }}, { &hf_ftam_AND_Set_item, - { "AND-Set", "ftam.AND_Set_item", + { "AND-Set item", "ftam.AND_Set_item", FT_UINT32, BASE_DEC, VALS(ftam_AND_Set_item_vals), 0, "ftam.AND_Set_item", HFILL }}, { &hf_ftam_pathname_Pattern, @@ -6011,7 +6011,7 @@ void proto_register_ftam(void) { FT_UINT32, BASE_DEC, NULL, 0, "ftam.T_pathname_value", HFILL }}, { &hf_ftam_pathname_value_item, - { "pathname-value", "ftam.pathname_value_item", + { "pathname-value item", "ftam.pathname_value_item", FT_UINT32, BASE_DEC, VALS(ftam_T_pathname_value_item_vals), 0, "ftam.T_pathname_value_item", HFILL }}, { &hf_ftam_string_match, @@ -6027,7 +6027,7 @@ void proto_register_ftam(void) { FT_UINT32, BASE_DEC, NULL, 0, "ftam.T_string_value", HFILL }}, { &hf_ftam_string_value_item, - { "string-value", "ftam.string_value_item", + { "string-value item", "ftam.string_value_item", FT_UINT32, BASE_DEC, VALS(ftam_T_string_value_item_vals), 0, "ftam.T_string_value_item", HFILL }}, { &hf_ftam_substring_match, @@ -6087,7 +6087,7 @@ void proto_register_ftam(void) { FT_NONE, BASE_NONE, NULL, 0, "ftam.Object_Identifier_Pattern", HFILL }}, { &hf_ftam_Attribute_Extensions_Pattern_item, - { "Attribute-Extensions-Pattern", "ftam.Attribute_Extensions_Pattern_item", + { "Attribute-Extensions-Pattern item", "ftam.Attribute_Extensions_Pattern_item", FT_NONE, BASE_NONE, NULL, 0, "ftam.Attribute_Extensions_Pattern_item", HFILL }}, { &hf_ftam_extension_set_attribute_Patterns, @@ -6095,7 +6095,7 @@ void proto_register_ftam(void) { FT_UINT32, BASE_DEC, NULL, 0, "ftam.T_extension_set_attribute_Patterns", HFILL }}, { &hf_ftam_extension_set_attribute_Patterns_item, - { "extension-set-attribute-Patterns", "ftam.extension_set_attribute_Patterns_item", + { "extension-set-attribute-Patterns item", "ftam.extension_set_attribute_Patterns_item", FT_NONE, BASE_NONE, NULL, 0, "ftam.T_extension_set_attribute_Patterns_item", HFILL }}, { &hf_ftam_attribute_extension_attribute_identifier, @@ -6107,7 +6107,7 @@ void proto_register_ftam(void) { FT_NONE, BASE_NONE, NULL, 0, "ftam.T_extension_attribute_Pattern", HFILL }}, { &hf_ftam__untag_item_04, - { "_untag", "ftam._untag_item", + { "Read-Attributes", "ftam.Read_Attributes", FT_NONE, BASE_NONE, NULL, 0, "ftam.Read_Attributes", HFILL }}, { &hf_ftam_success_Object_count, @@ -6119,19 +6119,19 @@ void proto_register_ftam(void) { FT_UINT32, BASE_DEC, NULL, 0, "ftam.SEQUENCE_OF_Pathname", HFILL }}, { &hf_ftam_success_Object_names_item, - { "success-Object-names", "ftam.success_Object_names_item", + { "Pathname", "ftam.Pathname", FT_UINT32, BASE_DEC, NULL, 0, "ftam.Pathname", HFILL }}, { &hf_ftam_Pathname_item, - { "Pathname", "ftam.Pathname_item", + { "Pathname item", "ftam.Pathname_item", FT_STRING, BASE_NONE, NULL, 0, "ftam.GraphicString", HFILL }}, { &hf_ftam_Pass_Passwords_item, - { "Pass-Passwords", "ftam.Pass_Passwords_item", + { "Password", "ftam.Password", FT_UINT32, BASE_DEC, VALS(ftam_Password_U_vals), 0, "ftam.Password", HFILL }}, { &hf_ftam__untag_item_05, - { "_untag", "ftam._untag_item", + { "_untag item", "ftam._untag_item", FT_NONE, BASE_NONE, NULL, 0, "ftam.Path_Access_Passwords_item", HFILL }}, { &hf_ftam_ap, diff --git a/epan/dissectors/packet-ftam.h b/epan/dissectors/packet-ftam.h index d9670b25fe..ddc5b5f42b 100644 --- a/epan/dissectors/packet-ftam.h +++ b/epan/dissectors/packet-ftam.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-ftam.h */ -/* ../../tools/asn2wrs.py -b -p ftam -c ftam.cnf -s packet-ftam-template ISO8571-FTAM.asn */ +/* ../../tools/asn2wrs.py -b -p ftam -c ./ftam.cnf -s ./packet-ftam-template -D . ISO8571-FTAM.asn */ /* Input file: packet-ftam-template.h */ diff --git a/epan/dissectors/packet-gnm.c b/epan/dissectors/packet-gnm.c index 5d60c9de8b..e4a0a3e83f 100644 --- a/epan/dissectors/packet-gnm.c +++ b/epan/dissectors/packet-gnm.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-gnm.c */ -/* ../../tools/asn2wrs.py -b -p gnm -c gnm.cnf -s packet-gnm-template GNM.asn */ +/* ../../tools/asn2wrs.py -b -p gnm -c ./gnm.cnf -s ./packet-gnm-template -D . GNM.asn */ /* Input file: packet-gnm-template.c */ @@ -2234,7 +2234,7 @@ void proto_register_gnm(void) { FT_STRING, BASE_NONE, NULL, 0, "gnm.Version", HFILL }}, { &hf_gnm_MappingList_item, - { "MappingList", "gnm.MappingList_item", + { "PayloadLevel", "gnm.PayloadLevel", FT_OID, BASE_NONE, NULL, 0, "gnm.PayloadLevel", HFILL }}, { &hf_gnm_objectClass, @@ -2246,11 +2246,11 @@ void proto_register_gnm(void) { FT_OID, BASE_NONE, NULL, 0, "gnm.CharacteristicInformation", HFILL }}, { &hf_gnm_SupportedTOClasses_item, - { "SupportedTOClasses", "gnm.SupportedTOClasses_item", + { "SupportedTOClasses item", "gnm.SupportedTOClasses_item", FT_OID, BASE_NONE, NULL, 0, "gnm.OBJECT_IDENTIFIER", HFILL }}, { &hf_gnm_AcceptableCircuitPackTypeList_item, - { "AcceptableCircuitPackTypeList", "gnm.AcceptableCircuitPackTypeList_item", + { "AcceptableCircuitPackTypeList item", "gnm.AcceptableCircuitPackTypeList_item", FT_STRING, BASE_NONE, NULL, 0, "gnm.PrintableString", HFILL }}, { &hf_gnm_mpCrossConnection, @@ -2262,7 +2262,7 @@ void proto_register_gnm(void) { FT_UINT32, BASE_DEC, NULL, 0, "gnm.SET_OF_ToTermSpecifier", HFILL }}, { &hf_gnm_legs_item, - { "legs", "gnm.legs_item", + { "ToTermSpecifier", "gnm.ToTermSpecifier", FT_UINT32, BASE_DEC, VALS(gnm_ToTermSpecifier_vals), 0, "gnm.ToTermSpecifier", HFILL }}, { &hf_gnm_problem, @@ -2282,7 +2282,7 @@ void proto_register_gnm(void) { FT_UINT32, BASE_DEC, VALS(gnm_AlarmSeverityCode_vals), 0, "gnm.AlarmSeverityCode", HFILL }}, { &hf_gnm_AlarmSeverityAssignmentList_item, - { "AlarmSeverityAssignmentList", "gnm.AlarmSeverityAssignmentList_item", + { "AlarmSeverityAssignment", "gnm.AlarmSeverityAssignment", FT_NONE, BASE_NONE, NULL, 0, "gnm.AlarmSeverityAssignment", HFILL }}, { &hf_gnm_characteristicInfoType, @@ -2302,7 +2302,7 @@ void proto_register_gnm(void) { FT_NONE, BASE_NONE, NULL, 0, "gnm.PointToMultipoint", HFILL }}, { &hf_gnm_ConnectInformation_item, - { "ConnectInformation", "gnm.ConnectInformation_item", + { "ConnectInformation item", "gnm.ConnectInformation_item", FT_NONE, BASE_NONE, NULL, 0, "gnm.ConnectInformation_item", HFILL }}, { &hf_gnm_itemType, @@ -2354,7 +2354,7 @@ void proto_register_gnm(void) { FT_UINT32, BASE_DEC, NULL, 0, "gnm.SEQUENCE_OF_ObjectInstance", HFILL }}, { &hf_gnm_concatenated_item, - { "concatenated", "gnm.concatenated_item", + { "ObjectInstance", "gnm.ObjectInstance", FT_UINT32, BASE_DEC, VALS(cmip_ObjectInstance_vals), 0, "cmip.ObjectInstance", HFILL }}, { &hf_gnm_explicitPToP, @@ -2390,11 +2390,11 @@ void proto_register_gnm(void) { FT_UINT32, BASE_DEC, VALS(gnm_AlarmStatus_vals), 0, "gnm.AlarmStatus", HFILL }}, { &hf_gnm_CurrentProblemList_item, - { "CurrentProblemList", "gnm.CurrentProblemList_item", + { "CurrentProblem", "gnm.CurrentProblem", FT_NONE, BASE_NONE, NULL, 0, "gnm.CurrentProblem", HFILL }}, { &hf_gnm_DisconnectResult_item, - { "DisconnectResult", "gnm.DisconnectResult_item", + { "DisconnectResult item", "gnm.DisconnectResult_item", FT_UINT32, BASE_DEC, VALS(gnm_DisconnectResult_item_vals), 0, "gnm.DisconnectResult_item", HFILL }}, { &hf_gnm_failed, @@ -2410,7 +2410,7 @@ void proto_register_gnm(void) { FT_UINT32, BASE_DEC, NULL, 0, "gnm.SET_OF_ObjectInstance", HFILL }}, { &hf_gnm_broadcast_item, - { "broadcast", "gnm.broadcast_item", + { "ObjectInstance", "gnm.ObjectInstance", FT_UINT32, BASE_DEC, VALS(cmip_ObjectInstance_vals), 0, "cmip.ObjectInstance", HFILL }}, { &hf_gnm_broadcastConcatenated, @@ -2418,11 +2418,11 @@ void proto_register_gnm(void) { FT_UINT32, BASE_DEC, NULL, 0, "gnm.T_broadcastConcatenated", HFILL }}, { &hf_gnm_broadcastConcatenated_item, - { "broadcastConcatenated", "gnm.broadcastConcatenated_item", + { "broadcastConcatenated item", "gnm.broadcastConcatenated_item", FT_UINT32, BASE_DEC, NULL, 0, "gnm.SEQUENCE_OF_ObjectInstance", HFILL }}, { &hf_gnm__item_item, - { "_item", "gnm._item_item", + { "ObjectInstance", "gnm.ObjectInstance", FT_UINT32, BASE_DEC, VALS(cmip_ObjectInstance_vals), 0, "cmip.ObjectInstance", HFILL }}, { &hf_gnm_fromTp, @@ -2434,7 +2434,7 @@ void proto_register_gnm(void) { FT_UINT32, BASE_DEC, NULL, 0, "gnm.SET_OF_ExplicitTP", HFILL }}, { &hf_gnm_toTPs_item, - { "toTPs", "gnm.toTPs_item", + { "ExplicitTP", "gnm.ExplicitTP", FT_UINT32, BASE_DEC, VALS(gnm_ExplicitTP_vals), 0, "gnm.ExplicitTP", HFILL }}, { &hf_gnm_toTp, @@ -2450,11 +2450,11 @@ void proto_register_gnm(void) { FT_UINT32, BASE_DEC, NULL, 0, "gnm.SEQUENCE_OF_ObjectInstance", HFILL }}, { &hf_gnm_listofTPs_item, - { "listofTPs", "gnm.listofTPs_item", + { "ObjectInstance", "gnm.ObjectInstance", FT_UINT32, BASE_DEC, VALS(cmip_ObjectInstance_vals), 0, "cmip.ObjectInstance", HFILL }}, { &hf_gnm_EquipmentHolderAddress_item, - { "EquipmentHolderAddress", "gnm.EquipmentHolderAddress_item", + { "EquipmentHolderAddress item", "gnm.EquipmentHolderAddress_item", FT_STRING, BASE_NONE, NULL, 0, "gnm.PrintableString", HFILL }}, { &hf_gnm_logicalProblem, @@ -2482,7 +2482,7 @@ void proto_register_gnm(void) { FT_NONE, BASE_NONE, NULL, 0, "gnm.NULL", HFILL }}, { &hf_gnm_ListOfCharacteristicInformation_item, - { "ListOfCharacteristicInformation", "gnm.ListOfCharacteristicInformation_item", + { "CharacteristicInformation", "gnm.CharacteristicInformation", FT_OID, BASE_NONE, NULL, 0, "gnm.CharacteristicInformation", HFILL }}, { &hf_gnm_problemCause, @@ -2494,11 +2494,11 @@ void proto_register_gnm(void) { FT_UINT32, BASE_DEC, NULL, 0, "gnm.SET_OF_ObjectInstance", HFILL }}, { &hf_gnm_incorrectInstances_item, - { "incorrectInstances", "gnm.incorrectInstances_item", + { "ObjectInstance", "gnm.ObjectInstance", FT_UINT32, BASE_DEC, VALS(cmip_ObjectInstance_vals), 0, "cmip.ObjectInstance", HFILL }}, { &hf_gnm_MultipleConnections_item, - { "MultipleConnections", "gnm.MultipleConnections_item", + { "MultipleConnections item", "gnm.MultipleConnections_item", FT_UINT32, BASE_DEC, VALS(gnm_MultipleConnections_item_vals), 0, "gnm.MultipleConnections_item", HFILL }}, { &hf_gnm_downstreamNotConnected, @@ -2534,7 +2534,7 @@ void proto_register_gnm(void) { FT_STRING, BASE_NONE, NULL, 0, "gnm.GraphicString", HFILL }}, { &hf_gnm_ObjectList_item, - { "ObjectList", "gnm.ObjectList_item", + { "ObjectInstance", "gnm.ObjectInstance", FT_UINT32, BASE_DEC, VALS(cmip_ObjectInstance_vals), 0, "cmip.ObjectInstance", HFILL }}, { &hf_gnm_diverse, @@ -2578,7 +2578,7 @@ void proto_register_gnm(void) { FT_UINT32, BASE_DEC, NULL, 0, "gnm.T_toTps", HFILL }}, { &hf_gnm_toTps_item, - { "toTps", "gnm.toTps_item", + { "toTps item", "gnm.toTps_item", FT_NONE, BASE_NONE, NULL, 0, "gnm.T_toTps_item", HFILL }}, { &hf_gnm_tp, @@ -2618,11 +2618,11 @@ void proto_register_gnm(void) { FT_UINT32, BASE_DEC, VALS(cmip_ObjectInstance_vals), 0, "cmip.ObjectInstance", HFILL }}, { &hf_gnm_SequenceOfObjectInstance_item, - { "SequenceOfObjectInstance", "gnm.SequenceOfObjectInstance_item", + { "ObjectInstance", "gnm.ObjectInstance", FT_UINT32, BASE_DEC, VALS(cmip_ObjectInstance_vals), 0, "cmip.ObjectInstance", HFILL }}, { &hf_gnm_SignalRateAndMappingList_item, - { "SignalRateAndMappingList", "gnm.SignalRateAndMappingList_item", + { "SignalRateAndMappingList item", "gnm.SignalRateAndMappingList_item", FT_NONE, BASE_NONE, NULL, 0, "gnm.SignalRateAndMappingList_item", HFILL }}, { &hf_gnm_signalRate, @@ -2650,7 +2650,7 @@ void proto_register_gnm(void) { FT_UINT32, BASE_DEC, NULL, 0, "gnm.SEQUENCE_OF_Bundle", HFILL }}, { &hf_gnm_complex_item, - { "complex", "gnm.complex_item", + { "Bundle", "gnm.Bundle", FT_NONE, BASE_NONE, NULL, 0, "gnm.Bundle", HFILL }}, { &hf_gnm_notApplicable, @@ -2662,7 +2662,7 @@ void proto_register_gnm(void) { FT_UINT32, BASE_DEC, NULL, 0, "gnm.SEQUENCE_OF_ObjectInstance", HFILL }}, { &hf_gnm_softwareInstances_item, - { "softwareInstances", "gnm.softwareInstances_item", + { "ObjectInstance", "gnm.ObjectInstance", FT_UINT32, BASE_DEC, VALS(cmip_ObjectInstance_vals), 0, "cmip.ObjectInstance", HFILL }}, { &hf_gnm_softwareIdentifiers, @@ -2670,11 +2670,11 @@ void proto_register_gnm(void) { FT_UINT32, BASE_DEC, NULL, 0, "gnm.T_softwareIdentifiers", HFILL }}, { &hf_gnm_softwareIdentifiers_item, - { "softwareIdentifiers", "gnm.softwareIdentifiers_item", + { "softwareIdentifiers item", "gnm.softwareIdentifiers_item", FT_STRING, BASE_NONE, NULL, 0, "gnm.PrintableString", HFILL }}, { &hf_gnm_SupportableClientList_item, - { "SupportableClientList", "gnm.SupportableClientList_item", + { "ObjectClass", "gnm.ObjectClass", FT_UINT32, BASE_DEC, VALS(cmip_ObjectClass_vals), 0, "cmip.ObjectClass", HFILL }}, { &hf_gnm_sourceType, @@ -2702,7 +2702,7 @@ void proto_register_gnm(void) { FT_UINT32, BASE_DEC, VALS(cmip_ObjectInstance_vals), 0, "cmip.ObjectInstance", HFILL }}, { &hf_gnm_ToTPPools_item, - { "ToTPPools", "gnm.ToTPPools_item", + { "ToTPPools item", "gnm.ToTPPools_item", FT_NONE, BASE_NONE, NULL, 0, "gnm.ToTPPools_item", HFILL }}, { &hf_gnm_tpPoolId, @@ -2714,7 +2714,7 @@ void proto_register_gnm(void) { FT_INT32, BASE_DEC, NULL, 0, "gnm.INTEGER", HFILL }}, { &hf_gnm_TpsInGtpList_item, - { "TpsInGtpList", "gnm.TpsInGtpList_item", + { "ObjectInstance", "gnm.ObjectInstance", FT_UINT32, BASE_DEC, VALS(cmip_ObjectInstance_vals), 0, "cmip.ObjectInstance", HFILL }}, { &hf_gnm_TransmissionCharacteristics_satellite, diff --git a/epan/dissectors/packet-gnm.h b/epan/dissectors/packet-gnm.h index 1ef57e3411..0f37fa1362 100644 --- a/epan/dissectors/packet-gnm.h +++ b/epan/dissectors/packet-gnm.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-gnm.h */ -/* ../../tools/asn2wrs.py -b -p gnm -c gnm.cnf -s packet-gnm-template GNM.asn */ +/* ../../tools/asn2wrs.py -b -p gnm -c ./gnm.cnf -s ./packet-gnm-template -D . GNM.asn */ /* Input file: packet-gnm-template.h */ diff --git a/epan/dissectors/packet-goose.c b/epan/dissectors/packet-goose.c index ef4eacec9d..4fec0387ce 100644 --- a/epan/dissectors/packet-goose.c +++ b/epan/dissectors/packet-goose.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-goose.c */ -/* ../../tools/asn2wrs.py -b -p goose -c goose.cnf -s packet-goose-template goose.asn */ +/* ../../tools/asn2wrs.py -b -p goose -c ./goose.cnf -s ./packet-goose-template -D . goose.asn */ /* Input file: packet-goose-template.c */ @@ -793,7 +793,7 @@ void proto_register_goose(void) { FT_UINT32, BASE_DEC, NULL, 0, "goose.T_offset", HFILL }}, { &hf_goose_offset_item, - { "offset", "goose.offset_item", + { "offset item", "goose.offset_item", FT_INT32, BASE_DEC, NULL, 0, "goose.INTEGER", HFILL }}, { &hf_goose_references, @@ -801,7 +801,7 @@ void proto_register_goose(void) { FT_UINT32, BASE_DEC, NULL, 0, "goose.T_references", HFILL }}, { &hf_goose_references_item, - { "references", "goose.references_item", + { "references item", "goose.references_item", FT_STRING, BASE_NONE, NULL, 0, "goose.VisibleString", HFILL }}, { &hf_goose_confRev, @@ -825,7 +825,7 @@ void proto_register_goose(void) { FT_UINT32, BASE_DEC, NULL, 0, "goose.SEQUENCE_OF_RequestResults", HFILL }}, { &hf_goose_result_item, - { "result", "goose.result_item", + { "RequestResults", "goose.RequestResults", FT_UINT32, BASE_DEC, VALS(goose_RequestResults_vals), 0, "goose.RequestResults", HFILL }}, { &hf_goose_responseNegative, @@ -885,7 +885,7 @@ void proto_register_goose(void) { FT_UINT32, BASE_DEC, NULL, 0, "goose.SEQUENCE_OF_Data", HFILL }}, { &hf_goose_allData_item, - { "allData", "goose.allData_item", + { "Data", "goose.Data", FT_UINT32, BASE_DEC, VALS(goose_Data_vals), 0, "goose.Data", HFILL }}, { &hf_goose_array, @@ -893,7 +893,7 @@ void proto_register_goose(void) { FT_UINT32, BASE_DEC, NULL, 0, "goose.SEQUENCE_OF_Data", HFILL }}, { &hf_goose_array_item, - { "array", "goose.array_item", + { "Data", "goose.Data", FT_UINT32, BASE_DEC, VALS(goose_Data_vals), 0, "goose.Data", HFILL }}, { &hf_goose_structure, @@ -901,7 +901,7 @@ void proto_register_goose(void) { FT_UINT32, BASE_DEC, NULL, 0, "goose.SEQUENCE_OF_Data", HFILL }}, { &hf_goose_structure_item, - { "structure", "goose.structure_item", + { "Data", "goose.Data", FT_UINT32, BASE_DEC, VALS(goose_Data_vals), 0, "goose.Data", HFILL }}, { &hf_goose_boolean, diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c index 6fd960bb2b..e3e5ab44c6 100644 --- a/epan/dissectors/packet-gsm_map.c +++ b/epan/dissectors/packet-gsm_map.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-gsm_map.c */ -/* ../../tools/asn2wrs.py -b -e -c gsmmap.cnf -s packet-gsmmap-template ../ros/Remote-Operations-Information-Objects.asn MobileDomainDefinitions.asn MAP-ApplicationContexts.asn MAP-SS-Code.asn MAP-BS-Code.asn MAP-TS-Code.asn MAP-ExtensionDataTypes.asn MAP-CommonDataTypes.asn MAP-SS-DataTypes.asn MAP-ER-DataTypes.asn MAP-SM-DataTypes.asn MAP-OM-DataTypes.asn MAP-MS-DataTypes.asn MAP-CH-DataTypes.asn MAP-LCS-DataTypes.asn MAP-GR-DataTypes.asn MAP-DialogueInformation.asn MAP-LocationServiceOperations.asn MAP-Group-Call-Operations.asn MAP-ShortMessageServiceOperations.asn MAP-SupplementaryServiceOperations.asn MAP-CallHandlingOperations.asn MAP-OperationAndMaintenanceOperations.asn MAP-MobileServiceOperations.asn MAP-Errors.asn MAP-Protocol.asn GSMMAP.asn SS-DataTypes.asn SS-Operations.asn */ +/* ../../tools/asn2wrs.py -b -e -c ./gsmmap.cnf -s ./packet-gsmmap-template -D . ../ros/Remote-Operations-Information-Objects.asn MobileDomainDefinitions.asn MAP-ApplicationContexts.asn MAP-SS-Code.asn MAP-BS-Code.asn MAP-TS-Code.asn MAP-ExtensionDataTypes.asn MAP-CommonDataTypes.asn MAP-SS-DataTypes.asn MAP-ER-DataTypes.asn MAP-SM-DataTypes.asn MAP-OM-DataTypes.asn MAP-MS-DataTypes.asn MAP-CH-DataTypes.asn MAP-LCS-DataTypes.asn MAP-GR-DataTypes.asn MAP-DialogueInformation.asn MAP-LocationServiceOperations.asn MAP-Group-Call-Operations.asn MAP-ShortMessageServiceOperations.asn MAP-SupplementaryServiceOperations.asn MAP-CallHandlingOperations.asn MAP-OperationAndMaintenanceOperations.asn MAP-MobileServiceOperations.asn MAP-Errors.asn MAP-Protocol.asn GSMMAP.asn SS-DataTypes.asn SS-Operations.asn */ /* Input file: packet-gsmmap-template.c */ @@ -18279,7 +18279,7 @@ void proto_register_gsm_map(void) { FT_NONE, BASE_NONE, NULL, 0, "gsm_map.SLR_Arg_PCS_Extensions", HFILL }}, { &hf_gsm_map_PrivateExtensionList_item, - { "PrivateExtensionList", "gsm_map.PrivateExtensionList_item", + { "PrivateExtension", "gsm_map.PrivateExtension", FT_NONE, BASE_NONE, NULL, 0, "gsm_map.PrivateExtension", HFILL }}, { &hf_gsm_map_extId, @@ -18334,7 +18334,7 @@ void proto_register_gsm_map(void) { FT_BYTES, BASE_HEX, NULL, 0, "gsm_map.LMSI", HFILL }}, { &hf_gsm_map_HLR_List_item, - { "HLR-List", "gsm_map.HLR_List_item", + { "HLR-Id", "gsm_map.HLR_Id", FT_BYTES, BASE_HEX, NULL, 0, "gsm_map.HLR_Id", HFILL }}, { &hf_gsm_map_naea_PreferredCIC, @@ -18449,7 +18449,7 @@ void proto_register_gsm_map(void) { FT_UINT32, BASE_DEC, NULL, 0, "gsm_map_ss.ForwardingFeatureList", HFILL }}, { &hf_gsm_map_ss_ForwardingFeatureList_item, - { "ForwardingFeatureList", "gsm_map.ss.ForwardingFeatureList_item", + { "ForwardingFeature", "gsm_map.ss.ForwardingFeature", FT_NONE, BASE_NONE, NULL, 0, "gsm_map_ss.ForwardingFeature", HFILL }}, { &hf_gsm_map_ss_ss_Status, @@ -18473,7 +18473,7 @@ void proto_register_gsm_map(void) { FT_UINT32, BASE_DEC, NULL, 0, "gsm_map_ss.CallBarringFeatureList", HFILL }}, { &hf_gsm_map_ss_CallBarringFeatureList_item, - { "CallBarringFeatureList", "gsm_map.ss.CallBarringFeatureList_item", + { "CallBarringFeature", "gsm_map.ss.CallBarringFeature", FT_NONE, BASE_NONE, NULL, 0, "gsm_map_ss.CallBarringFeature", HFILL }}, { &hf_gsm_map_ss_ss_SubscriptionOption, @@ -18509,7 +18509,7 @@ void proto_register_gsm_map(void) { FT_UINT32, BASE_DEC, NULL, 0, "gsm_map.MC_Bearers", HFILL }}, { &hf_gsm_map_ss_CCBS_FeatureList_item, - { "CCBS-FeatureList", "gsm_map.ss.CCBS_FeatureList_item", + { "CCBS-Feature", "gsm_map.ss.CCBS_Feature", FT_NONE, BASE_NONE, NULL, 0, "gsm_map_ss.CCBS_Feature", HFILL }}, { &hf_gsm_map_ss_ccbs_Index, @@ -18549,11 +18549,11 @@ void proto_register_gsm_map(void) { FT_BYTES, BASE_HEX, NULL, 0, "gsm_map.ISDN_AddressString", HFILL }}, { &hf_gsm_map_ss_SS_List_item, - { "SS-List", "gsm_map.ss.SS_List_item", + { "SS-Code", "gsm_map.ss.SS_Code", FT_UINT8, BASE_DEC, VALS(ssCode_vals), 0, "gsm_map.SS_Code", HFILL }}, { &hf_gsm_map_ss_BasicServiceGroupList_item, - { "BasicServiceGroupList", "gsm_map.ss.BasicServiceGroupList_item", + { "BasicServiceCode", "gsm_map.ss.BasicServiceCode", FT_UINT32, BASE_DEC, VALS(gsm_map_BasicServiceCode_vals), 0, "gsm_map.BasicServiceCode", HFILL }}, { &hf_gsm_map_ss_imsi, @@ -18577,7 +18577,7 @@ void proto_register_gsm_map(void) { FT_UINT32, BASE_DEC, VALS(gsm_map_ss_CCBS_RequestState_vals), 0, "gsm_map_ss.CCBS_RequestState", HFILL }}, { &hf_gsm_map_ss_SS_EventSpecification_item, - { "SS-EventSpecification", "gsm_map.ss.SS_EventSpecification_item", + { "AddressString", "gsm_map.ss.AddressString", FT_BYTES, BASE_HEX, NULL, 0, "gsm_map.AddressString", HFILL }}, { &hf_gsm_map_ss_ccbs_Data, @@ -18891,7 +18891,7 @@ void proto_register_gsm_map(void) { FT_NONE, BASE_NONE, NULL, 0, "gsm_map_sm.NULL", HFILL }}, { &hf_gsm_map_sm_DispatcherList_item, - { "DispatcherList", "gsm_map.sm.DispatcherList_item", + { "ISDN-AddressString", "gsm_map.sm.ISDN_AddressString", FT_BYTES, BASE_HEX, NULL, 0, "gsm_map.ISDN_AddressString", HFILL }}, { &hf_gsm_map_sm_MW_Status_sc_AddressNotIncluded, @@ -19353,7 +19353,7 @@ void proto_register_gsm_map(void) { FT_BYTES, BASE_HEX, NULL, 0, "gsm_map.IMEI", HFILL }}, { &hf_gsm_map_ms_PagingArea_item, - { "PagingArea", "gsm_map.ms.PagingArea_item", + { "LocationArea", "gsm_map.ms.LocationArea", FT_UINT32, BASE_DEC, VALS(gsm_map_ms_LocationArea_vals), 0, "gsm_map_ms.LocationArea", HFILL }}, { &hf_gsm_map_ms_laiFixedLength, @@ -19429,11 +19429,11 @@ void proto_register_gsm_map(void) { FT_UINT32, BASE_DEC, NULL, 0, "gsm_map_ms.QuintupletList", HFILL }}, { &hf_gsm_map_ms_TripletList_item, - { "TripletList", "gsm_map.ms.TripletList_item", + { "AuthenticationTriplet", "gsm_map.ms.AuthenticationTriplet", FT_NONE, BASE_NONE, NULL, 0, "gsm_map_ms.AuthenticationTriplet", HFILL }}, { &hf_gsm_map_ms_QuintupletList_item, - { "QuintupletList", "gsm_map.ms.QuintupletList_item", + { "AuthenticationQuintuplet", "gsm_map.ms.AuthenticationQuintuplet", FT_NONE, BASE_NONE, NULL, 0, "gsm_map_ms.AuthenticationQuintuplet", HFILL }}, { &hf_gsm_map_ms_rand, @@ -19665,11 +19665,11 @@ void proto_register_gsm_map(void) { FT_NONE, BASE_NONE, NULL, 0, "gsm_map_ms.UESBI_Iu", HFILL }}, { &hf_gsm_map_ms_BSSMAP_ServiceHandoverList_item, - { "BSSMAP-ServiceHandoverList", "gsm_map.ms.BSSMAP_ServiceHandoverList_item", + { "BSSMAP-ServiceHandoverInfo", "gsm_map.ms.BSSMAP_ServiceHandoverInfo", FT_NONE, BASE_NONE, NULL, 0, "gsm_map_ms.BSSMAP_ServiceHandoverInfo", HFILL }}, { &hf_gsm_map_ms_RadioResourceList_item, - { "RadioResourceList", "gsm_map.ms.RadioResourceList_item", + { "RadioResource", "gsm_map.ms.RadioResource", FT_NONE, BASE_NONE, NULL, 0, "gsm_map_ms.RadioResource", HFILL }}, { &hf_gsm_map_ms_handoverNumber, @@ -19773,7 +19773,7 @@ void proto_register_gsm_map(void) { FT_BYTES, BASE_HEX, NULL, 0, "gsm_map_ms.Codec", HFILL }}, { &hf_gsm_map_ms_RelocationNumberList_item, - { "RelocationNumberList", "gsm_map.ms.RelocationNumberList_item", + { "RelocationNumber", "gsm_map.ms.RelocationNumber", FT_NONE, BASE_NONE, NULL, 0, "gsm_map_ms.RelocationNumber", HFILL }}, { &hf_gsm_map_ms_immediateResponsePreferred, @@ -19809,7 +19809,7 @@ void proto_register_gsm_map(void) { FT_UINT32, BASE_DEC, NULL, 0, "gsm_map_ms.EPS_AuthenticationSetList", HFILL }}, { &hf_gsm_map_ms_EPS_AuthenticationSetList_item, - { "EPS-AuthenticationSetList", "gsm_map.ms.EPS_AuthenticationSetList_item", + { "EPC-AV", "gsm_map.ms.EPC_AV", FT_NONE, BASE_NONE, NULL, 0, "gsm_map_ms.EPC_AV", HFILL }}, { &hf_gsm_map_ms_kasme, @@ -19841,7 +19841,7 @@ void proto_register_gsm_map(void) { FT_BYTES, BASE_HEX, NULL, 0, "gsm_map_ms.UESBI_IuB", HFILL }}, { &hf_gsm_map_ms_CSG_SubscriptionDataList_item, - { "CSG-SubscriptionDataList", "gsm_map.ms.CSG_SubscriptionDataList_item", + { "CSG-SubscriptionData", "gsm_map.ms.CSG_SubscriptionData", FT_NONE, BASE_NONE, NULL, 0, "gsm_map_ms.CSG_SubscriptionData", HFILL }}, { &hf_gsm_map_ms_csg_Id, @@ -19885,7 +19885,7 @@ void proto_register_gsm_map(void) { FT_UINT32, BASE_DEC, NULL, 0, "gsm_map_ms.EPS_DataList", HFILL }}, { &hf_gsm_map_ms_EPS_DataList_item, - { "EPS-DataList", "gsm_map.ms.EPS_DataList_item", + { "APN-Configuration", "gsm_map.ms.APN_Configuration", FT_NONE, BASE_NONE, NULL, 0, "gsm_map_ms.APN_Configuration", HFILL }}, { &hf_gsm_map_ms_servedPartyIP_Address, @@ -19929,7 +19929,7 @@ void proto_register_gsm_map(void) { FT_INT32, BASE_DEC, NULL, 0, "gsm_map_ms.Bandwidth", HFILL }}, { &hf_gsm_map_ms_SpecificAPNInfoList_item, - { "SpecificAPNInfoList", "gsm_map.ms.SpecificAPNInfoList_item", + { "SpecificAPNInfo", "gsm_map.ms.SpecificAPNInfo", FT_NONE, BASE_NONE, NULL, 0, "gsm_map_ms.SpecificAPNInfo", HFILL }}, { &hf_gsm_map_ms_priority_level, @@ -19973,11 +19973,11 @@ void proto_register_gsm_map(void) { FT_UINT32, BASE_DEC, NULL, 0, "gsm_map_ms.LCS_PrivacyExceptionList", HFILL }}, { &hf_gsm_map_ms_GMLC_List_item, - { "GMLC-List", "gsm_map.ms.GMLC_List_item", + { "ISDN-AddressString", "gsm_map.ms.ISDN_AddressString", FT_BYTES, BASE_HEX, NULL, 0, "gsm_map.ISDN_AddressString", HFILL }}, { &hf_gsm_map_ms_GPRSDataList_item, - { "GPRSDataList", "gsm_map.ms.GPRSDataList_item", + { "PDP-Context", "gsm_map.ms.PDP_Context", FT_NONE, BASE_NONE, NULL, 0, "gsm_map_ms.PDP_Context", HFILL }}, { &hf_gsm_map_ms_pdp_ContextId, @@ -20053,7 +20053,7 @@ void proto_register_gsm_map(void) { FT_NONE, BASE_NONE, NULL, 0, "gsm_map_ms.NULL", HFILL }}, { &hf_gsm_map_ms_GPRS_CamelTDPDataList_item, - { "GPRS-CamelTDPDataList", "gsm_map.ms.GPRS_CamelTDPDataList_item", + { "GPRS-CamelTDPData", "gsm_map.ms.GPRS_CamelTDPData", FT_NONE, BASE_NONE, NULL, 0, "gsm_map_ms.GPRS_CamelTDPData", HFILL }}, { &hf_gsm_map_ms_gprs_TriggerDetectionPoint, @@ -20073,7 +20073,7 @@ void proto_register_gsm_map(void) { FT_UINT32, BASE_DEC, VALS(gsm_map_ms_DefaultGPRS_Handling_vals), 0, "gsm_map_ms.DefaultGPRS_Handling", HFILL }}, { &hf_gsm_map_ms_LSADataList_item, - { "LSADataList", "gsm_map.ms.LSADataList_item", + { "LSAData", "gsm_map.ms.LSAData", FT_NONE, BASE_NONE, NULL, 0, "gsm_map_ms.LSAData", HFILL }}, { &hf_gsm_map_ms_lsaIdentity, @@ -20145,11 +20145,11 @@ void proto_register_gsm_map(void) { FT_NONE, BASE_NONE, NULL, 0, "gsm_map_ms.VlrCamelSubscriptionInfo", HFILL }}, { &hf_gsm_map_ms_BearerServiceList_item, - { "BearerServiceList", "gsm_map.ms.BearerServiceList_item", + { "Ext-BearerServiceCode", "gsm_map.ms.Ext_BearerServiceCode", FT_UINT8, BASE_DEC, VALS(Bearerservice_vals), 0, "gsm_map.Ext_BearerServiceCode", HFILL }}, { &hf_gsm_map_ms_TeleserviceList_item, - { "TeleserviceList", "gsm_map.ms.TeleserviceList_item", + { "Ext-TeleserviceCode", "gsm_map.ms.Ext_TeleserviceCode", FT_UINT8, BASE_DEC, VALS(Teleservice_vals), 0, "gsm_map.Ext_TeleserviceCode", HFILL }}, { &hf_gsm_map_ms_odb_GeneralData, @@ -20161,7 +20161,7 @@ void proto_register_gsm_map(void) { FT_BYTES, BASE_HEX, NULL, 0, "gsm_map_ms.ODB_HPLMN_Data", HFILL }}, { &hf_gsm_map_ms_Ext_SS_InfoList_item, - { "Ext-SS-InfoList", "gsm_map.ms.Ext_SS_InfoList_item", + { "Ext-SS-Info", "gsm_map.ms.Ext_SS_Info", FT_UINT32, BASE_DEC, VALS(gsm_map_ms_Ext_SS_Info_vals), 0, "gsm_map_ms.Ext_SS_Info", HFILL }}, { &hf_gsm_map_ms_forwardingInfo, @@ -20193,7 +20193,7 @@ void proto_register_gsm_map(void) { FT_UINT32, BASE_DEC, NULL, 0, "gsm_map_ms.Ext_ForwFeatureList", HFILL }}, { &hf_gsm_map_ms_Ext_ForwFeatureList_item, - { "Ext-ForwFeatureList", "gsm_map.ms.Ext_ForwFeatureList_item", + { "Ext-ForwFeature", "gsm_map.ms.Ext_ForwFeature", FT_NONE, BASE_NONE, NULL, 0, "gsm_map_ms.Ext_ForwFeature", HFILL }}, { &hf_gsm_map_ms_basicService, @@ -20229,7 +20229,7 @@ void proto_register_gsm_map(void) { FT_UINT32, BASE_DEC, NULL, 0, "gsm_map_ms.Ext_CallBarFeatureList", HFILL }}, { &hf_gsm_map_ms_Ext_CallBarFeatureList_item, - { "Ext-CallBarFeatureList", "gsm_map.ms.Ext_CallBarFeatureList_item", + { "Ext-CallBarringFeature", "gsm_map.ms.Ext_CallBarringFeature", FT_NONE, BASE_NONE, NULL, 0, "gsm_map_ms.Ext_CallBarringFeature", HFILL }}, { &hf_gsm_map_ms_cug_SubscriptionList, @@ -20241,7 +20241,7 @@ void proto_register_gsm_map(void) { FT_UINT32, BASE_DEC, NULL, 0, "gsm_map_ms.CUG_FeatureList", HFILL }}, { &hf_gsm_map_ms_CUG_SubscriptionList_item, - { "CUG-SubscriptionList", "gsm_map.ms.CUG_SubscriptionList_item", + { "CUG-Subscription", "gsm_map.ms.CUG_Subscription", FT_NONE, BASE_NONE, NULL, 0, "gsm_map_ms.CUG_Subscription", HFILL }}, { &hf_gsm_map_ms_cug_Index, @@ -20261,11 +20261,11 @@ void proto_register_gsm_map(void) { FT_UINT32, BASE_DEC, NULL, 0, "gsm_map_ms.Ext_BasicServiceGroupList", HFILL }}, { &hf_gsm_map_ms_CUG_FeatureList_item, - { "CUG-FeatureList", "gsm_map.ms.CUG_FeatureList_item", + { "CUG-Feature", "gsm_map.ms.CUG_Feature", FT_NONE, BASE_NONE, NULL, 0, "gsm_map_ms.CUG_Feature", HFILL }}, { &hf_gsm_map_ms_Ext_BasicServiceGroupList_item, - { "Ext-BasicServiceGroupList", "gsm_map.ms.Ext_BasicServiceGroupList_item", + { "Ext-BasicServiceCode", "gsm_map.ms.Ext_BasicServiceCode", FT_UINT32, BASE_DEC, VALS(gsm_map_Ext_BasicServiceCode_vals), 0, "gsm_map.Ext_BasicServiceCode", HFILL }}, { &hf_gsm_map_ms_preferentialCUG_Indicator, @@ -20281,7 +20281,7 @@ void proto_register_gsm_map(void) { FT_UINT32, BASE_DEC, VALS(gsm_map_ss_SS_SubscriptionOption_vals), 0, "gsm_map_ss.SS_SubscriptionOption", HFILL }}, { &hf_gsm_map_ms_LCS_PrivacyExceptionList_item, - { "LCS-PrivacyExceptionList", "gsm_map.ms.LCS_PrivacyExceptionList_item", + { "LCS-PrivacyClass", "gsm_map.ms.LCS_PrivacyClass", FT_NONE, BASE_NONE, NULL, 0, "gsm_map_ms.LCS_PrivacyClass", HFILL }}, { &hf_gsm_map_ms_notificationToMSUser, @@ -20305,15 +20305,15 @@ void proto_register_gsm_map(void) { FT_UINT32, BASE_DEC, NULL, 0, "gsm_map_ms.ServiceTypeList", HFILL }}, { &hf_gsm_map_ms_ExternalClientList_item, - { "ExternalClientList", "gsm_map.ms.ExternalClientList_item", + { "ExternalClient", "gsm_map.ms.ExternalClient", FT_NONE, BASE_NONE, NULL, 0, "gsm_map_ms.ExternalClient", HFILL }}, { &hf_gsm_map_ms_PLMNClientList_item, - { "PLMNClientList", "gsm_map.ms.PLMNClientList_item", + { "LCSClientInternalID", "gsm_map.ms.LCSClientInternalID", FT_UINT32, BASE_DEC, VALS(gsm_map_LCSClientInternalID_vals), 0, "gsm_map.LCSClientInternalID", HFILL }}, { &hf_gsm_map_ms_Ext_ExternalClientList_item, - { "Ext-ExternalClientList", "gsm_map.ms.Ext_ExternalClientList_item", + { "ExternalClient", "gsm_map.ms.ExternalClient", FT_NONE, BASE_NONE, NULL, 0, "gsm_map_ms.ExternalClient", HFILL }}, { &hf_gsm_map_ms_clientIdentity, @@ -20325,7 +20325,7 @@ void proto_register_gsm_map(void) { FT_UINT32, BASE_DEC, VALS(gsm_map_ms_GMLC_Restriction_vals), 0, "gsm_map_ms.GMLC_Restriction", HFILL }}, { &hf_gsm_map_ms_ServiceTypeList_item, - { "ServiceTypeList", "gsm_map.ms.ServiceTypeList_item", + { "ServiceType", "gsm_map.ms.ServiceType", FT_NONE, BASE_NONE, NULL, 0, "gsm_map_ms.ServiceType", HFILL }}, { &hf_gsm_map_ms_serviceTypeIdentity, @@ -20333,11 +20333,11 @@ void proto_register_gsm_map(void) { FT_UINT32, BASE_DEC, VALS(gsm_map_LCSServiceTypeID_vals), 0, "gsm_map.LCSServiceTypeID", HFILL }}, { &hf_gsm_map_ms_MOLR_List_item, - { "MOLR-List", "gsm_map.ms.MOLR_List_item", + { "MOLR-Class", "gsm_map.ms.MOLR_Class", FT_NONE, BASE_NONE, NULL, 0, "gsm_map_ms.MOLR_Class", HFILL }}, { &hf_gsm_map_ms_ZoneCodeList_item, - { "ZoneCodeList", "gsm_map.ms.ZoneCodeList_item", + { "ZoneCode", "gsm_map.ms.ZoneCode", FT_BYTES, BASE_HEX, NULL, 0, "gsm_map_ms.ZoneCode", HFILL }}, { &hf_gsm_map_ms_ss_List, @@ -20425,7 +20425,7 @@ void proto_register_gsm_map(void) { FT_NONE, BASE_NONE, NULL, 0, "gsm_map_ms.NULL", HFILL }}, { &hf_gsm_map_ms_ContextIdList_item, - { "ContextIdList", "gsm_map.ms.ContextIdList_item", + { "ContextId", "gsm_map.ms.ContextId", FT_UINT32, BASE_DEC, NULL, 0, "gsm_map_ms.ContextId", HFILL }}, { &hf_gsm_map_ms_allLSAData, @@ -20437,11 +20437,11 @@ void proto_register_gsm_map(void) { FT_UINT32, BASE_DEC, NULL, 0, "gsm_map_ms.LSAIdentityList", HFILL }}, { &hf_gsm_map_ms_LSAIdentityList_item, - { "LSAIdentityList", "gsm_map.ms.LSAIdentityList_item", + { "LSAIdentity", "gsm_map.ms.LSAIdentity", FT_BYTES, BASE_HEX, NULL, 0, "gsm_map_ms.LSAIdentity", HFILL }}, { &hf_gsm_map_ms_BasicServiceList_item, - { "BasicServiceList", "gsm_map.ms.BasicServiceList_item", + { "Ext-BasicServiceCode", "gsm_map.ms.Ext_BasicServiceCode", FT_UINT32, BASE_DEC, VALS(gsm_map_Ext_BasicServiceCode_vals), 0, "gsm_map.Ext_BasicServiceCode", HFILL }}, { &hf_gsm_map_ms_o_CSI, @@ -20477,7 +20477,7 @@ void proto_register_gsm_map(void) { FT_NONE, BASE_NONE, NULL, 0, "gsm_map_ms.D_CSI", HFILL }}, { &hf_gsm_map_ms_MT_smsCAMELTDP_CriteriaList_item, - { "MT-smsCAMELTDP-CriteriaList", "gsm_map.ms.MT_smsCAMELTDP_CriteriaList_item", + { "MT-smsCAMELTDP-Criteria", "gsm_map.ms.MT_smsCAMELTDP_Criteria", FT_NONE, BASE_NONE, NULL, 0, "gsm_map_ms.MT_smsCAMELTDP_Criteria", HFILL }}, { &hf_gsm_map_ms_sms_TriggerDetectionPoint, @@ -20489,7 +20489,7 @@ void proto_register_gsm_map(void) { FT_UINT32, BASE_DEC, NULL, 0, "gsm_map_ms.TPDU_TypeCriterion", HFILL }}, { &hf_gsm_map_ms_TPDU_TypeCriterion_item, - { "TPDU-TypeCriterion", "gsm_map.ms.TPDU_TypeCriterion_item", + { "MT-SMS-TPDU-Type", "gsm_map.ms.MT_SMS_TPDU_Type", FT_UINT32, BASE_DEC, VALS(gsm_map_ms_MT_SMS_TPDU_Type_vals), 0, "gsm_map_ms.MT_SMS_TPDU_Type", HFILL }}, { &hf_gsm_map_ms_dp_AnalysedInfoCriteriaList, @@ -20497,7 +20497,7 @@ void proto_register_gsm_map(void) { FT_UINT32, BASE_DEC, NULL, 0, "gsm_map_ms.DP_AnalysedInfoCriteriaList", HFILL }}, { &hf_gsm_map_ms_DP_AnalysedInfoCriteriaList_item, - { "DP-AnalysedInfoCriteriaList", "gsm_map.ms.DP_AnalysedInfoCriteriaList_item", + { "DP-AnalysedInfoCriterium", "gsm_map.ms.DP_AnalysedInfoCriterium", FT_NONE, BASE_NONE, NULL, 0, "gsm_map_ms.DP_AnalysedInfoCriterium", HFILL }}, { &hf_gsm_map_ms_dialledNumber, @@ -20517,7 +20517,7 @@ void proto_register_gsm_map(void) { FT_UINT32, BASE_DEC, NULL, 0, "gsm_map_ms.SS_EventList", HFILL }}, { &hf_gsm_map_ms_SS_EventList_item, - { "SS-EventList", "gsm_map.ms.SS_EventList_item", + { "SS-Code", "gsm_map.ms.SS_Code", FT_UINT8, BASE_DEC, VALS(ssCode_vals), 0, "gsm_map.SS_Code", HFILL }}, { &hf_gsm_map_ms_o_BcsmCamelTDPDataList, @@ -20529,7 +20529,7 @@ void proto_register_gsm_map(void) { FT_NONE, BASE_NONE, NULL, 0, "gsm_map_ms.NULL", HFILL }}, { &hf_gsm_map_ms_O_BcsmCamelTDPDataList_item, - { "O-BcsmCamelTDPDataList", "gsm_map.ms.O_BcsmCamelTDPDataList_item", + { "O-BcsmCamelTDPData", "gsm_map.ms.O_BcsmCamelTDPData", FT_NONE, BASE_NONE, NULL, 0, "gsm_map_ms.O_BcsmCamelTDPData", HFILL }}, { &hf_gsm_map_ms_o_BcsmTriggerDetectionPoint, @@ -20537,11 +20537,11 @@ void proto_register_gsm_map(void) { FT_UINT32, BASE_DEC, VALS(gsm_map_ms_O_BcsmTriggerDetectionPoint_vals), 0, "gsm_map_ms.O_BcsmTriggerDetectionPoint", HFILL }}, { &hf_gsm_map_ms_O_BcsmCamelTDPCriteriaList_item, - { "O-BcsmCamelTDPCriteriaList", "gsm_map.ms.O_BcsmCamelTDPCriteriaList_item", + { "O-BcsmCamelTDP-Criteria", "gsm_map.ms.O_BcsmCamelTDP_Criteria", FT_NONE, BASE_NONE, NULL, 0, "gsm_map_ms.O_BcsmCamelTDP_Criteria", HFILL }}, { &hf_gsm_map_ms_T_BCSM_CAMEL_TDP_CriteriaList_item, - { "T-BCSM-CAMEL-TDP-CriteriaList", "gsm_map.ms.T_BCSM_CAMEL_TDP_CriteriaList_item", + { "T-BCSM-CAMEL-TDP-Criteria", "gsm_map.ms.T_BCSM_CAMEL_TDP_Criteria", FT_NONE, BASE_NONE, NULL, 0, "gsm_map_ms.T_BCSM_CAMEL_TDP_Criteria", HFILL }}, { &hf_gsm_map_ms_destinationNumberCriteria, @@ -20581,23 +20581,23 @@ void proto_register_gsm_map(void) { FT_UINT32, BASE_DEC, NULL, 0, "gsm_map_ms.DestinationNumberLengthList", HFILL }}, { &hf_gsm_map_ms_DestinationNumberList_item, - { "DestinationNumberList", "gsm_map.ms.DestinationNumberList_item", + { "ISDN-AddressString", "gsm_map.ms.ISDN_AddressString", FT_BYTES, BASE_HEX, NULL, 0, "gsm_map.ISDN_AddressString", HFILL }}, { &hf_gsm_map_ms_DestinationNumberLengthList_item, - { "DestinationNumberLengthList", "gsm_map.ms.DestinationNumberLengthList_item", + { "DestinationNumberLengthList item", "gsm_map.ms.DestinationNumberLengthList_item", FT_UINT32, BASE_DEC, NULL, 0, "gsm_map_ms.INTEGER_1_maxNumOfISDN_AddressDigits", HFILL }}, { &hf_gsm_map_ms_BasicServiceCriteria_item, - { "BasicServiceCriteria", "gsm_map.ms.BasicServiceCriteria_item", + { "Ext-BasicServiceCode", "gsm_map.ms.Ext_BasicServiceCode", FT_UINT32, BASE_DEC, VALS(gsm_map_Ext_BasicServiceCode_vals), 0, "gsm_map.Ext_BasicServiceCode", HFILL }}, { &hf_gsm_map_ms_O_CauseValueCriteria_item, - { "O-CauseValueCriteria", "gsm_map.ms.O_CauseValueCriteria_item", + { "CauseValue", "gsm_map.ms.CauseValue", FT_BYTES, BASE_HEX, NULL, 0, "gsm_map_ms.CauseValue", HFILL }}, { &hf_gsm_map_ms_T_CauseValueCriteria_item, - { "T-CauseValueCriteria", "gsm_map.ms.T_CauseValueCriteria_item", + { "CauseValue", "gsm_map.ms.CauseValue", FT_BYTES, BASE_HEX, NULL, 0, "gsm_map_ms.CauseValue", HFILL }}, { &hf_gsm_map_ms_sms_CAMEL_TDP_DataList, @@ -20605,7 +20605,7 @@ void proto_register_gsm_map(void) { FT_UINT32, BASE_DEC, NULL, 0, "gsm_map_ms.SMS_CAMEL_TDP_DataList", HFILL }}, { &hf_gsm_map_ms_SMS_CAMEL_TDP_DataList_item, - { "SMS-CAMEL-TDP-DataList", "gsm_map.ms.SMS_CAMEL_TDP_DataList_item", + { "SMS-CAMEL-TDP-Data", "gsm_map.ms.SMS_CAMEL_TDP_Data", FT_NONE, BASE_NONE, NULL, 0, "gsm_map_ms.SMS_CAMEL_TDP_Data", HFILL }}, { &hf_gsm_map_ms_defaultSMS_Handling, @@ -20617,7 +20617,7 @@ void proto_register_gsm_map(void) { FT_UINT32, BASE_DEC, NULL, 0, "gsm_map_ms.MobilityTriggers", HFILL }}, { &hf_gsm_map_ms_MobilityTriggers_item, - { "MobilityTriggers", "gsm_map.ms.MobilityTriggers_item", + { "MM-Code", "gsm_map.ms.MM_Code", FT_BYTES, BASE_HEX, NULL, 0, "gsm_map_ms.MM_Code", HFILL }}, { &hf_gsm_map_ms_t_BcsmCamelTDPDataList, @@ -20625,7 +20625,7 @@ void proto_register_gsm_map(void) { FT_UINT32, BASE_DEC, NULL, 0, "gsm_map_ms.T_BcsmCamelTDPDataList", HFILL }}, { &hf_gsm_map_ms_T_BcsmCamelTDPDataList_item, - { "T-BcsmCamelTDPDataList", "gsm_map.ms.T_BcsmCamelTDPDataList_item", + { "T-BcsmCamelTDPData", "gsm_map.ms.T_BcsmCamelTDPData", FT_NONE, BASE_NONE, NULL, 0, "gsm_map_ms.T_BcsmCamelTDPData", HFILL }}, { &hf_gsm_map_ms_t_BcsmTriggerDetectionPoint, @@ -20653,11 +20653,11 @@ void proto_register_gsm_map(void) { FT_NONE, BASE_NONE, NULL, 0, "gsm_map_ms.NULL", HFILL }}, { &hf_gsm_map_ms_VBSDataList_item, - { "VBSDataList", "gsm_map.ms.VBSDataList_item", + { "VoiceBroadcastData", "gsm_map.ms.VoiceBroadcastData", FT_NONE, BASE_NONE, NULL, 0, "gsm_map_ms.VoiceBroadcastData", HFILL }}, { &hf_gsm_map_ms_VGCSDataList_item, - { "VGCSDataList", "gsm_map.ms.VGCSDataList_item", + { "VoiceGroupCallData", "gsm_map.ms.VoiceGroupCallData", FT_NONE, BASE_NONE, NULL, 0, "gsm_map_ms.VoiceGroupCallData", HFILL }}, { &hf_gsm_map_ms_groupId, @@ -20853,7 +20853,7 @@ void proto_register_gsm_map(void) { FT_UINT32, BASE_DEC, NULL, 0, "gsm_map_ms.PDP_ContextInfoList", HFILL }}, { &hf_gsm_map_ms_PDP_ContextInfoList_item, - { "PDP-ContextInfoList", "gsm_map.ms.PDP_ContextInfoList_item", + { "PDP-ContextInfo", "gsm_map.ms.PDP_ContextInfo", FT_NONE, BASE_NONE, NULL, 0, "gsm_map_ms.PDP_ContextInfo", HFILL }}, { &hf_gsm_map_ms_pdp_ContextIdentifier, @@ -21005,7 +21005,7 @@ void proto_register_gsm_map(void) { FT_NONE, BASE_NONE, NULL, 0, "gsm_map_ms.NULL", HFILL }}, { &hf_gsm_map_ms_MSISDN_BS_List_item, - { "MSISDN-BS-List", "gsm_map.ms.MSISDN_BS_List_item", + { "MSISDN-BS", "gsm_map.ms.MSISDN_BS", FT_NONE, BASE_NONE, NULL, 0, "gsm_map_ms.MSISDN_BS", HFILL }}, { &hf_gsm_map_ms_password, @@ -22267,7 +22267,7 @@ void proto_register_gsm_map(void) { FT_UINT32, BASE_DEC, NULL, 0, "gsm_map_lcs.AreaList", HFILL }}, { &hf_gsm_map_lcs_AreaList_item, - { "AreaList", "gsm_map.lcs.AreaList_item", + { "Area", "gsm_map.lcs.Area", FT_NONE, BASE_NONE, NULL, 0, "gsm_map_lcs.Area", HFILL }}, { &hf_gsm_map_lcs_areaType, @@ -22295,7 +22295,7 @@ void proto_register_gsm_map(void) { FT_UINT32, BASE_DEC, NULL, 0, "gsm_map_lcs.PLMNList", HFILL }}, { &hf_gsm_map_lcs_PLMNList_item, - { "PLMNList", "gsm_map.lcs.PLMNList_item", + { "ReportingPLMN", "gsm_map.lcs.ReportingPLMN", FT_NONE, BASE_NONE, NULL, 0, "gsm_map_lcs.ReportingPLMN", HFILL }}, { &hf_gsm_map_lcs_plmn_Id, @@ -22832,7 +22832,7 @@ void proto_register_gsm_map(void) { FT_BYTES, BASE_HEX, NULL, 0, "gsm_map.ISDN_AddressString", HFILL }}, { &hf_gsm_old_SendAuthenticationInfoResOld_item, - { "SendAuthenticationInfoResOld", "gsm_old.SendAuthenticationInfoResOld_item", + { "SendAuthenticationInfoResOld item", "gsm_old.SendAuthenticationInfoResOld_item", FT_NONE, BASE_NONE, NULL, 0, "gsm_old.SendAuthenticationInfoResOld_item", HFILL }}, { &hf_gsm_old_rand, @@ -22852,7 +22852,7 @@ void proto_register_gsm_map(void) { FT_UINT32, BASE_DEC, NULL, 0, "gsm_old.TripletListold", HFILL }}, { &hf_gsm_old_TripletListold_item, - { "TripletListold", "gsm_old.TripletListold_item", + { "AuthenticationTriplet-v2", "gsm_old.AuthenticationTriplet_v2", FT_NONE, BASE_NONE, NULL, 0, "gsm_old.AuthenticationTriplet_v2", HFILL }}, { &hf_gsm_old_channelType, @@ -22912,7 +22912,7 @@ void proto_register_gsm_map(void) { FT_UINT32, BASE_DEC, NULL, 0, "gsm_old.T_operatorSS_Code", HFILL }}, { &hf_gsm_old_operatorSS_Code_item, - { "operatorSS-Code", "gsm_old.operatorSS_Code_item", + { "operatorSS-Code item", "gsm_old.operatorSS_Code_item", FT_BYTES, BASE_HEX, NULL, 0, "gsm_old.OCTET_STRING_SIZE_1", HFILL }}, { &hf_gsm_old_sm_RP_DA, diff --git a/epan/dissectors/packet-gsm_map.h b/epan/dissectors/packet-gsm_map.h index 0f2b05ae82..f4ee5ffae1 100644 --- a/epan/dissectors/packet-gsm_map.h +++ b/epan/dissectors/packet-gsm_map.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-gsm_map.h */ -/* ../../tools/asn2wrs.py -b -e -c gsmmap.cnf -s packet-gsmmap-template ../ros/Remote-Operations-Information-Objects.asn MobileDomainDefinitions.asn MAP-ApplicationContexts.asn MAP-SS-Code.asn MAP-BS-Code.asn MAP-TS-Code.asn MAP-ExtensionDataTypes.asn MAP-CommonDataTypes.asn MAP-SS-DataTypes.asn MAP-ER-DataTypes.asn MAP-SM-DataTypes.asn MAP-OM-DataTypes.asn MAP-MS-DataTypes.asn MAP-CH-DataTypes.asn MAP-LCS-DataTypes.asn MAP-GR-DataTypes.asn MAP-DialogueInformation.asn MAP-LocationServiceOperations.asn MAP-Group-Call-Operations.asn MAP-ShortMessageServiceOperations.asn MAP-SupplementaryServiceOperations.asn MAP-CallHandlingOperations.asn MAP-OperationAndMaintenanceOperations.asn MAP-MobileServiceOperations.asn MAP-Errors.asn MAP-Protocol.asn GSMMAP.asn SS-DataTypes.asn SS-Operations.asn */ +/* ../../tools/asn2wrs.py -b -e -c ./gsmmap.cnf -s ./packet-gsmmap-template -D . ../ros/Remote-Operations-Information-Objects.asn MobileDomainDefinitions.asn MAP-ApplicationContexts.asn MAP-SS-Code.asn MAP-BS-Code.asn MAP-TS-Code.asn MAP-ExtensionDataTypes.asn MAP-CommonDataTypes.asn MAP-SS-DataTypes.asn MAP-ER-DataTypes.asn MAP-SM-DataTypes.asn MAP-OM-DataTypes.asn MAP-MS-DataTypes.asn MAP-CH-DataTypes.asn MAP-LCS-DataTypes.asn MAP-GR-DataTypes.asn MAP-DialogueInformation.asn MAP-LocationServiceOperations.asn MAP-Group-Call-Operations.asn MAP-ShortMessageServiceOperations.asn MAP-SupplementaryServiceOperations.asn MAP-CallHandlingOperations.asn MAP-OperationAndMaintenanceOperations.asn MAP-MobileServiceOperations.asn MAP-Errors.asn MAP-Protocol.asn GSMMAP.asn SS-DataTypes.asn SS-Operations.asn */ /* Input file: packet-gsmmap-template.h */ diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c index cfffbdfa58..b59c654632 100644 --- a/epan/dissectors/packet-h225.c +++ b/epan/dissectors/packet-h225.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-h225.c */ -/* ../../tools/asn2wrs.py -e -p h225 -c h225.cnf -s packet-h225-template H323-MESSAGES.asn */ +/* ../../tools/asn2wrs.py -e -p h225 -c ./h225.cnf -s ./packet-h225-template -D . H323-MESSAGES.asn */ /* Input file: packet-h225-template.c */ @@ -7671,7 +7671,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.T_h4501SupplementaryService", HFILL }}, { &hf_h225_h4501SupplementaryService_item, - { "h4501SupplementaryService", "h225.h4501SupplementaryService_item", + { "h4501SupplementaryService item", "h225.h4501SupplementaryService_item", FT_UINT32, BASE_DEC, NULL, 0, "h225.T_h4501SupplementaryService_item", HFILL }}, { &hf_h225_h245Tunneling, @@ -7679,7 +7679,7 @@ void proto_register_h225(void) { FT_BOOLEAN, 8, NULL, 0, "h225.T_h245Tunneling", HFILL }}, { &hf_h225_H245Control_item, - { "H245Control", "h225.H245Control_item", + { "H245Control item", "h225.H245Control_item", FT_UINT32, BASE_DEC, NULL, 0, "h225.H245Control_item", HFILL }}, { &hf_h225_h245Control, @@ -7691,7 +7691,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_NonStandardParameter", HFILL }}, { &hf_h225_nonStandardControl_item, - { "nonStandardControl", "h225.nonStandardControl_item", + { "NonStandardParameter", "h225.NonStandardParameter", FT_NONE, BASE_NONE, NULL, 0, "h225.NonStandardParameter", HFILL }}, { &hf_h225_callLinkage, @@ -7711,7 +7711,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.T_messageContent", HFILL }}, { &hf_h225_messageContent_item, - { "messageContent", "h225.messageContent_item", + { "messageContent item", "h225.messageContent_item", FT_UINT32, BASE_DEC, NULL, 0, "h225.T_messageContent_item", HFILL }}, { &hf_h225_tunnellingRequired, @@ -7731,7 +7731,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_GenericData", HFILL }}, { &hf_h225_genericData_item, - { "genericData", "h225.genericData_item", + { "GenericData", "h225.GenericData", FT_NONE, BASE_NONE, NULL, 0, "h225.GenericData", HFILL }}, { &hf_h225_nonStandard, @@ -7771,7 +7771,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_ClearToken", HFILL }}, { &hf_h225_tokens_item, - { "tokens", "h225.tokens_item", + { "ClearToken", "h225.ClearToken", FT_NONE, BASE_NONE, NULL, 0, "h235.ClearToken", HFILL }}, { &hf_h225_cryptoTokens, @@ -7779,7 +7779,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_CryptoH323Token", HFILL }}, { &hf_h225_cryptoTokens_item, - { "cryptoTokens", "h225.cryptoTokens_item", + { "CryptoH323Token", "h225.CryptoH323Token", FT_UINT32, BASE_DEC, VALS(h225_CryptoH323Token_vals), 0, "h225.CryptoH323Token", HFILL }}, { &hf_h225_fastStart, @@ -7799,7 +7799,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_AliasAddress", HFILL }}, { &hf_h225_alertingAddress_item, - { "alertingAddress", "h225.alertingAddress_item", + { "AliasAddress", "h225.AliasAddress", FT_UINT32, BASE_DEC, VALS(AliasAddress_vals), 0, "h225.AliasAddress", HFILL }}, { &hf_h225_presentationIndicator, @@ -7819,7 +7819,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_ServiceControlSession", HFILL }}, { &hf_h225_serviceControl_item, - { "serviceControl", "h225.serviceControl_item", + { "ServiceControlSession", "h225.ServiceControlSession", FT_NONE, BASE_NONE, NULL, 0, "h225.ServiceControlSession", HFILL }}, { &hf_h225_capacity, @@ -7843,7 +7843,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_AliasAddress", HFILL }}, { &hf_h225_connectedAddress_item, - { "connectedAddress", "h225.connectedAddress_item", + { "AliasAddress", "h225.AliasAddress", FT_UINT32, BASE_DEC, VALS(AliasAddress_vals), 0, "h225.AliasAddress", HFILL }}, { &hf_h225_circuitInfo, @@ -7859,7 +7859,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_AliasAddress", HFILL }}, { &hf_h225_busyAddress_item, - { "busyAddress", "h225.busyAddress_item", + { "AliasAddress", "h225.AliasAddress", FT_UINT32, BASE_DEC, VALS(AliasAddress_vals), 0, "h225.AliasAddress", HFILL }}, { &hf_h225_noBandwidth, @@ -7967,7 +7967,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_AliasAddress", HFILL }}, { &hf_h225_sourceAddress_item, - { "sourceAddress", "h225.sourceAddress_item", + { "AliasAddress", "h225.AliasAddress", FT_UINT32, BASE_DEC, VALS(AliasAddress_vals), 0, "h225.AliasAddress", HFILL }}, { &hf_h225_setup_UUIE_sourceInfo, @@ -7979,7 +7979,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_AliasAddress", HFILL }}, { &hf_h225_destinationAddress_item, - { "destinationAddress", "h225.destinationAddress_item", + { "AliasAddress", "h225.AliasAddress", FT_UINT32, BASE_DEC, VALS(AliasAddress_vals), 0, "h225.AliasAddress", HFILL }}, { &hf_h225_destCallSignalAddress, @@ -7991,7 +7991,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_AliasAddress", HFILL }}, { &hf_h225_destExtraCallInfo_item, - { "destExtraCallInfo", "h225.destExtraCallInfo_item", + { "AliasAddress", "h225.AliasAddress", FT_UINT32, BASE_DEC, VALS(AliasAddress_vals), 0, "h225.AliasAddress", HFILL }}, { &hf_h225_destExtraCRV, @@ -7999,7 +7999,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_CallReferenceValue", HFILL }}, { &hf_h225_destExtraCRV_item, - { "destExtraCRV", "h225.destExtraCRV_item", + { "CallReferenceValue", "h225.CallReferenceValue", FT_UINT32, BASE_DEC, NULL, 0, "h225.CallReferenceValue", HFILL }}, { &hf_h225_activeMC, @@ -8051,11 +8051,11 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_H245Security", HFILL }}, { &hf_h225_h245SecurityCapability_item, - { "h245SecurityCapability", "h225.h245SecurityCapability_item", + { "H245Security", "h225.H245Security", FT_UINT32, BASE_DEC, VALS(h225_H245Security_vals), 0, "h225.H245Security", HFILL }}, { &hf_h225_FastStart_item, - { "FastStart", "h225.FastStart_item", + { "FastStart item", "h225.FastStart_item", FT_UINT32, BASE_DEC, NULL, 0, "h225.FastStart_item", HFILL }}, { &hf_h225_mediaWaitForConnect, @@ -8087,7 +8087,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, VALS(h225_ScnConnectionAggregation_vals), 0, "h225.ScnConnectionAggregation", HFILL }}, { &hf_h225_Language_item, - { "Language", "h225.Language_item", + { "Language item", "h225.Language_item", FT_STRING, BASE_NONE, NULL, 0, "h225.IA5String_SIZE_1_32", HFILL }}, { &hf_h225_symmetricOperationRequired, @@ -8099,7 +8099,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_SupportedProtocols", HFILL }}, { &hf_h225_desiredProtocols_item, - { "desiredProtocols", "h225.desiredProtocols_item", + { "SupportedProtocols", "h225.SupportedProtocols", FT_UINT32, BASE_DEC, VALS(h225_SupportedProtocols_vals), 0, "h225.SupportedProtocols", HFILL }}, { &hf_h225_neededFeatures, @@ -8107,7 +8107,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_FeatureDescriptor", HFILL }}, { &hf_h225_neededFeatures_item, - { "neededFeatures", "h225.neededFeatures_item", + { "FeatureDescriptor", "h225.FeatureDescriptor", FT_NONE, BASE_NONE, NULL, 0, "h225.FeatureDescriptor", HFILL }}, { &hf_h225_desiredFeatures, @@ -8115,7 +8115,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_FeatureDescriptor", HFILL }}, { &hf_h225_desiredFeatures_item, - { "desiredFeatures", "h225.desiredFeatures_item", + { "FeatureDescriptor", "h225.FeatureDescriptor", FT_NONE, BASE_NONE, NULL, 0, "h225.FeatureDescriptor", HFILL }}, { &hf_h225_supportedFeatures, @@ -8123,11 +8123,11 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_FeatureDescriptor", HFILL }}, { &hf_h225_supportedFeatures_item, - { "supportedFeatures", "h225.supportedFeatures_item", + { "FeatureDescriptor", "h225.FeatureDescriptor", FT_NONE, BASE_NONE, NULL, 0, "h225.FeatureDescriptor", HFILL }}, { &hf_h225_ParallelH245Control_item, - { "ParallelH245Control", "h225.ParallelH245Control_item", + { "ParallelH245Control item", "h225.ParallelH245Control_item", FT_UINT32, BASE_DEC, NULL, 0, "h225.ParallelH245Control_item", HFILL }}, { &hf_h225_parallelH245Control, @@ -8139,7 +8139,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_ExtendedAliasAddress", HFILL }}, { &hf_h225_additionalSourceAddresses_item, - { "additionalSourceAddresses", "h225.additionalSourceAddresses_item", + { "ExtendedAliasAddress", "h225.ExtendedAliasAddress", FT_NONE, BASE_NONE, NULL, 0, "h225.ExtendedAliasAddress", HFILL }}, { &hf_h225_hopCount_1_31, @@ -8219,7 +8219,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_AliasAddress", HFILL }}, { &hf_h225_alternativeAliasAddress_item, - { "alternativeAliasAddress", "h225.alternativeAliasAddress_item", + { "AliasAddress", "h225.AliasAddress", FT_UINT32, BASE_DEC, VALS(AliasAddress_vals), 0, "h225.AliasAddress", HFILL }}, { &hf_h225_facilityReason, @@ -8231,7 +8231,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_ConferenceList", HFILL }}, { &hf_h225_conferences_item, - { "conferences", "h225.conferences_item", + { "ConferenceList", "h225.ConferenceList", FT_NONE, BASE_NONE, NULL, 0, "h225.ConferenceList", HFILL }}, { &hf_h225_conferenceAlias, @@ -8307,7 +8307,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.T_h245Route", HFILL }}, { &hf_h225_h245Route_item, - { "route", "h225.route_item", + { "route item", "h225.route_item", FT_BYTES, BASE_HEX, NULL, 0, "h225.OCTET_STRING_SIZE_4", HFILL }}, { &hf_h225_h245Routing, @@ -8387,7 +8387,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.T_route", HFILL }}, { &hf_h225_route_item, - { "route", "h225.route_item", + { "route item", "h225.route_item", FT_BYTES, BASE_HEX, NULL, 0, "h225.OCTET_STRING_SIZE_4", HFILL }}, { &hf_h225_routing, @@ -8451,7 +8451,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_TunnelledProtocol", HFILL }}, { &hf_h225_supportedTunnelledProtocols_item, - { "supportedTunnelledProtocols", "h225.supportedTunnelledProtocols_item", + { "TunnelledProtocol", "h225.TunnelledProtocol", FT_NONE, BASE_NONE, NULL, 0, "h225.TunnelledProtocol", HFILL }}, { &hf_h225_protocol, @@ -8459,7 +8459,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_SupportedProtocols", HFILL }}, { &hf_h225_protocol_item, - { "protocol", "h225.protocol_item", + { "SupportedProtocols", "h225.SupportedProtocols", FT_UINT32, BASE_DEC, VALS(h225_SupportedProtocols_vals), 0, "h225.SupportedProtocols", HFILL }}, { &hf_h225_h310, @@ -8511,7 +8511,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_DataRate", HFILL }}, { &hf_h225_dataRatesSupported_item, - { "dataRatesSupported", "h225.dataRatesSupported_item", + { "DataRate", "h225.DataRate", FT_NONE, BASE_NONE, NULL, 0, "h225.DataRate", HFILL }}, { &hf_h225_supportedPrefixes, @@ -8519,7 +8519,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_SupportedPrefix", HFILL }}, { &hf_h225_supportedPrefixes_item, - { "supportedPrefixes", "h225.supportedPrefixes_item", + { "SupportedPrefix", "h225.SupportedPrefix", FT_NONE, BASE_NONE, NULL, 0, "h225.SupportedPrefix", HFILL }}, { &hf_h225_t38FaxProtocol, @@ -8847,7 +8847,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_AliasAddress", HFILL }}, { &hf_h225_aliasAddress_item, - { "aliasAddress", "h225.aliasAddress_item", + { "AliasAddress", "h225.AliasAddress", FT_UINT32, BASE_DEC, VALS(AliasAddress_vals), 0, "h225.AliasAddress", HFILL }}, { &hf_h225_callSignalAddress, @@ -8855,7 +8855,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_TransportAddress", HFILL }}, { &hf_h225_callSignalAddress_item, - { "callSignalAddress", "h225.callSignalAddress_item", + { "TransportAddress", "h225.TransportAddress", FT_UINT32, BASE_DEC, VALS(h225_TransportAddress_vals), 0, "h225.TransportAddress", HFILL }}, { &hf_h225_rasAddress, @@ -8863,7 +8863,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_TransportAddress", HFILL }}, { &hf_h225_rasAddress_item, - { "rasAddress", "h225.rasAddress_item", + { "TransportAddress", "h225.TransportAddress", FT_UINT32, BASE_DEC, VALS(h225_TransportAddress_vals), 0, "h225.TransportAddress", HFILL }}, { &hf_h225_endpointType, @@ -8879,7 +8879,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_AliasAddress", HFILL }}, { &hf_h225_remoteExtensionAddress_item, - { "remoteExtensionAddress", "h225.remoteExtensionAddress_item", + { "AliasAddress", "h225.AliasAddress", FT_UINT32, BASE_DEC, VALS(AliasAddress_vals), 0, "h225.AliasAddress", HFILL }}, { &hf_h225_alternateTransportAddresses, @@ -8891,7 +8891,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_TransportAddress", HFILL }}, { &hf_h225_annexE_item, - { "annexE", "h225.annexE_item", + { "TransportAddress", "h225.TransportAddress", FT_UINT32, BASE_DEC, VALS(h225_TransportAddress_vals), 0, "h225.TransportAddress", HFILL }}, { &hf_h225_sctp, @@ -8899,7 +8899,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_TransportAddress", HFILL }}, { &hf_h225_sctp_item, - { "sctp", "h225.sctp_item", + { "TransportAddress", "h225.TransportAddress", FT_UINT32, BASE_DEC, VALS(h225_TransportAddress_vals), 0, "h225.TransportAddress", HFILL }}, { &hf_h225_tcp, @@ -8931,7 +8931,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_AlternateGK", HFILL }}, { &hf_h225_alternateGatekeeper_item, - { "alternateGatekeeper", "h225.alternateGatekeeper_item", + { "AlternateGK", "h225.AlternateGK", FT_NONE, BASE_NONE, NULL, 0, "h225.AlternateGK", HFILL }}, { &hf_h225_altGKisPermanent, @@ -9211,7 +9211,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_CallsAvailable", HFILL }}, { &hf_h225_voiceGwCallsAvailable_item, - { "voiceGwCallsAvailable", "h225.voiceGwCallsAvailable_item", + { "CallsAvailable", "h225.CallsAvailable", FT_NONE, BASE_NONE, NULL, 0, "h225.CallsAvailable", HFILL }}, { &hf_h225_h310GwCallsAvailable, @@ -9219,7 +9219,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_CallsAvailable", HFILL }}, { &hf_h225_h310GwCallsAvailable_item, - { "h310GwCallsAvailable", "h225.h310GwCallsAvailable_item", + { "CallsAvailable", "h225.CallsAvailable", FT_NONE, BASE_NONE, NULL, 0, "h225.CallsAvailable", HFILL }}, { &hf_h225_h320GwCallsAvailable, @@ -9227,7 +9227,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_CallsAvailable", HFILL }}, { &hf_h225_h320GwCallsAvailable_item, - { "h320GwCallsAvailable", "h225.h320GwCallsAvailable_item", + { "CallsAvailable", "h225.CallsAvailable", FT_NONE, BASE_NONE, NULL, 0, "h225.CallsAvailable", HFILL }}, { &hf_h225_h321GwCallsAvailable, @@ -9235,7 +9235,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_CallsAvailable", HFILL }}, { &hf_h225_h321GwCallsAvailable_item, - { "h321GwCallsAvailable", "h225.h321GwCallsAvailable_item", + { "CallsAvailable", "h225.CallsAvailable", FT_NONE, BASE_NONE, NULL, 0, "h225.CallsAvailable", HFILL }}, { &hf_h225_h322GwCallsAvailable, @@ -9243,7 +9243,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_CallsAvailable", HFILL }}, { &hf_h225_h322GwCallsAvailable_item, - { "h322GwCallsAvailable", "h225.h322GwCallsAvailable_item", + { "CallsAvailable", "h225.CallsAvailable", FT_NONE, BASE_NONE, NULL, 0, "h225.CallsAvailable", HFILL }}, { &hf_h225_h323GwCallsAvailable, @@ -9251,7 +9251,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_CallsAvailable", HFILL }}, { &hf_h225_h323GwCallsAvailable_item, - { "h323GwCallsAvailable", "h225.h323GwCallsAvailable_item", + { "CallsAvailable", "h225.CallsAvailable", FT_NONE, BASE_NONE, NULL, 0, "h225.CallsAvailable", HFILL }}, { &hf_h225_h324GwCallsAvailable, @@ -9259,7 +9259,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_CallsAvailable", HFILL }}, { &hf_h225_h324GwCallsAvailable_item, - { "h324GwCallsAvailable", "h225.h324GwCallsAvailable_item", + { "CallsAvailable", "h225.CallsAvailable", FT_NONE, BASE_NONE, NULL, 0, "h225.CallsAvailable", HFILL }}, { &hf_h225_t120OnlyGwCallsAvailable, @@ -9267,7 +9267,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_CallsAvailable", HFILL }}, { &hf_h225_t120OnlyGwCallsAvailable_item, - { "t120OnlyGwCallsAvailable", "h225.t120OnlyGwCallsAvailable_item", + { "CallsAvailable", "h225.CallsAvailable", FT_NONE, BASE_NONE, NULL, 0, "h225.CallsAvailable", HFILL }}, { &hf_h225_t38FaxAnnexbOnlyGwCallsAvailable, @@ -9275,7 +9275,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_CallsAvailable", HFILL }}, { &hf_h225_t38FaxAnnexbOnlyGwCallsAvailable_item, - { "t38FaxAnnexbOnlyGwCallsAvailable", "h225.t38FaxAnnexbOnlyGwCallsAvailable_item", + { "CallsAvailable", "h225.CallsAvailable", FT_NONE, BASE_NONE, NULL, 0, "h225.CallsAvailable", HFILL }}, { &hf_h225_terminalCallsAvailable, @@ -9283,7 +9283,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_CallsAvailable", HFILL }}, { &hf_h225_terminalCallsAvailable_item, - { "terminalCallsAvailable", "h225.terminalCallsAvailable_item", + { "CallsAvailable", "h225.CallsAvailable", FT_NONE, BASE_NONE, NULL, 0, "h225.CallsAvailable", HFILL }}, { &hf_h225_mcuCallsAvailable, @@ -9291,7 +9291,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_CallsAvailable", HFILL }}, { &hf_h225_mcuCallsAvailable_item, - { "mcuCallsAvailable", "h225.mcuCallsAvailable_item", + { "CallsAvailable", "h225.CallsAvailable", FT_NONE, BASE_NONE, NULL, 0, "h225.CallsAvailable", HFILL }}, { &hf_h225_sipGwCallsAvailable, @@ -9299,7 +9299,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_CallsAvailable", HFILL }}, { &hf_h225_sipGwCallsAvailable_item, - { "sipGwCallsAvailable", "h225.sipGwCallsAvailable_item", + { "CallsAvailable", "h225.CallsAvailable", FT_NONE, BASE_NONE, NULL, 0, "h225.CallsAvailable", HFILL }}, { &hf_h225_calls, @@ -9335,7 +9335,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.T_cic_2_4", HFILL }}, { &hf_h225_cic_2_4_item, - { "cic", "h225.cic_item", + { "cic item", "h225.cic_item", FT_BYTES, BASE_HEX, NULL, 0, "h225.OCTET_STRING_SIZE_2_4", HFILL }}, { &hf_h225_pointCode, @@ -9347,7 +9347,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.T_member", HFILL }}, { &hf_h225_member_item, - { "member", "h225.member_item", + { "member item", "h225.member_item", FT_UINT32, BASE_DEC, NULL, 0, "h225.INTEGER_0_65535", HFILL }}, { &hf_h225_carrierIdentificationCode, @@ -9399,7 +9399,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_NonStandardParameter", HFILL }}, { &hf_h225_nonStandardUsageTypes_item, - { "nonStandardUsageTypes", "h225.nonStandardUsageTypes_item", + { "NonStandardParameter", "h225.NonStandardParameter", FT_NONE, BASE_NONE, NULL, 0, "h225.NonStandardParameter", HFILL }}, { &hf_h225_startTime, @@ -9451,7 +9451,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_NonStandardParameter", HFILL }}, { &hf_h225_nonStandardUsageFields_item, - { "nonStandardUsageFields", "h225.nonStandardUsageFields_item", + { "NonStandardParameter", "h225.NonStandardParameter", FT_NONE, BASE_NONE, NULL, 0, "h225.NonStandardParameter", HFILL }}, { &hf_h225_alertingTime, @@ -9531,7 +9531,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.T_parameters", HFILL }}, { &hf_h225_parameters_item, - { "parameters", "h225.parameters_item", + { "parameters item", "h225.parameters_item", FT_NONE, BASE_NONE, NULL, 0, "h225.T_parameters_item", HFILL }}, { &hf_h225_standard, @@ -9587,7 +9587,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_SIZE_1_512_OF_EnumeratedParameter", HFILL }}, { &hf_h225_compound_item, - { "compound", "h225.compound_item", + { "EnumeratedParameter", "h225.EnumeratedParameter", FT_NONE, BASE_NONE, NULL, 0, "h225.EnumeratedParameter", HFILL }}, { &hf_h225_nested, @@ -9595,7 +9595,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_SIZE_1_16_OF_GenericData", HFILL }}, { &hf_h225_nested_item, - { "nested", "h225.nested_item", + { "GenericData", "h225.GenericData", FT_NONE, BASE_NONE, NULL, 0, "h225.GenericData", HFILL }}, { &hf_h225_replacementFeatureSet, @@ -9635,7 +9635,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.T_associatedSessionIds", HFILL }}, { &hf_h225_associatedSessionIds_item, - { "associatedSessionIds", "h225.associatedSessionIds_item", + { "associatedSessionIds item", "h225.associatedSessionIds_item", FT_UINT32, BASE_DEC, NULL, 0, "h225.INTEGER_1_255", HFILL }}, { &hf_h225_multicast_flg, @@ -9783,7 +9783,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_AdmissionConfirm", HFILL }}, { &hf_h225_admissionConfirmSequence_item, - { "admissionConfirmSequence", "h225.admissionConfirmSequence_item", + { "AdmissionConfirm", "h225.AdmissionConfirm", FT_NONE, BASE_NONE, NULL, 0, "h225.AdmissionConfirm", HFILL }}, { &hf_h225_requestSeqNum, @@ -9799,7 +9799,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_AliasAddress", HFILL }}, { &hf_h225_endpointAlias_item, - { "endpointAlias", "h225.endpointAlias_item", + { "AliasAddress", "h225.AliasAddress", FT_UINT32, BASE_DEC, VALS(AliasAddress_vals), 0, "h225.AliasAddress", HFILL }}, { &hf_h225_alternateEndpoints, @@ -9807,7 +9807,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_Endpoint", HFILL }}, { &hf_h225_alternateEndpoints_item, - { "alternateEndpoints", "h225.alternateEndpoints_item", + { "Endpoint", "h225.Endpoint", FT_NONE, BASE_NONE, NULL, 0, "h225.Endpoint", HFILL }}, { &hf_h225_authenticationCapability, @@ -9815,7 +9815,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_AuthenticationMechanism", HFILL }}, { &hf_h225_authenticationCapability_item, - { "authenticationCapability", "h225.authenticationCapability_item", + { "AuthenticationMechanism", "h225.AuthenticationMechanism", FT_UINT32, BASE_DEC, VALS(h235_AuthenticationMechanism_vals), 0, "h235.AuthenticationMechanism", HFILL }}, { &hf_h225_algorithmOIDs, @@ -9823,7 +9823,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.T_algorithmOIDs", HFILL }}, { &hf_h225_algorithmOIDs_item, - { "algorithmOIDs", "h225.algorithmOIDs_item", + { "algorithmOIDs item", "h225.algorithmOIDs_item", FT_OID, BASE_NONE, NULL, 0, "h225.OBJECT_IDENTIFIER", HFILL }}, { &hf_h225_integrity, @@ -9831,7 +9831,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_IntegrityMechanism", HFILL }}, { &hf_h225_integrity_item, - { "integrity", "h225.integrity_item", + { "IntegrityMechanism", "h225.IntegrityMechanism", FT_UINT32, BASE_DEC, VALS(h225_IntegrityMechanism_vals), 0, "h225.IntegrityMechanism", HFILL }}, { &hf_h225_integrityCheckValue, @@ -9899,7 +9899,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_AliasAddress", HFILL }}, { &hf_h225_terminalAlias_item, - { "terminalAlias", "h225.terminalAlias_item", + { "AliasAddress", "h225.AliasAddress", FT_UINT32, BASE_DEC, VALS(AliasAddress_vals), 0, "h225.AliasAddress", HFILL }}, { &hf_h225_endpointVendor, @@ -9927,7 +9927,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_AddressPattern", HFILL }}, { &hf_h225_terminalAliasPattern_item, - { "terminalAliasPattern", "h225.terminalAliasPattern_item", + { "AddressPattern", "h225.AddressPattern", FT_UINT32, BASE_DEC, VALS(h225_AddressPattern_vals), 0, "h225.AddressPattern", HFILL }}, { &hf_h225_usageReportingCapability, @@ -9939,7 +9939,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_H248PackagesDescriptor", HFILL }}, { &hf_h225_supportedH248Packages_item, - { "supportedH248Packages", "h225.supportedH248Packages_item", + { "H248PackagesDescriptor", "h225.H248PackagesDescriptor", FT_BYTES, BASE_HEX, NULL, 0, "h225.H248PackagesDescriptor", HFILL }}, { &hf_h225_callCreditCapability, @@ -10007,7 +10007,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_RasUsageSpecification", HFILL }}, { &hf_h225_usageSpec_item, - { "usageSpec", "h225.usageSpec_item", + { "RasUsageSpecification", "h225.RasUsageSpecification", FT_NONE, BASE_NONE, NULL, 0, "h225.RasUsageSpecification", HFILL }}, { &hf_h225_featureServerAlias, @@ -10039,7 +10039,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_AliasAddress", HFILL }}, { &hf_h225_duplicateAlias_item, - { "duplicateAlias", "h225.duplicateAlias_item", + { "AliasAddress", "h225.AliasAddress", FT_UINT32, BASE_DEC, VALS(AliasAddress_vals), 0, "h225.AliasAddress", HFILL }}, { &hf_h225_invalidTerminalType, @@ -10087,7 +10087,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_AddressPattern", HFILL }}, { &hf_h225_endpointAliasPattern_item, - { "endpointAliasPattern", "h225.endpointAliasPattern_item", + { "AddressPattern", "h225.AddressPattern", FT_UINT32, BASE_DEC, VALS(h225_AddressPattern_vals), 0, "h225.AddressPattern", HFILL }}, { &hf_h225_reregistrationRequired, @@ -10127,7 +10127,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, VALS(h225_CallModel_vals), 0, "h225.CallModel", HFILL }}, { &hf_h225_DestinationInfo_item, - { "DestinationInfo", "h225.DestinationInfo_item", + { "DestinationInfo item", "h225.DestinationInfo_item", FT_UINT32, BASE_DEC, VALS(AliasAddress_vals), 0, "h225.DestinationInfo_item", HFILL }}, { &hf_h225_destinationInfo, @@ -10139,7 +10139,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_AliasAddress", HFILL }}, { &hf_h225_srcInfo_item, - { "srcInfo", "h225.srcInfo_item", + { "AliasAddress", "h225.AliasAddress", FT_UINT32, BASE_DEC, VALS(AliasAddress_vals), 0, "h225.AliasAddress", HFILL }}, { &hf_h225_srcCallSignalAddress, @@ -10163,7 +10163,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_Endpoint", HFILL }}, { &hf_h225_srcAlternatives_item, - { "srcAlternatives", "h225.srcAlternatives_item", + { "Endpoint", "h225.Endpoint", FT_NONE, BASE_NONE, NULL, 0, "h225.Endpoint", HFILL }}, { &hf_h225_destAlternatives, @@ -10171,7 +10171,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_Endpoint", HFILL }}, { &hf_h225_destAlternatives_item, - { "destAlternatives", "h225.destAlternatives_item", + { "Endpoint", "h225.Endpoint", FT_NONE, BASE_NONE, NULL, 0, "h225.Endpoint", HFILL }}, { &hf_h225_gatewayDataRate, @@ -10227,7 +10227,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_SIZE_1_256_OF_QOSCapability", HFILL }}, { &hf_h225_qOSCapabilities_item, - { "qOSCapabilities", "h225.qOSCapabilities_item", + { "QOSCapability", "h225.QOSCapability", FT_NONE, BASE_NONE, NULL, 0, "h245.QOSCapability", HFILL }}, { &hf_h225_irrFrequency, @@ -10247,7 +10247,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_SupportedProtocols", HFILL }}, { &hf_h225_supportedProtocols_item, - { "supportedProtocols", "h225.supportedProtocols_item", + { "SupportedProtocols", "h225.SupportedProtocols", FT_UINT32, BASE_DEC, VALS(h225_SupportedProtocols_vals), 0, "h225.SupportedProtocols", HFILL }}, { &hf_h225_modifiedSrcInfo, @@ -10255,7 +10255,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_AliasAddress", HFILL }}, { &hf_h225_modifiedSrcInfo_item, - { "modifiedSrcInfo", "h225.modifiedSrcInfo_item", + { "AliasAddress", "h225.AliasAddress", FT_UINT32, BASE_DEC, VALS(AliasAddress_vals), 0, "h225.AliasAddress", HFILL }}, { &hf_h225_setup_bool, @@ -10343,7 +10343,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_PartyNumber", HFILL }}, { &hf_h225_routeCallToSCN_item, - { "routeCallToSCN", "h225.routeCallToSCN_item", + { "PartyNumber", "h225.PartyNumber", FT_UINT32, BASE_DEC, VALS(h225_PartyNumber_vals), 0, "h225.PartyNumber", HFILL }}, { &hf_h225_exceedsCallCapacity, @@ -10379,7 +10379,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_BandwidthDetails", HFILL }}, { &hf_h225_bandwidthDetails_item, - { "bandwidthDetails", "h225.bandwidthDetails_item", + { "BandwidthDetails", "h225.BandwidthDetails", FT_NONE, BASE_NONE, NULL, 0, "h225.BandwidthDetails", HFILL }}, { &hf_h225_bandRejectReason, @@ -10411,7 +10411,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_AliasAddress", HFILL }}, { &hf_h225_sourceInfo_item, - { "sourceInfo", "h225.sourceInfo_item", + { "AliasAddress", "h225.AliasAddress", FT_UINT32, BASE_DEC, VALS(AliasAddress_vals), 0, "h225.AliasAddress", HFILL }}, { &hf_h225_hopCount, @@ -10423,7 +10423,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_AliasAddress", HFILL }}, { &hf_h225_sourceEndpointInfo_item, - { "sourceEndpointInfo", "h225.sourceEndpointInfo_item", + { "AliasAddress", "h225.AliasAddress", FT_UINT32, BASE_DEC, VALS(AliasAddress_vals), 0, "h225.AliasAddress", HFILL }}, { &hf_h225_locationConfirm_callSignalAddress, @@ -10447,7 +10447,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_PartyNumber", HFILL }}, { &hf_h225_routeCalltoSCN_item, - { "routeCalltoSCN", "h225.routeCalltoSCN_item", + { "PartyNumber", "h225.PartyNumber", FT_UINT32, BASE_DEC, VALS(h225_PartyNumber_vals), 0, "h225.PartyNumber", HFILL }}, { &hf_h225_disengageReason, @@ -10499,7 +10499,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.T_perCallInfo", HFILL }}, { &hf_h225_perCallInfo_item, - { "perCallInfo", "h225.perCallInfo_item", + { "perCallInfo item", "h225.perCallInfo_item", FT_NONE, BASE_NONE, NULL, 0, "h225.T_perCallInfo_item", HFILL }}, { &hf_h225_originator, @@ -10511,7 +10511,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_RTPSession", HFILL }}, { &hf_h225_audio_item, - { "audio", "h225.audio_item", + { "RTPSession", "h225.RTPSession", FT_NONE, BASE_NONE, NULL, 0, "h225.RTPSession", HFILL }}, { &hf_h225_video, @@ -10519,7 +10519,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_RTPSession", HFILL }}, { &hf_h225_video_item, - { "video", "h225.video_item", + { "RTPSession", "h225.RTPSession", FT_NONE, BASE_NONE, NULL, 0, "h225.RTPSession", HFILL }}, { &hf_h225_data, @@ -10527,7 +10527,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_TransportChannelInfo", HFILL }}, { &hf_h225_data_item, - { "data", "h225.data_item", + { "TransportChannelInfo", "h225.TransportChannelInfo", FT_NONE, BASE_NONE, NULL, 0, "h225.TransportChannelInfo", HFILL }}, { &hf_h225_h245, @@ -10543,7 +10543,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_ConferenceIdentifier", HFILL }}, { &hf_h225_substituteConfIDs_item, - { "substituteConfIDs", "h225.substituteConfIDs_item", + { "ConferenceIdentifier", "h225.ConferenceIdentifier", FT_GUID, BASE_NONE, NULL, 0, "h225.ConferenceIdentifier", HFILL }}, { &hf_h225_pdu, @@ -10551,7 +10551,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.T_pdu", HFILL }}, { &hf_h225_pdu_item, - { "pdu", "h225.pdu_item", + { "pdu item", "h225.pdu_item", FT_NONE, BASE_NONE, NULL, 0, "h225.T_pdu_item", HFILL }}, { &hf_h225_h323pdu, @@ -10607,7 +10607,7 @@ void proto_register_h225(void) { FT_UINT32, BASE_DEC, NULL, 0, "h225.SEQUENCE_OF_SupportedProtocols", HFILL }}, { &hf_h225_protocols_item, - { "protocols", "h225.protocols_item", + { "SupportedProtocols", "h225.SupportedProtocols", FT_UINT32, BASE_DEC, VALS(h225_SupportedProtocols_vals), 0, "h225.SupportedProtocols", HFILL }}, { &hf_h225_almostOutOfResources, diff --git a/epan/dissectors/packet-h225.h b/epan/dissectors/packet-h225.h index 8521fab2aa..b9145b3d0e 100644 --- a/epan/dissectors/packet-h225.h +++ b/epan/dissectors/packet-h225.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-h225.h */ -/* ../../tools/asn2wrs.py -e -p h225 -c h225.cnf -s packet-h225-template H323-MESSAGES.asn */ +/* ../../tools/asn2wrs.py -e -p h225 -c ./h225.cnf -s ./packet-h225-template -D . H323-MESSAGES.asn */ /* Input file: packet-h225-template.h */ diff --git a/epan/dissectors/packet-h235.c b/epan/dissectors/packet-h235.c index e79fe1be5e..e2cd10ed91 100644 --- a/epan/dissectors/packet-h235.c +++ b/epan/dissectors/packet-h235.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-h235.c */ -/* ../../tools/asn2wrs.py -e -p h235 -c h235.cnf -s packet-h235-template H235-SECURITY-MESSAGES.asn H235-SRTP.asn */ +/* ../../tools/asn2wrs.py -e -p h235 -c ./h235.cnf -s ./packet-h235-template -D . H235-SECURITY-MESSAGES.asn H235-SRTP.asn */ /* Input file: packet-h235-template.c */ @@ -1229,7 +1229,7 @@ void proto_register_h235(void) { FT_UINT32, BASE_DEC, NULL, 0, "h235.SEQUENCE_OF_ProfileElement", HFILL }}, { &hf_h235_profileInfo_item, - { "profileInfo", "h235.profileInfo_item", + { "ProfileElement", "h235.ProfileElement", FT_NONE, BASE_NONE, NULL, 0, "h235.ProfileElement", HFILL }}, { &hf_h235_elementID, @@ -1377,7 +1377,7 @@ void proto_register_h235(void) { FT_BYTES, BASE_HEX, NULL, 0, "h235.OCTET_STRING", HFILL }}, { &hf_h235_SrtpCryptoCapability_item, - { "SrtpCryptoCapability", "h235.SrtpCryptoCapability_item", + { "SrtpCryptoInfo", "h235.SrtpCryptoInfo", FT_NONE, BASE_NONE, NULL, 0, "h235.SrtpCryptoInfo", HFILL }}, { &hf_h235_cryptoSuite, @@ -1393,7 +1393,7 @@ void proto_register_h235(void) { FT_BOOLEAN, 8, NULL, 0, "h235.BOOLEAN", HFILL }}, { &hf_h235_SrtpKeys_item, - { "SrtpKeys", "h235.SrtpKeys_item", + { "SrtpKeyParameters", "h235.SrtpKeyParameters", FT_NONE, BASE_NONE, NULL, 0, "h235.SrtpKeyParameters", HFILL }}, { &hf_h235_masterKey, @@ -1457,7 +1457,7 @@ void proto_register_h235(void) { FT_UINT32, BASE_DEC, NULL, 0, "h235.SEQUENCE_OF_GenericData", HFILL }}, { &hf_h235_newParameter_item, - { "newParameter", "h235.newParameter_item", + { "GenericData", "h235.GenericData", FT_NONE, BASE_NONE, NULL, 0, "h225.GenericData", HFILL }}, { &hf_h235_fecBeforeSrtp, diff --git a/epan/dissectors/packet-h235.h b/epan/dissectors/packet-h235.h index 2bd6f3a98d..832a7b3066 100644 --- a/epan/dissectors/packet-h235.h +++ b/epan/dissectors/packet-h235.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-h235.h */ -/* ../../tools/asn2wrs.py -e -p h235 -c h235.cnf -s packet-h235-template H235-SECURITY-MESSAGES.asn H235-SRTP.asn */ +/* ../../tools/asn2wrs.py -e -p h235 -c ./h235.cnf -s ./packet-h235-template -D . H235-SECURITY-MESSAGES.asn H235-SRTP.asn */ /* Input file: packet-h235-template.h */ diff --git a/epan/dissectors/packet-h245.c b/epan/dissectors/packet-h245.c index bed07c3427..99cfda6932 100644 --- a/epan/dissectors/packet-h245.c +++ b/epan/dissectors/packet-h245.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-h245.c */ -/* ../../tools/asn2wrs.py -e -p h245 -c h245.cnf -s packet-h245-template MULTIMEDIA-SYSTEM-CONTROL.asn */ +/* ../../tools/asn2wrs.py -e -p h245 -c ./h245.cnf -s ./packet-h245-template -D . MULTIMEDIA-SYSTEM-CONTROL.asn */ /* Input file: packet-h245-template.c */ @@ -14856,7 +14856,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.T_messageContent", HFILL }}, { &hf_h245_messageContent_item, - { "messageContent", "h245.messageContent_item", + { "messageContent item", "h245.messageContent_item", FT_NONE, BASE_NONE, NULL, 0, "h245.T_messageContent_item", HFILL }}, { &hf_h245_nonStandardData, @@ -14936,7 +14936,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.SET_SIZE_1_256_OF_CapabilityTableEntry", HFILL }}, { &hf_h245_capabilityTable_item, - { "capabilityTable", "h245.capabilityTable_item", + { "CapabilityTableEntry", "h245.CapabilityTableEntry", FT_NONE, BASE_NONE, NULL, 0, "h245.CapabilityTableEntry", HFILL }}, { &hf_h245_capabilityDescriptors, @@ -14944,7 +14944,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.SET_SIZE_1_256_OF_CapabilityDescriptor", HFILL }}, { &hf_h245_capabilityDescriptors_item, - { "capabilityDescriptors", "h245.capabilityDescriptors_item", + { "CapabilityDescriptor", "h245.CapabilityDescriptor", FT_NONE, BASE_NONE, NULL, 0, "h245.CapabilityDescriptor", HFILL }}, { &hf_h245_genericInformation, @@ -14952,7 +14952,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.SEQUENCE_OF_GenericInformation", HFILL }}, { &hf_h245_genericInformation_item, - { "genericInformation", "h245.genericInformation_item", + { "GenericInformation", "h245.GenericInformation", FT_NONE, BASE_NONE, NULL, 0, "h245.GenericInformation", HFILL }}, { &hf_h245_capabilityTableEntryNumber, @@ -14972,11 +14972,11 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.SET_SIZE_1_256_OF_AlternativeCapabilitySet", HFILL }}, { &hf_h245_simultaneousCapabilities_item, - { "simultaneousCapabilities", "h245.simultaneousCapabilities_item", + { "AlternativeCapabilitySet", "h245.AlternativeCapabilitySet", FT_UINT32, BASE_DEC, NULL, 0, "h245.AlternativeCapabilitySet", HFILL }}, { &hf_h245_AlternativeCapabilitySet_item, - { "alternativeCapability", "h245.AlternativeCapabilitySet_item", + { "alternativeCapability", "h245.CapabilityTableEntryNumber", FT_UINT32, BASE_DEC, NULL, 0, "h245.CapabilityTableEntryNumber", HFILL }}, { &hf_h245_tcs_rej_cause, @@ -15164,7 +15164,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.SET_OF_VCCapability", HFILL }}, { &hf_h245_vcCapability_item, - { "vcCapability", "h245.vcCapability_item", + { "VCCapability", "h245.VCCapability", FT_NONE, BASE_NONE, NULL, 0, "h245.VCCapability", HFILL }}, { &hf_h245_aal1, @@ -15260,7 +15260,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.SET_SIZE_1_256_OF_Q2931Address", HFILL }}, { &hf_h245_gatewayAddress_item, - { "gatewayAddress", "h245.gatewayAddress_item", + { "Q2931Address", "h245.Q2931Address", FT_NONE, BASE_NONE, NULL, 0, "h245.Q2931Address", HFILL }}, { &hf_h245_srtsClockRecoveryflag, @@ -15560,7 +15560,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.SEQUENCE_SIZE_1_256_OF_RedundancyEncodingCapability", HFILL }}, { &hf_h245_redundancyEncodingCapability_item, - { "redundancyEncodingCapability", "h245.redundancyEncodingCapability_item", + { "RedundancyEncodingCapability", "h245.RedundancyEncodingCapability", FT_NONE, BASE_NONE, NULL, 0, "h245.RedundancyEncodingCapability", HFILL }}, { &hf_h245_logicalChannelSwitchingCapability, @@ -15580,7 +15580,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.SEQUENCE_SIZE_1_256_OF_RTPPayloadType", HFILL }}, { &hf_h245_rtpPayloadTypes_item, - { "rtpPayloadType", "h245.rtpPayloadType_item", + { "RTPPayloadType", "h245.RTPPayloadType", FT_NONE, BASE_NONE, NULL, 0, "h245.RTPPayloadType", HFILL }}, { &hf_h245_qosMode, @@ -15776,7 +15776,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.SEQUENCE_SIZE_1_256_OF_QOSCapability", HFILL }}, { &hf_h245_qOSCapabilities_item, - { "qOSCapabilities", "h245.qOSCapabilities_item", + { "QOSCapability", "h245.QOSCapability", FT_NONE, BASE_NONE, NULL, 0, "h245.QOSCapability", HFILL }}, { &hf_h245_mediaChannelCapabilities, @@ -15784,7 +15784,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.SEQUENCE_SIZE_1_256_OF_MediaChannelCapability", HFILL }}, { &hf_h245_mediaChannelCapabilities_item, - { "mediaChannelCapabilities", "h245.mediaChannelCapabilities_item", + { "MediaChannelCapability", "h245.MediaChannelCapability", FT_NONE, BASE_NONE, NULL, 0, "h245.MediaChannelCapability", HFILL }}, { &hf_h245_redundancyEncodingMethod, @@ -15800,7 +15800,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.SEQUENCE_SIZE_1_256_OF_CapabilityTableEntryNumber", HFILL }}, { &hf_h245_secondaryEncodingCapability_item, - { "secondaryEncoding", "h245.secondaryEncoding_item", + { "CapabilityTableEntryNumber", "h245.CapabilityTableEntryNumber", FT_UINT32, BASE_DEC, NULL, 0, "h245.CapabilityTableEntryNumber", HFILL }}, { &hf_h245_rtpAudioRedundancyEncoding, @@ -15832,7 +15832,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.SEQUENCE_SIZE_1_256_OF_RTPH263VideoRedundancyFrameMapping", HFILL }}, { &hf_h245_custom_item, - { "custom", "h245.custom_item", + { "RTPH263VideoRedundancyFrameMapping", "h245.RTPH263VideoRedundancyFrameMapping", FT_NONE, BASE_NONE, NULL, 0, "h245.RTPH263VideoRedundancyFrameMapping", HFILL }}, { &hf_h245_containedThreads, @@ -15840,7 +15840,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.T_containedThreads", HFILL }}, { &hf_h245_containedThreads_item, - { "containedThreads", "h245.containedThreads_item", + { "containedThreads item", "h245.containedThreads_item", FT_UINT32, BASE_DEC, NULL, 0, "h245.INTEGER_0_15", HFILL }}, { &hf_h245_threadNumber, @@ -15852,7 +15852,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.T_frameSequence", HFILL }}, { &hf_h245_frameSequence_item, - { "frameSequence", "h245.frameSequence_item", + { "frameSequence item", "h245.frameSequence_item", FT_UINT32, BASE_DEC, NULL, 0, "h245.INTEGER_0_255", HFILL }}, { &hf_h245_multicastCapability, @@ -15868,7 +15868,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.SEQUENCE_OF_MediaDistributionCapability", HFILL }}, { &hf_h245_mediaDistributionCapability_item, - { "mediaDistributionCapability", "h245.mediaDistributionCapability_item", + { "MediaDistributionCapability", "h245.MediaDistributionCapability", FT_NONE, BASE_NONE, NULL, 0, "h245.MediaDistributionCapability", HFILL }}, { &hf_h245_centralizedControl, @@ -15900,7 +15900,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.SEQUENCE_OF_DataApplicationCapability", HFILL }}, { &hf_h245_centralizedData_item, - { "centralizedData", "h245.centralizedData_item", + { "DataApplicationCapability", "h245.DataApplicationCapability", FT_NONE, BASE_NONE, NULL, 0, "h245.DataApplicationCapability", HFILL }}, { &hf_h245_distributedData, @@ -15908,7 +15908,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.SEQUENCE_OF_DataApplicationCapability", HFILL }}, { &hf_h245_distributedData_item, - { "distributedData", "h245.distributedData_item", + { "DataApplicationCapability", "h245.DataApplicationCapability", FT_NONE, BASE_NONE, NULL, 0, "h245.DataApplicationCapability", HFILL }}, { &hf_h245_h261VideoCapability, @@ -15940,7 +15940,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.SEQUENCE_OF_VideoCapability", HFILL }}, { &hf_h245_videoCapability_item, - { "videoCapability", "h245.videoCapability_item", + { "VideoCapability", "h245.VideoCapability", FT_UINT32, BASE_DEC, VALS(h245_VideoCapability_vals), 0, "h245.VideoCapability", HFILL }}, { &hf_h245_videoCapabilityExtension, @@ -15948,7 +15948,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.SEQUENCE_OF_GenericCapability", HFILL }}, { &hf_h245_videoCapabilityExtension_item, - { "videoCapabilityExtension", "h245.videoCapabilityExtension_item", + { "GenericCapability", "h245.GenericCapability", FT_NONE, BASE_NONE, NULL, 0, "h245.GenericCapability", HFILL }}, { &hf_h245_qcifMPI_1_4, @@ -16132,7 +16132,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.SET_SIZE_1_14_OF_EnhancementOptions", HFILL }}, { &hf_h245_snrEnhancement_item, - { "snrEnhancement", "h245.snrEnhancement_item", + { "EnhancementOptions", "h245.EnhancementOptions", FT_NONE, BASE_NONE, NULL, 0, "h245.EnhancementOptions", HFILL }}, { &hf_h245_spatialEnhancement, @@ -16140,7 +16140,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.SET_SIZE_1_14_OF_EnhancementOptions", HFILL }}, { &hf_h245_spatialEnhancement_item, - { "spatialEnhancement", "h245.spatialEnhancement_item", + { "EnhancementOptions", "h245.EnhancementOptions", FT_NONE, BASE_NONE, NULL, 0, "h245.EnhancementOptions", HFILL }}, { &hf_h245_bPictureEnhancement, @@ -16148,7 +16148,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.SET_SIZE_1_14_OF_BEnhancementParameters", HFILL }}, { &hf_h245_bPictureEnhancement_item, - { "bPictureEnhancement", "h245.bPictureEnhancement_item", + { "BEnhancementParameters", "h245.BEnhancementParameters", FT_NONE, BASE_NONE, NULL, 0, "h245.BEnhancementParameters", HFILL }}, { &hf_h245_enhancementOptions, @@ -16268,7 +16268,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.SET_SIZE_1_16_OF_CustomPictureClockFrequency", HFILL }}, { &hf_h245_customPictureClockFrequency_item, - { "customPictureClockFrequency", "h245.customPictureClockFrequency_item", + { "CustomPictureClockFrequency", "h245.CustomPictureClockFrequency", FT_NONE, BASE_NONE, NULL, 0, "h245.CustomPictureClockFrequency", HFILL }}, { &hf_h245_customPictureFormat, @@ -16276,7 +16276,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.SET_SIZE_1_16_OF_CustomPictureFormat", HFILL }}, { &hf_h245_customPictureFormat_item, - { "customPictureFormat", "h245.customPictureFormat_item", + { "CustomPictureFormat", "h245.CustomPictureFormat", FT_NONE, BASE_NONE, NULL, 0, "h245.CustomPictureFormat", HFILL }}, { &hf_h245_modeCombos, @@ -16284,7 +16284,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.SET_SIZE_1_16_OF_H263VideoModeCombos", HFILL }}, { &hf_h245_modeCombos_item, - { "modeCombos", "h245.modeCombos_item", + { "H263VideoModeCombos", "h245.H263VideoModeCombos", FT_NONE, BASE_NONE, NULL, 0, "h245.H263VideoModeCombos", HFILL }}, { &hf_h245_h263Version3Options, @@ -16444,7 +16444,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.T_customPCF", HFILL }}, { &hf_h245_customPCF_item, - { "customPCF", "h245.customPCF_item", + { "customPCF item", "h245.customPCF_item", FT_NONE, BASE_NONE, NULL, 0, "h245.T_customPCF_item", HFILL }}, { &hf_h245_customMPI, @@ -16464,7 +16464,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.T_pixelAspectCode", HFILL }}, { &hf_h245_pixelAspectCode_item, - { "pixelAspectCode", "h245.pixelAspectCode_item", + { "pixelAspectCode item", "h245.pixelAspectCode_item", FT_UINT32, BASE_DEC, NULL, 0, "h245.INTEGER_1_14", HFILL }}, { &hf_h245_extendedPAR, @@ -16472,7 +16472,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.T_extendedPAR", HFILL }}, { &hf_h245_extendedPAR_item, - { "extendedPAR", "h245.extendedPAR_item", + { "extendedPAR item", "h245.extendedPAR_item", FT_NONE, BASE_NONE, NULL, 0, "h245.T_extendedPAR_item", HFILL }}, { &hf_h245_width, @@ -16492,7 +16492,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.SET_SIZE_1_16_OF_H263ModeComboFlags", HFILL }}, { &hf_h245_h263VideoCoupledModes_item, - { "h263VideoCoupledModes", "h245.h263VideoCoupledModes_item", + { "H263ModeComboFlags", "h245.H263ModeComboFlags", FT_NONE, BASE_NONE, NULL, 0, "h245.H263ModeComboFlags", HFILL }}, { &hf_h245_referencePicSelect, @@ -17132,7 +17132,7 @@ void proto_register_h245(void) { FT_NONE, BASE_NONE, NULL, 0, "h245.GenericCapability", HFILL }}, { &hf_h245_EncryptionCapability_item, - { "EncryptionCapability", "h245.EncryptionCapability_item", + { "MediaEncryptionAlgorithm", "h245.MediaEncryptionAlgorithm", FT_UINT32, BASE_DEC, VALS(h245_MediaEncryptionAlgorithm_vals), 0, "h245.MediaEncryptionAlgorithm", HFILL }}, { &hf_h245_algorithm, @@ -17148,7 +17148,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.SEQUENCE_SIZE_1_16_OF_NonStandardParameter", HFILL }}, { &hf_h245_ui_nonStandard_item, - { "nonStandard", "h245.nonStandard_item", + { "NonStandardParameter", "h245.NonStandardParameter", FT_NONE, BASE_NONE, NULL, 0, "h245.NonStandardParameter", HFILL }}, { &hf_h245_basicString, @@ -17200,7 +17200,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.SEQUENCE_OF_NonStandardParameter", HFILL }}, { &hf_h245_nonStandardParams_item, - { "nonStandardData", "h245.nonStandardData_item", + { "NonStandardParameter", "h245.NonStandardParameter", FT_NONE, BASE_NONE, NULL, 0, "h245.NonStandardParameter", HFILL }}, { &hf_h245_chairControlCapability, @@ -17224,7 +17224,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.T_collapsing", HFILL }}, { &hf_h245_collapsing_item, - { "collapsing", "h245.collapsing_item", + { "collapsing item", "h245.collapsing_item", FT_NONE, BASE_NONE, NULL, 0, "h245.T_collapsing_item", HFILL }}, { &hf_h245_nonCollapsing, @@ -17232,7 +17232,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.T_nonCollapsing", HFILL }}, { &hf_h245_nonCollapsing_item, - { "nonCollapsing", "h245.nonCollapsing_item", + { "nonCollapsing item", "h245.nonCollapsing_item", FT_NONE, BASE_NONE, NULL, 0, "h245.T_nonCollapsing_item", HFILL }}, { &hf_h245_nonCollapsingRaw, @@ -17272,7 +17272,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.SEQUENCE_OF_ParameterIdentifier", HFILL }}, { &hf_h245_supersedes_item, - { "supersedes", "h245.supersedes_item", + { "ParameterIdentifier", "h245.ParameterIdentifier", FT_UINT32, BASE_DEC, VALS(h245_ParameterIdentifier_vals), 0, "h245.ParameterIdentifier", HFILL }}, { &hf_h245_standard, @@ -17312,7 +17312,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.SEQUENCE_OF_GenericParameter", HFILL }}, { &hf_h245_genericParameters_item, - { "genericParameter", "h245.genericParameter_item", + { "GenericParameter", "h245.GenericParameter", FT_NONE, BASE_NONE, NULL, 0, "h245.GenericParameter", HFILL }}, { &hf_h245_multiplexFormat, @@ -17328,7 +17328,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.SET_SIZE_1_256_OF_AlternativeCapabilitySet", HFILL }}, { &hf_h245_capabilityOnMuxStream_item, - { "capabilityOnMuxStream", "h245.capabilityOnMuxStream_item", + { "AlternativeCapabilitySet", "h245.AlternativeCapabilitySet", FT_UINT32, BASE_DEC, NULL, 0, "h245.AlternativeCapabilitySet", HFILL }}, { &hf_h245_dynamicRTPPayloadType, @@ -17344,7 +17344,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.SET_SIZE_1_256_OF_AlternativeCapabilitySet", HFILL }}, { &hf_h245_capabilities_item, - { "capabilities", "h245.capabilities_item", + { "AlternativeCapabilitySet", "h245.AlternativeCapabilitySet", FT_UINT32, BASE_DEC, NULL, 0, "h245.AlternativeCapabilitySet", HFILL }}, { &hf_h245_fecc_rfc2733, @@ -17920,7 +17920,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.SEQUENCE_OF_RedundancyEncodingElement", HFILL }}, { &hf_h245_secondary_item, - { "secondary", "h245.secondary_item", + { "RedundancyEncodingElement", "h245.RedundancyEncodingElement", FT_NONE, BASE_NONE, NULL, 0, "h245.RedundancyEncodingElement", HFILL }}, { &hf_h245_payloadType, @@ -17932,7 +17932,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.SEQUENCE_OF_MultiplePayloadStreamElement", HFILL }}, { &hf_h245_elements_item, - { "elements", "h245.elements_item", + { "MultiplePayloadStreamElement", "h245.MultiplePayloadStreamElement", FT_NONE, BASE_NONE, NULL, 0, "h245.MultiplePayloadStreamElement", HFILL }}, { &hf_h245_dep_rfc2733, @@ -18072,7 +18072,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.T_route", HFILL }}, { &hf_h245_route_item, - { "route", "h245.route_item", + { "route item", "h245.route_item", FT_BYTES, BASE_HEX, NULL, 0, "h245.OCTET_STRING_SIZE_4", HFILL }}, { &hf_h245_nsap, @@ -18120,7 +18120,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.SEQUENCE_SIZE_1_256_OF_EscrowData", HFILL }}, { &hf_h245_escrowentry_item, - { "escrowentry", "h245.escrowentry_item", + { "EscrowData", "h245.EscrowData", FT_NONE, BASE_NONE, NULL, 0, "h245.EscrowData", HFILL }}, { &hf_h245_genericParameter, @@ -18296,7 +18296,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.SET_SIZE_1_15_OF_MultiplexEntryDescriptor", HFILL }}, { &hf_h245_multiplexEntryDescriptors_item, - { "multiplexEntryDescriptors", "h245.multiplexEntryDescriptors_item", + { "MultiplexEntryDescriptor", "h245.MultiplexEntryDescriptor", FT_NONE, BASE_NONE, NULL, 0, "h245.MultiplexEntryDescriptor", HFILL }}, { &hf_h245_multiplexTableEntryNumber, @@ -18308,7 +18308,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.T_elementList", HFILL }}, { &hf_h245_elementList_item, - { "elementList", "h245.elementList_item", + { "MultiplexElement", "h245.MultiplexElement", FT_NONE, BASE_NONE, NULL, 0, "h245.MultiplexElement", HFILL }}, { &hf_h245_me_type, @@ -18324,7 +18324,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.T_subElementList", HFILL }}, { &hf_h245_subElementList_item, - { "subElementList", "h245.subElementList_item", + { "MultiplexElement", "h245.MultiplexElement", FT_NONE, BASE_NONE, NULL, 0, "h245.MultiplexElement", HFILL }}, { &hf_h245_me_repeatCount, @@ -18344,7 +18344,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.SET_SIZE_1_15_OF_MultiplexTableEntryNumber", HFILL }}, { &hf_h245_multiplexTableEntryNumbers_item, - { "multiplexTableEntryNumber", "h245.multiplexTableEntryNumber_item", + { "MultiplexTableEntryNumber", "h245.MultiplexTableEntryNumber", FT_UINT32, BASE_DEC, NULL, 0, "h245.MultiplexTableEntryNumber", HFILL }}, { &hf_h245_sendRejectionDescriptions, @@ -18352,7 +18352,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.SET_SIZE_1_15_OF_MultiplexEntryRejectionDescriptions", HFILL }}, { &hf_h245_sendRejectionDescriptions_item, - { "rejectionDescriptions", "h245.rejectionDescriptions_item", + { "MultiplexEntryRejectionDescriptions", "h245.MultiplexEntryRejectionDescriptions", FT_NONE, BASE_NONE, NULL, 0, "h245.MultiplexEntryRejectionDescriptions", HFILL }}, { &hf_h245_mux_rej_cause, @@ -18372,7 +18372,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.SET_SIZE_1_15_OF_MultiplexTableEntryNumber", HFILL }}, { &hf_h245_entryNumbers_item, - { "entryNumbers", "h245.entryNumbers_item", + { "MultiplexTableEntryNumber", "h245.MultiplexTableEntryNumber", FT_UINT32, BASE_DEC, NULL, 0, "h245.MultiplexTableEntryNumber", HFILL }}, { &hf_h245_rejectionDescriptions, @@ -18380,7 +18380,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.SET_SIZE_1_15_OF_RequestMultiplexEntryRejectionDescriptions", HFILL }}, { &hf_h245_rejectionDescriptions_item, - { "rejectionDescriptions", "h245.rejectionDescriptions_item", + { "RequestMultiplexEntryRejectionDescriptions", "h245.RequestMultiplexEntryRejectionDescriptions", FT_NONE, BASE_NONE, NULL, 0, "h245.RequestMultiplexEntryRejectionDescriptions", HFILL }}, { &hf_h245_req_mux_rej_cause, @@ -18392,7 +18392,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.SEQUENCE_SIZE_1_256_OF_ModeDescription", HFILL }}, { &hf_h245_requestedModes_item, - { "requestedModes", "h245.requestedModes_item", + { "ModeDescription", "h245.ModeDescription", FT_UINT32, BASE_DEC, NULL, 0, "h245.ModeDescription", HFILL }}, { &hf_h245_req_mode_ack_response, @@ -18424,7 +18424,7 @@ void proto_register_h245(void) { FT_NONE, BASE_NONE, NULL, 0, "h245.NULL", HFILL }}, { &hf_h245_ModeDescription_item, - { "ModeDescription", "h245.ModeDescription_item", + { "ModeElement", "h245.ModeElement", FT_NONE, BASE_NONE, NULL, 0, "h245.ModeElement", HFILL }}, { &hf_h245_videoMode, @@ -18508,7 +18508,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.SEQUENCE_OF_RedundancyEncodingDTModeElement", HFILL }}, { &hf_h245_secondaryDTM_item, - { "secondary", "h245.secondary_item", + { "RedundancyEncodingDTModeElement", "h245.RedundancyEncodingDTModeElement", FT_NONE, BASE_NONE, NULL, 0, "h245.RedundancyEncodingDTModeElement", HFILL }}, { &hf_h245_re_type, @@ -18520,7 +18520,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.SEQUENCE_OF_MultiplePayloadStreamElementMode", HFILL }}, { &hf_h245_mpsmElements_item, - { "elements", "h245.elements_item", + { "MultiplePayloadStreamElementMode", "h245.MultiplePayloadStreamElementMode", FT_NONE, BASE_NONE, NULL, 0, "h245.MultiplePayloadStreamElementMode", HFILL }}, { &hf_h245_rfc2733Mode, @@ -18928,7 +18928,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.SET_SIZE_1_256_OF_CommunicationModeTableEntry", HFILL }}, { &hf_h245_communicationModeTable_item, - { "communicationModeTable", "h245.communicationModeTable_item", + { "CommunicationModeTableEntry", "h245.CommunicationModeTableEntry", FT_NONE, BASE_NONE, NULL, 0, "h245.CommunicationModeTableEntry", HFILL }}, { &hf_h245_terminalLabel, @@ -19028,7 +19028,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, VALS(h245_RemoteMCRequest_vals), 0, "h245.RemoteMCRequest", HFILL }}, { &hf_h245_CertSelectionCriteria_item, - { "CertSelectionCriteria", "h245.CertSelectionCriteria_item", + { "Criteria", "h245.Criteria", FT_NONE, BASE_NONE, NULL, 0, "h245.Criteria", HFILL }}, { &hf_h245_field, @@ -19080,7 +19080,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.SET_SIZE_1_256_OF_TerminalLabel", HFILL }}, { &hf_h245_terminalListResponse_item, - { "terminalListResponse", "h245.terminalListResponse_item", + { "TerminalLabel", "h245.TerminalLabel", FT_NONE, BASE_NONE, NULL, 0, "h245.TerminalLabel", HFILL }}, { &hf_h245_videoCommandReject, @@ -19172,7 +19172,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.SEQUENCE_OF_TerminalInformation", HFILL }}, { &hf_h245_terminalInformation_item, - { "terminalInformation", "h245.terminalInformation_item", + { "TerminalInformation", "h245.TerminalInformation", FT_NONE, BASE_NONE, NULL, 0, "h245.TerminalInformation", HFILL }}, { &hf_h245_masterActivate, @@ -19296,7 +19296,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.SET_SIZE_1_65535_OF_DialingInformationNumber", HFILL }}, { &hf_h245_differential_item, - { "differential", "h245.differential_item", + { "DialingInformationNumber", "h245.DialingInformationNumber", FT_NONE, BASE_NONE, NULL, 0, "h245.DialingInformationNumber", HFILL }}, { &hf_h245_infoNotAvailable, @@ -19316,7 +19316,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.SET_SIZE_1_255_OF_DialingInformationNetworkType", HFILL }}, { &hf_h245_networkType_item, - { "networkType", "h245.networkType_item", + { "DialingInformationNetworkType", "h245.DialingInformationNetworkType", FT_UINT32, BASE_DEC, VALS(h245_DialingInformationNetworkType_vals), 0, "h245.DialingInformationNetworkType", HFILL }}, { &hf_h245_n_isdn, @@ -19372,7 +19372,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.SET_SIZE_1_65535_OF_CapabilityTableEntryNumber", HFILL }}, { &hf_h245_capabilityTableEntryNumbers_item, - { "capabilityTableEntryNumbers", "h245.capabilityTableEntryNumbers_item", + { "CapabilityTableEntryNumber", "h245.CapabilityTableEntryNumber", FT_UINT32, BASE_DEC, NULL, 0, "h245.CapabilityTableEntryNumber", HFILL }}, { &hf_h245_capabilityDescriptorNumbers, @@ -19380,7 +19380,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.SET_SIZE_1_256_OF_CapabilityDescriptorNumber", HFILL }}, { &hf_h245_capabilityDescriptorNumbers_item, - { "capabilityDescriptorNumbers", "h245.capabilityDescriptorNumbers_item", + { "CapabilityDescriptorNumber", "h245.CapabilityDescriptorNumber", FT_UINT32, BASE_DEC, NULL, 0, "h245.CapabilityDescriptorNumber", HFILL }}, { &hf_h245_genericRequestFlag, @@ -19640,7 +19640,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.SEQUENCE_OF_PictureReference", HFILL }}, { &hf_h245_lostPicture_item, - { "lostPicture", "h245.lostPicture_item", + { "PictureReference", "h245.PictureReference", FT_UINT32, BASE_DEC, VALS(h245_PictureReference_vals), 0, "h245.PictureReference", HFILL }}, { &hf_h245_lostPartialPicture, @@ -19656,7 +19656,7 @@ void proto_register_h245(void) { FT_UINT32, BASE_DEC, NULL, 0, "h245.SEQUENCE_OF_PictureReference", HFILL }}, { &hf_h245_recoveryReferencePicture_item, - { "recoveryReferencePicture", "h245.recoveryReferencePicture_item", + { "PictureReference", "h245.PictureReference", FT_UINT32, BASE_DEC, VALS(h245_PictureReference_vals), 0, "h245.PictureReference", HFILL }}, { &hf_h245_encryptionUpdateCommand, diff --git a/epan/dissectors/packet-h245.h b/epan/dissectors/packet-h245.h index 4376792099..386f1d0775 100644 --- a/epan/dissectors/packet-h245.h +++ b/epan/dissectors/packet-h245.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-h245.h */ -/* ../../tools/asn2wrs.py -e -p h245 -c h245.cnf -s packet-h245-template MULTIMEDIA-SYSTEM-CONTROL.asn */ +/* ../../tools/asn2wrs.py -e -p h245 -c ./h245.cnf -s ./packet-h245-template -D . MULTIMEDIA-SYSTEM-CONTROL.asn */ /* Input file: packet-h245-template.h */ diff --git a/epan/dissectors/packet-h248.c b/epan/dissectors/packet-h248.c index ae5487c676..47aceb8960 100644 --- a/epan/dissectors/packet-h248.c +++ b/epan/dissectors/packet-h248.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-h248.c */ -/* ../../tools/asn2wrs.py -b -p h248 -c h248.cnf -s packet-h248-template h248v3.asn */ +/* ../../tools/asn2wrs.py -b -p h248 -c ./h248.cnf -s ./packet-h248-template -D . h248v3.asn */ /* Input file: packet-h248-template.c */ @@ -5248,7 +5248,7 @@ void proto_register_h248(void) { FT_UINT32, BASE_DEC, NULL, 0, "h248.SEQUENCE_OF_Transaction", HFILL }}, { &hf_h248_transactions_item, - { "transactions", "h248.transactions_item", + { "Transaction", "h248.Transaction", FT_UINT32, BASE_DEC, VALS(h248_Transaction_vals), 0, "h248.Transaction", HFILL }}, { &hf_h248_ip4Address, @@ -5316,7 +5316,7 @@ void proto_register_h248(void) { FT_UINT32, BASE_DEC, NULL, 0, "h248.SEQUENCE_OF_ActionRequest", HFILL }}, { &hf_h248_actions_item, - { "actions", "h248.actions_item", + { "ActionRequest", "h248.ActionRequest", FT_NONE, BASE_NONE, NULL, 0, "h248.ActionRequest", HFILL }}, { &hf_h248_tpend_transactionId, @@ -5344,7 +5344,7 @@ void proto_register_h248(void) { FT_UINT32, BASE_DEC, NULL, 0, "h248.SEQUENCE_OF_ActionReply", HFILL }}, { &hf_h248_actionReplies_item, - { "actionReplies", "h248.actionReplies_item", + { "ActionReply", "h248.ActionReply", FT_NONE, BASE_NONE, NULL, 0, "h248.ActionReply", HFILL }}, { &hf_h248_segmentNumber, @@ -5360,7 +5360,7 @@ void proto_register_h248(void) { FT_UINT32, BASE_DEC, NULL, 0, "h248.T_seg_rep_transactionId", HFILL }}, { &hf_h248_TransactionResponseAck_item, - { "TransactionResponseAck", "h248.TransactionResponseAck_item", + { "TransactionAck", "h248.TransactionAck", FT_NONE, BASE_NONE, NULL, 0, "h248.TransactionAck", HFILL }}, { &hf_h248_firstAck, @@ -5396,7 +5396,7 @@ void proto_register_h248(void) { FT_UINT32, BASE_DEC, NULL, 0, "h248.SEQUENCE_OF_CommandRequest", HFILL }}, { &hf_h248_commandRequests_item, - { "commandRequests", "h248.commandRequests_item", + { "CommandRequest", "h248.CommandRequest", FT_NONE, BASE_NONE, NULL, 0, "h248.CommandRequest", HFILL }}, { &hf_h248_errorDescriptor, @@ -5412,7 +5412,7 @@ void proto_register_h248(void) { FT_UINT32, BASE_DEC, NULL, 0, "h248.SEQUENCE_OF_CommandReply", HFILL }}, { &hf_h248_commandReply_item, - { "commandReply", "h248.commandReply_item", + { "CommandReply", "h248.CommandReply", FT_UINT32, BASE_DEC, VALS(h248_CommandReply_vals), 0, "h248.CommandReply", HFILL }}, { &hf_h248_priority, @@ -5428,7 +5428,7 @@ void proto_register_h248(void) { FT_UINT32, BASE_DEC, NULL, 0, "h248.T_topologyReq", HFILL }}, { &hf_h248_topologyReq_item, - { "topologyReq", "h248.topologyReq_item", + { "TopologyRequest", "h248.TopologyRequest", FT_NONE, BASE_NONE, NULL, 0, "h248.TopologyRequest", HFILL }}, { &hf_h248_iepscallind_BOOL, @@ -5440,7 +5440,7 @@ void proto_register_h248(void) { FT_UINT32, BASE_DEC, NULL, 0, "h248.SEQUENCE_OF_PropertyParm", HFILL }}, { &hf_h248_contextProp_item, - { "contextProp", "h248.contextProp_item", + { "PropertyParm", "h248.PropertyParm", FT_NONE, BASE_NONE, NULL, 0, "h248.PropertyParm", HFILL }}, { &hf_h248_contextList, @@ -5448,7 +5448,7 @@ void proto_register_h248(void) { FT_UINT32, BASE_DEC, NULL, 0, "h248.SEQUENCE_OF_ContextIDinList", HFILL }}, { &hf_h248_contextList_item, - { "contextList", "h248.contextList_item", + { "ContextIDinList", "h248.ContextIDinList", FT_UINT32, BASE_DEC, NULL, 0, "h248.ContextIDinList", HFILL }}, { &hf_h248_topology, @@ -5472,7 +5472,7 @@ void proto_register_h248(void) { FT_UINT32, BASE_DEC, NULL, 0, "h248.SEQUENCE_OF_IndAudPropertyParm", HFILL }}, { &hf_h248_contextPropAud_item, - { "contextPropAud", "h248.contextPropAud_item", + { "IndAudPropertyParm", "h248.IndAudPropertyParm", FT_NONE, BASE_NONE, NULL, 0, "h248.IndAudPropertyParm", HFILL }}, { &hf_h248_selectpriority, @@ -5604,7 +5604,7 @@ void proto_register_h248(void) { FT_UINT32, BASE_DEC, NULL, 0, "h248.SEQUENCE_OF_AmmDescriptor", HFILL }}, { &hf_h248_descriptors_item, - { "descriptors", "h248.descriptors_item", + { "AmmDescriptor", "h248.AmmDescriptor", FT_UINT32, BASE_DEC, VALS(h248_AmmDescriptor_vals), 0, "h248.AmmDescriptor", HFILL }}, { &hf_h248_mediaDescriptor, @@ -5672,7 +5672,7 @@ void proto_register_h248(void) { FT_UINT32, BASE_DEC, NULL, 0, "h248.TerminationAudit", HFILL }}, { &hf_h248_TerminationAudit_item, - { "TerminationAudit", "h248.TerminationAudit_item", + { "AuditReturnParameter", "h248.AuditReturnParameter", FT_UINT32, BASE_DEC, VALS(h248_AuditReturnParameter_vals), 0, "h248.AuditReturnParameter", HFILL }}, { &hf_h248_observedEventsDescriptor, @@ -5696,7 +5696,7 @@ void proto_register_h248(void) { FT_UINT32, BASE_DEC, NULL, 0, "h248.SEQUENCE_OF_IndAuditParameter", HFILL }}, { &hf_h248_auditPropertyToken_item, - { "auditPropertyToken", "h248.auditPropertyToken_item", + { "IndAuditParameter", "h248.IndAuditParameter", FT_UINT32, BASE_DEC, VALS(h248_IndAuditParameter_vals), 0, "h248.IndAuditParameter", HFILL }}, { &hf_h248_indaudmediaDescriptor, @@ -5744,7 +5744,7 @@ void proto_register_h248(void) { FT_UINT32, BASE_DEC, NULL, 0, "h248.SEQUENCE_OF_IndAudStreamDescriptor", HFILL }}, { &hf_h248_multiStream_item, - { "multiStream", "h248.multiStream_item", + { "IndAudStreamDescriptor", "h248.IndAudStreamDescriptor", FT_NONE, BASE_NONE, NULL, 0, "h248.IndAudStreamDescriptor", HFILL }}, { &hf_h248_indAudStreamParms, @@ -5784,7 +5784,7 @@ void proto_register_h248(void) { FT_UINT32, BASE_DEC, NULL, 0, "h248.SEQUENCE_OF_IndAudPropertyParm", HFILL }}, { &hf_h248_indAudPropertyParms_item, - { "propertyParms", "h248.propertyParms_item", + { "IndAudPropertyParm", "h248.IndAudPropertyParm", FT_NONE, BASE_NONE, NULL, 0, "h248.IndAudPropertyParm", HFILL }}, { &hf_h248_streamModeSel, @@ -5808,7 +5808,7 @@ void proto_register_h248(void) { FT_UINT32, BASE_DEC, NULL, 0, "h248.IndAudPropertyGroup", HFILL }}, { &hf_h248_IndAudPropertyGroup_item, - { "IndAudPropertyGroup", "h248.IndAudPropertyGroup_item", + { "IndAudPropertyParm", "h248.IndAudPropertyParm", FT_NONE, BASE_NONE, NULL, 0, "h248.IndAudPropertyParm", HFILL }}, { &hf_h248_eventBufferControl, @@ -5884,7 +5884,7 @@ void proto_register_h248(void) { FT_UINT32, BASE_DEC, NULL, 0, "h248.SEQUENCE_OF_ObservedEvent", HFILL }}, { &hf_h248_observedEventLst_item, - { "observedEventLst", "h248.observedEventLst_item", + { "ObservedEvent", "h248.ObservedEvent", FT_NONE, BASE_NONE, NULL, 0, "h248.ObservedEvent", HFILL }}, { &hf_h248_eventName, @@ -5896,7 +5896,7 @@ void proto_register_h248(void) { FT_UINT32, BASE_DEC, NULL, 0, "h248.SEQUENCE_OF_EventParameter", HFILL }}, { &hf_h248_eventParList_item, - { "eventParList", "h248.eventParList_item", + { "EventParameter", "h248.EventParameter", FT_NONE, BASE_NONE, NULL, 0, "h248.EventParameter", HFILL }}, { &hf_h248_timeNotation, @@ -5928,7 +5928,7 @@ void proto_register_h248(void) { FT_BOOLEAN, 8, NULL, 0, "h248.BOOLEAN", HFILL }}, { &hf_h248_EventParamValues_item, - { "EventParamValues", "h248.EventParamValues_item", + { "EventParamValue", "h248.EventParamValue", FT_BYTES, BASE_HEX, NULL, 0, "h248.EventParamValue", HFILL }}, { &hf_h248_serviceChangeParms, @@ -5948,7 +5948,7 @@ void proto_register_h248(void) { FT_UINT32, BASE_DEC, NULL, 0, "h248.SEQUENCE_OF_WildcardField", HFILL }}, { &hf_h248_wildcard_item, - { "wildcard", "h248.wildcard_item", + { "WildcardField", "h248.WildcardField", FT_BYTES, BASE_HEX, NULL, 0, "h248.WildcardField", HFILL }}, { &hf_h248_terminationId, @@ -5956,7 +5956,7 @@ void proto_register_h248(void) { FT_BYTES, BASE_HEX, NULL, 0, "h248.T_terminationId", HFILL }}, { &hf_h248_TerminationIDList_item, - { "TerminationIDList", "h248.TerminationIDList_item", + { "TerminationID", "h248.TerminationID", FT_NONE, BASE_NONE, NULL, 0, "h248.TerminationID", HFILL }}, { &hf_h248_termStateDescr, @@ -5976,7 +5976,7 @@ void proto_register_h248(void) { FT_UINT32, BASE_DEC, NULL, 0, "h248.SEQUENCE_OF_StreamDescriptor", HFILL }}, { &hf_h248_mediaDescriptorMultiStream_item, - { "multiStream", "h248.multiStream_item", + { "StreamDescriptor", "h248.StreamDescriptor", FT_NONE, BASE_NONE, NULL, 0, "h248.StreamDescriptor", HFILL }}, { &hf_h248_streamParms, @@ -6012,7 +6012,7 @@ void proto_register_h248(void) { FT_UINT32, BASE_DEC, NULL, 0, "h248.SEQUENCE_OF_PropertyParm", HFILL }}, { &hf_h248_propertyParms_item, - { "propertyParms", "h248.propertyParms_item", + { "PropertyParm", "h248.PropertyParm", FT_NONE, BASE_NONE, NULL, 0, "h248.PropertyParm", HFILL }}, { &hf_h248_propertyName, @@ -6024,7 +6024,7 @@ void proto_register_h248(void) { FT_UINT32, BASE_DEC, NULL, 0, "h248.SEQUENCE_OF_PropertyID", HFILL }}, { &hf_h248_propertyParamValue_item, - { "value", "h248.value_item", + { "PropertyID", "h248.PropertyID", FT_BYTES, BASE_HEX, NULL, 0, "h248.PropertyID", HFILL }}, { &hf_h248_propParm_extraInfo, @@ -6036,11 +6036,11 @@ void proto_register_h248(void) { FT_UINT32, BASE_DEC, NULL, 0, "h248.SEQUENCE_OF_PropertyGroup", HFILL }}, { &hf_h248_propGrps_item, - { "propGrps", "h248.propGrps_item", + { "PropertyGroup", "h248.PropertyGroup", FT_UINT32, BASE_DEC, NULL, 0, "h248.PropertyGroup", HFILL }}, { &hf_h248_PropertyGroup_item, - { "PropertyGroup", "h248.PropertyGroup_item", + { "PropertyParm", "h248.PropertyParm", FT_NONE, BASE_NONE, NULL, 0, "h248.PropertyParm", HFILL }}, { &hf_h248_tSEventBufferControl, @@ -6060,7 +6060,7 @@ void proto_register_h248(void) { FT_UINT32, BASE_DEC, NULL, 0, "h248.SEQUENCE_OF_TerminationID", HFILL }}, { &hf_h248_termList_item, - { "termList", "h248.termList_item", + { "TerminationID", "h248.TerminationID", FT_NONE, BASE_NONE, NULL, 0, "h248.TerminationID", HFILL }}, { &hf_h248_nonStandardData, @@ -6072,7 +6072,7 @@ void proto_register_h248(void) { FT_UINT32, BASE_DEC, NULL, 0, "h248.SEQUENCE_OF_RequestedEvent", HFILL }}, { &hf_h248_eventList_item, - { "eventList", "h248.eventList_item", + { "RequestedEvent", "h248.RequestedEvent", FT_NONE, BASE_NONE, NULL, 0, "h248.RequestedEvent", HFILL }}, { &hf_h248_eventAction, @@ -6084,7 +6084,7 @@ void proto_register_h248(void) { FT_UINT32, BASE_DEC, NULL, 0, "h248.SEQUENCE_OF_EventParameter", HFILL }}, { &hf_h248_evParList_item, - { "evParList", "h248.evParList_item", + { "EventParameter", "h248.EventParameter", FT_NONE, BASE_NONE, NULL, 0, "h248.EventParameter", HFILL }}, { &hf_h248_secondEvent, @@ -6128,7 +6128,7 @@ void proto_register_h248(void) { FT_UINT32, BASE_DEC, NULL, 0, "h248.SEQUENCE_OF_SecondRequestedEvent", HFILL }}, { &hf_h248_secondaryEventList_item, - { "eventList", "h248.eventList_item", + { "SecondRequestedEvent", "h248.SecondRequestedEvent", FT_NONE, BASE_NONE, NULL, 0, "h248.SecondRequestedEvent", HFILL }}, { &hf_h248_pkgdName, @@ -6140,11 +6140,11 @@ void proto_register_h248(void) { FT_NONE, BASE_NONE, NULL, 0, "h248.SecondRequestedActions", HFILL }}, { &hf_h248_EventBufferDescriptor_item, - { "EventBufferDescriptor", "h248.EventBufferDescriptor_item", + { "EventSpec", "h248.EventSpec", FT_NONE, BASE_NONE, NULL, 0, "h248.EventSpec", HFILL }}, { &hf_h248_SignalsDescriptor_item, - { "SignalsDescriptor", "h248.SignalsDescriptor_item", + { "SignalRequest", "h248.SignalRequest", FT_UINT32, BASE_DEC, VALS(h248_SignalRequest_vals), 0, "h248.SignalRequest", HFILL }}, { &hf_h248_signal, @@ -6160,7 +6160,7 @@ void proto_register_h248(void) { FT_UINT32, BASE_DEC, NULL, 0, "h248.SEQUENCE_OF_Signal", HFILL }}, { &hf_h248_signalList_item, - { "signalList", "h248.signalList_item", + { "Signal", "h248.Signal", FT_NONE, BASE_NONE, NULL, 0, "h248.Signal", HFILL }}, { &hf_h248_signalName, @@ -6184,7 +6184,7 @@ void proto_register_h248(void) { FT_UINT32, BASE_DEC, NULL, 0, "h248.SEQUENCE_OF_SigParameter", HFILL }}, { &hf_h248_sigParList_item, - { "sigParList", "h248.sigParList_item", + { "SigParameter", "h248.SigParameter", FT_NONE, BASE_NONE, NULL, 0, "h248.SigParameter", HFILL }}, { &hf_h248_direction, @@ -6208,7 +6208,7 @@ void proto_register_h248(void) { FT_UINT32, BASE_DEC, VALS(h248_T_extraInfo_vals), 0, "h248.T_extraInfo", HFILL }}, { &hf_h248_SigParamValues_item, - { "SigParamValues", "h248.SigParamValues_item", + { "SigParamValue", "h248.SigParamValue", FT_BYTES, BASE_HEX, NULL, 0, "h248.SigParamValue", HFILL }}, { &hf_h248_mtl, @@ -6216,7 +6216,7 @@ void proto_register_h248(void) { FT_UINT32, BASE_DEC, NULL, 0, "h248.SEQUENCE_OF_ModemType", HFILL }}, { &hf_h248_mtl_item, - { "mtl", "h248.mtl_item", + { "ModemType", "h248.ModemType", FT_UINT32, BASE_DEC, VALS(h248_ModemType_vals), 0, "h248.ModemType", HFILL }}, { &hf_h248_mpl, @@ -6224,7 +6224,7 @@ void proto_register_h248(void) { FT_UINT32, BASE_DEC, NULL, 0, "h248.SEQUENCE_OF_PropertyParm", HFILL }}, { &hf_h248_mpl_item, - { "mpl", "h248.mpl_item", + { "PropertyParm", "h248.PropertyParm", FT_NONE, BASE_NONE, NULL, 0, "h248.PropertyParm", HFILL }}, { &hf_h248_startTimer, @@ -6288,7 +6288,7 @@ void proto_register_h248(void) { FT_NONE, BASE_NONE, NULL, 0, "h248.NULL", HFILL }}, { &hf_h248_SCreasonValue_item, - { "SCreasonValue", "h248.SCreasonValue_item", + { "SCreasonValueOctetStr", "h248.SCreasonValueOctetStr", FT_BYTES, BASE_HEX, NULL, 0, "h248.SCreasonValueOctetStr", HFILL }}, { &hf_h248_timestamp, @@ -6300,11 +6300,11 @@ void proto_register_h248(void) { FT_STRING, BASE_NONE, NULL, 0, "h248.IA5String_SIZE_1_67", HFILL }}, { &hf_h248_PackagesDescriptor_item, - { "PackagesDescriptor", "h248.PackagesDescriptor_item", + { "PackagesItem", "h248.PackagesItem", FT_NONE, BASE_NONE, NULL, 0, "h248.PackagesItem", HFILL }}, { &hf_h248_StatisticsDescriptor_item, - { "StatisticsDescriptor", "h248.StatisticsDescriptor_item", + { "StatisticsParameter", "h248.StatisticsParameter", FT_NONE, BASE_NONE, NULL, 0, "h248.StatisticsParameter", HFILL }}, { &hf_h248_statName, @@ -6360,7 +6360,7 @@ void proto_register_h248(void) { FT_STRING, BASE_NONE, NULL, 0, "h248.IA5String_SIZE_8", HFILL }}, { &hf_h248_Value_item, - { "Value", "h248.Value_item", + { "Value item", "h248.Value_item", FT_BYTES, BASE_HEX, NULL, 0, "h248.OCTET_STRING", HFILL }}, { &hf_h248_T_auditToken_muxToken, diff --git a/epan/dissectors/packet-h248.h b/epan/dissectors/packet-h248.h index 60a4a6f3b6..d168a57923 100644 --- a/epan/dissectors/packet-h248.h +++ b/epan/dissectors/packet-h248.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-h248.h */ -/* ../../tools/asn2wrs.py -b -p h248 -c h248.cnf -s packet-h248-template h248v3.asn */ +/* ../../tools/asn2wrs.py -b -p h248 -c ./h248.cnf -s ./packet-h248-template -D . h248v3.asn */ /* Input file: packet-h248-template.h */ diff --git a/epan/dissectors/packet-h282.c b/epan/dissectors/packet-h282.c index 57159587eb..27d4939ada 100644 --- a/epan/dissectors/packet-h282.c +++ b/epan/dissectors/packet-h282.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-h282.c */ -/* ../../tools/asn2wrs.py -p h282 -c h282.cnf -s packet-h282-template RDC-PROTOCOL.asn */ +/* ../../tools/asn2wrs.py -p h282 -c ./h282.cnf -s ./packet-h282-template -D . RDC-PROTOCOL.asn */ /* Input file: packet-h282-template.c */ @@ -4538,7 +4538,7 @@ void proto_register_h282(void) { FT_UINT32, BASE_DEC, VALS(h282_Key_vals), 0, "h282.Key", HFILL }}, { &hf_h282_NonCollapsingCapabilities_item, - { "NonCollapsingCapabilities", "h282.NonCollapsingCapabilities_item", + { "NonCollapsingCapabilities item", "h282.NonCollapsingCapabilities_item", FT_NONE, BASE_NONE, NULL, 0, "h282.NonCollapsingCapabilities_item", HFILL }}, { &hf_h282_capabilityID, @@ -4554,7 +4554,7 @@ void proto_register_h282(void) { FT_UINT32, BASE_DEC, NULL, 0, "h282.SET_SIZE_0_127_OF_DeviceProfile", HFILL }}, { &hf_h282_deviceList_item, - { "deviceList", "h282.deviceList_item", + { "DeviceProfile", "h282.DeviceProfile", FT_NONE, BASE_NONE, NULL, 0, "h282.DeviceProfile", HFILL }}, { &hf_h282_streamList, @@ -4562,7 +4562,7 @@ void proto_register_h282(void) { FT_UINT32, BASE_DEC, NULL, 0, "h282.SET_SIZE_0_127_OF_StreamProfile", HFILL }}, { &hf_h282_streamList_item, - { "streamList", "h282.streamList_item", + { "StreamProfile", "h282.StreamProfile", FT_NONE, BASE_NONE, NULL, 0, "h282.StreamProfile", HFILL }}, { &hf_h282_playing, @@ -4614,7 +4614,7 @@ void proto_register_h282(void) { FT_UINT32, BASE_DEC, NULL, 0, "h282.T_presetCapability", HFILL }}, { &hf_h282_presetCapability_item, - { "presetCapability", "h282.presetCapability_item", + { "presetCapability item", "h282.presetCapability_item", FT_NONE, BASE_NONE, NULL, 0, "h282.T_presetCapability_item", HFILL }}, { &hf_h282_presetNumber, @@ -4638,7 +4638,7 @@ void proto_register_h282(void) { FT_UINT32, BASE_DEC, NULL, 0, "h282.T_filterTextLabel", HFILL }}, { &hf_h282_filterTextLabel_item, - { "filterTextLabel", "h282.filterTextLabel_item", + { "filterTextLabel item", "h282.filterTextLabel_item", FT_NONE, BASE_NONE, NULL, 0, "h282.T_filterTextLabel_item", HFILL }}, { &hf_h282_filterNumber, @@ -4658,7 +4658,7 @@ void proto_register_h282(void) { FT_UINT32, BASE_DEC, NULL, 0, "h282.T_accessoryTextLabel", HFILL }}, { &hf_h282_accessoryTextLabel_item, - { "accessoryTextLabel", "h282.accessoryTextLabel_item", + { "accessoryTextLabel item", "h282.accessoryTextLabel_item", FT_NONE, BASE_NONE, NULL, 0, "h282.T_accessoryTextLabel_item", HFILL }}, { &hf_h282_lensNumber, @@ -4678,7 +4678,7 @@ void proto_register_h282(void) { FT_UINT32, BASE_DEC, NULL, 0, "h282.T_lightTextLabel", HFILL }}, { &hf_h282_lightTextLabel_item, - { "lightTextLabel", "h282.lightTextLabel_item", + { "lightTextLabel item", "h282.lightTextLabel_item", FT_NONE, BASE_NONE, NULL, 0, "h282.T_lightTextLabel_item", HFILL }}, { &hf_h282_lightNumber, @@ -4738,7 +4738,7 @@ void proto_register_h282(void) { FT_UINT32, BASE_DEC, NULL, 0, "h282.T_multiplierFactors", HFILL }}, { &hf_h282_multiplierFactors_item, - { "multiplierFactors", "h282.multiplierFactors_item", + { "multiplierFactors item", "h282.multiplierFactors_item", FT_UINT32, BASE_DEC, NULL, 0, "h282.INTEGER_10_1000", HFILL }}, { &hf_h282_divisorFactors, @@ -4746,7 +4746,7 @@ void proto_register_h282(void) { FT_UINT32, BASE_DEC, NULL, 0, "h282.T_divisorFactors", HFILL }}, { &hf_h282_divisorFactors_item, - { "divisorFactors", "h282.divisorFactors_item", + { "divisorFactors item", "h282.divisorFactors_item", FT_UINT32, BASE_DEC, NULL, 0, "h282.INTEGER_10_1000", HFILL }}, { &hf_h282_numberOfDeviceInputs, @@ -4762,7 +4762,7 @@ void proto_register_h282(void) { FT_UINT32, BASE_DEC, NULL, 0, "h282.T_availableDevices", HFILL }}, { &hf_h282_availableDevices_item, - { "availableDevices", "h282.availableDevices_item", + { "availableDevices item", "h282.availableDevices_item", FT_NONE, BASE_NONE, NULL, 0, "h282.T_availableDevices_item", HFILL }}, { &hf_h282_deviceClass, @@ -4778,7 +4778,7 @@ void proto_register_h282(void) { FT_UINT32, BASE_DEC, NULL, 0, "h282.T_availableDevices_01", HFILL }}, { &hf_h282_availableDevices_item_01, - { "availableDevices", "h282.availableDevices_item", + { "availableDevices item", "h282.availableDevices_item", FT_NONE, BASE_NONE, NULL, 0, "h282.T_availableDevices_item_01", HFILL }}, { &hf_h282_deviceStateSupported, @@ -5254,7 +5254,7 @@ void proto_register_h282(void) { FT_UINT32, BASE_DEC, NULL, 0, "h282.T_inputDevices", HFILL }}, { &hf_h282_inputDevices_item, - { "inputDevices", "h282.inputDevices_item", + { "inputDevices item", "h282.inputDevices_item", FT_NONE, BASE_NONE, NULL, 0, "h282.T_inputDevices_item", HFILL }}, { &hf_h282_setDeviceState, @@ -5966,7 +5966,7 @@ void proto_register_h282(void) { FT_UINT32, BASE_DEC, NULL, 0, "h282.SET_OF_DeviceAttribute", HFILL }}, { &hf_h282_deviceAttributeList_item, - { "deviceAttributeList", "h282.deviceAttributeList_item", + { "DeviceAttribute", "h282.DeviceAttribute", FT_UINT32, BASE_DEC, VALS(h282_DeviceAttribute_vals), 0, "h282.DeviceAttribute", HFILL }}, { &hf_h282_result_02, @@ -6010,7 +6010,7 @@ void proto_register_h282(void) { FT_UINT32, BASE_DEC, NULL, 0, "h282.SET_SIZE_1_8_OF_ControlAttribute", HFILL }}, { &hf_h282_controlAttributeList_item, - { "controlAttributeList", "h282.controlAttributeList_item", + { "ControlAttribute", "h282.ControlAttribute", FT_UINT32, BASE_DEC, VALS(h282_ControlAttribute_vals), 0, "h282.ControlAttribute", HFILL }}, { &hf_h282_statusAttributeIdentifierList, @@ -6018,7 +6018,7 @@ void proto_register_h282(void) { FT_UINT32, BASE_DEC, NULL, 0, "h282.SET_SIZE_1_16_OF_StatusAttributeIdentifier", HFILL }}, { &hf_h282_statusAttributeIdentifierList_item, - { "statusAttributeIdentifierList", "h282.statusAttributeIdentifierList_item", + { "StatusAttributeIdentifier", "h282.StatusAttributeIdentifier", FT_UINT32, BASE_DEC, VALS(h282_StatusAttributeIdentifier_vals), 0, "h282.StatusAttributeIdentifier", HFILL }}, { &hf_h282_statusAttributeList, @@ -6026,7 +6026,7 @@ void proto_register_h282(void) { FT_UINT32, BASE_DEC, NULL, 0, "h282.SET_SIZE_1_16_OF_StatusAttribute", HFILL }}, { &hf_h282_statusAttributeList_item, - { "statusAttributeList", "h282.statusAttributeList_item", + { "StatusAttribute", "h282.StatusAttribute", FT_UINT32, BASE_DEC, VALS(h282_StatusAttribute_vals), 0, "h282.StatusAttribute", HFILL }}, { &hf_h282_result_05, @@ -6042,7 +6042,7 @@ void proto_register_h282(void) { FT_UINT32, BASE_DEC, NULL, 0, "h282.SET_OF_DeviceEventIdentifier", HFILL }}, { &hf_h282_deviceEventIdentifierList_item, - { "deviceEventIdentifierList", "h282.deviceEventIdentifierList_item", + { "DeviceEventIdentifier", "h282.DeviceEventIdentifier", FT_UINT32, BASE_DEC, VALS(h282_DeviceEventIdentifier_vals), 0, "h282.DeviceEventIdentifier", HFILL }}, { &hf_h282_result_06, @@ -6054,7 +6054,7 @@ void proto_register_h282(void) { FT_UINT32, BASE_DEC, NULL, 0, "h282.SET_SIZE_1_8_OF_DeviceEvent", HFILL }}, { &hf_h282_deviceEventList_item, - { "deviceEventList", "h282.deviceEventList_item", + { "DeviceEvent", "h282.DeviceEvent", FT_UINT32, BASE_DEC, VALS(h282_DeviceEvent_vals), 0, "h282.DeviceEvent", HFILL }}, { &hf_h282_nonStandardData, diff --git a/epan/dissectors/packet-h283.c b/epan/dissectors/packet-h283.c index 56d6fef785..f5d492cf1f 100644 --- a/epan/dissectors/packet-h283.c +++ b/epan/dissectors/packet-h283.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-h283.c */ -/* ../../tools/asn2wrs.py -p h283 -c h283.cnf -s packet-h283-template LCT-PROTOCOL.asn */ +/* ../../tools/asn2wrs.py -p h283 -c ./h283.cnf -s ./packet-h283-template -D . LCT-PROTOCOL.asn */ /* Input file: packet-h283-template.c */ @@ -661,7 +661,7 @@ void proto_register_h283(void) { FT_UINT32, BASE_DEC, NULL, 0, "h283.SEQUENCE_OF_NonStandardParameter", HFILL }}, { &hf_h283_nonStandardParameters_item, - { "nonStandardParameters", "h283.nonStandardParameters_item", + { "NonStandardParameter", "h283.NonStandardParameter", FT_NONE, BASE_NONE, NULL, 0, "h283.NonStandardParameter", HFILL }}, { &hf_h283_mAddress, diff --git a/epan/dissectors/packet-h323.c b/epan/dissectors/packet-h323.c index 159873d511..8958ac8c1e 100644 --- a/epan/dissectors/packet-h323.c +++ b/epan/dissectors/packet-h323.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-h323.c */ -/* ../../tools/asn2wrs.py -p h323 -c h323.cnf -s packet-h323-template RAS-PROTOCOL-TUNNEL.asn ROBUSTNESS-DATA.asn */ +/* ../../tools/asn2wrs.py -p h323 -c ./h323.cnf -s ./packet-h323-template -D . RAS-PROTOCOL-TUNNEL.asn ROBUSTNESS-DATA.asn */ /* Input file: packet-h323-template.c */ @@ -472,7 +472,7 @@ void proto_register_h323(void) { FT_UINT32, BASE_DEC, NULL, 0, "h323.T_messageContent", HFILL }}, { &hf_h323_messageContent_item, - { "messageContent", "h323.messageContent_item", + { "messageContent item", "h323.messageContent_item", FT_BYTES, BASE_HEX, NULL, 0, "h323.OCTET_STRING", HFILL }}, { &hf_h323_tunnellingRequired, @@ -516,7 +516,7 @@ void proto_register_h323(void) { FT_NONE, BASE_NONE, NULL, 0, "h323.StatusInquiry_RD", HFILL }}, { &hf_h323_BackupCallSignalAddresses_item, - { "BackupCallSignalAddresses", "h323.BackupCallSignalAddresses_item", + { "BackupCallSignalAddresses item", "h323.BackupCallSignalAddresses_item", FT_UINT32, BASE_DEC, VALS(h323_BackupCallSignalAddresses_item_vals), 0, "h323.BackupCallSignalAddresses_item", HFILL }}, { &hf_h323_tcp, @@ -552,7 +552,7 @@ void proto_register_h323(void) { FT_UINT32, BASE_DEC, NULL, 0, "h323.T_fastStart", HFILL }}, { &hf_h323_fastStart_item, - { "fastStart", "h323.fastStart_item", + { "fastStart item", "h323.fastStart_item", FT_BYTES, BASE_HEX, NULL, 0, "h323.OCTET_STRING", HFILL }}, { &hf_h323_resetH245, diff --git a/epan/dissectors/packet-h323.h b/epan/dissectors/packet-h323.h index 0a919f9dd8..b8381d84c2 100644 --- a/epan/dissectors/packet-h323.h +++ b/epan/dissectors/packet-h323.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-h323.h */ -/* ../../tools/asn2wrs.py -p h323 -c h323.cnf -s packet-h323-template RAS-PROTOCOL-TUNNEL.asn ROBUSTNESS-DATA.asn */ +/* ../../tools/asn2wrs.py -p h323 -c ./h323.cnf -s ./packet-h323-template -D . RAS-PROTOCOL-TUNNEL.asn ROBUSTNESS-DATA.asn */ /* Input file: packet-h323-template.h */ diff --git a/epan/dissectors/packet-h450-ros.c b/epan/dissectors/packet-h450-ros.c index 83b3a6e261..1c4e899040 100644 --- a/epan/dissectors/packet-h450-ros.c +++ b/epan/dissectors/packet-h450-ros.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-h450-ros.c */ -/* ../../tools/asn2wrs.py -e -p h450.ros -c h450-ros.cnf -s packet-h450-ros-template ../ros/Remote-Operations-Information-Objects.asn Remote-Operations-Apdus.asn */ +/* ../../tools/asn2wrs.py -e -p h450.ros -c ./h450-ros.cnf -s ./packet-h450-ros-template -D . ../ros/Remote-Operations-Information-Objects.asn Remote-Operations-Apdus.asn */ /* Input file: packet-h450-ros-template.c */ diff --git a/epan/dissectors/packet-h450-ros.h b/epan/dissectors/packet-h450-ros.h index b132fd08c3..e79cb801f1 100644 --- a/epan/dissectors/packet-h450-ros.h +++ b/epan/dissectors/packet-h450-ros.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-h450-ros.h */ -/* ../../tools/asn2wrs.py -e -p h450.ros -c h450-ros.cnf -s packet-h450-ros-template ../ros/Remote-Operations-Information-Objects.asn Remote-Operations-Apdus.asn */ +/* ../../tools/asn2wrs.py -e -p h450.ros -c ./h450-ros.cnf -s ./packet-h450-ros-template -D . ../ros/Remote-Operations-Information-Objects.asn Remote-Operations-Apdus.asn */ /* Input file: packet-h450-ros-template.h */ diff --git a/epan/dissectors/packet-h450.c b/epan/dissectors/packet-h450.c index 2c315dd2c6..21f6325b9a 100644 --- a/epan/dissectors/packet-h450.c +++ b/epan/dissectors/packet-h450.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-h450.c */ -/* ../../tools/asn2wrs.py -c h450.cnf -s packet-h450-template H4501-Supplementary-ServiceAPDU-Structure.asn Addressing-Data-Elements.asn H225-generic-parameters-definition.asn Manufacturer-specific-service-extension-definition.asn H4501-General-Error-List.asn Call-Transfer-Operations.asn Call-Diversion-Operations.asn Call-Hold-Operations.asn Call-Park-Pickup-Operations.asn Call-Waiting-Operations.asn Message-Waiting-Indication-Operations.asn Name-Operations.asn Call-Completion-Operations.asn Call-Offer-Operations.asn Call-Intrusion-Operations.asn Common-Information-Operations.asn */ +/* ../../tools/asn2wrs.py -c ./h450.cnf -s ./packet-h450-template -D . H4501-Supplementary-ServiceAPDU-Structure.asn Addressing-Data-Elements.asn H225-generic-parameters-definition.asn Manufacturer-specific-service-extension-definition.asn H4501-General-Error-List.asn Call-Transfer-Operations.asn Call-Diversion-Operations.asn Call-Hold-Operations.asn Call-Park-Pickup-Operations.asn Call-Waiting-Operations.asn Message-Waiting-Indication-Operations.asn Name-Operations.asn Call-Completion-Operations.asn Call-Offer-Operations.asn Call-Intrusion-Operations.asn Common-Information-Operations.asn */ /* Input file: packet-h450-template.c */ @@ -4907,7 +4907,7 @@ void proto_register_h450(void) { FT_UINT32, BASE_DEC, NULL, 0, "h450.T_rosApdus", HFILL }}, { &hf_h450_rosApdus_item, - { "rosApdus", "h450.rosApdus_item", + { "rosApdus item", "h450.rosApdus_item", FT_UINT32, BASE_DEC, VALS(h450_ros_ROS_vals), 0, "h450.T_rosApdus_item", HFILL }}, { &hf_h450_destinationAddress, @@ -4915,7 +4915,7 @@ void proto_register_h450(void) { FT_UINT32, BASE_DEC, NULL, 0, "h450.SEQUENCE_OF_AliasAddress", HFILL }}, { &hf_h450_destinationAddress_item, - { "destinationAddress", "h450.destinationAddress_item", + { "AliasAddress", "h450.AliasAddress", FT_UINT32, BASE_DEC, VALS(AliasAddress_vals), 0, "h225.AliasAddress", HFILL }}, { &hf_h450_remoteExtensionAddress, @@ -5086,7 +5086,7 @@ void proto_register_h450(void) { FT_UINT32, BASE_DEC, VALS(h450_2_T_cTActiveArg_argumentExtension_vals), 0, "h450_2.T_cTActiveArg_argumentExtension", HFILL }}, { &hf_h450_2_ExtensionSeq_item, - { "ExtensionSeq", "h450.2.ExtensionSeq_item", + { "Extension", "h450.2.Extension", FT_NONE, BASE_NONE, NULL, 0, "h450.Extension", HFILL }}, { &hf_h450_2_unspecified_extension, @@ -5333,7 +5333,7 @@ void proto_register_h450(void) { FT_UINT32, BASE_DEC, VALS(h450_3_DivertingLegInformation4Arg_extension_vals), 0, "h450_3.DivertingLegInformation4Arg_extension", HFILL }}, { &hf_h450_3_IntResultList_item, - { "IntResultList", "h450.3.IntResultList_item", + { "IntResult", "h450.3.IntResult", FT_NONE, BASE_NONE, NULL, 0, "h450_3.IntResult", HFILL }}, { &hf_h450_3_remoteEnabled, @@ -5353,7 +5353,7 @@ void proto_register_h450(void) { FT_NONE, BASE_NONE, NULL, 0, "h225.NonStandardParameter", HFILL }}, { &hf_h450_3_ExtensionSeq_item, - { "ExtensionSeq", "h450.3.ExtensionSeq_item", + { "Extension", "h450.3.Extension", FT_NONE, BASE_NONE, NULL, 0, "h450.Extension", HFILL }}, @@ -5392,7 +5392,7 @@ void proto_register_h450(void) { FT_UINT32, BASE_DEC, NULL, 0, "h450_4.SEQUENCE_SIZE_0_255_OF_MixedExtension", HFILL }}, { &hf_h450_4_holdNotificArg_extensionArg_item, - { "extensionArg", "h450.4.extensionArg_item", + { "MixedExtension", "h450.4.MixedExtension", FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0, "h450_4.MixedExtension", HFILL }}, { &hf_h450_4_retrieveNotificArg_extensionArg, @@ -5400,7 +5400,7 @@ void proto_register_h450(void) { FT_UINT32, BASE_DEC, NULL, 0, "h450_4.SEQUENCE_SIZE_0_255_OF_MixedExtension", HFILL }}, { &hf_h450_4_retrieveNotificArg_extensionArg_item, - { "extensionArg", "h450.4.extensionArg_item", + { "MixedExtension", "h450.4.MixedExtension", FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0, "h450_4.MixedExtension", HFILL }}, { &hf_h450_4_remoteHoldArg_extensionArg, @@ -5408,7 +5408,7 @@ void proto_register_h450(void) { FT_UINT32, BASE_DEC, NULL, 0, "h450_4.SEQUENCE_SIZE_0_255_OF_MixedExtension", HFILL }}, { &hf_h450_4_remoteHoldArg_extensionArg_item, - { "extensionArg", "h450.4.extensionArg_item", + { "MixedExtension", "h450.4.MixedExtension", FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0, "h450_4.MixedExtension", HFILL }}, { &hf_h450_4_extensionRes, @@ -5416,7 +5416,7 @@ void proto_register_h450(void) { FT_UINT32, BASE_DEC, NULL, 0, "h450_4.SEQUENCE_SIZE_0_255_OF_MixedExtension", HFILL }}, { &hf_h450_4_extensionRes_item, - { "extensionRes", "h450.4.extensionRes_item", + { "MixedExtension", "h450.4.MixedExtension", FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0, "h450_4.MixedExtension", HFILL }}, { &hf_h450_4_remoteRetrieveArg_extensionArg, @@ -5424,7 +5424,7 @@ void proto_register_h450(void) { FT_UINT32, BASE_DEC, NULL, 0, "h450_4.SEQUENCE_SIZE_0_255_OF_MixedExtension", HFILL }}, { &hf_h450_4_remoteRetrieveArg_extensionArg_item, - { "extensionArg", "h450.4.extensionArg_item", + { "MixedExtension", "h450.4.MixedExtension", FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0, "h450_4.MixedExtension", HFILL }}, { &hf_h450_4_mixedExtension_extension, @@ -5436,7 +5436,7 @@ void proto_register_h450(void) { FT_NONE, BASE_NONE, NULL, 0, "h225.NonStandardParameter", HFILL }}, { &hf_h450_4_PAR_undefined_item, - { "PAR-undefined", "h450.4.PAR_undefined_item", + { "MixedExtension", "h450.4.MixedExtension", FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0, "h450_4.MixedExtension", HFILL }}, @@ -5531,7 +5531,7 @@ void proto_register_h450(void) { FT_UINT32, BASE_DEC, NULL, 0, "h450_5.SEQUENCE_SIZE_0_255_OF_MixedExtension", HFILL }}, { &hf_h450_5_cpRequestArg_extensionArg_item, - { "extensionArg", "h450.5.extensionArg_item", + { "MixedExtension", "h450.5.MixedExtension", FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0, "h450_4.MixedExtension", HFILL }}, { &hf_h450_5_parkCondition, @@ -5543,7 +5543,7 @@ void proto_register_h450(void) { FT_UINT32, BASE_DEC, NULL, 0, "h450_5.SEQUENCE_SIZE_0_255_OF_MixedExtension", HFILL }}, { &hf_h450_5_extensionRes_item, - { "extensionRes", "h450.5.extensionRes_item", + { "MixedExtension", "h450.5.MixedExtension", FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0, "h450_4.MixedExtension", HFILL }}, { &hf_h450_5_cpSetupArg_extensionArg, @@ -5551,7 +5551,7 @@ void proto_register_h450(void) { FT_UINT32, BASE_DEC, NULL, 0, "h450_5.SEQUENCE_SIZE_0_255_OF_MixedExtension", HFILL }}, { &hf_h450_5_cpSetupArg_extensionArg_item, - { "extensionArg", "h450.5.extensionArg_item", + { "MixedExtension", "h450.5.MixedExtension", FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0, "h450_4.MixedExtension", HFILL }}, { &hf_h450_5_callPickupId, @@ -5583,7 +5583,7 @@ void proto_register_h450(void) { FT_UINT32, BASE_DEC, NULL, 0, "h450_5.SEQUENCE_SIZE_0_255_OF_MixedExtension", HFILL }}, { &hf_h450_5_groupIndicationOnArg_extensionArg_item, - { "extensionArg", "h450.5.extensionArg_item", + { "MixedExtension", "h450.5.MixedExtension", FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0, "h450_4.MixedExtension", HFILL }}, { &hf_h450_5_groupIndicationOffArg_extensionArg, @@ -5591,7 +5591,7 @@ void proto_register_h450(void) { FT_UINT32, BASE_DEC, NULL, 0, "h450_5.SEQUENCE_SIZE_0_255_OF_MixedExtension", HFILL }}, { &hf_h450_5_groupIndicationOffArg_extensionArg_item, - { "extensionArg", "h450.5.extensionArg_item", + { "MixedExtension", "h450.5.MixedExtension", FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0, "h450_4.MixedExtension", HFILL }}, { &hf_h450_5_picking_upNumber, @@ -5603,7 +5603,7 @@ void proto_register_h450(void) { FT_UINT32, BASE_DEC, NULL, 0, "h450_5.SEQUENCE_SIZE_0_255_OF_MixedExtension", HFILL }}, { &hf_h450_5_pickrequArg_extensionArg_item, - { "extensionArg", "h450.5.extensionArg_item", + { "MixedExtension", "h450.5.MixedExtension", FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0, "h450_4.MixedExtension", HFILL }}, { &hf_h450_5_pickupArg_extensionArg, @@ -5611,7 +5611,7 @@ void proto_register_h450(void) { FT_UINT32, BASE_DEC, NULL, 0, "h450_5.SEQUENCE_SIZE_0_255_OF_MixedExtension", HFILL }}, { &hf_h450_5_pickupArg_extensionArg_item, - { "extensionArg", "h450.5.extensionArg_item", + { "MixedExtension", "h450.5.MixedExtension", FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0, "h450_4.MixedExtension", HFILL }}, { &hf_h450_5_pickExeArg_extensionArg, @@ -5619,7 +5619,7 @@ void proto_register_h450(void) { FT_UINT32, BASE_DEC, NULL, 0, "h450_5.SEQUENCE_SIZE_0_255_OF_MixedExtension", HFILL }}, { &hf_h450_5_pickExeArg_extensionArg_item, - { "extensionArg", "h450.5.extensionArg_item", + { "MixedExtension", "h450.5.MixedExtension", FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0, "h450_4.MixedExtension", HFILL }}, { &hf_h450_5_cpNotifyArg_extensionArg, @@ -5627,7 +5627,7 @@ void proto_register_h450(void) { FT_UINT32, BASE_DEC, NULL, 0, "h450_5.SEQUENCE_SIZE_0_255_OF_MixedExtension", HFILL }}, { &hf_h450_5_cpNotifyArg_extensionArg_item, - { "extensionArg", "h450.5.extensionArg_item", + { "MixedExtension", "h450.5.MixedExtension", FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0, "h450_4.MixedExtension", HFILL }}, { &hf_h450_5_cpickupNotifyArg_extensionArg, @@ -5635,11 +5635,11 @@ void proto_register_h450(void) { FT_UINT32, BASE_DEC, NULL, 0, "h450_5.SEQUENCE_SIZE_0_255_OF_MixedExtension", HFILL }}, { &hf_h450_5_cpickupNotifyArg_extensionArg_item, - { "extensionArg", "h450.5.extensionArg_item", + { "MixedExtension", "h450.5.MixedExtension", FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0, "h450_4.MixedExtension", HFILL }}, { &hf_h450_5_PAR_undefined_item, - { "PAR-undefined", "h450.5.PAR_undefined_item", + { "MixedExtension", "h450.5.MixedExtension", FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0, "h450_4.MixedExtension", HFILL }}, @@ -5658,7 +5658,7 @@ void proto_register_h450(void) { FT_UINT32, BASE_DEC, NULL, 0, "h450_6.SEQUENCE_SIZE_0_255_OF_MixedExtension", HFILL }}, { &hf_h450_6_callWaitingArg_extensionArg_item, - { "extensionArg", "h450.6.extensionArg_item", + { "MixedExtension", "h450.6.MixedExtension", FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0, "h450_4.MixedExtension", HFILL }}, @@ -5721,11 +5721,11 @@ void proto_register_h450(void) { FT_UINT32, BASE_DEC, NULL, 0, "h450_7.SEQUENCE_SIZE_0_255_OF_MixedExtension", HFILL }}, { &hf_h450_7_mWIActivateArg_extensionArg_item, - { "extensionArg", "h450.7.extensionArg_item", + { "MixedExtension", "h450.7.MixedExtension", FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0, "h450_4.MixedExtension", HFILL }}, { &hf_h450_7_DummyRes_item, - { "DummyRes", "h450.7.DummyRes_item", + { "MixedExtension", "h450.7.MixedExtension", FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0, "h450_4.MixedExtension", HFILL }}, { &hf_h450_7_callbackReq, @@ -5737,7 +5737,7 @@ void proto_register_h450(void) { FT_UINT32, BASE_DEC, NULL, 0, "h450_7.SEQUENCE_SIZE_0_255_OF_MixedExtension", HFILL }}, { &hf_h450_7_mWIDeactivateArg_extensionArg_item, - { "extensionArg", "h450.7.extensionArg_item", + { "MixedExtension", "h450.7.MixedExtension", FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0, "h450_4.MixedExtension", HFILL }}, { &hf_h450_7_mWIInterrogateArg_extensionArg, @@ -5745,11 +5745,11 @@ void proto_register_h450(void) { FT_UINT32, BASE_DEC, NULL, 0, "h450_7.SEQUENCE_SIZE_0_255_OF_MixedExtension", HFILL }}, { &hf_h450_7_mWIInterrogateArg_extensionArg_item, - { "extensionArg", "h450.7.extensionArg_item", + { "MixedExtension", "h450.7.MixedExtension", FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0, "h450_4.MixedExtension", HFILL }}, { &hf_h450_7_MWIInterrogateRes_item, - { "MWIInterrogateRes", "h450.7.MWIInterrogateRes_item", + { "MWIInterrogateResElt", "h450.7.MWIInterrogateResElt", FT_NONE, BASE_NONE, NULL, 0, "h450_7.MWIInterrogateResElt", HFILL }}, { &hf_h450_7_mWIInterrogateResElt_extensionArg, @@ -5757,7 +5757,7 @@ void proto_register_h450(void) { FT_UINT32, BASE_DEC, NULL, 0, "h450_7.SEQUENCE_SIZE_0_255_OF_MixedExtension", HFILL }}, { &hf_h450_7_mWIInterrogateResElt_extensionArg_item, - { "extensionArg", "h450.7.extensionArg_item", + { "MixedExtension", "h450.7.MixedExtension", FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0, "h450_4.MixedExtension", HFILL }}, { &hf_h450_7_integer, @@ -5773,7 +5773,7 @@ void proto_register_h450(void) { FT_STRING, BASE_NONE, NULL, 0, "h450_7.NumericString_SIZE_1_10", HFILL }}, { &hf_h450_7_PAR_undefined_item, - { "PAR-undefined", "h450.7.PAR_undefined_item", + { "MixedExtension", "h450.7.MixedExtension", FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0, "h450_4.MixedExtension", HFILL }}, @@ -5804,7 +5804,7 @@ void proto_register_h450(void) { FT_UINT32, BASE_DEC, NULL, 0, "h450_8.SEQUENCE_SIZE_0_255_OF_MixedExtension", HFILL }}, { &hf_h450_8_extensionArg_item, - { "extensionArg", "h450.8.extensionArg_item", + { "MixedExtension", "h450.8.MixedExtension", FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0, "h450_4.MixedExtension", HFILL }}, { &hf_h450_8_namePresentationAllowed, @@ -5879,7 +5879,7 @@ void proto_register_h450(void) { FT_UINT32, BASE_DEC, NULL, 0, "h450_9.SEQUENCE_SIZE_0_255_OF_MixedExtension", HFILL }}, { &hf_h450_9_ccRequestArg_extension_item, - { "extension", "h450.9.extension_item", + { "MixedExtension", "h450.9.MixedExtension", FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0, "h450_4.MixedExtension", HFILL }}, { &hf_h450_9_retain_service, @@ -5891,7 +5891,7 @@ void proto_register_h450(void) { FT_UINT32, BASE_DEC, NULL, 0, "h450_9.SEQUENCE_SIZE_0_255_OF_MixedExtension", HFILL }}, { &hf_h450_9_ccRequestRes_extension_item, - { "extension", "h450.9.extension_item", + { "MixedExtension", "h450.9.MixedExtension", FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0, "h450_4.MixedExtension", HFILL }}, { &hf_h450_9_shortArg, @@ -5907,7 +5907,7 @@ void proto_register_h450(void) { FT_UINT32, BASE_DEC, NULL, 0, "h450_9.SEQUENCE_SIZE_0_255_OF_MixedExtension", HFILL }}, { &hf_h450_9_ccShortArg_extension_item, - { "extension", "h450.9.extension_item", + { "MixedExtension", "h450.9.MixedExtension", FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0, "h450_4.MixedExtension", HFILL }}, { &hf_h450_9_ccLongArg_extension, @@ -5915,7 +5915,7 @@ void proto_register_h450(void) { FT_UINT32, BASE_DEC, NULL, 0, "h450_9.SEQUENCE_SIZE_0_255_OF_MixedExtension", HFILL }}, { &hf_h450_9_ccLongArg_extension_item, - { "extension", "h450.9.extension_item", + { "MixedExtension", "h450.9.MixedExtension", FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0, "h450_4.MixedExtension", HFILL }}, @@ -5938,7 +5938,7 @@ void proto_register_h450(void) { FT_UINT32, BASE_DEC, NULL, 0, "h450_10.SEQUENCE_SIZE_0_255_OF_MixedExtension", HFILL }}, { &hf_h450_10_coReqOptArg_extension_item, - { "extension", "h450.10.extension_item", + { "MixedExtension", "h450.10.MixedExtension", FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0, "h450_4.MixedExtension", HFILL }}, { &hf_h450_10_rUAlertOptArg_extension, @@ -5946,7 +5946,7 @@ void proto_register_h450(void) { FT_UINT32, BASE_DEC, NULL, 0, "h450_10.SEQUENCE_SIZE_0_255_OF_MixedExtension", HFILL }}, { &hf_h450_10_rUAlertOptArg_extension_item, - { "extension", "h450.10.extension_item", + { "MixedExtension", "h450.10.MixedExtension", FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0, "h450_4.MixedExtension", HFILL }}, { &hf_h450_10_cfbOvrOptArg_extension, @@ -5954,7 +5954,7 @@ void proto_register_h450(void) { FT_UINT32, BASE_DEC, NULL, 0, "h450_10.SEQUENCE_SIZE_0_255_OF_MixedExtension", HFILL }}, { &hf_h450_10_cfbOvrOptArg_extension_item, - { "extension", "h450.10.extension_item", + { "MixedExtension", "h450.10.MixedExtension", FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0, "h450_4.MixedExtension", HFILL }}, @@ -6021,7 +6021,7 @@ void proto_register_h450(void) { FT_UINT32, BASE_DEC, NULL, 0, "h450_11.SEQUENCE_SIZE_0_255_OF_MixedExtension", HFILL }}, { &hf_h450_11_cIRequestArg_argumentExtension_item, - { "argumentExtension", "h450.11.argumentExtension_item", + { "MixedExtension", "h450.11.MixedExtension", FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0, "h450_4.MixedExtension", HFILL }}, { &hf_h450_11_ciStatusInformation, @@ -6033,7 +6033,7 @@ void proto_register_h450(void) { FT_UINT32, BASE_DEC, NULL, 0, "h450_11.SEQUENCE_SIZE_0_255_OF_MixedExtension", HFILL }}, { &hf_h450_11_cIRequestRes_resultExtension_item, - { "resultExtension", "h450.11.resultExtension_item", + { "MixedExtension", "h450.11.MixedExtension", FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0, "h450_4.MixedExtension", HFILL }}, { &hf_h450_11_cIGetCIPLOptArg_argumentExtension, @@ -6041,7 +6041,7 @@ void proto_register_h450(void) { FT_UINT32, BASE_DEC, NULL, 0, "h450_11.SEQUENCE_SIZE_0_255_OF_MixedExtension", HFILL }}, { &hf_h450_11_cIGetCIPLOptArg_argumentExtension_item, - { "argumentExtension", "h450.11.argumentExtension_item", + { "MixedExtension", "h450.11.MixedExtension", FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0, "h450_4.MixedExtension", HFILL }}, { &hf_h450_11_ciProtectionLevel, @@ -6057,7 +6057,7 @@ void proto_register_h450(void) { FT_UINT32, BASE_DEC, NULL, 0, "h450_11.SEQUENCE_SIZE_0_255_OF_MixedExtension", HFILL }}, { &hf_h450_11_cIGetCIPLRes_resultExtension_item, - { "resultExtension", "h450.11.resultExtension_item", + { "MixedExtension", "h450.11.MixedExtension", FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0, "h450_4.MixedExtension", HFILL }}, { &hf_h450_11_cIIsOptArg_argumentExtension, @@ -6065,7 +6065,7 @@ void proto_register_h450(void) { FT_UINT32, BASE_DEC, NULL, 0, "h450_11.SEQUENCE_SIZE_0_255_OF_MixedExtension", HFILL }}, { &hf_h450_11_cIIsOptArg_argumentExtension_item, - { "argumentExtension", "h450.11.argumentExtension_item", + { "MixedExtension", "h450.11.MixedExtension", FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0, "h450_4.MixedExtension", HFILL }}, { &hf_h450_11_cIIsOptRes_resultExtension, @@ -6073,7 +6073,7 @@ void proto_register_h450(void) { FT_UINT32, BASE_DEC, NULL, 0, "h450_11.SEQUENCE_SIZE_0_255_OF_MixedExtension", HFILL }}, { &hf_h450_11_cIIsOptRes_resultExtension_item, - { "resultExtension", "h450.11.resultExtension_item", + { "MixedExtension", "h450.11.MixedExtension", FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0, "h450_4.MixedExtension", HFILL }}, { &hf_h450_11_cIFrcRelArg_argumentExtension, @@ -6081,7 +6081,7 @@ void proto_register_h450(void) { FT_UINT32, BASE_DEC, NULL, 0, "h450_11.SEQUENCE_SIZE_0_255_OF_MixedExtension", HFILL }}, { &hf_h450_11_cIFrcRelArg_argumentExtension_item, - { "argumentExtension", "h450.11.argumentExtension_item", + { "MixedExtension", "h450.11.MixedExtension", FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0, "h450_4.MixedExtension", HFILL }}, { &hf_h450_11_cIFrcRelOptRes_resultExtension, @@ -6089,7 +6089,7 @@ void proto_register_h450(void) { FT_UINT32, BASE_DEC, NULL, 0, "h450_11.SEQUENCE_SIZE_0_255_OF_MixedExtension", HFILL }}, { &hf_h450_11_cIFrcRelOptRes_resultExtension_item, - { "resultExtension", "h450.11.resultExtension_item", + { "MixedExtension", "h450.11.MixedExtension", FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0, "h450_4.MixedExtension", HFILL }}, { &hf_h450_11_cIWobOptArg_argumentExtension, @@ -6097,7 +6097,7 @@ void proto_register_h450(void) { FT_UINT32, BASE_DEC, NULL, 0, "h450_11.SEQUENCE_SIZE_0_255_OF_MixedExtension", HFILL }}, { &hf_h450_11_cIWobOptArg_argumentExtension_item, - { "argumentExtension", "h450.11.argumentExtension_item", + { "MixedExtension", "h450.11.MixedExtension", FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0, "h450_4.MixedExtension", HFILL }}, { &hf_h450_11_cIWobOptRes_resultExtension, @@ -6105,7 +6105,7 @@ void proto_register_h450(void) { FT_UINT32, BASE_DEC, NULL, 0, "h450_11.SEQUENCE_SIZE_0_255_OF_MixedExtension", HFILL }}, { &hf_h450_11_cIWobOptRes_resultExtension_item, - { "resultExtension", "h450.11.resultExtension_item", + { "MixedExtension", "h450.11.MixedExtension", FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0, "h450_4.MixedExtension", HFILL }}, { &hf_h450_11_specificCall, @@ -6117,7 +6117,7 @@ void proto_register_h450(void) { FT_UINT32, BASE_DEC, NULL, 0, "h450_11.SEQUENCE_SIZE_0_255_OF_MixedExtension", HFILL }}, { &hf_h450_11_cISilentArg_argumentExtension_item, - { "argumentExtension", "h450.11.argumentExtension_item", + { "MixedExtension", "h450.11.MixedExtension", FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0, "h450_4.MixedExtension", HFILL }}, { &hf_h450_11_cISilentOptRes_resultExtension, @@ -6125,7 +6125,7 @@ void proto_register_h450(void) { FT_UINT32, BASE_DEC, NULL, 0, "h450_11.SEQUENCE_SIZE_0_255_OF_MixedExtension", HFILL }}, { &hf_h450_11_cISilentOptRes_resultExtension_item, - { "resultExtension", "h450.11.resultExtension_item", + { "MixedExtension", "h450.11.MixedExtension", FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0, "h450_4.MixedExtension", HFILL }}, { &hf_h450_11_cINotificationArg_argumentExtension, @@ -6133,7 +6133,7 @@ void proto_register_h450(void) { FT_UINT32, BASE_DEC, NULL, 0, "h450_11.SEQUENCE_SIZE_0_255_OF_MixedExtension", HFILL }}, { &hf_h450_11_cINotificationArg_argumentExtension_item, - { "argumentExtension", "h450.11.argumentExtension_item", + { "MixedExtension", "h450.11.MixedExtension", FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0, "h450_4.MixedExtension", HFILL }}, { &hf_h450_11_callIntrusionImpending, @@ -6188,7 +6188,7 @@ void proto_register_h450(void) { FT_UINT32, BASE_DEC, NULL, 0, "h450_12.SEQUENCE_SIZE_0_255_OF_MixedExtension", HFILL }}, { &hf_h450_12_cmnArg_extension_item, - { "extension", "h450.12.extension_item", + { "MixedExtension", "h450.12.MixedExtension", FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0, "h450_4.MixedExtension", HFILL }}, { &hf_h450_12_extensionArg, @@ -6196,7 +6196,7 @@ void proto_register_h450(void) { FT_UINT32, BASE_DEC, NULL, 0, "h450_12.SEQUENCE_SIZE_0_255_OF_MixedExtension", HFILL }}, { &hf_h450_12_extensionArg_item, - { "extensionArg", "h450.12.extensionArg_item", + { "MixedExtension", "h450.12.MixedExtension", FT_UINT32, BASE_DEC, VALS(h450_4_MixedExtension_vals), 0, "h450_4.MixedExtension", HFILL }}, { &hf_h450_12_ssCFreRoutingSupported, diff --git a/epan/dissectors/packet-h460.c b/epan/dissectors/packet-h460.c index 3f4e47019e..353147dec9 100644 --- a/epan/dissectors/packet-h460.c +++ b/epan/dissectors/packet-h460.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-h460.c */ -/* ../../tools/asn2wrs.py -c h460.cnf -s packet-h460-template NUMBER-PORTABILITY.asn CIRCUIT-STATUS-MAP.asn CALL-PRIORITY.asn QOS-MONITORING-REPORT.asn QOS-MONITORING-EXTENDED-VOIP-REPORT.asn CALL-PARTY-CATEGORY.asn MLPP.asn SIGNALLING-CHANNEL-SUSPEND-REDIRECT.asn SIGNALLING-TRAVERSAL.asn MEDIA-TRAVERSAL.asn MESSAGE-BROADCAST.asn */ +/* ../../tools/asn2wrs.py -c ./h460.cnf -s ./packet-h460-template -D . NUMBER-PORTABILITY.asn CIRCUIT-STATUS-MAP.asn CALL-PRIORITY.asn QOS-MONITORING-REPORT.asn QOS-MONITORING-EXTENDED-VOIP-REPORT.asn CALL-PARTY-CATEGORY.asn MLPP.asn SIGNALLING-CHANNEL-SUSPEND-REDIRECT.asn SIGNALLING-TRAVERSAL.asn MEDIA-TRAVERSAL.asn MESSAGE-BROADCAST.asn */ /* Input file: packet-h460-template.c */ @@ -2259,7 +2259,7 @@ void proto_register_h460(void) { FT_UINT32, BASE_DEC, NULL, 0, "h460_3.SEQUENCE_OF_CircuitStatusMap", HFILL }}, { &hf_h460_3_circuitStatusMap_item, - { "circuitStatusMap", "h460.3.circuitStatusMap_item", + { "CircuitStatusMap", "h460.3.CircuitStatusMap", FT_NONE, BASE_NONE, NULL, 0, "h460_3.CircuitStatusMap", HFILL }}, { &hf_h460_3_statusType, @@ -2326,7 +2326,7 @@ void proto_register_h460(void) { FT_UINT32, BASE_DEC, NULL, 0, "h460_4.SEQUENCE_OF_ClearToken", HFILL }}, { &hf_h460_4_tokens_item, - { "tokens", "h460.4.tokens_item", + { "ClearToken", "h460.4.ClearToken", FT_NONE, BASE_NONE, NULL, 0, "h235.ClearToken", HFILL }}, { &hf_h460_4_cryptoTokens, @@ -2334,7 +2334,7 @@ void proto_register_h460(void) { FT_UINT32, BASE_DEC, NULL, 0, "h460_4.SEQUENCE_OF_CryptoToken", HFILL }}, { &hf_h460_4_cryptoTokens_item, - { "cryptoTokens", "h460.4.cryptoTokens_item", + { "CryptoToken", "h460.4.CryptoToken", FT_UINT32, BASE_DEC, VALS(h235_CryptoToken_vals), 0, "h235.CryptoToken", HFILL }}, { &hf_h460_4_rejectReason, @@ -2457,7 +2457,7 @@ void proto_register_h460(void) { FT_UINT32, BASE_DEC, NULL, 0, "h460_9.SEQUENCE_OF_Extension", HFILL }}, { &hf_h460_9_extensions_item, - { "extensions", "h460.9.extensions_item", + { "Extension", "h460.9.Extension", FT_NONE, BASE_NONE, NULL, 0, "h460_9.Extension", HFILL }}, { &hf_h460_9_callReferenceValue, @@ -2477,7 +2477,7 @@ void proto_register_h460(void) { FT_UINT32, BASE_DEC, NULL, 0, "h460_9.SEQUENCE_OF_RTCPMeasures", HFILL }}, { &hf_h460_9_mediaChannelsQoS_item, - { "mediaChannelsQoS", "h460.9.mediaChannelsQoS_item", + { "RTCPMeasures", "h460.9.RTCPMeasures", FT_NONE, BASE_NONE, NULL, 0, "h460_9.RTCPMeasures", HFILL }}, { &hf_h460_9_periodic, @@ -2497,7 +2497,7 @@ void proto_register_h460(void) { FT_UINT32, BASE_DEC, NULL, 0, "h460_9.SEQUENCE_OF_PerCallQoSReport", HFILL }}, { &hf_h460_9_perCallInfo_item, - { "perCallInfo", "h460.9.perCallInfo_item", + { "PerCallQoSReport", "h460.9.PerCallQoSReport", FT_NONE, BASE_NONE, NULL, 0, "h460_9.PerCallQoSReport", HFILL }}, { &hf_h460_9_mediaInfo, @@ -2505,7 +2505,7 @@ void proto_register_h460(void) { FT_UINT32, BASE_DEC, NULL, 0, "h460_9.SEQUENCE_OF_RTCPMeasures", HFILL }}, { &hf_h460_9_mediaInfo_item, - { "mediaInfo", "h460.9.mediaInfo_item", + { "RTCPMeasures", "h460.9.RTCPMeasures", FT_NONE, BASE_NONE, NULL, 0, "h460_9.RTCPMeasures", HFILL }}, { &hf_h460_9_networkPacketLossRate, @@ -2754,7 +2754,7 @@ void proto_register_h460(void) { FT_UINT32, BASE_DEC, NULL, 0, "h460_15.SEQUENCE_OF_TransportAddress", HFILL }}, { &hf_h460_15_channelResumeAddress_item, - { "channelResumeAddress", "h460.15.channelResumeAddress_item", + { "TransportAddress", "h460.15.TransportAddress", FT_UINT32, BASE_DEC, VALS(h225_TransportAddress_vals), 0, "h225.TransportAddress", HFILL }}, { &hf_h460_15_immediateResume, @@ -2843,7 +2843,7 @@ void proto_register_h460(void) { FT_UINT32, BASE_DEC, NULL, 0, "h460_21.SEQUENCE_SIZE_1_256_OF_TransmitCapabilities", HFILL }}, { &hf_h460_21_transmitCapabilities_item, - { "transmitCapabilities", "h460.21.transmitCapabilities_item", + { "TransmitCapabilities", "h460.21.TransmitCapabilities", FT_NONE, BASE_NONE, NULL, 0, "h460_21.TransmitCapabilities", HFILL }}, { &hf_h460_21_capabilities, @@ -2851,7 +2851,7 @@ void proto_register_h460(void) { FT_UINT32, BASE_DEC, NULL, 0, "h460_21.SEQUENCE_SIZE_1_256_OF_Capability", HFILL }}, { &hf_h460_21_capabilities_item, - { "capabilities", "h460.21.capabilities_item", + { "Capability", "h460.21.Capability", FT_UINT32, BASE_DEC, VALS(h245_Capability_vals), 0, "h245.Capability", HFILL }}, { &hf_h460_21_maxGroups, diff --git a/epan/dissectors/packet-h501.c b/epan/dissectors/packet-h501.c index b3d49f9dd2..d19071b0a4 100644 --- a/epan/dissectors/packet-h501.c +++ b/epan/dissectors/packet-h501.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-h501.c */ -/* ../../tools/asn2wrs.py -p h501 -c h501.cnf -s packet-h501-template H501-MESSAGES.asn */ +/* ../../tools/asn2wrs.py -p h501 -c ./h501.cnf -s ./packet-h501-template -D . H501-MESSAGES.asn */ /* Input file: packet-h501-template.c */ @@ -2717,7 +2717,7 @@ void proto_register_h501(void) { FT_UINT32, BASE_DEC, NULL, 0, "h501.SEQUENCE_OF_TransportAddress", HFILL }}, { &hf_h501_replyAddress_item, - { "replyAddress", "h501.replyAddress_item", + { "TransportAddress", "h501.TransportAddress", FT_UINT32, BASE_DEC, VALS(h225_TransportAddress_vals), 0, "h225.TransportAddress", HFILL }}, { &hf_h501_integrityCheckValue, @@ -2729,7 +2729,7 @@ void proto_register_h501(void) { FT_UINT32, BASE_DEC, NULL, 0, "h501.SEQUENCE_OF_ClearToken", HFILL }}, { &hf_h501_tokens_item, - { "tokens", "h501.tokens_item", + { "ClearToken", "h501.ClearToken", FT_NONE, BASE_NONE, NULL, 0, "h235.ClearToken", HFILL }}, { &hf_h501_cryptoTokens, @@ -2737,7 +2737,7 @@ void proto_register_h501(void) { FT_UINT32, BASE_DEC, NULL, 0, "h501.SEQUENCE_OF_CryptoH323Token", HFILL }}, { &hf_h501_cryptoTokens_item, - { "cryptoTokens", "h501.cryptoTokens_item", + { "CryptoH323Token", "h501.CryptoH323Token", FT_UINT32, BASE_DEC, VALS(h225_CryptoH323Token_vals), 0, "h225.CryptoH323Token", HFILL }}, { &hf_h501_nonStandard, @@ -2745,7 +2745,7 @@ void proto_register_h501(void) { FT_UINT32, BASE_DEC, NULL, 0, "h501.SEQUENCE_OF_NonStandardParameter", HFILL }}, { &hf_h501_nonStandard_item, - { "nonStandard", "h501.nonStandard_item", + { "NonStandardParameter", "h501.NonStandardParameter", FT_NONE, BASE_NONE, NULL, 0, "h225.NonStandardParameter", HFILL }}, { &hf_h501_serviceID, @@ -2757,7 +2757,7 @@ void proto_register_h501(void) { FT_UINT32, BASE_DEC, NULL, 0, "h501.SEQUENCE_OF_GenericData", HFILL }}, { &hf_h501_genericData_item, - { "genericData", "h501.genericData_item", + { "GenericData", "h501.GenericData", FT_NONE, BASE_NONE, NULL, 0, "h225.GenericData", HFILL }}, { &hf_h501_featureSet, @@ -2781,7 +2781,7 @@ void proto_register_h501(void) { FT_UINT32, BASE_DEC, NULL, 0, "h501.SEQUENCE_OF_SecurityMode", HFILL }}, { &hf_h501_securityMode_item, - { "securityMode", "h501.securityMode_item", + { "SecurityMode", "h501.SecurityMode", FT_NONE, BASE_NONE, NULL, 0, "h501.SecurityMode", HFILL }}, { &hf_h501_timeToLive, @@ -2805,7 +2805,7 @@ void proto_register_h501(void) { FT_UINT32, BASE_DEC, NULL, 0, "h501.T_algorithmOIDs", HFILL }}, { &hf_h501_algorithmOIDs_item, - { "algorithmOIDs", "h501.algorithmOIDs_item", + { "algorithmOIDs item", "h501.algorithmOIDs_item", FT_OID, BASE_NONE, NULL, 0, "h501.OBJECT_IDENTIFIER", HFILL }}, { &hf_h501_alternates, @@ -2889,7 +2889,7 @@ void proto_register_h501(void) { FT_UINT32, BASE_DEC, NULL, 0, "h501.SEQUENCE_OF_DescriptorID", HFILL }}, { &hf_h501_descriptorID_item, - { "descriptorID", "h501.descriptorID_item", + { "DescriptorID", "h501.DescriptorID", FT_GUID, BASE_NONE, NULL, 0, "h501.DescriptorID", HFILL }}, { &hf_h501_descriptor, @@ -2897,7 +2897,7 @@ void proto_register_h501(void) { FT_UINT32, BASE_DEC, NULL, 0, "h501.SEQUENCE_OF_Descriptor", HFILL }}, { &hf_h501_descriptor_item, - { "descriptor", "h501.descriptor_item", + { "Descriptor", "h501.Descriptor", FT_NONE, BASE_NONE, NULL, 0, "h501.Descriptor", HFILL }}, { &hf_h501_reason_02, @@ -2929,7 +2929,7 @@ void proto_register_h501(void) { FT_UINT32, BASE_DEC, NULL, 0, "h501.SEQUENCE_OF_DescriptorInfo", HFILL }}, { &hf_h501_descriptorInfo_item, - { "descriptorInfo", "h501.descriptorInfo_item", + { "DescriptorInfo", "h501.DescriptorInfo", FT_NONE, BASE_NONE, NULL, 0, "h501.DescriptorInfo", HFILL }}, { &hf_h501_reason_03, @@ -2949,7 +2949,7 @@ void proto_register_h501(void) { FT_UINT32, BASE_DEC, NULL, 0, "h501.SEQUENCE_OF_UpdateInformation", HFILL }}, { &hf_h501_updateInfo_item, - { "updateInfo", "h501.updateInfo_item", + { "UpdateInformation", "h501.UpdateInformation", FT_NONE, BASE_NONE, NULL, 0, "h501.UpdateInformation", HFILL }}, { &hf_h501_descriptorInfo_01, @@ -2993,7 +2993,7 @@ void proto_register_h501(void) { FT_UINT32, BASE_DEC, NULL, 0, "h501.SEQUENCE_OF_SupportedProtocols", HFILL }}, { &hf_h501_desiredProtocols_item, - { "desiredProtocols", "h501.desiredProtocols_item", + { "SupportedProtocols", "h501.SupportedProtocols", FT_UINT32, BASE_DEC, VALS(h225_SupportedProtocols_vals), 0, "h225.SupportedProtocols", HFILL }}, { &hf_h501_templates, @@ -3001,7 +3001,7 @@ void proto_register_h501(void) { FT_UINT32, BASE_DEC, NULL, 0, "h501.SEQUENCE_OF_AddressTemplate", HFILL }}, { &hf_h501_templates_item, - { "templates", "h501.templates_item", + { "AddressTemplate", "h501.AddressTemplate", FT_NONE, BASE_NONE, NULL, 0, "h501.AddressTemplate", HFILL }}, { &hf_h501_partialResponse, @@ -3013,7 +3013,7 @@ void proto_register_h501(void) { FT_UINT32, BASE_DEC, NULL, 0, "h501.SEQUENCE_OF_SupportedProtocols", HFILL }}, { &hf_h501_supportedProtocols_item, - { "supportedProtocols", "h501.supportedProtocols_item", + { "SupportedProtocols", "h501.SupportedProtocols", FT_UINT32, BASE_DEC, VALS(h225_SupportedProtocols_vals), 0, "h225.SupportedProtocols", HFILL }}, { &hf_h501_serviceControl, @@ -3021,7 +3021,7 @@ void proto_register_h501(void) { FT_UINT32, BASE_DEC, NULL, 0, "h501.SEQUENCE_OF_ServiceControlSession", HFILL }}, { &hf_h501_serviceControl_item, - { "serviceControl", "h501.serviceControl_item", + { "ServiceControlSession", "h501.ServiceControlSession", FT_NONE, BASE_NONE, NULL, 0, "h225.ServiceControlSession", HFILL }}, { &hf_h501_reason_04, @@ -3061,7 +3061,7 @@ void proto_register_h501(void) { FT_UINT32, BASE_DEC, NULL, 0, "h501.SEQUENCE_OF_AccessToken", HFILL }}, { &hf_h501_accessTokens_item, - { "accessTokens", "h501.accessTokens_item", + { "AccessToken", "h501.AccessToken", FT_UINT32, BASE_DEC, VALS(h501_AccessToken_vals), 0, "h501.AccessToken", HFILL }}, { &hf_h501_senderRole, @@ -3097,7 +3097,7 @@ void proto_register_h501(void) { FT_UINT32, BASE_DEC, NULL, 0, "h501.SEQUENCE_OF_UsageField", HFILL }}, { &hf_h501_usageFields_item, - { "usageFields", "h501.usageFields_item", + { "UsageField", "h501.UsageField", FT_NONE, BASE_NONE, NULL, 0, "h501.UsageField", HFILL }}, { &hf_h501_id, @@ -3133,7 +3133,7 @@ void proto_register_h501(void) { FT_UINT32, BASE_DEC, NULL, 0, "h501.SEQUENCE_OF_AccessToken", HFILL }}, { &hf_h501_accessToken_item, - { "accessToken", "h501.accessToken_item", + { "AccessToken", "h501.AccessToken", FT_UINT32, BASE_DEC, VALS(h501_AccessToken_vals), 0, "h501.AccessToken", HFILL }}, { &hf_h501_reason_07, @@ -3213,7 +3213,7 @@ void proto_register_h501(void) { FT_UINT32, BASE_DEC, NULL, 0, "h501.SEQUENCE_OF_Pattern", HFILL }}, { &hf_h501_pattern_item, - { "pattern", "h501.pattern_item", + { "Pattern", "h501.Pattern", FT_UINT32, BASE_DEC, VALS(h501_Pattern_vals), 0, "h501.Pattern", HFILL }}, { &hf_h501_routeInfo, @@ -3221,7 +3221,7 @@ void proto_register_h501(void) { FT_UINT32, BASE_DEC, NULL, 0, "h501.SEQUENCE_OF_RouteInformation", HFILL }}, { &hf_h501_routeInfo_item, - { "routeInfo", "h501.routeInfo_item", + { "RouteInformation", "h501.RouteInformation", FT_NONE, BASE_NONE, NULL, 0, "h501.RouteInformation", HFILL }}, { &hf_h501_specific, @@ -3269,7 +3269,7 @@ void proto_register_h501(void) { FT_UINT32, BASE_DEC, NULL, 0, "h501.SEQUENCE_OF_PriceInfoSpec", HFILL }}, { &hf_h501_priceInfo_item, - { "priceInfo", "h501.priceInfo_item", + { "PriceInfoSpec", "h501.PriceInfoSpec", FT_NONE, BASE_NONE, NULL, 0, "h501.PriceInfoSpec", HFILL }}, { &hf_h501_contacts, @@ -3277,7 +3277,7 @@ void proto_register_h501(void) { FT_UINT32, BASE_DEC, NULL, 0, "h501.SEQUENCE_OF_ContactInformation", HFILL }}, { &hf_h501_contacts_item, - { "contacts", "h501.contacts_item", + { "ContactInformation", "h501.ContactInformation", FT_NONE, BASE_NONE, NULL, 0, "h501.ContactInformation", HFILL }}, { &hf_h501_type, @@ -3293,7 +3293,7 @@ void proto_register_h501(void) { FT_UINT32, BASE_DEC, NULL, 0, "h501.SEQUENCE_OF_CircuitIdentifier", HFILL }}, { &hf_h501_supportedCircuits_item, - { "supportedCircuits", "h501.supportedCircuits_item", + { "CircuitIdentifier", "h501.CircuitIdentifier", FT_NONE, BASE_NONE, NULL, 0, "h225.CircuitIdentifier", HFILL }}, { &hf_h501_transportAddress, @@ -3313,7 +3313,7 @@ void proto_register_h501(void) { FT_UINT32, BASE_DEC, NULL, 0, "h501.SEQUENCE_OF_SecurityMode", HFILL }}, { &hf_h501_security_item, - { "security", "h501.security_item", + { "SecurityMode", "h501.SecurityMode", FT_NONE, BASE_NONE, NULL, 0, "h501.SecurityMode", HFILL }}, { &hf_h501_multipleCalls, @@ -3349,7 +3349,7 @@ void proto_register_h501(void) { FT_UINT32, BASE_DEC, NULL, 0, "h501.SEQUENCE_OF_PriceElement", HFILL }}, { &hf_h501_priceElement_item, - { "priceElement", "h501.priceElement_item", + { "PriceElement", "h501.PriceElement", FT_NONE, BASE_NONE, NULL, 0, "h501.PriceElement", HFILL }}, { &hf_h501_priceFormula, @@ -3409,7 +3409,7 @@ void proto_register_h501(void) { FT_UINT32, BASE_DEC, NULL, 0, "h501.SEQUENCE_OF_AlternatePE", HFILL }}, { &hf_h501_alternatePE_item, - { "alternatePE", "h501.alternatePE_item", + { "AlternatePE", "h501.AlternatePE", FT_NONE, BASE_NONE, NULL, 0, "h501.AlternatePE", HFILL }}, { &hf_h501_alternateIsPermanent, @@ -3469,7 +3469,7 @@ void proto_register_h501(void) { FT_UINT32, BASE_DEC, NULL, 0, "h501.SEQUENCE_OF_CryptoH323Token", HFILL }}, { &hf_h501_userAuthenticator_item, - { "userAuthenticator", "h501.userAuthenticator_item", + { "CryptoH323Token", "h501.CryptoH323Token", FT_UINT32, BASE_DEC, VALS(h225_CryptoH323Token_vals), 0, "h225.CryptoH323Token", HFILL }}, { &hf_h501_sendTo, @@ -3505,7 +3505,7 @@ void proto_register_h501(void) { FT_UINT32, BASE_DEC, NULL, 0, "h501.T_required", HFILL }}, { &hf_h501_required_item, - { "required", "h501.required_item", + { "required item", "h501.required_item", FT_OID, BASE_NONE, NULL, 0, "h501.OBJECT_IDENTIFIER", HFILL }}, { &hf_h501_preferred, @@ -3513,7 +3513,7 @@ void proto_register_h501(void) { FT_UINT32, BASE_DEC, NULL, 0, "h501.T_preferred", HFILL }}, { &hf_h501_preferred_item, - { "preferred", "h501.preferred_item", + { "preferred item", "h501.preferred_item", FT_OID, BASE_NONE, NULL, 0, "h501.OBJECT_IDENTIFIER", HFILL }}, { &hf_h501_sendToPEAddress, @@ -3525,7 +3525,7 @@ void proto_register_h501(void) { FT_UINT32, BASE_DEC, NULL, 0, "h501.SEQUENCE_OF_AliasAddress", HFILL }}, { &hf_h501_logicalAddresses_item, - { "logicalAddresses", "h501.logicalAddresses_item", + { "AliasAddress", "h501.AliasAddress", FT_UINT32, BASE_DEC, VALS(AliasAddress_vals), 0, "h225.AliasAddress", HFILL }}, { &hf_h501_endpointType, diff --git a/epan/dissectors/packet-inap.c b/epan/dissectors/packet-inap.c index d1a7d75b78..e8bc2bfe97 100644 --- a/epan/dissectors/packet-inap.c +++ b/epan/dissectors/packet-inap.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-inap.c */ -/* ../../tools/asn2wrs.py -b -e -p inap -c inap.cnf -s packet-inap-template IN-common-classes.asn IN-SSF-SCF-Classes.asn IN-SCF-SRF-Classes.asn IN-operationcodes.asn IN-object-identifiers.asn IN-common-datatypes.asn IN-SSF-SCF-datatypes.asn IN-SSF-SCF-ops-args.asn IN-SCF-SRF-datatypes.asn IN-SCF-SRF-ops-args.asn ../ros/Remote-Operations-Information-Objects.asn ../ros/Remote-Operations-Generic-ROS-PDUs.asn */ +/* ../../tools/asn2wrs.py -b -e -p inap -c ./inap.cnf -s ./packet-inap-template -D . IN-common-classes.asn IN-SSF-SCF-Classes.asn IN-SCF-SRF-Classes.asn IN-operationcodes.asn IN-object-identifiers.asn IN-common-datatypes.asn IN-SSF-SCF-datatypes.asn IN-SSF-SCF-ops-args.asn IN-SCF-SRF-datatypes.asn IN-SCF-SRF-ops-args.asn ../ros/Remote-Operations-Information-Objects.asn ../ros/Remote-Operations-Generic-ROS-PDUs.asn */ /* Input file: packet-inap-template.c */ @@ -9564,7 +9564,7 @@ void proto_register_inap(void) { FT_NONE, BASE_NONE, NULL, 0, "inap.SRFCallGapArg", HFILL }}, { &hf_inap_Extensions_item, - { "Extensions", "inap.Extensions_item", + { "ExtensionField", "inap.ExtensionField", FT_NONE, BASE_NONE, NULL, 0, "inap.ExtensionField", HFILL }}, { &hf_inap_type, @@ -9580,7 +9580,7 @@ void proto_register_inap(void) { FT_NONE, BASE_NONE, NULL, 0, "inap.T_value", HFILL }}, { &hf_inap_AlternativeIdentities_item, - { "AlternativeIdentities", "inap.AlternativeIdentities_item", + { "AlternativeIdentity", "inap.AlternativeIdentity", FT_UINT32, BASE_DEC, VALS(inap_AlternativeIdentity_vals), 0, "inap.AlternativeIdentity", HFILL }}, { &hf_inap_url, @@ -9732,7 +9732,7 @@ void proto_register_inap(void) { FT_UINT32, BASE_DEC, NULL, 0, "inap.Integer4", HFILL }}, { &hf_inap_CountersValue_item, - { "CountersValue", "inap.CountersValue_item", + { "CounterAndValue", "inap.CounterAndValue", FT_NONE, BASE_NONE, NULL, 0, "inap.CounterAndValue", HFILL }}, { &hf_inap_action, @@ -9744,7 +9744,7 @@ void proto_register_inap(void) { FT_UINT32, BASE_DEC, VALS(inap_GapTreatment_vals), 0, "inap.GapTreatment", HFILL }}, { &hf_inap_DestinationRoutingAddress_item, - { "DestinationRoutingAddress", "inap.DestinationRoutingAddress_item", + { "CalledPartyNumber", "inap.CalledPartyNumber", FT_BYTES, BASE_HEX, NULL, 0, "inap.CalledPartyNumber", HFILL }}, { &hf_inap_serviceAddressInformation, @@ -10132,7 +10132,7 @@ void proto_register_inap(void) { FT_NONE, BASE_NONE, NULL, 0, "inap.T_both", HFILL }}, { &hf_inap_GenericNumbers_item, - { "GenericNumbers", "inap.GenericNumbers_item", + { "GenericNumber", "inap.GenericNumber", FT_BYTES, BASE_HEX, NULL, 0, "inap.GenericNumber", HFILL }}, { &hf_inap_actionOnProfile, @@ -10148,7 +10148,7 @@ void proto_register_inap(void) { FT_UINT32, BASE_DEC, VALS(inap_EventTypeBCSM_vals), 0, "inap.EventTypeBCSM", HFILL }}, { &hf_inap_INServiceCompatibilityIndication_item, - { "INServiceCompatibilityIndication", "inap.INServiceCompatibilityIndication_item", + { "Entry", "inap.Entry", FT_UINT32, BASE_DEC, VALS(inap_Entry_vals), 0, "inap.Entry", HFILL }}, { &hf_inap_alternativeCalledPartyIds, @@ -10176,7 +10176,7 @@ void proto_register_inap(void) { FT_BYTES, BASE_HEX, NULL, 0, "inap.LegType", HFILL }}, { &hf_inap_MidCallControlInfo_item, - { "MidCallControlInfo", "inap.MidCallControlInfo_item", + { "MidCallControlInfo item", "inap.MidCallControlInfo_item", FT_NONE, BASE_NONE, NULL, 0, "inap.MidCallControlInfo_item", HFILL }}, { &hf_inap_midCallInfoType, @@ -10224,11 +10224,11 @@ void proto_register_inap(void) { FT_UINT32, BASE_DEC, VALS(inap_FacilityGroup_vals), 0, "inap.FacilityGroup", HFILL }}, { &hf_inap_RequestedInformationList_item, - { "RequestedInformationList", "inap.RequestedInformationList_item", + { "RequestedInformation", "inap.RequestedInformation", FT_NONE, BASE_NONE, NULL, 0, "inap.RequestedInformation", HFILL }}, { &hf_inap_RequestedInformationTypeList_item, - { "RequestedInformationTypeList", "inap.RequestedInformationTypeList_item", + { "RequestedInformationType", "inap.RequestedInformationType", FT_UINT32, BASE_DEC, VALS(inap_RequestedInformationType_vals), 0, "inap.RequestedInformationType", HFILL }}, { &hf_inap_requestedInformationType, @@ -10260,7 +10260,7 @@ void proto_register_inap(void) { FT_UINT32, BASE_DEC, VALS(inap_USIMonitorMode_vals), 0, "inap.USIMonitorMode", HFILL }}, { &hf_inap_RequestedUTSIList_item, - { "RequestedUTSIList", "inap.RequestedUTSIList_item", + { "RequestedUTSI", "inap.RequestedUTSI", FT_NONE, BASE_NONE, NULL, 0, "inap.RequestedUTSI", HFILL }}, { &hf_inap_lineID, @@ -10276,7 +10276,7 @@ void proto_register_inap(void) { FT_INT32, BASE_DEC, NULL, 0, "inap.INTEGER", HFILL }}, { &hf_inap_RouteCountersValue_item, - { "RouteCountersValue", "inap.RouteCountersValue_item", + { "RouteCountersAndValue", "inap.RouteCountersAndValue", FT_NONE, BASE_NONE, NULL, 0, "inap.RouteCountersAndValue", HFILL }}, { &hf_inap_route, @@ -10284,7 +10284,7 @@ void proto_register_inap(void) { FT_BYTES, BASE_HEX, NULL, 0, "inap.Route", HFILL }}, { &hf_inap_RouteList_item, - { "RouteList", "inap.RouteList_item", + { "Route", "inap.Route", FT_BYTES, BASE_HEX, NULL, 0, "inap.Route", HFILL }}, { &hf_inap_miscCallInfo, @@ -10380,7 +10380,7 @@ void proto_register_inap(void) { FT_UINT32, BASE_DEC, VALS(inap_ProfileIdentifier_vals), 0, "inap.ProfileIdentifier", HFILL }}, { &hf_inap_TriggerResults_item, - { "TriggerResults", "inap.TriggerResults_item", + { "TriggerResult", "inap.TriggerResult", FT_NONE, BASE_NONE, NULL, 0, "inap.TriggerResult", HFILL }}, { &hf_inap_tDPIdentifer, @@ -10392,7 +10392,7 @@ void proto_register_inap(void) { FT_UINT32, BASE_DEC, VALS(inap_ActionPerformed_vals), 0, "inap.ActionPerformed", HFILL }}, { &hf_inap_Triggers_item, - { "Triggers", "inap.Triggers_item", + { "Trigger", "inap.Trigger", FT_NONE, BASE_NONE, NULL, 0, "inap.Trigger", HFILL }}, { &hf_inap_tDPIdentifier_01, @@ -10876,7 +10876,7 @@ void proto_register_inap(void) { FT_UINT32, BASE_DEC, NULL, 0, "inap.T_callSegments", HFILL }}, { &hf_inap_callSegments_item, - { "callSegments", "inap.callSegments_item", + { "callSegments item", "inap.callSegments_item", FT_NONE, BASE_NONE, NULL, 0, "inap.T_callSegments_item", HFILL }}, { &hf_inap_legs, @@ -10884,7 +10884,7 @@ void proto_register_inap(void) { FT_UINT32, BASE_DEC, NULL, 0, "inap.T_legs", HFILL }}, { &hf_inap_legs_item, - { "legs", "inap.legs_item", + { "legs item", "inap.legs_item", FT_NONE, BASE_NONE, NULL, 0, "inap.T_legs_item", HFILL }}, { &hf_inap_sourceLeg, @@ -10952,7 +10952,7 @@ void proto_register_inap(void) { FT_INT32, BASE_DEC, NULL, 0, "inap.Duration", HFILL }}, { &hf_inap_RequestNotificationChargingEventArg_item, - { "RequestNotificationChargingEventArg", "inap.RequestNotificationChargingEventArg_item", + { "ChargingEvent", "inap.ChargingEvent", FT_NONE, BASE_NONE, NULL, 0, "inap.ChargingEvent", HFILL }}, { &hf_inap_bcsmEvents, @@ -10960,7 +10960,7 @@ void proto_register_inap(void) { FT_UINT32, BASE_DEC, NULL, 0, "inap.SEQUENCE_SIZE_1_numOfBCSMEvents_OF_BCSMEvent", HFILL }}, { &hf_inap_bcsmEvents_item, - { "bcsmEvents", "inap.bcsmEvents_item", + { "BCSMEvent", "inap.BCSMEvent", FT_NONE, BASE_NONE, NULL, 0, "inap.BCSMEvent", HFILL }}, { &hf_inap_componentTypes, @@ -10968,7 +10968,7 @@ void proto_register_inap(void) { FT_UINT32, BASE_DEC, NULL, 0, "inap.SEQUENCE_SIZE_1_3_OF_ComponentType", HFILL }}, { &hf_inap_componentTypes_item, - { "componentTypes", "inap.componentTypes_item", + { "ComponentType", "inap.ComponentType", FT_UINT32, BASE_DEC, VALS(inap_ComponentType_vals), 0, "inap.ComponentType", HFILL }}, { &hf_inap_requestedUTSIList, @@ -11016,7 +11016,7 @@ void proto_register_inap(void) { FT_UINT32, BASE_DEC, NULL, 0, "inap.SEQUENCE_SIZE_1_numOfINProfile_OF_INprofile", HFILL }}, { &hf_inap_iNprofiles_item, - { "iNprofiles", "inap.iNprofiles_item", + { "INprofile", "inap.INprofile", FT_NONE, BASE_NONE, NULL, 0, "inap.INprofile", HFILL }}, { &hf_inap_legToBeSplit, @@ -11172,7 +11172,7 @@ void proto_register_inap(void) { FT_UINT32, BASE_DEC, NULL, 0, "inap.SEQUENCE_SIZE_1_b3__numOfMessageIDs_OF_Integer4", HFILL }}, { &hf_inap_elementaryMessageIDs_item, - { "elementaryMessageIDs", "inap.elementaryMessageIDs_item", + { "Integer4", "inap.Integer4", FT_UINT32, BASE_DEC, NULL, 0, "inap.Integer4", HFILL }}, { &hf_inap_variableMessage, @@ -11184,7 +11184,7 @@ void proto_register_inap(void) { FT_UINT32, BASE_DEC, NULL, 0, "inap.SEQUENCE_SIZE_1_b3__maxVariableParts_OF_VariablePart", HFILL }}, { &hf_inap_variableParts_item, - { "variableParts", "inap.variableParts_item", + { "VariablePart", "inap.VariablePart", FT_UINT32, BASE_DEC, VALS(inap_VariablePart_vals), 0, "inap.VariablePart", HFILL }}, { &hf_inap_iPAddressValue, diff --git a/epan/dissectors/packet-inap.h b/epan/dissectors/packet-inap.h index 7a4eecfb6c..856273e39b 100644 --- a/epan/dissectors/packet-inap.h +++ b/epan/dissectors/packet-inap.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-inap.h */ -/* ../../tools/asn2wrs.py -b -e -p inap -c inap.cnf -s packet-inap-template IN-common-classes.asn IN-SSF-SCF-Classes.asn IN-SCF-SRF-Classes.asn IN-operationcodes.asn IN-object-identifiers.asn IN-common-datatypes.asn IN-SSF-SCF-datatypes.asn IN-SSF-SCF-ops-args.asn IN-SCF-SRF-datatypes.asn IN-SCF-SRF-ops-args.asn ../ros/Remote-Operations-Information-Objects.asn ../ros/Remote-Operations-Generic-ROS-PDUs.asn */ +/* ../../tools/asn2wrs.py -b -e -p inap -c ./inap.cnf -s ./packet-inap-template -D . IN-common-classes.asn IN-SSF-SCF-Classes.asn IN-SCF-SRF-Classes.asn IN-operationcodes.asn IN-object-identifiers.asn IN-common-datatypes.asn IN-SSF-SCF-datatypes.asn IN-SSF-SCF-ops-args.asn IN-SCF-SRF-datatypes.asn IN-SCF-SRF-ops-args.asn ../ros/Remote-Operations-Information-Objects.asn ../ros/Remote-Operations-Generic-ROS-PDUs.asn */ /* Input file: packet-inap-template.h */ diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c index e2e6aa5afc..dfd791d690 100644 --- a/epan/dissectors/packet-ldap.c +++ b/epan/dissectors/packet-ldap.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-ldap.c */ -/* ../../tools/asn2wrs.py -b -p ldap -c ldap.cnf -s packet-ldap-template Lightweight-Directory-Access-Protocol-V3.asn */ +/* ../../tools/asn2wrs.py -b -p ldap -c ./ldap.cnf -s ./packet-ldap-template -D . Lightweight-Directory-Access-Protocol-V3.asn */ /* Input file: packet-ldap-template.c */ @@ -4741,7 +4741,7 @@ void proto_register_ldap(void) { FT_NONE, BASE_NONE, NULL, 0, "ldap.ExtendedResponse", HFILL }}, { &hf_ldap_AttributeDescriptionList_item, - { "AttributeDescriptionList", "ldap.AttributeDescriptionList_item", + { "AttributeDescription", "ldap.AttributeDescription", FT_STRING, BASE_NONE, NULL, 0, "ldap.AttributeDescription", HFILL }}, { &hf_ldap_attributeDesc, @@ -4761,7 +4761,7 @@ void proto_register_ldap(void) { FT_UINT32, BASE_DEC, NULL, 0, "ldap.SET_OF_AttributeValue", HFILL }}, { &hf_ldap_vals_item, - { "vals", "ldap.vals_item", + { "AttributeValue", "ldap.AttributeValue", FT_BYTES, BASE_HEX, NULL, 0, "ldap.AttributeValue", HFILL }}, { &hf_ldap_resultCode, @@ -4781,11 +4781,11 @@ void proto_register_ldap(void) { FT_UINT32, BASE_DEC, NULL, 0, "ldap.Referral", HFILL }}, { &hf_ldap_Referral_item, - { "Referral", "ldap.Referral_item", + { "LDAPURL", "ldap.LDAPURL", FT_STRING, BASE_NONE, NULL, 0, "ldap.LDAPURL", HFILL }}, { &hf_ldap_Controls_item, - { "Controls", "ldap.Controls_item", + { "Control", "ldap.Control", FT_NONE, BASE_NONE, NULL, 0, "ldap.Control", HFILL }}, { &hf_ldap_controlType, @@ -4885,7 +4885,7 @@ void proto_register_ldap(void) { FT_UINT32, BASE_DEC, NULL, 0, "ldap.T_and", HFILL }}, { &hf_ldap_and_item, - { "and", "ldap.and_item", + { "and item", "ldap.and_item", FT_UINT32, BASE_DEC, VALS(ldap_Filter_vals), 0, "ldap.T_and_item", HFILL }}, { &hf_ldap_or, @@ -4893,7 +4893,7 @@ void proto_register_ldap(void) { FT_UINT32, BASE_DEC, NULL, 0, "ldap.T_or", HFILL }}, { &hf_ldap_or_item, - { "or", "ldap.or_item", + { "or item", "ldap.or_item", FT_UINT32, BASE_DEC, VALS(ldap_Filter_vals), 0, "ldap.T_or_item", HFILL }}, { &hf_ldap_not, @@ -4933,7 +4933,7 @@ void proto_register_ldap(void) { FT_UINT32, BASE_DEC, NULL, 0, "ldap.T_substringFilter_substrings", HFILL }}, { &hf_ldap_substringFilter_substrings_item, - { "substrings", "ldap.substrings_item", + { "substrings item", "ldap.substrings_item", FT_UINT32, BASE_DEC, VALS(ldap_T_substringFilter_substrings_item_vals), 0, "ldap.T_substringFilter_substrings_item", HFILL }}, { &hf_ldap_initial, @@ -4969,11 +4969,11 @@ void proto_register_ldap(void) { FT_UINT32, BASE_DEC, NULL, 0, "ldap.PartialAttributeList", HFILL }}, { &hf_ldap_PartialAttributeList_item, - { "PartialAttributeList", "ldap.PartialAttributeList_item", + { "PartialAttributeList item", "ldap.PartialAttributeList_item", FT_NONE, BASE_NONE, NULL, 0, "ldap.PartialAttributeList_item", HFILL }}, { &hf_ldap__untag_item, - { "_untag", "ldap._untag_item", + { "LDAPURL", "ldap.LDAPURL", FT_STRING, BASE_NONE, NULL, 0, "ldap.LDAPURL", HFILL }}, { &hf_ldap_object, @@ -4985,7 +4985,7 @@ void proto_register_ldap(void) { FT_UINT32, BASE_DEC, NULL, 0, "ldap.ModifyRequest_modification", HFILL }}, { &hf_ldap_modifyRequest_modification_item, - { "modification", "ldap.modification_item", + { "modification item", "ldap.modification_item", FT_NONE, BASE_NONE, NULL, 0, "ldap.T_modifyRequest_modification_item", HFILL }}, { &hf_ldap_operation, @@ -5005,7 +5005,7 @@ void proto_register_ldap(void) { FT_UINT32, BASE_DEC, NULL, 0, "ldap.AttributeList", HFILL }}, { &hf_ldap_AttributeList_item, - { "AttributeList", "ldap.AttributeList_item", + { "AttributeList item", "ldap.AttributeList_item", FT_NONE, BASE_NONE, NULL, 0, "ldap.AttributeList_item", HFILL }}, { &hf_ldap_newrdn, @@ -5053,7 +5053,7 @@ void proto_register_ldap(void) { FT_BYTES, BASE_HEX, NULL, 0, "ldap.OCTET_STRING", HFILL }}, { &hf_ldap_SortKeyList_item, - { "SortKeyList", "ldap.SortKeyList_item", + { "SortKeyList item", "ldap.SortKeyList_item", FT_NONE, BASE_NONE, NULL, 0, "ldap.SortKeyList_item", HFILL }}, { &hf_ldap_attributeType, diff --git a/epan/dissectors/packet-logotypecertextn.c b/epan/dissectors/packet-logotypecertextn.c index bbbcaa1400..c78a7c130c 100644 --- a/epan/dissectors/packet-logotypecertextn.c +++ b/epan/dissectors/packet-logotypecertextn.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-logotypecertextn.c */ -/* ../../tools/asn2wrs.py -b -p logotypecertextn -c logotypecertextn.cnf -s packet-logotypecertextn-template LogotypeCertExtn.asn */ +/* ../../tools/asn2wrs.py -b -p logotypecertextn -c ./logotypecertextn.cnf -s ./packet-logotypecertextn-template -D . LogotypeCertExtn.asn */ /* Input file: packet-logotypecertextn-template.c */ @@ -541,7 +541,7 @@ void proto_register_logotypecertextn(void) { FT_UINT32, BASE_DEC, NULL, 0, "logotypecertextn.SEQUENCE_OF_LogotypeInfo", HFILL }}, { &hf_logotypecertextn_communityLogos_item, - { "communityLogos", "logotypecertextn.communityLogos_item", + { "LogotypeInfo", "logotypecertextn.LogotypeInfo", FT_UINT32, BASE_DEC, VALS(logotypecertextn_LogotypeInfo_vals), 0, "logotypecertextn.LogotypeInfo", HFILL }}, { &hf_logotypecertextn_issuerLogo, @@ -557,7 +557,7 @@ void proto_register_logotypecertextn(void) { FT_UINT32, BASE_DEC, NULL, 0, "logotypecertextn.SEQUENCE_OF_OtherLogotypeInfo", HFILL }}, { &hf_logotypecertextn_otherLogos_item, - { "otherLogos", "logotypecertextn.otherLogos_item", + { "OtherLogotypeInfo", "logotypecertextn.OtherLogotypeInfo", FT_NONE, BASE_NONE, NULL, 0, "logotypecertextn.OtherLogotypeInfo", HFILL }}, { &hf_logotypecertextn_direct, @@ -573,7 +573,7 @@ void proto_register_logotypecertextn(void) { FT_UINT32, BASE_DEC, NULL, 0, "logotypecertextn.SEQUENCE_OF_LogotypeImage", HFILL }}, { &hf_logotypecertextn_image_item, - { "image", "logotypecertextn.image_item", + { "LogotypeImage", "logotypecertextn.LogotypeImage", FT_NONE, BASE_NONE, NULL, 0, "logotypecertextn.LogotypeImage", HFILL }}, { &hf_logotypecertextn_audio, @@ -581,7 +581,7 @@ void proto_register_logotypecertextn(void) { FT_UINT32, BASE_DEC, NULL, 0, "logotypecertextn.SEQUENCE_OF_LogotypeAudio", HFILL }}, { &hf_logotypecertextn_audio_item, - { "audio", "logotypecertextn.audio_item", + { "LogotypeAudio", "logotypecertextn.LogotypeAudio", FT_NONE, BASE_NONE, NULL, 0, "logotypecertextn.LogotypeAudio", HFILL }}, { &hf_logotypecertextn_imageDetails, @@ -609,7 +609,7 @@ void proto_register_logotypecertextn(void) { FT_UINT32, BASE_DEC, NULL, 0, "logotypecertextn.SEQUENCE_SIZE_1_MAX_OF_HashAlgAndValue", HFILL }}, { &hf_logotypecertextn_logotypeHash_item, - { "logotypeHash", "logotypecertextn.logotypeHash_item", + { "HashAlgAndValue", "logotypecertextn.HashAlgAndValue", FT_NONE, BASE_NONE, NULL, 0, "logotypecertextn.HashAlgAndValue", HFILL }}, { &hf_logotypecertextn_logotypeURI, @@ -617,7 +617,7 @@ void proto_register_logotypecertextn(void) { FT_UINT32, BASE_DEC, NULL, 0, "logotypecertextn.T_logotypeURI", HFILL }}, { &hf_logotypecertextn_logotypeURI_item, - { "logotypeURI", "logotypecertextn.logotypeURI_item", + { "logotypeURI item", "logotypecertextn.logotypeURI_item", FT_STRING, BASE_NONE, NULL, 0, "logotypecertextn.T_logotypeURI_item", HFILL }}, { &hf_logotypecertextn_type, @@ -677,7 +677,7 @@ void proto_register_logotypecertextn(void) { FT_UINT32, BASE_DEC, NULL, 0, "logotypecertextn.SEQUENCE_SIZE_1_MAX_OF_HashAlgAndValue", HFILL }}, { &hf_logotypecertextn_refStructHash_item, - { "refStructHash", "logotypecertextn.refStructHash_item", + { "HashAlgAndValue", "logotypecertextn.HashAlgAndValue", FT_NONE, BASE_NONE, NULL, 0, "logotypecertextn.HashAlgAndValue", HFILL }}, { &hf_logotypecertextn_refStructURI, @@ -685,7 +685,7 @@ void proto_register_logotypecertextn(void) { FT_UINT32, BASE_DEC, NULL, 0, "logotypecertextn.T_refStructURI", HFILL }}, { &hf_logotypecertextn_refStructURI_item, - { "refStructURI", "logotypecertextn.refStructURI_item", + { "refStructURI item", "logotypecertextn.refStructURI_item", FT_STRING, BASE_NONE, NULL, 0, "logotypecertextn.T_refStructURI_item", HFILL }}, { &hf_logotypecertextn_hashAlg, diff --git a/epan/dissectors/packet-logotypecertextn.h b/epan/dissectors/packet-logotypecertextn.h index 8c09f6f40f..b31fb2dd54 100644 --- a/epan/dissectors/packet-logotypecertextn.h +++ b/epan/dissectors/packet-logotypecertextn.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-logotypecertextn.h */ -/* ../../tools/asn2wrs.py -b -p logotypecertextn -c logotypecertextn.cnf -s packet-logotypecertextn-template LogotypeCertExtn.asn */ +/* ../../tools/asn2wrs.py -b -p logotypecertextn -c ./logotypecertextn.cnf -s ./packet-logotypecertextn-template -D . LogotypeCertExtn.asn */ /* Input file: packet-logotypecertextn-template.h */ diff --git a/epan/dissectors/packet-lte-rrc.c b/epan/dissectors/packet-lte-rrc.c index 1e5cd76aba..4ef7ed3d6a 100644 --- a/epan/dissectors/packet-lte-rrc.c +++ b/epan/dissectors/packet-lte-rrc.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-lte-rrc.c */ -/* ../../tools/asn2wrs.py -L -p lte-rrc -c lte-rrc.cnf -s packet-lte-rrc-template EUTRA-RRC-Definitions.asn EUTRA-UE-Variables.asn EUTRA-InterNodeDefinitions.asn */ +/* ../../tools/asn2wrs.py -L -p lte-rrc -c ./lte-rrc.cnf -s ./packet-lte-rrc-template -D . EUTRA-RRC-Definitions.asn EUTRA-UE-Variables.asn EUTRA-InterNodeDefinitions.asn */ /* Input file: packet-lte-rrc-template.c */ @@ -17144,7 +17144,7 @@ void proto_register_lte_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.T_nonCriticalExtension_02", HFILL }}, { &hf_lte_rrc_DRB_CountMSB_InfoList_item, - { "DRB-CountMSB-InfoList", "lte-rrc.DRB_CountMSB_InfoList_item", + { "DRB-CountMSB-InfoList item", "lte-rrc.DRB_CountMSB_InfoList_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.DRB_CountMSB_InfoList_item", HFILL }}, { &hf_lte_rrc_drb_Identity, @@ -17180,7 +17180,7 @@ void proto_register_lte_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.T_nonCriticalExtension_03", HFILL }}, { &hf_lte_rrc_DRB_CountInfoList_item, - { "DRB-CountInfoList", "lte-rrc.DRB_CountInfoList_item", + { "DRB-CountInfoList item", "lte-rrc.DRB_CountInfoList_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.DRB_CountInfoList_item", HFILL }}, { &hf_lte_rrc_count_Uplink, @@ -17376,7 +17376,7 @@ void proto_register_lte_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "lte_rrc.GERAN_SystemInformation", HFILL }}, { &hf_lte_rrc_GERAN_SystemInformation_item, - { "GERAN-SystemInformation", "lte-rrc.GERAN_SystemInformation_item", + { "GERAN-SystemInformation item", "lte-rrc.GERAN_SystemInformation_item", FT_BYTES, BASE_HEX, NULL, 0, "lte_rrc.OCTET_STRING_SIZE_1_23", HFILL }}, { &hf_lte_rrc_pagingRecordList, @@ -17396,7 +17396,7 @@ void proto_register_lte_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.T_nonCriticalExtension_08", HFILL }}, { &hf_lte_rrc_PagingRecordList_item, - { "PagingRecordList", "lte-rrc.PagingRecordList_item", + { "PagingRecord", "lte-rrc.PagingRecord", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.PagingRecord", HFILL }}, { &hf_lte_rrc_ue_Identity, @@ -17444,7 +17444,7 @@ void proto_register_lte_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "lte_rrc.SEQUENCE_SIZE_1_maxDRB_OF_NAS_DedicatedInformation", HFILL }}, { &hf_lte_rrc_nas_DedicatedInformationList_item, - { "nas-DedicatedInformationList", "lte-rrc.nas_DedicatedInformationList_item", + { "NAS-DedicatedInformation", "lte-rrc.NAS_DedicatedInformation", FT_BYTES, BASE_HEX, NULL, 0, "lte_rrc.NAS_DedicatedInformation", HFILL }}, { &hf_lte_rrc_radioResourceConfiguration, @@ -17684,7 +17684,7 @@ void proto_register_lte_rrc(void) { FT_UINT32, BASE_DEC, VALS(lte_rrc_T_t320_vals), 0, "lte_rrc.T_t320", HFILL }}, { &hf_lte_rrc_InterFreqPriorityList_item, - { "InterFreqPriorityList", "lte-rrc.InterFreqPriorityList_item", + { "InterFreqPriorityList item", "lte-rrc.InterFreqPriorityList_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.InterFreqPriorityList_item", HFILL }}, { &hf_lte_rrc_cellReselectionPriority, @@ -17692,7 +17692,7 @@ void proto_register_lte_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "lte_rrc.INTEGER_0_7", HFILL }}, { &hf_lte_rrc_GERAN_FreqPriorityList_item, - { "GERAN-FreqPriorityList", "lte-rrc.GERAN_FreqPriorityList_item", + { "GERAN-FreqPriorityList item", "lte-rrc.GERAN_FreqPriorityList_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.GERAN_FreqPriorityList_item", HFILL }}, { &hf_lte_rrc_geran_BCCH_FrequencyGroup, @@ -17704,7 +17704,7 @@ void proto_register_lte_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "lte_rrc.INTEGER_0_7", HFILL }}, { &hf_lte_rrc_UTRA_FDD_FreqPriorityList_item, - { "UTRA-FDD-FreqPriorityList", "lte-rrc.UTRA_FDD_FreqPriorityList_item", + { "UTRA-FDD-FreqPriorityList item", "lte-rrc.UTRA_FDD_FreqPriorityList_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.UTRA_FDD_FreqPriorityList_item", HFILL }}, { &hf_lte_rrc_utra_CarrierFreq, @@ -17716,11 +17716,11 @@ void proto_register_lte_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "lte_rrc.INTEGER_0_7", HFILL }}, { &hf_lte_rrc_UTRA_TDD_FreqPriorityList_item, - { "UTRA-TDD-FreqPriorityList", "lte-rrc.UTRA_TDD_FreqPriorityList_item", + { "UTRA-TDD-FreqPriorityList item", "lte-rrc.UTRA_TDD_FreqPriorityList_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.UTRA_TDD_FreqPriorityList_item", HFILL }}, { &hf_lte_rrc_HRPD_BandClassPriorityList_item, - { "HRPD-BandClassPriorityList", "lte-rrc.HRPD_BandClassPriorityList_item", + { "HRPD-BandClassPriorityList item", "lte-rrc.HRPD_BandClassPriorityList_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.HRPD_BandClassPriorityList_item", HFILL }}, { &hf_lte_rrc_hrpd_bandClass, @@ -17732,7 +17732,7 @@ void proto_register_lte_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "lte_rrc.INTEGER_0_7", HFILL }}, { &hf_lte_rrc_OneXRTT_BandClassPriorityList_item, - { "OneXRTT-BandClassPriorityList", "lte-rrc.OneXRTT_BandClassPriorityList_item", + { "OneXRTT-BandClassPriorityList item", "lte-rrc.OneXRTT_BandClassPriorityList_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.OneXRTT_BandClassPriorityList_item", HFILL }}, { &hf_lte_rrc_oneXRTT_bandClass, @@ -17904,7 +17904,7 @@ void proto_register_lte_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "lte_rrc.T_sib_TypeAndInfo", HFILL }}, { &hf_lte_rrc_sib_TypeAndInfo_item, - { "sib-TypeAndInfo", "lte-rrc.sib_TypeAndInfo_item", + { "sib-TypeAndInfo item", "lte-rrc.sib_TypeAndInfo_item", FT_UINT32, BASE_DEC, VALS(lte_rrc_T_sib_TypeAndInfo_item_vals), 0, "lte_rrc.T_sib_TypeAndInfo_item", HFILL }}, { &hf_lte_rrc_sib2, @@ -18024,7 +18024,7 @@ void proto_register_lte_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.T_nonCriticalExtension_22", HFILL }}, { &hf_lte_rrc_PLMN_IdentityList_item, - { "PLMN-IdentityList", "lte-rrc.PLMN_IdentityList_item", + { "PLMN-IdentityList item", "lte-rrc.PLMN_IdentityList_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.PLMN_IdentityList_item", HFILL }}, { &hf_lte_rrc_cellReservedForOperatorUse, @@ -18032,7 +18032,7 @@ void proto_register_lte_rrc(void) { FT_UINT32, BASE_DEC, VALS(lte_rrc_T_cellReservedForOperatorUse_vals), 0, "lte_rrc.T_cellReservedForOperatorUse", HFILL }}, { &hf_lte_rrc_SchedulingInformation_item, - { "SchedulingInformation", "lte-rrc.SchedulingInformation_item", + { "SchedulingInformation item", "lte-rrc.SchedulingInformation_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.SchedulingInformation_item", HFILL }}, { &hf_lte_rrc_si_Periodicity, @@ -18044,7 +18044,7 @@ void proto_register_lte_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "lte_rrc.SIB_MappingInfo", HFILL }}, { &hf_lte_rrc_SIB_MappingInfo_item, - { "SIB-MappingInfo", "lte-rrc.SIB_MappingInfo_item", + { "SIB-Type", "lte-rrc.SIB_Type", FT_UINT32, BASE_DEC, VALS(lte_rrc_SIB_Type_vals), 0, "lte_rrc.SIB_Type", HFILL }}, { &hf_lte_rrc_criticalExtensions_23, @@ -18072,7 +18072,7 @@ void proto_register_lte_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.T_nonCriticalExtension_23", HFILL }}, { &hf_lte_rrc_UE_RadioAccessCapRequest_item, - { "UE-RadioAccessCapRequest", "lte-rrc.UE_RadioAccessCapRequest_item", + { "RAT-Type", "lte-rrc.RAT_Type", FT_UINT32, BASE_DEC, VALS(lte_rrc_RAT_Type_vals), 0, "lte_rrc.RAT_Type", HFILL }}, { &hf_lte_rrc_criticalExtensions_24, @@ -18092,7 +18092,7 @@ void proto_register_lte_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.T_criticalExtensionsFuture_24", HFILL }}, { &hf_lte_rrc_UECapabilityInformation_r8_IEs_item, - { "UECapabilityInformation-r8-IEs", "lte-rrc.UECapabilityInformation_r8_IEs_item", + { "UECapabilityInformation-r8-IEs item", "lte-rrc.UECapabilityInformation_r8_IEs_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.UECapabilityInformation_r8_IEs_item", HFILL }}, { &hf_lte_rrc_rat_Type, @@ -18220,7 +18220,7 @@ void proto_register_lte_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "lte_rrc.AccessClassBarringList", HFILL }}, { &hf_lte_rrc_AccessClassBarringList_item, - { "AccessClassBarringList", "lte-rrc.AccessClassBarringList_item", + { "AccessClassBarringList item", "lte-rrc.AccessClassBarringList_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.AccessClassBarringList_item", HFILL }}, { &hf_lte_rrc_accessClassBarring, @@ -18228,7 +18228,7 @@ void proto_register_lte_rrc(void) { FT_BOOLEAN, 8, NULL, 0, "lte_rrc.BOOLEAN", HFILL }}, { &hf_lte_rrc_MBSFN_SubframeConfiguration_item, - { "MBSFN-SubframeConfiguration", "lte-rrc.MBSFN_SubframeConfiguration_item", + { "MBSFN-SubframeConfiguration item", "lte-rrc.MBSFN_SubframeConfiguration_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.MBSFN_SubframeConfiguration_item", HFILL }}, { &hf_lte_rrc_radioframeAllocationPeriod, @@ -18340,7 +18340,7 @@ void proto_register_lte_rrc(void) { FT_UINT32, BASE_DEC, VALS(lte_rrc_PhysicalCellIdentityAndRange_vals), 0, "lte_rrc.PhysicalCellIdentityAndRange", HFILL }}, { &hf_lte_rrc_IntraFreqNeighbouringCellList_item, - { "IntraFreqNeighbouringCellList", "lte-rrc.IntraFreqNeighbouringCellList_item", + { "IntraFreqNeighbouringCellList item", "lte-rrc.IntraFreqNeighbouringCellList_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.IntraFreqNeighbouringCellList_item", HFILL }}, { &hf_lte_rrc_physicalCellIdentity, @@ -18352,7 +18352,7 @@ void proto_register_lte_rrc(void) { FT_UINT32, BASE_DEC, VALS(lte_rrc_T_q_OffsetCell_vals), 0, "lte_rrc.T_q_OffsetCell", HFILL }}, { &hf_lte_rrc_IntraFreqBlacklistedCellList_item, - { "IntraFreqBlacklistedCellList", "lte-rrc.IntraFreqBlacklistedCellList_item", + { "IntraFreqBlacklistedCellList item", "lte-rrc.IntraFreqBlacklistedCellList_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.IntraFreqBlacklistedCellList_item", HFILL }}, { &hf_lte_rrc_physicalCellIdentityAndRange, @@ -18364,7 +18364,7 @@ void proto_register_lte_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "lte_rrc.InterFreqCarrierFreqList", HFILL }}, { &hf_lte_rrc_InterFreqCarrierFreqList_item, - { "InterFreqCarrierFreqList", "lte-rrc.InterFreqCarrierFreqList_item", + { "InterFreqCarrierFreqList item", "lte-rrc.InterFreqCarrierFreqList_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.InterFreqCarrierFreqList_item", HFILL }}, { &hf_lte_rrc_speedDependentScalingParameters_01, @@ -18400,7 +18400,7 @@ void proto_register_lte_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "lte_rrc.InterFreqBlacklistedCellList", HFILL }}, { &hf_lte_rrc_InterFreqNeighbouringCellList_item, - { "InterFreqNeighbouringCellList", "lte-rrc.InterFreqNeighbouringCellList_item", + { "InterFreqNeighbouringCellList item", "lte-rrc.InterFreqNeighbouringCellList_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.InterFreqNeighbouringCellList_item", HFILL }}, { &hf_lte_rrc_q_OffsetCell_01, @@ -18408,7 +18408,7 @@ void proto_register_lte_rrc(void) { FT_UINT32, BASE_DEC, VALS(lte_rrc_T_q_OffsetCell_01_vals), 0, "lte_rrc.T_q_OffsetCell_01", HFILL }}, { &hf_lte_rrc_InterFreqBlacklistedCellList_item, - { "InterFreqBlacklistedCellList", "lte-rrc.InterFreqBlacklistedCellList_item", + { "InterFreqBlacklistedCellList item", "lte-rrc.InterFreqBlacklistedCellList_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.InterFreqBlacklistedCellList_item", HFILL }}, { &hf_lte_rrc_utra_FDD_CarrierFreqList, @@ -18436,7 +18436,7 @@ void proto_register_lte_rrc(void) { FT_UINT32, BASE_DEC, VALS(lte_rrc_T_t_ReselectionUTRA_SF_High_vals), 0, "lte_rrc.T_t_ReselectionUTRA_SF_High", HFILL }}, { &hf_lte_rrc_UTRA_FDD_CarrierFreqList_item, - { "UTRA-FDD-CarrierFreqList", "lte-rrc.UTRA_FDD_CarrierFreqList_item", + { "UTRA-FDD-CarrierFreqList item", "lte-rrc.UTRA_FDD_CarrierFreqList_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.UTRA_FDD_CarrierFreqList_item", HFILL }}, { &hf_lte_rrc_maxAllowedTxPower, @@ -18448,7 +18448,7 @@ void proto_register_lte_rrc(void) { FT_INT32, BASE_DEC, NULL, 0, "lte_rrc.INTEGER_M24_0", HFILL }}, { &hf_lte_rrc_UTRA_TDD_CarrierFreqList_item, - { "UTRA-TDD-CarrierFreqList", "lte-rrc.UTRA_TDD_CarrierFreqList_item", + { "UTRA-TDD-CarrierFreqList item", "lte-rrc.UTRA_TDD_CarrierFreqList_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.UTRA_TDD_CarrierFreqList_item", HFILL }}, { &hf_lte_rrc_t_ReselectionGERAN, @@ -18472,7 +18472,7 @@ void proto_register_lte_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "lte_rrc.GERAN_NeigbourFreqList", HFILL }}, { &hf_lte_rrc_GERAN_NeigbourFreqList_item, - { "GERAN-NeigbourFreqList", "lte-rrc.GERAN_NeigbourFreqList_item", + { "GERAN-BCCH-Group", "lte-rrc.GERAN_BCCH_Group", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.GERAN_BCCH_Group", HFILL }}, { &hf_lte_rrc_geran_BCCH_Configuration, @@ -18576,7 +18576,7 @@ void proto_register_lte_rrc(void) { FT_UINT32, BASE_DEC, VALS(lte_rrc_T_t_ReselectionCDMA_OneXRTT_SF_High_vals), 0, "lte_rrc.T_t_ReselectionCDMA_OneXRTT_SF_High", HFILL }}, { &hf_lte_rrc_CDMA2000_NeighbourCellList_item, - { "CDMA2000-NeighbourCellList", "lte-rrc.CDMA2000_NeighbourCellList_item", + { "CDMA2000-NeighbourCellList item", "lte-rrc.CDMA2000_NeighbourCellList_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.CDMA2000_NeighbourCellList_item", HFILL }}, { &hf_lte_rrc_bandClass, @@ -18588,7 +18588,7 @@ void proto_register_lte_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "lte_rrc.CDMA2000_NeighbourCellsPerBandclass", HFILL }}, { &hf_lte_rrc_CDMA2000_NeighbourCellsPerBandclass_item, - { "CDMA2000-NeighbourCellsPerBandclass", "lte-rrc.CDMA2000_NeighbourCellsPerBandclass_item", + { "CDMA2000-NeighbourCellsPerBandclass item", "lte-rrc.CDMA2000_NeighbourCellsPerBandclass_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.CDMA2000_NeighbourCellsPerBandclass_item", HFILL }}, { &hf_lte_rrc_frequency, @@ -18600,11 +18600,11 @@ void proto_register_lte_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "lte_rrc.CDMA2000_CellIdList", HFILL }}, { &hf_lte_rrc_CDMA2000_CellIdList_item, - { "CDMA2000-CellIdList", "lte-rrc.CDMA2000_CellIdList_item", + { "CDMA2000-CellIdentity", "lte-rrc.CDMA2000_CellIdentity", FT_UINT32, BASE_DEC, NULL, 0, "lte_rrc.CDMA2000_CellIdentity", HFILL }}, { &hf_lte_rrc_HRPD_BandClassList_item, - { "HRPD-BandClassList", "lte-rrc.HRPD_BandClassList_item", + { "HRPD-BandClassList item", "lte-rrc.HRPD_BandClassList_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.HRPD_BandClassList_item", HFILL }}, { &hf_lte_rrc_hrpd_BandClass, @@ -18620,7 +18620,7 @@ void proto_register_lte_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "lte_rrc.INTEGER_0_63", HFILL }}, { &hf_lte_rrc_OneXRTT_BandClassList_item, - { "OneXRTT-BandClassList", "lte-rrc.OneXRTT_BandClassList_item", + { "OneXRTT-BandClassList item", "lte-rrc.OneXRTT_BandClassList_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.OneXRTT_BandClassList_item", HFILL }}, { &hf_lte_rrc_oneXRTT_BandClass, @@ -19328,7 +19328,7 @@ void proto_register_lte_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.PhysicalConfigDedicated", HFILL }}, { &hf_lte_rrc_SRB_ToAddModifyList_item, - { "SRB-ToAddModifyList", "lte-rrc.SRB_ToAddModifyList_item", + { "SRB-ToAddModifyList item", "lte-rrc.SRB_ToAddModifyList_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.SRB_ToAddModifyList_item", HFILL }}, { &hf_lte_rrc_srb_Identity, @@ -19352,7 +19352,7 @@ void proto_register_lte_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.LogicalChannelConfig", HFILL }}, { &hf_lte_rrc_DRB_ToAddModifyList_item, - { "DRB-ToAddModifyList", "lte-rrc.DRB_ToAddModifyList_item", + { "DRB-ToAddModifyList item", "lte-rrc.DRB_ToAddModifyList_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.DRB_ToAddModifyList_item", HFILL }}, { &hf_lte_rrc_eps_BearerIdentity, @@ -19376,7 +19376,7 @@ void proto_register_lte_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.LogicalChannelConfig", HFILL }}, { &hf_lte_rrc_DRB_ToReleaseList_item, - { "DRB-ToReleaseList", "lte-rrc.DRB_ToReleaseList_item", + { "DRB-ToReleaseList item", "lte-rrc.DRB_ToReleaseList_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.DRB_ToReleaseList_item", HFILL }}, { &hf_lte_rrc_am, @@ -19696,7 +19696,7 @@ void proto_register_lte_rrc(void) { FT_BYTES, BASE_HEX, NULL, 0, "lte_rrc.BIT_STRING_SIZE_49", HFILL }}, { &hf_lte_rrc_CellIndexList_item, - { "CellIndexList", "lte-rrc.CellIndexList_item", + { "CellIndexList item", "lte-rrc.CellIndexList_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.CellIndexList_item", HFILL }}, { &hf_lte_rrc_cellIndex, @@ -19756,7 +19756,7 @@ void proto_register_lte_rrc(void) { FT_BYTES, BASE_HEX, NULL, 0, "lte_rrc.OCTET_STRING_SIZE_1_16", HFILL }}, { &hf_lte_rrc_ExplicitListOfARFCNs_item, - { "ExplicitListOfARFCNs", "lte-rrc.ExplicitListOfARFCNs_item", + { "GERAN-ARFCN-Value", "lte-rrc.GERAN_ARFCN_Value", FT_UINT32, BASE_DEC, NULL, 0, "lte_rrc.GERAN_ARFCN_Value", HFILL }}, { &hf_lte_rrc_networkColourCode, @@ -19800,7 +19800,7 @@ void proto_register_lte_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "lte_rrc.HRPD_SecondaryPreRegistrationZoneIdList", HFILL }}, { &hf_lte_rrc_HRPD_SecondaryPreRegistrationZoneIdList_item, - { "HRPD-SecondaryPreRegistrationZoneIdList", "lte-rrc.HRPD_SecondaryPreRegistrationZoneIdList_item", + { "HRPD-SecondaryPreRegistrationZoneIdList item", "lte-rrc.HRPD_SecondaryPreRegistrationZoneIdList_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.HRPD_SecondaryPreRegistrationZoneIdList_item", HFILL }}, { &hf_lte_rrc_hrpd_SecondaryPreRegistrationZoneId, @@ -19940,11 +19940,11 @@ void proto_register_lte_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "lte_rrc.MNC", HFILL }}, { &hf_lte_rrc_MCC_item, - { "MCC", "lte-rrc.MCC_item", + { "MCC-MNC-Digit", "lte-rrc.MCC_MNC_Digit", FT_UINT32, BASE_DEC, NULL, 0, "lte_rrc.MCC_MNC_Digit", HFILL }}, { &hf_lte_rrc_MNC_item, - { "MNC", "lte-rrc.MNC_item", + { "MCC-MNC-Digit", "lte-rrc.MCC_MNC_Digit", FT_UINT32, BASE_DEC, NULL, 0, "lte_rrc.MCC_MNC_Digit", HFILL }}, { &hf_lte_rrc_primaryScramblingCode, @@ -20012,7 +20012,7 @@ void proto_register_lte_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "lte_rrc.CDMA2000_CellIdentity", HFILL }}, { &hf_lte_rrc_CDMA2000_CellsToAddModifyList_item, - { "CDMA2000-CellsToAddModifyList", "lte-rrc.CDMA2000_CellsToAddModifyList_item", + { "CDMA2000-CellsToAddModifyList item", "lte-rrc.CDMA2000_CellsToAddModifyList_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.CDMA2000_CellsToAddModifyList_item", HFILL }}, { &hf_lte_rrc_cellIdentity_01, @@ -20044,7 +20044,7 @@ void proto_register_lte_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "lte_rrc.PhysicalCellIdentity", HFILL }}, { &hf_lte_rrc_NeighCellsToAddModifyList_item, - { "NeighCellsToAddModifyList", "lte-rrc.NeighCellsToAddModifyList_item", + { "NeighCellsToAddModifyList item", "lte-rrc.NeighCellsToAddModifyList_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.NeighCellsToAddModifyList_item", HFILL }}, { &hf_lte_rrc_cellIdentity_02, @@ -20056,7 +20056,7 @@ void proto_register_lte_rrc(void) { FT_UINT32, BASE_DEC, VALS(lte_rrc_T_cellIndividualOffset_vals), 0, "lte_rrc.T_cellIndividualOffset", HFILL }}, { &hf_lte_rrc_BlackListedCellsToAddModifyList_item, - { "BlackListedCellsToAddModifyList", "lte-rrc.BlackListedCellsToAddModifyList_item", + { "BlackListedCellsToAddModifyList item", "lte-rrc.BlackListedCellsToAddModifyList_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.BlackListedCellsToAddModifyList_item", HFILL }}, { &hf_lte_rrc_cellIdentityAndRange, @@ -20076,7 +20076,7 @@ void proto_register_lte_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.GERAN_CellIdentity", HFILL }}, { &hf_lte_rrc_GERAN_MeasFrequencyList_item, - { "GERAN-MeasFrequencyList", "lte-rrc.GERAN_MeasFrequencyList_item", + { "GERAN-CarrierFreqList", "lte-rrc.GERAN_CarrierFreqList", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.GERAN_CarrierFreqList", HFILL }}, { &hf_lte_rrc_cellsToAddModifyList_02, @@ -20104,7 +20104,7 @@ void proto_register_lte_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.UTRA_TDD_CellIdentity", HFILL }}, { &hf_lte_rrc_UTRA_FDD_CellsToAddModifyList_item, - { "UTRA-FDD-CellsToAddModifyList", "lte-rrc.UTRA_FDD_CellsToAddModifyList_item", + { "UTRA-FDD-CellsToAddModifyList item", "lte-rrc.UTRA_FDD_CellsToAddModifyList_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.UTRA_FDD_CellsToAddModifyList_item", HFILL }}, { &hf_lte_rrc_utra_FDD_CellIdentity, @@ -20112,7 +20112,7 @@ void proto_register_lte_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.UTRA_FDD_CellIdentity", HFILL }}, { &hf_lte_rrc_UTRA_TDD_CellsToAddModifyList_item, - { "UTRA-TDD-CellsToAddModifyList", "lte-rrc.UTRA_TDD_CellsToAddModifyList_item", + { "UTRA-TDD-CellsToAddModifyList item", "lte-rrc.UTRA_TDD_CellsToAddModifyList_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.UTRA_TDD_CellsToAddModifyList_item", HFILL }}, { &hf_lte_rrc_utra_TDD_CellIdentity, @@ -20156,7 +20156,7 @@ void proto_register_lte_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.MeasResultsCDMA2000", HFILL }}, { &hf_lte_rrc_MeasResultListEUTRA_item, - { "MeasResultListEUTRA", "lte-rrc.MeasResultListEUTRA_item", + { "MeasResultListEUTRA item", "lte-rrc.MeasResultListEUTRA_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.MeasResultListEUTRA_item", HFILL }}, { &hf_lte_rrc_globalCellIdentity, @@ -20180,7 +20180,7 @@ void proto_register_lte_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.T_measResult", HFILL }}, { &hf_lte_rrc_MeasResultListUTRA_item, - { "MeasResultListUTRA", "lte-rrc.MeasResultListUTRA_item", + { "MeasResultListUTRA item", "lte-rrc.MeasResultListUTRA_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.MeasResultListUTRA_item", HFILL }}, { &hf_lte_rrc_physicalCellIdentity_01, @@ -20240,7 +20240,7 @@ void proto_register_lte_rrc(void) { FT_INT32, BASE_DEC, NULL, 0, "lte_rrc.INTEGER_M5_91", HFILL }}, { &hf_lte_rrc_MeasResultListGERAN_item, - { "MeasResultListGERAN", "lte-rrc.MeasResultListGERAN_item", + { "MeasResultListGERAN item", "lte-rrc.MeasResultListGERAN_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.MeasResultListGERAN_item", HFILL }}, { &hf_lte_rrc_physicalCellIdentity_02, @@ -20276,7 +20276,7 @@ void proto_register_lte_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "lte_rrc.MeasResultListCDMA2000", HFILL }}, { &hf_lte_rrc_MeasResultListCDMA2000_item, - { "MeasResultListCDMA2000", "lte-rrc.MeasResultListCDMA2000_item", + { "MeasResultListCDMA2000 item", "lte-rrc.MeasResultListCDMA2000_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.MeasResultListCDMA2000_item", HFILL }}, { &hf_lte_rrc_physicalCellIdentity_03, @@ -20300,7 +20300,7 @@ void proto_register_lte_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "lte_rrc.INTEGER_0_63", HFILL }}, { &hf_lte_rrc_PLMN_IdentityList2_item, - { "PLMN-IdentityList2", "lte-rrc.PLMN_IdentityList2_item", + { "PLMN-IdentityList2 item", "lte-rrc.PLMN_IdentityList2_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.PLMN_IdentityList2_item", HFILL }}, { &hf_lte_rrc_measObjectToRemoveList, @@ -20352,11 +20352,11 @@ void proto_register_lte_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.ConnectedModeSpeedDependentScalingParameters", HFILL }}, { &hf_lte_rrc_MeasIdToRemoveList_item, - { "MeasIdToRemoveList", "lte-rrc.MeasIdToRemoveList_item", + { "MeasIdToRemoveList item", "lte-rrc.MeasIdToRemoveList_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.MeasIdToRemoveList_item", HFILL }}, { &hf_lte_rrc_MeasIdToAddModifyList_item, - { "MeasIdToAddModifyList", "lte-rrc.MeasIdToAddModifyList_item", + { "MeasIdToAddModifyList item", "lte-rrc.MeasIdToAddModifyList_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.MeasIdToAddModifyList_item", HFILL }}, { &hf_lte_rrc_measObjectId, @@ -20368,11 +20368,11 @@ void proto_register_lte_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "lte_rrc.ReportConfigId", HFILL }}, { &hf_lte_rrc_MeasObjectToRemoveList_item, - { "MeasObjectToRemoveList", "lte-rrc.MeasObjectToRemoveList_item", + { "MeasObjectToRemoveList item", "lte-rrc.MeasObjectToRemoveList_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.MeasObjectToRemoveList_item", HFILL }}, { &hf_lte_rrc_MeasObjectToAddModifyList_item, - { "MeasObjectToAddModifyList", "lte-rrc.MeasObjectToAddModifyList_item", + { "MeasObjectToAddModifyList item", "lte-rrc.MeasObjectToAddModifyList_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.MeasObjectToAddModifyList_item", HFILL }}, { &hf_lte_rrc_measObject, @@ -20396,11 +20396,11 @@ void proto_register_lte_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.MeasObjectCDMA2000", HFILL }}, { &hf_lte_rrc_ReportConfigToRemoveList_item, - { "ReportConfigToRemoveList", "lte-rrc.ReportConfigToRemoveList_item", + { "ReportConfigToRemoveList item", "lte-rrc.ReportConfigToRemoveList_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.ReportConfigToRemoveList_item", HFILL }}, { &hf_lte_rrc_ReportConfigToAddModifyList_item, - { "ReportConfigToAddModifyList", "lte-rrc.ReportConfigToAddModifyList_item", + { "ReportConfigToAddModifyList item", "lte-rrc.ReportConfigToAddModifyList_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.ReportConfigToAddModifyList_item", HFILL }}, { &hf_lte_rrc_reportConfig, @@ -20652,7 +20652,7 @@ void proto_register_lte_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "lte_rrc.INTEGER_0_49", HFILL }}, { &hf_lte_rrc_IMSI_item, - { "IMSI", "lte-rrc.IMSI_item", + { "IMSI-Digit", "lte-rrc.IMSI_Digit", FT_UINT32, BASE_DEC, NULL, 0, "lte_rrc.IMSI_Digit", HFILL }}, { &hf_lte_rrc_m_TMSI, @@ -20740,7 +20740,7 @@ void proto_register_lte_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "lte_rrc.SupportedEUTRA_BandList", HFILL }}, { &hf_lte_rrc_SupportedEUTRA_BandList_item, - { "SupportedEUTRA-BandList", "lte-rrc.SupportedEUTRA_BandList_item", + { "SupportedEUTRA-BandList item", "lte-rrc.SupportedEUTRA_BandList_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.SupportedEUTRA_BandList_item", HFILL }}, { &hf_lte_rrc_eutra_Band, @@ -20756,7 +20756,7 @@ void proto_register_lte_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "lte_rrc.EUTRA_BandList", HFILL }}, { &hf_lte_rrc_EUTRA_BandList_item, - { "EUTRA-BandList", "lte-rrc.EUTRA_BandList_item", + { "EUTRA-BandList item", "lte-rrc.EUTRA_BandList_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.EUTRA_BandList_item", HFILL }}, { &hf_lte_rrc_interFreqEUTRA_BandList, @@ -20768,7 +20768,7 @@ void proto_register_lte_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "lte_rrc.InterRAT_BandList", HFILL }}, { &hf_lte_rrc_InterFreqEUTRA_BandList_item, - { "InterFreqEUTRA-BandList", "lte-rrc.InterFreqEUTRA_BandList_item", + { "InterFreqEUTRA-BandList item", "lte-rrc.InterFreqEUTRA_BandList_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.InterFreqEUTRA_BandList_item", HFILL }}, { &hf_lte_rrc_interFreqNeedForGaps, @@ -20776,7 +20776,7 @@ void proto_register_lte_rrc(void) { FT_BOOLEAN, 8, NULL, 0, "lte_rrc.BOOLEAN", HFILL }}, { &hf_lte_rrc_InterRAT_BandList_item, - { "InterRAT-BandList", "lte-rrc.InterRAT_BandList_item", + { "InterRAT-BandList item", "lte-rrc.InterRAT_BandList_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.InterRAT_BandList_item", HFILL }}, { &hf_lte_rrc_interRAT_NeedForGaps, @@ -20788,7 +20788,7 @@ void proto_register_lte_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "lte_rrc.SupportedUTRA_FDD_BandList", HFILL }}, { &hf_lte_rrc_SupportedUTRA_FDD_BandList_item, - { "SupportedUTRA-FDD-BandList", "lte-rrc.SupportedUTRA_FDD_BandList_item", + { "SupportedUTRA-FDD-BandList item", "lte-rrc.SupportedUTRA_FDD_BandList_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.SupportedUTRA_FDD_BandList_item", HFILL }}, { &hf_lte_rrc_utra_FDD_Band, @@ -20800,7 +20800,7 @@ void proto_register_lte_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "lte_rrc.SupportedUTRA_TDD128BandList", HFILL }}, { &hf_lte_rrc_SupportedUTRA_TDD128BandList_item, - { "SupportedUTRA-TDD128BandList", "lte-rrc.SupportedUTRA_TDD128BandList_item", + { "SupportedUTRA-TDD128BandList item", "lte-rrc.SupportedUTRA_TDD128BandList_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.SupportedUTRA_TDD128BandList_item", HFILL }}, { &hf_lte_rrc_utra_TDD128Band, @@ -20812,7 +20812,7 @@ void proto_register_lte_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "lte_rrc.SupportedUTRA_TDD384BandList", HFILL }}, { &hf_lte_rrc_SupportedUTRA_TDD384BandList_item, - { "SupportedUTRA-TDD384BandList", "lte-rrc.SupportedUTRA_TDD384BandList_item", + { "SupportedUTRA-TDD384BandList item", "lte-rrc.SupportedUTRA_TDD384BandList_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.SupportedUTRA_TDD384BandList_item", HFILL }}, { &hf_lte_rrc_utra_TDD384Band, @@ -20824,7 +20824,7 @@ void proto_register_lte_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "lte_rrc.SupportedUTRA_TDD768BandList", HFILL }}, { &hf_lte_rrc_SupportedUTRA_TDD768BandList_item, - { "SupportedUTRA-TDD768BandList", "lte-rrc.SupportedUTRA_TDD768BandList_item", + { "SupportedUTRA-TDD768BandList item", "lte-rrc.SupportedUTRA_TDD768BandList_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.SupportedUTRA_TDD768BandList_item", HFILL }}, { &hf_lte_rrc_utra_TDD768Band, @@ -20840,7 +20840,7 @@ void proto_register_lte_rrc(void) { FT_BOOLEAN, 8, NULL, 0, "lte_rrc.BOOLEAN", HFILL }}, { &hf_lte_rrc_SupportedGERAN_BandList_item, - { "SupportedGERAN-BandList", "lte-rrc.SupportedGERAN_BandList_item", + { "SupportedGERAN-BandList item", "lte-rrc.SupportedGERAN_BandList_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.SupportedGERAN_BandList_item", HFILL }}, { &hf_lte_rrc_geran_Band, @@ -20860,7 +20860,7 @@ void proto_register_lte_rrc(void) { FT_UINT32, BASE_DEC, VALS(lte_rrc_T_cdma2000_HRPD_RxConfig_vals), 0, "lte_rrc.T_cdma2000_HRPD_RxConfig", HFILL }}, { &hf_lte_rrc_SupportedHRPD_BandList_item, - { "SupportedHRPD-BandList", "lte-rrc.SupportedHRPD_BandList_item", + { "SupportedHRPD-BandList item", "lte-rrc.SupportedHRPD_BandList_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.SupportedHRPD_BandList_item", HFILL }}, { &hf_lte_rrc_cdma2000_HRPD_Band, @@ -20880,7 +20880,7 @@ void proto_register_lte_rrc(void) { FT_UINT32, BASE_DEC, VALS(lte_rrc_T_cdma2000_1xRTT_RxConfig_vals), 0, "lte_rrc.T_cdma2000_1xRTT_RxConfig", HFILL }}, { &hf_lte_rrc_Supported1xRTT_BandList_item, - { "Supported1xRTT-BandList", "lte-rrc.Supported1xRTT_BandList_item", + { "Supported1xRTT-BandList item", "lte-rrc.Supported1xRTT_BandList_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.Supported1xRTT_BandList_item", HFILL }}, { &hf_lte_rrc_cdma2000_1xRTT_Band, @@ -20928,7 +20928,7 @@ void proto_register_lte_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.T_speedDependentParameters_01", HFILL }}, { &hf_lte_rrc_VarMeasurementReports_item, - { "VarMeasurementReports", "lte-rrc.VarMeasurementReports_item", + { "VarMeasurementReports item", "lte-rrc.VarMeasurementReports_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.VarMeasurementReports_item", HFILL }}, { &hf_lte_rrc_cellsTriggeredList, @@ -20940,7 +20940,7 @@ void proto_register_lte_rrc(void) { FT_INT32, BASE_DEC, NULL, 0, "lte_rrc.INTEGER", HFILL }}, { &hf_lte_rrc_CellsTriggeredList_item, - { "CellsTriggeredList", "lte-rrc.CellsTriggeredList_item", + { "CellsTriggeredList item", "lte-rrc.CellsTriggeredList_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.CellsTriggeredList_item", HFILL }}, { &hf_lte_rrc_message_07, @@ -21128,7 +21128,7 @@ void proto_register_lte_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "lte_rrc.AdditionalReestabInfoList", HFILL }}, { &hf_lte_rrc_AdditionalReestabInfoList_item, - { "AdditionalReestabInfoList", "lte-rrc.AdditionalReestabInfoList_item", + { "AdditionalReestabInfoList item", "lte-rrc.AdditionalReestabInfoList_item", FT_NONE, BASE_NONE, NULL, 0, "lte_rrc.AdditionalReestabInfoList_item", HFILL }}, { &hf_lte_rrc_key_eNodeB_Star, diff --git a/epan/dissectors/packet-mms.c b/epan/dissectors/packet-mms.c index 5c46dd5e14..a175274415 100644 --- a/epan/dissectors/packet-mms.c +++ b/epan/dissectors/packet-mms.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-mms.c */ -/* ../../tools/asn2wrs.py -b -p mms -c mms.cnf -s packet-mms-template mms.asn */ +/* ../../tools/asn2wrs.py -b -p mms -c ./mms.cnf -s ./packet-mms-template -D . mms.asn */ /* Input file: packet-mms-template.c */ @@ -6992,7 +6992,7 @@ void proto_register_mms(void) { FT_UINT32, BASE_DEC, NULL, 0, "mms.SEQUENCE_OF_Modifier", HFILL }}, { &hf_mms_listOfModifier_item, - { "listOfModifier", "mms.listOfModifier_item", + { "Modifier", "mms.Modifier", FT_UINT32, BASE_DEC, VALS(mms_Modifier_vals), 0, "mms.Modifier", HFILL }}, { &hf_mms_confirmedServiceRequest, @@ -7668,7 +7668,7 @@ void proto_register_mms(void) { FT_NONE, BASE_NONE, NULL, 0, "mms.FileDirectory_Response", HFILL }}, { &hf_mms_FileName_item, - { "FileName", "mms.FileName_item", + { "FileName item", "mms.FileName_item", FT_STRING, BASE_NONE, NULL, 0, "mms.GraphicString", HFILL }}, { &hf_mms_vmd_specific, @@ -7976,7 +7976,7 @@ void proto_register_mms(void) { FT_UINT32, BASE_DEC, NULL, 0, "mms.SEQUENCE_OF_Identifier", HFILL }}, { &hf_mms_listOfIdentifier_item, - { "listOfIdentifier", "mms.listOfIdentifier_item", + { "Identifier", "mms.Identifier", FT_STRING, BASE_NONE, NULL, 0, "mms.Identifier", HFILL }}, { &hf_mms_moreFollows, @@ -8000,7 +8000,7 @@ void proto_register_mms(void) { FT_UINT32, BASE_DEC, NULL, 0, "mms.T_listOfAbstractSyntaxes", HFILL }}, { &hf_mms_listOfAbstractSyntaxes_item, - { "listOfAbstractSyntaxes", "mms.listOfAbstractSyntaxes_item", + { "listOfAbstractSyntaxes item", "mms.listOfAbstractSyntaxes_item", FT_OID, BASE_NONE, NULL, 0, "mms.OBJECT_IDENTIFIER", HFILL }}, { &hf_mms_extendedObjectClass_01, @@ -8028,7 +8028,7 @@ void proto_register_mms(void) { FT_UINT32, BASE_DEC, NULL, 0, "mms.T_listOfCapabilities", HFILL }}, { &hf_mms_listOfCapabilities_item, - { "listOfCapabilities", "mms.listOfCapabilities_item", + { "listOfCapabilities item", "mms.listOfCapabilities_item", FT_STRING, BASE_NONE, NULL, 0, "mms.VisibleString", HFILL }}, { &hf_mms_domainName, @@ -8108,7 +8108,7 @@ void proto_register_mms(void) { FT_UINT32, BASE_DEC, NULL, 0, "mms.SEQUENCE_OF_Identifier", HFILL }}, { &hf_mms_listOfProgramInvocations_item, - { "listOfProgramInvocations", "mms.listOfProgramInvocations_item", + { "Identifier", "mms.Identifier", FT_STRING, BASE_NONE, NULL, 0, "mms.Identifier", HFILL }}, { &hf_mms_uploadInProgress, @@ -8124,7 +8124,7 @@ void proto_register_mms(void) { FT_UINT32, BASE_DEC, NULL, 0, "mms.SEQUENCE_OF_Identifier", HFILL }}, { &hf_mms_listOfDomainName_item, - { "listOfDomainName", "mms.listOfDomainName_item", + { "Identifier", "mms.Identifier", FT_STRING, BASE_NONE, NULL, 0, "mms.Identifier", HFILL }}, { &hf_mms_reusable, @@ -8160,7 +8160,7 @@ void proto_register_mms(void) { FT_UINT32, BASE_DEC, NULL, 0, "mms.SEQUENCE_OF_Identifier", HFILL }}, { &hf_mms_listOfDomainNames_item, - { "listOfDomainNames", "mms.listOfDomainNames_item", + { "Identifier", "mms.Identifier", FT_STRING, BASE_NONE, NULL, 0, "mms.Identifier", HFILL }}, { &hf_mms_monitor, @@ -8204,7 +8204,7 @@ void proto_register_mms(void) { FT_UINT32, BASE_DEC, NULL, 0, "mms.T_components", HFILL }}, { &hf_mms_components_item, - { "components", "mms.components_item", + { "components item", "mms.components_item", FT_NONE, BASE_NONE, NULL, 0, "mms.T_components_item", HFILL }}, { &hf_mms_componentName, @@ -8256,7 +8256,7 @@ void proto_register_mms(void) { FT_NONE, BASE_NONE, NULL, 0, "mms.NULL", HFILL }}, { &hf_mms_AlternateAccess_item, - { "AlternateAccess", "mms.AlternateAccess_item", + { "AlternateAccess item", "mms.AlternateAccess_item", FT_UINT32, BASE_DEC, VALS(mms_AlternateAccess_item_vals), 0, "mms.AlternateAccess_item", HFILL }}, { &hf_mms_unnamed, @@ -8308,7 +8308,7 @@ void proto_register_mms(void) { FT_UINT32, BASE_DEC, NULL, 0, "mms.SEQUENCE_OF_AccessResult", HFILL }}, { &hf_mms_listOfAccessResult_item, - { "listOfAccessResult", "mms.listOfAccessResult_item", + { "AccessResult", "mms.AccessResult", FT_UINT32, BASE_DEC, VALS(mms_AccessResult_vals), 0, "mms.AccessResult", HFILL }}, { &hf_mms_listOfData, @@ -8316,11 +8316,11 @@ void proto_register_mms(void) { FT_UINT32, BASE_DEC, NULL, 0, "mms.SEQUENCE_OF_Data", HFILL }}, { &hf_mms_listOfData_item, - { "listOfData", "mms.listOfData_item", + { "Data", "mms.Data", FT_UINT32, BASE_DEC, VALS(mms_Data_vals), 0, "mms.Data", HFILL }}, { &hf_mms_Write_Response_item, - { "Write-Response", "mms.Write_Response_item", + { "Write-Response item", "mms.Write_Response_item", FT_UINT32, BASE_DEC, VALS(mms_Write_Response_item_vals), 0, "mms.Write_Response_item", HFILL }}, { &hf_mms_failure, @@ -8368,7 +8368,7 @@ void proto_register_mms(void) { FT_UINT32, BASE_DEC, NULL, 0, "mms.SEQUENCE_OF_ObjectName", HFILL }}, { &hf_mms_listOfName_item, - { "listOfName", "mms.listOfName_item", + { "ObjectName", "mms.ObjectName", FT_UINT32, BASE_DEC, VALS(mms_ObjectName_vals), 0, "mms.ObjectName", HFILL }}, { &hf_mms_numberMatched, @@ -8388,7 +8388,7 @@ void proto_register_mms(void) { FT_UINT32, BASE_DEC, NULL, 0, "mms.T_listOfVariable", HFILL }}, { &hf_mms_listOfVariable_item, - { "listOfVariable", "mms.listOfVariable_item", + { "listOfVariable item", "mms.listOfVariable_item", FT_NONE, BASE_NONE, NULL, 0, "mms.T_listOfVariable_item", HFILL }}, { &hf_mms_variableSpecification, @@ -8404,7 +8404,7 @@ void proto_register_mms(void) { FT_UINT32, BASE_DEC, NULL, 0, "mms.T_listOfVariable_01", HFILL }}, { &hf_mms_listOfVariable_item_01, - { "listOfVariable", "mms.listOfVariable_item", + { "listOfVariable item", "mms.listOfVariable_item", FT_NONE, BASE_NONE, NULL, 0, "mms.T_listOfVariable_item_01", HFILL }}, { &hf_mms_scopeOfDelete_01, @@ -8416,7 +8416,7 @@ void proto_register_mms(void) { FT_UINT32, BASE_DEC, NULL, 0, "mms.SEQUENCE_OF_ObjectName", HFILL }}, { &hf_mms_listOfVariableListName_item, - { "listOfVariableListName", "mms.listOfVariableListName_item", + { "ObjectName", "mms.ObjectName", FT_UINT32, BASE_DEC, VALS(mms_ObjectName_vals), 0, "mms.ObjectName", HFILL }}, { &hf_mms_scopeOfDelete_02, @@ -8428,7 +8428,7 @@ void proto_register_mms(void) { FT_UINT32, BASE_DEC, NULL, 0, "mms.SEQUENCE_OF_ObjectName", HFILL }}, { &hf_mms_listOfTypeName_item, - { "listOfTypeName", "mms.listOfTypeName_item", + { "ObjectName", "mms.ObjectName", FT_UINT32, BASE_DEC, VALS(mms_ObjectName_vals), 0, "mms.ObjectName", HFILL }}, { &hf_mms_array_01, @@ -8436,7 +8436,7 @@ void proto_register_mms(void) { FT_UINT32, BASE_DEC, NULL, 0, "mms.SEQUENCE_OF_Data", HFILL }}, { &hf_mms_array_item, - { "array", "mms.array_item", + { "Data", "mms.Data", FT_UINT32, BASE_DEC, VALS(mms_Data_vals), 0, "mms.Data", HFILL }}, { &hf_mms_structure_01, @@ -8444,7 +8444,7 @@ void proto_register_mms(void) { FT_UINT32, BASE_DEC, NULL, 0, "mms.SEQUENCE_OF_Data", HFILL }}, { &hf_mms_structure_item, - { "structure", "mms.structure_item", + { "Data", "mms.Data", FT_UINT32, BASE_DEC, VALS(mms_Data_vals), 0, "mms.Data", HFILL }}, { &hf_mms_boolean_01, @@ -8492,11 +8492,11 @@ void proto_register_mms(void) { FT_UINT32, BASE_DEC, NULL, 0, "mms.T_listOfVariable_02", HFILL }}, { &hf_mms_listOfVariable_item_02, - { "listOfVariable", "mms.listOfVariable_item", + { "listOfVariable item", "mms.listOfVariable_item", FT_NONE, BASE_NONE, NULL, 0, "mms.T_listOfVariable_item_02", HFILL }}, { &hf_mms_ScatteredAccessDescription_item, - { "ScatteredAccessDescription", "mms.ScatteredAccessDescription_item", + { "ScatteredAccessDescription item", "mms.ScatteredAccessDescription_item", FT_NONE, BASE_NONE, NULL, 0, "mms.ScatteredAccessDescription_item", HFILL }}, { &hf_mms_variableDescription, @@ -8584,7 +8584,7 @@ void proto_register_mms(void) { FT_UINT32, BASE_DEC, NULL, 0, "mms.T_listOfNamedTokens", HFILL }}, { &hf_mms_listOfNamedTokens_item, - { "listOfNamedTokens", "mms.listOfNamedTokens_item", + { "listOfNamedTokens item", "mms.listOfNamedTokens_item", FT_UINT32, BASE_DEC, VALS(mms_T_listOfNamedTokens_item_vals), 0, "mms.T_listOfNamedTokens_item", HFILL }}, { &hf_mms_freeNamedToken, @@ -8612,7 +8612,7 @@ void proto_register_mms(void) { FT_UINT32, BASE_DEC, NULL, 0, "mms.SEQUENCE_OF_SemaphoreEntry", HFILL }}, { &hf_mms_listOfSemaphoreEntry_item, - { "listOfSemaphoreEntry", "mms.listOfSemaphoreEntry_item", + { "SemaphoreEntry", "mms.SemaphoreEntry", FT_NONE, BASE_NONE, NULL, 0, "mms.SemaphoreEntry", HFILL }}, { &hf_mms_entryId, @@ -8644,7 +8644,7 @@ void proto_register_mms(void) { FT_UINT32, BASE_DEC, NULL, 0, "mms.T_listOfPromptData", HFILL }}, { &hf_mms_listOfPromptData_item, - { "listOfPromptData", "mms.listOfPromptData_item", + { "listOfPromptData item", "mms.listOfPromptData_item", FT_STRING, BASE_NONE, NULL, 0, "mms.VisibleString", HFILL }}, { &hf_mms_inputTimeOut, @@ -8656,7 +8656,7 @@ void proto_register_mms(void) { FT_UINT32, BASE_DEC, NULL, 0, "mms.T_listOfOutputData", HFILL }}, { &hf_mms_listOfOutputData_item, - { "listOfOutputData", "mms.listOfOutputData_item", + { "listOfOutputData item", "mms.listOfOutputData_item", FT_STRING, BASE_NONE, NULL, 0, "mms.VisibleString", HFILL }}, { &hf_mms_eventConditionName, @@ -8692,7 +8692,7 @@ void proto_register_mms(void) { FT_UINT32, BASE_DEC, NULL, 0, "mms.SEQUENCE_OF_ObjectName", HFILL }}, { &hf_mms_specific_item, - { "specific", "mms.specific_item", + { "ObjectName", "mms.ObjectName", FT_UINT32, BASE_DEC, VALS(mms_ObjectName_vals), 0, "mms.ObjectName", HFILL }}, { &hf_mms_aa_specific_01, @@ -8776,7 +8776,7 @@ void proto_register_mms(void) { FT_UINT32, BASE_DEC, NULL, 0, "mms.SEQUENCE_OF_ObjectName", HFILL }}, { &hf_mms_eventEnrollmentNames_item, - { "eventEnrollmentNames", "mms.eventEnrollmentNames_item", + { "ObjectName", "mms.ObjectName", FT_UINT32, BASE_DEC, VALS(mms_ObjectName_vals), 0, "mms.ObjectName", HFILL }}, { &hf_mms_continueAfter_02, @@ -8816,7 +8816,7 @@ void proto_register_mms(void) { FT_UINT32, BASE_DEC, NULL, 0, "mms.SEQUENCE_OF_EventEnrollment", HFILL }}, { &hf_mms_listOfEventEnrollment_item, - { "listOfEventEnrollment", "mms.listOfEventEnrollment_item", + { "EventEnrollment", "mms.EventEnrollment", FT_NONE, BASE_NONE, NULL, 0, "mms.EventEnrollment", HFILL }}, { &hf_mms_eventConditionTransitions, @@ -8884,7 +8884,7 @@ void proto_register_mms(void) { FT_UINT32, BASE_DEC, NULL, 0, "mms.SEQUENCE_OF_AlarmSummary", HFILL }}, { &hf_mms_listOfAlarmSummary_item, - { "listOfAlarmSummary", "mms.listOfAlarmSummary_item", + { "AlarmSummary", "mms.AlarmSummary", FT_NONE, BASE_NONE, NULL, 0, "mms.AlarmSummary", HFILL }}, { &hf_mms_unacknowledgedState, @@ -8904,7 +8904,7 @@ void proto_register_mms(void) { FT_UINT32, BASE_DEC, NULL, 0, "mms.SEQUENCE_OF_AlarmEnrollmentSummary", HFILL }}, { &hf_mms_listOfAlarmEnrollmentSummary_item, - { "listOfAlarmEnrollmentSummary", "mms.listOfAlarmEnrollmentSummary_item", + { "AlarmEnrollmentSummary", "mms.AlarmEnrollmentSummary", FT_NONE, BASE_NONE, NULL, 0, "mms.AlarmEnrollmentSummary", HFILL }}, { &hf_mms_enrollementState, @@ -8988,7 +8988,7 @@ void proto_register_mms(void) { FT_UINT32, BASE_DEC, NULL, 0, "mms.T_listOfVariables", HFILL }}, { &hf_mms_listOfVariables_item, - { "listOfVariables", "mms.listOfVariables_item", + { "listOfVariables item", "mms.listOfVariables_item", FT_STRING, BASE_NONE, NULL, 0, "mms.VisibleString", HFILL }}, { &hf_mms_entryToStartAfter, @@ -9008,7 +9008,7 @@ void proto_register_mms(void) { FT_UINT32, BASE_DEC, NULL, 0, "mms.SEQUENCE_OF_JournalEntry", HFILL }}, { &hf_mms_listOfJournalEntry_item, - { "listOfJournalEntry", "mms.listOfJournalEntry_item", + { "JournalEntry", "mms.JournalEntry", FT_NONE, BASE_NONE, NULL, 0, "mms.JournalEntry", HFILL }}, { &hf_mms_entryIdentifier, @@ -9028,7 +9028,7 @@ void proto_register_mms(void) { FT_UINT32, BASE_DEC, NULL, 0, "mms.SEQUENCE_OF_EntryContent", HFILL }}, { &hf_mms_listOfJournalEntry_item_01, - { "listOfJournalEntry", "mms.listOfJournalEntry_item", + { "EntryContent", "mms.EntryContent", FT_NONE, BASE_NONE, NULL, 0, "mms.EntryContent", HFILL }}, { &hf_mms_limitSpecification, @@ -9072,7 +9072,7 @@ void proto_register_mms(void) { FT_UINT32, BASE_DEC, NULL, 0, "mms.T_listOfVariables_01", HFILL }}, { &hf_mms_listOfVariables_item_01, - { "listOfVariables", "mms.listOfVariables_item", + { "listOfVariables item", "mms.listOfVariables_item", FT_NONE, BASE_NONE, NULL, 0, "mms.T_listOfVariables_item", HFILL }}, { &hf_mms_variableTag, @@ -9136,7 +9136,7 @@ void proto_register_mms(void) { FT_UINT32, BASE_DEC, NULL, 0, "mms.SEQUENCE_OF_DirectoryEntry", HFILL }}, { &hf_mms_listOfDirectoryEntry_item, - { "listOfDirectoryEntry", "mms.listOfDirectoryEntry_item", + { "DirectoryEntry", "mms.DirectoryEntry", FT_NONE, BASE_NONE, NULL, 0, "mms.DirectoryEntry", HFILL }}, { &hf_mms_filename, diff --git a/epan/dissectors/packet-mms.h b/epan/dissectors/packet-mms.h index 810acccb8c..73be5f15b7 100644 --- a/epan/dissectors/packet-mms.h +++ b/epan/dissectors/packet-mms.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-mms.h */ -/* ../../tools/asn2wrs.py -b -p mms -c mms.cnf -s packet-mms-template mms.asn */ +/* ../../tools/asn2wrs.py -b -p mms -c ./mms.cnf -s ./packet-mms-template -D . mms.asn */ /* Input file: packet-mms-template.h */ diff --git a/epan/dissectors/packet-mpeg-audio.c b/epan/dissectors/packet-mpeg-audio.c index 9bac85cfa4..22fb9e51ca 100644 --- a/epan/dissectors/packet-mpeg-audio.c +++ b/epan/dissectors/packet-mpeg-audio.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-mpeg-audio.c */ -/* ../../tools/asn2wrs.py -p mpeg-audio -c mpeg-audio.cnf -s packet-mpeg-audio-template mpeg-audio.asn */ +/* ../../tools/asn2wrs.py -p mpeg-audio -c ./mpeg-audio.cnf -s ./packet-mpeg-audio-template -D . mpeg-audio.asn */ /* Input file: packet-mpeg-audio-template.c */ diff --git a/epan/dissectors/packet-mpeg-pes.c b/epan/dissectors/packet-mpeg-pes.c index 93ec9caeee..7c8d3d57eb 100644 --- a/epan/dissectors/packet-mpeg-pes.c +++ b/epan/dissectors/packet-mpeg-pes.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-mpeg-pes.c */ -/* ../../tools/asn2wrs.py -p mpeg-pes -c mpeg-pes.cnf -s packet-mpeg-pes-template mpeg-pes.asn */ +/* ../../tools/asn2wrs.py -p mpeg-pes -c ./mpeg-pes.cnf -s ./packet-mpeg-pes-template -D . mpeg-pes.asn */ /* Input file: packet-mpeg-pes-template.c */ diff --git a/epan/dissectors/packet-nbap.c b/epan/dissectors/packet-nbap.c index f28d0c0bd4..f445a7b60a 100644 --- a/epan/dissectors/packet-nbap.c +++ b/epan/dissectors/packet-nbap.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-nbap.c */ -/* ../../tools/asn2wrs.py -p nbap -c nbap.cnf -s packet-nbap-template NBAP-CommonDataTypes.asn NBAP-Constants.asn NBAP-Containers.asn NBAP-IEs.asn NBAP-PDU-Contents.asn NBAP-PDU-Descriptions.asn */ +/* ../../tools/asn2wrs.py -p nbap -c ./nbap.cnf -s ./packet-nbap-template -D . NBAP-CommonDataTypes.asn NBAP-Constants.asn NBAP-Containers.asn NBAP-IEs.asn NBAP-PDU-Contents.asn NBAP-PDU-Descriptions.asn */ /* Input file: packet-nbap-template.c */ @@ -51279,7 +51279,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.INTEGER_0_32767", HFILL }}, { &hf_nbap_ProtocolIE_Container_item, - { "ProtocolIE-Container", "nbap.ProtocolIE_Container_item", + { "ProtocolIE-Field", "nbap.ProtocolIE_Field", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Field", HFILL }}, { &hf_nbap_id, @@ -51295,7 +51295,7 @@ void proto_register_nbap(void) { FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Field_value", HFILL }}, { &hf_nbap_ProtocolExtensionContainer_item, - { "ProtocolExtensionContainer", "nbap.ProtocolExtensionContainer_item", + { "ProtocolExtensionField", "nbap.ProtocolExtensionField", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolExtensionField", HFILL }}, { &hf_nbap_extensionValue, @@ -51303,7 +51303,7 @@ void proto_register_nbap(void) { FT_NONE, BASE_NONE, NULL, 0, "nbap.T_extensionValue", HFILL }}, { &hf_nbap_PrivateIE_Container_item, - { "PrivateIE-Container", "nbap.PrivateIE_Container_item", + { "PrivateIE-Field", "nbap.PrivateIE_Field", FT_NONE, BASE_NONE, NULL, 0, "nbap.PrivateIE_Field", HFILL }}, { &hf_nbap_id_01, @@ -51315,7 +51315,7 @@ void proto_register_nbap(void) { FT_NONE, BASE_NONE, NULL, 0, "nbap.PrivateIE_Field_value", HFILL }}, { &hf_nbap_AdditionalMeasurementValueList_item, - { "AdditionalMeasurementValueList", "nbap.AdditionalMeasurementValueList_item", + { "AdditionalMeasurementValue", "nbap.AdditionalMeasurementValue", FT_NONE, BASE_NONE, NULL, 0, "nbap.AdditionalMeasurementValue", HFILL }}, { &hf_nbap_uARFCN, @@ -51331,7 +51331,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.ProtocolExtensionContainer", HFILL }}, { &hf_nbap_AdditionalTimeSlotListLCR_item, - { "AdditionalTimeSlotListLCR", "nbap.AdditionalTimeSlotListLCR_item", + { "AdditionalTimeSlotLCR", "nbap.AdditionalTimeSlotLCR", FT_NONE, BASE_NONE, NULL, 0, "nbap.AdditionalTimeSlotLCR", HFILL }}, { &hf_nbap_timeslot_InitiatedListLCR, @@ -51347,7 +51347,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.Transmission_Gap_Pattern_Sequence_Status_List", HFILL }}, { &hf_nbap_Transmission_Gap_Pattern_Sequence_Status_List_item, - { "Transmission-Gap-Pattern-Sequence-Status-List", "nbap.Transmission_Gap_Pattern_Sequence_Status_List_item", + { "Transmission-Gap-Pattern-Sequence-Status-List item", "nbap.Transmission_Gap_Pattern_Sequence_Status_List_item", FT_NONE, BASE_NONE, NULL, 0, "nbap.Transmission_Gap_Pattern_Sequence_Status_List_item", HFILL }}, { &hf_nbap_tGPSID, @@ -51395,7 +51395,7 @@ void proto_register_nbap(void) { FT_INT32, BASE_DEC, NULL, 0, "nbap.DL_Power", HFILL }}, { &hf_nbap_Best_Cell_Portions_Value_item, - { "Best-Cell-Portions-Value", "nbap.Best_Cell_Portions_Value_item", + { "Best-Cell-Portions-Item", "nbap.Best_Cell_Portions_Item", FT_NONE, BASE_NONE, NULL, 0, "nbap.Best_Cell_Portions_Item", HFILL }}, { &hf_nbap_cellPortionID, @@ -51431,7 +51431,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, VALS(nbap_CauseMisc_vals), 0, "nbap.CauseMisc", HFILL }}, { &hf_nbap_Cell_ERNTI_Status_Information_item, - { "Cell-ERNTI-Status-Information", "nbap.Cell_ERNTI_Status_Information_item", + { "Cell-ERNTI-Status-Information-Item", "nbap.Cell_ERNTI_Status_Information_Item", FT_NONE, BASE_NONE, NULL, 0, "nbap.Cell_ERNTI_Status_Information_Item", HFILL }}, { &hf_nbap_c_ID, @@ -51443,7 +51443,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.Vacant_ERNTI", HFILL }}, { &hf_nbap_Vacant_ERNTI_item, - { "Vacant-ERNTI", "nbap.Vacant_ERNTI_item", + { "E-RNTI", "nbap.E_RNTI", FT_UINT32, BASE_DEC, NULL, 0, "nbap.E_RNTI", HFILL }}, { &hf_nbap_initialPhase_0_1048575, @@ -51463,7 +51463,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.INTEGER_0_127_", HFILL }}, { &hf_nbap_CommonChannelsCapacityConsumptionLaw_item, - { "CommonChannelsCapacityConsumptionLaw", "nbap.CommonChannelsCapacityConsumptionLaw_item", + { "CommonChannelsCapacityConsumptionLaw item", "nbap.CommonChannelsCapacityConsumptionLaw_item", FT_NONE, BASE_NONE, NULL, 0, "nbap.CommonChannelsCapacityConsumptionLaw_item", HFILL }}, { &hf_nbap_dl_Cost, @@ -51647,7 +51647,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, VALS(nbap_FDD_TPC_DownlinkStepSize_vals), 0, "nbap.FDD_TPC_DownlinkStepSize", HFILL }}, { &hf_nbap_Common_E_DCH_Resource_Combination_InfoList_item, - { "Common-E-DCH-Resource-Combination-InfoList", "nbap.Common_E_DCH_Resource_Combination_InfoList_item", + { "Common-E-DCH-Resource-Combination-InfoList-Item", "nbap.Common_E_DCH_Resource_Combination_InfoList_Item", FT_NONE, BASE_NONE, NULL, 0, "nbap.Common_E_DCH_Resource_Combination_InfoList_Item", HFILL }}, { &hf_nbap_soffset, @@ -51675,7 +51675,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.E_HICH_Signature_Sequence", HFILL }}, { &hf_nbap_Ul_common_E_DCH_MACflow_Specific_InfoList_item, - { "Ul-common-E-DCH-MACflow-Specific-InfoList", "nbap.Ul_common_E_DCH_MACflow_Specific_InfoList_item", + { "Ul-common-E-DCH-MACflow-Specific-InfoList-Item", "nbap.Ul_common_E_DCH_MACflow_Specific_InfoList_Item", FT_NONE, BASE_NONE, NULL, 0, "nbap.Ul_common_E_DCH_MACflow_Specific_InfoList_Item", HFILL }}, { &hf_nbap_ul_Common_MACFlowID, @@ -51711,7 +51711,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.Common_E_DCH_MACdFlow_Specific_InfoList", HFILL }}, { &hf_nbap_Common_E_DCH_MACdFlow_Specific_InfoList_item, - { "Common-E-DCH-MACdFlow-Specific-InfoList", "nbap.Common_E_DCH_MACdFlow_Specific_InfoList_item", + { "Common-E-DCH-MACdFlow-Specific-InfoList-Item", "nbap.Common_E_DCH_MACdFlow_Specific_InfoList_Item", FT_NONE, BASE_NONE, NULL, 0, "nbap.Common_E_DCH_MACdFlow_Specific_InfoList_Item", HFILL }}, { &hf_nbap_common_e_DCH_MACdFlow_ID, @@ -51735,7 +51735,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.Common_E_DCH_LogicalChannel_InfoList", HFILL }}, { &hf_nbap_Common_E_DCH_LogicalChannel_InfoList_item, - { "Common-E-DCH-LogicalChannel-InfoList", "nbap.Common_E_DCH_LogicalChannel_InfoList_item", + { "Common-E-DCH-LogicalChannel-InfoList-Item", "nbap.Common_E_DCH_LogicalChannel_InfoList_Item", FT_NONE, BASE_NONE, NULL, 0, "nbap.Common_E_DCH_LogicalChannel_InfoList_Item", HFILL }}, { &hf_nbap_logicalChannelId, @@ -51755,11 +51755,11 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.E_Serving_Grant_Value", HFILL }}, { &hf_nbap_Ul_common_E_DCH_MACflow_Specific_InfoResponseList_item, - { "Ul-common-E-DCH-MACflow-Specific-InfoResponseList", "nbap.Ul_common_E_DCH_MACflow_Specific_InfoResponseList_item", + { "Ul-common-E-DCH-MACflow-Specific-InfoResponseList-Item", "nbap.Ul_common_E_DCH_MACflow_Specific_InfoResponseList_Item", FT_NONE, BASE_NONE, NULL, 0, "nbap.Ul_common_E_DCH_MACflow_Specific_InfoResponseList_Item", HFILL }}, { &hf_nbap_Common_MACFlows_to_DeleteFDD_item, - { "Common-MACFlows-to-DeleteFDD", "nbap.Common_MACFlows_to_DeleteFDD_item", + { "Common-MACFlows-to-DeleteFDD-Item", "nbap.Common_MACFlows_to_DeleteFDD_Item", FT_NONE, BASE_NONE, NULL, 0, "nbap.Common_MACFlows_to_DeleteFDD_Item", HFILL }}, { &hf_nbap_common_MACFlow_ID, @@ -51767,7 +51767,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.Common_MACFlow_ID", HFILL }}, { &hf_nbap_CommonMACFlow_Specific_InfoList_item, - { "CommonMACFlow-Specific-InfoList", "nbap.CommonMACFlow_Specific_InfoList_item", + { "CommonMACFlow-Specific-InfoItem", "nbap.CommonMACFlow_Specific_InfoItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.CommonMACFlow_Specific_InfoItem", HFILL }}, { &hf_nbap_common_MACFlow_Id, @@ -51783,7 +51783,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.Common_MACFlow_PriorityQueue_Information", HFILL }}, { &hf_nbap_CommonMACFlow_Specific_InfoList_Response_item, - { "CommonMACFlow-Specific-InfoList-Response", "nbap.CommonMACFlow_Specific_InfoList_Response_item", + { "CommonMACFlow-Specific-InfoItem-Response", "nbap.CommonMACFlow_Specific_InfoItem_Response", FT_NONE, BASE_NONE, NULL, 0, "nbap.CommonMACFlow_Specific_InfoItem_Response", HFILL }}, { &hf_nbap_commonMACFlow_ID, @@ -51795,7 +51795,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.HSDSCH_Initial_Capacity_Allocation", HFILL }}, { &hf_nbap_Common_MACFlow_PriorityQueue_Information_item, - { "Common-MACFlow-PriorityQueue-Information", "nbap.Common_MACFlow_PriorityQueue_Information_item", + { "Common-MACFlow-PriorityQueue-Item", "nbap.Common_MACFlow_PriorityQueue_Item", FT_NONE, BASE_NONE, NULL, 0, "nbap.Common_MACFlow_PriorityQueue_Item", HFILL }}, { &hf_nbap_priority_Queue_Information_for_Enhanced_FACH, @@ -51891,7 +51891,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, VALS(nbap_DRX_Information_to_Modify_vals), 0, "nbap.DRX_Information_to_Modify", HFILL }}, { &hf_nbap_ContinuousPacketConnectivityHS_SCCH_less_Information_item, - { "ContinuousPacketConnectivityHS-SCCH-less-Information", "nbap.ContinuousPacketConnectivityHS_SCCH_less_Information_item", + { "ContinuousPacketConnectivityHS-SCCH-less-InformationItem", "nbap.ContinuousPacketConnectivityHS_SCCH_less_InformationItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.ContinuousPacketConnectivityHS_SCCH_less_InformationItem", HFILL }}, { &hf_nbap_transport_Block_Size_Index, @@ -51943,7 +51943,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.CriticalityDiagnostics_IE_List", HFILL }}, { &hf_nbap_CriticalityDiagnostics_IE_List_item, - { "CriticalityDiagnostics-IE-List", "nbap.CriticalityDiagnostics_IE_List_item", + { "CriticalityDiagnostics-IE-List item", "nbap.CriticalityDiagnostics_IE_List_item", FT_NONE, BASE_NONE, NULL, 0, "nbap.CriticalityDiagnostics_IE_List_item", HFILL }}, { &hf_nbap_iECriticality, @@ -52003,7 +52003,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.ControlGAP", HFILL }}, { &hf_nbap_PRXdes_base_perURAFCN_item, - { "PRXdes-base-perURAFCN", "nbap.PRXdes_base_perURAFCN_item", + { "PRXdes-base-Item", "nbap.PRXdes_base_Item", FT_NONE, BASE_NONE, NULL, 0, "nbap.PRXdes_base_Item", HFILL }}, { &hf_nbap_pRXdes_base, @@ -52011,7 +52011,7 @@ void proto_register_nbap(void) { FT_INT32, BASE_DEC, NULL, 0, "nbap.PRXdes_base", HFILL }}, { &hf_nbap_Ul_common_E_DCH_MACflow_Specific_InfoListLCR_item, - { "Ul-common-E-DCH-MACflow-Specific-InfoListLCR", "nbap.Ul_common_E_DCH_MACflow_Specific_InfoListLCR_item", + { "Ul-common-E-DCH-MACflow-Specific-InfoList-ItemLCR", "nbap.Ul_common_E_DCH_MACflow_Specific_InfoList_ItemLCR", FT_NONE, BASE_NONE, NULL, 0, "nbap.Ul_common_E_DCH_MACflow_Specific_InfoList_ItemLCR", HFILL }}, { &hf_nbap_ul_Common_MACFlowIDLCR, @@ -52023,7 +52023,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.Common_E_DCH_MACdFlow_Specific_InfoListLCR", HFILL }}, { &hf_nbap_Common_E_DCH_MACdFlow_Specific_InfoListLCR_item, - { "Common-E-DCH-MACdFlow-Specific-InfoListLCR", "nbap.Common_E_DCH_MACdFlow_Specific_InfoListLCR_item", + { "Common-E-DCH-MACdFlow-Specific-InfoList-ItemLCR", "nbap.Common_E_DCH_MACdFlow_Specific_InfoList_ItemLCR", FT_NONE, BASE_NONE, NULL, 0, "nbap.Common_E_DCH_MACdFlow_Specific_InfoList_ItemLCR", HFILL }}, { &hf_nbap_common_e_DCH_MACdFlow_ID_01, @@ -52051,7 +52051,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.Common_E_RNTI_Info_LCR", HFILL }}, { &hf_nbap_Ul_common_E_DCH_MACflow_Specific_InfoResponseListLCR_item, - { "Ul-common-E-DCH-MACflow-Specific-InfoResponseListLCR", "nbap.Ul_common_E_DCH_MACflow_Specific_InfoResponseListLCR_item", + { "Ul-common-E-DCH-MACflow-Specific-InfoResponseList-ItemLCR", "nbap.Ul_common_E_DCH_MACflow_Specific_InfoResponseList_ItemLCR", FT_NONE, BASE_NONE, NULL, 0, "nbap.Ul_common_E_DCH_MACflow_Specific_InfoResponseList_ItemLCR", HFILL }}, { &hf_nbap_ul_Common_MACFlowID_LCR, @@ -52059,7 +52059,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.Common_MACFlow_ID_LCR", HFILL }}, { &hf_nbap_Common_E_AGCH_ListLCR_item, - { "Common-E-AGCH-ListLCR", "nbap.Common_E_AGCH_ListLCR_item", + { "Common-E-AGCH-ItemLCR", "nbap.Common_E_AGCH_ItemLCR", FT_NONE, BASE_NONE, NULL, 0, "nbap.Common_E_AGCH_ItemLCR", HFILL }}, { &hf_nbap_e_AGCH_ID, @@ -52067,7 +52067,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.E_AGCH_Id", HFILL }}, { &hf_nbap_Common_E_HICH_ListLCR_item, - { "Common-E-HICH-ListLCR", "nbap.Common_E_HICH_ListLCR_item", + { "Common-E-HICH-ItemLCR", "nbap.Common_E_HICH_ItemLCR", FT_NONE, BASE_NONE, NULL, 0, "nbap.Common_E_HICH_ItemLCR", HFILL }}, { &hf_nbap_eI, @@ -52079,7 +52079,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.E_HICH_ID_LCR", HFILL }}, { &hf_nbap_Common_E_RNTI_Info_LCR_item, - { "Common-E-RNTI-Info-LCR", "nbap.Common_E_RNTI_Info_LCR_item", + { "Common-E-RNTI-Info-ItemLCR", "nbap.Common_E_RNTI_Info_ItemLCR", FT_NONE, BASE_NONE, NULL, 0, "nbap.Common_E_RNTI_Info_ItemLCR", HFILL }}, { &hf_nbap_starting_E_RNTI, @@ -52095,7 +52095,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.INTEGER_1_7", HFILL }}, { &hf_nbap_Common_MACFlows_to_DeleteLCR_item, - { "Common-MACFlows-to-DeleteLCR", "nbap.Common_MACFlows_to_DeleteLCR_item", + { "Common-MACFlows-to-DeleteLCR-Item", "nbap.Common_MACFlows_to_DeleteLCR_Item", FT_NONE, BASE_NONE, NULL, 0, "nbap.Common_MACFlows_to_DeleteLCR_Item", HFILL }}, { &hf_nbap_common_MACFlow_ID_LCR, @@ -52103,7 +52103,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.Common_MACFlow_ID_LCR", HFILL }}, { &hf_nbap_CommonMACFlow_Specific_InfoListLCR_item, - { "CommonMACFlow-Specific-InfoListLCR", "nbap.CommonMACFlow_Specific_InfoListLCR_item", + { "CommonMACFlow-Specific-InfoItemLCR", "nbap.CommonMACFlow_Specific_InfoItemLCR", FT_NONE, BASE_NONE, NULL, 0, "nbap.CommonMACFlow_Specific_InfoItemLCR", HFILL }}, { &hf_nbap_common_MACFlow_PriorityQueue_InformationLCR, @@ -52111,7 +52111,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.Common_MACFlow_PriorityQueue_Information", HFILL }}, { &hf_nbap_Common_H_RNTI_InformationLCR_item, - { "Common-H-RNTI-InformationLCR", "nbap.Common_H_RNTI_InformationLCR_item", + { "Common-H-RNTI-InfoItemLCR", "nbap.Common_H_RNTI_InfoItemLCR", FT_NONE, BASE_NONE, NULL, 0, "nbap.Common_H_RNTI_InfoItemLCR", HFILL }}, { &hf_nbap_common_H_RNTI, @@ -52131,11 +52131,11 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.N_PROTECT", HFILL }}, { &hf_nbap_CommonMACFlow_Specific_InfoList_ResponseLCR_item, - { "CommonMACFlow-Specific-InfoList-ResponseLCR", "nbap.CommonMACFlow_Specific_InfoList_ResponseLCR_item", + { "CommonMACFlow-Specific-InfoItem-ResponseLCR", "nbap.CommonMACFlow_Specific_InfoItem_ResponseLCR", FT_NONE, BASE_NONE, NULL, 0, "nbap.CommonMACFlow_Specific_InfoItem_ResponseLCR", HFILL }}, { &hf_nbap_DCH_FDD_Information_item, - { "DCH-FDD-Information", "nbap.DCH_FDD_Information_item", + { "DCH-FDD-InformationItem", "nbap.DCH_FDD_InformationItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.DCH_FDD_InformationItem", HFILL }}, { &hf_nbap_ul_FP_Mode, @@ -52155,7 +52155,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.DCH_Specific_FDD_InformationList", HFILL }}, { &hf_nbap_DCH_Specific_FDD_InformationList_item, - { "DCH-Specific-FDD-InformationList", "nbap.DCH_Specific_FDD_InformationList_item", + { "DCH-Specific-FDD-Item", "nbap.DCH_Specific_FDD_Item", FT_NONE, BASE_NONE, NULL, 0, "nbap.DCH_Specific_FDD_Item", HFILL }}, { &hf_nbap_dCH_ID, @@ -52183,11 +52183,11 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, VALS(nbap_QE_Selector_vals), 0, "nbap.QE_Selector", HFILL }}, { &hf_nbap_DCH_InformationResponse_item, - { "DCH-InformationResponse", "nbap.DCH_InformationResponse_item", + { "DCH-InformationResponseItem", "nbap.DCH_InformationResponseItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.DCH_InformationResponseItem", HFILL }}, { &hf_nbap_DCH_TDD_Information_item, - { "DCH-TDD-Information", "nbap.DCH_TDD_Information_item", + { "DCH-TDD-InformationItem", "nbap.DCH_TDD_InformationItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.DCH_TDD_InformationItem", HFILL }}, { &hf_nbap_dCH_SpecificInformationList_01, @@ -52195,7 +52195,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.DCH_Specific_TDD_InformationList", HFILL }}, { &hf_nbap_DCH_Specific_TDD_InformationList_item, - { "DCH-Specific-TDD-InformationList", "nbap.DCH_Specific_TDD_InformationList_item", + { "DCH-Specific-TDD-Item", "nbap.DCH_Specific_TDD_Item", FT_NONE, BASE_NONE, NULL, 0, "nbap.DCH_Specific_TDD_Item", HFILL }}, { &hf_nbap_ul_CCTrCH_ID, @@ -52207,7 +52207,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.CCTrCH_ID", HFILL }}, { &hf_nbap_FDD_DCHs_to_Modify_item, - { "FDD-DCHs-to-Modify", "nbap.FDD_DCHs_to_Modify_item", + { "FDD-DCHs-to-ModifyItem", "nbap.FDD_DCHs_to_ModifyItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.FDD_DCHs_to_ModifyItem", HFILL }}, { &hf_nbap_dCH_SpecificInformationList_02, @@ -52215,11 +52215,11 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.DCH_ModifySpecificInformation_FDD", HFILL }}, { &hf_nbap_DCH_ModifySpecificInformation_FDD_item, - { "DCH-ModifySpecificInformation-FDD", "nbap.DCH_ModifySpecificInformation_FDD_item", + { "DCH-ModifySpecificItem-FDD", "nbap.DCH_ModifySpecificItem_FDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.DCH_ModifySpecificItem_FDD", HFILL }}, { &hf_nbap_TDD_DCHs_to_Modify_item, - { "TDD-DCHs-to-Modify", "nbap.TDD_DCHs_to_Modify_item", + { "DCH-ModifyItem-TDD", "nbap.DCH_ModifyItem_TDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.DCH_ModifyItem_TDD", HFILL }}, { &hf_nbap_dCH_SpecificInformationList_03, @@ -52227,11 +52227,11 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.DCH_ModifySpecificInformation_TDD", HFILL }}, { &hf_nbap_DCH_ModifySpecificInformation_TDD_item, - { "DCH-ModifySpecificInformation-TDD", "nbap.DCH_ModifySpecificInformation_TDD_item", + { "DCH-ModifySpecificItem-TDD", "nbap.DCH_ModifySpecificItem_TDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.DCH_ModifySpecificItem_TDD", HFILL }}, { &hf_nbap_DedicatedChannelsCapacityConsumptionLaw_item, - { "DedicatedChannelsCapacityConsumptionLaw", "nbap.DedicatedChannelsCapacityConsumptionLaw_item", + { "DedicatedChannelsCapacityConsumptionLaw item", "nbap.DedicatedChannelsCapacityConsumptionLaw_item", FT_NONE, BASE_NONE, NULL, 0, "nbap.DedicatedChannelsCapacityConsumptionLaw_item", HFILL }}, { &hf_nbap_dl_Cost_1, @@ -52351,7 +52351,7 @@ void proto_register_nbap(void) { FT_BYTES, BASE_HEX, NULL, 0, "nbap.BIT_STRING_SIZE_8", HFILL }}, { &hf_nbap_DGANSS_Information_item, - { "DGANSS-Information", "nbap.DGANSS_Information_item", + { "DGANSS-InformationItem", "nbap.DGANSS_InformationItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.DGANSS_InformationItem", HFILL }}, { &hf_nbap_gANSS_SignalId, @@ -52367,7 +52367,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.DGANSS_SignalInformation", HFILL }}, { &hf_nbap_DGANSS_SignalInformation_item, - { "DGANSS-SignalInformation", "nbap.DGANSS_SignalInformation_item", + { "DGANSS-SignalInformationItem", "nbap.DGANSS_SignalInformationItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.DGANSS_SignalInformationItem", HFILL }}, { &hf_nbap_satId, @@ -52411,7 +52411,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, VALS(nbap_PRCDeviation_vals), 0, "nbap.PRCDeviation", HFILL }}, { &hf_nbap_DL_Timeslot_Information_item, - { "DL-Timeslot-Information", "nbap.DL_Timeslot_Information_item", + { "DL-Timeslot-InformationItem", "nbap.DL_Timeslot_InformationItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.DL_Timeslot_InformationItem", HFILL }}, { &hf_nbap_timeSlot, @@ -52431,7 +52431,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.TDD_DL_Code_Information", HFILL }}, { &hf_nbap_DL_TimeslotLCR_Information_item, - { "DL-TimeslotLCR-Information", "nbap.DL_TimeslotLCR_Information_item", + { "DL-TimeslotLCR-InformationItem", "nbap.DL_TimeslotLCR_InformationItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.DL_TimeslotLCR_InformationItem", HFILL }}, { &hf_nbap_timeSlotLCR, @@ -52447,7 +52447,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.TDD_DL_Code_LCR_Information", HFILL }}, { &hf_nbap_DL_Timeslot768_Information_item, - { "DL-Timeslot768-Information", "nbap.DL_Timeslot768_Information_item", + { "DL-Timeslot768-InformationItem", "nbap.DL_Timeslot768_InformationItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.DL_Timeslot768_InformationItem", HFILL }}, { &hf_nbap_midambleShiftAndBurstType768, @@ -52483,7 +52483,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.ScaledAdjustmentRatio", HFILL }}, { &hf_nbap_DL_ReferencePowerInformationList_item, - { "DL-ReferencePowerInformationList", "nbap.DL_ReferencePowerInformationList_item", + { "DL-ReferencePowerInformationItem", "nbap.DL_ReferencePowerInformationItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.DL_ReferencePowerInformationItem", HFILL }}, { &hf_nbap_rL_ID, @@ -52495,7 +52495,7 @@ void proto_register_nbap(void) { FT_INT32, BASE_DEC, NULL, 0, "nbap.DL_Power", HFILL }}, { &hf_nbap_DL_TimeslotISCPInfo_item, - { "DL-TimeslotISCPInfo", "nbap.DL_TimeslotISCPInfo_item", + { "DL-TimeslotISCPInfoItem", "nbap.DL_TimeslotISCPInfoItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.DL_TimeslotISCPInfoItem", HFILL }}, { &hf_nbap_dL_TimeslotISCP, @@ -52503,11 +52503,11 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.DL_TimeslotISCP", HFILL }}, { &hf_nbap_DL_TimeslotISCPInfoLCR_item, - { "DL-TimeslotISCPInfoLCR", "nbap.DL_TimeslotISCPInfoLCR_item", + { "DL-TimeslotISCPInfoItemLCR", "nbap.DL_TimeslotISCPInfoItemLCR", FT_NONE, BASE_NONE, NULL, 0, "nbap.DL_TimeslotISCPInfoItemLCR", HFILL }}, { &hf_nbap_DL_HS_PDSCH_Timeslot_Information_LCR_PSCH_ReconfRqst_item, - { "DL-HS-PDSCH-Timeslot-Information-LCR-PSCH-ReconfRqst", "nbap.DL_HS_PDSCH_Timeslot_Information_LCR_PSCH_ReconfRqst_item", + { "DL-HS-PDSCH-Timeslot-InformationItem-LCR-PSCH-ReconfRqst", "nbap.DL_HS_PDSCH_Timeslot_InformationItem_LCR_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.DL_HS_PDSCH_Timeslot_InformationItem_LCR_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_midambleShiftAndBurstType_01, @@ -52523,7 +52523,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.MaximumTransmissionPower", HFILL }}, { &hf_nbap_DL_HS_PDSCH_Codelist_LCR_PSCH_ReconfRqst_item, - { "DL-HS-PDSCH-Codelist-LCR-PSCH-ReconfRqst", "nbap.DL_HS_PDSCH_Codelist_LCR_PSCH_ReconfRqst_item", + { "TDD-ChannelisationCode", "nbap.TDD_ChannelisationCode", FT_UINT32, BASE_DEC, VALS(nbap_TDD_ChannelisationCode_vals), 0, "nbap.TDD_ChannelisationCode", HFILL }}, { &hf_nbap_uE_DRX_Cycle, @@ -52551,7 +52551,7 @@ void proto_register_nbap(void) { FT_NONE, BASE_NONE, NULL, 0, "nbap.NULL", HFILL }}, { &hf_nbap_DSCH_InformationResponse_item, - { "DSCH-InformationResponse", "nbap.DSCH_InformationResponse_item", + { "DSCH-InformationResponseItem", "nbap.DSCH_InformationResponseItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.DSCH_InformationResponseItem", HFILL }}, { &hf_nbap_dSCH_ID, @@ -52559,7 +52559,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.DSCH_ID", HFILL }}, { &hf_nbap_DSCH_TDD_Information_item, - { "DSCH-TDD-Information", "nbap.DSCH_TDD_Information_item", + { "DSCH-TDD-InformationItem", "nbap.DSCH_TDD_InformationItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.DSCH_TDD_InformationItem", HFILL }}, { &hf_nbap_cCTrCH_ID, @@ -52639,7 +52639,7 @@ void proto_register_nbap(void) { FT_NONE, BASE_NONE, NULL, 0, "nbap.NULL", HFILL }}, { &hf_nbap_E_AGCH_FDD_Code_List_item, - { "E-AGCH-FDD-Code-List", "nbap.E_AGCH_FDD_Code_List_item", + { "FDD-DL-ChannelisationCodeNumber", "nbap.FDD_DL_ChannelisationCodeNumber", FT_UINT32, BASE_DEC, NULL, 0, "nbap.FDD_DL_ChannelisationCodeNumber", HFILL }}, { &hf_nbap_e_DCH_SF_allocation, @@ -52647,7 +52647,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.E_DCH_SF_allocation", HFILL }}, { &hf_nbap_E_DCH_SF_allocation_item, - { "E-DCH-SF-allocation", "nbap.E_DCH_SF_allocation_item", + { "E-DCH-SF-allocation item", "nbap.E_DCH_SF_allocation_item", FT_NONE, BASE_NONE, NULL, 0, "nbap.E_DCH_SF_allocation_item", HFILL }}, { &hf_nbap_e_AGCH_And_E_RGCH_E_HICH_FDD_Scrambling_Code, @@ -52707,7 +52707,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.E_DCH_MACdFlow_Specific_UpdateInformation", HFILL }}, { &hf_nbap_E_DCH_MACdFlow_Specific_UpdateInformation_item, - { "E-DCH-MACdFlow-Specific-UpdateInformation", "nbap.E_DCH_MACdFlow_Specific_UpdateInformation_item", + { "E-DCH-MACdFlow-Specific-UpdateInformation-Item", "nbap.E_DCH_MACdFlow_Specific_UpdateInformation_Item", FT_NONE, BASE_NONE, NULL, 0, "nbap.E_DCH_MACdFlow_Specific_UpdateInformation_Item", HFILL }}, { &hf_nbap_e_DCH_MACdFlow_ID, @@ -52719,7 +52719,7 @@ void proto_register_nbap(void) { FT_BYTES, BASE_HEX, NULL, 0, "nbap.HARQ_Process_Allocation_2ms_EDCH", HFILL }}, { &hf_nbap_E_DCH_DL_Control_Channel_Change_Information_item, - { "E-DCH-DL-Control-Channel-Change-Information", "nbap.E_DCH_DL_Control_Channel_Change_Information_item", + { "E-DCH-DL-Control-Channel-Change-Information-Item", "nbap.E_DCH_DL_Control_Channel_Change_Information_Item", FT_NONE, BASE_NONE, NULL, 0, "nbap.E_DCH_DL_Control_Channel_Change_Information_Item", HFILL }}, { &hf_nbap_e_DCH_RL_ID, @@ -52727,7 +52727,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.RL_ID", HFILL }}, { &hf_nbap_E_DCH_DL_Control_Channel_Grant_Information_item, - { "E-DCH-DL-Control-Channel-Grant-Information", "nbap.E_DCH_DL_Control_Channel_Grant_Information_item", + { "E-DCH-DL-Control-Channel-Grant-Information-Item", "nbap.E_DCH_DL_Control_Channel_Grant_Information_Item", FT_NONE, BASE_NONE, NULL, 0, "nbap.E_DCH_DL_Control_Channel_Grant_Information_Item", HFILL }}, { &hf_nbap_e_DCH_Non_Scheduled_Transmission_Grant, @@ -52739,7 +52739,7 @@ void proto_register_nbap(void) { FT_NONE, BASE_NONE, NULL, 0, "nbap.NULL", HFILL }}, { &hf_nbap_E_DCH_LogicalChannelInformation_item, - { "E-DCH-LogicalChannelInformation", "nbap.E_DCH_LogicalChannelInformation_item", + { "E-DCH-LogicalChannelInformationItem", "nbap.E_DCH_LogicalChannelInformationItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.E_DCH_LogicalChannelInformationItem", HFILL }}, { &hf_nbap_schedulingPriorityIndicator, @@ -52763,7 +52763,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.E_DCH_MACdPDU_SizeList", HFILL }}, { &hf_nbap_E_DCH_MACdPDU_SizeList_item, - { "E-DCH-MACdPDU-SizeList", "nbap.E_DCH_MACdPDU_SizeList_item", + { "E-DCH-MACdPDU-SizeListItem", "nbap.E_DCH_MACdPDU_SizeListItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.E_DCH_MACdPDU_SizeListItem", HFILL }}, { &hf_nbap_mACdPDU_Size, @@ -52771,7 +52771,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.MACdPDU_Size", HFILL }}, { &hf_nbap_E_DCH_LogicalChannelToModify_item, - { "E-DCH-LogicalChannelToModify", "nbap.E_DCH_LogicalChannelToModify_item", + { "E-DCH-LogicalChannelToModifyItem", "nbap.E_DCH_LogicalChannelToModifyItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.E_DCH_LogicalChannelToModifyItem", HFILL }}, { &hf_nbap_mACd_PDU_Size_List_01, @@ -52779,11 +52779,11 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.E_DCH_MACdPDU_SizeToModifyList", HFILL }}, { &hf_nbap_E_DCH_MACdPDU_SizeToModifyList_item, - { "E-DCH-MACdPDU-SizeToModifyList", "nbap.E_DCH_MACdPDU_SizeToModifyList_item", + { "E-DCH-MACdPDU-SizeListItem", "nbap.E_DCH_MACdPDU_SizeListItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.E_DCH_MACdPDU_SizeListItem", HFILL }}, { &hf_nbap_E_DCH_LogicalChannelToDelete_item, - { "E-DCH-LogicalChannelToDelete", "nbap.E_DCH_LogicalChannelToDelete_item", + { "E-DCH-LogicalChannelToDeleteItem", "nbap.E_DCH_LogicalChannelToDeleteItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.E_DCH_LogicalChannelToDeleteItem", HFILL }}, { &hf_nbap_e_DCH_MACdFlow_Specific_Info, @@ -52791,7 +52791,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.E_DCH_MACdFlow_Specific_InfoList", HFILL }}, { &hf_nbap_E_DCH_MACdFlow_Specific_InfoList_item, - { "E-DCH-MACdFlow-Specific-InfoList", "nbap.E_DCH_MACdFlow_Specific_InfoList_item", + { "E-DCH-MACdFlow-Specific-InfoItem", "nbap.E_DCH_MACdFlow_Specific_InfoItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.E_DCH_MACdFlow_Specific_InfoItem", HFILL }}, { &hf_nbap_eDCH_Grant_Type_Information, @@ -52803,11 +52803,11 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.E_DCH_LogicalChannelInformation", HFILL }}, { &hf_nbap_E_DCH_MACdFlow_Specific_InformationResp_item, - { "E-DCH-MACdFlow-Specific-InformationResp", "nbap.E_DCH_MACdFlow_Specific_InformationResp_item", + { "E-DCH-MACdFlow-Specific-InformationResp-Item", "nbap.E_DCH_MACdFlow_Specific_InformationResp_Item", FT_NONE, BASE_NONE, NULL, 0, "nbap.E_DCH_MACdFlow_Specific_InformationResp_Item", HFILL }}, { &hf_nbap_E_DCH_MACdFlow_Specific_InfoList_to_Modify_item, - { "E-DCH-MACdFlow-Specific-InfoList-to-Modify", "nbap.E_DCH_MACdFlow_Specific_InfoList_to_Modify_item", + { "E-DCH-MACdFlow-Specific-InfoItem-to-Modify", "nbap.E_DCH_MACdFlow_Specific_InfoItem_to_Modify", FT_NONE, BASE_NONE, NULL, 0, "nbap.E_DCH_MACdFlow_Specific_InfoItem_to_Modify", HFILL }}, { &hf_nbap_eDCH_LogicalChannelToAdd, @@ -52823,7 +52823,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.E_DCH_LogicalChannelToDelete", HFILL }}, { &hf_nbap_E_DCH_MACdFlows_to_Delete_item, - { "E-DCH-MACdFlows-to-Delete", "nbap.E_DCH_MACdFlows_to_Delete_item", + { "E-DCH-MACdFlow-to-Delete-Item", "nbap.E_DCH_MACdFlow_to_Delete_Item", FT_NONE, BASE_NONE, NULL, 0, "nbap.E_DCH_MACdFlow_to_Delete_Item", HFILL }}, { &hf_nbap_maxBits_MACe_PDU_non_scheduled, @@ -52851,7 +52851,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.E_DCH_RL_InformationList_Rsp", HFILL }}, { &hf_nbap_E_DCH_RL_InformationList_Rsp_item, - { "E-DCH-RL-InformationList-Rsp", "nbap.E_DCH_RL_InformationList_Rsp_item", + { "E-DCH-RL-InformationList-Rsp-Item", "nbap.E_DCH_RL_InformationList_Rsp_Item", FT_NONE, BASE_NONE, NULL, 0, "nbap.E_DCH_RL_InformationList_Rsp_Item", HFILL }}, { &hf_nbap_rl_ID, @@ -52867,7 +52867,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, VALS(nbap_Cause_vals), 0, "nbap.Cause", HFILL }}, { &hf_nbap_EDCH_RACH_Report_Value_item, - { "EDCH-RACH-Report-Value", "nbap.EDCH_RACH_Report_Value_item", + { "EDCH-RACH-Report-Value item", "nbap.EDCH_RACH_Report_Value_item", FT_NONE, BASE_NONE, NULL, 0, "nbap.EDCH_RACH_Report_Value_item", HFILL }}, { &hf_nbap_granted_EDCH_RACH_resources, @@ -52895,7 +52895,7 @@ void proto_register_nbap(void) { FT_NONE, BASE_NONE, NULL, 0, "nbap.DTX_Cycle_10ms_to_Modify_Items", HFILL }}, { &hf_nbap_E_DCH_MACdFlows_to_DeleteLCR_item, - { "E-DCH-MACdFlows-to-DeleteLCR", "nbap.E_DCH_MACdFlows_to_DeleteLCR_item", + { "E-DCH-MACdFlow-to-Delete-ItemLCR", "nbap.E_DCH_MACdFlow_to_Delete_ItemLCR", FT_NONE, BASE_NONE, NULL, 0, "nbap.E_DCH_MACdFlow_to_Delete_ItemLCR", HFILL }}, { &hf_nbap_e_DCH_MACdFlow_ID_LCR, @@ -52919,7 +52919,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.E_RGCH_E_HICH_FDD_Code_List", HFILL }}, { &hf_nbap_E_RGCH_E_HICH_FDD_Code_List_item, - { "E-RGCH-E-HICH-FDD-Code-List", "nbap.E_RGCH_E_HICH_FDD_Code_List_item", + { "FDD-DL-ChannelisationCodeNumber", "nbap.FDD_DL_ChannelisationCodeNumber", FT_UINT32, BASE_DEC, NULL, 0, "nbap.FDD_DL_ChannelisationCodeNumber", HFILL }}, { &hf_nbap_e_TFCI_BetaEC_Boost, @@ -52943,7 +52943,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.Reference_E_TFCI_Information", HFILL }}, { &hf_nbap_E_DCHProvidedBitRate_item, - { "E-DCHProvidedBitRate", "nbap.E_DCHProvidedBitRate_item", + { "E-DCHProvidedBitRate-Item", "nbap.E_DCHProvidedBitRate_Item", FT_NONE, BASE_NONE, NULL, 0, "nbap.E_DCHProvidedBitRate_Item", HFILL }}, { &hf_nbap_e_DCHProvidedBitRateValue, @@ -52979,11 +52979,11 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.E_DCH_sixteenQAM_RefBetaInfo", HFILL }}, { &hf_nbap_E_DCH_QPSK_RefBetaInfo_item, - { "E-DCH-QPSK-RefBetaInfo", "nbap.E_DCH_QPSK_RefBetaInfo_item", + { "E-DCH-RefBeta-Item", "nbap.E_DCH_RefBeta_Item", FT_NONE, BASE_NONE, NULL, 0, "nbap.E_DCH_RefBeta_Item", HFILL }}, { &hf_nbap_E_DCH_sixteenQAM_RefBetaInfo_item, - { "E-DCH-sixteenQAM-RefBetaInfo", "nbap.E_DCH_sixteenQAM_RefBetaInfo_item", + { "E-DCH-RefBeta-Item", "nbap.E_DCH_RefBeta_Item", FT_NONE, BASE_NONE, NULL, 0, "nbap.E_DCH_RefBeta_Item", HFILL }}, { &hf_nbap_refCodeRate, @@ -52995,7 +52995,7 @@ void proto_register_nbap(void) { FT_INT32, BASE_DEC, NULL, 0, "nbap.RefBeta", HFILL }}, { &hf_nbap_E_DCH_MACdFlows_Information_TDD_item, - { "E-DCH-MACdFlows-Information-TDD", "nbap.E_DCH_MACdFlows_Information_TDD_item", + { "E-DCH-MACdFlow-InfoTDDItem", "nbap.E_DCH_MACdFlow_InfoTDDItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.E_DCH_MACdFlow_InfoTDDItem", HFILL }}, { &hf_nbap_eDCH_Grant_TypeTDD, @@ -53047,7 +53047,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.Scheduled_E_HICH_Specific_Information_ResponseLCRTDD", HFILL }}, { &hf_nbap_Scheduled_E_HICH_Specific_Information_ResponseLCRTDD_item, - { "Scheduled-E-HICH-Specific-Information-ResponseLCRTDD", "nbap.Scheduled_E_HICH_Specific_Information_ResponseLCRTDD_item", + { "Scheduled-E-HICH-Specific-InformationItem-ResponseLCRTDD", "nbap.Scheduled_E_HICH_Specific_InformationItem_ResponseLCRTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.Scheduled_E_HICH_Specific_InformationItem_ResponseLCRTDD", HFILL }}, { &hf_nbap_e_HICH_ID_TDD, @@ -53055,7 +53055,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.E_HICH_ID_TDD", HFILL }}, { &hf_nbap_E_DCH_TDD_MACdFlow_Specific_InformationResp_item, - { "E-DCH-TDD-MACdFlow-Specific-InformationResp", "nbap.E_DCH_TDD_MACdFlow_Specific_InformationResp_item", + { "E-DCH-TDD-MACdFlow-Specific-InformationResp-Item", "nbap.E_DCH_TDD_MACdFlow_Specific_InformationResp_Item", FT_NONE, BASE_NONE, NULL, 0, "nbap.E_DCH_TDD_MACdFlow_Specific_InformationResp_Item", HFILL }}, { &hf_nbap_e_DCH_MacdFlow_Id, @@ -53063,7 +53063,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.E_DCH_MACdFlow_ID", HFILL }}, { &hf_nbap_E_AGCH_Specific_InformationRespListTDD_item, - { "E-AGCH-Specific-InformationRespListTDD", "nbap.E_AGCH_Specific_InformationRespListTDD_item", + { "E-AGCH-Specific-InformationResp-ItemTDD", "nbap.E_AGCH_Specific_InformationResp_ItemTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.E_AGCH_Specific_InformationResp_ItemTDD", HFILL }}, { &hf_nbap_e_AGCH_Id, @@ -53087,7 +53087,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.E_DCH_TDD_Information_to_Modify_List", HFILL }}, { &hf_nbap_E_DCH_TDD_Information_to_Modify_List_item, - { "E-DCH-TDD-Information-to-Modify-List", "nbap.E_DCH_TDD_Information_to_Modify_List_item", + { "E-DCH-MACdFlow-ModifyTDDItem", "nbap.E_DCH_MACdFlow_ModifyTDDItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.E_DCH_MACdFlow_ModifyTDDItem", HFILL }}, { &hf_nbap_e_DCH_LogicalChannelToAdd, @@ -53159,7 +53159,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, VALS(nbap_DRX_Interruption_by_HS_DSCH_vals), 0, "nbap.DRX_Interruption_by_HS_DSCH", HFILL }}, { &hf_nbap_FDD_DL_CodeInformation_item, - { "FDD-DL-CodeInformation", "nbap.FDD_DL_CodeInformation_item", + { "FDD-DL-CodeInformationItem", "nbap.FDD_DL_CodeInformationItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.FDD_DL_CodeInformationItem", HFILL }}, { &hf_nbap_dl_ScramblingCode, @@ -53235,7 +53235,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.Ganss_Sat_Info_AddNavList", HFILL }}, { &hf_nbap_GANSS_Additional_Time_Models_item, - { "GANSS-Additional-Time-Models", "nbap.GANSS_Additional_Time_Models_item", + { "GANSS-Time-Model", "nbap.GANSS_Time_Model", FT_NONE, BASE_NONE, NULL, 0, "nbap.GANSS_Time_Model", HFILL }}, { &hf_nbap_utcModel1, @@ -53315,7 +53315,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.GANSS_AuxInfoGANSS_ID3", HFILL }}, { &hf_nbap_GANSS_AuxInfoGANSS_ID1_item, - { "GANSS-AuxInfoGANSS-ID1", "nbap.GANSS_AuxInfoGANSS_ID1_item", + { "GANSS-AuxInfoGANSS-ID1-element", "nbap.GANSS_AuxInfoGANSS_ID1_element", FT_NONE, BASE_NONE, NULL, 0, "nbap.GANSS_AuxInfoGANSS_ID1_element", HFILL }}, { &hf_nbap_svID, @@ -53327,7 +53327,7 @@ void proto_register_nbap(void) { FT_BYTES, BASE_HEX, NULL, 0, "nbap.BIT_STRING_SIZE_8", HFILL }}, { &hf_nbap_GANSS_AuxInfoGANSS_ID3_item, - { "GANSS-AuxInfoGANSS-ID3", "nbap.GANSS_AuxInfoGANSS_ID3_item", + { "GANSS-AuxInfoGANSS-ID3-element", "nbap.GANSS_AuxInfoGANSS_ID3_element", FT_NONE, BASE_NONE, NULL, 0, "nbap.GANSS_AuxInfoGANSS_ID3_element", HFILL }}, { &hf_nbap_channelNumber, @@ -53339,7 +53339,7 @@ void proto_register_nbap(void) { FT_BOOLEAN, 8, NULL, 0, "nbap.BOOLEAN", HFILL }}, { &hf_nbap_GANSS_Clock_Model_item, - { "GANSS-Clock-Model", "nbap.GANSS_Clock_Model_item", + { "GANSS-SatelliteClockModelItem", "nbap.GANSS_SatelliteClockModelItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.GANSS_SatelliteClockModelItem", HFILL }}, { &hf_nbap_cnavToc, @@ -53423,7 +53423,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.GANSS_DataBitAssistanceList", HFILL }}, { &hf_nbap_GANSS_DataBitAssistanceList_item, - { "GANSS-DataBitAssistanceList", "nbap.GANSS_DataBitAssistanceList_item", + { "GANSS-DataBitAssistanceItem", "nbap.GANSS_DataBitAssistanceItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.GANSS_DataBitAssistanceItem", HFILL }}, { &hf_nbap_dataBitAssistanceSgnList, @@ -53431,7 +53431,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.GANSS_DataBitAssistanceSgnList", HFILL }}, { &hf_nbap_GANSS_DataBitAssistanceSgnList_item, - { "GANSS-DataBitAssistanceSgnList", "nbap.GANSS_DataBitAssistanceSgnList_item", + { "GANSS-DataBitAssistanceSgnItem", "nbap.GANSS_DataBitAssistanceSgnItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.GANSS_DataBitAssistanceSgnItem", HFILL }}, { &hf_nbap_ganss_SignalId, @@ -53459,7 +53459,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.T_ganss_SatelliteInfo", HFILL }}, { &hf_nbap_ganss_SatelliteInfo_item, - { "ganss-SatelliteInfo", "nbap.ganss_SatelliteInfo_item", + { "ganss-SatelliteInfo item", "nbap.ganss_SatelliteInfo_item", FT_UINT32, BASE_DEC, NULL, 0, "nbap.INTEGER_0_63", HFILL }}, { &hf_nbap_b1, @@ -53503,7 +53503,7 @@ void proto_register_nbap(void) { FT_BOOLEAN, 8, NULL, 0, "nbap.BOOLEAN", HFILL }}, { &hf_nbap_GANSS_GenericDataInfoReqList_item, - { "GANSS-GenericDataInfoReqList", "nbap.GANSS_GenericDataInfoReqList_item", + { "GANSS-GenericDataInfoReqItem", "nbap.GANSS_GenericDataInfoReqItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.GANSS_GenericDataInfoReqItem", HFILL }}, { &hf_nbap_ganss_Id, @@ -53535,7 +53535,7 @@ void proto_register_nbap(void) { FT_NONE, BASE_NONE, NULL, 0, "nbap.GANSS_Data_Bit_Assistance_ReqItem", HFILL }}, { &hf_nbap_GANSS_Generic_Data_item, - { "GANSS-Generic-Data", "nbap.GANSS_Generic_Data_item", + { "GANSS-Generic-DataItem", "nbap.GANSS_Generic_DataItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.GANSS_Generic_DataItem", HFILL }}, { &hf_nbap_dganss_Correction, @@ -53967,7 +53967,7 @@ void proto_register_nbap(void) { FT_NONE, BASE_NONE, NULL, 0, "nbap.GANSS_KeplerianParametersOrb", HFILL }}, { &hf_nbap_GANSS_Real_Time_Integrity_item, - { "GANSS-Real-Time-Integrity", "nbap.GANSS_Real_Time_Integrity_item", + { "GANSS-RealTimeInformationItem", "nbap.GANSS_RealTimeInformationItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.GANSS_RealTimeInformationItem", HFILL }}, { &hf_nbap_bad_ganss_satId, @@ -54023,7 +54023,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.INTEGER_0_1_", HFILL }}, { &hf_nbap_GANSS_SatelliteInformationKP_item, - { "GANSS-SatelliteInformationKP", "nbap.GANSS_SatelliteInformationKP_item", + { "GANSS-SatelliteInformationKPItem", "nbap.GANSS_SatelliteInformationKPItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.GANSS_SatelliteInformationKPItem", HFILL }}, { &hf_nbap_ganss_e_alm, @@ -54067,7 +54067,7 @@ void proto_register_nbap(void) { FT_BYTES, BASE_HEX, NULL, 0, "nbap.BIT_STRING_SIZE_11", HFILL }}, { &hf_nbap_Ganss_Sat_Info_AddNavList_item, - { "Ganss-Sat-Info-AddNavList", "nbap.Ganss_Sat_Info_AddNavList_item", + { "Ganss-Sat-Info-AddNavList item", "nbap.Ganss_Sat_Info_AddNavList_item", FT_NONE, BASE_NONE, NULL, 0, "nbap.Ganss_Sat_Info_AddNavList_item", HFILL }}, { &hf_nbap_svHealth, @@ -54087,7 +54087,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, VALS(nbap_GANSS_AddOrbitModels_vals), 0, "nbap.GANSS_AddOrbitModels", HFILL }}, { &hf_nbap_GANSS_SAT_Info_Almanac_GLOkpList_item, - { "GANSS-SAT-Info-Almanac-GLOkpList", "nbap.GANSS_SAT_Info_Almanac_GLOkpList_item", + { "GANSS-SAT-Info-Almanac-GLOkp", "nbap.GANSS_SAT_Info_Almanac_GLOkp", FT_NONE, BASE_NONE, NULL, 0, "nbap.GANSS_SAT_Info_Almanac_GLOkp", HFILL }}, { &hf_nbap_gloAlmNA, @@ -54143,7 +54143,7 @@ void proto_register_nbap(void) { FT_BYTES, BASE_HEX, NULL, 0, "nbap.BIT_STRING_SIZE_2", HFILL }}, { &hf_nbap_GANSS_SAT_Info_Almanac_MIDIkpList_item, - { "GANSS-SAT-Info-Almanac-MIDIkpList", "nbap.GANSS_SAT_Info_Almanac_MIDIkpList_item", + { "GANSS-SAT-Info-Almanac-MIDIkp", "nbap.GANSS_SAT_Info_Almanac_MIDIkp", FT_NONE, BASE_NONE, NULL, 0, "nbap.GANSS_SAT_Info_Almanac_MIDIkp", HFILL }}, { &hf_nbap_midiAlmE, @@ -54195,7 +54195,7 @@ void proto_register_nbap(void) { FT_BYTES, BASE_HEX, NULL, 0, "nbap.BIT_STRING_SIZE_1", HFILL }}, { &hf_nbap_GANSS_SAT_Info_Almanac_NAVkpList_item, - { "GANSS-SAT-Info-Almanac-NAVkpList", "nbap.GANSS_SAT_Info_Almanac_NAVkpList_item", + { "GANSS-SAT-Info-Almanac-NAVkp", "nbap.GANSS_SAT_Info_Almanac_NAVkp", FT_NONE, BASE_NONE, NULL, 0, "nbap.GANSS_SAT_Info_Almanac_NAVkp", HFILL }}, { &hf_nbap_navAlmE, @@ -54239,7 +54239,7 @@ void proto_register_nbap(void) { FT_BYTES, BASE_HEX, NULL, 0, "nbap.BIT_STRING_SIZE_11", HFILL }}, { &hf_nbap_GANSS_SAT_Info_Almanac_REDkpList_item, - { "GANSS-SAT-Info-Almanac-REDkpList", "nbap.GANSS_SAT_Info_Almanac_REDkpList_item", + { "GANSS-SAT-Info-Almanac-REDkp", "nbap.GANSS_SAT_Info_Almanac_REDkp", FT_NONE, BASE_NONE, NULL, 0, "nbap.GANSS_SAT_Info_Almanac_REDkp", HFILL }}, { &hf_nbap_redAlmDeltaA, @@ -54267,7 +54267,7 @@ void proto_register_nbap(void) { FT_BYTES, BASE_HEX, NULL, 0, "nbap.BIT_STRING_SIZE_1", HFILL }}, { &hf_nbap_GANSS_SAT_Info_Almanac_SBASecefList_item, - { "GANSS-SAT-Info-Almanac-SBASecefList", "nbap.GANSS_SAT_Info_Almanac_SBASecefList_item", + { "GANSS-SAT-Info-Almanac-SBASecef", "nbap.GANSS_SAT_Info_Almanac_SBASecef", FT_NONE, BASE_NONE, NULL, 0, "nbap.GANSS_SAT_Info_Almanac_SBASecef", HFILL }}, { &hf_nbap_sbasAlmDataID, @@ -54307,7 +54307,7 @@ void proto_register_nbap(void) { FT_BYTES, BASE_HEX, NULL, 0, "nbap.BIT_STRING_SIZE_11", HFILL }}, { &hf_nbap_GANSS_Sat_Info_Nav_item, - { "GANSS-Sat-Info-Nav", "nbap.GANSS_Sat_Info_Nav_item", + { "GANSS-Sat-Info-Nav item", "nbap.GANSS_Sat_Info_Nav_item", FT_NONE, BASE_NONE, NULL, 0, "nbap.GANSS_Sat_Info_Nav_item", HFILL }}, { &hf_nbap_svHealth_01, @@ -54515,7 +54515,7 @@ void proto_register_nbap(void) { FT_BYTES, BASE_HEX, NULL, 0, "nbap.BIT_STRING_SIZE_8", HFILL }}, { &hf_nbap_GPS_Information_item, - { "GPS-Information", "nbap.GPS_Information_item", + { "GPS-Information-Item", "nbap.GPS_Information_Item", FT_UINT32, BASE_DEC, VALS(nbap_GPS_Information_Item_vals), 0, "nbap.GPS_Information_Item", HFILL }}, { &hf_nbap_bad_satellites, @@ -54531,7 +54531,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.SATInfo_RealTime_Integrity", HFILL }}, { &hf_nbap_GPS_NavigationModel_and_TimeRecovery_item, - { "GPS-NavigationModel-and-TimeRecovery", "nbap.GPS_NavigationModel_and_TimeRecovery_item", + { "GPS-NavandRecovery-Item", "nbap.GPS_NavandRecovery_Item", FT_NONE, BASE_NONE, NULL, 0, "nbap.GPS_NavandRecovery_Item", HFILL }}, { &hf_nbap_tx_tow_nav, @@ -54659,11 +54659,11 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.HARQ_MemoryPartitioningList", HFILL }}, { &hf_nbap_HARQ_MemoryPartitioningList_item, - { "HARQ-MemoryPartitioningList", "nbap.HARQ_MemoryPartitioningList_item", + { "HARQ-MemoryPartitioningItem", "nbap.HARQ_MemoryPartitioningItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.HARQ_MemoryPartitioningItem", HFILL }}, { &hf_nbap_HARQ_MemoryPartitioningInfoExtForMIMO_item, - { "HARQ-MemoryPartitioningInfoExtForMIMO", "nbap.HARQ_MemoryPartitioningInfoExtForMIMO_item", + { "HARQ-MemoryPartitioningItem", "nbap.HARQ_MemoryPartitioningItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.HARQ_MemoryPartitioningItem", HFILL }}, { &hf_nbap_process_Memory_Size, @@ -54671,7 +54671,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, VALS(nbap_T_process_Memory_Size_vals), 0, "nbap.T_process_Memory_Size", HFILL }}, { &hf_nbap_HS_DSCHProvidedBitRate_item, - { "HS-DSCHProvidedBitRate", "nbap.HS_DSCHProvidedBitRate_item", + { "HS-DSCHProvidedBitRate-Item", "nbap.HS_DSCHProvidedBitRate_Item", FT_NONE, BASE_NONE, NULL, 0, "nbap.HS_DSCHProvidedBitRate_Item", HFILL }}, { &hf_nbap_hS_DSCHProvidedBitRateValue, @@ -54679,7 +54679,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.HS_DSCHProvidedBitRateValue", HFILL }}, { &hf_nbap_HS_DSCHProvidedBitRateValueInformation_For_CellPortion_item, - { "HS-DSCHProvidedBitRateValueInformation-For-CellPortion", "nbap.HS_DSCHProvidedBitRateValueInformation_For_CellPortion_item", + { "HS-DSCHProvidedBitRateValueInformation-For-CellPortion-Item", "nbap.HS_DSCHProvidedBitRateValueInformation_For_CellPortion_Item", FT_NONE, BASE_NONE, NULL, 0, "nbap.HS_DSCHProvidedBitRateValueInformation_For_CellPortion_Item", HFILL }}, { &hf_nbap_hS_DSCHProvidedBitRateValue_01, @@ -54687,7 +54687,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.HS_DSCHProvidedBitRate", HFILL }}, { &hf_nbap_HS_DSCHRequiredPower_item, - { "HS-DSCHRequiredPower", "nbap.HS_DSCHRequiredPower_item", + { "HS-DSCHRequiredPower-Item", "nbap.HS_DSCHRequiredPower_Item", FT_NONE, BASE_NONE, NULL, 0, "nbap.HS_DSCHRequiredPower_Item", HFILL }}, { &hf_nbap_hS_DSCHRequiredPowerValue, @@ -54699,7 +54699,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.HS_DSCHRequiredPowerPerUEInformation", HFILL }}, { &hf_nbap_HS_DSCHRequiredPowerPerUEInformation_item, - { "HS-DSCHRequiredPowerPerUEInformation", "nbap.HS_DSCHRequiredPowerPerUEInformation_item", + { "HS-DSCHRequiredPowerPerUEInformation-Item", "nbap.HS_DSCHRequiredPowerPerUEInformation_Item", FT_NONE, BASE_NONE, NULL, 0, "nbap.HS_DSCHRequiredPowerPerUEInformation_Item", HFILL }}, { &hf_nbap_cRNC_CommunicationContextID, @@ -54711,7 +54711,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.HS_DSCHRequiredPowerPerUEWeight", HFILL }}, { &hf_nbap_HS_DSCHRequiredPowerValueInformation_For_CellPortion_item, - { "HS-DSCHRequiredPowerValueInformation-For-CellPortion", "nbap.HS_DSCHRequiredPowerValueInformation_For_CellPortion_item", + { "HS-DSCHRequiredPowerValueInformation-For-CellPortion-Item", "nbap.HS_DSCHRequiredPowerValueInformation_For_CellPortion_Item", FT_NONE, BASE_NONE, NULL, 0, "nbap.HS_DSCHRequiredPowerValueInformation_For_CellPortion_Item", HFILL }}, { &hf_nbap_hS_DSCHRequiredPowerValue_01, @@ -54831,7 +54831,7 @@ void proto_register_nbap(void) { FT_INT32, BASE_DEC, NULL, 0, "nbap.TDD_AckNack_Power_Offset", HFILL }}, { &hf_nbap_HSDSCH_MACdFlow_Specific_InfoList_to_Modify_item, - { "HSDSCH-MACdFlow-Specific-InfoList-to-Modify", "nbap.HSDSCH_MACdFlow_Specific_InfoList_to_Modify_item", + { "HSDSCH-MACdFlow-Specific-InfoItem-to-Modify", "nbap.HSDSCH_MACdFlow_Specific_InfoItem_to_Modify", FT_NONE, BASE_NONE, NULL, 0, "nbap.HSDSCH_MACdFlow_Specific_InfoItem_to_Modify", HFILL }}, { &hf_nbap_hsDSCH_MACdFlow_ID, @@ -54903,7 +54903,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.Transport_Block_Size_List", HFILL }}, { &hf_nbap_HSDSCH_Paging_System_Information_ResponseFDD_item, - { "HSDSCH-Paging-System-Information-ResponseFDD", "nbap.HSDSCH_Paging_System_Information_ResponseFDD_item", + { "HSDSCH-Paging-System-Information-ResponseList", "nbap.HSDSCH_Paging_System_Information_ResponseList", FT_NONE, BASE_NONE, NULL, 0, "nbap.HSDSCH_Paging_System_Information_ResponseList", HFILL }}, { &hf_nbap_pagingMACFlow_ID, @@ -54923,7 +54923,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.HSSCCH_Specific_InformationRespListTDDLCR", HFILL }}, { &hf_nbap_HSDSCH_MACdFlow_Specific_InformationResp_item, - { "HSDSCH-MACdFlow-Specific-InformationResp", "nbap.HSDSCH_MACdFlow_Specific_InformationResp_item", + { "HSDSCH-MACdFlow-Specific-InformationResp-Item", "nbap.HSDSCH_MACdFlow_Specific_InformationResp_Item", FT_NONE, BASE_NONE, NULL, 0, "nbap.HSDSCH_MACdFlow_Specific_InformationResp_Item", HFILL }}, { &hf_nbap_hsDSCHMacdFlow_Id, @@ -54939,15 +54939,15 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.PriorityQueue_InfoList", HFILL }}, { &hf_nbap_HSDSCH_MACdFlow_Specific_InfoList_item, - { "HSDSCH-MACdFlow-Specific-InfoList", "nbap.HSDSCH_MACdFlow_Specific_InfoList_item", + { "HSDSCH-MACdFlow-Specific-InfoItem", "nbap.HSDSCH_MACdFlow_Specific_InfoItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.HSDSCH_MACdFlow_Specific_InfoItem", HFILL }}, { &hf_nbap_HSDSCH_MACdFlows_to_Delete_item, - { "HSDSCH-MACdFlows-to-Delete", "nbap.HSDSCH_MACdFlows_to_Delete_item", + { "HSDSCH-MACdFlows-to-Delete-Item", "nbap.HSDSCH_MACdFlows_to_Delete_Item", FT_NONE, BASE_NONE, NULL, 0, "nbap.HSDSCH_MACdFlows_to_Delete_Item", HFILL }}, { &hf_nbap_HSDSCH_Initial_Capacity_Allocation_item, - { "HSDSCH-Initial-Capacity-Allocation", "nbap.HSDSCH_Initial_Capacity_Allocation_item", + { "HSDSCH-Initial-Capacity-AllocationItem", "nbap.HSDSCH_Initial_Capacity_AllocationItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.HSDSCH_Initial_Capacity_AllocationItem", HFILL }}, { &hf_nbap_maximum_MACdPDU_Size, @@ -55011,7 +55011,7 @@ void proto_register_nbap(void) { FT_NONE, BASE_NONE, NULL, 0, "nbap.NULL", HFILL }}, { &hf_nbap_HS_SCCH_PreconfiguredCodes_item, - { "HS-SCCH-PreconfiguredCodes", "nbap.HS_SCCH_PreconfiguredCodes_item", + { "HS-SCCH-PreconfiguredCodesItem", "nbap.HS_SCCH_PreconfiguredCodesItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.HS_SCCH_PreconfiguredCodesItem", HFILL }}, { &hf_nbap_hS_SCCH_CodeNumber, @@ -55019,7 +55019,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.HS_SCCH_CodeNumber", HFILL }}, { &hf_nbap_HSSCCH_Specific_InformationRespListFDD_item, - { "HSSCCH-Specific-InformationRespListFDD", "nbap.HSSCCH_Specific_InformationRespListFDD_item", + { "HSSCCH-Codes", "nbap.HSSCCH_Codes", FT_NONE, BASE_NONE, NULL, 0, "nbap.HSSCCH_Codes", HFILL }}, { &hf_nbap_codeNumber, @@ -55027,7 +55027,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.INTEGER_0_127", HFILL }}, { &hf_nbap_HSSCCH_Specific_InformationRespListTDD_item, - { "HSSCCH-Specific-InformationRespListTDD", "nbap.HSSCCH_Specific_InformationRespListTDD_item", + { "HSSCCH-Specific-InformationRespItemTDD", "nbap.HSSCCH_Specific_InformationRespItemTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.HSSCCH_Specific_InformationRespItemTDD", HFILL }}, { &hf_nbap_timeslot, @@ -55043,7 +55043,7 @@ void proto_register_nbap(void) { FT_NONE, BASE_NONE, NULL, 0, "nbap.HSSICH_Info", HFILL }}, { &hf_nbap_HSSCCH_Specific_InformationRespListTDDLCR_item, - { "HSSCCH-Specific-InformationRespListTDDLCR", "nbap.HSSCCH_Specific_InformationRespListTDDLCR_item", + { "HSSCCH-Specific-InformationRespItemTDDLCR", "nbap.HSSCCH_Specific_InformationRespItemTDDLCR", FT_NONE, BASE_NONE, NULL, 0, "nbap.HSSCCH_Specific_InformationRespItemTDDLCR", HFILL }}, { &hf_nbap_timeslotLCR, @@ -55063,7 +55063,7 @@ void proto_register_nbap(void) { FT_NONE, BASE_NONE, NULL, 0, "nbap.HSSICH_InfoLCR", HFILL }}, { &hf_nbap_HSSCCH_Specific_InformationRespListTDD768_item, - { "HSSCCH-Specific-InformationRespListTDD768", "nbap.HSSCCH_Specific_InformationRespListTDD768_item", + { "HSSCCH-Specific-InformationRespItemTDD768", "nbap.HSSCCH_Specific_InformationRespItemTDD768", FT_NONE, BASE_NONE, NULL, 0, "nbap.HSSCCH_Specific_InformationRespItemTDD768", HFILL }}, { &hf_nbap_tDD_ChannelisationCode768, @@ -55103,7 +55103,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.HS_SCCH_FDD_Code_List", HFILL }}, { &hf_nbap_HS_SCCH_FDD_Code_List_item, - { "HS-SCCH-FDD-Code-List", "nbap.HS_SCCH_FDD_Code_List_item", + { "HS-SCCH-FDD-Code-Information-Item", "nbap.HS_SCCH_FDD_Code_Information_Item", FT_UINT32, BASE_DEC, NULL, 0, "nbap.HS_SCCH_FDD_Code_Information_Item", HFILL }}, { &hf_nbap_hspdsch_RL_ID, @@ -55215,7 +55215,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.INTEGER_1_3", HFILL }}, { &hf_nbap_HSDSCH_Paging_System_Information_ResponseLCR_item, - { "HSDSCH-Paging-System-Information-ResponseLCR", "nbap.HSDSCH_Paging_System_Information_ResponseLCR_item", + { "HSDSCH-Paging-System-Information-ResponseListLCR", "nbap.HSDSCH_Paging_System_Information_ResponseListLCR", FT_NONE, BASE_NONE, NULL, 0, "nbap.HSDSCH_Paging_System_Information_ResponseListLCR", HFILL }}, { &hf_nbap_dL_HS_PDSCH_Timeslot_Information_LCR_PSCH_ReconfRqst, @@ -55223,7 +55223,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.DL_HS_PDSCH_Timeslot_Information_LCR_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_HSSCCH_Specific_InformationRespListLCR_item, - { "HSSCCH-Specific-InformationRespListLCR", "nbap.HSSCCH_Specific_InformationRespListLCR_item", + { "HSSCCH-Specific-InformationRespItemLCR", "nbap.HSSCCH_Specific_InformationRespItemLCR", FT_NONE, BASE_NONE, NULL, 0, "nbap.HSSCCH_Specific_InformationRespItemLCR", HFILL }}, { &hf_nbap_hS_SCCH_ID_LCR, @@ -55343,7 +55343,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, VALS(nbap_T_maxPhysChPerTimeslot_vals), 0, "nbap.T_maxPhysChPerTimeslot", HFILL }}, { &hf_nbap_MACdPDU_Size_Indexlist_item, - { "MACdPDU-Size-Indexlist", "nbap.MACdPDU_Size_Indexlist_item", + { "MACdPDU-Size-IndexItem", "nbap.MACdPDU_Size_IndexItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.MACdPDU_Size_IndexItem", HFILL }}, { &hf_nbap_sID, @@ -55355,7 +55355,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.MACdPDU_Size", HFILL }}, { &hf_nbap_MACdPDU_Size_Indexlist_to_Modify_item, - { "MACdPDU-Size-Indexlist-to-Modify", "nbap.MACdPDU_Size_Indexlist_to_Modify_item", + { "MACdPDU-Size-IndexItem-to-Modify", "nbap.MACdPDU_Size_IndexItem_to_Modify", FT_NONE, BASE_NONE, NULL, 0, "nbap.MACdPDU_Size_IndexItem_to_Modify", HFILL }}, { &hf_nbap_maximum_TB_Size_cell_edge_users, @@ -55367,7 +55367,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.INTEGER_0_5000_", HFILL }}, { &hf_nbap_MessageStructure_item, - { "MessageStructure", "nbap.MessageStructure_item", + { "MessageStructure item", "nbap.MessageStructure_item", FT_NONE, BASE_NONE, NULL, 0, "nbap.MessageStructure_item", HFILL }}, { &hf_nbap_repetitionNumber_01, @@ -55495,7 +55495,7 @@ void proto_register_nbap(void) { FT_INT32, BASE_DEC, NULL, 0, "nbap.MBSFN_CPICH_secondary_CCPCH_power_offset", HFILL }}, { &hf_nbap_MultipleFreq_HSPDSCH_InformationList_ResponseTDDLCR_item, - { "MultipleFreq-HSPDSCH-InformationList-ResponseTDDLCR", "nbap.MultipleFreq_HSPDSCH_InformationList_ResponseTDDLCR_item", + { "MultipleFreq-HSPDSCH-InformationItem-ResponseTDDLCR", "nbap.MultipleFreq_HSPDSCH_InformationItem_ResponseTDDLCR", FT_NONE, BASE_NONE, NULL, 0, "nbap.MultipleFreq_HSPDSCH_InformationItem_ResponseTDDLCR", HFILL }}, { &hf_nbap_multi_Cell_Capability, @@ -55507,7 +55507,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.Possible_Secondary_Serving_Cell_List", HFILL }}, { &hf_nbap_NeighbouringCellMeasurementInformation_item, - { "NeighbouringCellMeasurementInformation", "nbap.NeighbouringCellMeasurementInformation_item", + { "NeighbouringCellMeasurementInformation item", "nbap.NeighbouringCellMeasurementInformation_item", FT_UINT32, BASE_DEC, VALS(nbap_NeighbouringCellMeasurementInformation_item_vals), 0, "nbap.NeighbouringCellMeasurementInformation_item", HFILL }}, { &hf_nbap_neighbouringFDDCellMeasurementInformation, @@ -55535,11 +55535,11 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.CellParameterID", HFILL }}, { &hf_nbap_NI_Information_item, - { "NI-Information", "nbap.NI_Information_item", + { "Notification-Indicator", "nbap.Notification_Indicator", FT_UINT32, BASE_DEC, NULL, 0, "nbap.Notification_Indicator", HFILL }}, { &hf_nbap_Paging_MACFlows_to_DeleteFDD_item, - { "Paging-MACFlows-to-DeleteFDD", "nbap.Paging_MACFlows_to_DeleteFDD_item", + { "Paging-MACFlows-to-DeleteFDD-Item", "nbap.Paging_MACFlows_to_DeleteFDD_Item", FT_NONE, BASE_NONE, NULL, 0, "nbap.Paging_MACFlows_to_DeleteFDD_Item", HFILL }}, { &hf_nbap_paging_MACFlow_ID, @@ -55547,7 +55547,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.Paging_MACFlow_ID", HFILL }}, { &hf_nbap_Paging_MACFlow_Specific_Information_item, - { "Paging-MACFlow-Specific-Information", "nbap.Paging_MACFlow_Specific_Information_item", + { "Paging-MAC-Flow-Specific-Information-Item", "nbap.Paging_MAC_Flow_Specific_Information_Item", FT_NONE, BASE_NONE, NULL, 0, "nbap.Paging_MAC_Flow_Specific_Information_Item", HFILL }}, { &hf_nbap_paging_MACFlow_Id, @@ -55563,7 +55563,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.Paging_MACFlow_PriorityQueue_Information", HFILL }}, { &hf_nbap_Paging_MACFlow_PriorityQueue_Information_item, - { "Paging-MACFlow-PriorityQueue-Information", "nbap.Paging_MACFlow_PriorityQueue_Information_item", + { "Paging-MACFlow-PriorityQueue-Item", "nbap.Paging_MACFlow_PriorityQueue_Item", FT_NONE, BASE_NONE, NULL, 0, "nbap.Paging_MACFlow_PriorityQueue_Item", HFILL }}, { &hf_nbap_priority_Queue_Information_for_Enhanced_PCH, @@ -55575,7 +55575,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.PLCCHsequenceNumber", HFILL }}, { &hf_nbap_Possible_Secondary_Serving_Cell_List_item, - { "Possible-Secondary-Serving-Cell-List", "nbap.Possible_Secondary_Serving_Cell_List_item", + { "Possible-Secondary-Serving-Cell", "nbap.Possible_Secondary_Serving_Cell", FT_NONE, BASE_NONE, NULL, 0, "nbap.Possible_Secondary_Serving_Cell", HFILL }}, { &hf_nbap_local_Cell_ID, @@ -55607,7 +55607,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.MAC_PDU_SizeExtended", HFILL }}, { &hf_nbap_PriorityQueue_InfoList_item, - { "PriorityQueue-InfoList", "nbap.PriorityQueue_InfoList_item", + { "PriorityQueue-InfoItem", "nbap.PriorityQueue_InfoItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.PriorityQueue_InfoItem", HFILL }}, { &hf_nbap_priorityQueueId, @@ -55631,7 +55631,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, VALS(nbap_RLC_Mode_vals), 0, "nbap.RLC_Mode", HFILL }}, { &hf_nbap_PriorityQueue_InfoList_to_Modify_item, - { "PriorityQueue-InfoList-to-Modify", "nbap.PriorityQueue_InfoList_to_Modify_item", + { "ModifyPriorityQueue", "nbap.ModifyPriorityQueue", FT_UINT32, BASE_DEC, VALS(nbap_ModifyPriorityQueue_vals), 0, "nbap.ModifyPriorityQueue", HFILL }}, { &hf_nbap_macdPDU_Size_Index_to_Modify, @@ -55639,11 +55639,11 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.MACdPDU_Size_Indexlist_to_Modify", HFILL }}, { &hf_nbap_PriorityQueue_InfoList_to_Modify_Unsynchronised_item, - { "PriorityQueue-InfoList-to-Modify-Unsynchronised", "nbap.PriorityQueue_InfoList_to_Modify_Unsynchronised_item", + { "PriorityQueue-InfoItem-to-Modify-Unsynchronised", "nbap.PriorityQueue_InfoItem_to_Modify_Unsynchronised", FT_NONE, BASE_NONE, NULL, 0, "nbap.PriorityQueue_InfoItem_to_Modify_Unsynchronised", HFILL }}, { &hf_nbap_Paging_MACFlow_Specific_InformationLCR_item, - { "Paging-MACFlow-Specific-InformationLCR", "nbap.Paging_MACFlow_Specific_InformationLCR_item", + { "Paging-MAC-Flow-Specific-Information-ItemLCR", "nbap.Paging_MAC_Flow_Specific_Information_ItemLCR", FT_NONE, BASE_NONE, NULL, 0, "nbap.Paging_MAC_Flow_Specific_Information_ItemLCR", HFILL }}, { &hf_nbap_hSDPA_associated_PICH_InfoLCR, @@ -55655,11 +55655,11 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.Paging_MACFlow_PriorityQueue_Information", HFILL }}, { &hf_nbap_Paging_MACFlows_to_DeleteLCR_item, - { "Paging-MACFlows-to-DeleteLCR", "nbap.Paging_MACFlows_to_DeleteLCR_item", + { "Paging-MACFlows-to-DeleteLCR-Item", "nbap.Paging_MACFlows_to_DeleteLCR_Item", FT_NONE, BASE_NONE, NULL, 0, "nbap.Paging_MACFlows_to_DeleteLCR_Item", HFILL }}, { &hf_nbap_RL_Specific_DCH_Info_item, - { "RL-Specific-DCH-Info", "nbap.RL_Specific_DCH_Info_item", + { "RL-Specific-DCH-Info-Item", "nbap.RL_Specific_DCH_Info_Item", FT_NONE, BASE_NONE, NULL, 0, "nbap.RL_Specific_DCH_Info_Item", HFILL }}, { &hf_nbap_dCH_id, @@ -55687,11 +55687,11 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.E_HICH_PowerOffset", HFILL }}, { &hf_nbap_RL_Specific_E_DCH_Information_item, - { "RL-Specific-E-DCH-Information", "nbap.RL_Specific_E_DCH_Information_item", + { "RL-Specific-E-DCH-Information-Item", "nbap.RL_Specific_E_DCH_Information_Item", FT_NONE, BASE_NONE, NULL, 0, "nbap.RL_Specific_E_DCH_Information_Item", HFILL }}, { &hf_nbap_Reference_E_TFCI_Information_item, - { "Reference-E-TFCI-Information", "nbap.Reference_E_TFCI_Information_item", + { "Reference-E-TFCI-Information-Item", "nbap.Reference_E_TFCI_Information_Item", FT_NONE, BASE_NONE, NULL, 0, "nbap.Reference_E_TFCI_Information_Item", HFILL }}, { &hf_nbap_reference_E_TFCI, @@ -55839,7 +55839,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.ReportPeriodicity_Scaledmsec", HFILL }}, { &hf_nbap_Received_total_wide_band_power_For_CellPortion_Value_item, - { "Received-total-wide-band-power-For-CellPortion-Value", "nbap.Received_total_wide_band_power_For_CellPortion_Value_item", + { "Received-total-wide-band-power-For-CellPortion-Value-Item", "nbap.Received_total_wide_band_power_For_CellPortion_Value_Item", FT_NONE, BASE_NONE, NULL, 0, "nbap.Received_total_wide_band_power_For_CellPortion_Value_Item", HFILL }}, { &hf_nbap_received_total_wide_band_power_value, @@ -55847,7 +55847,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.Received_total_wide_band_power_Value", HFILL }}, { &hf_nbap_Received_Scheduled_EDCH_Power_Share_For_CellPortion_Value_item, - { "Received-Scheduled-EDCH-Power-Share-For-CellPortion-Value", "nbap.Received_Scheduled_EDCH_Power_Share_For_CellPortion_Value_item", + { "Received-Scheduled-EDCH-Power-Share-For-CellPortion-Value-Item", "nbap.Received_Scheduled_EDCH_Power_Share_For_CellPortion_Value_Item", FT_NONE, BASE_NONE, NULL, 0, "nbap.Received_Scheduled_EDCH_Power_Share_For_CellPortion_Value_Item", HFILL }}, { &hf_nbap_received_Scheduled_power_share_value, @@ -55895,7 +55895,7 @@ void proto_register_nbap(void) { FT_NONE, BASE_NONE, NULL, 0, "nbap.GPS_RX_POS", HFILL }}, { &hf_nbap_SAT_Info_Almanac_item, - { "SAT-Info-Almanac", "nbap.SAT_Info_Almanac_item", + { "SAT-Info-Almanac-Item", "nbap.SAT_Info_Almanac_Item", FT_NONE, BASE_NONE, NULL, 0, "nbap.SAT_Info_Almanac_Item", HFILL }}, { &hf_nbap_data_id, @@ -55951,11 +55951,11 @@ void proto_register_nbap(void) { FT_BYTES, BASE_HEX, NULL, 0, "nbap.BIT_STRING_SIZE_11", HFILL }}, { &hf_nbap_SAT_Info_Almanac_ExtList_item, - { "SAT-Info-Almanac-ExtList", "nbap.SAT_Info_Almanac_ExtList_item", + { "SAT-Info-Almanac-ExtItem", "nbap.SAT_Info_Almanac_ExtItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.SAT_Info_Almanac_ExtItem", HFILL }}, { &hf_nbap_SAT_Info_DGPSCorrections_item, - { "SAT-Info-DGPSCorrections", "nbap.SAT_Info_DGPSCorrections_item", + { "SAT-Info-DGPSCorrections-Item", "nbap.SAT_Info_DGPSCorrections_Item", FT_NONE, BASE_NONE, NULL, 0, "nbap.SAT_Info_DGPSCorrections_Item", HFILL }}, { &hf_nbap_iode_dgps, @@ -55971,7 +55971,7 @@ void proto_register_nbap(void) { FT_INT32, BASE_DEC, NULL, 0, "nbap.Range_Correction_Rate", HFILL }}, { &hf_nbap_SATInfo_RealTime_Integrity_item, - { "SATInfo-RealTime-Integrity", "nbap.SATInfo_RealTime_Integrity_item", + { "SAT-Info-RealTime-Integrity-Item", "nbap.SAT_Info_RealTime_Integrity_Item", FT_NONE, BASE_NONE, NULL, 0, "nbap.SAT_Info_RealTime_Integrity_Item", HFILL }}, { &hf_nbap_bad_sat_id, @@ -55979,7 +55979,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.SAT_ID", HFILL }}, { &hf_nbap_SecondaryServingCells_item, - { "SecondaryServingCells", "nbap.SecondaryServingCells_item", + { "SecondaryServingCellsItem", "nbap.SecondaryServingCellsItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.SecondaryServingCellsItem", HFILL }}, { &hf_nbap_secondaryC_ID, @@ -56007,7 +56007,7 @@ void proto_register_nbap(void) { FT_NONE, BASE_NONE, NULL, 0, "nbap.NULL", HFILL }}, { &hf_nbap_SetsOfHS_SCCH_Codes_item, - { "SetsOfHS-SCCH-Codes", "nbap.SetsOfHS_SCCH_Codes_item", + { "SetsOfHS-SCCH-CodesItem", "nbap.SetsOfHS_SCCH_CodesItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.SetsOfHS_SCCH_CodesItem", HFILL }}, { &hf_nbap_hS_SCCH_PreconfiguredCodes, @@ -56027,7 +56027,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.T_successfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation", HFILL }}, { &hf_nbap_successfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation_item, - { "successfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation", "nbap.successfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation_item", + { "successfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation item", "nbap.successfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation_item", FT_NONE, BASE_NONE, NULL, 0, "nbap.T_successfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation_item", HFILL }}, { &hf_nbap_sFNSFNValue, @@ -56055,7 +56055,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.T_unsuccessfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation", HFILL }}, { &hf_nbap_unsuccessfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation_item, - { "unsuccessfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation", "nbap.unsuccessfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation_item", + { "unsuccessfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation item", "nbap.unsuccessfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation_item", FT_NONE, BASE_NONE, NULL, 0, "nbap.T_unsuccessfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation_item", HFILL }}, { &hf_nbap_sFNSFNTimeStamp_FDD, @@ -56091,7 +56091,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.SynchronisationReportCharactThreExc", HFILL }}, { &hf_nbap_SynchronisationReportCharactThreExc_item, - { "SynchronisationReportCharactThreExc", "nbap.SynchronisationReportCharactThreExc_item", + { "SynchronisationReportCharactThreInfoItem", "nbap.SynchronisationReportCharactThreInfoItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.SynchronisationReportCharactThreInfoItem", HFILL }}, { &hf_nbap_syncFrameNumber, @@ -56103,7 +56103,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.SEQUENCE_SIZE_1_maxNrOfReceptsPerSyncFrame_OF_SynchronisationReportCharactCellSyncBurstInfoItem", HFILL }}, { &hf_nbap_cellSyncBurstInformation_item, - { "cellSyncBurstInformation", "nbap.cellSyncBurstInformation_item", + { "SynchronisationReportCharactCellSyncBurstInfoItem", "nbap.SynchronisationReportCharactCellSyncBurstInfoItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.SynchronisationReportCharactCellSyncBurstInfoItem", HFILL }}, { &hf_nbap_cellSyncBurstCode, @@ -56123,7 +56123,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.CellSyncBurstTimingThreshold", HFILL }}, { &hf_nbap_SyncDLCodeIdThreInfoLCR_item, - { "SyncDLCodeIdThreInfoLCR", "nbap.SyncDLCodeIdThreInfoLCR_item", + { "SyncDLCodeIdThreInfoList", "nbap.SyncDLCodeIdThreInfoList", FT_NONE, BASE_NONE, NULL, 0, "nbap.SyncDLCodeIdThreInfoList", HFILL }}, { &hf_nbap_syncFrameNoToReceive, @@ -56135,7 +56135,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.SyncDLCodeInfoListLCR", HFILL }}, { &hf_nbap_SyncDLCodeInfoListLCR_item, - { "SyncDLCodeInfoListLCR", "nbap.SyncDLCodeInfoListLCR_item", + { "SyncDLCodeInfoItemLCR", "nbap.SyncDLCodeInfoItemLCR", FT_NONE, BASE_NONE, NULL, 0, "nbap.SyncDLCodeInfoItemLCR", HFILL }}, { &hf_nbap_syncDLCodeId, @@ -56155,7 +56155,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, VALS(nbap_Modulation_vals), 0, "nbap.Modulation", HFILL }}, { &hf_nbap_TDD_DL_Code_Information_item, - { "TDD-DL-Code-Information", "nbap.TDD_DL_Code_Information_item", + { "TDD-DL-Code-InformationItem", "nbap.TDD_DL_Code_InformationItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.TDD_DL_Code_InformationItem", HFILL }}, { &hf_nbap_dPCH_ID, @@ -56163,7 +56163,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.DPCH_ID", HFILL }}, { &hf_nbap_TDD_DL_Code_LCR_Information_item, - { "TDD-DL-Code-LCR-Information", "nbap.TDD_DL_Code_LCR_Information_item", + { "TDD-DL-Code-LCR-InformationItem", "nbap.TDD_DL_Code_LCR_InformationItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.TDD_DL_Code_LCR_InformationItem", HFILL }}, { &hf_nbap_tdd_DL_DPCH_TimeSlotFormat_LCR, @@ -56171,7 +56171,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, VALS(nbap_TDD_DL_DPCH_TimeSlotFormat_LCR_vals), 0, "nbap.TDD_DL_DPCH_TimeSlotFormat_LCR", HFILL }}, { &hf_nbap_TDD_DL_Code_768_Information_item, - { "TDD-DL-Code-768-Information", "nbap.TDD_DL_Code_768_Information_item", + { "TDD-DL-Code-768-InformationItem", "nbap.TDD_DL_Code_768_InformationItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.TDD_DL_Code_768_InformationItem", HFILL }}, { &hf_nbap_qPSK_01, @@ -56223,11 +56223,11 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.RefTFCNumber", HFILL }}, { &hf_nbap_TDD_UL_Code_Information_item, - { "TDD-UL-Code-Information", "nbap.TDD_UL_Code_Information_item", + { "TDD-UL-Code-InformationItem", "nbap.TDD_UL_Code_InformationItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.TDD_UL_Code_InformationItem", HFILL }}, { &hf_nbap_TDD_UL_Code_LCR_Information_item, - { "TDD-UL-Code-LCR-Information", "nbap.TDD_UL_Code_LCR_Information_item", + { "TDD-UL-Code-LCR-InformationItem", "nbap.TDD_UL_Code_LCR_InformationItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.TDD_UL_Code_LCR_InformationItem", HFILL }}, { &hf_nbap_tdd_UL_DPCH_TimeSlotFormat_LCR, @@ -56235,7 +56235,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, VALS(nbap_TDD_UL_DPCH_TimeSlotFormat_LCR_vals), 0, "nbap.TDD_UL_DPCH_TimeSlotFormat_LCR", HFILL }}, { &hf_nbap_TDD_UL_Code_768_Information_item, - { "TDD-UL-Code-768-Information", "nbap.TDD_UL_Code_768_Information_item", + { "TDD-UL-Code-768-InformationItem", "nbap.TDD_UL_Code_768_InformationItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.TDD_UL_Code_768_InformationItem", HFILL }}, { &hf_nbap_qPSK_02, @@ -56259,11 +56259,11 @@ void proto_register_nbap(void) { FT_NONE, BASE_NONE, NULL, 0, "nbap.NULL", HFILL }}, { &hf_nbap_TimeSlot_InitiatedListLCR_item, - { "TimeSlot-InitiatedListLCR", "nbap.TimeSlot_InitiatedListLCR_item", + { "TimeSlotLCR", "nbap.TimeSlotLCR", FT_UINT32, BASE_DEC, NULL, 0, "nbap.TimeSlotLCR", HFILL }}, { &hf_nbap_TimeSlotMeasurementValueListLCR_item, - { "TimeSlotMeasurementValueListLCR", "nbap.TimeSlotMeasurementValueListLCR_item", + { "TimeSlotMeasurementValueLCR", "nbap.TimeSlotMeasurementValueLCR", FT_NONE, BASE_NONE, NULL, 0, "nbap.TimeSlotMeasurementValueLCR", HFILL }}, { &hf_nbap_commonMeasurementValue, @@ -56283,7 +56283,7 @@ void proto_register_nbap(void) { FT_BYTES, BASE_HEX, NULL, 0, "nbap.GenericTrafficCategory", HFILL }}, { &hf_nbap_Transmission_Gap_Pattern_Sequence_Information_item, - { "Transmission-Gap-Pattern-Sequence-Information", "nbap.Transmission_Gap_Pattern_Sequence_Information_item", + { "Transmission-Gap-Pattern-Sequence-Information item", "nbap.Transmission_Gap_Pattern_Sequence_Information_item", FT_NONE, BASE_NONE, NULL, 0, "nbap.Transmission_Gap_Pattern_Sequence_Information_item", HFILL }}, { &hf_nbap_tGSN, @@ -56343,7 +56343,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.DeltaSIR", HFILL }}, { &hf_nbap_TransmittedCarrierPowerOfAllCodesNotUsedForHS_PDSCH_HS_SCCH_E_AGCH_E_RGCHOrE_HICHTransmissionCellPortionValue_item, - { "TransmittedCarrierPowerOfAllCodesNotUsedForHS-PDSCH-HS-SCCH-E-AGCH-E-RGCHOrE-HICHTransmissionCellPortionValue", "nbap.TransmittedCarrierPowerOfAllCodesNotUsedForHS_PDSCH_HS_SCCH_E_AGCH_E_RGCHOrE_HICHTransmissionCellPortionValue_item", + { "TransmittedCarrierPowerOfAllCodesNotUsedForHS-PDSCH-HS-SCCH-E-AGCH-E-RGCHOrE-HICHTransmissionCellPortionValue-Item", "nbap.TransmittedCarrierPowerOfAllCodesNotUsedForHS_PDSCH_HS_SCCH_E_AGCH_E_RGCHOrE_HICHTransmissionCellPortionValue_Item", FT_NONE, BASE_NONE, NULL, 0, "nbap.TransmittedCarrierPowerOfAllCodesNotUsedForHS_PDSCH_HS_SCCH_E_AGCH_E_RGCHOrE_HICHTransmissionCellPortionValue_Item", HFILL }}, { &hf_nbap_transmittedCarrierPowerOfAllCodesNotUsedForHSTransmissionValue, @@ -56351,7 +56351,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.TransmittedCarrierPowerOfAllCodesNotUsedForHSTransmissionValue", HFILL }}, { &hf_nbap_Transmitted_Carrier_Power_For_CellPortion_Value_item, - { "Transmitted-Carrier-Power-For-CellPortion-Value", "nbap.Transmitted_Carrier_Power_For_CellPortion_Value_item", + { "Transmitted-Carrier-Power-For-CellPortion-Value-Item", "nbap.Transmitted_Carrier_Power_For_CellPortion_Value_Item", FT_NONE, BASE_NONE, NULL, 0, "nbap.Transmitted_Carrier_Power_For_CellPortion_Value_Item", HFILL }}, { &hf_nbap_transmitted_Carrier_Power_Value, @@ -56371,7 +56371,7 @@ void proto_register_nbap(void) { FT_NONE, BASE_NONE, NULL, 0, "nbap.NULL", HFILL }}, { &hf_nbap_TFCS_TFCSList_item, - { "TFCS-TFCSList", "nbap.TFCS_TFCSList_item", + { "TFCS-TFCSList item", "nbap.TFCS_TFCSList_item", FT_NONE, BASE_NONE, NULL, 0, "nbap.TFCS_TFCSList_item", HFILL }}, { &hf_nbap_cTFC, @@ -56411,7 +56411,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.INTEGER_0_maxCTFC", HFILL }}, { &hf_nbap_Transport_Block_Size_List_item, - { "Transport-Block-Size-List", "nbap.Transport_Block_Size_List_item", + { "Transport-Block-Size-List item", "nbap.Transport_Block_Size_List_item", FT_NONE, BASE_NONE, NULL, 0, "nbap.Transport_Block_Size_List_item", HFILL }}, { &hf_nbap_transport_Block_Size_Index_for_Enhanced_PCH, @@ -56427,7 +56427,7 @@ void proto_register_nbap(void) { FT_NONE, BASE_NONE, NULL, 0, "nbap.TransportFormatSet_Semi_staticPart", HFILL }}, { &hf_nbap_TransportFormatSet_DynamicPartList_item, - { "TransportFormatSet-DynamicPartList", "nbap.TransportFormatSet_DynamicPartList_item", + { "TransportFormatSet-DynamicPartList item", "nbap.TransportFormatSet_DynamicPartList_item", FT_NONE, BASE_NONE, NULL, 0, "nbap.TransportFormatSet_DynamicPartList_item", HFILL }}, { &hf_nbap_nrOfTransportBlocks, @@ -56447,7 +56447,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.TransmissionTimeIntervalInformation", HFILL }}, { &hf_nbap_TransmissionTimeIntervalInformation_item, - { "TransmissionTimeIntervalInformation", "nbap.TransmissionTimeIntervalInformation_item", + { "TransmissionTimeIntervalInformation item", "nbap.TransmissionTimeIntervalInformation_item", FT_NONE, BASE_NONE, NULL, 0, "nbap.TransmissionTimeIntervalInformation_item", HFILL }}, { &hf_nbap_transmissionTimeInterval, @@ -56559,7 +56559,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.RNC_ID", HFILL }}, { &hf_nbap_UL_Timeslot_Information_item, - { "UL-Timeslot-Information", "nbap.UL_Timeslot_Information_item", + { "UL-Timeslot-InformationItem", "nbap.UL_Timeslot_InformationItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.UL_Timeslot_InformationItem", HFILL }}, { &hf_nbap_uL_Code_InformationList, @@ -56567,7 +56567,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.TDD_UL_Code_Information", HFILL }}, { &hf_nbap_UL_TimeslotLCR_Information_item, - { "UL-TimeslotLCR-Information", "nbap.UL_TimeslotLCR_Information_item", + { "UL-TimeslotLCR-InformationItem", "nbap.UL_TimeslotLCR_InformationItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.UL_TimeslotLCR_InformationItem", HFILL }}, { &hf_nbap_uL_Code_InformationList_01, @@ -56575,7 +56575,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.TDD_UL_Code_LCR_Information", HFILL }}, { &hf_nbap_UL_Timeslot768_Information_item, - { "UL-Timeslot768-Information", "nbap.UL_Timeslot768_Information_item", + { "UL-Timeslot768-InformationItem", "nbap.UL_Timeslot768_InformationItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.UL_Timeslot768_InformationItem", HFILL }}, { &hf_nbap_uL_Code_InformationList_02, @@ -56599,7 +56599,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.UL_Synchronisation_Frequency", HFILL }}, { &hf_nbap_UL_TimeSlot_ISCP_Info_item, - { "UL-TimeSlot-ISCP-Info", "nbap.UL_TimeSlot_ISCP_Info_item", + { "UL-TimeSlot-ISCP-InfoItem", "nbap.UL_TimeSlot_ISCP_InfoItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.UL_TimeSlot_ISCP_InfoItem", HFILL }}, { &hf_nbap_iSCP, @@ -56607,11 +56607,11 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.UL_TimeslotISCP_Value", HFILL }}, { &hf_nbap_UL_TimeSlot_ISCP_LCR_Info_item, - { "UL-TimeSlot-ISCP-LCR-Info", "nbap.UL_TimeSlot_ISCP_LCR_Info_item", + { "UL-TimeSlot-ISCP-LCR-InfoItem", "nbap.UL_TimeSlot_ISCP_LCR_InfoItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.UL_TimeSlot_ISCP_LCR_InfoItem", HFILL }}, { &hf_nbap_USCH_Information_item, - { "USCH-Information", "nbap.USCH_Information_item", + { "USCH-InformationItem", "nbap.USCH_InformationItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.USCH_InformationItem", HFILL }}, { &hf_nbap_uSCH_ID, @@ -56619,7 +56619,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.USCH_ID", HFILL }}, { &hf_nbap_USCH_InformationResponse_item, - { "USCH-InformationResponse", "nbap.USCH_InformationResponse_item", + { "USCH-InformationResponseItem", "nbap.USCH_InformationResponseItem", FT_NONE, BASE_NONE, NULL, 0, "nbap.USCH_InformationResponseItem", HFILL }}, { &hf_nbap_protocolIEs, @@ -56679,7 +56679,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.PowerOffset", HFILL }}, { &hf_nbap_FACH_ParametersListIE_CTCH_SetupRqstFDD_item, - { "FACH-ParametersListIE-CTCH-SetupRqstFDD", "nbap.FACH_ParametersListIE_CTCH_SetupRqstFDD_item", + { "FACH-ParametersItem-CTCH-SetupRqstFDD", "nbap.FACH_ParametersItem_CTCH_SetupRqstFDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.FACH_ParametersItem_CTCH_SetupRqstFDD", HFILL }}, { &hf_nbap_maxFACH_Power, @@ -56735,7 +56735,7 @@ void proto_register_nbap(void) { FT_NONE, BASE_NONE, NULL, 0, "nbap.AICH_Parameters_CTCH_SetupRqstFDD", HFILL }}, { &hf_nbap_AllowedSlotFormatInformationList_CTCH_SetupRqstFDD_item, - { "AllowedSlotFormatInformationList-CTCH-SetupRqstFDD", "nbap.AllowedSlotFormatInformationList_CTCH_SetupRqstFDD_item", + { "AllowedSlotFormatInformationItem-CTCH-SetupRqstFDD", "nbap.AllowedSlotFormatInformationItem_CTCH_SetupRqstFDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.AllowedSlotFormatInformationItem_CTCH_SetupRqstFDD", HFILL }}, { &hf_nbap_rACHSlotFormat, @@ -56779,7 +56779,7 @@ void proto_register_nbap(void) { FT_NONE, BASE_NONE, NULL, 0, "nbap.PCH_Parameters_CTCH_SetupRqstTDD", HFILL }}, { &hf_nbap_Secondary_CCPCH_parameterListIE_CTCH_SetupRqstTDD_item, - { "Secondary-CCPCH-parameterListIE-CTCH-SetupRqstTDD", "nbap.Secondary_CCPCH_parameterListIE_CTCH_SetupRqstTDD_item", + { "Secondary-CCPCH-parameterItem-CTCH-SetupRqstTDD", "nbap.Secondary_CCPCH_parameterItem_CTCH_SetupRqstTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.Secondary_CCPCH_parameterItem_CTCH_SetupRqstTDD", HFILL }}, { &hf_nbap_midambleShiftandBurstType, @@ -56791,7 +56791,7 @@ void proto_register_nbap(void) { FT_INT32, BASE_DEC, NULL, 0, "nbap.DL_Power", HFILL }}, { &hf_nbap_Secondary_CCPCH_LCR_parameterList_CTCH_SetupRqstTDD_item, - { "Secondary-CCPCH-LCR-parameterList-CTCH-SetupRqstTDD", "nbap.Secondary_CCPCH_LCR_parameterList_CTCH_SetupRqstTDD_item", + { "Secondary-CCPCH-LCR-parameterItem-CTCH-SetupRqstTDD", "nbap.Secondary_CCPCH_LCR_parameterItem_CTCH_SetupRqstTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.Secondary_CCPCH_LCR_parameterItem_CTCH_SetupRqstTDD", HFILL }}, { &hf_nbap_s_CCPCH_TimeSlotFormat_LCR, @@ -56799,7 +56799,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, VALS(nbap_TDD_DL_DPCH_TimeSlotFormat_LCR_vals), 0, "nbap.TDD_DL_DPCH_TimeSlotFormat_LCR", HFILL }}, { &hf_nbap_Secondary_CCPCH_768_parameterList_CTCH_SetupRqstTDD_item, - { "Secondary-CCPCH-768-parameterList-CTCH-SetupRqstTDD", "nbap.Secondary_CCPCH_768_parameterList_CTCH_SetupRqstTDD_item", + { "Secondary-CCPCH-768-parameterItem-CTCH-SetupRqstTDD", "nbap.Secondary_CCPCH_768_parameterItem_CTCH_SetupRqstTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.Secondary_CCPCH_768_parameterItem_CTCH_SetupRqstTDD", HFILL }}, { &hf_nbap_tFCI_Presence768, @@ -56811,7 +56811,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, VALS(nbap_MidambleShiftAndBurstType768_vals), 0, "nbap.MidambleShiftAndBurstType768", HFILL }}, { &hf_nbap_FACH_ParametersListIE_CTCH_SetupRqstTDD_item, - { "FACH-ParametersListIE-CTCH-SetupRqstTDD", "nbap.FACH_ParametersListIE_CTCH_SetupRqstTDD_item", + { "FACH-ParametersItem-CTCH-SetupRqstTDD", "nbap.FACH_ParametersItem_CTCH_SetupRqstTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.FACH_ParametersItem_CTCH_SetupRqstTDD", HFILL }}, { &hf_nbap_fACH_CCTrCH_ID, @@ -56863,7 +56863,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, VALS(nbap_MidambleShiftAndBurstType768_vals), 0, "nbap.MidambleShiftAndBurstType768", HFILL }}, { &hf_nbap_TimeSlotConfigurationList_LCR_CTCH_SetupRqstTDD_item, - { "TimeSlotConfigurationList-LCR-CTCH-SetupRqstTDD", "nbap.TimeSlotConfigurationList_LCR_CTCH_SetupRqstTDD_item", + { "TimeSlotConfigurationItem-LCR-CTCH-SetupRqstTDD", "nbap.TimeSlotConfigurationItem_LCR_CTCH_SetupRqstTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.TimeSlotConfigurationItem_LCR_CTCH_SetupRqstTDD", HFILL }}, { &hf_nbap_timeslotLCR_Parameter_ID, @@ -56871,11 +56871,11 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.CellParameterID", HFILL }}, { &hf_nbap_Secondary_CCPCH_parameterExtendedList_CTCH_SetupRqstTDD_item, - { "Secondary-CCPCH-parameterExtendedList-CTCH-SetupRqstTDD", "nbap.Secondary_CCPCH_parameterExtendedList_CTCH_SetupRqstTDD_item", + { "Secondary-CCPCH-parameterItem-CTCH-SetupRqstTDD", "nbap.Secondary_CCPCH_parameterItem_CTCH_SetupRqstTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.Secondary_CCPCH_parameterItem_CTCH_SetupRqstTDD", HFILL }}, { &hf_nbap_Secondary_CCPCH_LCR_parameterExtendedList_CTCH_SetupRqstTDD_item, - { "Secondary-CCPCH-LCR-parameterExtendedList-CTCH-SetupRqstTDD", "nbap.Secondary_CCPCH_LCR_parameterExtendedList_CTCH_SetupRqstTDD_item", + { "Secondary-CCPCH-LCR-parameterItem-CTCH-SetupRqstTDD", "nbap.Secondary_CCPCH_LCR_parameterItem_CTCH_SetupRqstTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.Secondary_CCPCH_LCR_parameterItem_CTCH_SetupRqstTDD", HFILL }}, { &hf_nbap_pRACH_Parameters_CTCH_SetupRqstTDD, @@ -56899,7 +56899,7 @@ void proto_register_nbap(void) { FT_NONE, BASE_NONE, NULL, 0, "nbap.TransportFormatSet", HFILL }}, { &hf_nbap_PRACH_LCR_ParametersList_CTCH_SetupRqstTDD_item, - { "PRACH-LCR-ParametersList-CTCH-SetupRqstTDD", "nbap.PRACH_LCR_ParametersList_CTCH_SetupRqstTDD_item", + { "PRACH-LCR-ParametersItem-CTCH-SetupRqstTDD", "nbap.PRACH_LCR_ParametersItem_CTCH_SetupRqstTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.PRACH_LCR_ParametersItem_CTCH_SetupRqstTDD", HFILL }}, { &hf_nbap_fPACH_Power, @@ -56919,7 +56919,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, VALS(nbap_PRACH_Midamble_vals), 0, "nbap.PRACH_Midamble", HFILL }}, { &hf_nbap_FACH_CommonTransportChannel_InformationResponse_item, - { "FACH-CommonTransportChannel-InformationResponse", "nbap.FACH_CommonTransportChannel_InformationResponse_item", + { "CommonTransportChannel-InformationResponse", "nbap.CommonTransportChannel_InformationResponse", FT_NONE, BASE_NONE, NULL, 0, "nbap.CommonTransportChannel_InformationResponse", HFILL }}, { &hf_nbap_secondary_CCPCH_parameters_02, @@ -56947,7 +56947,7 @@ void proto_register_nbap(void) { FT_NONE, BASE_NONE, NULL, 0, "nbap.PICH_Parameters_CTCH_ReconfRqstFDD", HFILL }}, { &hf_nbap_FACH_ParametersListIE_CTCH_ReconfRqstFDD_item, - { "FACH-ParametersListIE-CTCH-ReconfRqstFDD", "nbap.FACH_ParametersListIE_CTCH_ReconfRqstFDD_item", + { "FACH-ParametersItem-CTCH-ReconfRqstFDD", "nbap.FACH_ParametersItem_CTCH_ReconfRqstFDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.FACH_ParametersItem_CTCH_ReconfRqstFDD", HFILL }}, { &hf_nbap_pRACH_ParametersList_CTCH_ReconfRqstFDD, @@ -56959,7 +56959,7 @@ void proto_register_nbap(void) { FT_NONE, BASE_NONE, NULL, 0, "nbap.AICH_ParametersList_CTCH_ReconfRqstFDD", HFILL }}, { &hf_nbap_PRACH_ParametersListIE_CTCH_ReconfRqstFDD_item, - { "PRACH-ParametersListIE-CTCH-ReconfRqstFDD", "nbap.PRACH_ParametersListIE_CTCH_ReconfRqstFDD_item", + { "PRACH-ParametersItem-CTCH-ReconfRqstFDD", "nbap.PRACH_ParametersItem_CTCH_ReconfRqstFDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.PRACH_ParametersItem_CTCH_ReconfRqstFDD", HFILL }}, { &hf_nbap_allowedSlotFormatInformation_01, @@ -56967,7 +56967,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.AllowedSlotFormatInformationList_CTCH_ReconfRqstFDD", HFILL }}, { &hf_nbap_AllowedSlotFormatInformationList_CTCH_ReconfRqstFDD_item, - { "AllowedSlotFormatInformationList-CTCH-ReconfRqstFDD", "nbap.AllowedSlotFormatInformationList_CTCH_ReconfRqstFDD_item", + { "AllowedSlotFormatInformationItem-CTCH-ReconfRqstFDD", "nbap.AllowedSlotFormatInformationItem_CTCH_ReconfRqstFDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.AllowedSlotFormatInformationItem_CTCH_ReconfRqstFDD", HFILL }}, { &hf_nbap_rACH_SlotFormat, @@ -56975,7 +56975,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, VALS(nbap_RACH_SlotFormat_vals), 0, "nbap.RACH_SlotFormat", HFILL }}, { &hf_nbap_AICH_ParametersListIE_CTCH_ReconfRqstFDD_item, - { "AICH-ParametersListIE-CTCH-ReconfRqstFDD", "nbap.AICH_ParametersListIE_CTCH_ReconfRqstFDD_item", + { "AICH-ParametersItem-CTCH-ReconfRqstFDD", "nbap.AICH_ParametersItem_CTCH_ReconfRqstFDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.AICH_ParametersItem_CTCH_ReconfRqstFDD", HFILL }}, { &hf_nbap_secondaryCCPCHList, @@ -56983,7 +56983,7 @@ void proto_register_nbap(void) { FT_NONE, BASE_NONE, NULL, 0, "nbap.Secondary_CCPCHList_CTCH_ReconfRqstTDD", HFILL }}, { &hf_nbap_Secondary_CCPCHListIE_CTCH_ReconfRqstTDD_item, - { "Secondary-CCPCHListIE-CTCH-ReconfRqstTDD", "nbap.Secondary_CCPCHListIE_CTCH_ReconfRqstTDD_item", + { "Secondary-CCPCHItem-CTCH-ReconfRqstTDD", "nbap.Secondary_CCPCHItem_CTCH_ReconfRqstTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.Secondary_CCPCHItem_CTCH_ReconfRqstTDD", HFILL }}, { &hf_nbap_sCCPCH_Power, @@ -56991,15 +56991,15 @@ void proto_register_nbap(void) { FT_INT32, BASE_DEC, NULL, 0, "nbap.DL_Power", HFILL }}, { &hf_nbap_Secondary_CCPCH_parameterExtendedList_CTCH_ReconfRqstTDD_item, - { "Secondary-CCPCH-parameterExtendedList-CTCH-ReconfRqstTDD", "nbap.Secondary_CCPCH_parameterExtendedList_CTCH_ReconfRqstTDD_item", + { "Secondary-CCPCHItem-CTCH-ReconfRqstTDD", "nbap.Secondary_CCPCHItem_CTCH_ReconfRqstTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.Secondary_CCPCHItem_CTCH_ReconfRqstTDD", HFILL }}, { &hf_nbap_Secondary_CCPCH_LCR_parameterExtendedList_CTCH_ReconfRqstTDD_item, - { "Secondary-CCPCH-LCR-parameterExtendedList-CTCH-ReconfRqstTDD", "nbap.Secondary_CCPCH_LCR_parameterExtendedList_CTCH_ReconfRqstTDD_item", + { "Secondary-CCPCHItem-CTCH-ReconfRqstTDD", "nbap.Secondary_CCPCHItem_CTCH_ReconfRqstTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.Secondary_CCPCHItem_CTCH_ReconfRqstTDD", HFILL }}, { &hf_nbap_FACH_ParametersList_CTCH_ReconfRqstTDD_item, - { "FACH-ParametersList-CTCH-ReconfRqstTDD", "nbap.FACH_ParametersList_CTCH_ReconfRqstTDD_item", + { "FACH-ParametersItem-CTCH-ReconfRqstTDD", "nbap.FACH_ParametersItem_CTCH_ReconfRqstTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.FACH_ParametersItem_CTCH_ReconfRqstTDD", HFILL }}, { &hf_nbap_commonPhysicalChannelId, @@ -57015,7 +57015,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.Secondary_CCPCH_768_List_CTCH_ReconfRqstTDD", HFILL }}, { &hf_nbap_Secondary_CCPCH_768_List_CTCH_ReconfRqstTDD_item, - { "Secondary-CCPCH-768-List-CTCH-ReconfRqstTDD", "nbap.Secondary_CCPCH_768_List_CTCH_ReconfRqstTDD_item", + { "Secondary-CCPCH-768-Item-CTCH-ReconfRqstTDD", "nbap.Secondary_CCPCH_768_Item_CTCH_ReconfRqstTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.Secondary_CCPCH_768_Item_CTCH_ReconfRqstTDD", HFILL }}, { &hf_nbap_uPPCHPositionLCR, @@ -57023,7 +57023,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.UPPCHPositionLCR", HFILL }}, { &hf_nbap_Cell_InformationList_AuditRsp_item, - { "Cell-InformationList-AuditRsp", "nbap.Cell_InformationList_AuditRsp_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_configurationGenerationID, @@ -57103,79 +57103,79 @@ void proto_register_nbap(void) { FT_NONE, BASE_NONE, NULL, 0, "nbap.SCH_Information_AuditRsp", HFILL }}, { &hf_nbap_S_CPICH_InformationList_AuditRsp_item, - { "S-CPICH-InformationList-AuditRsp", "nbap.S_CPICH_InformationList_AuditRsp_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_S_CCPCH_InformationList_AuditRsp_item, - { "S-CCPCH-InformationList-AuditRsp", "nbap.S_CCPCH_InformationList_AuditRsp_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_FACH_InformationList_AuditRsp_item, - { "FACH-InformationList-AuditRsp", "nbap.FACH_InformationList_AuditRsp_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_PRACH_InformationList_AuditRsp_item, - { "PRACH-InformationList-AuditRsp", "nbap.PRACH_InformationList_AuditRsp_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_RACH_InformationList_AuditRsp_item, - { "RACH-InformationList-AuditRsp", "nbap.RACH_InformationList_AuditRsp_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_AICH_InformationList_AuditRsp_item, - { "AICH-InformationList-AuditRsp", "nbap.AICH_InformationList_AuditRsp_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_FPACH_LCR_InformationList_AuditRsp_item, - { "FPACH-LCR-InformationList-AuditRsp", "nbap.FPACH_LCR_InformationList_AuditRsp_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_S_CCPCH_InformationListExt_AuditRsp_item, - { "S-CCPCH-InformationListExt-AuditRsp", "nbap.S_CCPCH_InformationListExt_AuditRsp_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_S_CCPCH_LCR_InformationListExt_AuditRsp_item, - { "S-CCPCH-LCR-InformationListExt-AuditRsp", "nbap.S_CCPCH_LCR_InformationListExt_AuditRsp_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_PLCCH_InformationList_AuditRsp_item, - { "PLCCH-InformationList-AuditRsp", "nbap.PLCCH_InformationList_AuditRsp_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_S_CCPCH_768_InformationList_AuditRsp_item, - { "S-CCPCH-768-InformationList-AuditRsp", "nbap.S_CCPCH_768_InformationList_AuditRsp_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_PRACH_768_InformationList_AuditRsp_item, - { "PRACH-768-InformationList-AuditRsp", "nbap.PRACH_768_InformationList_AuditRsp_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_E_RUCCH_InformationList_AuditRsp_item, - { "E-RUCCH-InformationList-AuditRsp", "nbap.E_RUCCH_InformationList_AuditRsp_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_E_RUCCH_768_InformationList_AuditRsp_item, - { "E-RUCCH-768-InformationList-AuditRsp", "nbap.E_RUCCH_768_InformationList_AuditRsp_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_Cell_Frequency_List_Information_LCR_MulFreq_AuditRsp_item, - { "Cell-Frequency-List-Information-LCR-MulFreq-AuditRsp", "nbap.Cell_Frequency_List_Information_LCR_MulFreq_AuditRsp_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_UPPCH_LCR_InformationList_AuditRsp_item, - { "UPPCH-LCR-InformationList-AuditRsp", "nbap.UPPCH_LCR_InformationList_AuditRsp_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_MultipleFreq_HS_DSCH_Resources_InformationList_AuditRsp_item, - { "MultipleFreq-HS-DSCH-Resources-InformationList-AuditRsp", "nbap.MultipleFreq_HS_DSCH_Resources_InformationList_AuditRsp_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_MultipleFreq_E_DCH_Resources_InformationList_AuditRsp_item, - { "MultipleFreq-E-DCH-Resources-InformationList-AuditRsp", "nbap.MultipleFreq_E_DCH_Resources_InformationList_AuditRsp_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_CCP_InformationList_AuditRsp_item, - { "CCP-InformationList-AuditRsp", "nbap.CCP_InformationList_AuditRsp_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_communicationControlPortID, @@ -57183,7 +57183,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.CommunicationControlPortID", HFILL }}, { &hf_nbap_Local_Cell_InformationList_AuditRsp_item, - { "Local-Cell-InformationList-AuditRsp", "nbap.Local_Cell_InformationList_AuditRsp_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_dl_or_global_capacityCredit, @@ -57219,11 +57219,11 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.Local_Cell_ID", HFILL }}, { &hf_nbap_Local_Cell_Group_InformationList_AuditRsp_item, - { "Local-Cell-Group-InformationList-AuditRsp", "nbap.Local_Cell_Group_InformationList_AuditRsp_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_Power_Local_Cell_Group_InformationList_AuditRsp_item, - { "Power-Local-Cell-Group-InformationList-AuditRsp", "nbap.Power_Local_Cell_Group_InformationList_AuditRsp_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_power_Local_Cell_Group_ID, @@ -57307,7 +57307,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, VALS(nbap_TransmitDiversityIndicator_vals), 0, "nbap.TransmitDiversityIndicator", HFILL }}, { &hf_nbap_SecondaryCPICH_InformationList_Cell_SetupRqstFDD_item, - { "SecondaryCPICH-InformationList-Cell-SetupRqstFDD", "nbap.SecondaryCPICH_InformationList_Cell_SetupRqstFDD_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_fDD_DL_ChannelisationCodeNumber, @@ -57343,7 +57343,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, VALS(nbap_IPDL_Indicator_vals), 0, "nbap.IPDL_Indicator", HFILL }}, { &hf_nbap_CellPortion_InformationList_Cell_SetupRqstFDD_item, - { "CellPortion-InformationList-Cell-SetupRqstFDD", "nbap.CellPortion_InformationList_Cell_SetupRqstFDD_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_associatedSecondaryCPICH, @@ -57383,7 +57383,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, VALS(nbap_SCTD_Indicator_vals), 0, "nbap.SCTD_Indicator", HFILL }}, { &hf_nbap_TimeSlotConfigurationList_Cell_SetupRqstTDD_item, - { "TimeSlotConfigurationList-Cell-SetupRqstTDD", "nbap.TimeSlotConfigurationList_Cell_SetupRqstTDD_item", + { "TimeSlotConfigurationItem-Cell-SetupRqstTDD", "nbap.TimeSlotConfigurationItem_Cell_SetupRqstTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.TimeSlotConfigurationItem_Cell_SetupRqstTDD", HFILL }}, { &hf_nbap_timeSlotStatus, @@ -57395,7 +57395,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, VALS(nbap_TimeSlotDirection_vals), 0, "nbap.TimeSlotDirection", HFILL }}, { &hf_nbap_TimeSlotConfigurationList_LCR_Cell_SetupRqstTDD_item, - { "TimeSlotConfigurationList-LCR-Cell-SetupRqstTDD", "nbap.TimeSlotConfigurationList_LCR_Cell_SetupRqstTDD_item", + { "TimeSlotConfigurationItem-LCR-Cell-SetupRqstTDD", "nbap.TimeSlotConfigurationItem_LCR_Cell_SetupRqstTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.TimeSlotConfigurationItem_LCR_Cell_SetupRqstTDD", HFILL }}, { &hf_nbap_dwPCH_Power, @@ -57411,7 +57411,7 @@ void proto_register_nbap(void) { FT_NONE, BASE_NONE, NULL, 0, "nbap.IPDL_TDD_Parameters_LCR", HFILL }}, { &hf_nbap_Cell_Frequency_List_LCR_MulFreq_Cell_SetupRqstTDD_item, - { "Cell-Frequency-List-LCR-MulFreq-Cell-SetupRqstTDD", "nbap.Cell_Frequency_List_LCR_MulFreq_Cell_SetupRqstTDD_item", + { "Cell-Frequency-Item-LCR-MulFreq-Cell-SetupRqstTDD", "nbap.Cell_Frequency_Item_LCR_MulFreq_Cell_SetupRqstTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.Cell_Frequency_Item_LCR_MulFreq_Cell_SetupRqstTDD", HFILL }}, { &hf_nbap_timeSlotConfigurationList_LCR_Cell_SetupRqstTDD, @@ -57419,7 +57419,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.TimeSlotConfigurationList_LCR_Cell_SetupRqstTDD", HFILL }}, { &hf_nbap_SecondaryCPICH_InformationList_Cell_ReconfRqstFDD_item, - { "SecondaryCPICH-InformationList-Cell-ReconfRqstFDD", "nbap.SecondaryCPICH_InformationList_Cell_ReconfRqstFDD_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_bCH_information_01, @@ -57427,15 +57427,15 @@ void proto_register_nbap(void) { FT_NONE, BASE_NONE, NULL, 0, "nbap.BCH_information_Cell_ReconfRqstFDD", HFILL }}, { &hf_nbap_CellPortion_InformationList_Cell_ReconfRqstFDD_item, - { "CellPortion-InformationList-Cell-ReconfRqstFDD", "nbap.CellPortion_InformationList_Cell_ReconfRqstFDD_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_TimeSlotConfigurationList_Cell_ReconfRqstTDD_item, - { "TimeSlotConfigurationList-Cell-ReconfRqstTDD", "nbap.TimeSlotConfigurationList_Cell_ReconfRqstTDD_item", + { "TimeSlotConfigurationItem-Cell-ReconfRqstTDD", "nbap.TimeSlotConfigurationItem_Cell_ReconfRqstTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.TimeSlotConfigurationItem_Cell_ReconfRqstTDD", HFILL }}, { &hf_nbap_TimeSlotConfigurationList_LCR_Cell_ReconfRqstTDD_item, - { "TimeSlotConfigurationList-LCR-Cell-ReconfRqstTDD", "nbap.TimeSlotConfigurationList_LCR_Cell_ReconfRqstTDD_item", + { "TimeSlotConfigurationItem-LCR-Cell-ReconfRqstTDD", "nbap.TimeSlotConfigurationItem_LCR_Cell_ReconfRqstTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.TimeSlotConfigurationItem_LCR_Cell_ReconfRqstTDD", HFILL }}, { &hf_nbap_cell_Frequency_Add_LCR_MulFreq_Cell_ReconfRqstTDD, @@ -57455,7 +57455,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.TimeSlotConfigurationList_LCR_Cell_ReconfRqstTDD", HFILL }}, { &hf_nbap_Cell_Frequency_ModifyList_LCR_MulFreq_Cell_ReconfRqstTDD_item, - { "Cell-Frequency-ModifyList-LCR-MulFreq-Cell-ReconfRqstTDD", "nbap.Cell_Frequency_ModifyList_LCR_MulFreq_Cell_ReconfRqstTDD_item", + { "Cell-Frequency-ModifyItem-LCR-MulFreq-Cell-ReconfRqstTDD", "nbap.Cell_Frequency_ModifyItem_LCR_MulFreq_Cell_ReconfRqstTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.Cell_Frequency_ModifyItem_LCR_MulFreq_Cell_ReconfRqstTDD", HFILL }}, { &hf_nbap_no_Failure, @@ -57475,7 +57475,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.Local_Cell_Group_InformationList_ResourceStatusInd", HFILL }}, { &hf_nbap_Local_Cell_InformationList_ResourceStatusInd_item, - { "Local-Cell-InformationList-ResourceStatusInd", "nbap.Local_Cell_InformationList_ResourceStatusInd_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_local_CellID, @@ -57487,11 +57487,11 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, VALS(nbap_AddorDeleteIndicator_vals), 0, "nbap.AddorDeleteIndicator", HFILL }}, { &hf_nbap_Local_Cell_Group_InformationList_ResourceStatusInd_item, - { "Local-Cell-Group-InformationList-ResourceStatusInd", "nbap.Local_Cell_Group_InformationList_ResourceStatusInd_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_Power_Local_Cell_Group_InformationList_ResourceStatusInd_item, - { "Power-Local-Cell-Group-InformationList-ResourceStatusInd", "nbap.Power_Local_Cell_Group_InformationList_ResourceStatusInd_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_local_Cell_InformationList_01, @@ -57511,7 +57511,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.Cell_InformationList_ResourceStatusInd", HFILL }}, { &hf_nbap_Local_Cell_InformationList2_ResourceStatusInd_item, - { "Local-Cell-InformationList2-ResourceStatusInd", "nbap.Local_Cell_InformationList2_ResourceStatusInd_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_maximum_DL_PowerCapability, @@ -57519,15 +57519,15 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.MaximumDL_PowerCapability", HFILL }}, { &hf_nbap_Local_Cell_Group_InformationList2_ResourceStatusInd_item, - { "Local-Cell-Group-InformationList2-ResourceStatusInd", "nbap.Local_Cell_Group_InformationList2_ResourceStatusInd_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_CCP_InformationList_ResourceStatusInd_item, - { "CCP-InformationList-ResourceStatusInd", "nbap.CCP_InformationList_ResourceStatusInd_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_Cell_InformationList_ResourceStatusInd_item, - { "Cell-InformationList-ResourceStatusInd", "nbap.Cell_InformationList_ResourceStatusInd_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_primary_SCH_Information_01, @@ -57587,83 +57587,83 @@ void proto_register_nbap(void) { FT_NONE, BASE_NONE, NULL, 0, "nbap.SCH_Information_ResourceStatusInd", HFILL }}, { &hf_nbap_S_CPICH_InformationList_ResourceStatusInd_item, - { "S-CPICH-InformationList-ResourceStatusInd", "nbap.S_CPICH_InformationList_ResourceStatusInd_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_S_CCPCH_InformationList_ResourceStatusInd_item, - { "S-CCPCH-InformationList-ResourceStatusInd", "nbap.S_CCPCH_InformationList_ResourceStatusInd_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_FACH_InformationList_ResourceStatusInd_item, - { "FACH-InformationList-ResourceStatusInd", "nbap.FACH_InformationList_ResourceStatusInd_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_PRACH_InformationList_ResourceStatusInd_item, - { "PRACH-InformationList-ResourceStatusInd", "nbap.PRACH_InformationList_ResourceStatusInd_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_RACH_InformationList_ResourceStatusInd_item, - { "RACH-InformationList-ResourceStatusInd", "nbap.RACH_InformationList_ResourceStatusInd_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_AICH_InformationList_ResourceStatusInd_item, - { "AICH-InformationList-ResourceStatusInd", "nbap.AICH_InformationList_ResourceStatusInd_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_FPACH_LCR_InformationList_ResourceStatusInd_item, - { "FPACH-LCR-InformationList-ResourceStatusInd", "nbap.FPACH_LCR_InformationList_ResourceStatusInd_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_S_CCPCH_InformationListExt_ResourceStatusInd_item, - { "S-CCPCH-InformationListExt-ResourceStatusInd", "nbap.S_CCPCH_InformationListExt_ResourceStatusInd_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_S_CCPCH_LCR_InformationListExt_ResourceStatusInd_item, - { "S-CCPCH-LCR-InformationListExt-ResourceStatusInd", "nbap.S_CCPCH_LCR_InformationListExt_ResourceStatusInd_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_PLCCH_InformationList_ResourceStatusInd_item, - { "PLCCH-InformationList-ResourceStatusInd", "nbap.PLCCH_InformationList_ResourceStatusInd_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_S_CCPCH_768_InformationList_ResourceStatusInd_item, - { "S-CCPCH-768-InformationList-ResourceStatusInd", "nbap.S_CCPCH_768_InformationList_ResourceStatusInd_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_PRACH_768_InformationList_ResourceStatusInd_item, - { "PRACH-768-InformationList-ResourceStatusInd", "nbap.PRACH_768_InformationList_ResourceStatusInd_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_E_RUCCH_InformationList_ResourceStatusInd_item, - { "E-RUCCH-InformationList-ResourceStatusInd", "nbap.E_RUCCH_InformationList_ResourceStatusInd_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_E_RUCCH_768_InformationList_ResourceStatusInd_item, - { "E-RUCCH-768-InformationList-ResourceStatusInd", "nbap.E_RUCCH_768_InformationList_ResourceStatusInd_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_Cell_Frequency_List_Information_LCR_MulFreq_ResourceStatusInd_item, - { "Cell-Frequency-List-Information-LCR-MulFreq-ResourceStatusInd", "nbap.Cell_Frequency_List_Information_LCR_MulFreq_ResourceStatusInd_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_UPPCH_LCR_InformationList_ResourceStatusInd_item, - { "UPPCH-LCR-InformationList-ResourceStatusInd", "nbap.UPPCH_LCR_InformationList_ResourceStatusInd_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_MultipleFreq_HS_DSCH_Resources_InformationList_ResourceStatusInd_item, - { "MultipleFreq-HS-DSCH-Resources-InformationList-ResourceStatusInd", "nbap.MultipleFreq_HS_DSCH_Resources_InformationList_ResourceStatusInd_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_Power_Local_Cell_Group_InformationList2_ResourceStatusInd_item, - { "Power-Local-Cell-Group-InformationList2-ResourceStatusInd", "nbap.Power_Local_Cell_Group_InformationList2_ResourceStatusInd_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_MultipleFreq_E_DCH_Resources_InformationList_ResourceStatusInd_item, - { "MultipleFreq-E-DCH-Resources-InformationList-ResourceStatusInd", "nbap.MultipleFreq_E_DCH_Resources_InformationList_ResourceStatusInd_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_MIB_SB_SIB_InformationList_SystemInfoUpdateRqst_item, - { "MIB-SB-SIB-InformationList-SystemInfoUpdateRqst", "nbap.MIB_SB_SIB_InformationList_SystemInfoUpdateRqst_item", + { "MIB-SB-SIB-InformationItem-SystemInfoUpdateRqst", "nbap.MIB_SB_SIB_InformationItem_SystemInfoUpdateRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.MIB_SB_SIB_InformationItem_SystemInfoUpdateRqst", HFILL }}, { &hf_nbap_iB_Type, @@ -57699,7 +57699,7 @@ void proto_register_nbap(void) { FT_NONE, BASE_NONE, NULL, 0, "nbap.SegmentInformationList_SystemInfoUpdate", HFILL }}, { &hf_nbap_SegmentInformationListIE_SystemInfoUpdate_item, - { "SegmentInformationListIE-SystemInfoUpdate", "nbap.SegmentInformationListIE_SystemInfoUpdate_item", + { "SegmentInformationItem-SystemInfoUpdate", "nbap.SegmentInformationItem_SystemInfoUpdate", FT_NONE, BASE_NONE, NULL, 0, "nbap.SegmentInformationItem_SystemInfoUpdate", HFILL }}, { &hf_nbap_iB_SG_POS, @@ -57715,7 +57715,7 @@ void proto_register_nbap(void) { FT_BYTES, BASE_HEX, NULL, 0, "nbap.IB_SG_DATA", HFILL }}, { &hf_nbap_Additional_HS_Cell_Information_RL_Setup_List_item, - { "Additional-HS-Cell-Information-RL-Setup-List", "nbap.Additional_HS_Cell_Information_RL_Setup_List_item", + { "Additional-HS-Cell-Information-RL-Setup-ItemIEs", "nbap.Additional_HS_Cell_Information_RL_Setup_ItemIEs", FT_NONE, BASE_NONE, NULL, 0, "nbap.Additional_HS_Cell_Information_RL_Setup_ItemIEs", HFILL }}, { &hf_nbap_hSPDSCH_RL_ID, @@ -57791,7 +57791,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.PowerOffset", HFILL }}, { &hf_nbap_RL_InformationList_RL_SetupRqstFDD_item, - { "RL-InformationList-RL-SetupRqstFDD", "nbap.RL_InformationList_RL_SetupRqstFDD_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_firstRLS_indicator, @@ -57843,7 +57843,7 @@ void proto_register_nbap(void) { FT_NONE, BASE_NONE, NULL, 0, "nbap.PowerOffsetInformation_F_DPCH_RL_SetupRqstFDD", HFILL }}, { &hf_nbap_UL_CCTrCH_InformationList_RL_SetupRqstTDD_item, - { "UL-CCTrCH-InformationList-RL-SetupRqstTDD", "nbap.UL_CCTrCH_InformationList_RL_SetupRqstTDD_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_uL_DPCH_Information, @@ -57867,7 +57867,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.UL_Timeslot768_Information", HFILL }}, { &hf_nbap_DL_CCTrCH_InformationList_RL_SetupRqstTDD_item, - { "DL-CCTrCH-InformationList-RL-SetupRqstTDD", "nbap.DL_CCTrCH_InformationList_RL_SetupRqstTDD_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_tdd_TPC_DownlinkStepSize, @@ -57883,7 +57883,7 @@ void proto_register_nbap(void) { FT_NONE, BASE_NONE, NULL, 0, "nbap.DL_DPCH_Information_RL_SetupRqstTDD", HFILL }}, { &hf_nbap_CCTrCH_TPCList_RL_SetupRqstTDD_item, - { "CCTrCH-TPCList-RL-SetupRqstTDD", "nbap.CCTrCH_TPCList_RL_SetupRqstTDD_item", + { "CCTrCH-TPCItem-RL-SetupRqstTDD", "nbap.CCTrCH_TPCItem_RL_SetupRqstTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.CCTrCH_TPCItem_RL_SetupRqstTDD", HFILL }}, { &hf_nbap_dL_Timeslot_Information, @@ -57911,11 +57911,11 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.DL_TimeslotISCPInfo", HFILL }}, { &hf_nbap_Additional_HS_Cell_Information_Response_List_item, - { "Additional-HS-Cell-Information-Response-List", "nbap.Additional_HS_Cell_Information_Response_List_item", + { "Additional-HS-Cell-Information-Response-ItemIEs", "nbap.Additional_HS_Cell_Information_Response_ItemIEs", FT_NONE, BASE_NONE, NULL, 0, "nbap.Additional_HS_Cell_Information_Response_ItemIEs", HFILL }}, { &hf_nbap_RL_InformationResponseList_RL_SetupRspFDD_item, - { "RL-InformationResponseList-RL-SetupRspFDD", "nbap.RL_InformationResponseList_RL_SetupRspFDD_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_rL_Set_ID, @@ -57987,11 +57987,11 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.Successful_RL_InformationRespList_RL_SetupFailureFDD", HFILL }}, { &hf_nbap_Unsuccessful_RL_InformationRespList_RL_SetupFailureFDD_item, - { "Unsuccessful-RL-InformationRespList-RL-SetupFailureFDD", "nbap.Unsuccessful_RL_InformationRespList_RL_SetupFailureFDD_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_Successful_RL_InformationRespList_RL_SetupFailureFDD_item, - { "Successful-RL-InformationRespList-RL-SetupFailureFDD", "nbap.Successful_RL_InformationRespList_RL_SetupFailureFDD_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_diversityIndication_01, @@ -58023,11 +58023,11 @@ void proto_register_nbap(void) { FT_NONE, BASE_NONE, NULL, 0, "nbap.Unsuccessful_RL_InformationRespItem_RL_SetupFailureTDD", HFILL }}, { &hf_nbap_Additional_HS_Cell_Information_RL_Addition_List_item, - { "Additional-HS-Cell-Information-RL-Addition-List", "nbap.Additional_HS_Cell_Information_RL_Addition_List_item", + { "Additional-HS-Cell-Information-RL-Addition-ItemIEs", "nbap.Additional_HS_Cell_Information_RL_Addition_ItemIEs", FT_NONE, BASE_NONE, NULL, 0, "nbap.Additional_HS_Cell_Information_RL_Addition_ItemIEs", HFILL }}, { &hf_nbap_RL_InformationList_RL_AdditionRqstFDD_item, - { "RL-InformationList-RL-AdditionRqstFDD", "nbap.RL_InformationList_RL_AdditionRqstFDD_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_initialDL_TransmissionPower, @@ -58047,7 +58047,7 @@ void proto_register_nbap(void) { FT_NONE, BASE_NONE, NULL, 0, "nbap.NULL", HFILL }}, { &hf_nbap_UL_CCTrCH_InformationList_RL_AdditionRqstTDD_item, - { "UL-CCTrCH-InformationList-RL-AdditionRqstTDD", "nbap.UL_CCTrCH_InformationList_RL_AdditionRqstTDD_item", + { "UL-CCTrCH-InformationItem-RL-AdditionRqstTDD", "nbap.UL_CCTrCH_InformationItem_RL_AdditionRqstTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.UL_CCTrCH_InformationItem_RL_AdditionRqstTDD", HFILL }}, { &hf_nbap_uL_DPCH_Information_01, @@ -58055,7 +58055,7 @@ void proto_register_nbap(void) { FT_NONE, BASE_NONE, NULL, 0, "nbap.UL_DPCH_InformationList_RL_AdditionRqstTDD", HFILL }}, { &hf_nbap_DL_CCTrCH_InformationList_RL_AdditionRqstTDD_item, - { "DL-CCTrCH-InformationList-RL-AdditionRqstTDD", "nbap.DL_CCTrCH_InformationList_RL_AdditionRqstTDD_item", + { "DL-CCTrCH-InformationItem-RL-AdditionRqstTDD", "nbap.DL_CCTrCH_InformationItem_RL_AdditionRqstTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.DL_CCTrCH_InformationItem_RL_AdditionRqstTDD", HFILL }}, { &hf_nbap_dL_DPCH_Information_01, @@ -58067,7 +58067,7 @@ void proto_register_nbap(void) { FT_INT32, BASE_DEC, NULL, 0, "nbap.DL_Power", HFILL }}, { &hf_nbap_Additional_HS_Cell_Change_Information_Response_List_item, - { "Additional-HS-Cell-Change-Information-Response-List", "nbap.Additional_HS_Cell_Change_Information_Response_List_item", + { "Additional-HS-Cell-Change-Information-Response-ItemIEs", "nbap.Additional_HS_Cell_Change_Information_Response_ItemIEs", FT_NONE, BASE_NONE, NULL, 0, "nbap.Additional_HS_Cell_Change_Information_Response_ItemIEs", HFILL }}, { &hf_nbap_hS_DSCH_Secondary_Serving_Cell_Change_Information_Response, @@ -58075,7 +58075,7 @@ void proto_register_nbap(void) { FT_NONE, BASE_NONE, NULL, 0, "nbap.HS_DSCH_Secondary_Serving_Cell_Change_Information_Response", HFILL }}, { &hf_nbap_RL_InformationResponseList_RL_AdditionRspFDD_item, - { "RL-InformationResponseList-RL-AdditionRspFDD", "nbap.RL_InformationResponseList_RL_AdditionRspFDD_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_diversityIndication_02, @@ -58135,11 +58135,11 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.Successful_RL_InformationRespList_RL_AdditionFailureFDD", HFILL }}, { &hf_nbap_Unsuccessful_RL_InformationRespList_RL_AdditionFailureFDD_item, - { "Unsuccessful-RL-InformationRespList-RL-AdditionFailureFDD", "nbap.Unsuccessful_RL_InformationRespList_RL_AdditionFailureFDD_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_Successful_RL_InformationRespList_RL_AdditionFailureFDD_item, - { "Successful-RL-InformationRespList-RL-AdditionFailureFDD", "nbap.Successful_RL_InformationRespList_RL_AdditionFailureFDD_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_diversityIndication_04, @@ -58167,7 +58167,7 @@ void proto_register_nbap(void) { FT_NONE, BASE_NONE, NULL, 0, "nbap.Unsuccessful_RL_InformationRespItem_RL_AdditionFailureTDD", HFILL }}, { &hf_nbap_Additional_HS_Cell_Information_RL_Reconf_Prep_item, - { "Additional-HS-Cell-Information-RL-Reconf-Prep", "nbap.Additional_HS_Cell_Information_RL_Reconf_Prep_item", + { "Additional-HS-Cell-Information-RL-Reconf-Prep-ItemIEs", "nbap.Additional_HS_Cell_Information_RL_Reconf_Prep_ItemIEs", FT_NONE, BASE_NONE, NULL, 0, "nbap.Additional_HS_Cell_Information_RL_Reconf_Prep_ItemIEs", HFILL }}, { &hf_nbap_hS_DSCH_Secondary_Serving_Information_To_Modify, @@ -58187,11 +58187,11 @@ void proto_register_nbap(void) { FT_NONE, BASE_NONE, NULL, 0, "nbap.PowerOffsetInformation_RL_ReconfPrepFDD", HFILL }}, { &hf_nbap_DCH_DeleteList_RL_ReconfPrepFDD_item, - { "DCH-DeleteList-RL-ReconfPrepFDD", "nbap.DCH_DeleteList_RL_ReconfPrepFDD_item", + { "DCH-DeleteItem-RL-ReconfPrepFDD", "nbap.DCH_DeleteItem_RL_ReconfPrepFDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.DCH_DeleteItem_RL_ReconfPrepFDD", HFILL }}, { &hf_nbap_RL_InformationList_RL_ReconfPrepFDD_item, - { "RL-InformationList-RL-ReconfPrepFDD", "nbap.RL_InformationList_RL_ReconfPrepFDD_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_maxDL_Power, @@ -58211,7 +58211,7 @@ void proto_register_nbap(void) { FT_NONE, BASE_NONE, NULL, 0, "nbap.PowerOffsetInformation_F_DPCH_RL_ReconfPrepFDD", HFILL }}, { &hf_nbap_UL_CCTrCH_InformationAddList_RL_ReconfPrepTDD_item, - { "UL-CCTrCH-InformationAddList-RL-ReconfPrepTDD", "nbap.UL_CCTrCH_InformationAddList_RL_ReconfPrepTDD_item", + { "UL-CCTrCH-InformationAddItem-RL-ReconfPrepTDD", "nbap.UL_CCTrCH_InformationAddItem_RL_ReconfPrepTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.UL_CCTrCH_InformationAddItem_RL_ReconfPrepTDD", HFILL }}, { &hf_nbap_ul_DPCH_InformationList, @@ -58223,7 +58223,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.UL_TimeslotLCR_Information", HFILL }}, { &hf_nbap_MultipleRL_UL_DPCH_InformationAddList_RL_ReconfPrepTDD_item, - { "MultipleRL-UL-DPCH-InformationAddList-RL-ReconfPrepTDD", "nbap.MultipleRL_UL_DPCH_InformationAddList_RL_ReconfPrepTDD_item", + { "MultipleRL-UL-DPCH-InformationAddListIE-RL-ReconfPrepTDD", "nbap.MultipleRL_UL_DPCH_InformationAddListIE_RL_ReconfPrepTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.MultipleRL_UL_DPCH_InformationAddListIE_RL_ReconfPrepTDD", HFILL }}, { &hf_nbap_ul_DPCH_InformationListLCR, @@ -58243,7 +58243,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.UL_Timeslot768_Information", HFILL }}, { &hf_nbap_UL_CCTrCH_InformationModifyList_RL_ReconfPrepTDD_item, - { "UL-CCTrCH-InformationModifyList-RL-ReconfPrepTDD", "nbap.UL_CCTrCH_InformationModifyList_RL_ReconfPrepTDD_item", + { "UL-CCTrCH-InformationModifyItem-RL-ReconfPrepTDD", "nbap.UL_CCTrCH_InformationModifyItem_RL_ReconfPrepTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.UL_CCTrCH_InformationModifyItem_RL_ReconfPrepTDD", HFILL }}, { &hf_nbap_ul_DPCH_InformationAddList, @@ -58263,7 +58263,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.UL_Timeslot_InformationModify_ModifyList_RL_ReconfPrepTDD", HFILL }}, { &hf_nbap_UL_Timeslot_InformationModify_ModifyList_RL_ReconfPrepTDD_item, - { "UL-Timeslot-InformationModify-ModifyList-RL-ReconfPrepTDD", "nbap.UL_Timeslot_InformationModify_ModifyList_RL_ReconfPrepTDD_item", + { "UL-Timeslot-InformationModify-ModifyItem-RL-ReconfPrepTDD", "nbap.UL_Timeslot_InformationModify_ModifyItem_RL_ReconfPrepTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.UL_Timeslot_InformationModify_ModifyItem_RL_ReconfPrepTDD", HFILL }}, { &hf_nbap_uL_Code_InformationModify_ModifyList_RL_ReconfPrepTDD, @@ -58271,11 +58271,11 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.UL_Code_InformationModify_ModifyList_RL_ReconfPrepTDD", HFILL }}, { &hf_nbap_UL_Code_InformationModify_ModifyList_RL_ReconfPrepTDD_item, - { "UL-Code-InformationModify-ModifyList-RL-ReconfPrepTDD", "nbap.UL_Code_InformationModify_ModifyList_RL_ReconfPrepTDD_item", + { "UL-Code-InformationModify-ModifyItem-RL-ReconfPrepTDD", "nbap.UL_Code_InformationModify_ModifyItem_RL_ReconfPrepTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.UL_Code_InformationModify_ModifyItem_RL_ReconfPrepTDD", HFILL }}, { &hf_nbap_UL_TimeslotLCR_InformationModify_ModifyList_RL_ReconfPrepTDD_item, - { "UL-TimeslotLCR-InformationModify-ModifyList-RL-ReconfPrepTDD", "nbap.UL_TimeslotLCR_InformationModify_ModifyList_RL_ReconfPrepTDD_item", + { "UL-Timeslot-LCR-InformationModify-ModifyItem-RL-ReconfPrepTDD", "nbap.UL_Timeslot_LCR_InformationModify_ModifyItem_RL_ReconfPrepTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.UL_Timeslot_LCR_InformationModify_ModifyItem_RL_ReconfPrepTDD", HFILL }}, { &hf_nbap_uL_Code_InformationModify_ModifyList_RL_ReconfPrepTDDLCR, @@ -58283,11 +58283,11 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.UL_Code_InformationModify_ModifyList_RL_ReconfPrepTDDLCR", HFILL }}, { &hf_nbap_UL_Code_InformationModify_ModifyList_RL_ReconfPrepTDDLCR_item, - { "UL-Code-InformationModify-ModifyList-RL-ReconfPrepTDDLCR", "nbap.UL_Code_InformationModify_ModifyList_RL_ReconfPrepTDDLCR_item", + { "UL-Code-InformationModify-ModifyItem-RL-ReconfPrepTDDLCR", "nbap.UL_Code_InformationModify_ModifyItem_RL_ReconfPrepTDDLCR", FT_NONE, BASE_NONE, NULL, 0, "nbap.UL_Code_InformationModify_ModifyItem_RL_ReconfPrepTDDLCR", HFILL }}, { &hf_nbap_UL_Timeslot768_InformationModify_ModifyList_RL_ReconfPrepTDD_item, - { "UL-Timeslot768-InformationModify-ModifyList-RL-ReconfPrepTDD", "nbap.UL_Timeslot768_InformationModify_ModifyList_RL_ReconfPrepTDD_item", + { "UL-Timeslot-768-InformationModify-ModifyItem-RL-ReconfPrepTDD", "nbap.UL_Timeslot_768_InformationModify_ModifyItem_RL_ReconfPrepTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.UL_Timeslot_768_InformationModify_ModifyItem_RL_ReconfPrepTDD", HFILL }}, { &hf_nbap_uL_Code_InformationModify_ModifyList_RL_ReconfPrepTDD768, @@ -58295,15 +58295,15 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.UL_Code_InformationModify_ModifyList_RL_ReconfPrepTDD768", HFILL }}, { &hf_nbap_UL_Code_InformationModify_ModifyList_RL_ReconfPrepTDD768_item, - { "UL-Code-InformationModify-ModifyList-RL-ReconfPrepTDD768", "nbap.UL_Code_InformationModify_ModifyList_RL_ReconfPrepTDD768_item", + { "UL-Code-InformationModify-ModifyItem-RL-ReconfPrepTDD768", "nbap.UL_Code_InformationModify_ModifyItem_RL_ReconfPrepTDD768", FT_NONE, BASE_NONE, NULL, 0, "nbap.UL_Code_InformationModify_ModifyItem_RL_ReconfPrepTDD768", HFILL }}, { &hf_nbap_UL_DPCH_InformationModify_DeleteListIE_RL_ReconfPrepTDD_item, - { "UL-DPCH-InformationModify-DeleteListIE-RL-ReconfPrepTDD", "nbap.UL_DPCH_InformationModify_DeleteListIE_RL_ReconfPrepTDD_item", + { "UL-DPCH-InformationModify-DeleteItem-RL-ReconfPrepTDD", "nbap.UL_DPCH_InformationModify_DeleteItem_RL_ReconfPrepTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.UL_DPCH_InformationModify_DeleteItem_RL_ReconfPrepTDD", HFILL }}, { &hf_nbap_MultipleRL_UL_DPCH_InformationModifyList_RL_ReconfPrepTDD_item, - { "MultipleRL-UL-DPCH-InformationModifyList-RL-ReconfPrepTDD", "nbap.MultipleRL_UL_DPCH_InformationModifyList_RL_ReconfPrepTDD_item", + { "MultipleRL-UL-DPCH-InformationModifyListIE-RL-ReconfPrepTDD", "nbap.MultipleRL_UL_DPCH_InformationModifyListIE_RL_ReconfPrepTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.MultipleRL_UL_DPCH_InformationModifyListIE_RL_ReconfPrepTDD", HFILL }}, { &hf_nbap_ul_DPCH_InformationAddListLCR, @@ -58311,11 +58311,11 @@ void proto_register_nbap(void) { FT_NONE, BASE_NONE, NULL, 0, "nbap.UL_DPCH_LCR_InformationModify_AddList_RL_ReconfPrepTDD", HFILL }}, { &hf_nbap_UL_CCTrCH_InformationDeleteList_RL_ReconfPrepTDD_item, - { "UL-CCTrCH-InformationDeleteList-RL-ReconfPrepTDD", "nbap.UL_CCTrCH_InformationDeleteList_RL_ReconfPrepTDD_item", + { "UL-CCTrCH-InformationDeleteItem-RL-ReconfPrepTDD", "nbap.UL_CCTrCH_InformationDeleteItem_RL_ReconfPrepTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.UL_CCTrCH_InformationDeleteItem_RL_ReconfPrepTDD", HFILL }}, { &hf_nbap_DL_CCTrCH_InformationAddList_RL_ReconfPrepTDD_item, - { "DL-CCTrCH-InformationAddList-RL-ReconfPrepTDD", "nbap.DL_CCTrCH_InformationAddList_RL_ReconfPrepTDD_item", + { "DL-CCTrCH-InformationAddItem-RL-ReconfPrepTDD", "nbap.DL_CCTrCH_InformationAddItem_RL_ReconfPrepTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.DL_CCTrCH_InformationAddItem_RL_ReconfPrepTDD", HFILL }}, { &hf_nbap_cCTrCH_TPCList_01, @@ -58327,7 +58327,7 @@ void proto_register_nbap(void) { FT_NONE, BASE_NONE, NULL, 0, "nbap.DL_DPCH_InformationAddList_RL_ReconfPrepTDD", HFILL }}, { &hf_nbap_CCTrCH_TPCAddList_RL_ReconfPrepTDD_item, - { "CCTrCH-TPCAddList-RL-ReconfPrepTDD", "nbap.CCTrCH_TPCAddList_RL_ReconfPrepTDD_item", + { "CCTrCH-TPCAddItem-RL-ReconfPrepTDD", "nbap.CCTrCH_TPCAddItem_RL_ReconfPrepTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.CCTrCH_TPCAddItem_RL_ReconfPrepTDD", HFILL }}, { &hf_nbap_dL_Timeslot_InformationLCR, @@ -58335,7 +58335,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.DL_TimeslotLCR_Information", HFILL }}, { &hf_nbap_MultipleRL_DL_DPCH_InformationAddList_RL_ReconfPrepTDD_item, - { "MultipleRL-DL-DPCH-InformationAddList-RL-ReconfPrepTDD", "nbap.MultipleRL_DL_DPCH_InformationAddList_RL_ReconfPrepTDD_item", + { "MultipleRL-DL-DPCH-InformationAddListIE-RL-ReconfPrepTDD", "nbap.MultipleRL_DL_DPCH_InformationAddListIE_RL_ReconfPrepTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.MultipleRL_DL_DPCH_InformationAddListIE_RL_ReconfPrepTDD", HFILL }}, { &hf_nbap_dl_DPCH_InformationListLCR, @@ -58363,7 +58363,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.DL_Timeslot768_Information", HFILL }}, { &hf_nbap_DL_CCTrCH_InformationModifyList_RL_ReconfPrepTDD_item, - { "DL-CCTrCH-InformationModifyList-RL-ReconfPrepTDD", "nbap.DL_CCTrCH_InformationModifyList_RL_ReconfPrepTDD_item", + { "DL-CCTrCH-InformationModifyItem-RL-ReconfPrepTDD", "nbap.DL_CCTrCH_InformationModifyItem_RL_ReconfPrepTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.DL_CCTrCH_InformationModifyItem_RL_ReconfPrepTDD", HFILL }}, { &hf_nbap_cCTrCH_TPCList_02, @@ -58383,7 +58383,7 @@ void proto_register_nbap(void) { FT_NONE, BASE_NONE, NULL, 0, "nbap.DL_DPCH_InformationModify_DeleteList_RL_ReconfPrepTDD", HFILL }}, { &hf_nbap_CCTrCH_TPCModifyList_RL_ReconfPrepTDD_item, - { "CCTrCH-TPCModifyList-RL-ReconfPrepTDD", "nbap.CCTrCH_TPCModifyList_RL_ReconfPrepTDD_item", + { "CCTrCH-TPCModifyItem-RL-ReconfPrepTDD", "nbap.CCTrCH_TPCModifyItem_RL_ReconfPrepTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.CCTrCH_TPCModifyItem_RL_ReconfPrepTDD", HFILL }}, { &hf_nbap_dL_Timeslot_InformationAddModify_ModifyList_RL_ReconfPrepTDD, @@ -58391,7 +58391,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.DL_Timeslot_InformationModify_ModifyList_RL_ReconfPrepTDD", HFILL }}, { &hf_nbap_DL_Timeslot_InformationModify_ModifyList_RL_ReconfPrepTDD_item, - { "DL-Timeslot-InformationModify-ModifyList-RL-ReconfPrepTDD", "nbap.DL_Timeslot_InformationModify_ModifyList_RL_ReconfPrepTDD_item", + { "DL-Timeslot-InformationModify-ModifyItem-RL-ReconfPrepTDD", "nbap.DL_Timeslot_InformationModify_ModifyItem_RL_ReconfPrepTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.DL_Timeslot_InformationModify_ModifyItem_RL_ReconfPrepTDD", HFILL }}, { &hf_nbap_dL_Code_InformationModify_ModifyList_RL_ReconfPrepTDD, @@ -58399,11 +58399,11 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.DL_Code_InformationModify_ModifyList_RL_ReconfPrepTDD", HFILL }}, { &hf_nbap_DL_Code_InformationModify_ModifyList_RL_ReconfPrepTDD_item, - { "DL-Code-InformationModify-ModifyList-RL-ReconfPrepTDD", "nbap.DL_Code_InformationModify_ModifyList_RL_ReconfPrepTDD_item", + { "DL-Code-InformationModify-ModifyItem-RL-ReconfPrepTDD", "nbap.DL_Code_InformationModify_ModifyItem_RL_ReconfPrepTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.DL_Code_InformationModify_ModifyItem_RL_ReconfPrepTDD", HFILL }}, { &hf_nbap_DL_Timeslot_LCR_InformationModify_ModifyList_RL_ReconfPrepTDD_item, - { "DL-Timeslot-LCR-InformationModify-ModifyList-RL-ReconfPrepTDD", "nbap.DL_Timeslot_LCR_InformationModify_ModifyList_RL_ReconfPrepTDD_item", + { "DL-Timeslot-LCR-InformationModify-ModifyItem-RL-ReconfPrepTDD", "nbap.DL_Timeslot_LCR_InformationModify_ModifyItem_RL_ReconfPrepTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.DL_Timeslot_LCR_InformationModify_ModifyItem_RL_ReconfPrepTDD", HFILL }}, { &hf_nbap_dL_Code_LCR_InformationModify_ModifyList_RL_ReconfPrepTDD, @@ -58411,11 +58411,11 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.DL_Code_LCR_InformationModify_ModifyList_RL_ReconfPrepTDD", HFILL }}, { &hf_nbap_DL_Code_LCR_InformationModify_ModifyList_RL_ReconfPrepTDD_item, - { "DL-Code-LCR-InformationModify-ModifyList-RL-ReconfPrepTDD", "nbap.DL_Code_LCR_InformationModify_ModifyList_RL_ReconfPrepTDD_item", + { "DL-Code-LCR-InformationModify-ModifyItem-RL-ReconfPrepTDD", "nbap.DL_Code_LCR_InformationModify_ModifyItem_RL_ReconfPrepTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.DL_Code_LCR_InformationModify_ModifyItem_RL_ReconfPrepTDD", HFILL }}, { &hf_nbap_DL_Timeslot_768_InformationModify_ModifyList_RL_ReconfPrepTDD_item, - { "DL-Timeslot-768-InformationModify-ModifyList-RL-ReconfPrepTDD", "nbap.DL_Timeslot_768_InformationModify_ModifyList_RL_ReconfPrepTDD_item", + { "DL-Timeslot-768-InformationModify-ModifyItem-RL-ReconfPrepTDD", "nbap.DL_Timeslot_768_InformationModify_ModifyItem_RL_ReconfPrepTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.DL_Timeslot_768_InformationModify_ModifyItem_RL_ReconfPrepTDD", HFILL }}, { &hf_nbap_dL_Code_768_InformationModify_ModifyList_RL_ReconfPrepTDD, @@ -58423,7 +58423,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.DL_Code_768_InformationModify_ModifyList_RL_ReconfPrepTDD", HFILL }}, { &hf_nbap_DL_Code_768_InformationModify_ModifyList_RL_ReconfPrepTDD_item, - { "DL-Code-768-InformationModify-ModifyList-RL-ReconfPrepTDD", "nbap.DL_Code_768_InformationModify_ModifyList_RL_ReconfPrepTDD_item", + { "DL-Code-768-InformationModify-ModifyItem-RL-ReconfPrepTDD", "nbap.DL_Code_768_InformationModify_ModifyItem_RL_ReconfPrepTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.DL_Code_768_InformationModify_ModifyItem_RL_ReconfPrepTDD", HFILL }}, { &hf_nbap_dPCH_ID768, @@ -58431,11 +58431,11 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.DPCH_ID768", HFILL }}, { &hf_nbap_DL_DPCH_InformationModify_DeleteListIE_RL_ReconfPrepTDD_item, - { "DL-DPCH-InformationModify-DeleteListIE-RL-ReconfPrepTDD", "nbap.DL_DPCH_InformationModify_DeleteListIE_RL_ReconfPrepTDD_item", + { "DL-DPCH-InformationModify-DeleteItem-RL-ReconfPrepTDD", "nbap.DL_DPCH_InformationModify_DeleteItem_RL_ReconfPrepTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.DL_DPCH_InformationModify_DeleteItem_RL_ReconfPrepTDD", HFILL }}, { &hf_nbap_MultipleRL_DL_DPCH_InformationModifyList_RL_ReconfPrepTDD_item, - { "MultipleRL-DL-DPCH-InformationModifyList-RL-ReconfPrepTDD", "nbap.MultipleRL_DL_DPCH_InformationModifyList_RL_ReconfPrepTDD_item", + { "MultipleRL-DL-DPCH-InformationModifyListIE-RL-ReconfPrepTDD", "nbap.MultipleRL_DL_DPCH_InformationModifyListIE_RL_ReconfPrepTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.MultipleRL_DL_DPCH_InformationModifyListIE_RL_ReconfPrepTDD", HFILL }}, { &hf_nbap_dl_DPCH_InformationAddListLCR, @@ -58455,35 +58455,35 @@ void proto_register_nbap(void) { FT_INT32, BASE_DEC, NULL, 0, "nbap.DL_Power", HFILL }}, { &hf_nbap_DL_CCTrCH_InformationDeleteList_RL_ReconfPrepTDD_item, - { "DL-CCTrCH-InformationDeleteList-RL-ReconfPrepTDD", "nbap.DL_CCTrCH_InformationDeleteList_RL_ReconfPrepTDD_item", + { "DL-CCTrCH-InformationDeleteItem-RL-ReconfPrepTDD", "nbap.DL_CCTrCH_InformationDeleteItem_RL_ReconfPrepTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.DL_CCTrCH_InformationDeleteItem_RL_ReconfPrepTDD", HFILL }}, { &hf_nbap_DCH_DeleteList_RL_ReconfPrepTDD_item, - { "DCH-DeleteList-RL-ReconfPrepTDD", "nbap.DCH_DeleteList_RL_ReconfPrepTDD_item", + { "DCH-DeleteItem-RL-ReconfPrepTDD", "nbap.DCH_DeleteItem_RL_ReconfPrepTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.DCH_DeleteItem_RL_ReconfPrepTDD", HFILL }}, { &hf_nbap_DSCH_Information_ModifyList_RL_ReconfPrepTDD_item, - { "DSCH-Information-ModifyList-RL-ReconfPrepTDD", "nbap.DSCH_Information_ModifyList_RL_ReconfPrepTDD_item", + { "DSCH-Information-ModifyItem-RL-ReconfPrepTDD", "nbap.DSCH_Information_ModifyItem_RL_ReconfPrepTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.DSCH_Information_ModifyItem_RL_ReconfPrepTDD", HFILL }}, { &hf_nbap_DSCH_Information_DeleteList_RL_ReconfPrepTDD_item, - { "DSCH-Information-DeleteList-RL-ReconfPrepTDD", "nbap.DSCH_Information_DeleteList_RL_ReconfPrepTDD_item", + { "DSCH-Information-DeleteItem-RL-ReconfPrepTDD", "nbap.DSCH_Information_DeleteItem_RL_ReconfPrepTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.DSCH_Information_DeleteItem_RL_ReconfPrepTDD", HFILL }}, { &hf_nbap_USCH_Information_ModifyList_RL_ReconfPrepTDD_item, - { "USCH-Information-ModifyList-RL-ReconfPrepTDD", "nbap.USCH_Information_ModifyList_RL_ReconfPrepTDD_item", + { "USCH-Information-ModifyItem-RL-ReconfPrepTDD", "nbap.USCH_Information_ModifyItem_RL_ReconfPrepTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.USCH_Information_ModifyItem_RL_ReconfPrepTDD", HFILL }}, { &hf_nbap_USCH_Information_DeleteList_RL_ReconfPrepTDD_item, - { "USCH-Information-DeleteList-RL-ReconfPrepTDD", "nbap.USCH_Information_DeleteList_RL_ReconfPrepTDD_item", + { "USCH-Information-DeleteItem-RL-ReconfPrepTDD", "nbap.USCH_Information_DeleteItem_RL_ReconfPrepTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.USCH_Information_DeleteItem_RL_ReconfPrepTDD", HFILL }}, { &hf_nbap_MultipleRL_Information_RL_ReconfPrepTDD_item, - { "MultipleRL-Information-RL-ReconfPrepTDD", "nbap.MultipleRL_Information_RL_ReconfPrepTDD_item", + { "RL-Information-RL-ReconfPrepTDD", "nbap.RL_Information_RL_ReconfPrepTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.RL_Information_RL_ReconfPrepTDD", HFILL }}, { &hf_nbap_RL_InformationResponseList_RL_ReconfReady_item, - { "RL-InformationResponseList-RL-ReconfReady", "nbap.RL_InformationResponseList_RL_ReconfReady_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_dCH_InformationResponseList_RL_ReconfReady, @@ -58511,11 +58511,11 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.RL_ReconfigurationFailureList_RL_ReconfFailure", HFILL }}, { &hf_nbap_RL_ReconfigurationFailureList_RL_ReconfFailure_item, - { "RL-ReconfigurationFailureList-RL-ReconfFailure", "nbap.RL_ReconfigurationFailureList_RL_ReconfFailure_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_Additional_HS_Cell_Information_RL_Reconf_Req_item, - { "Additional-HS-Cell-Information-RL-Reconf-Req", "nbap.Additional_HS_Cell_Information_RL_Reconf_Req_item", + { "Additional-HS-Cell-Information-RL-Reconf-Req-ItemIEs", "nbap.Additional_HS_Cell_Information_RL_Reconf_Req_ItemIEs", FT_NONE, BASE_NONE, NULL, 0, "nbap.Additional_HS_Cell_Information_RL_Reconf_Req_ItemIEs", HFILL }}, { &hf_nbap_hS_DSCH_FDD_Secondary_Serving_Information_To_Modify_Unsynchronised, @@ -58535,27 +58535,27 @@ void proto_register_nbap(void) { FT_NONE, BASE_NONE, NULL, 0, "nbap.TFCS", HFILL }}, { &hf_nbap_DCH_DeleteList_RL_ReconfRqstFDD_item, - { "DCH-DeleteList-RL-ReconfRqstFDD", "nbap.DCH_DeleteList_RL_ReconfRqstFDD_item", + { "DCH-DeleteItem-RL-ReconfRqstFDD", "nbap.DCH_DeleteItem_RL_ReconfRqstFDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.DCH_DeleteItem_RL_ReconfRqstFDD", HFILL }}, { &hf_nbap_RL_InformationList_RL_ReconfRqstFDD_item, - { "RL-InformationList-RL-ReconfRqstFDD", "nbap.RL_InformationList_RL_ReconfRqstFDD_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_UL_CCTrCH_InformationModifyList_RL_ReconfRqstTDD_item, - { "UL-CCTrCH-InformationModifyList-RL-ReconfRqstTDD", "nbap.UL_CCTrCH_InformationModifyList_RL_ReconfRqstTDD_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_UL_CCTrCH_InformationDeleteList_RL_ReconfRqstTDD_item, - { "UL-CCTrCH-InformationDeleteList-RL-ReconfRqstTDD", "nbap.UL_CCTrCH_InformationDeleteList_RL_ReconfRqstTDD_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_DL_CCTrCH_InformationModifyList_RL_ReconfRqstTDD_item, - { "DL-CCTrCH-InformationModifyList-RL-ReconfRqstTDD", "nbap.DL_CCTrCH_InformationModifyList_RL_ReconfRqstTDD_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_MultipleRL_DL_CCTrCH_InformationModifyList_RL_ReconfRqstTDD_item, - { "MultipleRL-DL-CCTrCH-InformationModifyList-RL-ReconfRqstTDD", "nbap.MultipleRL_DL_CCTrCH_InformationModifyList_RL_ReconfRqstTDD_item", + { "MultipleRL-DL-CCTrCH-InformationModifyListIE-RL-ReconfRqstTDD", "nbap.MultipleRL_DL_CCTrCH_InformationModifyListIE_RL_ReconfRqstTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.MultipleRL_DL_CCTrCH_InformationModifyListIE_RL_ReconfRqstTDD", HFILL }}, { &hf_nbap_dl_DPCH_LCR_InformationModifyList, @@ -58575,7 +58575,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.DL_Timeslot_LCR_InformationModify_ModifyList_RL_ReconfRqstTDD", HFILL }}, { &hf_nbap_DL_Timeslot_LCR_InformationModify_ModifyList_RL_ReconfRqstTDD_item, - { "DL-Timeslot-LCR-InformationModify-ModifyList-RL-ReconfRqstTDD", "nbap.DL_Timeslot_LCR_InformationModify_ModifyList_RL_ReconfRqstTDD_item", + { "DL-Timeslot-LCR-InformationModify-ModifyItem-RL-ReconfRqstTDD", "nbap.DL_Timeslot_LCR_InformationModify_ModifyItem_RL_ReconfRqstTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.DL_Timeslot_LCR_InformationModify_ModifyItem_RL_ReconfRqstTDD", HFILL }}, { &hf_nbap_maxPowerLCR, @@ -58587,19 +58587,19 @@ void proto_register_nbap(void) { FT_INT32, BASE_DEC, NULL, 0, "nbap.DL_Power", HFILL }}, { &hf_nbap_DL_CCTrCH_InformationDeleteList_RL_ReconfRqstTDD_item, - { "DL-CCTrCH-InformationDeleteList-RL-ReconfRqstTDD", "nbap.DL_CCTrCH_InformationDeleteList_RL_ReconfRqstTDD_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_DCH_DeleteList_RL_ReconfRqstTDD_item, - { "DCH-DeleteList-RL-ReconfRqstTDD", "nbap.DCH_DeleteList_RL_ReconfRqstTDD_item", + { "DCH-DeleteItem-RL-ReconfRqstTDD", "nbap.DCH_DeleteItem_RL_ReconfRqstTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.DCH_DeleteItem_RL_ReconfRqstTDD", HFILL }}, { &hf_nbap_Multiple_RL_Information_RL_ReconfRqstTDD_item, - { "Multiple-RL-Information-RL-ReconfRqstTDD", "nbap.Multiple_RL_Information_RL_ReconfRqstTDD_item", + { "RL-Information-RL-ReconfRqstTDD", "nbap.RL_Information_RL_ReconfRqstTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.RL_Information_RL_ReconfRqstTDD", HFILL }}, { &hf_nbap_RL_InformationResponseList_RL_ReconfRsp_item, - { "RL-InformationResponseList-RL-ReconfRsp", "nbap.RL_InformationResponseList_RL_ReconfRsp_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_dCH_InformationResponseList_RL_ReconfRsp, @@ -58607,11 +58607,11 @@ void proto_register_nbap(void) { FT_NONE, BASE_NONE, NULL, 0, "nbap.DCH_InformationResponseList_RL_ReconfRsp", HFILL }}, { &hf_nbap_RL_informationList_RL_DeletionRqst_item, - { "RL-informationList-RL-DeletionRqst", "nbap.RL_informationList_RL_DeletionRqst_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_DL_ReferencePowerInformationList_DL_PC_Rqst_item, - { "DL-ReferencePowerInformationList-DL-PC-Rqst", "nbap.DL_ReferencePowerInformationList_DL_PC_Rqst_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_dl_ReferencePower, @@ -58639,19 +58639,19 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.RL_InformationList_DM_Rqst", HFILL }}, { &hf_nbap_RL_InformationList_DM_Rqst_item, - { "RL-InformationList-DM-Rqst", "nbap.RL_InformationList_DM_Rqst_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_PUSCH_Info_DM_Rqst_item, - { "PUSCH-Info-DM-Rqst", "nbap.PUSCH_Info_DM_Rqst_item", + { "PUSCH-ID", "nbap.PUSCH_ID", FT_UINT32, BASE_DEC, NULL, 0, "nbap.PUSCH_ID", HFILL }}, { &hf_nbap_HSSICH_Info_DM_Rqst_item, - { "HSSICH-Info-DM-Rqst", "nbap.HSSICH_Info_DM_Rqst_item", + { "HS-SICH-ID", "nbap.HS_SICH_ID", FT_UINT32, BASE_DEC, NULL, 0, "nbap.HS_SICH_ID", HFILL }}, { &hf_nbap_HSSICH_InfoExt_DM_Rqst_item, - { "HSSICH-InfoExt-DM-Rqst", "nbap.HSSICH_InfoExt_DM_Rqst_item", + { "Extended-HS-SICH-ID", "nbap.Extended_HS_SICH_ID", FT_UINT32, BASE_DEC, NULL, 0, "nbap.Extended_HS_SICH_ID", HFILL }}, { &hf_nbap_rL_Set_InformationList_DM_Rqst, @@ -58659,7 +58659,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.RL_Set_InformationList_DM_Rqst", HFILL }}, { &hf_nbap_RL_Set_InformationList_DM_Rqst_item, - { "RL-Set-InformationList-DM-Rqst", "nbap.RL_Set_InformationList_DM_Rqst_item", + { "RL-Set-InformationItem-DM-Rqst", "nbap.RL_Set_InformationItem_DM_Rqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.RL_Set_InformationItem_DM_Rqst", HFILL }}, { &hf_nbap_rL_01, @@ -58683,7 +58683,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.RL_InformationList_DM_Rsp", HFILL }}, { &hf_nbap_RL_InformationList_DM_Rsp_item, - { "RL-InformationList-DM-Rsp", "nbap.RL_InformationList_DM_Rsp_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_dedicatedMeasurementValue, @@ -58691,11 +58691,11 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, VALS(nbap_DedicatedMeasurementValue_vals), 0, "nbap.DedicatedMeasurementValue", HFILL }}, { &hf_nbap_PUSCH_Info_DM_Rsp_item, - { "PUSCH-Info-DM-Rsp", "nbap.PUSCH_Info_DM_Rsp_item", + { "PUSCH-ID", "nbap.PUSCH_ID", FT_UINT32, BASE_DEC, NULL, 0, "nbap.PUSCH_ID", HFILL }}, { &hf_nbap_Multiple_PUSCH_InfoList_DM_Rsp_item, - { "Multiple-PUSCH-InfoList-DM-Rsp", "nbap.Multiple_PUSCH_InfoList_DM_Rsp_item", + { "Multiple-PUSCH-InfoListIE-DM-Rsp", "nbap.Multiple_PUSCH_InfoListIE_DM_Rsp", FT_NONE, BASE_NONE, NULL, 0, "nbap.Multiple_PUSCH_InfoListIE_DM_Rsp", HFILL }}, { &hf_nbap_pUSCH_ID, @@ -58703,19 +58703,19 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.PUSCH_ID", HFILL }}, { &hf_nbap_Multiple_DedicatedMeasurementValueList_TDD_DM_Rsp_item, - { "Multiple-DedicatedMeasurementValueList-TDD-DM-Rsp", "nbap.Multiple_DedicatedMeasurementValueList_TDD_DM_Rsp_item", + { "Multiple-DedicatedMeasurementValueItem-TDD-DM-Rsp", "nbap.Multiple_DedicatedMeasurementValueItem_TDD_DM_Rsp", FT_NONE, BASE_NONE, NULL, 0, "nbap.Multiple_DedicatedMeasurementValueItem_TDD_DM_Rsp", HFILL }}, { &hf_nbap_Multiple_DedicatedMeasurementValueList_LCR_TDD_DM_Rsp_item, - { "Multiple-DedicatedMeasurementValueList-LCR-TDD-DM-Rsp", "nbap.Multiple_DedicatedMeasurementValueList_LCR_TDD_DM_Rsp_item", + { "Multiple-DedicatedMeasurementValueItem-LCR-TDD-DM-Rsp", "nbap.Multiple_DedicatedMeasurementValueItem_LCR_TDD_DM_Rsp", FT_NONE, BASE_NONE, NULL, 0, "nbap.Multiple_DedicatedMeasurementValueItem_LCR_TDD_DM_Rsp", HFILL }}, { &hf_nbap_Multiple_HSSICHMeasurementValueList_TDD_DM_Rsp_item, - { "Multiple-HSSICHMeasurementValueList-TDD-DM-Rsp", "nbap.Multiple_HSSICHMeasurementValueList_TDD_DM_Rsp_item", + { "Multiple-HSSICHMeasurementValueItem-TDD-DM-Rsp", "nbap.Multiple_HSSICHMeasurementValueItem_TDD_DM_Rsp", FT_NONE, BASE_NONE, NULL, 0, "nbap.Multiple_HSSICHMeasurementValueItem_TDD_DM_Rsp", HFILL }}, { &hf_nbap_Multiple_DedicatedMeasurementValueList_768_TDD_DM_Rsp_item, - { "Multiple-DedicatedMeasurementValueList-768-TDD-DM-Rsp", "nbap.Multiple_DedicatedMeasurementValueList_768_TDD_DM_Rsp_item", + { "Multiple-DedicatedMeasurementValueItem-768-TDD-DM-Rsp", "nbap.Multiple_DedicatedMeasurementValueItem_768_TDD_DM_Rsp", FT_NONE, BASE_NONE, NULL, 0, "nbap.Multiple_DedicatedMeasurementValueItem_768_TDD_DM_Rsp", HFILL }}, { &hf_nbap_rL_Set_InformationList_DM_Rsp, @@ -58723,7 +58723,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.RL_Set_InformationList_DM_Rsp", HFILL }}, { &hf_nbap_RL_Set_InformationList_DM_Rsp_item, - { "RL-Set-InformationList-DM-Rsp", "nbap.RL_Set_InformationList_DM_Rsp_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_rL_02, @@ -58747,7 +58747,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.RL_InformationList_DM_Rprt", HFILL }}, { &hf_nbap_RL_InformationList_DM_Rprt_item, - { "RL-InformationList-DM-Rprt", "nbap.RL_InformationList_DM_Rprt_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_dedicatedMeasurementValueInformation, @@ -58755,11 +58755,11 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, VALS(nbap_DedicatedMeasurementValueInformation_vals), 0, "nbap.DedicatedMeasurementValueInformation", HFILL }}, { &hf_nbap_PUSCH_Info_DM_Rprt_item, - { "PUSCH-Info-DM-Rprt", "nbap.PUSCH_Info_DM_Rprt_item", + { "PUSCH-ID", "nbap.PUSCH_ID", FT_UINT32, BASE_DEC, NULL, 0, "nbap.PUSCH_ID", HFILL }}, { &hf_nbap_Multiple_PUSCH_InfoList_DM_Rprt_item, - { "Multiple-PUSCH-InfoList-DM-Rprt", "nbap.Multiple_PUSCH_InfoList_DM_Rprt_item", + { "Multiple-PUSCH-InfoListIE-DM-Rprt", "nbap.Multiple_PUSCH_InfoListIE_DM_Rprt", FT_NONE, BASE_NONE, NULL, 0, "nbap.Multiple_PUSCH_InfoListIE_DM_Rprt", HFILL }}, { &hf_nbap_rL_Set_InformationList_DM_Rprt, @@ -58767,7 +58767,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.RL_Set_InformationList_DM_Rprt", HFILL }}, { &hf_nbap_RL_Set_InformationList_DM_Rprt_item, - { "RL-Set-InformationList-DM-Rprt", "nbap.RL_Set_InformationList_DM_Rprt_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_rL_03, @@ -58787,7 +58787,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.RL_InformationList_RL_FailureInd", HFILL }}, { &hf_nbap_RL_InformationList_RL_FailureInd_item, - { "RL-InformationList-RL-FailureInd", "nbap.RL_InformationList_RL_FailureInd_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_rL_Set_InformationList_RL_FailureInd, @@ -58795,7 +58795,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.RL_Set_InformationList_RL_FailureInd", HFILL }}, { &hf_nbap_RL_Set_InformationList_RL_FailureInd_item, - { "RL-Set-InformationList-RL-FailureInd", "nbap.RL_Set_InformationList_RL_FailureInd_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_cCTrCH_InformationList_RL_FailureInd, @@ -58803,11 +58803,11 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.CCTrCH_InformationList_RL_FailureInd", HFILL }}, { &hf_nbap_CCTrCH_InformationList_RL_FailureInd_item, - { "CCTrCH-InformationList-RL-FailureInd", "nbap.CCTrCH_InformationList_RL_FailureInd_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_RL_InformationList_RL_PreemptRequiredInd_item, - { "RL-InformationList-RL-PreemptRequiredInd", "nbap.RL_InformationList_RL_PreemptRequiredInd_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_rL_04, @@ -58827,7 +58827,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.RL_InformationList_RL_RestoreInd", HFILL }}, { &hf_nbap_RL_InformationList_RL_RestoreInd_item, - { "RL-InformationList-RL-RestoreInd", "nbap.RL_InformationList_RL_RestoreInd_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_rL_Set_InformationList_RL_RestoreInd, @@ -58835,7 +58835,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.RL_Set_InformationList_RL_RestoreInd", HFILL }}, { &hf_nbap_RL_Set_InformationList_RL_RestoreInd_item, - { "RL-Set-InformationList-RL-RestoreInd", "nbap.RL_Set_InformationList_RL_RestoreInd_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_cCTrCH_InformationList_RL_RestoreInd, @@ -58843,7 +58843,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.CCTrCH_InformationList_RL_RestoreInd", HFILL }}, { &hf_nbap_CCTrCH_InformationList_RL_RestoreInd_item, - { "CCTrCH-InformationList-RL-RestoreInd", "nbap.CCTrCH_InformationList_RL_RestoreInd_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_privateIEs, @@ -58851,7 +58851,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.PrivateIE_Container", HFILL }}, { &hf_nbap_HSDPA_And_EDCH_CellPortion_InformationList_PSCH_ReconfRqst_item, - { "HSDPA-And-EDCH-CellPortion-InformationList-PSCH-ReconfRqst", "nbap.HSDPA_And_EDCH_CellPortion_InformationList_PSCH_ReconfRqst_item", + { "HSDPA-And-EDCH-CellPortion-InformationItem-PSCH-ReconfRqst", "nbap.HSDPA_And_EDCH_CellPortion_InformationItem_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.HSDPA_And_EDCH_CellPortion_InformationItem_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_hS_PDSCH_HS_SCCH_ScramblingCode_PSCH_ReconfRqst, @@ -58879,7 +58879,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, VALS(nbap_E_RGCH_E_HICH_FDD_Code_Information_vals), 0, "nbap.E_RGCH_E_HICH_FDD_Code_Information", HFILL }}, { &hf_nbap_PDSCHSets_AddList_PSCH_ReconfRqst_item, - { "PDSCHSets-AddList-PSCH-ReconfRqst", "nbap.PDSCHSets_AddList_PSCH_ReconfRqst_item", + { "PDSCHSets-AddItem-PSCH-ReconfRqst", "nbap.PDSCHSets_AddItem_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.PDSCHSets_AddItem_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_pDSCHSet_ID, @@ -58895,7 +58895,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.DL_Timeslot_InformationAddList_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_DL_Timeslot_InformationAddList_PSCH_ReconfRqst_item, - { "DL-Timeslot-InformationAddList-PSCH-ReconfRqst", "nbap.DL_Timeslot_InformationAddList_PSCH_ReconfRqst_item", + { "DL-Timeslot-InformationAddItem-PSCH-ReconfRqst", "nbap.DL_Timeslot_InformationAddItem_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.DL_Timeslot_InformationAddItem_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_dL_Code_InformationAddList_PSCH_ReconfRqst, @@ -58903,7 +58903,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.DL_Code_InformationAddList_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_DL_Code_InformationAddList_PSCH_ReconfRqst_item, - { "DL-Code-InformationAddList-PSCH-ReconfRqst", "nbap.DL_Code_InformationAddList_PSCH_ReconfRqst_item", + { "DL-Code-InformationAddItem-PSCH-ReconfRqst", "nbap.DL_Code_InformationAddItem_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.DL_Code_InformationAddItem_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_pDSCH_ID, @@ -58915,7 +58915,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.DL_Timeslot_InformationAddList_LCR_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_DL_Timeslot_InformationAddList_LCR_PSCH_ReconfRqst_item, - { "DL-Timeslot-InformationAddList-LCR-PSCH-ReconfRqst", "nbap.DL_Timeslot_InformationAddList_LCR_PSCH_ReconfRqst_item", + { "DL-Timeslot-InformationAddItem-LCR-PSCH-ReconfRqst", "nbap.DL_Timeslot_InformationAddItem_LCR_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.DL_Timeslot_InformationAddItem_LCR_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_dL_Code_InformationAddList_LCR_PSCH_ReconfRqst, @@ -58923,7 +58923,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.DL_Code_InformationAddList_LCR_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_DL_Code_InformationAddList_LCR_PSCH_ReconfRqst_item, - { "DL-Code-InformationAddList-LCR-PSCH-ReconfRqst", "nbap.DL_Code_InformationAddList_LCR_PSCH_ReconfRqst_item", + { "DL-Code-InformationAddItem-LCR-PSCH-ReconfRqst", "nbap.DL_Code_InformationAddItem_LCR_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.DL_Code_InformationAddItem_LCR_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_dL_Timeslot_InformationAddList_768_PSCH_ReconfRqst, @@ -58931,7 +58931,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.DL_Timeslot_InformationAddList_768_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_DL_Timeslot_InformationAddList_768_PSCH_ReconfRqst_item, - { "DL-Timeslot-InformationAddList-768-PSCH-ReconfRqst", "nbap.DL_Timeslot_InformationAddList_768_PSCH_ReconfRqst_item", + { "DL-Timeslot-InformationAddItem-768-PSCH-ReconfRqst", "nbap.DL_Timeslot_InformationAddItem_768_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.DL_Timeslot_InformationAddItem_768_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_dL_Code_InformationAddList_768_PSCH_ReconfRqst, @@ -58939,7 +58939,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.DL_Code_InformationAddList_768_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_DL_Code_InformationAddList_768_PSCH_ReconfRqst_item, - { "DL-Code-InformationAddList-768-PSCH-ReconfRqst", "nbap.DL_Code_InformationAddList_768_PSCH_ReconfRqst_item", + { "DL-Code-InformationAddItem-768-PSCH-ReconfRqst", "nbap.DL_Code_InformationAddItem_768_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.DL_Code_InformationAddItem_768_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_pDSCH_ID768, @@ -58947,7 +58947,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.PDSCH_ID768", HFILL }}, { &hf_nbap_PDSCHSets_ModifyList_PSCH_ReconfRqst_item, - { "PDSCHSets-ModifyList-PSCH-ReconfRqst", "nbap.PDSCHSets_ModifyList_PSCH_ReconfRqst_item", + { "PDSCHSets-ModifyItem-PSCH-ReconfRqst", "nbap.PDSCHSets_ModifyItem_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.PDSCHSets_ModifyItem_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_pDSCH_InformationList_01, @@ -58959,7 +58959,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.DL_Timeslot_InformationModifyList_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_DL_Timeslot_InformationModifyList_PSCH_ReconfRqst_item, - { "DL-Timeslot-InformationModifyList-PSCH-ReconfRqst", "nbap.DL_Timeslot_InformationModifyList_PSCH_ReconfRqst_item", + { "DL-Timeslot-InformationModifyItem-PSCH-ReconfRqst", "nbap.DL_Timeslot_InformationModifyItem_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.DL_Timeslot_InformationModifyItem_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_dL_Code_InformationModifyList_PSCH_ReconfRqst, @@ -58967,7 +58967,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.DL_Code_InformationModifyList_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_DL_Code_InformationModifyList_PSCH_ReconfRqst_item, - { "DL-Code-InformationModifyList-PSCH-ReconfRqst", "nbap.DL_Code_InformationModifyList_PSCH_ReconfRqst_item", + { "DL-Code-InformationModifyItem-PSCH-ReconfRqst", "nbap.DL_Code_InformationModifyItem_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.DL_Code_InformationModifyItem_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_dL_Timeslot_LCR_InformationModifyList_PSCH_ReconfRqst, @@ -58975,7 +58975,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.DL_Timeslot_LCR_InformationModifyList_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_DL_Timeslot_LCR_InformationModifyList_PSCH_ReconfRqst_item, - { "DL-Timeslot-LCR-InformationModifyList-PSCH-ReconfRqst", "nbap.DL_Timeslot_LCR_InformationModifyList_PSCH_ReconfRqst_item", + { "DL-Timeslot-LCR-InformationModifyItem-PSCH-ReconfRqst", "nbap.DL_Timeslot_LCR_InformationModifyItem_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.DL_Timeslot_LCR_InformationModifyItem_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_dL_Code_LCR_InformationModifyList_PSCH_ReconfRqst, @@ -58983,7 +58983,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.DL_Code_LCR_InformationModifyList_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_DL_Code_LCR_InformationModifyList_PSCH_ReconfRqst_item, - { "DL-Code-LCR-InformationModifyList-PSCH-ReconfRqst", "nbap.DL_Code_LCR_InformationModifyList_PSCH_ReconfRqst_item", + { "DL-Code-LCR-InformationModifyItem-PSCH-ReconfRqst", "nbap.DL_Code_LCR_InformationModifyItem_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.DL_Code_LCR_InformationModifyItem_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_dL_Timeslot_768_InformationModifyList_PSCH_ReconfRqst, @@ -58991,7 +58991,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.DL_Timeslot_768_InformationModifyList_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_DL_Timeslot_768_InformationModifyList_PSCH_ReconfRqst_item, - { "DL-Timeslot-768-InformationModifyList-PSCH-ReconfRqst", "nbap.DL_Timeslot_768_InformationModifyList_PSCH_ReconfRqst_item", + { "DL-Timeslot-768-InformationModifyItem-PSCH-ReconfRqst", "nbap.DL_Timeslot_768_InformationModifyItem_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.DL_Timeslot_768_InformationModifyItem_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_dL_Code_768_InformationModifyList_PSCH_ReconfRqst, @@ -58999,15 +58999,15 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.DL_Code_768_InformationModifyList_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_DL_Code_768_InformationModifyList_PSCH_ReconfRqst_item, - { "DL-Code-768-InformationModifyList-PSCH-ReconfRqst", "nbap.DL_Code_768_InformationModifyList_PSCH_ReconfRqst_item", + { "DL-Code-768-InformationModifyItem-PSCH-ReconfRqst", "nbap.DL_Code_768_InformationModifyItem_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.DL_Code_768_InformationModifyItem_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_PDSCHSets_DeleteList_PSCH_ReconfRqst_item, - { "PDSCHSets-DeleteList-PSCH-ReconfRqst", "nbap.PDSCHSets_DeleteList_PSCH_ReconfRqst_item", + { "PDSCHSets-DeleteItem-PSCH-ReconfRqst", "nbap.PDSCHSets_DeleteItem_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.PDSCHSets_DeleteItem_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_PUSCHSets_AddList_PSCH_ReconfRqst_item, - { "PUSCHSets-AddList-PSCH-ReconfRqst", "nbap.PUSCHSets_AddList_PSCH_ReconfRqst_item", + { "PUSCHSets-AddItem-PSCH-ReconfRqst", "nbap.PUSCHSets_AddItem_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.PUSCHSets_AddItem_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_pUSCHSet_ID, @@ -59023,7 +59023,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.UL_Timeslot_InformationAddList_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_UL_Timeslot_InformationAddList_PSCH_ReconfRqst_item, - { "UL-Timeslot-InformationAddList-PSCH-ReconfRqst", "nbap.UL_Timeslot_InformationAddList_PSCH_ReconfRqst_item", + { "UL-Timeslot-InformationAddItem-PSCH-ReconfRqst", "nbap.UL_Timeslot_InformationAddItem_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.UL_Timeslot_InformationAddItem_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_uL_Code_InformationAddList_PSCH_ReconfRqst, @@ -59031,7 +59031,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.UL_Code_InformationAddList_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_UL_Code_InformationAddList_PSCH_ReconfRqst_item, - { "UL-Code-InformationAddList-PSCH-ReconfRqst", "nbap.UL_Code_InformationAddList_PSCH_ReconfRqst_item", + { "UL-Code-InformationAddItem-PSCH-ReconfRqst", "nbap.UL_Code_InformationAddItem_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.UL_Code_InformationAddItem_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_uL_Timeslot_InformationAddList_LCR_PSCH_ReconfRqst, @@ -59039,7 +59039,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.UL_Timeslot_InformationAddList_LCR_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_UL_Timeslot_InformationAddList_LCR_PSCH_ReconfRqst_item, - { "UL-Timeslot-InformationAddList-LCR-PSCH-ReconfRqst", "nbap.UL_Timeslot_InformationAddList_LCR_PSCH_ReconfRqst_item", + { "UL-Timeslot-InformationAddItem-LCR-PSCH-ReconfRqst", "nbap.UL_Timeslot_InformationAddItem_LCR_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.UL_Timeslot_InformationAddItem_LCR_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_uL_Code_InformationAddList_LCR_PSCH_ReconfRqst, @@ -59047,7 +59047,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.UL_Code_InformationAddList_LCR_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_UL_Code_InformationAddList_LCR_PSCH_ReconfRqst_item, - { "UL-Code-InformationAddList-LCR-PSCH-ReconfRqst", "nbap.UL_Code_InformationAddList_LCR_PSCH_ReconfRqst_item", + { "UL-Code-InformationAddItem-LCR-PSCH-ReconfRqst", "nbap.UL_Code_InformationAddItem_LCR_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.UL_Code_InformationAddItem_LCR_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_uL_Timeslot_InformationAddList_768_PSCH_ReconfRqst, @@ -59055,7 +59055,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.UL_Timeslot_InformationAddList_768_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_UL_Timeslot_InformationAddList_768_PSCH_ReconfRqst_item, - { "UL-Timeslot-InformationAddList-768-PSCH-ReconfRqst", "nbap.UL_Timeslot_InformationAddList_768_PSCH_ReconfRqst_item", + { "UL-Timeslot-InformationAddItem-768-PSCH-ReconfRqst", "nbap.UL_Timeslot_InformationAddItem_768_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.UL_Timeslot_InformationAddItem_768_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_uL_Code_InformationAddList_768_PSCH_ReconfRqst, @@ -59063,11 +59063,11 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.UL_Code_InformationAddList_768_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_UL_Code_InformationAddList_768_PSCH_ReconfRqst_item, - { "UL-Code-InformationAddList-768-PSCH-ReconfRqst", "nbap.UL_Code_InformationAddList_768_PSCH_ReconfRqst_item", + { "UL-Code-InformationAddItem-768-PSCH-ReconfRqst", "nbap.UL_Code_InformationAddItem_768_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.UL_Code_InformationAddItem_768_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_PUSCHSets_ModifyList_PSCH_ReconfRqst_item, - { "PUSCHSets-ModifyList-PSCH-ReconfRqst", "nbap.PUSCHSets_ModifyList_PSCH_ReconfRqst_item", + { "PUSCHSets-ModifyItem-PSCH-ReconfRqst", "nbap.PUSCHSets_ModifyItem_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.PUSCHSets_ModifyItem_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_pUSCH_InformationList_01, @@ -59079,7 +59079,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.UL_Timeslot_InformationModifyList_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_UL_Timeslot_InformationModifyList_PSCH_ReconfRqst_item, - { "UL-Timeslot-InformationModifyList-PSCH-ReconfRqst", "nbap.UL_Timeslot_InformationModifyList_PSCH_ReconfRqst_item", + { "UL-Timeslot-InformationModifyItem-PSCH-ReconfRqst", "nbap.UL_Timeslot_InformationModifyItem_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.UL_Timeslot_InformationModifyItem_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_uL_Code_InformationModifyList_PSCH_ReconfRqst, @@ -59087,7 +59087,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.UL_Code_InformationModifyList_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_UL_Code_InformationModifyList_PSCH_ReconfRqst_item, - { "UL-Code-InformationModifyList-PSCH-ReconfRqst", "nbap.UL_Code_InformationModifyList_PSCH_ReconfRqst_item", + { "UL-Code-InformationModifyItem-PSCH-ReconfRqst", "nbap.UL_Code_InformationModifyItem_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.UL_Code_InformationModifyItem_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_uL_Timeslot_InformationModifyList_LCR_PSCH_ReconfRqst, @@ -59095,7 +59095,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.UL_Timeslot_LCR_InformationModifyList_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_UL_Timeslot_LCR_InformationModifyList_PSCH_ReconfRqst_item, - { "UL-Timeslot-LCR-InformationModifyList-PSCH-ReconfRqst", "nbap.UL_Timeslot_LCR_InformationModifyList_PSCH_ReconfRqst_item", + { "UL-Timeslot-LCR-InformationModifyItem-PSCH-ReconfRqst", "nbap.UL_Timeslot_LCR_InformationModifyItem_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.UL_Timeslot_LCR_InformationModifyItem_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_uL_Code_LCR_InformationModifyList_PSCH_ReconfRqst, @@ -59103,7 +59103,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.UL_Code_LCR_InformationModifyList_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_UL_Code_LCR_InformationModifyList_PSCH_ReconfRqst_item, - { "UL-Code-LCR-InformationModifyList-PSCH-ReconfRqst", "nbap.UL_Code_LCR_InformationModifyList_PSCH_ReconfRqst_item", + { "UL-Code-LCR-InformationModifyItem-PSCH-ReconfRqst", "nbap.UL_Code_LCR_InformationModifyItem_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.UL_Code_LCR_InformationModifyItem_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_uL_Timeslot_InformationModifyList_768_PSCH_ReconfRqst, @@ -59111,7 +59111,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.UL_Timeslot_768_InformationModifyList_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_UL_Timeslot_768_InformationModifyList_PSCH_ReconfRqst_item, - { "UL-Timeslot-768-InformationModifyList-PSCH-ReconfRqst", "nbap.UL_Timeslot_768_InformationModifyList_PSCH_ReconfRqst_item", + { "UL-Timeslot-768-InformationModifyItem-PSCH-ReconfRqst", "nbap.UL_Timeslot_768_InformationModifyItem_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.UL_Timeslot_768_InformationModifyItem_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_uL_Code_768_InformationModifyList_PSCH_ReconfRqst, @@ -59119,11 +59119,11 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.UL_Code_768_InformationModifyList_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_UL_Code_768_InformationModifyList_PSCH_ReconfRqst_item, - { "UL-Code-768-InformationModifyList-PSCH-ReconfRqst", "nbap.UL_Code_768_InformationModifyList_PSCH_ReconfRqst_item", + { "UL-Code-768-InformationModifyItem-PSCH-ReconfRqst", "nbap.UL_Code_768_InformationModifyItem_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.UL_Code_768_InformationModifyItem_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_PUSCHSets_DeleteList_PSCH_ReconfRqst_item, - { "PUSCHSets-DeleteList-PSCH-ReconfRqst", "nbap.PUSCHSets_DeleteList_PSCH_ReconfRqst_item", + { "PUSCHSets-DeleteItem-PSCH-ReconfRqst", "nbap.PUSCHSets_DeleteItem_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.PUSCHSets_DeleteItem_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_dL_HS_PDSCH_Timeslot_Information_PSCH_ReconfRqst, @@ -59131,7 +59131,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.DL_HS_PDSCH_Timeslot_Information_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_DL_HS_PDSCH_Timeslot_Information_PSCH_ReconfRqst_item, - { "DL-HS-PDSCH-Timeslot-Information-PSCH-ReconfRqst", "nbap.DL_HS_PDSCH_Timeslot_Information_PSCH_ReconfRqst_item", + { "DL-HS-PDSCH-Timeslot-InformationItem-PSCH-ReconfRqst", "nbap.DL_HS_PDSCH_Timeslot_InformationItem_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.DL_HS_PDSCH_Timeslot_InformationItem_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_dl_HS_PDSCH_Codelist_PSCH_ReconfRqst, @@ -59139,11 +59139,11 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.DL_HS_PDSCH_Codelist_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_DL_HS_PDSCH_Codelist_PSCH_ReconfRqst_item, - { "DL-HS-PDSCH-Codelist-PSCH-ReconfRqst", "nbap.DL_HS_PDSCH_Codelist_PSCH_ReconfRqst_item", + { "TDD-ChannelisationCode", "nbap.TDD_ChannelisationCode", FT_UINT32, BASE_DEC, VALS(nbap_TDD_ChannelisationCode_vals), 0, "nbap.TDD_ChannelisationCode", HFILL }}, { &hf_nbap_DL_HS_PDSCH_Timeslot_Information_768_PSCH_ReconfRqst_item, - { "DL-HS-PDSCH-Timeslot-Information-768-PSCH-ReconfRqst", "nbap.DL_HS_PDSCH_Timeslot_Information_768_PSCH_ReconfRqst_item", + { "DL-HS-PDSCH-Timeslot-InformationItem-768-PSCH-ReconfRqst", "nbap.DL_HS_PDSCH_Timeslot_InformationItem_768_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.DL_HS_PDSCH_Timeslot_InformationItem_768_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_dl_HS_PDSCH_Codelist_768_PSCH_ReconfRqst, @@ -59151,11 +59151,11 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.DL_HS_PDSCH_Codelist_768_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_DL_HS_PDSCH_Codelist_768_PSCH_ReconfRqst_item, - { "DL-HS-PDSCH-Codelist-768-PSCH-ReconfRqst", "nbap.DL_HS_PDSCH_Codelist_768_PSCH_ReconfRqst_item", + { "TDD-ChannelisationCode768", "nbap.TDD_ChannelisationCode768", FT_UINT32, BASE_DEC, VALS(nbap_TDD_ChannelisationCode768_vals), 0, "nbap.TDD_ChannelisationCode768", HFILL }}, { &hf_nbap_MultipleFreq_DL_HS_PDSCH_Timeslot_Information_LCR_PSCH_ReconfRqst_item, - { "MultipleFreq-DL-HS-PDSCH-Timeslot-Information-LCR-PSCH-ReconfRqst", "nbap.MultipleFreq_DL_HS_PDSCH_Timeslot_Information_LCR_PSCH_ReconfRqst_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_hS_SCCH_Information_PSCH_ReconfRqst, @@ -59167,7 +59167,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.HS_SCCH_Information_LCR_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_HS_SCCH_Information_PSCH_ReconfRqst_item, - { "HS-SCCH-Information-PSCH-ReconfRqst", "nbap.HS_SCCH_Information_PSCH_ReconfRqst_item", + { "HS-SCCH-InformationItem-PSCH-ReconfRqst", "nbap.HS_SCCH_InformationItem_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.HS_SCCH_InformationItem_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_hS_SCCH_ID, @@ -59183,7 +59183,7 @@ void proto_register_nbap(void) { FT_NONE, BASE_NONE, NULL, 0, "nbap.HS_SICH_Information_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_HS_SCCH_Information_LCR_PSCH_ReconfRqst_item, - { "HS-SCCH-Information-LCR-PSCH-ReconfRqst", "nbap.HS_SCCH_Information_LCR_PSCH_ReconfRqst_item", + { "HS-SCCH-InformationItem-LCR-PSCH-ReconfRqst", "nbap.HS_SCCH_InformationItem_LCR_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.HS_SCCH_InformationItem_LCR_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_hS_SICH_Information_LCR, @@ -59191,7 +59191,7 @@ void proto_register_nbap(void) { FT_NONE, BASE_NONE, NULL, 0, "nbap.HS_SICH_Information_LCR_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_HS_SCCH_Information_768_PSCH_ReconfRqst_item, - { "HS-SCCH-Information-768-PSCH-ReconfRqst", "nbap.HS_SCCH_Information_768_PSCH_ReconfRqst_item", + { "HS-SCCH-InformationItem-768-PSCH-ReconfRqst", "nbap.HS_SCCH_InformationItem_768_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.HS_SCCH_InformationItem_768_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_hS_SICH_Information_768, @@ -59199,7 +59199,7 @@ void proto_register_nbap(void) { FT_NONE, BASE_NONE, NULL, 0, "nbap.HS_SICH_Information_768_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_HS_SCCH_InformationExt_LCR_PSCH_ReconfRqst_item, - { "HS-SCCH-InformationExt-LCR-PSCH-ReconfRqst", "nbap.HS_SCCH_InformationExt_LCR_PSCH_ReconfRqst_item", + { "HS-SCCH-InformationItem-LCR-PSCH-ReconfRqst", "nbap.HS_SCCH_InformationItem_LCR_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.HS_SCCH_InformationItem_LCR_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_hS_SCCH_InformationModify_PSCH_ReconfRqst, @@ -59215,7 +59215,7 @@ void proto_register_nbap(void) { FT_NONE, BASE_NONE, NULL, 0, "nbap.HS_SICH_InformationModify_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_HS_SCCH_InformationModify_LCR_PSCH_ReconfRqst_item, - { "HS-SCCH-InformationModify-LCR-PSCH-ReconfRqst", "nbap.HS_SCCH_InformationModify_LCR_PSCH_ReconfRqst_item", + { "HS-SCCH-InformationModifyItem-LCR-PSCH-ReconfRqst", "nbap.HS_SCCH_InformationModifyItem_LCR_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.HS_SCCH_InformationModifyItem_LCR_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_hS_SICH_Information_LCR_01, @@ -59223,11 +59223,11 @@ void proto_register_nbap(void) { FT_NONE, BASE_NONE, NULL, 0, "nbap.HS_SICH_InformationModify_LCR_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_HS_SCCH_InformationModifyExt_LCR_PSCH_ReconfRqst_item, - { "HS-SCCH-InformationModifyExt-LCR-PSCH-ReconfRqst", "nbap.HS_SCCH_InformationModifyExt_LCR_PSCH_ReconfRqst_item", + { "HS-SCCH-InformationModifyItem-LCR-PSCH-ReconfRqst", "nbap.HS_SCCH_InformationModifyItem_LCR_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.HS_SCCH_InformationModifyItem_LCR_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_HS_SCCH_InformationModify_768_PSCH_ReconfRqst_item, - { "HS-SCCH-InformationModify-768-PSCH-ReconfRqst", "nbap.HS_SCCH_InformationModify_768_PSCH_ReconfRqst_item", + { "HS-SCCH-InformationModifyItem-768-PSCH-ReconfRqst", "nbap.HS_SCCH_InformationModifyItem_768_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.HS_SCCH_InformationModifyItem_768_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_hS_SICH_Information_768_01, @@ -59235,11 +59235,11 @@ void proto_register_nbap(void) { FT_NONE, BASE_NONE, NULL, 0, "nbap.HS_SICH_InformationModify_768_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_HS_SCCH_InformationModify_PSCH_ReconfRqst_item, - { "HS-SCCH-InformationModify-PSCH-ReconfRqst", "nbap.HS_SCCH_InformationModify_PSCH_ReconfRqst_item", + { "HS-SCCH-InformationModifyItem-PSCH-ReconfRqst", "nbap.HS_SCCH_InformationModifyItem_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.HS_SCCH_InformationModifyItem_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_Delete_From_HS_SCCH_Resource_Pool_PSCH_ReconfRqst_item, - { "Delete-From-HS-SCCH-Resource-Pool-PSCH-ReconfRqst", "nbap.Delete_From_HS_SCCH_Resource_Pool_PSCH_ReconfRqst_item", + { "Delete-From-HS-SCCH-Resource-PoolItem-PSCH-ReconfRqst", "nbap.Delete_From_HS_SCCH_Resource_PoolItem_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.Delete_From_HS_SCCH_Resource_PoolItem_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_lTGI_Presence, @@ -59255,7 +59255,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.E_PUCH_Timeslot_Info", HFILL }}, { &hf_nbap_E_PUCH_Timeslot_Info_item, - { "E-PUCH-Timeslot-Info", "nbap.E_PUCH_Timeslot_Info_item", + { "TimeSlot", "nbap.TimeSlot", FT_UINT32, BASE_DEC, NULL, 0, "nbap.TimeSlot", HFILL }}, { &hf_nbap_e_AGCH_Information_PSCH_ReconfRqst, @@ -59263,7 +59263,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.E_AGCH_Information_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_E_AGCH_Information_PSCH_ReconfRqst_item, - { "E-AGCH-Information-PSCH-ReconfRqst", "nbap.E_AGCH_Information_PSCH_ReconfRqst_item", + { "E-AGCH-InformationItem-PSCH-ReconfRqst", "nbap.E_AGCH_InformationItem_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.E_AGCH_InformationItem_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_e_AGCH_MaxPower, @@ -59275,11 +59275,11 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.E_AGCH_InformationModify_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_E_AGCH_InformationModify_PSCH_ReconfRqst_item, - { "E-AGCH-InformationModify-PSCH-ReconfRqst", "nbap.E_AGCH_InformationModify_PSCH_ReconfRqst_item", + { "E-AGCH-InformationModifyItem-PSCH-ReconfRqst", "nbap.E_AGCH_InformationModifyItem_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.E_AGCH_InformationModifyItem_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_Delete_From_E_AGCH_Resource_Pool_PSCH_ReconfRqst_item, - { "Delete-From-E-AGCH-Resource-Pool-PSCH-ReconfRqst", "nbap.Delete_From_E_AGCH_Resource_Pool_PSCH_ReconfRqst_item", + { "Delete-From-E-AGCH-Resource-PoolItem-PSCH-ReconfRqst", "nbap.Delete_From_E_AGCH_Resource_PoolItem_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.Delete_From_E_AGCH_Resource_PoolItem_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_e_HICH_MaxPower, @@ -59291,7 +59291,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.E_AGCH_Information_768_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_E_AGCH_Information_768_PSCH_ReconfRqst_item, - { "E-AGCH-Information-768-PSCH-ReconfRqst", "nbap.E_AGCH_Information_768_PSCH_ReconfRqst_item", + { "E-AGCH-InformationItem-768-PSCH-ReconfRqst", "nbap.E_AGCH_InformationItem_768_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.E_AGCH_InformationItem_768_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_e_AGCH_InformationModify_768_PSCH_ReconfRqst, @@ -59299,7 +59299,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.E_AGCH_InformationModify_768_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_E_AGCH_InformationModify_768_PSCH_ReconfRqst_item, - { "E-AGCH-InformationModify-768-PSCH-ReconfRqst", "nbap.E_AGCH_InformationModify_768_PSCH_ReconfRqst_item", + { "E-AGCH-InformationModifyItem-768-PSCH-ReconfRqst", "nbap.E_AGCH_InformationModifyItem_768_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.E_AGCH_InformationModifyItem_768_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_e_PUCH_Timeslot_InfoLCR, @@ -59307,7 +59307,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.E_PUCH_Timeslot_InfoLCR", HFILL }}, { &hf_nbap_E_PUCH_Timeslot_InfoLCR_item, - { "E-PUCH-Timeslot-InfoLCR", "nbap.E_PUCH_Timeslot_InfoLCR_item", + { "E-PUCH-Timeslot-Item-InfoLCR", "nbap.E_PUCH_Timeslot_Item_InfoLCR", FT_NONE, BASE_NONE, NULL, 0, "nbap.E_PUCH_Timeslot_Item_InfoLCR", HFILL }}, { &hf_nbap_e_PUCH_Codelist_LCR, @@ -59315,7 +59315,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.E_PUCH_Codelist_LCR", HFILL }}, { &hf_nbap_E_PUCH_Codelist_LCR_item, - { "E-PUCH-Codelist-LCR", "nbap.E_PUCH_Codelist_LCR_item", + { "TDD-ChannelisationCode", "nbap.TDD_ChannelisationCode", FT_UINT32, BASE_DEC, VALS(nbap_TDD_ChannelisationCode_vals), 0, "nbap.TDD_ChannelisationCode", HFILL }}, { &hf_nbap_e_AGCH_Information_LCR_PSCH_ReconfRqst, @@ -59323,7 +59323,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.E_AGCH_Information_LCR_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_E_AGCH_Information_LCR_PSCH_ReconfRqst_item, - { "E-AGCH-Information-LCR-PSCH-ReconfRqst", "nbap.E_AGCH_Information_LCR_PSCH_ReconfRqst_item", + { "E-AGCH-InformationItem-LCR-PSCH-ReconfRqst", "nbap.E_AGCH_InformationItem_LCR_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.E_AGCH_InformationItem_LCR_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_e_AGCH_InformationModify_LCR_PSCH_ReconfRqst, @@ -59331,7 +59331,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.E_AGCH_InformationModify_LCR_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_E_AGCH_InformationModify_LCR_PSCH_ReconfRqst_item, - { "E-AGCH-InformationModify-LCR-PSCH-ReconfRqst", "nbap.E_AGCH_InformationModify_LCR_PSCH_ReconfRqst_item", + { "E-AGCH-InformationModifyItem-LCR-PSCH-ReconfRqst", "nbap.E_AGCH_InformationModifyItem_LCR_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.E_AGCH_InformationModifyItem_LCR_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_e_HICH_Information_LCR_PSCH_ReconfRqst, @@ -59339,7 +59339,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.E_HICH_Information_LCR_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_E_HICH_Information_LCR_PSCH_ReconfRqst_item, - { "E-HICH-Information-LCR-PSCH-ReconfRqst", "nbap.E_HICH_Information_LCR_PSCH_ReconfRqst_item", + { "E-HICH-InformationItem-LCR-PSCH-ReconfRqst", "nbap.E_HICH_InformationItem_LCR_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.E_HICH_InformationItem_LCR_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_e_HICH_Type, @@ -59351,11 +59351,11 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.E_HICH_InformationModify_LCR_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_E_HICH_InformationModify_LCR_PSCH_ReconfRqst_item, - { "E-HICH-InformationModify-LCR-PSCH-ReconfRqst", "nbap.E_HICH_InformationModify_LCR_PSCH_ReconfRqst_item", + { "E-HICH-InformationModifyItem-LCR-PSCH-ReconfRqst", "nbap.E_HICH_InformationModifyItem_LCR_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.E_HICH_InformationModifyItem_LCR_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_Delete_From_E_HICH_Resource_Pool_PSCH_ReconfRqst_item, - { "Delete-From-E-HICH-Resource-Pool-PSCH-ReconfRqst", "nbap.Delete_From_E_HICH_Resource_Pool_PSCH_ReconfRqst_item", + { "Delete-From-E-HICH-Resource-PoolItem-PSCH-ReconfRqst", "nbap.Delete_From_E_HICH_Resource_PoolItem_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.Delete_From_E_HICH_Resource_PoolItem_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_eRUCCH_SYNC_UL_codes_bitmap, @@ -59363,15 +59363,15 @@ void proto_register_nbap(void) { FT_BYTES, BASE_HEX, NULL, 0, "nbap.BIT_STRING_SIZE_8", HFILL }}, { &hf_nbap_Delete_From_HS_SCCH_Resource_PoolExt_PSCH_ReconfRqst_item, - { "Delete-From-HS-SCCH-Resource-PoolExt-PSCH-ReconfRqst", "nbap.Delete_From_HS_SCCH_Resource_PoolExt_PSCH_ReconfRqst_item", + { "Delete-From-HS-SCCH-Resource-PoolItem-PSCH-ReconfRqst", "nbap.Delete_From_HS_SCCH_Resource_PoolItem_PSCH_ReconfRqst", FT_NONE, BASE_NONE, NULL, 0, "nbap.Delete_From_HS_SCCH_Resource_PoolItem_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_MultipleFreq_E_PUCH_Timeslot_InformationList_LCR_PSCH_ReconfRqst_item, - { "MultipleFreq-E-PUCH-Timeslot-InformationList-LCR-PSCH-ReconfRqst", "nbap.MultipleFreq_E_PUCH_Timeslot_InformationList_LCR_PSCH_ReconfRqst_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_E_HICH_TimeOffset_ExtensionLCR_item, - { "E-HICH-TimeOffset-ExtensionLCR", "nbap.E_HICH_TimeOffset_ExtensionLCR_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_e_HICH_TimeOffsetLCR, @@ -59399,15 +59399,15 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.Unsuccessful_PUSCHSetList_PSCH_ReconfFailureTDD", HFILL }}, { &hf_nbap_Unsuccessful_PDSCHSetList_PSCH_ReconfFailureTDD_item, - { "Unsuccessful-PDSCHSetList-PSCH-ReconfFailureTDD", "nbap.Unsuccessful_PDSCHSetList_PSCH_ReconfFailureTDD_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_Unsuccessful_PUSCHSetList_PSCH_ReconfFailureTDD_item, - { "Unsuccessful-PUSCHSetList-PSCH-ReconfFailureTDD", "nbap.Unsuccessful_PUSCHSetList_PSCH_ReconfFailureTDD_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_UARFCNSpecificCauseList_PSCH_ReconfFailureTDD_item, - { "UARFCNSpecificCauseList-PSCH-ReconfFailureTDD", "nbap.UARFCNSpecificCauseList_PSCH_ReconfFailureTDD_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_communicationContext, @@ -59427,7 +59427,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.CommunicationContextInfoList_Reset", HFILL }}, { &hf_nbap_CommunicationContextInfoList_Reset_item, - { "CommunicationContextInfoList-Reset", "nbap.CommunicationContextInfoList_Reset_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_communicationContextType_Reset, @@ -59443,7 +59443,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.CommunicationControlPortInfoList_Reset", HFILL }}, { &hf_nbap_CommunicationControlPortInfoList_Reset_item, - { "CommunicationControlPortInfoList-Reset", "nbap.CommunicationControlPortInfoList_Reset_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_cell_03, @@ -59467,7 +59467,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, VALS(nbap_RequestedDataValueInformation_vals), 0, "nbap.RequestedDataValueInformation", HFILL }}, { &hf_nbap_TimeslotInfo_CellSyncInitiationRqstTDD_item, - { "TimeslotInfo-CellSyncInitiationRqstTDD", "nbap.TimeslotInfo_CellSyncInitiationRqstTDD_item", + { "TimeSlot", "nbap.TimeSlot", FT_UINT32, BASE_DEC, NULL, 0, "nbap.TimeSlot", HFILL }}, { &hf_nbap_cSBTransmissionID, @@ -59499,7 +59499,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.SYNCDlCodeId", HFILL }}, { &hf_nbap_CellSyncBurstTransReconfInfo_CellSyncReconfRqstTDD_item, - { "CellSyncBurstTransReconfInfo-CellSyncReconfRqstTDD", "nbap.CellSyncBurstTransReconfInfo_CellSyncReconfRqstTDD_item", + { "CellSyncBurstTransInfoItem-CellSyncReconfRqstTDD", "nbap.CellSyncBurstTransInfoItem_CellSyncReconfRqstTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.CellSyncBurstTransInfoItem_CellSyncReconfRqstTDD", HFILL }}, { &hf_nbap_syncFrameNumberToTransmit, @@ -59523,7 +59523,7 @@ void proto_register_nbap(void) { FT_NONE, BASE_NONE, NULL, 0, "nbap.SynchronisationReportCharacteristicsIE", HFILL }}, { &hf_nbap_CellSyncBurstMeasInfoListIE_CellSyncReconfRqstTDD_item, - { "CellSyncBurstMeasInfoListIE-CellSyncReconfRqstTDD", "nbap.CellSyncBurstMeasInfoListIE_CellSyncReconfRqstTDD_item", + { "CellSyncBurstMeasInfoItem-CellSyncReconfRqstTDD", "nbap.CellSyncBurstMeasInfoItem_CellSyncReconfRqstTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.CellSyncBurstMeasInfoItem_CellSyncReconfRqstTDD", HFILL }}, { &hf_nbap_syncFrameNrToReceive, @@ -59535,11 +59535,11 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.CellSyncBurstInfoList_CellSyncReconfRqstTDD", HFILL }}, { &hf_nbap_CellSyncBurstInfoList_CellSyncReconfRqstTDD_item, - { "CellSyncBurstInfoList-CellSyncReconfRqstTDD", "nbap.CellSyncBurstInfoList_CellSyncReconfRqstTDD_item", + { "CellSyncBurstInfoItem-CellSyncReconfRqstTDD", "nbap.CellSyncBurstInfoItem_CellSyncReconfRqstTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.CellSyncBurstInfoItem_CellSyncReconfRqstTDD", HFILL }}, { &hf_nbap_SYNCDlCodeIdTransReconfInfoLCR_CellSyncReconfRqstTDD_item, - { "SYNCDlCodeIdTransReconfInfoLCR-CellSyncReconfRqstTDD", "nbap.SYNCDlCodeIdTransReconfInfoLCR_CellSyncReconfRqstTDD_item", + { "SYNCDlCodeIdTransReconfItemLCR-CellSyncReconfRqstTDD", "nbap.SYNCDlCodeIdTransReconfItemLCR_CellSyncReconfRqstTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.SYNCDlCodeIdTransReconfItemLCR_CellSyncReconfRqstTDD", HFILL }}, { &hf_nbap_syncFrameNumberforTransmit, @@ -59551,7 +59551,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.SYNCDlCodeIdMeasInfoList_CellSyncReconfRqstTDD", HFILL }}, { &hf_nbap_SYNCDlCodeIdMeasInfoList_CellSyncReconfRqstTDD_item, - { "SYNCDlCodeIdMeasInfoList-CellSyncReconfRqstTDD", "nbap.SYNCDlCodeIdMeasInfoList_CellSyncReconfRqstTDD_item", + { "SYNCDlCodeIdMeasInfoItem-CellSyncReconfRqstTDD", "nbap.SYNCDlCodeIdMeasInfoItem_CellSyncReconfRqstTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.SYNCDlCodeIdMeasInfoItem_CellSyncReconfRqstTDD", HFILL }}, { &hf_nbap_sYNCDlCodeIdInfoLCR, @@ -59559,7 +59559,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.SYNCDlCodeIdInfoListLCR_CellSyncReconfRqstTDD", HFILL }}, { &hf_nbap_SYNCDlCodeIdInfoListLCR_CellSyncReconfRqstTDD_item, - { "SYNCDlCodeIdInfoListLCR-CellSyncReconfRqstTDD", "nbap.SYNCDlCodeIdInfoListLCR_CellSyncReconfRqstTDD_item", + { "SYNCDlCodeIdInfoItemLCR-CellSyncReconfRqstTDD", "nbap.SYNCDlCodeIdInfoItemLCR_CellSyncReconfRqstTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.SYNCDlCodeIdInfoItemLCR_CellSyncReconfRqstTDD", HFILL }}, { &hf_nbap_propagationDelayCompensation, @@ -59567,7 +59567,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, VALS(nbap_TimingAdjustmentValueLCR_vals), 0, "nbap.TimingAdjustmentValueLCR", HFILL }}, { &hf_nbap_CellAdjustmentInfo_SyncAdjustmentRqstTDD_item, - { "CellAdjustmentInfo-SyncAdjustmentRqstTDD", "nbap.CellAdjustmentInfo_SyncAdjustmentRqstTDD_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_frameAdjustmentValue, @@ -59595,11 +59595,11 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.Unsuccessful_cell_InformationRespList_SyncAdjustmntFailureTDD", HFILL }}, { &hf_nbap_Unsuccessful_cell_InformationRespList_SyncAdjustmntFailureTDD_item, - { "Unsuccessful-cell-InformationRespList-SyncAdjustmntFailureTDD", "nbap.Unsuccessful_cell_InformationRespList_SyncAdjustmntFailureTDD_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_CellSyncInfo_CellSyncReprtTDD_item, - { "CellSyncInfo-CellSyncReprtTDD", "nbap.CellSyncInfo_CellSyncReprtTDD_item", + { "CellSyncInfoItemIE-CellSyncReprtTDD", "nbap.CellSyncInfoItemIE_CellSyncReprtTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.CellSyncInfoItemIE_CellSyncReprtTDD", HFILL }}, { &hf_nbap_c_ID_CellSyncReprtTDD, @@ -59627,7 +59627,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.CellSyncBurstMeasInfoList_CellSyncReprtTDD", HFILL }}, { &hf_nbap_CellSyncBurstMeasInfoList_CellSyncReprtTDD_item, - { "CellSyncBurstMeasInfoList-CellSyncReprtTDD", "nbap.CellSyncBurstMeasInfoList_CellSyncReprtTDD_item", + { "CellSyncBurstMeasInfoItem-CellSyncReprtTDD", "nbap.CellSyncBurstMeasInfoItem_CellSyncReprtTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.CellSyncBurstMeasInfoItem_CellSyncReprtTDD", HFILL }}, { &hf_nbap_cellSyncBurstInfo_CellSyncReprtTDD, @@ -59635,7 +59635,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.SEQUENCE_SIZE_1_maxNrOfReceptsPerSyncFrame_OF_CellSyncBurstInfo_CellSyncReprtTDD", HFILL }}, { &hf_nbap_cellSyncBurstInfo_CellSyncReprtTDD_item, - { "cellSyncBurstInfo-CellSyncReprtTDD", "nbap.cellSyncBurstInfo_CellSyncReprtTDD_item", + { "CellSyncBurstInfo-CellSyncReprtTDD", "nbap.CellSyncBurstInfo_CellSyncReprtTDD", FT_UINT32, BASE_DEC, VALS(nbap_CellSyncBurstInfo_CellSyncReprtTDD_vals), 0, "nbap.CellSyncBurstInfo_CellSyncReprtTDD", HFILL }}, { &hf_nbap_cellSyncBurstAvailable, @@ -59651,7 +59651,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.CellSyncBurstSIR", HFILL }}, { &hf_nbap_SyncDLCodeIdsMeasInfoList_CellSyncReprtTDD_item, - { "SyncDLCodeIdsMeasInfoList-CellSyncReprtTDD", "nbap.SyncDLCodeIdsMeasInfoList_CellSyncReprtTDD_item", + { "SyncDLCodeIdsMeasInfoItem-CellSyncReprtTDD", "nbap.SyncDLCodeIdsMeasInfoItem_CellSyncReprtTDD", FT_NONE, BASE_NONE, NULL, 0, "nbap.SyncDLCodeIdsMeasInfoItem_CellSyncReprtTDD", HFILL }}, { &hf_nbap_syncDLCodeIdInfo_CellSyncReprtTDD, @@ -59659,7 +59659,7 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.SyncDLCodeIdInfo_CellSyncReprtTDD", HFILL }}, { &hf_nbap_SyncDLCodeIdInfo_CellSyncReprtTDD_item, - { "SyncDLCodeIdInfo-CellSyncReprtTDD", "nbap.SyncDLCodeIdInfo_CellSyncReprtTDD_item", + { "SyncDLCodeIdItem-CellSyncReprtTDD", "nbap.SyncDLCodeIdItem_CellSyncReprtTDD", FT_UINT32, BASE_DEC, VALS(nbap_SyncDLCodeIdItem_CellSyncReprtTDD_vals), 0, "nbap.SyncDLCodeIdItem_CellSyncReprtTDD", HFILL }}, { &hf_nbap_syncDLCodeIdAvailable, @@ -59679,27 +59679,27 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, NULL, 0, "nbap.CellSyncBurstSIR", HFILL }}, { &hf_nbap_DCH_RearrangeList_Bearer_RearrangeInd_item, - { "DCH-RearrangeList-Bearer-RearrangeInd", "nbap.DCH_RearrangeList_Bearer_RearrangeInd_item", + { "DCH-RearrangeItem-Bearer-RearrangeInd", "nbap.DCH_RearrangeItem_Bearer_RearrangeInd", FT_NONE, BASE_NONE, NULL, 0, "nbap.DCH_RearrangeItem_Bearer_RearrangeInd", HFILL }}, { &hf_nbap_DSCH_RearrangeList_Bearer_RearrangeInd_item, - { "DSCH-RearrangeList-Bearer-RearrangeInd", "nbap.DSCH_RearrangeList_Bearer_RearrangeInd_item", + { "DSCH-RearrangeItem-Bearer-RearrangeInd", "nbap.DSCH_RearrangeItem_Bearer_RearrangeInd", FT_NONE, BASE_NONE, NULL, 0, "nbap.DSCH_RearrangeItem_Bearer_RearrangeInd", HFILL }}, { &hf_nbap_USCH_RearrangeList_Bearer_RearrangeInd_item, - { "USCH-RearrangeList-Bearer-RearrangeInd", "nbap.USCH_RearrangeList_Bearer_RearrangeInd_item", + { "USCH-RearrangeItem-Bearer-RearrangeInd", "nbap.USCH_RearrangeItem_Bearer_RearrangeInd", FT_NONE, BASE_NONE, NULL, 0, "nbap.USCH_RearrangeItem_Bearer_RearrangeInd", HFILL }}, { &hf_nbap_HSDSCH_RearrangeList_Bearer_RearrangeInd_item, - { "HSDSCH-RearrangeList-Bearer-RearrangeInd", "nbap.HSDSCH_RearrangeList_Bearer_RearrangeInd_item", + { "HSDSCH-RearrangeItem-Bearer-RearrangeInd", "nbap.HSDSCH_RearrangeItem_Bearer_RearrangeInd", FT_NONE, BASE_NONE, NULL, 0, "nbap.HSDSCH_RearrangeItem_Bearer_RearrangeInd", HFILL }}, { &hf_nbap_E_DCH_RearrangeList_Bearer_RearrangeInd_item, - { "E-DCH-RearrangeList-Bearer-RearrangeInd", "nbap.E_DCH_RearrangeList_Bearer_RearrangeInd_item", + { "E-DCH-RearrangeItem-Bearer-RearrangeInd", "nbap.E_DCH_RearrangeItem_Bearer_RearrangeInd", FT_NONE, BASE_NONE, NULL, 0, "nbap.E_DCH_RearrangeItem_Bearer_RearrangeInd", HFILL }}, { &hf_nbap_DelayedActivationInformationList_RL_ActivationCmdFDD_item, - { "DelayedActivationInformationList-RL-ActivationCmdFDD", "nbap.DelayedActivationInformationList_RL_ActivationCmdFDD_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_delayed_activation_update, @@ -59707,11 +59707,11 @@ void proto_register_nbap(void) { FT_UINT32, BASE_DEC, VALS(nbap_DelayedActivationUpdate_vals), 0, "nbap.DelayedActivationUpdate", HFILL }}, { &hf_nbap_DelayedActivationInformationList_RL_ActivationCmdTDD_item, - { "DelayedActivationInformationList-RL-ActivationCmdTDD", "nbap.DelayedActivationInformationList_RL_ActivationCmdTDD_item", + { "ProtocolIE-Single-Container", "nbap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "nbap.ProtocolIE_Single_Container", HFILL }}, { &hf_nbap_Additional_HS_Cell_Information_RL_Param_Upd_item, - { "Additional-HS-Cell-Information-RL-Param-Upd", "nbap.Additional_HS_Cell_Information_RL_Param_Upd_item", + { "Additional-HS-Cell-Information-RL-Param-Upd-ItemIEs", "nbap.Additional_HS_Cell_Information_RL_Param_Upd_ItemIEs", FT_NONE, BASE_NONE, NULL, 0, "nbap.Additional_HS_Cell_Information_RL_Param_Upd_ItemIEs", HFILL }}, { &hf_nbap_hS_DSCH_FDD_Secondary_Serving_Update_Information, diff --git a/epan/dissectors/packet-ns_cert_exts.c b/epan/dissectors/packet-ns_cert_exts.c index a5c87f21af..63cbe0c72e 100644 --- a/epan/dissectors/packet-ns_cert_exts.c +++ b/epan/dissectors/packet-ns_cert_exts.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-ns_cert_exts.c */ -/* ../../tools/asn2wrs.py -b -p ns_cert_exts -c ns_cert_exts.cnf -s packet-ns_cert_exts-template NETSCAPE-CERT-EXTS.asn */ +/* ../../tools/asn2wrs.py -b -p ns_cert_exts -c ./ns_cert_exts.cnf -s ./packet-ns_cert_exts-template -D . NETSCAPE-CERT-EXTS.asn */ /* Input file: packet-ns_cert_exts-template.c */ diff --git a/epan/dissectors/packet-ocsp.c b/epan/dissectors/packet-ocsp.c index bfb13db312..45c628ddc0 100644 --- a/epan/dissectors/packet-ocsp.c +++ b/epan/dissectors/packet-ocsp.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-ocsp.c */ -/* ../../tools/asn2wrs.py -b -p ocsp -c ocsp.cnf -s packet-ocsp-template OCSP.asn */ +/* ../../tools/asn2wrs.py -b -p ocsp -c ./ocsp.cnf -s ./packet-ocsp-template -D . OCSP.asn */ /* Input file: packet-ocsp-template.c */ @@ -763,7 +763,7 @@ void proto_register_ocsp(void) { FT_UINT32, BASE_DEC, NULL, 0, "ocsp.SEQUENCE_OF_Request", HFILL }}, { &hf_ocsp_requestList_item, - { "requestList", "ocsp.requestList_item", + { "Request", "ocsp.Request", FT_NONE, BASE_NONE, NULL, 0, "ocsp.Request", HFILL }}, { &hf_ocsp_requestExtensions, @@ -783,7 +783,7 @@ void proto_register_ocsp(void) { FT_UINT32, BASE_DEC, NULL, 0, "ocsp.SEQUENCE_OF_Certificate", HFILL }}, { &hf_ocsp_certs_item, - { "certs", "ocsp.certs_item", + { "Certificate", "ocsp.Certificate", FT_NONE, BASE_NONE, NULL, 0, "x509af.Certificate", HFILL }}, { &hf_ocsp_reqCert, @@ -843,7 +843,7 @@ void proto_register_ocsp(void) { FT_UINT32, BASE_DEC, NULL, 0, "ocsp.SEQUENCE_OF_SingleResponse", HFILL }}, { &hf_ocsp_responses_item, - { "responses", "ocsp.responses_item", + { "SingleResponse", "ocsp.SingleResponse", FT_NONE, BASE_NONE, NULL, 0, "ocsp.SingleResponse", HFILL }}, { &hf_ocsp_responseExtensions, @@ -899,7 +899,7 @@ void proto_register_ocsp(void) { FT_UINT32, BASE_DEC, VALS(x509ce_CRLReason_vals), 0, "x509ce.CRLReason", HFILL }}, { &hf_ocsp_AcceptableResponses_item, - { "AcceptableResponses", "ocsp.AcceptableResponses_item", + { "AcceptableResponses item", "ocsp.AcceptableResponses_item", FT_OID, BASE_NONE, NULL, 0, "ocsp.OBJECT_IDENTIFIER", HFILL }}, { &hf_ocsp_issuer, diff --git a/epan/dissectors/packet-ocsp.h b/epan/dissectors/packet-ocsp.h index c0ea63f98c..90031e153d 100644 --- a/epan/dissectors/packet-ocsp.h +++ b/epan/dissectors/packet-ocsp.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-ocsp.h */ -/* ../../tools/asn2wrs.py -b -p ocsp -c ocsp.cnf -s packet-ocsp-template OCSP.asn */ +/* ../../tools/asn2wrs.py -b -p ocsp -c ./ocsp.cnf -s ./packet-ocsp-template -D . OCSP.asn */ /* Input file: packet-ocsp-template.h */ diff --git a/epan/dissectors/packet-p7.c b/epan/dissectors/packet-p7.c index 2c6016b6bf..0d83ac1803 100644 --- a/epan/dissectors/packet-p7.c +++ b/epan/dissectors/packet-p7.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-p7.c */ -/* ../../tools/asn2wrs.py -b -e -L -p p7 -c p7.cnf -s packet-p7-template MSAbstractService.asn MSGeneralAttributeTypes.asn MSAccessProtocol.asn */ +/* ../../tools/asn2wrs.py -b -e -L -p p7 -c ./p7.cnf -s ./packet-p7-template -D . MSAbstractService.asn MSGeneralAttributeTypes.asn MSAccessProtocol.asn */ /* Input file: packet-p7-template.c */ @@ -4378,7 +4378,7 @@ void proto_register_p7(void) { FT_UINT32, BASE_DEC, NULL, 0, "p7.AttributeValues", HFILL }}, { &hf_p7_attribute_values_item, - { "attribute-values", "p7.attribute_values_item", + { "attribute-values item", "p7.attribute_values_item", FT_NONE, BASE_NONE, NULL, 0, "p7.AttributeItem", HFILL }}, { &hf_p7_auto_action_type, @@ -4402,11 +4402,11 @@ void proto_register_p7(void) { FT_NONE, BASE_NONE, NULL, 0, "p7.T_error_parameter", HFILL }}, { &hf_p7_MSExtensions_item, - { "MSExtensions", "p7.MSExtensions_item", + { "MSExtensionItem", "p7.MSExtensionItem", FT_NONE, BASE_NONE, NULL, 0, "p7.MSExtensionItem", HFILL }}, { &hf_p7_MessageGroupName_item, - { "MessageGroupName", "p7.MessageGroupName_item", + { "GroupNamePart", "p7.GroupNamePart", FT_STRING, BASE_NONE, NULL, 0, "p7.GroupNamePart", HFILL }}, { &hf_p7_initiator_name, @@ -4442,7 +4442,7 @@ void proto_register_p7(void) { FT_UINT32, BASE_DEC, NULL, 0, "p7.T_allowed_content_types", HFILL }}, { &hf_p7_allowed_content_types_item, - { "allowed-content-types", "p7.allowed_content_types_item", + { "allowed-content-types item", "p7.allowed_content_types_item", FT_OID, BASE_NONE, NULL, 0, "p7.OBJECT_IDENTIFIER", HFILL }}, { &hf_p7_allowed_EITs, @@ -4454,7 +4454,7 @@ void proto_register_p7(void) { FT_INT32, BASE_DEC, NULL, 0, "p7.INTEGER", HFILL }}, { &hf_p7_MS_EITs_item, - { "MS-EITs", "p7.MS_EITs_item", + { "MS-EIT", "p7.MS_EIT", FT_OID, BASE_NONE, NULL, 0, "p7.MS_EIT", HFILL }}, { &hf_p7_responder_credentials, @@ -4466,7 +4466,7 @@ void proto_register_p7(void) { FT_UINT32, BASE_DEC, NULL, 0, "p7.SET_SIZE_1_ub_auto_actions_OF_AutoActionType", HFILL }}, { &hf_p7_available_auto_actions_item, - { "available-auto-actions", "p7.available_auto_actions_item", + { "AutoActionType", "p7.AutoActionType", FT_OID, BASE_NONE, NULL, 0, "p7.AutoActionType", HFILL }}, { &hf_p7_available_attribute_types, @@ -4474,7 +4474,7 @@ void proto_register_p7(void) { FT_UINT32, BASE_DEC, NULL, 0, "p7.SET_SIZE_1_ub_attributes_supported_OF_AttributeType", HFILL }}, { &hf_p7_available_attribute_types_item, - { "available-attribute-types", "p7.available_attribute_types_item", + { "AttributeType", "p7.AttributeType", FT_OID, BASE_NONE, NULL, 0, "p7.AttributeType", HFILL }}, { &hf_p7_alert_indication, @@ -4486,7 +4486,7 @@ void proto_register_p7(void) { FT_UINT32, BASE_DEC, NULL, 0, "p7.T_content_types_supported", HFILL }}, { &hf_p7_content_types_supported_item, - { "content-types-supported", "p7.content_types_supported_item", + { "content-types-supported item", "p7.content_types_supported_item", FT_OID, BASE_NONE, NULL, 0, "p7.OBJECT_IDENTIFIER", HFILL }}, { &hf_p7_entry_classes_supported, @@ -4494,7 +4494,7 @@ void proto_register_p7(void) { FT_UINT32, BASE_DEC, NULL, 0, "p7.SET_SIZE_1_ub_entry_classes_OF_EntryClass", HFILL }}, { &hf_p7_entry_classes_supported_item, - { "entry-classes-supported", "p7.entry_classes_supported_item", + { "EntryClass", "p7.EntryClass", FT_UINT32, BASE_DEC, VALS(p7_EntryClass_vals), 0, "p7.EntryClass", HFILL }}, { &hf_p7_matching_rules_supported, @@ -4502,7 +4502,7 @@ void proto_register_p7(void) { FT_UINT32, BASE_DEC, NULL, 0, "p7.T_matching_rules_supported", HFILL }}, { &hf_p7_matching_rules_supported_item, - { "matching-rules-supported", "p7.matching_rules_supported_item", + { "matching-rules-supported item", "p7.matching_rules_supported_item", FT_OID, BASE_NONE, NULL, 0, "p7.OBJECT_IDENTIFIER", HFILL }}, { &hf_p7_bind_result_extensions, @@ -4522,7 +4522,7 @@ void proto_register_p7(void) { FT_UINT32, BASE_DEC, NULL, 0, "p7.T_unsupported_extensions", HFILL }}, { &hf_p7_unsupported_extensions_item, - { "unsupported-extensions", "p7.unsupported_extensions_item", + { "unsupported-extensions item", "p7.unsupported_extensions_item", FT_OID, BASE_NONE, NULL, 0, "p7.OBJECT_IDENTIFIER", HFILL }}, { &hf_p7_ua_registration_id_unknown, @@ -4534,7 +4534,7 @@ void proto_register_p7(void) { FT_STRING, BASE_NONE, NULL, 0, "p7.GeneralString_SIZE_1_ub_service_information_length", HFILL }}, { &hf_p7_ChangeCredentialsAlgorithms_item, - { "ChangeCredentialsAlgorithms", "p7.ChangeCredentialsAlgorithms_item", + { "ChangeCredentialsAlgorithms item", "p7.ChangeCredentialsAlgorithms_item", FT_OID, BASE_NONE, NULL, 0, "p7.OBJECT_IDENTIFIER", HFILL }}, { &hf_p7_indication_only, @@ -4566,7 +4566,7 @@ void proto_register_p7(void) { FT_UINT32, BASE_DEC, NULL, 0, "p7.T_bind_extension_errors", HFILL }}, { &hf_p7_bind_extension_errors_item, - { "bind-extension-errors", "p7.bind_extension_errors_item", + { "bind-extension-errors item", "p7.bind_extension_errors_item", FT_OID, BASE_NONE, NULL, 0, "p7.OBJECT_IDENTIFIER", HFILL }}, { &hf_p7_sequence_number_range, @@ -4602,7 +4602,7 @@ void proto_register_p7(void) { FT_UINT32, BASE_DEC, NULL, 0, "p7.SET_OF_Filter", HFILL }}, { &hf_p7_and_item, - { "and", "p7.and_item", + { "Filter", "p7.Filter", FT_UINT32, BASE_DEC, VALS(p7_Filter_vals), 0, "p7.Filter", HFILL }}, { &hf_p7_or, @@ -4610,7 +4610,7 @@ void proto_register_p7(void) { FT_UINT32, BASE_DEC, NULL, 0, "p7.SET_OF_Filter", HFILL }}, { &hf_p7_or_item, - { "or", "p7.or_item", + { "Filter", "p7.Filter", FT_UINT32, BASE_DEC, VALS(p7_Filter_vals), 0, "p7.Filter", HFILL }}, { &hf_p7_not, @@ -4634,7 +4634,7 @@ void proto_register_p7(void) { FT_UINT32, BASE_DEC, NULL, 0, "p7.T_strings", HFILL }}, { &hf_p7_strings_item, - { "strings", "p7.strings_item", + { "strings item", "p7.strings_item", FT_UINT32, BASE_DEC, VALS(p7_T_strings_item_vals), 0, "p7.T_strings_item", HFILL }}, { &hf_p7_initial, @@ -4702,7 +4702,7 @@ void proto_register_p7(void) { FT_BYTES, BASE_HEX, NULL, 0, "p7.OverrideRestrictions", HFILL }}, { &hf_p7_EntryInformationSelection_item, - { "EntryInformationSelection", "p7.EntryInformationSelection_item", + { "AttributeSelection", "p7.AttributeSelection", FT_NONE, BASE_NONE, NULL, 0, "p7.AttributeSelection", HFILL }}, { &hf_p7_from, @@ -4722,7 +4722,7 @@ void proto_register_p7(void) { FT_UINT32, BASE_DEC, NULL, 0, "p7.SET_SIZE_1_ub_per_entry_OF_Attribute", HFILL }}, { &hf_p7_attributes_item, - { "attributes", "p7.attributes_item", + { "Attribute", "p7.Attribute", FT_NONE, BASE_NONE, NULL, 0, "p7.Attribute", HFILL }}, { &hf_p7_value_count_exceeded, @@ -4730,7 +4730,7 @@ void proto_register_p7(void) { FT_UINT32, BASE_DEC, NULL, 0, "p7.SET_SIZE_1_ub_per_entry_OF_AttributeValueCount", HFILL }}, { &hf_p7_value_count_exceeded_item, - { "value-count-exceeded", "p7.value_count_exceeded_item", + { "AttributeValueCount", "p7.AttributeValueCount", FT_NONE, BASE_NONE, NULL, 0, "p7.AttributeValueCount", HFILL }}, { &hf_p7_total, @@ -4750,7 +4750,7 @@ void proto_register_p7(void) { FT_UINT32, BASE_DEC, NULL, 0, "p7.SET_SIZE_1_ub_message_groups_OF_MessageGroupName", HFILL }}, { &hf_p7_add_message_group_names_item, - { "add-message-group-names", "p7.add_message_group_names_item", + { "MessageGroupName", "p7.MessageGroupName", FT_UINT32, BASE_DEC, NULL, 0, "p7.MessageGroupName", HFILL }}, { &hf_p7_ms_submission_extensions, @@ -4778,7 +4778,7 @@ void proto_register_p7(void) { FT_UINT32, BASE_DEC, NULL, 0, "p7.SEQUENCE_SIZE_1_ub_summaries_OF_AttributeType", HFILL }}, { &hf_p7_summary_requests_item, - { "summary-requests", "p7.summary_requests_item", + { "AttributeType", "p7.AttributeType", FT_OID, BASE_NONE, NULL, 0, "p7.AttributeType", HFILL }}, { &hf_p7_summarize_extensions, @@ -4802,7 +4802,7 @@ void proto_register_p7(void) { FT_UINT32, BASE_DEC, NULL, 0, "p7.SEQUENCE_SIZE_1_ub_summaries_OF_Summary", HFILL }}, { &hf_p7_summaries_item, - { "summaries", "p7.summaries_item", + { "Summary", "p7.Summary", FT_NONE, BASE_NONE, NULL, 0, "p7.Summary", HFILL }}, { &hf_p7_summarize_result_extensions, @@ -4826,7 +4826,7 @@ void proto_register_p7(void) { FT_UINT32, BASE_DEC, NULL, 0, "p7.T_summary_present", HFILL }}, { &hf_p7_summary_present_item, - { "present", "p7.present_item", + { "present item", "p7.present_item", FT_NONE, BASE_NONE, NULL, 0, "p7.T_summary_present_item", HFILL }}, { &hf_p7_value, @@ -4850,7 +4850,7 @@ void proto_register_p7(void) { FT_UINT32, BASE_DEC, NULL, 0, "p7.SEQUENCE_SIZE_1_ub_messages_OF_EntryInformation", HFILL }}, { &hf_p7_requested_item, - { "requested", "p7.requested_item", + { "EntryInformation", "p7.EntryInformation", FT_NONE, BASE_NONE, NULL, 0, "p7.EntryInformation", HFILL }}, { &hf_p7_list_result_extensions, @@ -4882,7 +4882,7 @@ void proto_register_p7(void) { FT_UINT32, BASE_DEC, NULL, 0, "p7.SEQUENCE_SIZE_1_ub_messages_OF_SequenceNumber", HFILL }}, { &hf_p7_list_item, - { "list", "p7.list_item", + { "SequenceNumber", "p7.SequenceNumber", FT_UINT32, BASE_DEC, NULL, 0, "p7.SequenceNumber", HFILL }}, { &hf_p7_fetch_result_extensions, @@ -4898,7 +4898,7 @@ void proto_register_p7(void) { FT_UINT32, BASE_DEC, NULL, 0, "p7.SET_SIZE_1_ub_messages_OF_SequenceNumber", HFILL }}, { &hf_p7_sequence_numbers_item, - { "sequence-numbers", "p7.sequence_numbers_item", + { "SequenceNumber", "p7.SequenceNumber", FT_UINT32, BASE_DEC, NULL, 0, "p7.SequenceNumber", HFILL }}, { &hf_p7_delete_extensions, @@ -4918,7 +4918,7 @@ void proto_register_p7(void) { FT_UINT32, BASE_DEC, NULL, 0, "p7.SEQUENCE_SIZE_1_ub_messages_OF_SequenceNumber", HFILL }}, { &hf_p7_entries_deleted_94_item, - { "entries-deleted", "p7.entries_deleted_item", + { "SequenceNumber", "p7.SequenceNumber", FT_UINT32, BASE_DEC, NULL, 0, "p7.SequenceNumber", HFILL }}, { &hf_p7_delete_result_extensions, @@ -4930,7 +4930,7 @@ void proto_register_p7(void) { FT_UINT32, BASE_DEC, NULL, 0, "p7.SET_SIZE_1_ub_auto_registrations_OF_AutoActionRegistration", HFILL }}, { &hf_p7_auto_action_registrations_item, - { "auto-action-registrations", "p7.auto_action_registrations_item", + { "AutoActionRegistration", "p7.AutoActionRegistration", FT_NONE, BASE_NONE, NULL, 0, "p7.AutoActionRegistration", HFILL }}, { &hf_p7_auto_action_deregistrations, @@ -4938,7 +4938,7 @@ void proto_register_p7(void) { FT_UINT32, BASE_DEC, NULL, 0, "p7.SET_SIZE_1_ub_auto_registrations_OF_AutoActionDeregistration", HFILL }}, { &hf_p7_auto_action_deregistrations_item, - { "auto-action-deregistrations", "p7.auto_action_deregistrations_item", + { "AutoActionDeregistration", "p7.AutoActionDeregistration", FT_NONE, BASE_NONE, NULL, 0, "p7.AutoActionDeregistration", HFILL }}, { &hf_p7_list_attribute_defaults, @@ -4946,7 +4946,7 @@ void proto_register_p7(void) { FT_UINT32, BASE_DEC, NULL, 0, "p7.SET_SIZE_0_ub_default_registrations_OF_AttributeType", HFILL }}, { &hf_p7_list_attribute_defaults_item, - { "list-attribute-defaults", "p7.list_attribute_defaults_item", + { "AttributeType", "p7.AttributeType", FT_OID, BASE_NONE, NULL, 0, "p7.AttributeType", HFILL }}, { &hf_p7_fetch_attribute_defaults, @@ -4954,7 +4954,7 @@ void proto_register_p7(void) { FT_UINT32, BASE_DEC, NULL, 0, "p7.SET_SIZE_0_ub_default_registrations_OF_AttributeType", HFILL }}, { &hf_p7_fetch_attribute_defaults_item, - { "fetch-attribute-defaults", "p7.fetch_attribute_defaults_item", + { "AttributeType", "p7.AttributeType", FT_OID, BASE_NONE, NULL, 0, "p7.AttributeType", HFILL }}, { &hf_p7_change_credentials, @@ -4974,7 +4974,7 @@ void proto_register_p7(void) { FT_UINT32, BASE_DEC, NULL, 0, "p7.SET_SIZE_1_ub_labels_and_redirections_OF_SecurityLabel", HFILL }}, { &hf_p7_user_security_labels_item, - { "user-security-labels", "p7.user_security_labels_item", + { "SecurityLabel", "p7.SecurityLabel", FT_NONE, BASE_NONE, NULL, 0, "x411.SecurityLabel", HFILL }}, { &hf_p7_ua_registrations, @@ -4982,7 +4982,7 @@ void proto_register_p7(void) { FT_UINT32, BASE_DEC, NULL, 0, "p7.SET_SIZE_1_ub_ua_registrations_OF_UARegistration", HFILL }}, { &hf_p7_ua_registrations_item, - { "ua-registrations", "p7.ua_registrations_item", + { "UARegistration", "p7.UARegistration", FT_NONE, BASE_NONE, NULL, 0, "p7.UARegistration", HFILL }}, { &hf_p7_submission_defaults, @@ -5006,7 +5006,7 @@ void proto_register_p7(void) { FT_UINT32, BASE_DEC, NULL, 0, "p7.SET_SIZE_0_ub_default_registrations_OF_AttributeType", HFILL }}, { &hf_p7_ua_list_attribute_defaults_item, - { "ua-list-attribute-defaults", "p7.ua_list_attribute_defaults_item", + { "AttributeType", "p7.AttributeType", FT_OID, BASE_NONE, NULL, 0, "p7.AttributeType", HFILL }}, { &hf_p7_ua_fetch_attribute_defaults, @@ -5014,7 +5014,7 @@ void proto_register_p7(void) { FT_UINT32, BASE_DEC, NULL, 0, "p7.SET_SIZE_0_ub_default_registrations_OF_AttributeType", HFILL }}, { &hf_p7_ua_fetch_attribute_defaults_item, - { "ua-fetch-attribute-defaults", "p7.ua_fetch_attribute_defaults_item", + { "AttributeType", "p7.AttributeType", FT_OID, BASE_NONE, NULL, 0, "p7.AttributeType", HFILL }}, { &hf_p7_ua_submission_defaults, @@ -5026,7 +5026,7 @@ void proto_register_p7(void) { FT_UINT32, BASE_DEC, NULL, 0, "p7.MSExtensions", HFILL }}, { &hf_p7_MessageGroupRegistrations_item, - { "MessageGroupRegistrations", "p7.MessageGroupRegistrations_item", + { "MessageGroupRegistrations item", "p7.MessageGroupRegistrations_item", FT_UINT32, BASE_DEC, VALS(p7_MessageGroupRegistrations_item_vals), 0, "p7.MessageGroupRegistrations_item", HFILL }}, { &hf_p7_register_group, @@ -5058,7 +5058,7 @@ void proto_register_p7(void) { FT_UINT32, BASE_DEC, NULL, 0, "p7.T_extended_registrations", HFILL }}, { &hf_p7_extended_registrations_item, - { "extended-registrations", "p7.extended_registrations_item", + { "extended-registrations item", "p7.extended_registrations_item", FT_NONE, BASE_NONE, NULL, 0, "p7.T_extended_registrations_item", HFILL }}, { &hf_p7_restrict_message_groups, @@ -5102,7 +5102,7 @@ void proto_register_p7(void) { FT_UINT32, BASE_DEC, NULL, 0, "p7.SET_SIZE_1_ub_default_registrations_OF_AttributeType", HFILL }}, { &hf_p7_registered_list_attribute_defaults_item, - { "list-attribute-defaults", "p7.list_attribute_defaults_item", + { "AttributeType", "p7.AttributeType", FT_OID, BASE_NONE, NULL, 0, "p7.AttributeType", HFILL }}, { &hf_p7_registered_fetch_attribute_defaults, @@ -5110,7 +5110,7 @@ void proto_register_p7(void) { FT_UINT32, BASE_DEC, NULL, 0, "p7.SET_SIZE_1_ub_default_registrations_OF_AttributeType", HFILL }}, { &hf_p7_registered_fetch_attribute_defaults_item, - { "fetch-attribute-defaults", "p7.fetch_attribute_defaults_item", + { "AttributeType", "p7.AttributeType", FT_OID, BASE_NONE, NULL, 0, "p7.AttributeType", HFILL }}, { &hf_p7_registered_message_group_registrations, @@ -5118,7 +5118,7 @@ void proto_register_p7(void) { FT_UINT32, BASE_DEC, NULL, 0, "p7.SET_SIZE_1_ub_message_groups_OF_MessageGroupNameAndDescriptor", HFILL }}, { &hf_p7_registered_message_group_registrations_item, - { "message-group-registrations", "p7.message_group_registrations_item", + { "MessageGroupNameAndDescriptor", "p7.MessageGroupNameAndDescriptor", FT_NONE, BASE_NONE, NULL, 0, "p7.MessageGroupNameAndDescriptor", HFILL }}, { &hf_p7_register_ms_result_extensions, @@ -5142,7 +5142,7 @@ void proto_register_p7(void) { FT_UINT32, BASE_DEC, NULL, 0, "p7.SEQUENCE_SIZE_1_ub_messages_OF_SequenceNumber", HFILL }}, { &hf_p7_specific_entries_item, - { "specific-entries", "p7.specific_entries_item", + { "SequenceNumber", "p7.SequenceNumber", FT_UINT32, BASE_DEC, NULL, 0, "p7.SequenceNumber", HFILL }}, { &hf_p7_modifications, @@ -5150,7 +5150,7 @@ void proto_register_p7(void) { FT_UINT32, BASE_DEC, NULL, 0, "p7.SEQUENCE_SIZE_1_ub_modifications_OF_EntryModification", HFILL }}, { &hf_p7_modifications_item, - { "modifications", "p7.modifications_item", + { "EntryModification", "p7.EntryModification", FT_NONE, BASE_NONE, NULL, 0, "p7.EntryModification", HFILL }}, { &hf_p7_modify_extensions, @@ -5186,7 +5186,7 @@ void proto_register_p7(void) { FT_UINT32, BASE_DEC, NULL, 0, "p7.OrderedAttributeValues", HFILL }}, { &hf_p7_ordered_attribute_values_item, - { "attribute-values", "p7.attribute_values_item", + { "attribute-values item", "p7.attribute_values_item", FT_NONE, BASE_NONE, NULL, 0, "p7.OrderedAttributeItem", HFILL }}, { &hf_p7_ordered_attribute_value, @@ -5202,7 +5202,7 @@ void proto_register_p7(void) { FT_UINT32, BASE_DEC, NULL, 0, "p7.SEQUENCE_SIZE_1_ub_messages_OF_SequenceNumber", HFILL }}, { &hf_p7_entries_modified_item, - { "entries-modified", "p7.entries_modified_item", + { "SequenceNumber", "p7.SequenceNumber", FT_UINT32, BASE_DEC, NULL, 0, "p7.SequenceNumber", HFILL }}, { &hf_p7_modify_result_extensions, @@ -5242,7 +5242,7 @@ void proto_register_p7(void) { FT_UINT32, BASE_DEC, NULL, 0, "p7.SET_OF_ExtensionField", HFILL }}, { &hf_p7_extensions_item, - { "extensions", "p7.extensions_item", + { "ExtensionField", "p7.ExtensionField", FT_NONE, BASE_NONE, NULL, 0, "x411.ExtensionField", HFILL }}, { &hf_p7_ms_message_result, @@ -5278,7 +5278,7 @@ void proto_register_p7(void) { FT_UINT32, BASE_DEC, NULL, 0, "p7.SEQUENCE_OF_PerRecipientProbeSubmissionFields", HFILL }}, { &hf_p7_per_recipient_fields_item, - { "per-recipient-fields", "p7.per_recipient_fields_item", + { "PerRecipientProbeSubmissionFields", "p7.PerRecipientProbeSubmissionFields", FT_NONE, BASE_NONE, NULL, 0, "x411.PerRecipientProbeSubmissionFields", HFILL }}, { &hf_p7_probe_submission_identifier, @@ -5298,7 +5298,7 @@ void proto_register_p7(void) { FT_UINT32, BASE_DEC, NULL, 0, "p7.AttributeProblems", HFILL }}, { &hf_p7_attribute_problem_item, - { "problems", "p7.problems_item", + { "problems item", "p7.problems_item", FT_NONE, BASE_NONE, NULL, 0, "p7.AttributeProblemItem", HFILL }}, { &hf_p7_attribute_problem, @@ -5314,7 +5314,7 @@ void proto_register_p7(void) { FT_UINT32, BASE_DEC, NULL, 0, "p7.AutoActionRequestProblems", HFILL }}, { &hf_p7_auto_action_request_problem_item, - { "problems", "p7.problems_item", + { "problems item", "p7.problems_item", FT_NONE, BASE_NONE, NULL, 0, "p7.AutoActionRequestProblemItem", HFILL }}, { &hf_p7_auto_action_request_problem, @@ -5326,7 +5326,7 @@ void proto_register_p7(void) { FT_UINT32, BASE_DEC, NULL, 0, "p7.DeleteProblems", HFILL }}, { &hf_p7_delete_problem_item, - { "problems", "p7.problems_item", + { "problems item", "p7.problems_item", FT_NONE, BASE_NONE, NULL, 0, "p7.DeleteProblemItem", HFILL }}, { &hf_p7_delete_problem, @@ -5338,7 +5338,7 @@ void proto_register_p7(void) { FT_UINT32, BASE_DEC, NULL, 0, "p7.SET_SIZE_1_ub_messages_OF_SequenceNumber", HFILL }}, { &hf_p7_entries_deleted_item, - { "entries-deleted", "p7.entries_deleted_item", + { "SequenceNumber", "p7.SequenceNumber", FT_UINT32, BASE_DEC, NULL, 0, "p7.SequenceNumber", HFILL }}, { &hf_p7_fetch_restriction_problems, @@ -5346,7 +5346,7 @@ void proto_register_p7(void) { FT_UINT32, BASE_DEC, NULL, 0, "p7.FetchRestrictionProblems", HFILL }}, { &hf_p7_fetch_restriction_problem_item, - { "problems", "p7.problems_item", + { "problems item", "p7.problems_item", FT_NONE, BASE_NONE, NULL, 0, "p7.FetchRestrictionProblemItem", HFILL }}, { &hf_p7_fetch_restriction_problem, @@ -5378,7 +5378,7 @@ void proto_register_p7(void) { FT_UINT32, BASE_DEC, NULL, 0, "p7.SequenceNumberProblems", HFILL }}, { &hf_p7_sequence_number_problem_item, - { "problems", "p7.problems_item", + { "problems item", "p7.problems_item", FT_NONE, BASE_NONE, NULL, 0, "p7.SequenceNumberProblemItem", HFILL }}, { &hf_p7_sequence_number_problem, @@ -5438,7 +5438,7 @@ void proto_register_p7(void) { FT_UINT32, BASE_DEC, NULL, 0, "p7.SEQUENCE_OF_PerRecipientReport", HFILL }}, { &hf_p7_location_item, - { "location", "p7.location_item", + { "PerRecipientReport", "p7.PerRecipientReport", FT_NONE, BASE_NONE, NULL, 0, "p7.PerRecipientReport", HFILL }}, { &hf_p7_report_entry, diff --git a/epan/dissectors/packet-p7.h b/epan/dissectors/packet-p7.h index 4868739c29..6859852682 100644 --- a/epan/dissectors/packet-p7.h +++ b/epan/dissectors/packet-p7.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-p7.h */ -/* ../../tools/asn2wrs.py -b -e -L -p p7 -c p7.cnf -s packet-p7-template MSAbstractService.asn MSGeneralAttributeTypes.asn MSAccessProtocol.asn */ +/* ../../tools/asn2wrs.py -b -e -L -p p7 -c ./p7.cnf -s ./packet-p7-template -D . MSAbstractService.asn MSGeneralAttributeTypes.asn MSAccessProtocol.asn */ /* Input file: packet-p7-template.h */ diff --git a/epan/dissectors/packet-pcap.c b/epan/dissectors/packet-pcap.c index 578631e7eb..37bfeb94fd 100644 --- a/epan/dissectors/packet-pcap.c +++ b/epan/dissectors/packet-pcap.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-pcap.c */ -/* ../../tools/asn2wrs.py -p pcap -c pcap.cnf -s packet-pcap-template PCAP-CommonDataTypes.asn PCAP-Constants.asn PCAP-Containers.asn PCAP-IEs.asn PCAP-PDU-Contents.asn PCAP-PDU-Descriptions.asn */ +/* ../../tools/asn2wrs.py -p pcap -c ./pcap.cnf -s ./packet-pcap-template -D . PCAP-CommonDataTypes.asn PCAP-Constants.asn PCAP-Containers.asn PCAP-IEs.asn PCAP-PDU-Contents.asn PCAP-PDU-Descriptions.asn */ /* Input file: packet-pcap-template.c */ @@ -11602,7 +11602,7 @@ void proto_register_pcap(void) { FT_UINT32, BASE_DEC, NULL, 0, "pcap.INTEGER_0_32767", HFILL }}, { &hf_pcap_ProtocolIE_Container_item, - { "ProtocolIE-Container", "pcap.ProtocolIE_Container_item", + { "ProtocolIE-Field", "pcap.ProtocolIE_Field", FT_NONE, BASE_NONE, NULL, 0, "pcap.ProtocolIE_Field", HFILL }}, { &hf_pcap_id, @@ -11618,7 +11618,7 @@ void proto_register_pcap(void) { FT_NONE, BASE_NONE, NULL, 0, "pcap.T_ie_field_value", HFILL }}, { &hf_pcap_ProtocolExtensionContainer_item, - { "ProtocolExtensionContainer", "pcap.ProtocolExtensionContainer_item", + { "ProtocolExtensionField", "pcap.ProtocolExtensionField", FT_NONE, BASE_NONE, NULL, 0, "pcap.ProtocolExtensionField", HFILL }}, { &hf_pcap_ext_id, @@ -11630,7 +11630,7 @@ void proto_register_pcap(void) { FT_NONE, BASE_NONE, NULL, 0, "pcap.T_extensionValue", HFILL }}, { &hf_pcap_PrivateIE_Container_item, - { "PrivateIE-Container", "pcap.PrivateIE_Container_item", + { "PrivateIE-Field", "pcap.PrivateIE_Field", FT_NONE, BASE_NONE, NULL, 0, "pcap.PrivateIE_Field", HFILL }}, { &hf_pcap_private_id, @@ -11674,11 +11674,11 @@ void proto_register_pcap(void) { FT_UINT32, BASE_DEC, VALS(pcap_CauseMisc_vals), 0, "pcap.CauseMisc", HFILL }}, { &hf_pcap_CellId_MeasuredResultsSets_item, - { "CellId-MeasuredResultsSets", "pcap.CellId_MeasuredResultsSets_item", + { "CellId-MeasuredResultsInfoList", "pcap.CellId_MeasuredResultsInfoList", FT_UINT32, BASE_DEC, NULL, 0, "pcap.CellId_MeasuredResultsInfoList", HFILL }}, { &hf_pcap_CellId_MeasuredResultsInfoList_item, - { "CellId-MeasuredResultsInfoList", "pcap.CellId_MeasuredResultsInfoList_item", + { "CellId-MeasuredResultsInfo", "pcap.CellId_MeasuredResultsInfo", FT_NONE, BASE_NONE, NULL, 0, "pcap.CellId_MeasuredResultsInfo", HFILL }}, { &hf_pcap_uC_ID, @@ -11874,7 +11874,7 @@ void proto_register_pcap(void) { FT_UINT32, BASE_DEC, NULL, 0, "pcap.CriticalityDiagnostics_IE_List", HFILL }}, { &hf_pcap_CriticalityDiagnostics_IE_List_item, - { "CriticalityDiagnostics-IE-List", "pcap.CriticalityDiagnostics_IE_List_item", + { "CriticalityDiagnostics-IE-List item", "pcap.CriticalityDiagnostics_IE_List_item", FT_NONE, BASE_NONE, NULL, 0, "pcap.CriticalityDiagnostics_IE_List_item", HFILL }}, { &hf_pcap_iECriticality, @@ -11910,7 +11910,7 @@ void proto_register_pcap(void) { FT_UINT32, BASE_DEC, NULL, 0, "pcap.DGPS_CorrectionSatInfoList", HFILL }}, { &hf_pcap_DGPS_CorrectionSatInfoList_item, - { "DGPS-CorrectionSatInfoList", "pcap.DGPS_CorrectionSatInfoList_item", + { "DGPS-CorrectionSatInfo", "pcap.DGPS_CorrectionSatInfo", FT_NONE, BASE_NONE, NULL, 0, "pcap.DGPS_CorrectionSatInfo", HFILL }}, { &hf_pcap_satID, @@ -12018,7 +12018,7 @@ void proto_register_pcap(void) { FT_UINT32, BASE_DEC, NULL, 0, "pcap.INTEGER_0_127", HFILL }}, { &hf_pcap_GA_Polygon_item, - { "GA-Polygon", "pcap.GA_Polygon_item", + { "GA-Polygon item", "pcap.GA_Polygon_item", FT_NONE, BASE_NONE, NULL, 0, "pcap.GA_Polygon_item", HFILL }}, { &hf_pcap_uncertaintySemi_major, @@ -12066,11 +12066,11 @@ void proto_register_pcap(void) { FT_UINT32, BASE_DEC, NULL, 0, "pcap.PositioningDataSet", HFILL }}, { &hf_pcap_GANSS_PositioningDataSet_item, - { "GANSS-PositioningDataSet", "pcap.GANSS_PositioningDataSet_item", + { "GANSS-PositioningMethodAndUsage", "pcap.GANSS_PositioningMethodAndUsage", FT_BYTES, BASE_HEX, NULL, 0, "pcap.GANSS_PositioningMethodAndUsage", HFILL }}, { &hf_pcap_PositioningDataSet_item, - { "PositioningDataSet", "pcap.PositioningDataSet_item", + { "PositioningMethodAndUsage", "pcap.PositioningMethodAndUsage", FT_BYTES, BASE_HEX, NULL, 0, "pcap.PositioningMethodAndUsage", HFILL }}, { &hf_pcap_gps_TOW_1msec, @@ -12082,7 +12082,7 @@ void proto_register_pcap(void) { FT_UINT32, BASE_DEC, NULL, 0, "pcap.AcquisitionSatInfoList", HFILL }}, { &hf_pcap_AcquisitionSatInfoList_item, - { "AcquisitionSatInfoList", "pcap.AcquisitionSatInfoList_item", + { "AcquisitionSatInfo", "pcap.AcquisitionSatInfo", FT_NONE, BASE_NONE, NULL, 0, "pcap.AcquisitionSatInfo", HFILL }}, { &hf_pcap_doppler0thOrder, @@ -12142,7 +12142,7 @@ void proto_register_pcap(void) { FT_UINT32, BASE_DEC, NULL, 0, "pcap.ProtocolExtensionContainer", HFILL }}, { &hf_pcap_DGANSS_Information_item, - { "DGANSS-Information", "pcap.DGANSS_Information_item", + { "DGANSS-InformationItem", "pcap.DGANSS_InformationItem", FT_NONE, BASE_NONE, NULL, 0, "pcap.DGANSS_InformationItem", HFILL }}, { &hf_pcap_gANSS_SignalId, @@ -12158,7 +12158,7 @@ void proto_register_pcap(void) { FT_UINT32, BASE_DEC, NULL, 0, "pcap.DGANSS_SignalInformation", HFILL }}, { &hf_pcap_DGANSS_SignalInformation_item, - { "DGANSS-SignalInformation", "pcap.DGANSS_SignalInformation_item", + { "DGANSS-SignalInformationItem", "pcap.DGANSS_SignalInformationItem", FT_NONE, BASE_NONE, NULL, 0, "pcap.DGANSS_SignalInformationItem", HFILL }}, { &hf_pcap_satId, @@ -12198,7 +12198,7 @@ void proto_register_pcap(void) { FT_UINT32, BASE_DEC, NULL, 0, "pcap.INTEGER_0_75", HFILL }}, { &hf_pcap_GANSS_Clock_Model_item, - { "GANSS-Clock-Model", "pcap.GANSS_Clock_Model_item", + { "GANSS-SatelliteClockModelItem", "pcap.GANSS_SatelliteClockModelItem", FT_NONE, BASE_NONE, NULL, 0, "pcap.GANSS_SatelliteClockModelItem", HFILL }}, { &hf_pcap_ganss_Reference_Time, @@ -12222,7 +12222,7 @@ void proto_register_pcap(void) { FT_UINT32, BASE_DEC, NULL, 0, "pcap.GANSS_DataBitAssistanceList", HFILL }}, { &hf_pcap_GANSS_DataBitAssistanceList_item, - { "GANSS-DataBitAssistanceList", "pcap.GANSS_DataBitAssistanceList_item", + { "GANSS-DataBitAssistanceItem", "pcap.GANSS_DataBitAssistanceItem", FT_NONE, BASE_NONE, NULL, 0, "pcap.GANSS_DataBitAssistanceItem", HFILL }}, { &hf_pcap_ganssDataTypeID, @@ -12246,7 +12246,7 @@ void proto_register_pcap(void) { FT_UINT32, BASE_DEC, VALS(pcap_T_dopplerUncertainty_vals), 0, "pcap.T_dopplerUncertainty", HFILL }}, { &hf_pcap_GANSS_GenericAssistanceDataList_item, - { "GANSS-GenericAssistanceDataList", "pcap.GANSS_GenericAssistanceDataList_item", + { "GANSSGenericAssistanceData", "pcap.GANSSGenericAssistanceData", FT_NONE, BASE_NONE, NULL, 0, "pcap.GANSSGenericAssistanceData", HFILL }}, { &hf_pcap_ganssId, @@ -12286,7 +12286,7 @@ void proto_register_pcap(void) { FT_NONE, BASE_NONE, NULL, 0, "pcap.GANSS_Navigation_Model", HFILL }}, { &hf_pcap_GANSS_GenericMeasurementInfo_item, - { "GANSS-GenericMeasurementInfo", "pcap.GANSS_GenericMeasurementInfo_item", + { "GANSS-GenericMeasurementInfo item", "pcap.GANSS_GenericMeasurementInfo_item", FT_NONE, BASE_NONE, NULL, 0, "pcap.GANSS_GenericMeasurementInfo_item", HFILL }}, { &hf_pcap_ganssSignalId, @@ -12414,7 +12414,7 @@ void proto_register_pcap(void) { FT_BYTES, BASE_HEX, NULL, 0, "pcap.BIT_STRING_SIZE_16", HFILL }}, { &hf_pcap_GANSS_MeasurementParameters_item, - { "GANSS-MeasurementParameters", "pcap.GANSS_MeasurementParameters_item", + { "GANSS-MeasurementParametersItem", "pcap.GANSS_MeasurementParametersItem", FT_NONE, BASE_NONE, NULL, 0, "pcap.GANSS_MeasurementParametersItem", HFILL }}, { &hf_pcap_cToNzero, @@ -12450,7 +12450,7 @@ void proto_register_pcap(void) { FT_UINT32, BASE_DEC, NULL, 0, "pcap.INTEGER_0_33554431", HFILL }}, { &hf_pcap_GANSS_MeasuredResultsList_item, - { "GANSS-MeasuredResultsList", "pcap.GANSS_MeasuredResultsList_item", + { "GANSS-MeasuredResults", "pcap.GANSS_MeasuredResults", FT_NONE, BASE_NONE, NULL, 0, "pcap.GANSS_MeasuredResults", HFILL }}, { &hf_pcap_referenceTime, @@ -12494,7 +12494,7 @@ void proto_register_pcap(void) { FT_NONE, BASE_NONE, NULL, 0, "pcap.GANSS_KeplerianParametersOrb", HFILL }}, { &hf_pcap_GANSS_Real_Time_Integrity_item, - { "GANSS-Real-Time-Integrity", "pcap.GANSS_Real_Time_Integrity_item", + { "GANSS-RealTimeInformationItem", "pcap.GANSS_RealTimeInformationItem", FT_NONE, BASE_NONE, NULL, 0, "pcap.GANSS_RealTimeInformationItem", HFILL }}, { &hf_pcap_bad_ganss_satId, @@ -12570,7 +12570,7 @@ void proto_register_pcap(void) { FT_UINT32, BASE_DEC, NULL, 0, "pcap.INTEGER_0_3", HFILL }}, { &hf_pcap_GANSS_SatelliteInformation_item, - { "GANSS-SatelliteInformation", "pcap.GANSS_SatelliteInformation_item", + { "GANSS-SatelliteInformationItem", "pcap.GANSS_SatelliteInformationItem", FT_NONE, BASE_NONE, NULL, 0, "pcap.GANSS_SatelliteInformationItem", HFILL }}, { &hf_pcap_ganssSatId, @@ -12602,7 +12602,7 @@ void proto_register_pcap(void) { FT_NONE, BASE_NONE, NULL, 0, "pcap.GANSS_AzimuthAndElevation", HFILL }}, { &hf_pcap_GANSS_SatelliteInformationKP_item, - { "GANSS-SatelliteInformationKP", "pcap.GANSS_SatelliteInformationKP_item", + { "GANSS-SatelliteInformationKPItem", "pcap.GANSS_SatelliteInformationKPItem", FT_NONE, BASE_NONE, NULL, 0, "pcap.GANSS_SatelliteInformationKPItem", HFILL }}, { &hf_pcap_ganss_e_alm, @@ -12646,7 +12646,7 @@ void proto_register_pcap(void) { FT_BYTES, BASE_HEX, NULL, 0, "pcap.BIT_STRING_SIZE_11", HFILL }}, { &hf_pcap_GANSS_Sat_Info_Nav_item, - { "GANSS-Sat-Info-Nav", "pcap.GANSS_Sat_Info_Nav_item", + { "GANSS-Sat-Info-Nav item", "pcap.GANSS_Sat_Info_Nav_item", FT_NONE, BASE_NONE, NULL, 0, "pcap.GANSS_Sat_Info_Nav_item", HFILL }}, { &hf_pcap_svHealth, @@ -12758,7 +12758,7 @@ void proto_register_pcap(void) { FT_BYTES, BASE_HEX, NULL, 0, "pcap.BIT_STRING_SIZE_364", HFILL }}, { &hf_pcap_AlmanacSatInfoList_item, - { "AlmanacSatInfoList", "pcap.AlmanacSatInfoList_item", + { "AlmanacSatInfo", "pcap.AlmanacSatInfo", FT_NONE, BASE_NONE, NULL, 0, "pcap.AlmanacSatInfo", HFILL }}, { &hf_pcap_dataID, @@ -12974,7 +12974,7 @@ void proto_register_pcap(void) { FT_BYTES, BASE_HEX, NULL, 0, "pcap.BIT_STRING_SIZE_8", HFILL }}, { &hf_pcap_MeasuredResultsList_item, - { "MeasuredResultsList", "pcap.MeasuredResultsList_item", + { "GPS-MeasuredResults", "pcap.GPS_MeasuredResults", FT_NONE, BASE_NONE, NULL, 0, "pcap.GPS_MeasuredResults", HFILL }}, { &hf_pcap_gps_MeasurementParamList, @@ -12982,7 +12982,7 @@ void proto_register_pcap(void) { FT_UINT32, BASE_DEC, NULL, 0, "pcap.GPS_MeasurementParamList", HFILL }}, { &hf_pcap_GPS_MeasurementParamList_item, - { "GPS-MeasurementParamList", "pcap.GPS_MeasurementParamList_item", + { "GPS-MeasurementParam", "pcap.GPS_MeasurementParam", FT_NONE, BASE_NONE, NULL, 0, "pcap.GPS_MeasurementParam", HFILL }}, { &hf_pcap_satelliteID, @@ -13014,7 +13014,7 @@ void proto_register_pcap(void) { FT_UINT32, BASE_DEC, NULL, 0, "pcap.INTEGER_0_63", HFILL }}, { &hf_pcap_GPS_NavigationModel_item, - { "GPS-NavigationModel", "pcap.GPS_NavigationModel_item", + { "NavigationModelSatInfo", "pcap.NavigationModelSatInfo", FT_NONE, BASE_NONE, NULL, 0, "pcap.NavigationModelSatInfo", HFILL }}, { &hf_pcap_satelliteStatus, @@ -13034,7 +13034,7 @@ void proto_register_pcap(void) { FT_NONE, BASE_NONE, NULL, 0, "pcap.NoBadSatellites", HFILL }}, { &hf_pcap_BadSatList_item, - { "BadSatList", "pcap.BadSatList_item", + { "BadSatList item", "pcap.BadSatList_item", FT_UINT32, BASE_DEC, NULL, 0, "pcap.INTEGER_0_63", HFILL }}, { &hf_pcap_gps_Week, @@ -13046,7 +13046,7 @@ void proto_register_pcap(void) { FT_UINT32, BASE_DEC, NULL, 0, "pcap.GPS_TOW_AssistList", HFILL }}, { &hf_pcap_GPS_TOW_AssistList_item, - { "GPS-TOW-AssistList", "pcap.GPS_TOW_AssistList_item", + { "GPS-TOW-Assist", "pcap.GPS_TOW_Assist", FT_NONE, BASE_NONE, NULL, 0, "pcap.GPS_TOW_Assist", HFILL }}, { &hf_pcap_tlm_Message, @@ -13158,7 +13158,7 @@ void proto_register_pcap(void) { FT_UINT32, BASE_DEC, NULL, 0, "pcap.GanssRequestedGenericAssistanceDataList", HFILL }}, { &hf_pcap_GanssRequestedGenericAssistanceDataList_item, - { "GanssRequestedGenericAssistanceDataList", "pcap.GanssRequestedGenericAssistanceDataList_item", + { "GanssReqGenericData", "pcap.GanssReqGenericData", FT_NONE, BASE_NONE, NULL, 0, "pcap.GanssReqGenericData", HFILL }}, { &hf_pcap_ganssRealTimeIntegrity, @@ -13202,7 +13202,7 @@ void proto_register_pcap(void) { FT_UINT32, BASE_DEC, NULL, 0, "pcap.ReqDataBitAssistanceList", HFILL }}, { &hf_pcap_ReqDataBitAssistanceList_item, - { "ReqDataBitAssistanceList", "pcap.ReqDataBitAssistanceList_item", + { "ReqDataBitAssistanceList item", "pcap.ReqDataBitAssistanceList_item", FT_NONE, BASE_NONE, NULL, 0, "pcap.ReqDataBitAssistanceList_item", HFILL }}, { &hf_pcap_ganssDataBitAssistance, @@ -13234,7 +13234,7 @@ void proto_register_pcap(void) { FT_UINT32, BASE_DEC, NULL, 0, "pcap.ExplicitInformationList", HFILL }}, { &hf_pcap_ExplicitInformationList_item, - { "ExplicitInformationList", "pcap.ExplicitInformationList_item", + { "ExplicitInformation", "pcap.ExplicitInformation", FT_UINT32, BASE_DEC, VALS(pcap_ExplicitInformation_vals), 0, "pcap.ExplicitInformation", HFILL }}, { &hf_pcap_almanacAndSatelliteHealth, @@ -13302,7 +13302,7 @@ void proto_register_pcap(void) { FT_UINT32, BASE_DEC, VALS(pcap_T_ganss_ReferenceLocation_vals), 0, "pcap.T_ganss_ReferenceLocation", HFILL }}, { &hf_pcap_GANSSGenericDataList_item, - { "GANSSGenericDataList", "pcap.GANSSGenericDataList_item", + { "GANSSGenericDataReq", "pcap.GANSSGenericDataReq", FT_NONE, BASE_NONE, NULL, 0, "pcap.GANSSGenericDataReq", HFILL }}, { &hf_pcap_ganssID, @@ -13366,7 +13366,7 @@ void proto_register_pcap(void) { FT_UINT32, BASE_DEC, NULL, 0, "pcap.SatelliteRelatedDataList", HFILL }}, { &hf_pcap_SatelliteRelatedDataList_item, - { "SatelliteRelatedDataList", "pcap.SatelliteRelatedDataList_item", + { "SatelliteRelatedData", "pcap.SatelliteRelatedData", FT_NONE, BASE_NONE, NULL, 0, "pcap.SatelliteRelatedData", HFILL }}, { &hf_pcap_ganssWeek, @@ -13386,11 +13386,11 @@ void proto_register_pcap(void) { FT_UINT32, BASE_DEC, NULL, 0, "pcap.SatelliteRelatedDataListGANSS", HFILL }}, { &hf_pcap_SatelliteRelatedDataListGANSS_item, - { "SatelliteRelatedDataListGANSS", "pcap.SatelliteRelatedDataListGANSS_item", + { "SatelliteRelatedDataGANSS", "pcap.SatelliteRelatedDataGANSS", FT_NONE, BASE_NONE, NULL, 0, "pcap.SatelliteRelatedDataGANSS", HFILL }}, { &hf_pcap_MessageStructure_item, - { "MessageStructure", "pcap.MessageStructure_item", + { "MessageStructure item", "pcap.MessageStructure_item", FT_NONE, BASE_NONE, NULL, 0, "pcap.MessageStructure_item", HFILL }}, { &hf_pcap_repetitionNumber_01, @@ -13422,7 +13422,7 @@ void proto_register_pcap(void) { FT_NONE, BASE_NONE, NULL, 0, "pcap.TUTRANGPSMeasurementValueInfo", HFILL }}, { &hf_pcap_OTDOA_NeighbourCellInfoList_item, - { "OTDOA-NeighbourCellInfoList", "pcap.OTDOA_NeighbourCellInfoList_item", + { "OTDOA-NeighbourCellInfo", "pcap.OTDOA_NeighbourCellInfo", FT_NONE, BASE_NONE, NULL, 0, "pcap.OTDOA_NeighbourCellInfo", HFILL }}, { &hf_pcap_relativeTimingDifferenceInfo, @@ -13430,11 +13430,11 @@ void proto_register_pcap(void) { FT_UINT32, BASE_DEC, VALS(pcap_RelativeTimingDifferenceInfo_vals), 0, "pcap.RelativeTimingDifferenceInfo", HFILL }}, { &hf_pcap_OTDOA_MeasuredResultsSets_item, - { "OTDOA-MeasuredResultsSets", "pcap.OTDOA_MeasuredResultsSets_item", + { "OTDOA-MeasuredResultsInfoList", "pcap.OTDOA_MeasuredResultsInfoList", FT_UINT32, BASE_DEC, NULL, 0, "pcap.OTDOA_MeasuredResultsInfoList", HFILL }}, { &hf_pcap_OTDOA_MeasuredResultsInfoList_item, - { "OTDOA-MeasuredResultsInfoList", "pcap.OTDOA_MeasuredResultsInfoList_item", + { "OTDOA-MeasuredResultsInfo", "pcap.OTDOA_MeasuredResultsInfo", FT_NONE, BASE_NONE, NULL, 0, "pcap.OTDOA_MeasuredResultsInfo", HFILL }}, { &hf_pcap_ue_SFNSFNTimeDifferenceType2Info, @@ -13658,7 +13658,7 @@ void proto_register_pcap(void) { FT_BOOLEAN, 8, NULL, 0, "pcap.BOOLEAN", HFILL }}, { &hf_pcap_NetworkAssistedGANSSSupport_item, - { "NetworkAssistedGANSSSupport", "pcap.NetworkAssistedGANSSSupport_item", + { "NetworkAssistedGANSSSupport item", "pcap.NetworkAssistedGANSSSupport_item", FT_NONE, BASE_NONE, NULL, 0, "pcap.NetworkAssistedGANSSSupport_item", HFILL }}, { &hf_pcap_ganssMode, @@ -13830,7 +13830,7 @@ void proto_register_pcap(void) { FT_UINT32, BASE_DEC, NULL, 0, "pcap.INTEGER_1_16", HFILL }}, { &hf_pcap_UE_Positioning_OTDOA_NeighbourCellList_item, - { "UE-Positioning-OTDOA-NeighbourCellList", "pcap.UE_Positioning_OTDOA_NeighbourCellList_item", + { "UE-Positioning-OTDOA-NeighbourCellInfo", "pcap.UE_Positioning_OTDOA_NeighbourCellInfo", FT_NONE, BASE_NONE, NULL, 0, "pcap.UE_Positioning_OTDOA_NeighbourCellInfo", HFILL }}, { &hf_pcap_modeSpecificInfo_02, @@ -14034,7 +14034,7 @@ void proto_register_pcap(void) { FT_UINT32, BASE_DEC, NULL, 0, "pcap.CFN", HFILL }}, { &hf_pcap_Transmission_Gap_Pattern_Sequence_Information_item, - { "Transmission-Gap-Pattern-Sequence-Information", "pcap.Transmission_Gap_Pattern_Sequence_Information_item", + { "Transmission-Gap-Pattern-Sequence-Information item", "pcap.Transmission_Gap_Pattern_Sequence_Information_item", FT_NONE, BASE_NONE, NULL, 0, "pcap.Transmission_Gap_Pattern_Sequence_Information_item", HFILL }}, { &hf_pcap_tGPSID, @@ -14074,7 +14074,7 @@ void proto_register_pcap(void) { FT_UINT32, BASE_DEC, NULL, 0, "pcap.Transmission_Gap_Pattern_Sequence_Status_List", HFILL }}, { &hf_pcap_Transmission_Gap_Pattern_Sequence_Status_List_item, - { "Transmission-Gap-Pattern-Sequence-Status-List", "pcap.Transmission_Gap_Pattern_Sequence_Status_List_item", + { "Transmission-Gap-Pattern-Sequence-Status-List item", "pcap.Transmission_Gap_Pattern_Sequence_Status_List_item", FT_NONE, BASE_NONE, NULL, 0, "pcap.Transmission_Gap_Pattern_Sequence_Status_List_item", HFILL }}, { &hf_pcap_tGPRC, @@ -14094,7 +14094,7 @@ void proto_register_pcap(void) { FT_UINT32, BASE_DEC, NULL, 0, "pcap.TrChInfoList", HFILL }}, { &hf_pcap_TrChInfoList_item, - { "TrChInfoList", "pcap.TrChInfoList_item", + { "UL-TrCHInfo", "pcap.UL_TrCHInfo", FT_NONE, BASE_NONE, NULL, 0, "pcap.UL_TrCHInfo", HFILL }}, { &hf_pcap_uL_TrCHtype, @@ -14134,7 +14134,7 @@ void proto_register_pcap(void) { FT_UINT32, BASE_DEC, NULL, 0, "pcap.Reference_E_TFCI_Information", HFILL }}, { &hf_pcap_Reference_E_TFCI_Information_item, - { "Reference-E-TFCI-Information", "pcap.Reference_E_TFCI_Information_item", + { "Reference-E-TFCI-Information-Item", "pcap.Reference_E_TFCI_Information_Item", FT_NONE, BASE_NONE, NULL, 0, "pcap.Reference_E_TFCI_Information_Item", HFILL }}, { &hf_pcap_reference_E_TFCI, @@ -14154,7 +14154,7 @@ void proto_register_pcap(void) { FT_UINT32, BASE_DEC, NULL, 0, "pcap.INTEGER_0_63", HFILL }}, { &hf_pcap_UL_Timeslot_Information_item, - { "UL-Timeslot-Information", "pcap.UL_Timeslot_Information_item", + { "UL-Timeslot-InformationItem", "pcap.UL_Timeslot_InformationItem", FT_NONE, BASE_NONE, NULL, 0, "pcap.UL_Timeslot_InformationItem", HFILL }}, { &hf_pcap_timeSlot, @@ -14222,7 +14222,7 @@ void proto_register_pcap(void) { FT_UINT32, BASE_DEC, VALS(pcap_T_midambleAllocationMode_02_vals), 0, "pcap.T_midambleAllocationMode_02", HFILL }}, { &hf_pcap_TDD_UL_Code_Information_item, - { "TDD-UL-Code-Information", "pcap.TDD_UL_Code_Information_item", + { "TDD-UL-Code-InformationItem", "pcap.TDD_UL_Code_InformationItem", FT_NONE, BASE_NONE, NULL, 0, "pcap.TDD_UL_Code_InformationItem", HFILL }}, { &hf_pcap_tdd_ChannelisationCode, @@ -14242,7 +14242,7 @@ void proto_register_pcap(void) { FT_NONE, BASE_NONE, NULL, 0, "pcap.UschParameters", HFILL }}, { &hf_pcap_PRACHparameters_item, - { "PRACHparameters", "pcap.PRACHparameters_item", + { "PRACH-ChannelInfo", "pcap.PRACH_ChannelInfo", FT_NONE, BASE_NONE, NULL, 0, "pcap.PRACH_ChannelInfo", HFILL }}, { &hf_pcap_pRACH_Info, @@ -14298,7 +14298,7 @@ void proto_register_pcap(void) { FT_NONE, BASE_NONE, NULL, 0, "pcap.TransportFormatSet_Semi_staticPart", HFILL }}, { &hf_pcap_TransportFormatSet_DynamicPartList_item, - { "TransportFormatSet-DynamicPartList", "pcap.TransportFormatSet_DynamicPartList_item", + { "TransportFormatSet-DynamicPartList item", "pcap.TransportFormatSet_DynamicPartList_item", FT_NONE, BASE_NONE, NULL, 0, "pcap.TransportFormatSet_DynamicPartList_item", HFILL }}, { &hf_pcap_rlc_Size, @@ -14310,7 +14310,7 @@ void proto_register_pcap(void) { FT_UINT32, BASE_DEC, NULL, 0, "pcap.SEQUENCE_SIZE_1_maxNrOfTFs_OF_TbsTTIInfo", HFILL }}, { &hf_pcap_numberOfTbsTTIList_item, - { "numberOfTbsTTIList", "pcap.numberOfTbsTTIList_item", + { "TbsTTIInfo", "pcap.TbsTTIInfo", FT_NONE, BASE_NONE, NULL, 0, "pcap.TbsTTIInfo", HFILL }}, { &hf_pcap_tTIInfo, @@ -14342,7 +14342,7 @@ void proto_register_pcap(void) { FT_UINT32, BASE_DEC, VALS(pcap_TransportFormatSet_CRC_Size_vals), 0, "pcap.TransportFormatSet_CRC_Size", HFILL }}, { &hf_pcap_TFCS_item, - { "TFCS", "pcap.TFCS_item", + { "CTFC", "pcap.CTFC", FT_UINT32, BASE_DEC, VALS(pcap_CTFC_vals), 0, "pcap.CTFC", HFILL }}, { &hf_pcap_ctfc2Bit, @@ -14350,7 +14350,7 @@ void proto_register_pcap(void) { FT_UINT32, BASE_DEC, NULL, 0, "pcap.T_ctfc2Bit", HFILL }}, { &hf_pcap_ctfc2Bit_item, - { "ctfc2Bit", "pcap.ctfc2Bit_item", + { "ctfc2Bit item", "pcap.ctfc2Bit_item", FT_UINT32, BASE_DEC, NULL, 0, "pcap.INTEGER_0_3", HFILL }}, { &hf_pcap_ctfc4Bit, @@ -14358,7 +14358,7 @@ void proto_register_pcap(void) { FT_UINT32, BASE_DEC, NULL, 0, "pcap.T_ctfc4Bit", HFILL }}, { &hf_pcap_ctfc4Bit_item, - { "ctfc4Bit", "pcap.ctfc4Bit_item", + { "ctfc4Bit item", "pcap.ctfc4Bit_item", FT_UINT32, BASE_DEC, NULL, 0, "pcap.INTEGER_0_15", HFILL }}, { &hf_pcap_ctfc6Bit, @@ -14366,7 +14366,7 @@ void proto_register_pcap(void) { FT_UINT32, BASE_DEC, NULL, 0, "pcap.T_ctfc6Bit", HFILL }}, { &hf_pcap_ctfc6Bit_item, - { "ctfc6Bit", "pcap.ctfc6Bit_item", + { "ctfc6Bit item", "pcap.ctfc6Bit_item", FT_UINT32, BASE_DEC, NULL, 0, "pcap.INTEGER_0_63", HFILL }}, { &hf_pcap_ctfc8Bit, @@ -14374,7 +14374,7 @@ void proto_register_pcap(void) { FT_UINT32, BASE_DEC, NULL, 0, "pcap.T_ctfc8Bit", HFILL }}, { &hf_pcap_ctfc8Bit_item, - { "ctfc8Bit", "pcap.ctfc8Bit_item", + { "ctfc8Bit item", "pcap.ctfc8Bit_item", FT_UINT32, BASE_DEC, NULL, 0, "pcap.INTEGER_0_255", HFILL }}, { &hf_pcap_ctfc12Bit, @@ -14382,7 +14382,7 @@ void proto_register_pcap(void) { FT_UINT32, BASE_DEC, NULL, 0, "pcap.T_ctfc12Bit", HFILL }}, { &hf_pcap_ctfc12Bit_item, - { "ctfc12Bit", "pcap.ctfc12Bit_item", + { "ctfc12Bit item", "pcap.ctfc12Bit_item", FT_UINT32, BASE_DEC, NULL, 0, "pcap.INTEGER_0_4095", HFILL }}, { &hf_pcap_ctfc16Bit, @@ -14390,7 +14390,7 @@ void proto_register_pcap(void) { FT_UINT32, BASE_DEC, NULL, 0, "pcap.T_ctfc16Bit", HFILL }}, { &hf_pcap_ctfc16Bit_item, - { "ctfc16Bit", "pcap.ctfc16Bit_item", + { "ctfc16Bit item", "pcap.ctfc16Bit_item", FT_UINT32, BASE_DEC, NULL, 0, "pcap.INTEGER_0_65535", HFILL }}, { &hf_pcap_ctfc24Bit, @@ -14398,7 +14398,7 @@ void proto_register_pcap(void) { FT_UINT32, BASE_DEC, NULL, 0, "pcap.T_ctfc24Bit", HFILL }}, { &hf_pcap_ctfc24Bit_item, - { "ctfc24Bit", "pcap.ctfc24Bit_item", + { "ctfc24Bit item", "pcap.ctfc24Bit_item", FT_UINT32, BASE_DEC, NULL, 0, "pcap.INTEGER_0_16777215", HFILL }}, { &hf_pcap_uSCH_SchedulingOffset, diff --git a/epan/dissectors/packet-pkcs1.c b/epan/dissectors/packet-pkcs1.c index c7c677c611..f804df4931 100644 --- a/epan/dissectors/packet-pkcs1.c +++ b/epan/dissectors/packet-pkcs1.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-pkcs1.c */ -/* ../../tools/asn2wrs.py -b -p pkcs1 -c pkcs1.cnf -s packet-pkcs1-template PKCS1.asn */ +/* ../../tools/asn2wrs.py -b -p pkcs1 -c ./pkcs1.cnf -s ./packet-pkcs1-template -D . PKCS1.asn */ /* Input file: packet-pkcs1-template.c */ diff --git a/epan/dissectors/packet-pkcs1.h b/epan/dissectors/packet-pkcs1.h index ffcbd9714e..618b232615 100644 --- a/epan/dissectors/packet-pkcs1.h +++ b/epan/dissectors/packet-pkcs1.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-pkcs1.h */ -/* ../../tools/asn2wrs.py -b -p pkcs1 -c pkcs1.cnf -s packet-pkcs1-template PKCS1.asn */ +/* ../../tools/asn2wrs.py -b -p pkcs1 -c ./pkcs1.cnf -s ./packet-pkcs1-template -D . PKCS1.asn */ /* Input file: packet-pkcs1-template.h */ diff --git a/epan/dissectors/packet-pkcs12.c b/epan/dissectors/packet-pkcs12.c index e46ec0f0e7..5e5e0e9ccc 100644 --- a/epan/dissectors/packet-pkcs12.c +++ b/epan/dissectors/packet-pkcs12.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-pkcs12.c */ -/* ../../tools/asn2wrs.py -b -e -p pkcs12 -c pkcs12.cnf -s packet-pkcs12-template pkcs12.asn */ +/* ../../tools/asn2wrs.py -b -e -p pkcs12 -c ./pkcs12.cnf -s ./packet-pkcs12-template -D . pkcs12.asn */ /* Input file: packet-pkcs12-template.c */ @@ -1288,11 +1288,11 @@ void proto_register_pkcs12(void) { FT_BYTES, BASE_HEX, NULL, 0, "cms.Digest", HFILL }}, { &hf_pkcs12_AuthenticatedSafe_item, - { "AuthenticatedSafe", "pkcs12.AuthenticatedSafe_item", + { "ContentInfo", "pkcs12.ContentInfo", FT_NONE, BASE_NONE, NULL, 0, "cms.ContentInfo", HFILL }}, { &hf_pkcs12_SafeContents_item, - { "SafeContents", "pkcs12.SafeContents_item", + { "SafeBag", "pkcs12.SafeBag", FT_NONE, BASE_NONE, NULL, 0, "pkcs12.SafeBag", HFILL }}, { &hf_pkcs12_bagId, @@ -1308,7 +1308,7 @@ void proto_register_pkcs12(void) { FT_UINT32, BASE_DEC, NULL, 0, "pkcs12.SET_OF_PKCS12Attribute", HFILL }}, { &hf_pkcs12_bagAttributes_item, - { "bagAttributes", "pkcs12.bagAttributes_item", + { "PKCS12Attribute", "pkcs12.PKCS12Attribute", FT_NONE, BASE_NONE, NULL, 0, "pkcs12.PKCS12Attribute", HFILL }}, { &hf_pkcs12_certId, @@ -1344,7 +1344,7 @@ void proto_register_pkcs12(void) { FT_UINT32, BASE_DEC, NULL, 0, "pkcs12.T_attrValues", HFILL }}, { &hf_pkcs12_attrValues_item, - { "attrValues", "pkcs12.attrValues_item", + { "attrValues item", "pkcs12.attrValues_item", FT_NONE, BASE_NONE, NULL, 0, "pkcs12.T_attrValues_item", HFILL }}, { &hf_pkcs12_privateKeyVersion, @@ -1364,7 +1364,7 @@ void proto_register_pkcs12(void) { FT_UINT32, BASE_DEC, NULL, 0, "pkcs12.Attributes", HFILL }}, { &hf_pkcs12_Attributes_item, - { "Attributes", "pkcs12.Attributes_item", + { "Attribute", "pkcs12.Attribute", FT_NONE, BASE_NONE, NULL, 0, "x509if.Attribute", HFILL }}, { &hf_pkcs12_encryptionAlgorithm, diff --git a/epan/dissectors/packet-pkcs12.h b/epan/dissectors/packet-pkcs12.h index 15a9af77e2..d220e04396 100644 --- a/epan/dissectors/packet-pkcs12.h +++ b/epan/dissectors/packet-pkcs12.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-pkcs12.h */ -/* ../../tools/asn2wrs.py -b -e -p pkcs12 -c pkcs12.cnf -s packet-pkcs12-template pkcs12.asn */ +/* ../../tools/asn2wrs.py -b -e -p pkcs12 -c ./pkcs12.cnf -s ./packet-pkcs12-template -D . pkcs12.asn */ /* Input file: packet-pkcs12-template.h */ diff --git a/epan/dissectors/packet-pkinit.c b/epan/dissectors/packet-pkinit.c index d8de5d3199..f4e4646250 100644 --- a/epan/dissectors/packet-pkinit.c +++ b/epan/dissectors/packet-pkinit.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-pkinit.c */ -/* ../../tools/asn2wrs.py -b -p pkinit -c pkinit.cnf -s packet-pkinit-template PKINIT.asn */ +/* ../../tools/asn2wrs.py -b -p pkinit -c ./pkinit.cnf -s ./packet-pkinit-template -D . PKINIT.asn */ /* Input file: packet-pkinit-template.c */ @@ -337,7 +337,7 @@ void proto_register_pkinit(void) { FT_UINT32, BASE_DEC, NULL, 0, "pkinit.SEQUENCE_OF_TrustedCA", HFILL }}, { &hf_pkinit_trustedCertifiers_item, - { "trustedCertifiers", "pkinit.trustedCertifiers_item", + { "TrustedCA", "pkinit.TrustedCA", FT_UINT32, BASE_DEC, VALS(pkinit_TrustedCA_vals), 0, "pkinit.TrustedCA", HFILL }}, { &hf_pkinit_kdcCert, @@ -365,7 +365,7 @@ void proto_register_pkinit(void) { FT_UINT32, BASE_DEC, NULL, 0, "pkinit.SEQUENCE_OF_AlgorithmIdentifier", HFILL }}, { &hf_pkinit_supportedCMSTypes_item, - { "supportedCMSTypes", "pkinit.supportedCMSTypes_item", + { "AlgorithmIdentifier", "pkinit.AlgorithmIdentifier", FT_NONE, BASE_NONE, NULL, 0, "pkix1explicit.AlgorithmIdentifier", HFILL }}, { &hf_pkinit_cusec, diff --git a/epan/dissectors/packet-pkinit.h b/epan/dissectors/packet-pkinit.h index 313129131c..b8fa6d0a14 100644 --- a/epan/dissectors/packet-pkinit.h +++ b/epan/dissectors/packet-pkinit.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-pkinit.h */ -/* ../../tools/asn2wrs.py -b -p pkinit -c pkinit.cnf -s packet-pkinit-template PKINIT.asn */ +/* ../../tools/asn2wrs.py -b -p pkinit -c ./pkinit.cnf -s ./packet-pkinit-template -D . PKINIT.asn */ /* Input file: packet-pkinit-template.h */ diff --git a/epan/dissectors/packet-pkix1explicit.c b/epan/dissectors/packet-pkix1explicit.c index 9ad8f69d7b..5465ece255 100644 --- a/epan/dissectors/packet-pkix1explicit.c +++ b/epan/dissectors/packet-pkix1explicit.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-pkix1explicit.c */ -/* ../../tools/asn2wrs.py -b -p pkix1explicit -c pkix1explicit.cnf -s packet-pkix1explicit-template PKIX1EXPLICIT93.asn IPAddrAndASCertExtn.asn */ +/* ../../tools/asn2wrs.py -b -p pkix1explicit -c ./pkix1explicit.cnf -s ./packet-pkix1explicit-template -D . PKIX1EXPLICIT93.asn IPAddrAndASCertExtn.asn */ /* Input file: packet-pkix1explicit-template.c */ @@ -861,7 +861,7 @@ void proto_register_pkix1explicit(void) { FT_STRING, BASE_NONE, NULL, 0, "pkix1explicit.GeneralizedTime", HFILL }}, { &hf_pkix1explicit_Extensions_item, - { "Extensions", "pkix1explicit.Extensions_item", + { "Extension", "pkix1explicit.Extension", FT_NONE, BASE_NONE, NULL, 0, "pkix1explicit.Extension", HFILL }}, { &hf_pkix1explicit_extnId, @@ -913,7 +913,7 @@ void proto_register_pkix1explicit(void) { FT_UINT32, BASE_DEC, NULL, 0, "pkix1explicit.T_values", HFILL }}, { &hf_pkix1explicit_values_item, - { "values", "pkix1explicit.values_item", + { "values item", "pkix1explicit.values_item", FT_NONE, BASE_NONE, NULL, 0, "pkix1explicit.T_values_item", HFILL }}, { &hf_pkix1explicit_value, @@ -921,11 +921,11 @@ void proto_register_pkix1explicit(void) { FT_NONE, BASE_NONE, NULL, 0, "pkix1explicit.T_value", HFILL }}, { &hf_pkix1explicit_RDNSequence_item, - { "RDNSequence", "pkix1explicit.RDNSequence_item", + { "RelativeDistinguishedName", "pkix1explicit.RelativeDistinguishedName", FT_UINT32, BASE_DEC, NULL, 0, "pkix1explicit.RelativeDistinguishedName", HFILL }}, { &hf_pkix1explicit_RelativeDistinguishedName_item, - { "RelativeDistinguishedName", "pkix1explicit.RelativeDistinguishedName_item", + { "AttributeTypeAndValue", "pkix1explicit.AttributeTypeAndValue", FT_NONE, BASE_NONE, NULL, 0, "pkix1explicit.AttributeTypeAndValue", HFILL }}, { &hf_pkix1explicit_type_01, @@ -937,7 +937,7 @@ void proto_register_pkix1explicit(void) { FT_STRING, BASE_NONE, NULL, 0, "pkix1explicit.TeletexString", HFILL }}, { &hf_pkix1explicit_IPAddrBlocks_item, - { "IPAddrBlocks", "pkix1explicit.IPAddrBlocks_item", + { "IPAddressFamily", "pkix1explicit.IPAddressFamily", FT_NONE, BASE_NONE, NULL, 0, "pkix1explicit.IPAddressFamily", HFILL }}, { &hf_pkix1explicit_addressFamily, @@ -957,7 +957,7 @@ void proto_register_pkix1explicit(void) { FT_UINT32, BASE_DEC, NULL, 0, "pkix1explicit.SEQUENCE_OF_IPAddressOrRange", HFILL }}, { &hf_pkix1explicit_addressesOrRanges_item, - { "addressesOrRanges", "pkix1explicit.addressesOrRanges_item", + { "IPAddressOrRange", "pkix1explicit.IPAddressOrRange", FT_UINT32, BASE_DEC, VALS(pkix1explicit_IPAddressOrRange_vals), 0, "pkix1explicit.IPAddressOrRange", HFILL }}, { &hf_pkix1explicit_addressPrefix, @@ -989,7 +989,7 @@ void proto_register_pkix1explicit(void) { FT_UINT32, BASE_DEC, NULL, 0, "pkix1explicit.SEQUENCE_OF_ASIdOrRange", HFILL }}, { &hf_pkix1explicit_asIdsOrRanges_item, - { "asIdsOrRanges", "pkix1explicit.asIdsOrRanges_item", + { "ASIdOrRange", "pkix1explicit.ASIdOrRange", FT_UINT32, BASE_DEC, VALS(pkix1explicit_ASIdOrRange_vals), 0, "pkix1explicit.ASIdOrRange", HFILL }}, { &hf_pkix1explicit_id, diff --git a/epan/dissectors/packet-pkix1explicit.h b/epan/dissectors/packet-pkix1explicit.h index 208f7339e6..867a8427b6 100644 --- a/epan/dissectors/packet-pkix1explicit.h +++ b/epan/dissectors/packet-pkix1explicit.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-pkix1explicit.h */ -/* ../../tools/asn2wrs.py -b -p pkix1explicit -c pkix1explicit.cnf -s packet-pkix1explicit-template PKIX1EXPLICIT93.asn IPAddrAndASCertExtn.asn */ +/* ../../tools/asn2wrs.py -b -p pkix1explicit -c ./pkix1explicit.cnf -s ./packet-pkix1explicit-template -D . PKIX1EXPLICIT93.asn IPAddrAndASCertExtn.asn */ /* Input file: packet-pkix1explicit-template.h */ diff --git a/epan/dissectors/packet-pkix1implicit.c b/epan/dissectors/packet-pkix1implicit.c index 51d3eeadbe..922c178102 100644 --- a/epan/dissectors/packet-pkix1implicit.c +++ b/epan/dissectors/packet-pkix1implicit.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-pkix1implicit.c */ -/* ../../tools/asn2wrs.py -b -p pkix1implicit -c pkix1implicit.cnf -s packet-pkix1implicit-template PKIX1IMPLICIT93.asn */ +/* ../../tools/asn2wrs.py -b -p pkix1implicit -c ./pkix1implicit.cnf -s ./packet-pkix1implicit-template -D . PKIX1IMPLICIT93.asn */ /* Input file: packet-pkix1implicit-template.c */ @@ -304,7 +304,7 @@ void proto_register_pkix1implicit(void) { FT_UINT32, BASE_DEC, NULL, 0, "pkix1implicit.AuthorityInfoAccessSyntax", HFILL }}, { &hf_pkix1implicit_AuthorityInfoAccessSyntax_item, - { "AuthorityInfoAccessSyntax", "pkix1implicit.AuthorityInfoAccessSyntax_item", + { "AccessDescription", "pkix1implicit.AccessDescription", FT_NONE, BASE_NONE, NULL, 0, "pkix1implicit.AccessDescription", HFILL }}, { &hf_pkix1implicit_accessMethod, @@ -332,7 +332,7 @@ void proto_register_pkix1implicit(void) { FT_UINT32, BASE_DEC, NULL, 0, "pkix1implicit.T_noticeNumbers", HFILL }}, { &hf_pkix1implicit_noticeNumbers_item, - { "noticeNumbers", "pkix1implicit.noticeNumbers_item", + { "noticeNumbers item", "pkix1implicit.noticeNumbers_item", FT_INT32, BASE_DEC, NULL, 0, "pkix1implicit.INTEGER", HFILL }}, { &hf_pkix1implicit_visibleString, diff --git a/epan/dissectors/packet-pkix1implicit.h b/epan/dissectors/packet-pkix1implicit.h index 5ac8208d47..8353dc24e1 100644 --- a/epan/dissectors/packet-pkix1implicit.h +++ b/epan/dissectors/packet-pkix1implicit.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-pkix1implicit.h */ -/* ../../tools/asn2wrs.py -b -p pkix1implicit -c pkix1implicit.cnf -s packet-pkix1implicit-template PKIX1IMPLICIT93.asn */ +/* ../../tools/asn2wrs.py -b -p pkix1implicit -c ./pkix1implicit.cnf -s ./packet-pkix1implicit-template -D . PKIX1IMPLICIT93.asn */ /* Input file: packet-pkix1implicit-template.h */ diff --git a/epan/dissectors/packet-pkixproxy.c b/epan/dissectors/packet-pkixproxy.c index a4c13d7871..a1060bf1ee 100644 --- a/epan/dissectors/packet-pkixproxy.c +++ b/epan/dissectors/packet-pkixproxy.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-pkixproxy.c */ -/* ../../tools/asn2wrs.py -b -p pkixproxy -c pkixproxy.cnf -s packet-pkixproxy-template PKIXProxy.asn */ +/* ../../tools/asn2wrs.py -b -p pkixproxy -c ./pkixproxy.cnf -s ./packet-pkixproxy-template -D . PKIXProxy.asn */ /* Input file: packet-pkixproxy-template.c */ diff --git a/epan/dissectors/packet-pkixproxy.h b/epan/dissectors/packet-pkixproxy.h index 55cc5c6eaa..85431d63d1 100644 --- a/epan/dissectors/packet-pkixproxy.h +++ b/epan/dissectors/packet-pkixproxy.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-pkixproxy.h */ -/* ../../tools/asn2wrs.py -b -p pkixproxy -c pkixproxy.cnf -s packet-pkixproxy-template PKIXProxy.asn */ +/* ../../tools/asn2wrs.py -b -p pkixproxy -c ./pkixproxy.cnf -s ./packet-pkixproxy-template -D . PKIXProxy.asn */ /* Input file: packet-pkixproxy-template.h */ diff --git a/epan/dissectors/packet-pkixqualified.c b/epan/dissectors/packet-pkixqualified.c index 260c4eecbb..31392c989a 100644 --- a/epan/dissectors/packet-pkixqualified.c +++ b/epan/dissectors/packet-pkixqualified.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-pkixqualified.c */ -/* ../../tools/asn2wrs.py -b -p pkixqualified -c pkixqualified.cnf -s packet-pkixqualified-template PKIXqualified.asn */ +/* ../../tools/asn2wrs.py -b -p pkixqualified -c ./pkixqualified.cnf -s ./packet-pkixqualified-template -D . PKIXqualified.asn */ /* Input file: packet-pkixqualified-template.c */ @@ -396,7 +396,7 @@ void proto_register_pkixqualified(void) { FT_STRING, BASE_NONE, NULL, 0, "pkixqualified.XmppAddr", HFILL }}, { &hf_pkixqualified_BiometricSyntax_item, - { "BiometricSyntax", "pkixqualified.BiometricSyntax_item", + { "BiometricData", "pkixqualified.BiometricData", FT_NONE, BASE_NONE, NULL, 0, "pkixqualified.BiometricData", HFILL }}, { &hf_pkixqualified_typeOfBiometricData, @@ -424,7 +424,7 @@ void proto_register_pkixqualified(void) { FT_OID, BASE_NONE, NULL, 0, "pkixqualified.OBJECT_IDENTIFIER", HFILL }}, { &hf_pkixqualified_QCStatements_item, - { "QCStatements", "pkixqualified.QCStatements_item", + { "QCStatement", "pkixqualified.QCStatement", FT_NONE, BASE_NONE, NULL, 0, "pkixqualified.QCStatement", HFILL }}, { &hf_pkixqualified_statementId, @@ -444,7 +444,7 @@ void proto_register_pkixqualified(void) { FT_UINT32, BASE_DEC, NULL, 0, "pkixqualified.NameRegistrationAuthorities", HFILL }}, { &hf_pkixqualified_NameRegistrationAuthorities_item, - { "NameRegistrationAuthorities", "pkixqualified.NameRegistrationAuthorities_item", + { "GeneralName", "pkixqualified.GeneralName", FT_UINT32, BASE_DEC, VALS(x509ce_GeneralName_vals), 0, "x509ce.GeneralName", HFILL }}, diff --git a/epan/dissectors/packet-pkixqualified.h b/epan/dissectors/packet-pkixqualified.h index eb6030951e..4804b16442 100644 --- a/epan/dissectors/packet-pkixqualified.h +++ b/epan/dissectors/packet-pkixqualified.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-pkixqualified.h */ -/* ../../tools/asn2wrs.py -b -p pkixqualified -c pkixqualified.cnf -s packet-pkixqualified-template PKIXqualified.asn */ +/* ../../tools/asn2wrs.py -b -p pkixqualified -c ./pkixqualified.cnf -s ./packet-pkixqualified-template -D . PKIXqualified.asn */ /* Input file: packet-pkixqualified-template.h */ diff --git a/epan/dissectors/packet-pkixtsp.c b/epan/dissectors/packet-pkixtsp.c index b87bfc1b67..6a048e1dfa 100644 --- a/epan/dissectors/packet-pkixtsp.c +++ b/epan/dissectors/packet-pkixtsp.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-pkixtsp.c */ -/* ../../tools/asn2wrs.py -b -p pkixtsp -c pkixtsp.cnf -s packet-pkixtsp-template PKIXTSP.asn */ +/* ../../tools/asn2wrs.py -b -p pkixtsp -c ./pkixtsp.cnf -s ./packet-pkixtsp-template -D . PKIXTSP.asn */ /* Input file: packet-pkixtsp-template.c */ diff --git a/epan/dissectors/packet-pkixtsp.h b/epan/dissectors/packet-pkixtsp.h index 7084bdf526..1140ca3d76 100644 --- a/epan/dissectors/packet-pkixtsp.h +++ b/epan/dissectors/packet-pkixtsp.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-pkixtsp.h */ -/* ../../tools/asn2wrs.py -b -p pkixtsp -c pkixtsp.cnf -s packet-pkixtsp-template PKIXTSP.asn */ +/* ../../tools/asn2wrs.py -b -p pkixtsp -c ./pkixtsp.cnf -s ./packet-pkixtsp-template -D . PKIXTSP.asn */ /* Input file: packet-pkixtsp-template.h */ diff --git a/epan/dissectors/packet-pres.c b/epan/dissectors/packet-pres.c index 56b90ce17d..ea9e843803 100644 --- a/epan/dissectors/packet-pres.c +++ b/epan/dissectors/packet-pres.c @@ -1629,7 +1629,7 @@ void proto_register_pres(void) { FT_UINT32, BASE_DEC, NULL, 0, "pres.Presentation_context_deletion_result_list", HFILL }}, { &hf_pres_Context_list_item, - { "Context-list", "pres.Context_list_item", + { "Context-list item", "pres.Context_list_item", FT_NONE, BASE_NONE, NULL, 0, "pres.Context_list_item", HFILL }}, { &hf_pres_presentation_context_identifier, @@ -1645,7 +1645,7 @@ void proto_register_pres(void) { FT_UINT32, BASE_DEC, NULL, 0, "pres.SEQUENCE_OF_Transfer_syntax_name", HFILL }}, { &hf_pres_transfer_syntax_name_list_item, - { "transfer-syntax-name-list", "pres.transfer_syntax_name_list_item", + { "Transfer-syntax-name", "pres.Transfer_syntax_name", FT_OID, BASE_NONE, NULL, 0, "pres.Transfer_syntax_name", HFILL }}, { &hf_pres_transfer_syntax_name, @@ -1657,19 +1657,19 @@ void proto_register_pres(void) { FT_INT32, BASE_DEC, VALS(pres_T_mode_value_vals), 0, "pres.T_mode_value", HFILL }}, { &hf_pres_Presentation_context_deletion_list_item, - { "Presentation-context-deletion-list", "pres.Presentation_context_deletion_list_item", + { "Presentation-context-identifier", "pres.Presentation_context_identifier", FT_INT32, BASE_DEC, NULL, 0, "pres.Presentation_context_identifier", HFILL }}, { &hf_pres_Presentation_context_deletion_result_list_item, - { "Presentation-context-deletion-result-list", "pres.Presentation_context_deletion_result_list_item", + { "Presentation-context-deletion-result-list item", "pres.Presentation_context_deletion_result_list_item", FT_INT32, BASE_DEC, VALS(pres_Presentation_context_deletion_result_list_item_vals), 0, "pres.Presentation_context_deletion_result_list_item", HFILL }}, { &hf_pres_Presentation_context_identifier_list_item, - { "Presentation-context-identifier-list", "pres.Presentation_context_identifier_list_item", + { "Presentation-context-identifier-list item", "pres.Presentation_context_identifier_list_item", FT_NONE, BASE_NONE, NULL, 0, "pres.Presentation_context_identifier_list_item", HFILL }}, { &hf_pres_Result_list_item, - { "Result-list", "pres.Result_list_item", + { "Result-list item", "pres.Result_list_item", FT_NONE, BASE_NONE, NULL, 0, "pres.Result_list_item", HFILL }}, { &hf_pres_result, @@ -1689,7 +1689,7 @@ void proto_register_pres(void) { FT_UINT32, BASE_DEC, NULL, 0, "pres.Fully_encoded_data", HFILL }}, { &hf_pres_Fully_encoded_data_item, - { "Fully-encoded-data", "pres.Fully_encoded_data_item", + { "PDV-list", "pres.PDV_list", FT_NONE, BASE_NONE, NULL, 0, "pres.PDV_list", HFILL }}, { &hf_pres_presentation_data_values, diff --git a/epan/dissectors/packet-q932-ros.c b/epan/dissectors/packet-q932-ros.c index 43a5d8356a..a27fe9fc50 100644 --- a/epan/dissectors/packet-q932-ros.c +++ b/epan/dissectors/packet-q932-ros.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-q932-ros.c */ -/* ../../tools/asn2wrs.py -b -p q932.ros -c q932-ros.cnf -s packet-q932-ros-template ../ros/Remote-Operations-Information-Objects.asn Facility-Information-Element-Components.asn */ +/* ../../tools/asn2wrs.py -b -p q932.ros -c ./q932-ros.cnf -s ./packet-q932-ros-template -D . ../ros/Remote-Operations-Information-Objects.asn Facility-Information-Element-Components.asn */ /* Input file: packet-q932-ros-template.c */ diff --git a/epan/dissectors/packet-q932.c b/epan/dissectors/packet-q932.c index 7b6d2aed45..8a0c63f6ab 100644 --- a/epan/dissectors/packet-q932.c +++ b/epan/dissectors/packet-q932.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-q932.c */ -/* ../../tools/asn2wrs.py -e -b -p q932 -c q932.cnf -s packet-q932-template Addressing-Data-Elements.asn Network-Facility-Extension.asn Network-Protocol-Profile-component.asn Interpretation-component.asn */ +/* ../../tools/asn2wrs.py -e -b -p q932 -c ./q932.cnf -s ./packet-q932-template -D . Addressing-Data-Elements.asn Network-Facility-Extension.asn Network-Protocol-Profile-component.asn Interpretation-component.asn */ /* Input file: packet-q932-template.c */ diff --git a/epan/dissectors/packet-q932.h b/epan/dissectors/packet-q932.h index a00d869ac5..fd45cdbb50 100644 --- a/epan/dissectors/packet-q932.h +++ b/epan/dissectors/packet-q932.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-q932.h */ -/* ../../tools/asn2wrs.py -e -b -p q932 -c q932.cnf -s packet-q932-template Addressing-Data-Elements.asn Network-Facility-Extension.asn Network-Protocol-Profile-component.asn Interpretation-component.asn */ +/* ../../tools/asn2wrs.py -e -b -p q932 -c ./q932.cnf -s ./packet-q932-template -D . Addressing-Data-Elements.asn Network-Facility-Extension.asn Network-Protocol-Profile-component.asn Interpretation-component.asn */ /* Input file: packet-q932-template.h */ diff --git a/epan/dissectors/packet-qsig.c b/epan/dissectors/packet-qsig.c index 938b0b4bea..90d9a68c59 100644 --- a/epan/dissectors/packet-qsig.c +++ b/epan/dissectors/packet-qsig.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-qsig.c */ -/* ../../tools/asn2wrs.py -e -c qsig.cnf -s packet-qsig-template qsig-gf-ext.asn qsig-gf-gp.asn qsig-gf-ade.asn QSIG-NA.asn QSIG-CF.asn QSIG-PR.asn QSIG-CT.asn QSIG-CC.asn QSIG-CO.asn QSIG-DND.asn QSIG-CI.asn QSIG-AOC.asn QSIG-RE.asn SYNC-SIG.asn QSIG-CINT.asn QSIG-CMN.asn QSIG-CPI.asn QSIG-PUMR.asn QSIG-PUMCH.asn QSIG-SSCT.asn QSIG-WTMLR.asn QSIG-WTMCH.asn QSIG-WTMAU.asn QSIG-SD.asn QSIG-CIDL.asn QSIG-SMS.asn QSIG-MCR.asn QSIG-MCM.asn QSIG-MID.asn */ +/* ../../tools/asn2wrs.py -e -c ./qsig.cnf -s ./packet-qsig-template -D . qsig-gf-ext.asn qsig-gf-gp.asn qsig-gf-ade.asn QSIG-NA.asn QSIG-CF.asn QSIG-PR.asn QSIG-CT.asn QSIG-CC.asn QSIG-CO.asn QSIG-DND.asn QSIG-CI.asn QSIG-AOC.asn QSIG-RE.asn SYNC-SIG.asn QSIG-CINT.asn QSIG-CMN.asn QSIG-CPI.asn QSIG-PUMR.asn QSIG-PUMCH.asn QSIG-SSCT.asn QSIG-WTMLR.asn QSIG-WTMCH.asn QSIG-WTMAU.asn QSIG-SD.asn QSIG-CIDL.asn QSIG-SMS.asn QSIG-MCR.asn QSIG-MCM.asn QSIG-MID.asn */ /* Input file: packet-qsig-template.c */ @@ -12720,7 +12720,7 @@ void proto_register_qsig(void) { FT_UINT32, BASE_DEC, NULL, 0, "qsig_na.SEQUENCE_OF_Extension", HFILL }}, { &hf_qsig_na_multiple_item, - { "multiple", "qsig.na.multiple_item", + { "Extension", "qsig.na.Extension", FT_NONE, BASE_NONE, NULL, 0, "qsig.Extension", HFILL }}, { &hf_qsig_na_namePresentationAllowed, @@ -12859,7 +12859,7 @@ void proto_register_qsig(void) { FT_UINT32, BASE_DEC, NULL, 0, "qsig_cf.SEQUENCE_OF_Extension", HFILL }}, { &hf_qsig_cf_multiple_item, - { "multiple", "qsig.cf.multiple_item", + { "Extension", "qsig.cf.Extension", FT_NONE, BASE_NONE, NULL, 0, "qsig.Extension", HFILL }}, { &hf_qsig_cf_null, @@ -12983,7 +12983,7 @@ void proto_register_qsig(void) { FT_UINT32, BASE_DEC, VALS(qsig_cf_DLI3Extension_vals), 0, "qsig_cf.DLI3Extension", HFILL }}, { &hf_qsig_cf_IntResultList_item, - { "IntResultList", "qsig.cf.IntResultList_item", + { "IntResult", "qsig.cf.IntResult", FT_NONE, BASE_NONE, NULL, 0, "qsig_cf.IntResult", HFILL }}, { &hf_qsig_cf_remoteEnabled, @@ -13042,7 +13042,7 @@ void proto_register_qsig(void) { FT_UINT32, BASE_DEC, NULL, 0, "qsig_pr.SEQUENCE_OF_Extension", HFILL }}, { &hf_qsig_pr_multiple_item, - { "multiple", "qsig.pr.multiple_item", + { "Extension", "qsig.pr.Extension", FT_NONE, BASE_NONE, NULL, 0, "qsig.Extension", HFILL }}, { &hf_qsig_pr_extensionPRS, @@ -13113,7 +13113,7 @@ void proto_register_qsig(void) { FT_UINT32, BASE_DEC, NULL, 0, "qsig_ct.SEQUENCE_OF_Extension", HFILL }}, { &hf_qsig_ct_multiple_item, - { "multiple", "qsig.ct.multiple_item", + { "Extension", "qsig.ct.Extension", FT_NONE, BASE_NONE, NULL, 0, "qsig.Extension", HFILL }}, { &hf_qsig_ct_callIdentity, @@ -13272,7 +13272,7 @@ void proto_register_qsig(void) { FT_UINT32, BASE_DEC, NULL, 0, "qsig_cc.SEQUENCE_OF_Extension", HFILL }}, { &hf_qsig_cc_multiple_item, - { "multiple", "qsig.cc.multiple_item", + { "Extension", "qsig.cc.Extension", FT_NONE, BASE_NONE, NULL, 0, "qsig.Extension", HFILL }}, @@ -13323,7 +13323,7 @@ void proto_register_qsig(void) { FT_UINT32, BASE_DEC, NULL, 0, "qsig_co.SEQUENCE_OF_Extension", HFILL }}, { &hf_qsig_co_sequenceOfExtn_item, - { "sequenceOfExtn", "qsig.co.sequenceOfExtn_item", + { "Extension", "qsig.co.Extension", FT_NONE, BASE_NONE, NULL, 0, "qsig.Extension", HFILL }}, { &hf_qsig_co_ServiceList_callOffer, @@ -13390,7 +13390,7 @@ void proto_register_qsig(void) { FT_UINT32, BASE_DEC, NULL, 0, "qsig_dnd.SEQUENCE_OF_Extension", HFILL }}, { &hf_qsig_dnd_sequenceOfExtn_item, - { "sequenceOfExtn", "qsig.dnd.sequenceOfExtn_item", + { "Extension", "qsig.dnd.Extension", FT_NONE, BASE_NONE, NULL, 0, "qsig.Extension", HFILL }}, { &hf_qsig_dnd_basicService, @@ -13410,7 +13410,7 @@ void proto_register_qsig(void) { FT_UINT32, BASE_DEC, NULL, 0, "qsig_dnd.T_status", HFILL }}, { &hf_qsig_dnd_status_item, - { "status", "qsig.dnd.status_item", + { "status item", "qsig.dnd.status_item", FT_NONE, BASE_NONE, NULL, 0, "qsig_dnd.T_status_item", HFILL }}, { &hf_qsig_dnd_dndProtectionLevel, @@ -13434,7 +13434,7 @@ void proto_register_qsig(void) { FT_UINT32, BASE_DEC, NULL, 0, "qsig_dnd.T_status_01", HFILL }}, { &hf_qsig_dnd_status_item_01, - { "status", "qsig.dnd.status_item", + { "status item", "qsig.dnd.status_item", FT_NONE, BASE_NONE, NULL, 0, "qsig_dnd.T_status_item_01", HFILL }}, { &hf_qsig_dnd_resultExtension_01, @@ -13533,7 +13533,7 @@ void proto_register_qsig(void) { FT_UINT32, BASE_DEC, NULL, 0, "qsig_ci.SEQUENCE_OF_Extension", HFILL }}, { &hf_qsig_ci_sequenceOfExtn_item, - { "sequenceOfExtn", "qsig.ci.sequenceOfExtn_item", + { "Extension", "qsig.ci.Extension", FT_NONE, BASE_NONE, NULL, 0, "qsig.Extension", HFILL }}, { &hf_qsig_ci_ciCapabilityLevel, @@ -13640,7 +13640,7 @@ void proto_register_qsig(void) { FT_UINT32, BASE_DEC, NULL, 0, "qsig_aoc.SEQUENCE_OF_Extension", HFILL }}, { &hf_qsig_aoc_multipleExtension_item, - { "multipleExtension", "qsig.aoc.multipleExtension_item", + { "Extension", "qsig.aoc.Extension", FT_NONE, BASE_NONE, NULL, 0, "qsig.Extension", HFILL }}, { &hf_qsig_aoc_interimCharge, @@ -13688,7 +13688,7 @@ void proto_register_qsig(void) { FT_UINT32, BASE_DEC, VALS(qsig_aoc_T_finalArgExtension_vals), 0, "qsig_aoc.T_finalArgExtension", HFILL }}, { &hf_qsig_aoc_AOCSCurrencyInfoList_item, - { "AOCSCurrencyInfoList", "qsig.aoc.AOCSCurrencyInfoList_item", + { "AOCSCurrencyInfo", "qsig.aoc.AOCSCurrencyInfo", FT_NONE, BASE_NONE, NULL, 0, "qsig_aoc.AOCSCurrencyInfo", HFILL }}, { &hf_qsig_aoc_chargedItem, @@ -13800,7 +13800,7 @@ void proto_register_qsig(void) { FT_UINT32, BASE_DEC, NULL, 0, "qsig_aoc.SEQUENCE_SIZE_0_7_OF_AdviceModeCombination", HFILL }}, { &hf_qsig_aoc_adviceModeCombinations_item, - { "adviceModeCombinations", "qsig.aoc.adviceModeCombinations_item", + { "AdviceModeCombination", "qsig.aoc.AdviceModeCombination", FT_UINT32, BASE_DEC, VALS(qsig_aoc_AdviceModeCombination_vals), 0, "qsig_aoc.AdviceModeCombination", HFILL }}, { &hf_qsig_aoc_chargeReqArgExtension, @@ -13879,7 +13879,7 @@ void proto_register_qsig(void) { FT_UINT32, BASE_DEC, NULL, 0, "qsig_re.SEQUENCE_OF_Extension", HFILL }}, { &hf_qsig_re_multipleExtension_item, - { "multipleExtension", "qsig.re.multipleExtension_item", + { "Extension", "qsig.re.Extension", FT_NONE, BASE_NONE, NULL, 0, "qsig.Extension", HFILL }}, { &hf_qsig_re_connectedNumber, @@ -13942,7 +13942,7 @@ void proto_register_qsig(void) { FT_UINT32, BASE_DEC, NULL, 0, "qsig_sync.SEQUENCE_OF_Extension", HFILL }}, { &hf_qsig_sync_sequOfExtn_item, - { "sequOfExtn", "qsig.sync.sequOfExtn_item", + { "Extension", "qsig.sync.Extension", FT_NONE, BASE_NONE, NULL, 0, "qsig.Extension", HFILL }}, @@ -14009,7 +14009,7 @@ void proto_register_qsig(void) { FT_UINT32, BASE_DEC, NULL, 0, "qsig_cint.SEQUENCE_OF_Extension", HFILL }}, { &hf_qsig_cint_multiple_item, - { "multiple", "qsig.cint.multiple_item", + { "Extension", "qsig.cint.Extension", FT_NONE, BASE_NONE, NULL, 0, "qsig.Extension", HFILL }}, @@ -14056,7 +14056,7 @@ void proto_register_qsig(void) { FT_UINT32, BASE_DEC, NULL, 0, "qsig_cmn.SEQUENCE_OF_Extension", HFILL }}, { &hf_qsig_cmn_multiple_item, - { "multiple", "qsig.cmn.multiple_item", + { "Extension", "qsig.cmn.Extension", FT_NONE, BASE_NONE, NULL, 0, "qsig.Extension", HFILL }}, { &hf_qsig_cmn_null, @@ -14175,7 +14175,7 @@ void proto_register_qsig(void) { FT_UINT32, BASE_DEC, NULL, 0, "qsig_cpi.SEQUENCE_OF_Extension", HFILL }}, { &hf_qsig_cpi_sequenceOfExtn_item, - { "sequenceOfExtn", "qsig.cpi.sequenceOfExtn_item", + { "Extension", "qsig.cpi.Extension", FT_NONE, BASE_NONE, NULL, 0, "qsig.Extension", HFILL }}, { &hf_qsig_cpi_cpiProtectionLevel, @@ -14282,7 +14282,7 @@ void proto_register_qsig(void) { FT_UINT32, BASE_DEC, NULL, 0, "qsig_pumr.SEQUENCE_OF_Extension", HFILL }}, { &hf_qsig_pumr_sequOfExtn_item, - { "sequOfExtn", "qsig.pumr.sequOfExtn_item", + { "Extension", "qsig.pumr.Extension", FT_NONE, BASE_NONE, NULL, 0, "qsig.Extension", HFILL }}, { &hf_qsig_pumr_pumXUserId, @@ -14310,7 +14310,7 @@ void proto_register_qsig(void) { FT_UINT32, BASE_DEC, VALS(qsig_pumr_T_userPin_02_vals), 0, "qsig_pumr.T_userPin_02", HFILL }}, { &hf_qsig_pumr_PumInterrogRes_item, - { "PumInterrogRes", "qsig.pumr.PumInterrogRes_item", + { "PumInterrogRes item", "qsig.pumr.PumInterrogRes_item", FT_NONE, BASE_NONE, NULL, 0, "qsig_pumr.PumInterrogRes_item", HFILL }}, { &hf_qsig_pumr_interrogParams, @@ -14425,7 +14425,7 @@ void proto_register_qsig(void) { FT_UINT32, BASE_DEC, NULL, 0, "qsig_pumch.SEQUENCE_OF_Extension", HFILL }}, { &hf_qsig_pumch_sequOfExtn_item, - { "sequOfExtn", "qsig.pumch.sequOfExtn_item", + { "Extension", "qsig.pumch.Extension", FT_NONE, BASE_NONE, NULL, 0, "qsig.Extension", HFILL }}, { &hf_qsig_pumch_alternativeId, @@ -14457,7 +14457,7 @@ void proto_register_qsig(void) { FT_UINT32, BASE_DEC, NULL, 0, "qsig_pumch.SEQUENCE_OF_Extension", HFILL }}, { &hf_qsig_pumch_multiple_item, - { "multiple", "qsig.pumch.multiple_item", + { "Extension", "qsig.pumch.Extension", FT_NONE, BASE_NONE, NULL, 0, "qsig.Extension", HFILL }}, @@ -14500,7 +14500,7 @@ void proto_register_qsig(void) { FT_UINT32, BASE_DEC, NULL, 0, "qsig_ssct.SEQUENCE_OF_Extension", HFILL }}, { &hf_qsig_ssct_multiple_item, - { "multiple", "qsig.ssct.multiple_item", + { "Extension", "qsig.ssct.Extension", FT_NONE, BASE_NONE, NULL, 0, "qsig.Extension", HFILL }}, { &hf_qsig_ssct_rerouteingNumber, @@ -14623,7 +14623,7 @@ void proto_register_qsig(void) { FT_UINT32, BASE_DEC, NULL, 0, "qsig_wtmlr.SEQUENCE_OF_Extension", HFILL }}, { &hf_qsig_wtmlr_sequOfExtn_item, - { "sequOfExtn", "qsig.wtmlr.sequOfExtn_item", + { "Extension", "qsig.wtmlr.Extension", FT_NONE, BASE_NONE, NULL, 0, "qsig.Extension", HFILL }}, { &hf_qsig_wtmlr_alternativeId, @@ -14746,7 +14746,7 @@ void proto_register_qsig(void) { FT_UINT32, BASE_DEC, NULL, 0, "qsig_wtmch.SEQUENCE_OF_Extension", HFILL }}, { &hf_qsig_wtmch_sequOfExtn_item, - { "sequOfExtn", "qsig.wtmch.sequOfExtn_item", + { "Extension", "qsig.wtmch.Extension", FT_NONE, BASE_NONE, NULL, 0, "qsig.Extension", HFILL }}, { &hf_qsig_wtmch_alternativeId, @@ -14778,7 +14778,7 @@ void proto_register_qsig(void) { FT_UINT32, BASE_DEC, NULL, 0, "qsig_wtmch.SEQUENCE_OF_Extension", HFILL }}, { &hf_qsig_wtmch_multiple_item, - { "multiple", "qsig.wtmch.multiple_item", + { "Extension", "qsig.wtmch.Extension", FT_NONE, BASE_NONE, NULL, 0, "qsig.Extension", HFILL }}, @@ -14889,7 +14889,7 @@ void proto_register_qsig(void) { FT_BYTES, BASE_HEX, NULL, 0, "qsig_wtmau.CalculationParam", HFILL }}, { &hf_qsig_wtmau_CalcWtatInfo_item, - { "CalcWtatInfo", "qsig.wtmau.CalcWtatInfo_item", + { "CalcWtatInfoUnit", "qsig.wtmau.CalcWtatInfoUnit", FT_NONE, BASE_NONE, NULL, 0, "qsig_wtmau.CalcWtatInfoUnit", HFILL }}, { &hf_qsig_wtmau_authResponse, @@ -14909,7 +14909,7 @@ void proto_register_qsig(void) { FT_UINT32, BASE_DEC, NULL, 0, "qsig_wtmau.SEQUENCE_OF_Extension", HFILL }}, { &hf_qsig_wtmau_sequOfExtn_item, - { "sequOfExtn", "qsig.wtmau.sequOfExtn_item", + { "Extension", "qsig.wtmau.Extension", FT_NONE, BASE_NONE, NULL, 0, "qsig.Extension", HFILL }}, { &hf_qsig_wtmau_authAlg, @@ -14964,7 +14964,7 @@ void proto_register_qsig(void) { FT_UINT32, BASE_DEC, NULL, 0, "qsig_sd.SEQUENCE_OF_Extension", HFILL }}, { &hf_qsig_sd_multipleExtension_item, - { "multipleExtension", "qsig.sd.multipleExtension_item", + { "Extension", "qsig.sd.Extension", FT_NONE, BASE_NONE, NULL, 0, "qsig.Extension", HFILL }}, @@ -15023,7 +15023,7 @@ void proto_register_qsig(void) { FT_UINT32, BASE_DEC, NULL, 0, "qsig_cidl.SEQUENCE_OF_Extension", HFILL }}, { &hf_qsig_cidl_sequenceOfExt_item, - { "sequenceOfExt", "qsig.cidl.sequenceOfExt_item", + { "Extension", "qsig.cidl.Extension", FT_NONE, BASE_NONE, NULL, 0, "qsig.Extension", HFILL }}, @@ -15214,7 +15214,7 @@ void proto_register_qsig(void) { FT_UINT32, BASE_DEC, NULL, 0, "qsig_sms.SEQUENCE_OF_Extension", HFILL }}, { &hf_qsig_sms_multiple_item, - { "multiple", "qsig.sms.multiple_item", + { "Extension", "qsig.sms.Extension", FT_NONE, BASE_NONE, NULL, 0, "qsig.Extension", HFILL }}, { &hf_qsig_sms_validityPeriodRel, @@ -15270,7 +15270,7 @@ void proto_register_qsig(void) { FT_BYTES, BASE_HEX, NULL, 0, "qsig_sms.ShortMessageTextData", HFILL }}, { &hf_qsig_sms_UserDataHeader_item, - { "UserDataHeader", "qsig.sms.UserDataHeader_item", + { "UserDataHeaderChoice", "qsig.sms.UserDataHeaderChoice", FT_UINT32, BASE_DEC, VALS(qsig_sms_UserDataHeaderChoice_vals), 0, "qsig_sms.UserDataHeaderChoice", HFILL }}, { &hf_qsig_sms_smscControlParameterHeader, @@ -15465,7 +15465,7 @@ void proto_register_qsig(void) { FT_UINT32, BASE_DEC, NULL, 0, "qsig_mcr.SEQUENCE_OF_Extension", HFILL }}, { &hf_qsig_mcr_multiple_item, - { "multiple", "qsig.mcr.multiple_item", + { "Extension", "qsig.mcr.Extension", FT_NONE, BASE_NONE, NULL, 0, "qsig.Extension", HFILL }}, @@ -15528,7 +15528,7 @@ void proto_register_qsig(void) { FT_UINT32, BASE_DEC, VALS(qsig_mcm_MCMExtensions_vals), 0, "qsig_mcm.MCMExtensions", HFILL }}, { &hf_qsig_mcm_MailboxFullFor_item, - { "MailboxFullFor", "qsig.mcm.MailboxFullFor_item", + { "MailboxFullPar", "qsig.mcm.MailboxFullPar", FT_NONE, BASE_NONE, NULL, 0, "qsig_mcm.MailboxFullPar", HFILL }}, { &hf_qsig_mcm_messageType, @@ -15548,7 +15548,7 @@ void proto_register_qsig(void) { FT_UINT32, BASE_DEC, NULL, 0, "qsig_mcm.SEQUENCE_OF_MCMServiceInfo", HFILL }}, { &hf_qsig_mcm_activateMCM_item, - { "activateMCM", "qsig.mcm.activateMCM_item", + { "MCMServiceInfo", "qsig.mcm.MCMServiceInfo", FT_NONE, BASE_NONE, NULL, 0, "qsig_mcm.MCMServiceInfo", HFILL }}, { &hf_qsig_mcm_deactivateMCM, @@ -15556,7 +15556,7 @@ void proto_register_qsig(void) { FT_UINT32, BASE_DEC, NULL, 0, "qsig_mcm.SEQUENCE_OF_MessageType", HFILL }}, { &hf_qsig_mcm_deactivateMCM_item, - { "deactivateMCM", "qsig.mcm.deactivateMCM_item", + { "MessageType", "qsig.mcm.MessageType", FT_UINT32, BASE_DEC, VALS(qsig_mcm_MessageType_vals), 0, "qsig_mcm.MessageType", HFILL }}, { &hf_qsig_mcm_setToDefaultValues, @@ -15576,7 +15576,7 @@ void proto_register_qsig(void) { FT_UINT32, BASE_DEC, NULL, 0, "qsig_mcm.SEQUENCE_OF_MessageType", HFILL }}, { &hf_qsig_mcm_interrogateInfo_item, - { "interrogateInfo", "qsig.mcm.interrogateInfo_item", + { "MessageType", "qsig.mcm.MessageType", FT_UINT32, BASE_DEC, VALS(qsig_mcm_MessageType_vals), 0, "qsig_mcm.MessageType", HFILL }}, { &hf_qsig_mcm_interrogateResult, @@ -15584,7 +15584,7 @@ void proto_register_qsig(void) { FT_UINT32, BASE_DEC, NULL, 0, "qsig_mcm.SEQUENCE_OF_MCMServiceInfo", HFILL }}, { &hf_qsig_mcm_interrogateResult_item, - { "interrogateResult", "qsig.mcm.interrogateResult_item", + { "MCMServiceInfo", "qsig.mcm.MCMServiceInfo", FT_NONE, BASE_NONE, NULL, 0, "qsig_mcm.MCMServiceInfo", HFILL }}, { &hf_qsig_mcm_servedUserNr, @@ -15628,7 +15628,7 @@ void proto_register_qsig(void) { FT_UINT32, BASE_DEC, NULL, 0, "qsig_mcm.SEQUENCE_OF_Extension", HFILL }}, { &hf_qsig_mcm_multipleExtension_item, - { "multipleExtension", "qsig.mcm.multipleExtension_item", + { "Extension", "qsig.mcm.Extension", FT_NONE, BASE_NONE, NULL, 0, "qsig.Extension", HFILL }}, { &hf_qsig_mcm_argumentExtMCMNoNew, @@ -15648,7 +15648,7 @@ void proto_register_qsig(void) { FT_UINT32, BASE_DEC, VALS(qsig_mcm_MCMUpdArgArgumentExt_vals), 0, "qsig_mcm.MCMUpdArgArgumentExt", HFILL }}, { &hf_qsig_mcm_MCMUpdateReqRes_item, - { "MCMUpdateReqRes", "qsig.mcm.MCMUpdateReqRes_item", + { "MCMUpdateReqResElt", "qsig.mcm.MCMUpdateReqResElt", FT_NONE, BASE_NONE, NULL, 0, "qsig_mcm.MCMUpdateReqResElt", HFILL }}, { &hf_qsig_mcm_argumentExtMCMUpdRes, @@ -15692,7 +15692,7 @@ void proto_register_qsig(void) { FT_NONE, BASE_NONE, NULL, 0, "qsig_mcm.NULL", HFILL }}, { &hf_qsig_mcm_CompleteInfo_item, - { "CompleteInfo", "qsig.mcm.CompleteInfo_item", + { "AddressHeader", "qsig.mcm.AddressHeader", FT_NONE, BASE_NONE, NULL, 0, "qsig_mcm.AddressHeader", HFILL }}, { &hf_qsig_mcm_originatorNr, @@ -15803,7 +15803,7 @@ void proto_register_qsig(void) { FT_UINT32, BASE_DEC, NULL, 0, "qsig_mid.SEQUENCE_OF_Extension", HFILL }}, { &hf_qsig_mid_multipleExtension_item, - { "multipleExtension", "qsig.mid.multipleExtension_item", + { "Extension", "qsig.mid.Extension", FT_NONE, BASE_NONE, NULL, 0, "qsig.Extension", HFILL }}, diff --git a/epan/dissectors/packet-qsig.h b/epan/dissectors/packet-qsig.h index e6e0d66ef4..45ae669613 100644 --- a/epan/dissectors/packet-qsig.h +++ b/epan/dissectors/packet-qsig.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-qsig.h */ -/* ../../tools/asn2wrs.py -e -c qsig.cnf -s packet-qsig-template qsig-gf-ext.asn qsig-gf-gp.asn qsig-gf-ade.asn QSIG-NA.asn QSIG-CF.asn QSIG-PR.asn QSIG-CT.asn QSIG-CC.asn QSIG-CO.asn QSIG-DND.asn QSIG-CI.asn QSIG-AOC.asn QSIG-RE.asn SYNC-SIG.asn QSIG-CINT.asn QSIG-CMN.asn QSIG-CPI.asn QSIG-PUMR.asn QSIG-PUMCH.asn QSIG-SSCT.asn QSIG-WTMLR.asn QSIG-WTMCH.asn QSIG-WTMAU.asn QSIG-SD.asn QSIG-CIDL.asn QSIG-SMS.asn QSIG-MCR.asn QSIG-MCM.asn QSIG-MID.asn */ +/* ../../tools/asn2wrs.py -e -c ./qsig.cnf -s ./packet-qsig-template -D . qsig-gf-ext.asn qsig-gf-gp.asn qsig-gf-ade.asn QSIG-NA.asn QSIG-CF.asn QSIG-PR.asn QSIG-CT.asn QSIG-CC.asn QSIG-CO.asn QSIG-DND.asn QSIG-CI.asn QSIG-AOC.asn QSIG-RE.asn SYNC-SIG.asn QSIG-CINT.asn QSIG-CMN.asn QSIG-CPI.asn QSIG-PUMR.asn QSIG-PUMCH.asn QSIG-SSCT.asn QSIG-WTMLR.asn QSIG-WTMCH.asn QSIG-WTMAU.asn QSIG-SD.asn QSIG-CIDL.asn QSIG-SMS.asn QSIG-MCR.asn QSIG-MCM.asn QSIG-MID.asn */ /* Input file: packet-qsig-template.h */ diff --git a/epan/dissectors/packet-ranap.c b/epan/dissectors/packet-ranap.c index 4abdae1a1a..6e7c0805b8 100644 --- a/epan/dissectors/packet-ranap.c +++ b/epan/dissectors/packet-ranap.c @@ -12850,7 +12850,7 @@ void proto_register_ranap(void) { FT_OID, BASE_NONE, NULL, 0, "ranap.OBJECT_IDENTIFIER", HFILL }}, { &hf_ranap_ProtocolIE_Container_item, - { "ProtocolIE-Container", "ranap.ProtocolIE_Container_item", + { "ProtocolIE-Field", "ranap.ProtocolIE_Field", FT_NONE, BASE_NONE, NULL, 0, "ranap.ProtocolIE_Field", HFILL }}, { &hf_ranap_id, @@ -12866,7 +12866,7 @@ void proto_register_ranap(void) { FT_NONE, BASE_NONE, NULL, 0, "ranap.T_ie_field_value", HFILL }}, { &hf_ranap_ProtocolIE_ContainerPair_item, - { "ProtocolIE-ContainerPair", "ranap.ProtocolIE_ContainerPair_item", + { "ProtocolIE-FieldPair", "ranap.ProtocolIE_FieldPair", FT_NONE, BASE_NONE, NULL, 0, "ranap.ProtocolIE_FieldPair", HFILL }}, { &hf_ranap_firstCriticality, @@ -12886,15 +12886,15 @@ void proto_register_ranap(void) { FT_NONE, BASE_NONE, NULL, 0, "ranap.T_secondValue", HFILL }}, { &hf_ranap_ProtocolIE_ContainerList_item, - { "ProtocolIE-ContainerList", "ranap.ProtocolIE_ContainerList_item", + { "ProtocolIE-Container", "ranap.ProtocolIE_Container", FT_UINT32, BASE_DEC, NULL, 0, "ranap.ProtocolIE_Container", HFILL }}, { &hf_ranap_ProtocolIE_ContainerPairList_item, - { "ProtocolIE-ContainerPairList", "ranap.ProtocolIE_ContainerPairList_item", + { "ProtocolIE-ContainerPair", "ranap.ProtocolIE_ContainerPair", FT_UINT32, BASE_DEC, NULL, 0, "ranap.ProtocolIE_ContainerPair", HFILL }}, { &hf_ranap_ProtocolExtensionContainer_item, - { "ProtocolExtensionContainer", "ranap.ProtocolExtensionContainer_item", + { "ProtocolExtensionField", "ranap.ProtocolExtensionField", FT_NONE, BASE_NONE, NULL, 0, "ranap.ProtocolExtensionField", HFILL }}, { &hf_ranap_ext_id, @@ -12906,7 +12906,7 @@ void proto_register_ranap(void) { FT_NONE, BASE_NONE, NULL, 0, "ranap.T_extensionValue", HFILL }}, { &hf_ranap_PrivateIE_Container_item, - { "PrivateIE-Container", "ranap.PrivateIE_Container_item", + { "PrivateIE-Field", "ranap.PrivateIE_Field", FT_NONE, BASE_NONE, NULL, 0, "ranap.PrivateIE_Field", HFILL }}, { &hf_ranap_private_id, @@ -12954,11 +12954,11 @@ void proto_register_ranap(void) { FT_UINT32, BASE_DEC, NULL, 0, "ranap.Alt_RAB_Parameter_ExtendedGuaranteedBitrates", HFILL }}, { &hf_ranap_Alt_RAB_Parameter_ExtendedGuaranteedBitrates_item, - { "Alt-RAB-Parameter-ExtendedGuaranteedBitrates", "ranap.Alt_RAB_Parameter_ExtendedGuaranteedBitrates_item", + { "Alt-RAB-Parameter-ExtendedGuaranteedBitrateList", "ranap.Alt_RAB_Parameter_ExtendedGuaranteedBitrateList", FT_UINT32, BASE_DEC, NULL, 0, "ranap.Alt_RAB_Parameter_ExtendedGuaranteedBitrateList", HFILL }}, { &hf_ranap_Alt_RAB_Parameter_ExtendedGuaranteedBitrateList_item, - { "Alt-RAB-Parameter-ExtendedGuaranteedBitrateList", "ranap.Alt_RAB_Parameter_ExtendedGuaranteedBitrateList_item", + { "ExtendedGuaranteedBitrate", "ranap.ExtendedGuaranteedBitrate", FT_UINT32, BASE_DEC, NULL, 0, "ranap.ExtendedGuaranteedBitrate", HFILL }}, { &hf_ranap_altGuaranteedBitrateType, @@ -12970,11 +12970,11 @@ void proto_register_ranap(void) { FT_UINT32, BASE_DEC, NULL, 0, "ranap.Alt_RAB_Parameter_GuaranteedBitrates", HFILL }}, { &hf_ranap_Alt_RAB_Parameter_GuaranteedBitrates_item, - { "Alt-RAB-Parameter-GuaranteedBitrates", "ranap.Alt_RAB_Parameter_GuaranteedBitrates_item", + { "Alt-RAB-Parameter-GuaranteedBitrateList", "ranap.Alt_RAB_Parameter_GuaranteedBitrateList", FT_UINT32, BASE_DEC, NULL, 0, "ranap.Alt_RAB_Parameter_GuaranteedBitrateList", HFILL }}, { &hf_ranap_Alt_RAB_Parameter_GuaranteedBitrateList_item, - { "Alt-RAB-Parameter-GuaranteedBitrateList", "ranap.Alt_RAB_Parameter_GuaranteedBitrateList_item", + { "GuaranteedBitrate", "ranap.GuaranteedBitrate", FT_UINT32, BASE_DEC, NULL, 0, "ranap.GuaranteedBitrate", HFILL }}, { &hf_ranap_altSupportedGuaranteedBitrateType, @@ -12986,7 +12986,7 @@ void proto_register_ranap(void) { FT_UINT32, BASE_DEC, NULL, 0, "ranap.Alt_RAB_Parameter_SupportedGuaranteedBitrates", HFILL }}, { &hf_ranap_Alt_RAB_Parameter_SupportedGuaranteedBitrates_item, - { "Alt-RAB-Parameter-SupportedGuaranteedBitrates", "ranap.Alt_RAB_Parameter_SupportedGuaranteedBitrates_item", + { "SupportedRAB-ParameterBitrateList", "ranap.SupportedRAB_ParameterBitrateList", FT_UINT32, BASE_DEC, NULL, 0, "ranap.SupportedRAB_ParameterBitrateList", HFILL }}, { &hf_ranap_altExtendedMaxBitrateType, @@ -12998,11 +12998,11 @@ void proto_register_ranap(void) { FT_UINT32, BASE_DEC, NULL, 0, "ranap.Alt_RAB_Parameter_ExtendedMaxBitrates", HFILL }}, { &hf_ranap_Alt_RAB_Parameter_ExtendedMaxBitrates_item, - { "Alt-RAB-Parameter-ExtendedMaxBitrates", "ranap.Alt_RAB_Parameter_ExtendedMaxBitrates_item", + { "Alt-RAB-Parameter-ExtendedMaxBitrateList", "ranap.Alt_RAB_Parameter_ExtendedMaxBitrateList", FT_UINT32, BASE_DEC, NULL, 0, "ranap.Alt_RAB_Parameter_ExtendedMaxBitrateList", HFILL }}, { &hf_ranap_Alt_RAB_Parameter_ExtendedMaxBitrateList_item, - { "Alt-RAB-Parameter-ExtendedMaxBitrateList", "ranap.Alt_RAB_Parameter_ExtendedMaxBitrateList_item", + { "ExtendedMaxBitrate", "ranap.ExtendedMaxBitrate", FT_UINT32, BASE_DEC, NULL, 0, "ranap.ExtendedMaxBitrate", HFILL }}, { &hf_ranap_altMaxBitrateType, @@ -13014,11 +13014,11 @@ void proto_register_ranap(void) { FT_UINT32, BASE_DEC, NULL, 0, "ranap.Alt_RAB_Parameter_MaxBitrates", HFILL }}, { &hf_ranap_Alt_RAB_Parameter_MaxBitrates_item, - { "Alt-RAB-Parameter-MaxBitrates", "ranap.Alt_RAB_Parameter_MaxBitrates_item", + { "Alt-RAB-Parameter-MaxBitrateList", "ranap.Alt_RAB_Parameter_MaxBitrateList", FT_UINT32, BASE_DEC, NULL, 0, "ranap.Alt_RAB_Parameter_MaxBitrateList", HFILL }}, { &hf_ranap_Alt_RAB_Parameter_MaxBitrateList_item, - { "Alt-RAB-Parameter-MaxBitrateList", "ranap.Alt_RAB_Parameter_MaxBitrateList_item", + { "MaxBitrate", "ranap.MaxBitrate", FT_UINT32, BASE_DEC, NULL, 0, "ranap.MaxBitrate", HFILL }}, { &hf_ranap_altSupportedMaxBitrateType, @@ -13030,7 +13030,7 @@ void proto_register_ranap(void) { FT_UINT32, BASE_DEC, NULL, 0, "ranap.Alt_RAB_Parameter_SupportedMaxBitrates", HFILL }}, { &hf_ranap_Alt_RAB_Parameter_SupportedMaxBitrates_item, - { "Alt-RAB-Parameter-SupportedMaxBitrates", "ranap.Alt_RAB_Parameter_SupportedMaxBitrates_item", + { "SupportedRAB-ParameterBitrateList", "ranap.SupportedRAB_ParameterBitrateList", FT_UINT32, BASE_DEC, NULL, 0, "ranap.SupportedRAB_ParameterBitrateList", HFILL }}, { &hf_ranap_sAI, @@ -13050,23 +13050,23 @@ void proto_register_ranap(void) { FT_UINT32, BASE_DEC, NULL, 0, "ranap.Ass_RAB_Parameter_GuaranteedBitrateList", HFILL }}, { &hf_ranap_Ass_RAB_Parameter_ExtendedGuaranteedBitrateList_item, - { "Ass-RAB-Parameter-ExtendedGuaranteedBitrateList", "ranap.Ass_RAB_Parameter_ExtendedGuaranteedBitrateList_item", + { "ExtendedGuaranteedBitrate", "ranap.ExtendedGuaranteedBitrate", FT_UINT32, BASE_DEC, NULL, 0, "ranap.ExtendedGuaranteedBitrate", HFILL }}, { &hf_ranap_Ass_RAB_Parameter_ExtendedMaxBitrateList_item, - { "Ass-RAB-Parameter-ExtendedMaxBitrateList", "ranap.Ass_RAB_Parameter_ExtendedMaxBitrateList_item", + { "ExtendedMaxBitrate", "ranap.ExtendedMaxBitrate", FT_UINT32, BASE_DEC, NULL, 0, "ranap.ExtendedMaxBitrate", HFILL }}, { &hf_ranap_Ass_RAB_Parameter_GuaranteedBitrateList_item, - { "Ass-RAB-Parameter-GuaranteedBitrateList", "ranap.Ass_RAB_Parameter_GuaranteedBitrateList_item", + { "GuaranteedBitrate", "ranap.GuaranteedBitrate", FT_UINT32, BASE_DEC, NULL, 0, "ranap.GuaranteedBitrate", HFILL }}, { &hf_ranap_Ass_RAB_Parameter_MaxBitrateList_item, - { "Ass-RAB-Parameter-MaxBitrateList", "ranap.Ass_RAB_Parameter_MaxBitrateList_item", + { "MaxBitrate", "ranap.MaxBitrate", FT_UINT32, BASE_DEC, NULL, 0, "ranap.MaxBitrate", HFILL }}, { &hf_ranap_AuthorisedPLMNs_item, - { "AuthorisedPLMNs", "ranap.AuthorisedPLMNs_item", + { "AuthorisedPLMNs item", "ranap.AuthorisedPLMNs_item", FT_NONE, BASE_NONE, NULL, 0, "ranap.AuthorisedPLMNs_item", HFILL }}, { &hf_ranap_pLMNidentity, @@ -13078,7 +13078,7 @@ void proto_register_ranap(void) { FT_UINT32, BASE_DEC, NULL, 0, "ranap.AuthorisedSNAs", HFILL }}, { &hf_ranap_AuthorisedSNAs_item, - { "AuthorisedSNAs", "ranap.AuthorisedSNAs_item", + { "SNAC", "ranap.SNAC", FT_UINT32, BASE_DEC, NULL, 0, "ranap.SNAC", HFILL }}, { &hf_ranap_cipheringKeyFlag, @@ -13166,7 +13166,7 @@ void proto_register_ranap(void) { FT_UINT32, BASE_DEC, NULL, 0, "ranap.CriticalityDiagnostics_IE_List", HFILL }}, { &hf_ranap_CriticalityDiagnostics_IE_List_item, - { "CriticalityDiagnostics-IE-List", "ranap.CriticalityDiagnostics_IE_List_item", + { "CriticalityDiagnostics-IE-List item", "ranap.CriticalityDiagnostics_IE_List_item", FT_NONE, BASE_NONE, NULL, 0, "ranap.CriticalityDiagnostics_IE_List_item", HFILL }}, { &hf_ranap_iECriticality, @@ -13182,7 +13182,7 @@ void proto_register_ranap(void) { FT_UINT32, BASE_DEC, NULL, 0, "ranap.RepetitionNumber0", HFILL }}, { &hf_ranap_MessageStructure_item, - { "MessageStructure", "ranap.MessageStructure_item", + { "MessageStructure item", "ranap.MessageStructure_item", FT_NONE, BASE_NONE, NULL, 0, "ranap.MessageStructure_item", HFILL }}, { &hf_ranap_item_repetitionNumber, @@ -13206,11 +13206,11 @@ void proto_register_ranap(void) { FT_UINT32, BASE_DEC, NULL, 0, "ranap.RAListwithNoIdleModeUEsAnyMore", HFILL }}, { &hf_ranap_NewRAListofIdleModeUEs_item, - { "NewRAListofIdleModeUEs", "ranap.NewRAListofIdleModeUEs_item", + { "RAC", "ranap.RAC", FT_BYTES, BASE_HEX, NULL, 0, "ranap.RAC", HFILL }}, { &hf_ranap_RAListwithNoIdleModeUEsAnyMore_item, - { "RAListwithNoIdleModeUEsAnyMore", "ranap.RAListwithNoIdleModeUEsAnyMore_item", + { "RAC", "ranap.RAC", FT_BYTES, BASE_HEX, NULL, 0, "ranap.RAC", HFILL }}, { &hf_ranap_macroENB_ID, @@ -13254,7 +13254,7 @@ void proto_register_ranap(void) { FT_NONE, BASE_NONE, NULL, 0, "ranap.IMEISVGroup", HFILL }}, { &hf_ranap_GANSS_PositioningDataSet_item, - { "GANSS-PositioningDataSet", "ranap.GANSS_PositioningDataSet_item", + { "GANSS-PositioningMethodAndUsage", "ranap.GANSS_PositioningMethodAndUsage", FT_BYTES, BASE_HEX, NULL, 0, "ranap.GANSS_PositioningMethodAndUsage", HFILL }}, { &hf_ranap_point, @@ -13346,7 +13346,7 @@ void proto_register_ranap(void) { FT_UINT32, BASE_DEC, NULL, 0, "ranap.INTEGER_0_127", HFILL }}, { &hf_ranap_GA_Polygon_item, - { "GA-Polygon", "ranap.GA_Polygon_item", + { "GA-Polygon item", "ranap.GA_Polygon_item", FT_NONE, BASE_NONE, NULL, 0, "ranap.GA_Polygon_item", HFILL }}, { &hf_ranap_uncertaintySemi_major, @@ -13386,7 +13386,7 @@ void proto_register_ranap(void) { FT_BYTES, BASE_HEX, NULL, 0, "ranap.BIT_STRING_SIZE_7", HFILL }}, { &hf_ranap_IMEIList_item, - { "IMEIList", "ranap.IMEIList_item", + { "IMEI", "ranap.IMEI", FT_BYTES, BASE_HEX, NULL, 0, "ranap.IMEI", HFILL }}, { &hf_ranap_iMEISV, @@ -13398,7 +13398,7 @@ void proto_register_ranap(void) { FT_BYTES, BASE_HEX, NULL, 0, "ranap.BIT_STRING_SIZE_7", HFILL }}, { &hf_ranap_IMEISVList_item, - { "IMEISVList", "ranap.IMEISVList_item", + { "IMEISV", "ranap.IMEISV", FT_BYTES, BASE_HEX, NULL, 0, "ranap.IMEISV", HFILL }}, { &hf_ranap_requestedMBMSIPMulticastAddressandAPNRequest, @@ -13442,7 +13442,7 @@ void proto_register_ranap(void) { FT_BYTES, BASE_HEX, NULL, 0, "ranap.BindingID", HFILL }}, { &hf_ranap_LA_LIST_item, - { "LA-LIST", "ranap.LA_LIST_item", + { "LA-LIST item", "ranap.LA_LIST_item", FT_NONE, BASE_NONE, NULL, 0, "ranap.LA_LIST_item", HFILL }}, { &hf_ranap_listOF_SNAs, @@ -13454,11 +13454,11 @@ void proto_register_ranap(void) { FT_UINT32, BASE_DEC, NULL, 0, "ranap.INTEGER_0_32767", HFILL }}, { &hf_ranap_ListOF_SNAs_item, - { "ListOF-SNAs", "ranap.ListOF_SNAs_item", + { "SNAC", "ranap.SNAC", FT_UINT32, BASE_DEC, NULL, 0, "ranap.SNAC", HFILL }}, { &hf_ranap_ListOfInterfacesToTrace_item, - { "ListOfInterfacesToTrace", "ranap.ListOfInterfacesToTrace_item", + { "InterfacesToTraceItem", "ranap.InterfacesToTraceItem", FT_NONE, BASE_NONE, NULL, 0, "ranap.InterfacesToTraceItem", HFILL }}, { &hf_ranap_interface, @@ -13474,7 +13474,7 @@ void proto_register_ranap(void) { FT_BYTES, BASE_HEX, NULL, 0, "ranap.RequestedGPSAssistanceData", HFILL }}, { &hf_ranap_MBMSIPMulticastAddressandAPNRequest_item, - { "MBMSIPMulticastAddressandAPNRequest", "ranap.MBMSIPMulticastAddressandAPNRequest_item", + { "TMGI", "ranap.TMGI", FT_NONE, BASE_NONE, NULL, 0, "ranap.TMGI", HFILL }}, { &hf_ranap_rAI, @@ -13482,7 +13482,7 @@ void proto_register_ranap(void) { FT_NONE, BASE_NONE, NULL, 0, "ranap.RAI", HFILL }}, { &hf_ranap_PDP_TypeInformation_item, - { "PDP-TypeInformation", "ranap.PDP_TypeInformation_item", + { "PDP-Type", "ranap.PDP_Type", FT_UINT32, BASE_DEC, VALS(ranap_PDP_Type_vals), 0, "ranap.PDP_Type", HFILL }}, { &hf_ranap_reportingAmount, @@ -13498,15 +13498,15 @@ void proto_register_ranap(void) { FT_BYTES, BASE_HEX, NULL, 0, "ranap.IMSI", HFILL }}, { &hf_ranap_PermittedEncryptionAlgorithms_item, - { "PermittedEncryptionAlgorithms", "ranap.PermittedEncryptionAlgorithms_item", + { "EncryptionAlgorithm", "ranap.EncryptionAlgorithm", FT_UINT32, BASE_DEC, VALS(ranap_EncryptionAlgorithm_vals), 0, "ranap.EncryptionAlgorithm", HFILL }}, { &hf_ranap_PermittedIntegrityProtectionAlgorithms_item, - { "PermittedIntegrityProtectionAlgorithms", "ranap.PermittedIntegrityProtectionAlgorithms_item", + { "IntegrityProtectionAlgorithm", "ranap.IntegrityProtectionAlgorithm", FT_UINT32, BASE_DEC, VALS(ranap_IntegrityProtectionAlgorithm_vals), 0, "ranap.IntegrityProtectionAlgorithm", HFILL }}, { &hf_ranap_PLMNs_in_shared_network_item, - { "PLMNs-in-shared-network", "ranap.PLMNs_in_shared_network_item", + { "PLMNs-in-shared-network item", "ranap.PLMNs_in_shared_network_item", FT_NONE, BASE_NONE, NULL, 0, "ranap.PLMNs_in_shared_network_item", HFILL }}, { &hf_ranap_lA_LIST, @@ -13514,7 +13514,7 @@ void proto_register_ranap(void) { FT_UINT32, BASE_DEC, NULL, 0, "ranap.LA_LIST", HFILL }}, { &hf_ranap_PositioningDataSet_item, - { "PositioningDataSet", "ranap.PositioningDataSet_item", + { "PositioningMethodAndUsage", "ranap.PositioningMethodAndUsage", FT_BYTES, BASE_HEX, NULL, 0, "ranap.PositioningMethodAndUsage", HFILL }}, { &hf_ranap_positioningDataDiscriminator, @@ -13530,19 +13530,19 @@ void proto_register_ranap(void) { FT_NONE, BASE_NONE, NULL, 0, "ranap.Shared_Network_Information", HFILL }}, { &hf_ranap_RAB_Parameter_ExtendedGuaranteedBitrateList_item, - { "RAB-Parameter-ExtendedGuaranteedBitrateList", "ranap.RAB_Parameter_ExtendedGuaranteedBitrateList_item", + { "ExtendedGuaranteedBitrate", "ranap.ExtendedGuaranteedBitrate", FT_UINT32, BASE_DEC, NULL, 0, "ranap.ExtendedGuaranteedBitrate", HFILL }}, { &hf_ranap_RAB_Parameter_ExtendedMaxBitrateList_item, - { "RAB-Parameter-ExtendedMaxBitrateList", "ranap.RAB_Parameter_ExtendedMaxBitrateList_item", + { "ExtendedMaxBitrate", "ranap.ExtendedMaxBitrate", FT_UINT32, BASE_DEC, NULL, 0, "ranap.ExtendedMaxBitrate", HFILL }}, { &hf_ranap_RAB_Parameter_GuaranteedBitrateList_item, - { "RAB-Parameter-GuaranteedBitrateList", "ranap.RAB_Parameter_GuaranteedBitrateList_item", + { "GuaranteedBitrate", "ranap.GuaranteedBitrate", FT_UINT32, BASE_DEC, NULL, 0, "ranap.GuaranteedBitrate", HFILL }}, { &hf_ranap_RAB_Parameter_MaxBitrateList_item, - { "RAB-Parameter-MaxBitrateList", "ranap.RAB_Parameter_MaxBitrateList_item", + { "MaxBitrate", "ranap.MaxBitrate", FT_UINT32, BASE_DEC, NULL, 0, "ranap.MaxBitrate", HFILL }}, { &hf_ranap_trafficClass, @@ -13594,7 +13594,7 @@ void proto_register_ranap(void) { FT_UINT32, BASE_DEC, VALS(ranap_RelocationRequirement_vals), 0, "ranap.RelocationRequirement", HFILL }}, { &hf_ranap_RAB_TrCH_Mapping_item, - { "RAB-TrCH-Mapping", "ranap.RAB_TrCH_Mapping_item", + { "RAB-TrCH-MappingItem", "ranap.RAB_TrCH_MappingItem", FT_NONE, BASE_NONE, NULL, 0, "ranap.RAB_TrCH_MappingItem", HFILL }}, { &hf_ranap_rAB_ID, @@ -13618,15 +13618,15 @@ void proto_register_ranap(void) { FT_UINT32, BASE_DEC, NULL, 0, "ranap.RAofIdleModeUEs", HFILL }}, { &hf_ranap_RAofIdleModeUEs_item, - { "RAofIdleModeUEs", "ranap.RAofIdleModeUEs_item", + { "RAC", "ranap.RAC", FT_BYTES, BASE_HEX, NULL, 0, "ranap.RAC", HFILL }}, { &hf_ranap_LAListofIdleModeUEs_item, - { "LAListofIdleModeUEs", "ranap.LAListofIdleModeUEs_item", + { "LAI", "ranap.LAI", FT_NONE, BASE_NONE, NULL, 0, "ranap.LAI", HFILL }}, { &hf_ranap_RequestedMBMSIPMulticastAddressandAPNRequest_item, - { "RequestedMBMSIPMulticastAddressandAPNRequest", "ranap.RequestedMBMSIPMulticastAddressandAPNRequest_item", + { "MBMSIPMulticastAddressandAPNlist", "ranap.MBMSIPMulticastAddressandAPNlist", FT_NONE, BASE_NONE, NULL, 0, "ranap.MBMSIPMulticastAddressandAPNlist", HFILL }}, { &hf_ranap_tMGI, @@ -13642,7 +13642,7 @@ void proto_register_ranap(void) { FT_BYTES, BASE_HEX, NULL, 0, "ranap.APN", HFILL }}, { &hf_ranap_RequestedMulticastServiceList_item, - { "RequestedMulticastServiceList", "ranap.RequestedMulticastServiceList_item", + { "TMGI", "ranap.TMGI", FT_NONE, BASE_NONE, NULL, 0, "ranap.TMGI", HFILL }}, { &hf_ranap_requestedMaxBitrates, @@ -13654,19 +13654,19 @@ void proto_register_ranap(void) { FT_UINT32, BASE_DEC, NULL, 0, "ranap.Requested_RAB_Parameter_GuaranteedBitrateList", HFILL }}, { &hf_ranap_Requested_RAB_Parameter_ExtendedMaxBitrateList_item, - { "Requested-RAB-Parameter-ExtendedMaxBitrateList", "ranap.Requested_RAB_Parameter_ExtendedMaxBitrateList_item", + { "ExtendedMaxBitrate", "ranap.ExtendedMaxBitrate", FT_UINT32, BASE_DEC, NULL, 0, "ranap.ExtendedMaxBitrate", HFILL }}, { &hf_ranap_Requested_RAB_Parameter_ExtendedGuaranteedBitrateList_item, - { "Requested-RAB-Parameter-ExtendedGuaranteedBitrateList", "ranap.Requested_RAB_Parameter_ExtendedGuaranteedBitrateList_item", + { "ExtendedGuaranteedBitrate", "ranap.ExtendedGuaranteedBitrate", FT_UINT32, BASE_DEC, NULL, 0, "ranap.ExtendedGuaranteedBitrate", HFILL }}, { &hf_ranap_Requested_RAB_Parameter_MaxBitrateList_item, - { "Requested-RAB-Parameter-MaxBitrateList", "ranap.Requested_RAB_Parameter_MaxBitrateList_item", + { "MaxBitrate", "ranap.MaxBitrate", FT_UINT32, BASE_DEC, NULL, 0, "ranap.MaxBitrate", HFILL }}, { &hf_ranap_Requested_RAB_Parameter_GuaranteedBitrateList_item, - { "Requested-RAB-Parameter-GuaranteedBitrateList", "ranap.Requested_RAB_Parameter_GuaranteedBitrateList_item", + { "GuaranteedBitrate", "ranap.GuaranteedBitrate", FT_UINT32, BASE_DEC, NULL, 0, "ranap.GuaranteedBitrate", HFILL }}, { &hf_ranap_event, @@ -13730,7 +13730,7 @@ void proto_register_ranap(void) { FT_UINT32, BASE_DEC, NULL, 0, "ranap.INTEGER_1_6", HFILL }}, { &hf_ranap_SDU_FormatInformationParameters_item, - { "SDU-FormatInformationParameters", "ranap.SDU_FormatInformationParameters_item", + { "SDU-FormatInformationParameters item", "ranap.SDU_FormatInformationParameters_item", FT_NONE, BASE_NONE, NULL, 0, "ranap.SDU_FormatInformationParameters_item", HFILL }}, { &hf_ranap_subflowSDU_Size, @@ -13742,7 +13742,7 @@ void proto_register_ranap(void) { FT_UINT32, BASE_DEC, NULL, 0, "ranap.RAB_SubflowCombinationBitRate", HFILL }}, { &hf_ranap_SDU_Parameters_item, - { "SDU-Parameters", "ranap.SDU_Parameters_item", + { "SDU-Parameters item", "ranap.SDU_Parameters_item", FT_NONE, BASE_NONE, NULL, 0, "ranap.SDU_Parameters_item", HFILL }}, { &hf_ranap_sDU_ErrorRatio, @@ -13826,11 +13826,11 @@ void proto_register_ranap(void) { FT_UINT32, BASE_DEC, NULL, 0, "ranap.RAB_TrCH_Mapping", HFILL }}, { &hf_ranap_SupportedRAB_ParameterBitrateList_item, - { "SupportedRAB-ParameterBitrateList", "ranap.SupportedRAB_ParameterBitrateList_item", + { "SupportedBitrate", "ranap.SupportedBitrate", FT_UINT32, BASE_DEC, NULL, 0, "ranap.SupportedBitrate", HFILL }}, { &hf_ranap_SRB_TrCH_Mapping_item, - { "SRB-TrCH-Mapping", "ranap.SRB_TrCH_Mapping_item", + { "SRB-TrCH-MappingItem", "ranap.SRB_TrCH_MappingItem", FT_NONE, BASE_NONE, NULL, 0, "ranap.SRB_TrCH_MappingItem", HFILL }}, { &hf_ranap_sRB_ID, @@ -13894,7 +13894,7 @@ void proto_register_ranap(void) { FT_UINT32, BASE_DEC, NULL, 0, "ranap.USCH_ID", HFILL }}, { &hf_ranap_TrCH_ID_List_item, - { "TrCH-ID-List", "ranap.TrCH_ID_List_item", + { "TrCH-ID", "ranap.TrCH_ID", FT_NONE, BASE_NONE, NULL, 0, "ranap.TrCH_ID", HFILL }}, { &hf_ranap_imsi, @@ -14034,7 +14034,7 @@ void proto_register_ranap(void) { FT_UINT32, BASE_DEC, NULL, 0, "ranap.JoinedMBMSBearerService_IEs", HFILL }}, { &hf_ranap_JoinedMBMSBearerService_IEs_item, - { "JoinedMBMSBearerService-IEs", "ranap.JoinedMBMSBearerService_IEs_item", + { "JoinedMBMSBearerService-IEs item", "ranap.JoinedMBMSBearerService_IEs_item", FT_NONE, BASE_NONE, NULL, 0, "ranap.JoinedMBMSBearerService_IEs_item", HFILL }}, { &hf_ranap_mBMS_PTP_RAB_ID, @@ -14098,7 +14098,7 @@ void proto_register_ranap(void) { FT_UINT32, BASE_DEC, NULL, 0, "ranap.DataVolumeList", HFILL }}, { &hf_ranap_DataVolumeList_item, - { "DataVolumeList", "ranap.DataVolumeList_item", + { "DataVolumeList item", "ranap.DataVolumeList_item", FT_NONE, BASE_NONE, NULL, 0, "ranap.DataVolumeList_item", HFILL }}, { &hf_ranap_dl_UnsuccessfullyTransmittedDataVolume, @@ -14166,11 +14166,11 @@ void proto_register_ranap(void) { FT_UINT32, BASE_HEX_DEC, NULL, 0, "ranap.GTP_TEI", HFILL }}, { &hf_ranap_LeftMBMSBearerService_IEs_item, - { "LeftMBMSBearerService-IEs", "ranap.LeftMBMSBearerService_IEs_item", + { "LeftMBMSBearerService-IEs item", "ranap.LeftMBMSBearerService_IEs_item", FT_NONE, BASE_NONE, NULL, 0, "ranap.LeftMBMSBearerService_IEs_item", HFILL }}, { &hf_ranap_UnsuccessfulLinking_IEs_item, - { "UnsuccessfulLinking-IEs", "ranap.UnsuccessfulLinking_IEs_item", + { "UnsuccessfulLinking-IEs item", "ranap.UnsuccessfulLinking_IEs_item", FT_NONE, BASE_NONE, NULL, 0, "ranap.UnsuccessfulLinking_IEs_item", HFILL }}, { &hf_ranap_initiatingMessage, diff --git a/epan/dissectors/packet-ranap.h b/epan/dissectors/packet-ranap.h index 0f5ee7f8bd..6a51cb46c1 100644 --- a/epan/dissectors/packet-ranap.h +++ b/epan/dissectors/packet-ranap.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-ranap.h */ -/* ../../tools/asn2wrs.py -p ranap -c ranap.cnf -s packet-ranap-template RANAP-CommonDataTypes.asn RANAP-Constants.asn RANAP-Containers.asn RANAP-IEs.asn RANAP-PDU-Contents.asn RANAP-PDU-Descriptions.asn */ +/* ../../tools/asn2wrs.py -p ranap -c ./ranap.cnf -s ./packet-ranap-template -D . RANAP-CommonDataTypes.asn RANAP-Constants.asn RANAP-Containers.asn RANAP-IEs.asn RANAP-PDU-Contents.asn RANAP-PDU-Descriptions.asn */ /* Input file: packet-ranap-template.h */ diff --git a/epan/dissectors/packet-rnsap.c b/epan/dissectors/packet-rnsap.c index dd36df72cd..5ced848e5e 100644 --- a/epan/dissectors/packet-rnsap.c +++ b/epan/dissectors/packet-rnsap.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-rnsap.c */ -/* ../../tools/asn2wrs.py -p rnsap -c rnsap.cnf -s packet-rnsap-template RNSAP-CommonDataTypes.asn RNSAP-Constants.asn RNSAP-Containers.asn RNSAP-IEs.asn RNSAP-PDU-Contents.asn RNSAP-PDU-Descriptions.asn */ +/* ../../tools/asn2wrs.py -p rnsap -c ./rnsap.cnf -s ./packet-rnsap-template -D . RNSAP-CommonDataTypes.asn RNSAP-Constants.asn RNSAP-Containers.asn RNSAP-IEs.asn RNSAP-PDU-Contents.asn RNSAP-PDU-Descriptions.asn */ /* Input file: packet-rnsap-template.c */ @@ -38108,7 +38108,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.INTEGER_0_32767", HFILL }}, { &hf_rnsap_ProtocolIE_Container_item, - { "ProtocolIE-Container", "rnsap.ProtocolIE_Container_item", + { "ProtocolIE-Field", "rnsap.ProtocolIE_Field", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Field", HFILL }}, { &hf_rnsap_id, @@ -38124,7 +38124,7 @@ void proto_register_rnsap(void) { FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Field_value", HFILL }}, { &hf_rnsap_ProtocolExtensionContainer_item, - { "ProtocolExtensionContainer", "rnsap.ProtocolExtensionContainer_item", + { "ProtocolExtensionField", "rnsap.ProtocolExtensionField", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolExtensionField", HFILL }}, { &hf_rnsap_extensionValue, @@ -38132,7 +38132,7 @@ void proto_register_rnsap(void) { FT_NONE, BASE_NONE, NULL, 0, "rnsap.T_extensionValue", HFILL }}, { &hf_rnsap_PrivateIE_Container_item, - { "PrivateIE-Container", "rnsap.PrivateIE_Container_item", + { "PrivateIE-Field", "rnsap.PrivateIE_Field", FT_NONE, BASE_NONE, NULL, 0, "rnsap.PrivateIE_Field", HFILL }}, { &hf_rnsap_id_01, @@ -38144,19 +38144,19 @@ void proto_register_rnsap(void) { FT_NONE, BASE_NONE, NULL, 0, "rnsap.PrivateIE_Field_value", HFILL }}, { &hf_rnsap_Active_MBMS_Bearer_Service_ListFDD_item, - { "Active-MBMS-Bearer-Service-ListFDD", "rnsap.Active_MBMS_Bearer_Service_ListFDD_item", + { "MBMS-Bearer-ServiceItemFDD", "rnsap.MBMS_Bearer_ServiceItemFDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.MBMS_Bearer_ServiceItemFDD", HFILL }}, { &hf_rnsap_Active_MBMS_Bearer_Service_ListFDD_PFL_item, - { "Active-MBMS-Bearer-Service-ListFDD-PFL", "rnsap.Active_MBMS_Bearer_Service_ListFDD_PFL_item", + { "MBMS-Bearer-ServiceItemFDD-PFL", "rnsap.MBMS_Bearer_ServiceItemFDD_PFL", FT_NONE, BASE_NONE, NULL, 0, "rnsap.MBMS_Bearer_ServiceItemFDD_PFL", HFILL }}, { &hf_rnsap_Active_MBMS_Bearer_Service_ListTDD_item, - { "Active-MBMS-Bearer-Service-ListTDD", "rnsap.Active_MBMS_Bearer_Service_ListTDD_item", + { "MBMS-Bearer-ServiceItemTDD", "rnsap.MBMS_Bearer_ServiceItemTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.MBMS_Bearer_ServiceItemTDD", HFILL }}, { &hf_rnsap_Active_MBMS_Bearer_Service_ListTDD_PFL_item, - { "Active-MBMS-Bearer-Service-ListTDD-PFL", "rnsap.Active_MBMS_Bearer_Service_ListTDD_PFL_item", + { "MBMS-Bearer-ServiceItemTDD-PFL", "rnsap.MBMS_Bearer_ServiceItemTDD_PFL", FT_NONE, BASE_NONE, NULL, 0, "rnsap.MBMS_Bearer_ServiceItemTDD_PFL", HFILL }}, { &hf_rnsap_cMConfigurationChangeCFN, @@ -38172,7 +38172,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.ProtocolExtensionContainer", HFILL }}, { &hf_rnsap_AdditionalPreferredFrequency_item, - { "AdditionalPreferredFrequency", "rnsap.AdditionalPreferredFrequency_item", + { "AdditionalPreferredFrequencyItem", "rnsap.AdditionalPreferredFrequencyItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.AdditionalPreferredFrequencyItem", HFILL }}, { &hf_rnsap_dL_UARFCN, @@ -38184,7 +38184,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.CorrespondingCells", HFILL }}, { &hf_rnsap_AffectedUEInformationForMBMS_item, - { "AffectedUEInformationForMBMS", "rnsap.AffectedUEInformationForMBMS_item", + { "S-RNTI", "rnsap.S_RNTI", FT_UINT32, BASE_DEC, NULL, 0, "rnsap.S_RNTI", HFILL }}, { &hf_rnsap_priorityLevel, @@ -38220,7 +38220,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.T_badSatelliteInformation", HFILL }}, { &hf_rnsap_badSatelliteInformation_item, - { "badSatelliteInformation", "rnsap.badSatelliteInformation_item", + { "badSatelliteInformation item", "rnsap.badSatelliteInformation_item", FT_NONE, BASE_NONE, NULL, 0, "rnsap.T_badSatelliteInformation_item", HFILL }}, { &hf_rnsap_badSAT_ID, @@ -38360,7 +38360,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, VALS(rnsap_DRX_Information_to_Modify_vals), 0, "rnsap.DRX_Information_to_Modify", HFILL }}, { &hf_rnsap_Continuous_Packet_Connectivity_HS_SCCH_Less_Information_item, - { "Continuous-Packet-Connectivity-HS-SCCH-Less-Information", "rnsap.Continuous_Packet_Connectivity_HS_SCCH_Less_Information_item", + { "Continuous-Packet-Connectivity-HS-SCCH-Less-InformationItem", "rnsap.Continuous_Packet_Connectivity_HS_SCCH_Less_InformationItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.Continuous_Packet_Connectivity_HS_SCCH_Less_InformationItem", HFILL }}, { &hf_rnsap_transport_Block_Size_Index, @@ -38380,7 +38380,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.HSPDSCH_Second_Code_Index", HFILL }}, { &hf_rnsap_CorrespondingCells_item, - { "CorrespondingCells", "rnsap.CorrespondingCells_item", + { "C-ID", "rnsap.C_ID", FT_UINT32, BASE_DEC, NULL, 0, "rnsap.C_ID", HFILL }}, { &hf_rnsap_continuous_Packet_Connectivity_DTX_DRX_Information, @@ -38416,7 +38416,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.CriticalityDiagnostics_IE_List", HFILL }}, { &hf_rnsap_CriticalityDiagnostics_IE_List_item, - { "CriticalityDiagnostics-IE-List", "rnsap.CriticalityDiagnostics_IE_List_item", + { "CriticalityDiagnostics-IE-List item", "rnsap.CriticalityDiagnostics_IE_List_item", FT_NONE, BASE_NONE, NULL, 0, "rnsap.CriticalityDiagnostics_IE_List_item", HFILL }}, { &hf_rnsap_iECriticality, @@ -38432,7 +38432,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.RepetitionNumber0", HFILL }}, { &hf_rnsap_MessageStructure_item, - { "MessageStructure", "rnsap.MessageStructure_item", + { "MessageStructure item", "rnsap.MessageStructure_item", FT_NONE, BASE_NONE, NULL, 0, "rnsap.MessageStructure_item", HFILL }}, { &hf_rnsap_repetitionNumber_01, @@ -38444,7 +38444,7 @@ void proto_register_rnsap(void) { FT_BYTES, BASE_HEX, NULL, 0, "rnsap.RAC", HFILL }}, { &hf_rnsap_DCH_FDD_Information_item, - { "DCH-FDD-Information", "rnsap.DCH_FDD_Information_item", + { "DCH-FDD-InformationItem", "rnsap.DCH_FDD_InformationItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.DCH_FDD_InformationItem", HFILL }}, { &hf_rnsap_payloadCRC_PresenceIndicator, @@ -38468,7 +38468,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.DCH_Specific_FDD_InformationList", HFILL }}, { &hf_rnsap_DCH_Specific_FDD_InformationList_item, - { "DCH-Specific-FDD-InformationList", "rnsap.DCH_Specific_FDD_InformationList_item", + { "DCH-Specific-FDD-Item", "rnsap.DCH_Specific_FDD_Item", FT_NONE, BASE_NONE, NULL, 0, "rnsap.DCH_Specific_FDD_Item", HFILL }}, { &hf_rnsap_dCH_ID, @@ -38512,7 +38512,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, VALS(rnsap_DRACControl_vals), 0, "rnsap.DRACControl", HFILL }}, { &hf_rnsap_DCH_InformationResponse_item, - { "DCH-InformationResponse", "rnsap.DCH_InformationResponse_item", + { "DCH-InformationResponseItem", "rnsap.DCH_InformationResponseItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.DCH_InformationResponseItem", HFILL }}, { &hf_rnsap_bindingID, @@ -38524,7 +38524,7 @@ void proto_register_rnsap(void) { FT_BYTES, BASE_HEX, NULL, 0, "rnsap.TransportLayerAddress", HFILL }}, { &hf_rnsap_DCH_TDD_Information_item, - { "DCH-TDD-Information", "rnsap.DCH_TDD_Information_item", + { "DCH-TDD-InformationItem", "rnsap.DCH_TDD_InformationItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.DCH_TDD_InformationItem", HFILL }}, { &hf_rnsap_dCH_SpecificInformationList_01, @@ -38532,7 +38532,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.DCH_Specific_TDD_InformationList", HFILL }}, { &hf_rnsap_DCH_Specific_TDD_InformationList_item, - { "DCH-Specific-TDD-InformationList", "rnsap.DCH_Specific_TDD_InformationList_item", + { "DCH-Specific-TDD-Item", "rnsap.DCH_Specific_TDD_Item", FT_NONE, BASE_NONE, NULL, 0, "rnsap.DCH_Specific_TDD_Item", HFILL }}, { &hf_rnsap_ul_cCTrCH_ID, @@ -38644,7 +38644,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.T_dGANSS_Information", HFILL }}, { &hf_rnsap_dGANSS_Information_item, - { "dGANSS-Information", "rnsap.dGANSS_Information_item", + { "dGANSS-Information item", "rnsap.dGANSS_Information_item", FT_NONE, BASE_NONE, NULL, 0, "rnsap.T_dGANSS_Information_item", HFILL }}, { &hf_rnsap_gANSS_SignalId, @@ -38660,7 +38660,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.T_dGANSS_SignalInformation", HFILL }}, { &hf_rnsap_dGANSS_SignalInformation_item, - { "dGANSS-SignalInformation", "rnsap.dGANSS_SignalInformation_item", + { "dGANSS-SignalInformation item", "rnsap.dGANSS_SignalInformation_item", FT_NONE, BASE_NONE, NULL, 0, "rnsap.T_dGANSS_SignalInformation_item", HFILL }}, { &hf_rnsap_satId, @@ -38704,7 +38704,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.T_satellite_DGPSCorrections_Information", HFILL }}, { &hf_rnsap_satellite_DGPSCorrections_Information_item, - { "satellite-DGPSCorrections-Information", "rnsap.satellite_DGPSCorrections_Information_item", + { "satellite-DGPSCorrections-Information item", "rnsap.satellite_DGPSCorrections_Information_item", FT_NONE, BASE_NONE, NULL, 0, "rnsap.T_satellite_DGPSCorrections_Information_item", HFILL }}, { &hf_rnsap_sAT_ID, @@ -38752,7 +38752,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.ScaledAdjustmentRatio", HFILL }}, { &hf_rnsap_DL_ReferencePowerInformationList_item, - { "DL-ReferencePowerInformationList", "rnsap.DL_ReferencePowerInformationList_item", + { "DL-ReferencePowerInformationItem", "rnsap.DL_ReferencePowerInformationItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.DL_ReferencePowerInformationItem", HFILL }}, { &hf_rnsap_rL_ID, @@ -38772,7 +38772,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.DL_ReferencePowerInformationList", HFILL }}, { &hf_rnsap_DL_Timeslot_Information_item, - { "DL-Timeslot-Information", "rnsap.DL_Timeslot_Information_item", + { "DL-Timeslot-InformationItem", "rnsap.DL_Timeslot_InformationItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.DL_Timeslot_InformationItem", HFILL }}, { &hf_rnsap_timeSlot, @@ -38792,7 +38792,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.TDD_DL_Code_Information", HFILL }}, { &hf_rnsap_DL_TimeslotLCR_Information_item, - { "DL-TimeslotLCR-Information", "rnsap.DL_TimeslotLCR_Information_item", + { "DL-TimeslotLCR-InformationItem", "rnsap.DL_TimeslotLCR_InformationItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.DL_TimeslotLCR_InformationItem", HFILL }}, { &hf_rnsap_timeSlotLCR, @@ -38808,7 +38808,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.TDD_DL_Code_LCR_Information", HFILL }}, { &hf_rnsap_DL_Timeslot_Information768_item, - { "DL-Timeslot-Information768", "rnsap.DL_Timeslot_Information768_item", + { "DL-Timeslot-InformationItem768", "rnsap.DL_Timeslot_InformationItem768", FT_NONE, BASE_NONE, NULL, 0, "rnsap.DL_Timeslot_InformationItem768", HFILL }}, { &hf_rnsap_midambleShiftAndBurstType768, @@ -38820,7 +38820,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.TDD_DL_Code_Information768", HFILL }}, { &hf_rnsap_DL_TimeSlot_ISCP_Info_item, - { "DL-TimeSlot-ISCP-Info", "rnsap.DL_TimeSlot_ISCP_Info_item", + { "DL-TimeSlot-ISCP-InfoItem", "rnsap.DL_TimeSlot_ISCP_InfoItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.DL_TimeSlot_ISCP_InfoItem", HFILL }}, { &hf_rnsap_dL_TimeslotISCP, @@ -38828,7 +38828,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.DL_TimeslotISCP", HFILL }}, { &hf_rnsap_DL_TimeSlot_ISCP_LCR_Information_item, - { "DL-TimeSlot-ISCP-LCR-Information", "rnsap.DL_TimeSlot_ISCP_LCR_Information_item", + { "DL-TimeSlot-ISCP-LCR-InfoItem", "rnsap.DL_TimeSlot_ISCP_LCR_InfoItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.DL_TimeSlot_ISCP_LCR_InfoItem", HFILL }}, { &hf_rnsap_uE_DRX_Cycle, @@ -38856,7 +38856,7 @@ void proto_register_rnsap(void) { FT_NONE, BASE_NONE, NULL, 0, "rnsap.NULL", HFILL }}, { &hf_rnsap_DSCH_FlowControlInformation_item, - { "DSCH-FlowControlInformation", "rnsap.DSCH_FlowControlInformation_item", + { "DSCH-FlowControlItem", "rnsap.DSCH_FlowControlItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.DSCH_FlowControlItem", HFILL }}, { &hf_rnsap_dSCH_SchedulingPriority, @@ -38868,7 +38868,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.MAC_c_sh_SDU_LengthList", HFILL }}, { &hf_rnsap_DSCH_TDD_Information_item, - { "DSCH-TDD-Information", "rnsap.DSCH_TDD_Information_item", + { "DSCH-TDD-InformationItem", "rnsap.DSCH_TDD_InformationItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.DSCH_TDD_InformationItem", HFILL }}, { &hf_rnsap_dSCH_ID, @@ -39020,7 +39020,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.EDCH_MACdFlow_Specific_InformationResponse", HFILL }}, { &hf_rnsap_EDCH_MACdFlow_Specific_InformationResponse_item, - { "EDCH-MACdFlow-Specific-InformationResponse", "rnsap.EDCH_MACdFlow_Specific_InformationResponse_item", + { "EDCH-MACdFlow-Specific-InformationResponseItem", "rnsap.EDCH_MACdFlow_Specific_InformationResponseItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.EDCH_MACdFlow_Specific_InformationResponseItem", HFILL }}, { &hf_rnsap_eDCH_MACdFlow_ID, @@ -39044,7 +39044,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.E_DCH_MACdFlow_Specific_UpdateInformation", HFILL }}, { &hf_rnsap_E_DCH_MACdFlow_Specific_UpdateInformation_item, - { "E-DCH-MACdFlow-Specific-UpdateInformation", "rnsap.E_DCH_MACdFlow_Specific_UpdateInformation_item", + { "E-DCH-MACdFlow-Specific-UpdateInformation-Item", "rnsap.E_DCH_MACdFlow_Specific_UpdateInformation_Item", FT_NONE, BASE_NONE, NULL, 0, "rnsap.E_DCH_MACdFlow_Specific_UpdateInformation_Item", HFILL }}, { &hf_rnsap_e_DCH_MACdFlow_ID, @@ -39052,7 +39052,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.EDCH_MACdFlow_ID", HFILL }}, { &hf_rnsap_E_DCH_DL_Control_Channel_Change_Information_item, - { "E-DCH-DL-Control-Channel-Change-Information", "rnsap.E_DCH_DL_Control_Channel_Change_Information_item", + { "E-DCH-DL-Control-Channel-Change-Information-Item", "rnsap.E_DCH_DL_Control_Channel_Change_Information_Item", FT_NONE, BASE_NONE, NULL, 0, "rnsap.E_DCH_DL_Control_Channel_Change_Information_Item", HFILL }}, { &hf_rnsap_e_DCH_RL_ID, @@ -39060,7 +39060,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.RL_ID", HFILL }}, { &hf_rnsap_E_DCH_DL_Control_Channel_Grant_Information_item, - { "E-DCH-DL-Control-Channel-Grant-Information", "rnsap.E_DCH_DL_Control_Channel_Grant_Information_item", + { "E-DCH-DL-Control-Channel-Grant-Information-Item", "rnsap.E_DCH_DL_Control_Channel_Grant_Information_Item", FT_NONE, BASE_NONE, NULL, 0, "rnsap.E_DCH_DL_Control_Channel_Grant_Information_Item", HFILL }}, { &hf_rnsap_e_DCH_Non_Scheduled_Transmission_Grant, @@ -39072,7 +39072,7 @@ void proto_register_rnsap(void) { FT_NONE, BASE_NONE, NULL, 0, "rnsap.NULL", HFILL }}, { &hf_rnsap_E_DCH_LogicalChannelInformation_item, - { "E-DCH-LogicalChannelInformation", "rnsap.E_DCH_LogicalChannelInformation_item", + { "E-DCH-LogicalChannelInformationItem", "rnsap.E_DCH_LogicalChannelInformationItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.E_DCH_LogicalChannelInformationItem", HFILL }}, { &hf_rnsap_logicalChannelId, @@ -39096,7 +39096,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.E_DCH_MACdPDU_SizeList", HFILL }}, { &hf_rnsap_E_DCH_MACdPDU_SizeList_item, - { "E-DCH-MACdPDU-SizeList", "rnsap.E_DCH_MACdPDU_SizeList_item", + { "E-DCH-MACdPDU-SizeListItem", "rnsap.E_DCH_MACdPDU_SizeListItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.E_DCH_MACdPDU_SizeListItem", HFILL }}, { &hf_rnsap_mACdPDU_Size, @@ -39104,7 +39104,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.MACdPDU_Size", HFILL }}, { &hf_rnsap_E_DCH_LogicalChannelToModify_item, - { "E-DCH-LogicalChannelToModify", "rnsap.E_DCH_LogicalChannelToModify_item", + { "E-DCH-LogicalChannelToModifyItem", "rnsap.E_DCH_LogicalChannelToModifyItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.E_DCH_LogicalChannelToModifyItem", HFILL }}, { &hf_rnsap_mACd_PDU_Size_List_01, @@ -39112,11 +39112,11 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.E_DCH_MACdPDU_SizeToModifyList", HFILL }}, { &hf_rnsap_E_DCH_MACdPDU_SizeToModifyList_item, - { "E-DCH-MACdPDU-SizeToModifyList", "rnsap.E_DCH_MACdPDU_SizeToModifyList_item", + { "E-DCH-MACdPDU-SizeListItem", "rnsap.E_DCH_MACdPDU_SizeListItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.E_DCH_MACdPDU_SizeListItem", HFILL }}, { &hf_rnsap_E_DCH_LogicalChannelToDelete_item, - { "E-DCH-LogicalChannelToDelete", "rnsap.E_DCH_LogicalChannelToDelete_item", + { "E-DCH-LogicalChannelToDeleteItem", "rnsap.E_DCH_LogicalChannelToDeleteItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.E_DCH_LogicalChannelToDeleteItem", HFILL }}, { &hf_rnsap_eDCH_MACdFlow_Specific_Information_01, @@ -39124,7 +39124,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.EDCH_MACdFlow_Specific_InfoList", HFILL }}, { &hf_rnsap_EDCH_MACdFlow_Specific_InfoList_item, - { "EDCH-MACdFlow-Specific-InfoList", "rnsap.EDCH_MACdFlow_Specific_InfoList_item", + { "EDCH-MACdFlow-Specific-InfoItem", "rnsap.EDCH_MACdFlow_Specific_InfoItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.EDCH_MACdFlow_Specific_InfoItem", HFILL }}, { &hf_rnsap_tnlQoS, @@ -39160,7 +39160,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.E_DCH_LogicalChannelInformation", HFILL }}, { &hf_rnsap_EDCH_MACdFlow_Specific_InfoToModifyList_item, - { "EDCH-MACdFlow-Specific-InfoToModifyList", "rnsap.EDCH_MACdFlow_Specific_InfoToModifyList_item", + { "EDCH-MACdFlow-Specific-InfoToModifyItem", "rnsap.EDCH_MACdFlow_Specific_InfoToModifyItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.EDCH_MACdFlow_Specific_InfoToModifyItem", HFILL }}, { &hf_rnsap_transportBearerRequestIndicator, @@ -39180,7 +39180,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.E_DCH_LogicalChannelToDelete", HFILL }}, { &hf_rnsap_EDCH_MACdFlows_To_Delete_item, - { "EDCH-MACdFlows-To-Delete", "rnsap.EDCH_MACdFlows_To_Delete_item", + { "EDCH-MACdFlows-To-Delete-Item", "rnsap.EDCH_MACdFlows_To_Delete_Item", FT_NONE, BASE_NONE, NULL, 0, "rnsap.EDCH_MACdFlows_To_Delete_Item", HFILL }}, { &hf_rnsap_maxBits_MACe_PDU_non_scheduled, @@ -39208,7 +39208,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.E_DCH_RL_InformationList_Rsp", HFILL }}, { &hf_rnsap_E_DCH_RL_InformationList_Rsp_item, - { "E-DCH-RL-InformationList-Rsp", "rnsap.E_DCH_RL_InformationList_Rsp_item", + { "E-DCH-RL-InformationList-Rsp-Item", "rnsap.E_DCH_RL_InformationList_Rsp_Item", FT_NONE, BASE_NONE, NULL, 0, "rnsap.E_DCH_RL_InformationList_Rsp_Item", HFILL }}, { &hf_rnsap_e_DCH_reconfigured_RL_Id, @@ -39396,11 +39396,11 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.E_DCH_sixteenQAM_RefBetaInfo", HFILL }}, { &hf_rnsap_E_DCH_QPSK_RefBetaInfo_item, - { "E-DCH-QPSK-RefBetaInfo", "rnsap.E_DCH_QPSK_RefBetaInfo_item", + { "E-DCH-RefBeta-Item", "rnsap.E_DCH_RefBeta_Item", FT_NONE, BASE_NONE, NULL, 0, "rnsap.E_DCH_RefBeta_Item", HFILL }}, { &hf_rnsap_E_DCH_sixteenQAM_RefBetaInfo_item, - { "E-DCH-sixteenQAM-RefBetaInfo", "rnsap.E_DCH_sixteenQAM_RefBetaInfo_item", + { "E-DCH-RefBeta-Item", "rnsap.E_DCH_RefBeta_Item", FT_NONE, BASE_NONE, NULL, 0, "rnsap.E_DCH_RefBeta_Item", HFILL }}, { &hf_rnsap_refCodeRate, @@ -39412,7 +39412,7 @@ void proto_register_rnsap(void) { FT_INT32, BASE_DEC, NULL, 0, "rnsap.RefBeta", HFILL }}, { &hf_rnsap_E_DCH_MACdFlows_Information_TDD_item, - { "E-DCH-MACdFlows-Information-TDD", "rnsap.E_DCH_MACdFlows_Information_TDD_item", + { "E-DCH-MACdFlow-InfoTDDItem", "rnsap.E_DCH_MACdFlow_InfoTDDItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.E_DCH_MACdFlow_InfoTDDItem", HFILL }}, { &hf_rnsap_tnlQos, @@ -39460,7 +39460,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.E_DCH_TDD_Information_to_Modify_List", HFILL }}, { &hf_rnsap_E_DCH_TDD_Information_to_Modify_List_item, - { "E-DCH-TDD-Information-to-Modify-List", "rnsap.E_DCH_TDD_Information_to_Modify_List_item", + { "E-DCH-MACdFlow-ModifyTDDItem", "rnsap.E_DCH_MACdFlow_ModifyTDDItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.E_DCH_MACdFlow_ModifyTDDItem", HFILL }}, { &hf_rnsap_e_DCH_LogicalChannelToAdd, @@ -39492,7 +39492,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.E_RNTI", HFILL }}, { &hf_rnsap_E_DCH_TDD_MACdFlow_Specific_InformationResp_item, - { "E-DCH-TDD-MACdFlow-Specific-InformationResp", "rnsap.E_DCH_TDD_MACdFlow_Specific_InformationResp_item", + { "E-DCH-TDD-MACdFlow-Specific-InformationResp-Item", "rnsap.E_DCH_TDD_MACdFlow_Specific_InformationResp_Item", FT_NONE, BASE_NONE, NULL, 0, "rnsap.E_DCH_TDD_MACdFlow_Specific_InformationResp_Item", HFILL }}, { &hf_rnsap_e_DCH_MacdFlow_Id, @@ -39500,7 +39500,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.EDCH_MACdFlow_ID", HFILL }}, { &hf_rnsap_E_AGCH_Specific_InformationRespListTDD_item, - { "E-AGCH-Specific-InformationRespListTDD", "rnsap.E_AGCH_Specific_InformationRespListTDD_item", + { "E-AGCH-Specific-InformationResp-ItemTDD", "rnsap.E_AGCH_Specific_InformationResp_ItemTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.E_AGCH_Specific_InformationResp_ItemTDD", HFILL }}, { &hf_rnsap_timeslot, @@ -39560,7 +39560,7 @@ void proto_register_rnsap(void) { FT_NONE, BASE_NONE, NULL, 0, "rnsap.E_HICH_InformationResp768", HFILL }}, { &hf_rnsap_E_AGCH_Specific_InformationRespList768TDD_item, - { "E-AGCH-Specific-InformationRespList768TDD", "rnsap.E_AGCH_Specific_InformationRespList768TDD_item", + { "E-AGCH-Specific-InformationResp-Item768TDD", "rnsap.E_AGCH_Specific_InformationResp_Item768TDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.E_AGCH_Specific_InformationResp_Item768TDD", HFILL }}, { &hf_rnsap_tDD_ChannelisationCode768, @@ -39608,7 +39608,7 @@ void proto_register_rnsap(void) { FT_NONE, BASE_NONE, NULL, 0, "rnsap.E_DCH_Non_Scheduled_Grant_Info_LCR", HFILL }}, { &hf_rnsap_E_AGCH_Specific_InformationRespList_LCR_TDD_item, - { "E-AGCH-Specific-InformationRespList-LCR-TDD", "rnsap.E_AGCH_Specific_InformationRespList_LCR_TDD_item", + { "E-AGCH-Specific-InformationResp-Item-LCR-TDD", "rnsap.E_AGCH_Specific_InformationResp_Item_LCR_TDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.E_AGCH_Specific_InformationResp_Item_LCR_TDD", HFILL }}, { &hf_rnsap_e_HICH_Scheduled_InformationResp_LCR, @@ -39624,7 +39624,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.E_HICH_TimeOffset_LCR", HFILL }}, { &hf_rnsap_E_HICH_Scheduled_InformationRespList_LCR_TDD_item, - { "E-HICH-Scheduled-InformationRespList-LCR-TDD", "rnsap.E_HICH_Scheduled_InformationRespList_LCR_TDD_item", + { "E-HICH-Scheduled-InformationResp-Item-LCR-TDD", "rnsap.E_HICH_Scheduled_InformationResp_Item_LCR_TDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.E_HICH_Scheduled_InformationResp_Item_LCR_TDD", HFILL }}, { &hf_rnsap_e_HICH_EI, @@ -39648,7 +39648,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, VALS(rnsap_E_DCH_SubframeNumber_LCR_vals), 0, "rnsap.E_DCH_SubframeNumber_LCR", HFILL }}, { &hf_rnsap_FACH_FlowControlInformation_item, - { "FACH-FlowControlInformation", "rnsap.FACH_FlowControlInformation_item", + { "FACH-FlowControlInformationItem", "rnsap.FACH_FlowControlInformationItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.FACH_FlowControlInformationItem", HFILL }}, { &hf_rnsap_fACH_SchedulingPriority, @@ -39660,11 +39660,11 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, VALS(rnsap_FACH_InitialWindowSize_vals), 0, "rnsap.FACH_InitialWindowSize", HFILL }}, { &hf_rnsap_FACH_InformationList_item, - { "FACH-InformationList", "rnsap.FACH_InformationList_item", + { "FACH-InformationItem", "rnsap.FACH_InformationItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.FACH_InformationItem", HFILL }}, { &hf_rnsap_FDD_DCHs_to_Modify_item, - { "FDD-DCHs-to-Modify", "rnsap.FDD_DCHs_to_Modify_item", + { "FDD-DCHs-to-ModifyItem", "rnsap.FDD_DCHs_to_ModifyItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.FDD_DCHs_to_ModifyItem", HFILL }}, { &hf_rnsap_dCH_SpecificInformationList_02, @@ -39672,7 +39672,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.FDD_DCHs_to_ModifySpecificInformationList", HFILL }}, { &hf_rnsap_FDD_DCHs_to_ModifySpecificInformationList_item, - { "FDD-DCHs-to-ModifySpecificInformationList", "rnsap.FDD_DCHs_to_ModifySpecificInformationList_item", + { "FDD-DCHs-to-ModifySpecificItem", "rnsap.FDD_DCHs_to_ModifySpecificItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.FDD_DCHs_to_ModifySpecificItem", HFILL }}, { &hf_rnsap_ul_TransportformatSet, @@ -39688,7 +39688,7 @@ void proto_register_rnsap(void) { FT_NONE, BASE_NONE, NULL, 0, "rnsap.NULL", HFILL }}, { &hf_rnsap_FDD_DL_CodeInformation_item, - { "FDD-DL-CodeInformation", "rnsap.FDD_DL_CodeInformation_item", + { "FDD-DL-CodeInformationItem", "rnsap.FDD_DL_CodeInformationItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.FDD_DL_CodeInformationItem", HFILL }}, { &hf_rnsap_dl_ScramblingCode, @@ -39712,7 +39712,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.INTEGER_1_4", HFILL }}, { &hf_rnsap_GA_Cell_item, - { "GA-Cell", "rnsap.GA_Cell_item", + { "GA-Cell item", "rnsap.GA_Cell_item", FT_NONE, BASE_NONE, NULL, 0, "rnsap.GA_Cell_item", HFILL }}, { &hf_rnsap_cell_GAIgeographicalCoordinate, @@ -39796,7 +39796,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.GANSS_SatelliteInformationKP", HFILL }}, { &hf_rnsap_GANSS_Clock_Model_item, - { "GANSS-Clock-Model", "rnsap.GANSS_Clock_Model_item", + { "GANSS-Clock-Model item", "rnsap.GANSS_Clock_Model_item", FT_NONE, BASE_NONE, NULL, 0, "rnsap.GANSS_Clock_Model_item", HFILL }}, { &hf_rnsap_t_oc, @@ -39844,7 +39844,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.GANSS_DataBitAssistanceList", HFILL }}, { &hf_rnsap_GANSS_DataBitAssistanceList_item, - { "GANSS-DataBitAssistanceList", "rnsap.GANSS_DataBitAssistanceList_item", + { "GANSS-DataBitAssistanceItem", "rnsap.GANSS_DataBitAssistanceItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.GANSS_DataBitAssistanceItem", HFILL }}, { &hf_rnsap_dataBitAssistanceSgnList, @@ -39852,7 +39852,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.GANSS_DataBitAssistanceSgnList", HFILL }}, { &hf_rnsap_GANSS_DataBitAssistanceSgnList_item, - { "GANSS-DataBitAssistanceSgnList", "rnsap.GANSS_DataBitAssistanceSgnList_item", + { "GANSS-DataBitAssistanceSgnItem", "rnsap.GANSS_DataBitAssistanceSgnItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.GANSS_DataBitAssistanceSgnItem", HFILL }}, { &hf_rnsap_ganss_SignalId, @@ -39880,11 +39880,11 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.T_ganss_SatelliteInfo", HFILL }}, { &hf_rnsap_ganss_SatelliteInfo_item, - { "ganss-SatelliteInfo", "rnsap.ganss_SatelliteInfo_item", + { "ganss-SatelliteInfo item", "rnsap.ganss_SatelliteInfo_item", FT_UINT32, BASE_DEC, NULL, 0, "rnsap.INTEGER_0_63", HFILL }}, { &hf_rnsap_GANSS_GenericDataInfoReqList_item, - { "GANSS-GenericDataInfoReqList", "rnsap.GANSS_GenericDataInfoReqList_item", + { "GANSS-GenericDataInfoReqItem", "rnsap.GANSS_GenericDataInfoReqItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.GANSS_GenericDataInfoReqItem", HFILL }}, { &hf_rnsap_ganss_Id, @@ -39916,7 +39916,7 @@ void proto_register_rnsap(void) { FT_NONE, BASE_NONE, NULL, 0, "rnsap.GANSS_Data_Bit_Assistance_ReqItem", HFILL }}, { &hf_rnsap_GANSS_Generic_Data_item, - { "GANSS-Generic-Data", "rnsap.GANSS_Generic_Data_item", + { "GANSS-Generic-DataItem", "rnsap.GANSS_Generic_DataItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.GANSS_Generic_DataItem", HFILL }}, { &hf_rnsap_dganss_Correction, @@ -40072,7 +40072,7 @@ void proto_register_rnsap(void) { FT_BYTES, BASE_HEX, NULL, 0, "rnsap.BIT_STRING_SIZE_16", HFILL }}, { &hf_rnsap_GANSS_Real_Time_Integrity_item, - { "GANSS-Real-Time-Integrity", "rnsap.GANSS_Real_Time_Integrity_item", + { "GANSS-Real-Time-Integrity item", "rnsap.GANSS_Real_Time_Integrity_item", FT_NONE, BASE_NONE, NULL, 0, "rnsap.GANSS_Real_Time_Integrity_item", HFILL }}, { &hf_rnsap_bad_ganss_satId, @@ -40100,7 +40100,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, VALS(rnsap_T_directionOfAltitude_01_vals), 0, "rnsap.T_directionOfAltitude_01", HFILL }}, { &hf_rnsap_GANSS_SatelliteInformationKP_item, - { "GANSS-SatelliteInformationKP", "rnsap.GANSS_SatelliteInformationKP_item", + { "GANSS-SatelliteInformationKP item", "rnsap.GANSS_SatelliteInformationKP_item", FT_NONE, BASE_NONE, NULL, 0, "rnsap.GANSS_SatelliteInformationKP_item", HFILL }}, { &hf_rnsap_ganss_e_alm, @@ -40144,7 +40144,7 @@ void proto_register_rnsap(void) { FT_BYTES, BASE_HEX, NULL, 0, "rnsap.BIT_STRING_SIZE_11", HFILL }}, { &hf_rnsap_GANSS_Sat_Info_Nav_item, - { "GANSS-Sat-Info-Nav", "rnsap.GANSS_Sat_Info_Nav_item", + { "GANSS-Sat-Info-Nav item", "rnsap.GANSS_Sat_Info_Nav_item", FT_NONE, BASE_NONE, NULL, 0, "rnsap.GANSS_Sat_Info_Nav_item", HFILL }}, { &hf_rnsap_svHealth, @@ -40276,7 +40276,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.GERAN_SystemInfo", HFILL }}, { &hf_rnsap_GERAN_SystemInfo_item, - { "GERAN-SystemInfo", "rnsap.GERAN_SystemInfo_item", + { "GERAN-SystemInfo item", "rnsap.GERAN_SystemInfo_item", FT_NONE, BASE_NONE, NULL, 0, "rnsap.GERAN_SystemInfo_item", HFILL }}, { &hf_rnsap_gERAN_SI_block, @@ -40292,7 +40292,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.T_satellite_Almanac_Information", HFILL }}, { &hf_rnsap_satellite_Almanac_Information_item, - { "satellite-Almanac-Information", "rnsap.satellite_Almanac_Information_item", + { "satellite-Almanac-Information item", "rnsap.satellite_Almanac_Information_item", FT_NONE, BASE_NONE, NULL, 0, "rnsap.T_satellite_Almanac_Information_item", HFILL }}, { &hf_rnsap_dATA_ID, @@ -40348,11 +40348,11 @@ void proto_register_rnsap(void) { FT_BYTES, BASE_HEX, NULL, 0, "rnsap.BIT_STRING_SIZE_364", HFILL }}, { &hf_rnsap_Satellite_Almanac_Information_ExtItem_item, - { "Satellite-Almanac-Information-ExtItem", "rnsap.Satellite_Almanac_Information_ExtItem_item", + { "Satellite-Almanac-Information-ExtItem item", "rnsap.Satellite_Almanac_Information_ExtItem_item", FT_NONE, BASE_NONE, NULL, 0, "rnsap.Satellite_Almanac_Information_ExtItem_item", HFILL }}, { &hf_rnsap_GPSInformation_item, - { "GPSInformation", "rnsap.GPSInformation_item", + { "GPSInformation item", "rnsap.GPSInformation_item", FT_NONE, BASE_NONE, NULL, 0, "rnsap.GPSInformation_item", HFILL }}, { &hf_rnsap_gPSInformationItem, @@ -40392,7 +40392,7 @@ void proto_register_rnsap(void) { FT_BYTES, BASE_HEX, NULL, 0, "rnsap.BIT_STRING_SIZE_8", HFILL }}, { &hf_rnsap_GPS_NavigationModel_and_TimeRecovery_item, - { "GPS-NavigationModel-and-TimeRecovery", "rnsap.GPS_NavigationModel_and_TimeRecovery_item", + { "GPS-NavigationModel-and-TimeRecovery item", "rnsap.GPS_NavigationModel_and_TimeRecovery_item", FT_NONE, BASE_NONE, NULL, 0, "rnsap.GPS_NavigationModel_and_TimeRecovery_item", HFILL }}, { &hf_rnsap_tx_tow_nav, @@ -40516,11 +40516,11 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.HARQ_MemoryPartitioningList", HFILL }}, { &hf_rnsap_HARQ_MemoryPartitioningList_item, - { "HARQ-MemoryPartitioningList", "rnsap.HARQ_MemoryPartitioningList_item", + { "HARQ-MemoryPartitioningItem", "rnsap.HARQ_MemoryPartitioningItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.HARQ_MemoryPartitioningItem", HFILL }}, { &hf_rnsap_HARQ_MemoryPartitioningInfoExtForMIMO_item, - { "HARQ-MemoryPartitioningInfoExtForMIMO", "rnsap.HARQ_MemoryPartitioningInfoExtForMIMO_item", + { "HARQ-MemoryPartitioningItem", "rnsap.HARQ_MemoryPartitioningItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.HARQ_MemoryPartitioningItem", HFILL }}, { &hf_rnsap_process_Memory_Size, @@ -40608,7 +40608,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.PriorityQueue_InfoList_to_Modify_Unsynchronised", HFILL }}, { &hf_rnsap_HSDSCH_MACdFlow_Specific_InfoList_item, - { "HSDSCH-MACdFlow-Specific-InfoList", "rnsap.HSDSCH_MACdFlow_Specific_InfoList_item", + { "HSDSCH-MACdFlow-Specific-InfoItem", "rnsap.HSDSCH_MACdFlow_Specific_InfoItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.HSDSCH_MACdFlow_Specific_InfoItem", HFILL }}, { &hf_rnsap_hSDSCH_MACdFlow_ID, @@ -40616,11 +40616,11 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.HSDSCH_MACdFlow_ID", HFILL }}, { &hf_rnsap_HSDSCH_MACdFlow_Specific_InfoList_Response_item, - { "HSDSCH-MACdFlow-Specific-InfoList-Response", "rnsap.HSDSCH_MACdFlow_Specific_InfoList_Response_item", + { "HSDSCH-MACdFlow-Specific-InfoItem-Response", "rnsap.HSDSCH_MACdFlow_Specific_InfoItem_Response", FT_NONE, BASE_NONE, NULL, 0, "rnsap.HSDSCH_MACdFlow_Specific_InfoItem_Response", HFILL }}, { &hf_rnsap_HSDSCH_MACdFlow_Specific_InfoList_to_Modify_item, - { "HSDSCH-MACdFlow-Specific-InfoList-to-Modify", "rnsap.HSDSCH_MACdFlow_Specific_InfoList_to_Modify_item", + { "HSDSCH-MACdFlow-Specific-InfoItem-to-Modify", "rnsap.HSDSCH_MACdFlow_Specific_InfoItem_to_Modify", FT_NONE, BASE_NONE, NULL, 0, "rnsap.HSDSCH_MACdFlow_Specific_InfoItem_to_Modify", HFILL }}, { &hf_rnsap_hSDSCH_MACdFlow_Specific_Info, @@ -40632,7 +40632,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.PriorityQueue_InfoList", HFILL }}, { &hf_rnsap_HSDSCH_MACdFlows_to_Delete_item, - { "HSDSCH-MACdFlows-to-Delete", "rnsap.HSDSCH_MACdFlows_to_Delete_item", + { "HSDSCH-MACdFlows-to-Delete-Item", "rnsap.HSDSCH_MACdFlows_to_Delete_Item", FT_NONE, BASE_NONE, NULL, 0, "rnsap.HSDSCH_MACdFlows_to_Delete_Item", HFILL }}, { &hf_rnsap_hsDSCH_MACdFlow_ID, @@ -40640,7 +40640,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.HSDSCH_MACdFlow_ID", HFILL }}, { &hf_rnsap_HSDSCH_Initial_Capacity_Allocation_item, - { "HSDSCH-Initial-Capacity-Allocation", "rnsap.HSDSCH_Initial_Capacity_Allocation_item", + { "HSDSCH-Initial-Capacity-AllocationItem", "rnsap.HSDSCH_Initial_Capacity_AllocationItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.HSDSCH_Initial_Capacity_AllocationItem", HFILL }}, { &hf_rnsap_maximum_MACdPDU_Size, @@ -40696,11 +40696,11 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.HSPDSCH_TDD_Specific_InfoList_Response_LCR", HFILL }}, { &hf_rnsap_HSPDSCH_TDD_Specific_InfoList_Response_item, - { "HSPDSCH-TDD-Specific-InfoList-Response", "rnsap.HSPDSCH_TDD_Specific_InfoList_Response_item", + { "HSPDSCH-TDD-Specific-InfoItem-Response", "rnsap.HSPDSCH_TDD_Specific_InfoItem_Response", FT_NONE, BASE_NONE, NULL, 0, "rnsap.HSPDSCH_TDD_Specific_InfoItem_Response", HFILL }}, { &hf_rnsap_HSPDSCH_TDD_Specific_InfoList_Response_LCR_item, - { "HSPDSCH-TDD-Specific-InfoList-Response-LCR", "rnsap.HSPDSCH_TDD_Specific_InfoList_Response_LCR_item", + { "HSPDSCH-TDD-Specific-InfoItem-Response-LCR", "rnsap.HSPDSCH_TDD_Specific_InfoItem_Response_LCR", FT_NONE, BASE_NONE, NULL, 0, "rnsap.HSPDSCH_TDD_Specific_InfoItem_Response_LCR", HFILL }}, { &hf_rnsap_timeslotLCR, @@ -40708,11 +40708,11 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.TimeSlotLCR", HFILL }}, { &hf_rnsap_HSPDSCH_TDD_Specific_InfoList_Response768_item, - { "HSPDSCH-TDD-Specific-InfoList-Response768", "rnsap.HSPDSCH_TDD_Specific_InfoList_Response768_item", + { "HSPDSCH-TDD-Specific-InfoItem-Response768", "rnsap.HSPDSCH_TDD_Specific_InfoItem_Response768", FT_NONE, BASE_NONE, NULL, 0, "rnsap.HSPDSCH_TDD_Specific_InfoItem_Response768", HFILL }}, { &hf_rnsap_HSSCCH_FDD_Specific_InfoList_Response_item, - { "HSSCCH-FDD-Specific-InfoList-Response", "rnsap.HSSCCH_FDD_Specific_InfoList_Response_item", + { "HSSCCH-FDD-Specific-InfoItem-Response", "rnsap.HSSCCH_FDD_Specific_InfoItem_Response", FT_NONE, BASE_NONE, NULL, 0, "rnsap.HSSCCH_FDD_Specific_InfoItem_Response", HFILL }}, { &hf_rnsap_code_Number, @@ -40720,7 +40720,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.INTEGER_0_127", HFILL }}, { &hf_rnsap_HSSCCH_TDD_Specific_InfoList_Response_item, - { "HSSCCH-TDD-Specific-InfoList-Response", "rnsap.HSSCCH_TDD_Specific_InfoList_Response_item", + { "HSSCCH-TDD-Specific-InfoItem-Response", "rnsap.HSSCCH_TDD_Specific_InfoItem_Response", FT_NONE, BASE_NONE, NULL, 0, "rnsap.HSSCCH_TDD_Specific_InfoItem_Response", HFILL }}, { &hf_rnsap_hSSICH_Info, @@ -40728,7 +40728,7 @@ void proto_register_rnsap(void) { FT_NONE, BASE_NONE, NULL, 0, "rnsap.HSSICH_Info", HFILL }}, { &hf_rnsap_HSSCCH_TDD_Specific_InfoList_Response_LCR_item, - { "HSSCCH-TDD-Specific-InfoList-Response-LCR", "rnsap.HSSCCH_TDD_Specific_InfoList_Response_LCR_item", + { "HSSCCH-TDD-Specific-InfoItem-Response-LCR", "rnsap.HSSCCH_TDD_Specific_InfoItem_Response_LCR", FT_NONE, BASE_NONE, NULL, 0, "rnsap.HSSCCH_TDD_Specific_InfoItem_Response_LCR", HFILL }}, { &hf_rnsap_first_TDD_ChannelisationCode, @@ -40744,7 +40744,7 @@ void proto_register_rnsap(void) { FT_NONE, BASE_NONE, NULL, 0, "rnsap.HSSICH_InfoLCR", HFILL }}, { &hf_rnsap_HSSCCH_TDD_Specific_InfoList_Response768_item, - { "HSSCCH-TDD-Specific-InfoList-Response768", "rnsap.HSSCCH_TDD_Specific_InfoList_Response768_item", + { "HSSCCH-TDD-Specific-InfoItem-Response768", "rnsap.HSSCCH_TDD_Specific_InfoItem_Response768", FT_NONE, BASE_NONE, NULL, 0, "rnsap.HSSCCH_TDD_Specific_InfoItem_Response768", HFILL }}, { &hf_rnsap_hSSICH_Info768, @@ -40824,7 +40824,7 @@ void proto_register_rnsap(void) { FT_NONE, BASE_NONE, NULL, 0, "rnsap.Extension_IPDLParameters", HFILL }}, { &hf_rnsap_Inter_Frequency_Cell_List_item, - { "Inter-Frequency-Cell-List", "rnsap.Inter_Frequency_Cell_List_item", + { "Inter-Frequency-Cell", "rnsap.Inter_Frequency_Cell", FT_NONE, BASE_NONE, NULL, 0, "rnsap.Inter_Frequency_Cell", HFILL }}, { &hf_rnsap_uL_UARFCN, @@ -40844,11 +40844,11 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.Inter_Frequency_Cell_Information_SIB12", HFILL }}, { &hf_rnsap_Inter_Frequency_Cell_Information_SIB11_item, - { "Inter-Frequency-Cell-Information-SIB11", "rnsap.Inter_Frequency_Cell_Information_SIB11_item", + { "Inter-Frequency-Cells-Information-SIB11-Per-Indication", "rnsap.Inter_Frequency_Cells_Information_SIB11_Per_Indication", FT_NONE, BASE_NONE, NULL, 0, "rnsap.Inter_Frequency_Cells_Information_SIB11_Per_Indication", HFILL }}, { &hf_rnsap_Inter_Frequency_Cell_Information_SIB12_item, - { "Inter-Frequency-Cell-Information-SIB12", "rnsap.Inter_Frequency_Cell_Information_SIB12_item", + { "Inter-Frequency-Cells-Information-SIB12-Per-Indication", "rnsap.Inter_Frequency_Cells_Information_SIB12_Per_Indication", FT_NONE, BASE_NONE, NULL, 0, "rnsap.Inter_Frequency_Cells_Information_SIB12_Per_Indication", HFILL }}, { &hf_rnsap_inter_Frequency_Cell_Indication_SIB11, @@ -40868,7 +40868,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.Inter_Frequency_Cell_SIB11_or_SIB12_List", HFILL }}, { &hf_rnsap_Inter_Frequency_Cell_SIB11_or_SIB12_List_item, - { "Inter-Frequency-Cell-SIB11-or-SIB12-List", "rnsap.Inter_Frequency_Cell_SIB11_or_SIB12_List_item", + { "Inter-Frequency-Cell-SIB11-or-SIB12", "rnsap.Inter_Frequency_Cell_SIB11_or_SIB12", FT_NONE, BASE_NONE, NULL, 0, "rnsap.Inter_Frequency_Cell_SIB11_or_SIB12", HFILL }}, { &hf_rnsap_interFrequencyCellID, @@ -40916,7 +40916,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, VALS(rnsap_IPSub_vals), 0, "rnsap.IPSub", HFILL }}, { &hf_rnsap_List_Of_PLMNs_item, - { "List-Of-PLMNs", "rnsap.List_Of_PLMNs_item", + { "PLMN-Identity", "rnsap.PLMN_Identity", FT_BYTES, BASE_HEX, NULL, 0, "rnsap.PLMN_Identity", HFILL }}, { &hf_rnsap_uplinkLoadValue, @@ -40936,11 +40936,11 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, VALS(rnsap_T_maxPhysChPerTimeslot_vals), 0, "rnsap.T_maxPhysChPerTimeslot", HFILL }}, { &hf_rnsap_MAC_c_sh_SDU_LengthList_item, - { "MAC-c-sh-SDU-LengthList", "rnsap.MAC_c_sh_SDU_LengthList_item", + { "MAC-c-sh-SDU-Length", "rnsap.MAC_c_sh_SDU_Length", FT_UINT32, BASE_DEC, NULL, 0, "rnsap.MAC_c_sh_SDU_Length", HFILL }}, { &hf_rnsap_MACdPDU_Size_IndexList_item, - { "MACdPDU-Size-IndexList", "rnsap.MACdPDU_Size_IndexList_item", + { "MACdPDU-Size-IndexItem", "rnsap.MACdPDU_Size_IndexItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.MACdPDU_Size_IndexItem", HFILL }}, { &hf_rnsap_sID, @@ -40948,7 +40948,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.SID", HFILL }}, { &hf_rnsap_MACdPDU_Size_IndexList_to_Modify_item, - { "MACdPDU-Size-IndexList-to-Modify", "rnsap.MACdPDU_Size_IndexList_to_Modify_item", + { "MACdPDU-Size-IndexItem-to-Modify", "rnsap.MACdPDU_Size_IndexItem_to_Modify", FT_NONE, BASE_NONE, NULL, 0, "rnsap.MACdPDU_Size_IndexItem_to_Modify", HFILL }}, { &hf_rnsap_accessPointName, @@ -40960,7 +40960,7 @@ void proto_register_rnsap(void) { FT_BYTES, BASE_HEX, NULL, 0, "rnsap.IPMulticastAddress", HFILL }}, { &hf_rnsap_MBMS_Bearer_Service_List_item, - { "MBMS-Bearer-Service-List", "rnsap.MBMS_Bearer_Service_List_item", + { "TMGI", "rnsap.TMGI", FT_NONE, BASE_NONE, NULL, 0, "rnsap.TMGI", HFILL }}, { &hf_rnsap_tmgi, @@ -41180,7 +41180,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.List_Of_PLMNs", HFILL }}, { &hf_rnsap_MultipleFreq_HSPDSCH_InformationList_ResponseTDDLCR_item, - { "MultipleFreq-HSPDSCH-InformationList-ResponseTDDLCR", "rnsap.MultipleFreq_HSPDSCH_InformationList_ResponseTDDLCR_item", + { "MultipleFreq-HSPDSCH-InformationItem-ResponseTDDLCR", "rnsap.MultipleFreq_HSPDSCH_InformationItem_ResponseTDDLCR", FT_NONE, BASE_NONE, NULL, 0, "rnsap.MultipleFreq_HSPDSCH_InformationItem_ResponseTDDLCR", HFILL }}, { &hf_rnsap_uARFCN, @@ -41192,7 +41192,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, VALS(rnsap_GERAN_SI_Type_vals), 0, "rnsap.GERAN_SI_Type", HFILL }}, { &hf_rnsap_Neighbouring_UMTS_CellInformation_item, - { "Neighbouring-UMTS-CellInformation", "rnsap.Neighbouring_UMTS_CellInformation_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_rNC_ID, @@ -41216,7 +41216,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.Neighbouring_TDD_CellInformation", HFILL }}, { &hf_rnsap_Neighbouring_FDD_CellInformation_item, - { "Neighbouring-FDD-CellInformation", "rnsap.Neighbouring_FDD_CellInformation_item", + { "Neighbouring-FDD-CellInformationItem", "rnsap.Neighbouring_FDD_CellInformationItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.Neighbouring_FDD_CellInformationItem", HFILL }}, { &hf_rnsap_uARFCNforNu, @@ -41260,7 +41260,7 @@ void proto_register_rnsap(void) { FT_NONE, BASE_NONE, NULL, 0, "rnsap.UC_ID", HFILL }}, { &hf_rnsap_Neighbouring_GSM_CellInformationIEs_item, - { "Neighbouring-GSM-CellInformationIEs", "rnsap.Neighbouring_GSM_CellInformationIEs_item", + { "Neighbouring-GSM-CellInformationItem", "rnsap.Neighbouring_GSM_CellInformationItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.Neighbouring_GSM_CellInformationItem", HFILL }}, { &hf_rnsap_cGI, @@ -41280,7 +41280,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.BCCH_ARFCN", HFILL }}, { &hf_rnsap_Neighbouring_TDD_CellInformation_item, - { "Neighbouring-TDD-CellInformation", "rnsap.Neighbouring_TDD_CellInformation_item", + { "Neighbouring-TDD-CellInformationItem", "rnsap.Neighbouring_TDD_CellInformationItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.Neighbouring_TDD_CellInformationItem", HFILL }}, { &hf_rnsap_uARFCNforNt, @@ -41312,7 +41312,7 @@ void proto_register_rnsap(void) { FT_INT32, BASE_DEC, NULL, 0, "rnsap.PCCPCH_Power", HFILL }}, { &hf_rnsap_Neighbouring_LCR_TDD_CellInformation_item, - { "Neighbouring-LCR-TDD-CellInformation", "rnsap.Neighbouring_LCR_TDD_CellInformation_item", + { "Neighbouring-LCR-TDD-CellInformationItem", "rnsap.Neighbouring_LCR_TDD_CellInformationItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.Neighbouring_LCR_TDD_CellInformationItem", HFILL }}, { &hf_rnsap_restrictionStateIndicator, @@ -41320,7 +41320,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, VALS(rnsap_RestrictionStateIndicator_vals), 0, "rnsap.RestrictionStateIndicator", HFILL }}, { &hf_rnsap_NotProvidedCellList_item, - { "NotProvidedCellList", "rnsap.NotProvidedCellList_item", + { "MBMSChannelTypeCellList", "rnsap.MBMSChannelTypeCellList", FT_NONE, BASE_NONE, NULL, 0, "rnsap.MBMSChannelTypeCellList", HFILL }}, { &hf_rnsap_uplinkNRTLoadInformationValue, @@ -41340,7 +41340,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, VALS(rnsap_InformationThreshold_vals), 0, "rnsap.InformationThreshold", HFILL }}, { &hf_rnsap_PCH_InformationList_item, - { "PCH-InformationList", "rnsap.PCH_InformationList_item", + { "PCH-InformationItem", "rnsap.PCH_InformationItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.PCH_InformationItem", HFILL }}, { &hf_rnsap_informationReportPeriodicity, @@ -41360,7 +41360,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.AdditionalPreferredFrequency", HFILL }}, { &hf_rnsap_PriorityQueue_InfoList_item, - { "PriorityQueue-InfoList", "rnsap.PriorityQueue_InfoList_item", + { "PriorityQueue-InfoItem", "rnsap.PriorityQueue_InfoItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.PriorityQueue_InfoItem", HFILL }}, { &hf_rnsap_priorityQueue_Id, @@ -41396,7 +41396,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, VALS(rnsap_RLC_Mode_vals), 0, "rnsap.RLC_Mode", HFILL }}, { &hf_rnsap_PriorityQueue_InfoList_EnhancedFACH_PCH_item, - { "PriorityQueue-InfoList-EnhancedFACH-PCH", "rnsap.PriorityQueue_InfoList_EnhancedFACH_PCH_item", + { "PriorityQueue-InfoItem-EnhancedFACH-PCH", "rnsap.PriorityQueue_InfoItem_EnhancedFACH_PCH", FT_NONE, BASE_NONE, NULL, 0, "rnsap.PriorityQueue_InfoItem_EnhancedFACH_PCH", HFILL }}, { &hf_rnsap_mAC_ehs_Reset_Timer, @@ -41408,7 +41408,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.MAC_PDU_SizeExtended", HFILL }}, { &hf_rnsap_PriorityQueue_InfoList_to_Modify_item, - { "PriorityQueue-InfoList-to-Modify", "rnsap.PriorityQueue_InfoList_to_Modify_item", + { "ModifyPriorityQueue", "rnsap.ModifyPriorityQueue", FT_UINT32, BASE_DEC, VALS(rnsap_ModifyPriorityQueue_vals), 0, "rnsap.ModifyPriorityQueue", HFILL }}, { &hf_rnsap_mACdPDU_Size_Index_to_Modify, @@ -41416,7 +41416,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.MACdPDU_Size_IndexList_to_Modify", HFILL }}, { &hf_rnsap_PriorityQueue_InfoList_to_Modify_Unsynchronised_item, - { "PriorityQueue-InfoList-to-Modify-Unsynchronised", "rnsap.PriorityQueue_InfoList_to_Modify_Unsynchronised_item", + { "PriorityQueue-InfoItem-to-Modify-Unsynchronised", "rnsap.PriorityQueue_InfoItem_to_Modify_Unsynchronised", FT_NONE, BASE_NONE, NULL, 0, "rnsap.PriorityQueue_InfoItem_to_Modify_Unsynchronised", HFILL }}, { &hf_rnsap_priorityQueueId, @@ -41432,7 +41432,7 @@ void proto_register_rnsap(void) { FT_NONE, BASE_NONE, NULL, 0, "rnsap.MBMSPreferredFreqLayerInfo", HFILL }}, { &hf_rnsap_UpPCH_InformationList_LCRTDD_item, - { "UpPCH-InformationList-LCRTDD", "rnsap.UpPCH_InformationList_LCRTDD_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_uPPCHPositionLCR, @@ -41440,19 +41440,19 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.UPPCHPositionLCR", HFILL }}, { &hf_rnsap_PTMCellList_item, - { "PTMCellList", "rnsap.PTMCellList_item", + { "MBMSChannelTypeCellList", "rnsap.MBMSChannelTypeCellList", FT_NONE, BASE_NONE, NULL, 0, "rnsap.MBMSChannelTypeCellList", HFILL }}, { &hf_rnsap_PTPCellList_item, - { "PTPCellList", "rnsap.PTPCellList_item", + { "MBMSChannelTypeCellList", "rnsap.MBMSChannelTypeCellList", FT_NONE, BASE_NONE, NULL, 0, "rnsap.MBMSChannelTypeCellList", HFILL }}, { &hf_rnsap_RB_Info_item, - { "RB-Info", "rnsap.RB_Info_item", + { "RB-Identity", "rnsap.RB_Identity", FT_UINT32, BASE_DEC, NULL, 0, "rnsap.RB_Identity", HFILL }}, { &hf_rnsap_Reference_E_TFCI_Information_item, - { "Reference-E-TFCI-Information", "rnsap.Reference_E_TFCI_Information_item", + { "Reference-E-TFCI-Information-Item", "rnsap.Reference_E_TFCI_Information_Item", FT_NONE, BASE_NONE, NULL, 0, "rnsap.Reference_E_TFCI_Information_Item", HFILL }}, { &hf_rnsap_reference_E_TFCI, @@ -41548,7 +41548,7 @@ void proto_register_rnsap(void) { FT_NONE, BASE_NONE, NULL, 0, "rnsap.InformationNotAvailable", HFILL }}, { &hf_rnsap_RL_Specific_DCH_Info_item, - { "RL-Specific-DCH-Info", "rnsap.RL_Specific_DCH_Info_item", + { "RL-Specific-DCH-Info-Item", "rnsap.RL_Specific_DCH_Info_Item", FT_NONE, BASE_NONE, NULL, 0, "rnsap.RL_Specific_DCH_Info_Item", HFILL }}, { &hf_rnsap_dCH_id, @@ -41572,7 +41572,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.E_HICH_PowerOffset", HFILL }}, { &hf_rnsap_RL_Specific_EDCH_Info_item, - { "RL-Specific-EDCH-Info", "rnsap.RL_Specific_EDCH_Info_item", + { "RL-Specific-EDCH-InfoItem", "rnsap.RL_Specific_EDCH_InfoItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.RL_Specific_EDCH_InfoItem", HFILL }}, { &hf_rnsap_uplinkRTLoadValue, @@ -41624,7 +41624,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.Secondary_CCPCH_TDD_InformationList768", HFILL }}, { &hf_rnsap_Secondary_CCPCH_TDD_InformationList_item, - { "Secondary-CCPCH-TDD-InformationList", "rnsap.Secondary_CCPCH_TDD_InformationList_item", + { "Secondary-CCPCH-TDD-InformationItem", "rnsap.Secondary_CCPCH_TDD_InformationItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.Secondary_CCPCH_TDD_InformationItem", HFILL }}, { &hf_rnsap_secondary_CCPCH_TDD_Code_Information, @@ -41636,7 +41636,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.TDD_PhysicalChannelOffset", HFILL }}, { &hf_rnsap_Secondary_LCR_CCPCH_TDD_InformationList_item, - { "Secondary-LCR-CCPCH-TDD-InformationList", "rnsap.Secondary_LCR_CCPCH_TDD_InformationList_item", + { "Secondary-LCR-CCPCH-TDD-InformationItem", "rnsap.Secondary_LCR_CCPCH_TDD_InformationItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.Secondary_LCR_CCPCH_TDD_InformationItem", HFILL }}, { &hf_rnsap_secondary_LCR_CCPCH_TDD_Code_Information, @@ -41644,7 +41644,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.Secondary_LCR_CCPCH_TDD_Code_Information", HFILL }}, { &hf_rnsap_Secondary_CCPCH_TDD_InformationList768_item, - { "Secondary-CCPCH-TDD-InformationList768", "rnsap.Secondary_CCPCH_TDD_InformationList768_item", + { "Secondary-CCPCH-TDD-InformationItem768", "rnsap.Secondary_CCPCH_TDD_InformationItem768", FT_NONE, BASE_NONE, NULL, 0, "rnsap.Secondary_CCPCH_TDD_InformationItem768", HFILL }}, { &hf_rnsap_secondary_CCPCH_TDD_Code_Information768, @@ -41652,11 +41652,11 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.Secondary_CCPCH_TDD_Code_Information768", HFILL }}, { &hf_rnsap_Secondary_CCPCH_TDD_Code_Information_item, - { "Secondary-CCPCH-TDD-Code-Information", "rnsap.Secondary_CCPCH_TDD_Code_Information_item", + { "Secondary-CCPCH-TDD-Code-InformationItem", "rnsap.Secondary_CCPCH_TDD_Code_InformationItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.Secondary_CCPCH_TDD_Code_InformationItem", HFILL }}, { &hf_rnsap_Secondary_LCR_CCPCH_TDD_Code_Information_item, - { "Secondary-LCR-CCPCH-TDD-Code-Information", "rnsap.Secondary_LCR_CCPCH_TDD_Code_Information_item", + { "Secondary-LCR-CCPCH-TDD-Code-InformationItem", "rnsap.Secondary_LCR_CCPCH_TDD_Code_InformationItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.Secondary_LCR_CCPCH_TDD_Code_InformationItem", HFILL }}, { &hf_rnsap_s_CCPCH_TimeSlotFormat_LCR, @@ -41664,7 +41664,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, VALS(rnsap_TDD_DL_DPCH_TimeSlotFormat_LCR_vals), 0, "rnsap.TDD_DL_DPCH_TimeSlotFormat_LCR", HFILL }}, { &hf_rnsap_Secondary_CCPCH_TDD_Code_Information768_item, - { "Secondary-CCPCH-TDD-Code-Information768", "rnsap.Secondary_CCPCH_TDD_Code_Information768_item", + { "Secondary-CCPCH-TDD-Code-InformationItem768", "rnsap.Secondary_CCPCH_TDD_Code_InformationItem768", FT_NONE, BASE_NONE, NULL, 0, "rnsap.Secondary_CCPCH_TDD_Code_InformationItem768", HFILL }}, { &hf_rnsap_sFNSFNChangeLimit, @@ -41680,7 +41680,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.T_successfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation", HFILL }}, { &hf_rnsap_successfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation_item, - { "successfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation", "rnsap.successfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation_item", + { "successfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation item", "rnsap.successfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation_item", FT_NONE, BASE_NONE, NULL, 0, "rnsap.T_successfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation_item", HFILL }}, { &hf_rnsap_sFNSFNValue, @@ -41708,7 +41708,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.T_unsuccessfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation", HFILL }}, { &hf_rnsap_unsuccessfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation_item, - { "unsuccessfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation", "rnsap.unsuccessfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation_item", + { "unsuccessfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation item", "rnsap.unsuccessfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation_item", FT_NONE, BASE_NONE, NULL, 0, "rnsap.T_unsuccessfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation_item", HFILL }}, { &hf_rnsap_sFNSFNTimeStamp_FDD, @@ -41740,7 +41740,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.ListOfSNAs", HFILL }}, { &hf_rnsap_ListOfSNAs_item, - { "ListOfSNAs", "rnsap.ListOfSNAs_item", + { "SNACode", "rnsap.SNACode", FT_UINT32, BASE_DEC, NULL, 0, "rnsap.SNACode", HFILL }}, { &hf_rnsap_sRNTI, @@ -41776,7 +41776,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, VALS(rnsap_Modulation_vals), 0, "rnsap.Modulation", HFILL }}, { &hf_rnsap_TDD_DCHs_to_Modify_item, - { "TDD-DCHs-to-Modify", "rnsap.TDD_DCHs_to_Modify_item", + { "TDD-DCHs-to-ModifyItem", "rnsap.TDD_DCHs_to_ModifyItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.TDD_DCHs_to_ModifyItem", HFILL }}, { &hf_rnsap_dCH_SpecificInformationList_03, @@ -41784,7 +41784,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.TDD_DCHs_to_ModifySpecificInformationList", HFILL }}, { &hf_rnsap_TDD_DCHs_to_ModifySpecificInformationList_item, - { "TDD-DCHs-to-ModifySpecificInformationList", "rnsap.TDD_DCHs_to_ModifySpecificInformationList_item", + { "TDD-DCHs-to-ModifySpecificItem", "rnsap.TDD_DCHs_to_ModifySpecificItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.TDD_DCHs_to_ModifySpecificItem", HFILL }}, { &hf_rnsap_ul_CCTrCH_ID, @@ -41796,7 +41796,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.CCTrCH_ID", HFILL }}, { &hf_rnsap_TDD_DL_Code_Information_item, - { "TDD-DL-Code-Information", "rnsap.TDD_DL_Code_Information_item", + { "TDD-DL-Code-InformationItem", "rnsap.TDD_DL_Code_InformationItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.TDD_DL_Code_InformationItem", HFILL }}, { &hf_rnsap_dPCH_ID, @@ -41804,7 +41804,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.DPCH_ID", HFILL }}, { &hf_rnsap_TDD_DL_Code_LCR_Information_item, - { "TDD-DL-Code-LCR-Information", "rnsap.TDD_DL_Code_LCR_Information_item", + { "TDD-DL-Code-LCR-InformationItem", "rnsap.TDD_DL_Code_LCR_InformationItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.TDD_DL_Code_LCR_InformationItem", HFILL }}, { &hf_rnsap_tdd_ChannelisationCodeLCR, @@ -41816,7 +41816,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, VALS(rnsap_TDD_DL_DPCH_TimeSlotFormat_LCR_vals), 0, "rnsap.TDD_DL_DPCH_TimeSlotFormat_LCR", HFILL }}, { &hf_rnsap_TDD_DL_Code_Information768_item, - { "TDD-DL-Code-Information768", "rnsap.TDD_DL_Code_Information768_item", + { "TDD-DL-Code-InformationItem768", "rnsap.TDD_DL_Code_InformationItem768", FT_NONE, BASE_NONE, NULL, 0, "rnsap.TDD_DL_Code_InformationItem768", HFILL }}, { &hf_rnsap_qPSK, @@ -41836,11 +41836,11 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.INTEGER_0_63", HFILL }}, { &hf_rnsap_TDD_UL_Code_Information_item, - { "TDD-UL-Code-Information", "rnsap.TDD_UL_Code_Information_item", + { "TDD-UL-Code-InformationItem", "rnsap.TDD_UL_Code_InformationItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.TDD_UL_Code_InformationItem", HFILL }}, { &hf_rnsap_TDD_UL_Code_LCR_Information_item, - { "TDD-UL-Code-LCR-Information", "rnsap.TDD_UL_Code_LCR_Information_item", + { "TDD-UL-Code-LCR-InformationItem", "rnsap.TDD_UL_Code_LCR_InformationItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.TDD_UL_Code_LCR_InformationItem", HFILL }}, { &hf_rnsap_tdd_UL_DPCH_TimeSlotFormat_LCR, @@ -41848,7 +41848,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, VALS(rnsap_TDD_UL_DPCH_TimeSlotFormat_LCR_vals), 0, "rnsap.TDD_UL_DPCH_TimeSlotFormat_LCR", HFILL }}, { &hf_rnsap_TDD_UL_Code_Information768_item, - { "TDD-UL-Code-Information768", "rnsap.TDD_UL_Code_Information768_item", + { "TDD-UL-Code-InformationItem768", "rnsap.TDD_UL_Code_InformationItem768", FT_NONE, BASE_NONE, NULL, 0, "rnsap.TDD_UL_Code_InformationItem768", HFILL }}, { &hf_rnsap_qPSK_01, @@ -41876,7 +41876,7 @@ void proto_register_rnsap(void) { FT_BYTES, BASE_HEX, NULL, 0, "rnsap.GenericTrafficCategory", HFILL }}, { &hf_rnsap_Transmission_Gap_Pattern_Sequence_Information_item, - { "Transmission-Gap-Pattern-Sequence-Information", "rnsap.Transmission_Gap_Pattern_Sequence_Information_item", + { "Transmission-Gap-Pattern-Sequence-Information item", "rnsap.Transmission_Gap_Pattern_Sequence_Information_item", FT_NONE, BASE_NONE, NULL, 0, "rnsap.Transmission_Gap_Pattern_Sequence_Information_item", HFILL }}, { &hf_rnsap_tGPSID, @@ -41940,7 +41940,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.DeltaSIR", HFILL }}, { &hf_rnsap_Transmission_Gap_Pattern_Sequence_Status_List_item, - { "Transmission-Gap-Pattern-Sequence-Status-List", "rnsap.Transmission_Gap_Pattern_Sequence_Status_List_item", + { "Transmission-Gap-Pattern-Sequence-Status-List item", "rnsap.Transmission_Gap_Pattern_Sequence_Status_List_item", FT_NONE, BASE_NONE, NULL, 0, "rnsap.Transmission_Gap_Pattern_Sequence_Status_List_item", HFILL }}, { &hf_rnsap_tGPRC, @@ -42048,7 +42048,7 @@ void proto_register_rnsap(void) { FT_NONE, BASE_NONE, NULL, 0, "rnsap.NULL", HFILL }}, { &hf_rnsap_TFCS_TFCSList_item, - { "TFCS-TFCSList", "rnsap.TFCS_TFCSList_item", + { "TFCS-TFCSList item", "rnsap.TFCS_TFCSList_item", FT_NONE, BASE_NONE, NULL, 0, "rnsap.TFCS_TFCSList_item", HFILL }}, { &hf_rnsap_cTFC, @@ -42096,7 +42096,7 @@ void proto_register_rnsap(void) { FT_NONE, BASE_NONE, NULL, 0, "rnsap.TransportFormatSet_Semi_staticPart", HFILL }}, { &hf_rnsap_TransportFormatSet_DynamicPartList_item, - { "TransportFormatSet-DynamicPartList", "rnsap.TransportFormatSet_DynamicPartList_item", + { "TransportFormatSet-DynamicPartList item", "rnsap.TransportFormatSet_DynamicPartList_item", FT_NONE, BASE_NONE, NULL, 0, "rnsap.TransportFormatSet_DynamicPartList_item", HFILL }}, { &hf_rnsap_nrOfTransportBlocks, @@ -42124,7 +42124,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.TransmissionTimeIntervalInformation", HFILL }}, { &hf_rnsap_TransmissionTimeIntervalInformation_item, - { "TransmissionTimeIntervalInformation", "rnsap.TransmissionTimeIntervalInformation_item", + { "TransmissionTimeIntervalInformation item", "rnsap.TransmissionTimeIntervalInformation_item", FT_NONE, BASE_NONE, NULL, 0, "rnsap.TransmissionTimeIntervalInformation_item", HFILL }}, { &hf_rnsap_transmissionTimeInterval, @@ -42236,7 +42236,7 @@ void proto_register_rnsap(void) { FT_NONE, BASE_NONE, NULL, 0, "rnsap.UEMeasurementThreshold_Extension", HFILL }}, { &hf_rnsap_UEMeasurementTimeslotInfoHCR_item, - { "UEMeasurementTimeslotInfoHCR", "rnsap.UEMeasurementTimeslotInfoHCR_item", + { "UEMeasurementTimeslotInfoHCR-IEs", "rnsap.UEMeasurementTimeslotInfoHCR_IEs", FT_NONE, BASE_NONE, NULL, 0, "rnsap.UEMeasurementTimeslotInfoHCR_IEs", HFILL }}, { &hf_rnsap_burstType, @@ -42244,11 +42244,11 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, VALS(rnsap_UEMeasurementTimeslotInfoHCRBurstType_vals), 0, "rnsap.UEMeasurementTimeslotInfoHCRBurstType", HFILL }}, { &hf_rnsap_UEMeasurementTimeslotInfoLCR_item, - { "UEMeasurementTimeslotInfoLCR", "rnsap.UEMeasurementTimeslotInfoLCR_item", + { "UEMeasurementTimeslotInfoLCR-IEs", "rnsap.UEMeasurementTimeslotInfoLCR_IEs", FT_NONE, BASE_NONE, NULL, 0, "rnsap.UEMeasurementTimeslotInfoLCR_IEs", HFILL }}, { &hf_rnsap_UEMeasurementTimeslotInfo768_item, - { "UEMeasurementTimeslotInfo768", "rnsap.UEMeasurementTimeslotInfo768_item", + { "UEMeasurementTimeslotInfo768-IEs", "rnsap.UEMeasurementTimeslotInfo768_IEs", FT_NONE, BASE_NONE, NULL, 0, "rnsap.UEMeasurementTimeslotInfo768_IEs", HFILL }}, { &hf_rnsap_burstType_01, @@ -42280,7 +42280,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.UEMeasurementValueTransmittedPowerListLCR", HFILL }}, { &hf_rnsap_UEMeasurementValueTransmittedPowerListHCR_item, - { "UEMeasurementValueTransmittedPowerListHCR", "rnsap.UEMeasurementValueTransmittedPowerListHCR_item", + { "UEMeasurementValueTransmittedPowerListHCR-IEs", "rnsap.UEMeasurementValueTransmittedPowerListHCR_IEs", FT_NONE, BASE_NONE, NULL, 0, "rnsap.UEMeasurementValueTransmittedPowerListHCR_IEs", HFILL }}, { &hf_rnsap_uETransmitPower_01, @@ -42288,11 +42288,11 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.INTEGER_0_104", HFILL }}, { &hf_rnsap_UEMeasurementValueTransmittedPowerListLCR_item, - { "UEMeasurementValueTransmittedPowerListLCR", "rnsap.UEMeasurementValueTransmittedPowerListLCR_item", + { "UEMeasurementValueTransmittedPowerListLCR-IEs", "rnsap.UEMeasurementValueTransmittedPowerListLCR_IEs", FT_NONE, BASE_NONE, NULL, 0, "rnsap.UEMeasurementValueTransmittedPowerListLCR_IEs", HFILL }}, { &hf_rnsap_UEMeasurementValueTransmittedPowerList768_item, - { "UEMeasurementValueTransmittedPowerList768", "rnsap.UEMeasurementValueTransmittedPowerList768_item", + { "UEMeasurementValueTransmittedPowerList768-IEs", "rnsap.UEMeasurementValueTransmittedPowerList768_IEs", FT_NONE, BASE_NONE, NULL, 0, "rnsap.UEMeasurementValueTransmittedPowerList768_IEs", HFILL }}, { &hf_rnsap_primaryCCPCH_RSCP, @@ -42312,15 +42312,15 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.UEMeasurementValueTimeslotISCPListLCR", HFILL }}, { &hf_rnsap_UEMeasurementValueTimeslotISCPListHCR_item, - { "UEMeasurementValueTimeslotISCPListHCR", "rnsap.UEMeasurementValueTimeslotISCPListHCR_item", + { "UEMeasurementValueTimeslotISCPListHCR-IEs", "rnsap.UEMeasurementValueTimeslotISCPListHCR_IEs", FT_NONE, BASE_NONE, NULL, 0, "rnsap.UEMeasurementValueTimeslotISCPListHCR_IEs", HFILL }}, { &hf_rnsap_UEMeasurementValueTimeslotISCPListLCR_item, - { "UEMeasurementValueTimeslotISCPListLCR", "rnsap.UEMeasurementValueTimeslotISCPListLCR_item", + { "UEMeasurementValueTimeslotISCPListLCR-IEs", "rnsap.UEMeasurementValueTimeslotISCPListLCR_IEs", FT_NONE, BASE_NONE, NULL, 0, "rnsap.UEMeasurementValueTimeslotISCPListLCR_IEs", HFILL }}, { &hf_rnsap_UEMeasurementValueTimeslotISCPList768_item, - { "UEMeasurementValueTimeslotISCPList768", "rnsap.UEMeasurementValueTimeslotISCPList768_item", + { "UEMeasurementValueTimeslotISCPList768-IEs", "rnsap.UEMeasurementValueTimeslotISCPList768_IEs", FT_NONE, BASE_NONE, NULL, 0, "rnsap.UEMeasurementValueTimeslotISCPList768_IEs", HFILL }}, { &hf_rnsap_measurementAvailable_02, @@ -42356,7 +42356,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.URA_ID", HFILL }}, { &hf_rnsap_UL_Timeslot_Information_item, - { "UL-Timeslot-Information", "rnsap.UL_Timeslot_Information_item", + { "UL-Timeslot-InformationItem", "rnsap.UL_Timeslot_InformationItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.UL_Timeslot_InformationItem", HFILL }}, { &hf_rnsap_uL_Code_Information, @@ -42364,7 +42364,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.TDD_UL_Code_Information", HFILL }}, { &hf_rnsap_UL_TimeslotLCR_Information_item, - { "UL-TimeslotLCR-Information", "rnsap.UL_TimeslotLCR_Information_item", + { "UL-TimeslotLCR-InformationItem", "rnsap.UL_TimeslotLCR_InformationItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.UL_TimeslotLCR_InformationItem", HFILL }}, { &hf_rnsap_uL_Code_LCR_InformationList, @@ -42376,7 +42376,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.PLCCHsequenceNumber", HFILL }}, { &hf_rnsap_UL_Timeslot_Information768_item, - { "UL-Timeslot-Information768", "rnsap.UL_Timeslot_Information768_item", + { "UL-Timeslot-InformationItem768", "rnsap.UL_Timeslot_InformationItem768", FT_NONE, BASE_NONE, NULL, 0, "rnsap.UL_Timeslot_InformationItem768", HFILL }}, { &hf_rnsap_uL_Code_Information768, @@ -42384,7 +42384,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.TDD_UL_Code_Information768", HFILL }}, { &hf_rnsap_UL_TimeSlot_ISCP_Info_item, - { "UL-TimeSlot-ISCP-Info", "rnsap.UL_TimeSlot_ISCP_Info_item", + { "UL-TimeSlot-ISCP-InfoItem", "rnsap.UL_TimeSlot_ISCP_InfoItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.UL_TimeSlot_ISCP_InfoItem", HFILL }}, { &hf_rnsap_uL_TimeslotISCP, @@ -42392,7 +42392,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.UL_TimeslotISCP", HFILL }}, { &hf_rnsap_UL_TimeSlot_ISCP_LCR_Info_item, - { "UL-TimeSlot-ISCP-LCR-Info", "rnsap.UL_TimeSlot_ISCP_LCR_Info_item", + { "UL-TimeSlot-ISCP-LCR-InfoItem", "rnsap.UL_TimeSlot_ISCP_LCR_InfoItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.UL_TimeSlot_ISCP_LCR_InfoItem", HFILL }}, { &hf_rnsap_iSCP, @@ -42448,11 +42448,11 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.RNCsWithCellsInTheAccessedURA_List", HFILL }}, { &hf_rnsap_RNCsWithCellsInTheAccessedURA_List_item, - { "RNCsWithCellsInTheAccessedURA-List", "rnsap.RNCsWithCellsInTheAccessedURA_List_item", + { "RNCsWithCellsInTheAccessedURA-Item", "rnsap.RNCsWithCellsInTheAccessedURA_Item", FT_NONE, BASE_NONE, NULL, 0, "rnsap.RNCsWithCellsInTheAccessedURA_Item", HFILL }}, { &hf_rnsap_USCH_Information_item, - { "USCH-Information", "rnsap.USCH_Information_item", + { "USCH-InformationItem", "rnsap.USCH_InformationItem", FT_NONE, BASE_NONE, NULL, 0, "rnsap.USCH_InformationItem", HFILL }}, { &hf_rnsap_uSCH_ID, @@ -42560,7 +42560,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.PowerOffset", HFILL }}, { &hf_rnsap_RL_InformationList_RL_SetupRqstFDD_item, - { "RL-InformationList-RL-SetupRqstFDD", "rnsap.RL_InformationList_RL_SetupRqstFDD_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_firstRLS_indicator, @@ -42624,7 +42624,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.MaxNrDLPhysicalchannels", HFILL }}, { &hf_rnsap_UL_CCTrCH_InformationList_RL_SetupRqstTDD_item, - { "UL-CCTrCH-InformationList-RL-SetupRqstTDD", "rnsap.UL_CCTrCH_InformationList_RL_SetupRqstTDD_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_cCTrCH_ID, @@ -42632,7 +42632,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.CCTrCH_ID", HFILL }}, { &hf_rnsap_DL_CCTrCH_InformationList_RL_SetupRqstTDD_item, - { "DL-CCTrCH-InformationList-RL-SetupRqstTDD", "rnsap.DL_CCTrCH_InformationList_RL_SetupRqstTDD_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_dl_PunctureLimit, @@ -42648,7 +42648,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.CCTrCH_TPCList_RL_SetupRqstTDD", HFILL }}, { &hf_rnsap_CCTrCH_TPCList_RL_SetupRqstTDD_item, - { "CCTrCH-TPCList-RL-SetupRqstTDD", "rnsap.CCTrCH_TPCList_RL_SetupRqstTDD_item", + { "CCTrCH-TPCItem-RL-SetupRqstTDD", "rnsap.CCTrCH_TPCItem_RL_SetupRqstTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.CCTrCH_TPCItem_RL_SetupRqstTDD", HFILL }}, { &hf_rnsap_specialBurstScheduling, @@ -42660,7 +42660,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.DL_TimeSlot_ISCP_Info", HFILL }}, { &hf_rnsap_RL_InformationResponseList_RL_SetupRspFDD_item, - { "RL-InformationResponseList-RL-SetupRspFDD", "rnsap.RL_InformationResponseList_RL_SetupRspFDD_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_rL_Set_ID, @@ -42804,7 +42804,7 @@ void proto_register_rnsap(void) { FT_NONE, BASE_NONE, NULL, 0, "rnsap.USCH_InformationResponse_RL_SetupRspTDD", HFILL }}, { &hf_rnsap_UL_CCTrCHInformationListIE_RL_SetupRspTDD_item, - { "UL-CCTrCHInformationListIE-RL-SetupRspTDD", "rnsap.UL_CCTrCHInformationListIE_RL_SetupRspTDD_item", + { "UL-CCTrCHInformationItem-RL-SetupRspTDD", "rnsap.UL_CCTrCHInformationItem_RL_SetupRspTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.UL_CCTrCHInformationItem_RL_SetupRspTDD", HFILL }}, { &hf_rnsap_ul_DPCH_Information, @@ -42820,7 +42820,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.UL_Timeslot_Information", HFILL }}, { &hf_rnsap_DL_CCTrCHInformationListIE_RL_SetupRspTDD_item, - { "DL-CCTrCHInformationListIE-RL-SetupRspTDD", "rnsap.DL_CCTrCHInformationListIE_RL_SetupRspTDD_item", + { "DL-CCTrCHInformationItem-RL-SetupRspTDD", "rnsap.DL_CCTrCHInformationItem_RL_SetupRspTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.DL_CCTrCHInformationItem_RL_SetupRspTDD", HFILL }}, { &hf_rnsap_dl_DPCH_Information, @@ -42832,7 +42832,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.DL_Timeslot_Information", HFILL }}, { &hf_rnsap_DSCH_InformationListIEs_RL_SetupRspTDD_item, - { "DSCH-InformationListIEs-RL-SetupRspTDD", "rnsap.DSCH_InformationListIEs_RL_SetupRspTDD_item", + { "DSCHInformationItem-RL-SetupRspTDD", "rnsap.DSCHInformationItem_RL_SetupRspTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.DSCHInformationItem_RL_SetupRspTDD", HFILL }}, { &hf_rnsap_dsch_ID, @@ -42848,7 +42848,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, VALS(rnsap_TransportFormatManagement_vals), 0, "rnsap.TransportFormatManagement", HFILL }}, { &hf_rnsap_USCH_InformationListIEs_RL_SetupRspTDD_item, - { "USCH-InformationListIEs-RL-SetupRspTDD", "rnsap.USCH_InformationListIEs_RL_SetupRspTDD_item", + { "USCHInformationItem-RL-SetupRspTDD", "rnsap.USCHInformationItem_RL_SetupRspTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.USCHInformationItem_RL_SetupRspTDD", HFILL }}, { &hf_rnsap_usch_ID, @@ -42880,7 +42880,7 @@ void proto_register_rnsap(void) { FT_NONE, BASE_NONE, NULL, 0, "rnsap.USCH_LCR_InformationResponse_RL_SetupRspTDD", HFILL }}, { &hf_rnsap_UL_LCR_CCTrCHInformationListIE_RL_SetupRspTDD_item, - { "UL-LCR-CCTrCHInformationListIE-RL-SetupRspTDD", "rnsap.UL_LCR_CCTrCHInformationListIE_RL_SetupRspTDD_item", + { "UL-LCR-CCTrCHInformationItem-RL-SetupRspTDD", "rnsap.UL_LCR_CCTrCHInformationItem_RL_SetupRspTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.UL_LCR_CCTrCHInformationItem_RL_SetupRspTDD", HFILL }}, { &hf_rnsap_ul_DPCH_LCR_Information, @@ -42892,7 +42892,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.UL_TimeslotLCR_Information", HFILL }}, { &hf_rnsap_DL_CCTrCH_LCR_InformationListIE_RL_SetupRspTDD_item, - { "DL-CCTrCH-LCR-InformationListIE-RL-SetupRspTDD", "rnsap.DL_CCTrCH_LCR_InformationListIE_RL_SetupRspTDD_item", + { "DL-CCTrCH-LCR-InformationItem-RL-SetupRspTDD", "rnsap.DL_CCTrCH_LCR_InformationItem_RL_SetupRspTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.DL_CCTrCH_LCR_InformationItem_RL_SetupRspTDD", HFILL }}, { &hf_rnsap_dl_DPCH_LCR_Information, @@ -42908,11 +42908,11 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, VALS(rnsap_TSTD_Indicator_vals), 0, "rnsap.TSTD_Indicator", HFILL }}, { &hf_rnsap_DSCH_LCR_InformationListIEs_RL_SetupRspTDD_item, - { "DSCH-LCR-InformationListIEs-RL-SetupRspTDD", "rnsap.DSCH_LCR_InformationListIEs_RL_SetupRspTDD_item", + { "DSCH-LCR-InformationItem-RL-SetupRspTDD", "rnsap.DSCH_LCR_InformationItem_RL_SetupRspTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.DSCH_LCR_InformationItem_RL_SetupRspTDD", HFILL }}, { &hf_rnsap_USCH_LCR_InformationListIEs_RL_SetupRspTDD_item, - { "USCH-LCR-InformationListIEs-RL-SetupRspTDD", "rnsap.USCH_LCR_InformationListIEs_RL_SetupRspTDD_item", + { "USCH-LCR-InformationItem-RL-SetupRspTDD", "rnsap.USCH_LCR_InformationItem_RL_SetupRspTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.USCH_LCR_InformationItem_RL_SetupRspTDD", HFILL }}, { &hf_rnsap_secondary_CCPCH_Info_TDD768, @@ -42940,7 +42940,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.TimeSlot", HFILL }}, { &hf_rnsap_UL_CCTrCHInformationListIE_RL_SetupRspTDD768_item, - { "UL-CCTrCHInformationListIE-RL-SetupRspTDD768", "rnsap.UL_CCTrCHInformationListIE_RL_SetupRspTDD768_item", + { "UL-CCTrCHInformationItem-RL-SetupRspTDD768", "rnsap.UL_CCTrCHInformationItem_RL_SetupRspTDD768", FT_NONE, BASE_NONE, NULL, 0, "rnsap.UL_CCTrCHInformationItem_RL_SetupRspTDD768", HFILL }}, { &hf_rnsap_ul_DPCH_Information768, @@ -42956,7 +42956,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.UL_Timeslot_Information768", HFILL }}, { &hf_rnsap_DL_CCTrCHInformationListIE_RL_SetupRspTDD768_item, - { "DL-CCTrCHInformationListIE-RL-SetupRspTDD768", "rnsap.DL_CCTrCHInformationListIE_RL_SetupRspTDD768_item", + { "DL-CCTrCHInformationItem-RL-SetupRspTDD768", "rnsap.DL_CCTrCHInformationItem_RL_SetupRspTDD768", FT_NONE, BASE_NONE, NULL, 0, "rnsap.DL_CCTrCHInformationItem_RL_SetupRspTDD768", HFILL }}, { &hf_rnsap_dl_DPCH_Information768, @@ -42992,11 +42992,11 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.SuccessfulRL_InformationResponseList_RL_SetupFailureFDD", HFILL }}, { &hf_rnsap_UnsuccessfulRL_InformationResponseList_RL_SetupFailureFDD_item, - { "UnsuccessfulRL-InformationResponseList-RL-SetupFailureFDD", "rnsap.UnsuccessfulRL_InformationResponseList_RL_SetupFailureFDD_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_SuccessfulRL_InformationResponseList_RL_SetupFailureFDD_item, - { "SuccessfulRL-InformationResponseList-RL-SetupFailureFDD", "rnsap.SuccessfulRL_InformationResponseList_RL_SetupFailureFDD_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_diversityIndication_01, @@ -43028,7 +43028,7 @@ void proto_register_rnsap(void) { FT_NONE, BASE_NONE, NULL, 0, "rnsap.Unsuccessful_RL_InformationRespItem_RL_SetupFailureTDD", HFILL }}, { &hf_rnsap_RL_InformationList_RL_AdditionRqstFDD_item, - { "RL-InformationList-RL-AdditionRqstFDD", "rnsap.RL_InformationList_RL_AdditionRqstFDD_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_dL_TimeSlot_ISCP_Info, @@ -43036,7 +43036,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.DL_TimeSlot_ISCP_Info", HFILL }}, { &hf_rnsap_UL_CCTrCH_InformationList_RL_AdditionRqstTDD_item, - { "UL-CCTrCH-InformationList-RL-AdditionRqstTDD", "rnsap.UL_CCTrCH_InformationList_RL_AdditionRqstTDD_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_uplinkStepSizeLCR, @@ -43044,7 +43044,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, VALS(rnsap_TDD_TPC_UplinkStepSize_LCR_vals), 0, "rnsap.TDD_TPC_UplinkStepSize_LCR", HFILL }}, { &hf_rnsap_DL_CCTrCH_InformationList_RL_AdditionRqstTDD_item, - { "DL-CCTrCH-InformationList-RL-AdditionRqstTDD", "rnsap.DL_CCTrCH_InformationList_RL_AdditionRqstTDD_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_downlinkStepSize, @@ -43052,7 +43052,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, VALS(rnsap_TDD_TPC_DownlinkStepSize_vals), 0, "rnsap.TDD_TPC_DownlinkStepSize", HFILL }}, { &hf_rnsap_RL_InformationResponseList_RL_AdditionRspFDD_item, - { "RL-InformationResponseList-RL-AdditionRspFDD", "rnsap.RL_InformationResponseList_RL_AdditionRspFDD_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_dl_CodeInformation_01, @@ -43092,7 +43092,7 @@ void proto_register_rnsap(void) { FT_NONE, BASE_NONE, NULL, 0, "rnsap.USCH_InformationResponse_RL_AdditionRspTDD", HFILL }}, { &hf_rnsap_UL_CCTrCHInformationListIE_RL_AdditionRspTDD_item, - { "UL-CCTrCHInformationListIE-RL-AdditionRspTDD", "rnsap.UL_CCTrCHInformationListIE_RL_AdditionRspTDD_item", + { "UL-CCTrCHInformationItem-RL-AdditionRspTDD", "rnsap.UL_CCTrCHInformationItem_RL_AdditionRspTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.UL_CCTrCHInformationItem_RL_AdditionRspTDD", HFILL }}, { &hf_rnsap_ul_DPCH_Information_01, @@ -43100,7 +43100,7 @@ void proto_register_rnsap(void) { FT_NONE, BASE_NONE, NULL, 0, "rnsap.UL_DPCH_InformationList_RL_AdditionRspTDD", HFILL }}, { &hf_rnsap_DL_CCTrCHInformationListIE_RL_AdditionRspTDD_item, - { "DL-CCTrCHInformationListIE-RL-AdditionRspTDD", "rnsap.DL_CCTrCHInformationListIE_RL_AdditionRspTDD_item", + { "DL-CCTrCHInformationItem-RL-AdditionRspTDD", "rnsap.DL_CCTrCHInformationItem_RL_AdditionRspTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.DL_CCTrCHInformationItem_RL_AdditionRspTDD", HFILL }}, { &hf_rnsap_dl_DPCH_Information_01, @@ -43120,7 +43120,7 @@ void proto_register_rnsap(void) { FT_NONE, BASE_NONE, NULL, 0, "rnsap.NonCombining_RL_AdditionRspTDD", HFILL }}, { &hf_rnsap_DSCH_InformationListIE_RL_AdditionRspTDD_item, - { "DSCH-InformationListIE-RL-AdditionRspTDD", "rnsap.DSCH_InformationListIE_RL_AdditionRspTDD_item", + { "DSCHInformationItem-RL-AdditionRspTDD", "rnsap.DSCHInformationItem_RL_AdditionRspTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.DSCHInformationItem_RL_AdditionRspTDD", HFILL }}, { &hf_rnsap_diversityIndication_04, @@ -43128,7 +43128,7 @@ void proto_register_rnsap(void) { FT_NONE, BASE_NONE, NULL, 0, "rnsap.DiversityIndication_RL_AdditionRspTDD2", HFILL }}, { &hf_rnsap_USCH_InformationListIE_RL_AdditionRspTDD_item, - { "USCH-InformationListIE-RL-AdditionRspTDD", "rnsap.USCH_InformationListIE_RL_AdditionRspTDD_item", + { "USCHInformationItem-RL-AdditionRspTDD", "rnsap.USCHInformationItem_RL_AdditionRspTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.USCHInformationItem_RL_AdditionRspTDD", HFILL }}, { &hf_rnsap_ul_CCTrCH_LCR_Information, @@ -43152,7 +43152,7 @@ void proto_register_rnsap(void) { FT_NONE, BASE_NONE, NULL, 0, "rnsap.USCH_LCR_InformationResponse_RL_AdditionRspTDD", HFILL }}, { &hf_rnsap_UL_CCTrCH_LCR_InformationListIE_RL_AdditionRspTDD_item, - { "UL-CCTrCH-LCR-InformationListIE-RL-AdditionRspTDD", "rnsap.UL_CCTrCH_LCR_InformationListIE_RL_AdditionRspTDD_item", + { "UL-CCTrCH-LCR-InformationItem-RL-AdditionRspTDD", "rnsap.UL_CCTrCH_LCR_InformationItem_RL_AdditionRspTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.UL_CCTrCH_LCR_InformationItem_RL_AdditionRspTDD", HFILL }}, { &hf_rnsap_ul_DPCH_LCR_Information_01, @@ -43160,7 +43160,7 @@ void proto_register_rnsap(void) { FT_NONE, BASE_NONE, NULL, 0, "rnsap.UL_DPCH_LCR_InformationList_RL_AdditionRspTDD", HFILL }}, { &hf_rnsap_DL_CCTrCH_LCR_InformationListIE_RL_AdditionRspTDD_item, - { "DL-CCTrCH-LCR-InformationListIE-RL-AdditionRspTDD", "rnsap.DL_CCTrCH_LCR_InformationListIE_RL_AdditionRspTDD_item", + { "DL-CCTrCH-LCR-InformationItem-RL-AdditionRspTDD", "rnsap.DL_CCTrCH_LCR_InformationItem_RL_AdditionRspTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.DL_CCTrCH_LCR_InformationItem_RL_AdditionRspTDD", HFILL }}, { &hf_rnsap_dl_DPCH_LCR_Information_01, @@ -43172,11 +43172,11 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.DL_TimeslotLCR_Information", HFILL }}, { &hf_rnsap_DSCH_LCR_InformationListIEs_RL_AdditionRspTDD_item, - { "DSCH-LCR-InformationListIEs-RL-AdditionRspTDD", "rnsap.DSCH_LCR_InformationListIEs_RL_AdditionRspTDD_item", + { "DSCH-LCR-InformationItem-RL-AdditionRspTDD", "rnsap.DSCH_LCR_InformationItem_RL_AdditionRspTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.DSCH_LCR_InformationItem_RL_AdditionRspTDD", HFILL }}, { &hf_rnsap_USCH_LCR_InformationListIEs_RL_AdditionRspTDD_item, - { "USCH-LCR-InformationListIEs-RL-AdditionRspTDD", "rnsap.USCH_LCR_InformationListIEs_RL_AdditionRspTDD_item", + { "USCH-LCR-InformationItem-RL-AdditionRspTDD", "rnsap.USCH_LCR_InformationItem_RL_AdditionRspTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.USCH_LCR_InformationItem_RL_AdditionRspTDD", HFILL }}, { &hf_rnsap_ul_CCTrCHInformation768_01, @@ -43188,7 +43188,7 @@ void proto_register_rnsap(void) { FT_NONE, BASE_NONE, NULL, 0, "rnsap.DL_CCTrCHInformationList_RL_AdditionRspTDD768", HFILL }}, { &hf_rnsap_UL_CCTrCHInformationListIE_RL_AdditionRspTDD768_item, - { "UL-CCTrCHInformationListIE-RL-AdditionRspTDD768", "rnsap.UL_CCTrCHInformationListIE_RL_AdditionRspTDD768_item", + { "UL-CCTrCHInformationItem-RL-AdditionRspTDD768", "rnsap.UL_CCTrCHInformationItem_RL_AdditionRspTDD768", FT_NONE, BASE_NONE, NULL, 0, "rnsap.UL_CCTrCHInformationItem_RL_AdditionRspTDD768", HFILL }}, { &hf_rnsap_ul_DPCH_Information768_01, @@ -43196,7 +43196,7 @@ void proto_register_rnsap(void) { FT_NONE, BASE_NONE, NULL, 0, "rnsap.UL_DPCH_InformationList_RL_AdditionRspTDD768", HFILL }}, { &hf_rnsap_DL_CCTrCHInformationListIE_RL_AdditionRspTDD768_item, - { "DL-CCTrCHInformationListIE-RL-AdditionRspTDD768", "rnsap.DL_CCTrCHInformationListIE_RL_AdditionRspTDD768_item", + { "DL-CCTrCHInformationItem-RL-AdditionRspTDD768", "rnsap.DL_CCTrCHInformationItem_RL_AdditionRspTDD768", FT_NONE, BASE_NONE, NULL, 0, "rnsap.DL_CCTrCHInformationItem_RL_AdditionRspTDD768", HFILL }}, { &hf_rnsap_dl_DPCH_Information768_01, @@ -43220,11 +43220,11 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.SuccessfulRL_InformationResponseList_RL_AdditionFailureFDD", HFILL }}, { &hf_rnsap_UnsuccessfulRL_InformationResponseList_RL_AdditionFailureFDD_item, - { "UnsuccessfulRL-InformationResponseList-RL-AdditionFailureFDD", "rnsap.UnsuccessfulRL_InformationResponseList_RL_AdditionFailureFDD_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_SuccessfulRL_InformationResponseList_RL_AdditionFailureFDD_item, - { "SuccessfulRL-InformationResponseList-RL-AdditionFailureFDD", "rnsap.SuccessfulRL_InformationResponseList_RL_AdditionFailureFDD_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_dl_CodeInformation_02, @@ -43256,7 +43256,7 @@ void proto_register_rnsap(void) { FT_NONE, BASE_NONE, NULL, 0, "rnsap.Unsuccessful_RL_InformationRespItem_RL_AdditionFailureTDD", HFILL }}, { &hf_rnsap_RL_InformationList_RL_DeletionRqst_item, - { "RL-InformationList-RL-DeletionRqst", "rnsap.RL_InformationList_RL_DeletionRqst_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_maxNrOfUL_DPDCHs, @@ -43288,11 +43288,11 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.PowerOffset", HFILL }}, { &hf_rnsap_DCH_DeleteList_RL_ReconfPrepFDD_item, - { "DCH-DeleteList-RL-ReconfPrepFDD", "rnsap.DCH_DeleteList_RL_ReconfPrepFDD_item", + { "DCH-DeleteItem-RL-ReconfPrepFDD", "rnsap.DCH_DeleteItem_RL_ReconfPrepFDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.DCH_DeleteItem_RL_ReconfPrepFDD", HFILL }}, { &hf_rnsap_RL_InformationList_RL_ReconfPrepFDD_item, - { "RL-InformationList-RL-ReconfPrepFDD", "rnsap.RL_InformationList_RL_ReconfPrepFDD_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_not_Used_sSDT_Indication, @@ -43308,19 +43308,19 @@ void proto_register_rnsap(void) { FT_NONE, BASE_NONE, NULL, 0, "rnsap.PowerOffsetInformation_F_DPCH_RL_ReconfPrepFDD", HFILL }}, { &hf_rnsap_UL_CCTrCH_InformationAddList_RL_ReconfPrepTDD_item, - { "UL-CCTrCH-InformationAddList-RL-ReconfPrepTDD", "rnsap.UL_CCTrCH_InformationAddList_RL_ReconfPrepTDD_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_UL_CCTrCH_InformationModifyList_RL_ReconfPrepTDD_item, - { "UL-CCTrCH-InformationModifyList-RL-ReconfPrepTDD", "rnsap.UL_CCTrCH_InformationModifyList_RL_ReconfPrepTDD_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_UL_CCTrCH_InformationDeleteList_RL_ReconfPrepTDD_item, - { "UL-CCTrCH-InformationDeleteList-RL-ReconfPrepTDD", "rnsap.UL_CCTrCH_InformationDeleteList_RL_ReconfPrepTDD_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_DL_CCTrCH_InformationAddList_RL_ReconfPrepTDD_item, - { "DL-CCTrCH-InformationAddList-RL-ReconfPrepTDD", "rnsap.DL_CCTrCH_InformationAddList_RL_ReconfPrepTDD_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_cCTrCH_TPCList_01, @@ -43328,11 +43328,11 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.CCTrCH_TPCAddList_RL_ReconfPrepTDD", HFILL }}, { &hf_rnsap_CCTrCH_TPCAddList_RL_ReconfPrepTDD_item, - { "CCTrCH-TPCAddList-RL-ReconfPrepTDD", "rnsap.CCTrCH_TPCAddList_RL_ReconfPrepTDD_item", + { "CCTrCH-TPCAddItem-RL-ReconfPrepTDD", "rnsap.CCTrCH_TPCAddItem_RL_ReconfPrepTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.CCTrCH_TPCAddItem_RL_ReconfPrepTDD", HFILL }}, { &hf_rnsap_DL_CCTrCH_InformationModifyList_RL_ReconfPrepTDD_item, - { "DL-CCTrCH-InformationModifyList-RL-ReconfPrepTDD", "rnsap.DL_CCTrCH_InformationModifyList_RL_ReconfPrepTDD_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_cCTrCH_TPCList_02, @@ -43340,27 +43340,27 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.CCTrCH_TPCModifyList_RL_ReconfPrepTDD", HFILL }}, { &hf_rnsap_CCTrCH_TPCModifyList_RL_ReconfPrepTDD_item, - { "CCTrCH-TPCModifyList-RL-ReconfPrepTDD", "rnsap.CCTrCH_TPCModifyList_RL_ReconfPrepTDD_item", + { "CCTrCH-TPCModifyItem-RL-ReconfPrepTDD", "rnsap.CCTrCH_TPCModifyItem_RL_ReconfPrepTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.CCTrCH_TPCModifyItem_RL_ReconfPrepTDD", HFILL }}, { &hf_rnsap_DL_CCTrCH_InformationDeleteList_RL_ReconfPrepTDD_item, - { "DL-CCTrCH-InformationDeleteList-RL-ReconfPrepTDD", "rnsap.DL_CCTrCH_InformationDeleteList_RL_ReconfPrepTDD_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_DCH_DeleteList_RL_ReconfPrepTDD_item, - { "DCH-DeleteList-RL-ReconfPrepTDD", "rnsap.DCH_DeleteList_RL_ReconfPrepTDD_item", + { "DCH-DeleteItem-RL-ReconfPrepTDD", "rnsap.DCH_DeleteItem_RL_ReconfPrepTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.DCH_DeleteItem_RL_ReconfPrepTDD", HFILL }}, { &hf_rnsap_DSCH_ModifyList_RL_ReconfPrepTDD_item, - { "DSCH-ModifyList-RL-ReconfPrepTDD", "rnsap.DSCH_ModifyList_RL_ReconfPrepTDD_item", + { "DSCH-ModifyItem-RL-ReconfPrepTDD", "rnsap.DSCH_ModifyItem_RL_ReconfPrepTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.DSCH_ModifyItem_RL_ReconfPrepTDD", HFILL }}, { &hf_rnsap_DSCH_DeleteList_RL_ReconfPrepTDD_item, - { "DSCH-DeleteList-RL-ReconfPrepTDD", "rnsap.DSCH_DeleteList_RL_ReconfPrepTDD_item", + { "DSCH-DeleteItem-RL-ReconfPrepTDD", "rnsap.DSCH_DeleteItem_RL_ReconfPrepTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.DSCH_DeleteItem_RL_ReconfPrepTDD", HFILL }}, { &hf_rnsap_USCH_ModifyList_RL_ReconfPrepTDD_item, - { "USCH-ModifyList-RL-ReconfPrepTDD", "rnsap.USCH_ModifyList_RL_ReconfPrepTDD_item", + { "USCH-ModifyItem-RL-ReconfPrepTDD", "rnsap.USCH_ModifyItem_RL_ReconfPrepTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.USCH_ModifyItem_RL_ReconfPrepTDD", HFILL }}, { &hf_rnsap_ul_ccTrCHID, @@ -43368,11 +43368,11 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.CCTrCH_ID", HFILL }}, { &hf_rnsap_USCH_DeleteList_RL_ReconfPrepTDD_item, - { "USCH-DeleteList-RL-ReconfPrepTDD", "rnsap.USCH_DeleteList_RL_ReconfPrepTDD_item", + { "USCH-DeleteItem-RL-ReconfPrepTDD", "rnsap.USCH_DeleteItem_RL_ReconfPrepTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.USCH_DeleteItem_RL_ReconfPrepTDD", HFILL }}, { &hf_rnsap_RL_Information_RL_ReconfPrepTDD_item, - { "RL-Information-RL-ReconfPrepTDD", "rnsap.RL_Information_RL_ReconfPrepTDD_item", + { "RL-InformationIE-RL-ReconfPrepTDD", "rnsap.RL_InformationIE_RL_ReconfPrepTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.RL_InformationIE_RL_ReconfPrepTDD", HFILL }}, { &hf_rnsap_rL_Specific_DCH_Info, @@ -43380,7 +43380,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.RL_Specific_DCH_Info", HFILL }}, { &hf_rnsap_RL_InformationResponseList_RL_ReconfReadyFDD_item, - { "RL-InformationResponseList-RL-ReconfReadyFDD", "rnsap.RL_InformationResponseList_RL_ReconfReadyFDD_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_max_UL_SIR, @@ -43424,7 +43424,7 @@ void proto_register_rnsap(void) { FT_NONE, BASE_NONE, NULL, 0, "rnsap.USCHToBeAddedOrModified_RL_ReconfReadyTDD", HFILL }}, { &hf_rnsap_UL_CCTrCHInformationListIE_RL_ReconfReadyTDD_item, - { "UL-CCTrCHInformationListIE-RL-ReconfReadyTDD", "rnsap.UL_CCTrCHInformationListIE_RL_ReconfReadyTDD_item", + { "UL-CCTrCH-InformationItem-RL-ReconfReadyTDD", "rnsap.UL_CCTrCH_InformationItem_RL_ReconfReadyTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.UL_CCTrCH_InformationItem_RL_ReconfReadyTDD", HFILL }}, { &hf_rnsap_ul_DPCH_AddInformation, @@ -43456,7 +43456,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.UL_Timeslot_InformationModifyList_RL_ReconfReadyTDD", HFILL }}, { &hf_rnsap_UL_TimeslotLCR_InformationModifyList_RL_ReconfReadyTDD_item, - { "UL-TimeslotLCR-InformationModifyList-RL-ReconfReadyTDD", "rnsap.UL_TimeslotLCR_InformationModifyList_RL_ReconfReadyTDD_item", + { "UL-TimeslotLCR-InformationModifyItem-RL-ReconfReadyTDD", "rnsap.UL_TimeslotLCR_InformationModifyItem_RL_ReconfReadyTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.UL_TimeslotLCR_InformationModifyItem_RL_ReconfReadyTDD", HFILL }}, { &hf_rnsap_tDD_uL_Code_LCR_Information, @@ -43464,11 +43464,11 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.TDD_UL_Code_LCR_InformationModifyList_RL_ReconfReadyTDD", HFILL }}, { &hf_rnsap_TDD_UL_Code_LCR_InformationModifyList_RL_ReconfReadyTDD_item, - { "TDD-UL-Code-LCR-InformationModifyList-RL-ReconfReadyTDD", "rnsap.TDD_UL_Code_LCR_InformationModifyList_RL_ReconfReadyTDD_item", + { "TDD-UL-Code-LCR-InformationModifyItem-RL-ReconfReadyTDD", "rnsap.TDD_UL_Code_LCR_InformationModifyItem_RL_ReconfReadyTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.TDD_UL_Code_LCR_InformationModifyItem_RL_ReconfReadyTDD", HFILL }}, { &hf_rnsap_UL_Timeslot_InformationModifyList_RL_ReconfReadyTDD_item, - { "UL-Timeslot-InformationModifyList-RL-ReconfReadyTDD", "rnsap.UL_Timeslot_InformationModifyList_RL_ReconfReadyTDD_item", + { "UL-Timeslot-InformationModifyItem-RL-ReconfReadyTDD", "rnsap.UL_Timeslot_InformationModifyItem_RL_ReconfReadyTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.UL_Timeslot_InformationModifyItem_RL_ReconfReadyTDD", HFILL }}, { &hf_rnsap_uL_Code_Information_01, @@ -43476,11 +43476,11 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.TDD_UL_Code_InformationModifyList_RL_ReconfReadyTDD", HFILL }}, { &hf_rnsap_TDD_UL_Code_InformationModifyList_RL_ReconfReadyTDD_item, - { "TDD-UL-Code-InformationModifyList-RL-ReconfReadyTDD", "rnsap.TDD_UL_Code_InformationModifyList_RL_ReconfReadyTDD_item", + { "TDD-UL-Code-InformationModifyItem-RL-ReconfReadyTDD", "rnsap.TDD_UL_Code_InformationModifyItem_RL_ReconfReadyTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.TDD_UL_Code_InformationModifyItem_RL_ReconfReadyTDD", HFILL }}, { &hf_rnsap_UL_Timeslot_InformationModifyList_RL_ReconfReadyTDD768_item, - { "UL-Timeslot-InformationModifyList-RL-ReconfReadyTDD768", "rnsap.UL_Timeslot_InformationModifyList_RL_ReconfReadyTDD768_item", + { "UL-Timeslot-InformationModifyItem-RL-ReconfReadyTDD768", "rnsap.UL_Timeslot_InformationModifyItem_RL_ReconfReadyTDD768", FT_NONE, BASE_NONE, NULL, 0, "rnsap.UL_Timeslot_InformationModifyItem_RL_ReconfReadyTDD768", HFILL }}, { &hf_rnsap_uL_Code_Information768_01, @@ -43488,15 +43488,15 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.TDD_UL_Code_InformationModifyList_RL_ReconfReadyTDD768", HFILL }}, { &hf_rnsap_TDD_UL_Code_InformationModifyList_RL_ReconfReadyTDD768_item, - { "TDD-UL-Code-InformationModifyList-RL-ReconfReadyTDD768", "rnsap.TDD_UL_Code_InformationModifyList_RL_ReconfReadyTDD768_item", + { "TDD-UL-Code-InformationModifyItem-RL-ReconfReadyTDD768", "rnsap.TDD_UL_Code_InformationModifyItem_RL_ReconfReadyTDD768", FT_NONE, BASE_NONE, NULL, 0, "rnsap.TDD_UL_Code_InformationModifyItem_RL_ReconfReadyTDD768", HFILL }}, { &hf_rnsap_UL_DPCH_InformationDeleteListIE_RL_ReconfReadyTDD_item, - { "UL-DPCH-InformationDeleteListIE-RL-ReconfReadyTDD", "rnsap.UL_DPCH_InformationDeleteListIE_RL_ReconfReadyTDD_item", + { "UL-DPCH-InformationDeleteItem-RL-ReconfReadyTDD", "rnsap.UL_DPCH_InformationDeleteItem_RL_ReconfReadyTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.UL_DPCH_InformationDeleteItem_RL_ReconfReadyTDD", HFILL }}, { &hf_rnsap_DL_CCTrCHInformationListIE_RL_ReconfReadyTDD_item, - { "DL-CCTrCHInformationListIE-RL-ReconfReadyTDD", "rnsap.DL_CCTrCHInformationListIE_RL_ReconfReadyTDD_item", + { "DL-CCTrCH-InformationItem-RL-ReconfReadyTDD", "rnsap.DL_CCTrCH_InformationItem_RL_ReconfReadyTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.DL_CCTrCH_InformationItem_RL_ReconfReadyTDD", HFILL }}, { &hf_rnsap_dl_DPCH_AddInformation, @@ -43520,7 +43520,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.DL_Timeslot_InformationModifyList_RL_ReconfReadyTDD", HFILL }}, { &hf_rnsap_DL_TimeslotLCR_InformationModifyList_RL_ReconfReadyTDD_item, - { "DL-TimeslotLCR-InformationModifyList-RL-ReconfReadyTDD", "rnsap.DL_TimeslotLCR_InformationModifyList_RL_ReconfReadyTDD_item", + { "DL-TimeslotLCR-InformationModifyItem-RL-ReconfReadyTDD", "rnsap.DL_TimeslotLCR_InformationModifyItem_RL_ReconfReadyTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.DL_TimeslotLCR_InformationModifyItem_RL_ReconfReadyTDD", HFILL }}, { &hf_rnsap_tDD_dL_Code_LCR_Information, @@ -43528,11 +43528,11 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.TDD_DL_Code_LCR_InformationModifyList_RL_ReconfReadyTDD", HFILL }}, { &hf_rnsap_TDD_DL_Code_LCR_InformationModifyList_RL_ReconfReadyTDD_item, - { "TDD-DL-Code-LCR-InformationModifyList-RL-ReconfReadyTDD", "rnsap.TDD_DL_Code_LCR_InformationModifyList_RL_ReconfReadyTDD_item", + { "TDD-DL-Code-LCR-InformationModifyItem-RL-ReconfReadyTDD", "rnsap.TDD_DL_Code_LCR_InformationModifyItem_RL_ReconfReadyTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.TDD_DL_Code_LCR_InformationModifyItem_RL_ReconfReadyTDD", HFILL }}, { &hf_rnsap_DL_Timeslot_InformationModifyList_RL_ReconfReadyTDD_item, - { "DL-Timeslot-InformationModifyList-RL-ReconfReadyTDD", "rnsap.DL_Timeslot_InformationModifyList_RL_ReconfReadyTDD_item", + { "DL-Timeslot-InformationModifyItem-RL-ReconfReadyTDD", "rnsap.DL_Timeslot_InformationModifyItem_RL_ReconfReadyTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.DL_Timeslot_InformationModifyItem_RL_ReconfReadyTDD", HFILL }}, { &hf_rnsap_dL_Code_Information_01, @@ -43540,11 +43540,11 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.TDD_DL_Code_InformationModifyList_RL_ReconfReadyTDD", HFILL }}, { &hf_rnsap_TDD_DL_Code_InformationModifyList_RL_ReconfReadyTDD_item, - { "TDD-DL-Code-InformationModifyList-RL-ReconfReadyTDD", "rnsap.TDD_DL_Code_InformationModifyList_RL_ReconfReadyTDD_item", + { "TDD-DL-Code-InformationModifyItem-RL-ReconfReadyTDD", "rnsap.TDD_DL_Code_InformationModifyItem_RL_ReconfReadyTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.TDD_DL_Code_InformationModifyItem_RL_ReconfReadyTDD", HFILL }}, { &hf_rnsap_DL_Timeslot_InformationModifyList_RL_ReconfReadyTDD768_item, - { "DL-Timeslot-InformationModifyList-RL-ReconfReadyTDD768", "rnsap.DL_Timeslot_InformationModifyList_RL_ReconfReadyTDD768_item", + { "DL-Timeslot-InformationModifyItem-RL-ReconfReadyTDD768", "rnsap.DL_Timeslot_InformationModifyItem_RL_ReconfReadyTDD768", FT_NONE, BASE_NONE, NULL, 0, "rnsap.DL_Timeslot_InformationModifyItem_RL_ReconfReadyTDD768", HFILL }}, { &hf_rnsap_dL_Code_Information768_01, @@ -43552,7 +43552,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.TDD_DL_Code_InformationModifyList_RL_ReconfReadyTDD768", HFILL }}, { &hf_rnsap_TDD_DL_Code_InformationModifyList_RL_ReconfReadyTDD768_item, - { "TDD-DL-Code-InformationModifyList-RL-ReconfReadyTDD768", "rnsap.TDD_DL_Code_InformationModifyList_RL_ReconfReadyTDD768_item", + { "TDD-DL-Code-InformationModifyItem-RL-ReconfReadyTDD768", "rnsap.TDD_DL_Code_InformationModifyItem_RL_ReconfReadyTDD768", FT_NONE, BASE_NONE, NULL, 0, "rnsap.TDD_DL_Code_InformationModifyItem_RL_ReconfReadyTDD768", HFILL }}, { &hf_rnsap_dPCH_ID768, @@ -43560,23 +43560,23 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.DPCH_ID768", HFILL }}, { &hf_rnsap_DL_DPCH_InformationDeleteListIE_RL_ReconfReadyTDD_item, - { "DL-DPCH-InformationDeleteListIE-RL-ReconfReadyTDD", "rnsap.DL_DPCH_InformationDeleteListIE_RL_ReconfReadyTDD_item", + { "DL-DPCH-InformationDeleteItem-RL-ReconfReadyTDD", "rnsap.DL_DPCH_InformationDeleteItem_RL_ReconfReadyTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.DL_DPCH_InformationDeleteItem_RL_ReconfReadyTDD", HFILL }}, { &hf_rnsap_DL_DPCH_InformationDeleteList768_RL_ReconfReadyTDD_item, - { "DL-DPCH-InformationDeleteList768-RL-ReconfReadyTDD", "rnsap.DL_DPCH_InformationDeleteList768_RL_ReconfReadyTDD_item", + { "DL-DPCH-InformationDeleteItem768-RL-ReconfReadyTDD", "rnsap.DL_DPCH_InformationDeleteItem768_RL_ReconfReadyTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.DL_DPCH_InformationDeleteItem768_RL_ReconfReadyTDD", HFILL }}, { &hf_rnsap_DSCHToBeAddedOrModifiedList_RL_ReconfReadyTDD_item, - { "DSCHToBeAddedOrModifiedList-RL-ReconfReadyTDD", "rnsap.DSCHToBeAddedOrModifiedList_RL_ReconfReadyTDD_item", + { "DSCHToBeAddedOrModifiedItem-RL-ReconfReadyTDD", "rnsap.DSCHToBeAddedOrModifiedItem_RL_ReconfReadyTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.DSCHToBeAddedOrModifiedItem_RL_ReconfReadyTDD", HFILL }}, { &hf_rnsap_USCHToBeAddedOrModifiedList_RL_ReconfReadyTDD_item, - { "USCHToBeAddedOrModifiedList-RL-ReconfReadyTDD", "rnsap.USCHToBeAddedOrModifiedList_RL_ReconfReadyTDD_item", + { "USCHToBeAddedOrModifiedItem-RL-ReconfReadyTDD", "rnsap.USCHToBeAddedOrModifiedItem_RL_ReconfReadyTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.USCHToBeAddedOrModifiedItem_RL_ReconfReadyTDD", HFILL }}, { &hf_rnsap_Multiple_RL_InformationResponse_RL_ReconfReadyTDD_item, - { "Multiple-RL-InformationResponse-RL-ReconfReadyTDD", "rnsap.Multiple_RL_InformationResponse_RL_ReconfReadyTDD_item", + { "RL-InformationResponse-RL-ReconfReadyTDD", "rnsap.RL_InformationResponse_RL_ReconfReadyTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.RL_InformationResponse_RL_ReconfReadyTDD", HFILL }}, { &hf_rnsap_generalCause_04, @@ -43592,43 +43592,43 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.RL_ReconfigurationFailureList_RL_ReconfFailure", HFILL }}, { &hf_rnsap_RL_ReconfigurationFailureList_RL_ReconfFailure_item, - { "RL-ReconfigurationFailureList-RL-ReconfFailure", "rnsap.RL_ReconfigurationFailureList_RL_ReconfFailure_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_DCH_DeleteList_RL_ReconfRqstFDD_item, - { "DCH-DeleteList-RL-ReconfRqstFDD", "rnsap.DCH_DeleteList_RL_ReconfRqstFDD_item", + { "DCH-DeleteItem-RL-ReconfRqstFDD", "rnsap.DCH_DeleteItem_RL_ReconfRqstFDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.DCH_DeleteItem_RL_ReconfRqstFDD", HFILL }}, { &hf_rnsap_RL_ReconfigurationRequestFDD_RL_InformationList_item, - { "RL-ReconfigurationRequestFDD-RL-InformationList", "rnsap.RL_ReconfigurationRequestFDD_RL_InformationList_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_UL_CCTrCH_InformationModifyList_RL_ReconfRqstTDD_item, - { "UL-CCTrCH-InformationModifyList-RL-ReconfRqstTDD", "rnsap.UL_CCTrCH_InformationModifyList_RL_ReconfRqstTDD_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_UL_CCTrCH_InformationDeleteList_RL_ReconfRqstTDD_item, - { "UL-CCTrCH-InformationDeleteList-RL-ReconfRqstTDD", "rnsap.UL_CCTrCH_InformationDeleteList_RL_ReconfRqstTDD_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_DL_CCTrCH_InformationModifyList_RL_ReconfRqstTDD_item, - { "DL-CCTrCH-InformationModifyList-RL-ReconfRqstTDD", "rnsap.DL_CCTrCH_InformationModifyList_RL_ReconfRqstTDD_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_DL_CCTrCH_InformationDeleteList_RL_ReconfRqstTDD_item, - { "DL-CCTrCH-InformationDeleteList-RL-ReconfRqstTDD", "rnsap.DL_CCTrCH_InformationDeleteList_RL_ReconfRqstTDD_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_DCH_DeleteList_RL_ReconfRqstTDD_item, - { "DCH-DeleteList-RL-ReconfRqstTDD", "rnsap.DCH_DeleteList_RL_ReconfRqstTDD_item", + { "DCH-DeleteItem-RL-ReconfRqstTDD", "rnsap.DCH_DeleteItem_RL_ReconfRqstTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.DCH_DeleteItem_RL_ReconfRqstTDD", HFILL }}, { &hf_rnsap_Multiple_RL_ReconfigurationRequestTDD_RL_Information_item, - { "Multiple-RL-ReconfigurationRequestTDD-RL-Information", "rnsap.Multiple_RL_ReconfigurationRequestTDD_RL_Information_item", + { "RL-ReconfigurationRequestTDD-RL-Information", "rnsap.RL_ReconfigurationRequestTDD_RL_Information", FT_NONE, BASE_NONE, NULL, 0, "rnsap.RL_ReconfigurationRequestTDD_RL_Information", HFILL }}, { &hf_rnsap_RL_InformationResponseList_RL_ReconfRspFDD_item, - { "RL-InformationResponseList-RL-ReconfRspFDD", "rnsap.RL_InformationResponseList_RL_ReconfRspFDD_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_dCHsInformationResponseList, @@ -43644,7 +43644,7 @@ void proto_register_rnsap(void) { FT_NONE, BASE_NONE, NULL, 0, "rnsap.DCH_InformationResponseList_RL_ReconfRspTDD", HFILL }}, { &hf_rnsap_DL_CCTrCH_InformationList_RL_ReconfRspTDD_item, - { "DL-CCTrCH-InformationList-RL-ReconfRspTDD", "rnsap.DL_CCTrCH_InformationList_RL_ReconfRspTDD_item", + { "DL-CCTrCH-InformationItem-RL-ReconfRspTDD", "rnsap.DL_CCTrCH_InformationItem_RL_ReconfRspTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.DL_CCTrCH_InformationItem_RL_ReconfRspTDD", HFILL }}, { &hf_rnsap_dl_DPCH_ModifyInformation_LCR, @@ -43656,7 +43656,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.DL_Timeslot_LCR_InformationModifyList_RL_ReconfRspTDD", HFILL }}, { &hf_rnsap_DL_Timeslot_LCR_InformationModifyList_RL_ReconfRspTDD_item, - { "DL-Timeslot-LCR-InformationModifyList-RL-ReconfRspTDD", "rnsap.DL_Timeslot_LCR_InformationModifyList_RL_ReconfRspTDD_item", + { "DL-Timeslot-LCR-InformationModifyItem-RL-ReconfRspTDD", "rnsap.DL_Timeslot_LCR_InformationModifyItem_RL_ReconfRspTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.DL_Timeslot_LCR_InformationModifyItem_RL_ReconfRspTDD", HFILL }}, { &hf_rnsap_maxPowerLCR, @@ -43668,7 +43668,7 @@ void proto_register_rnsap(void) { FT_INT32, BASE_DEC, NULL, 0, "rnsap.DL_Power", HFILL }}, { &hf_rnsap_Multiple_RL_InformationResponse_RL_ReconfRspTDD_item, - { "Multiple-RL-InformationResponse-RL-ReconfRspTDD", "rnsap.Multiple_RL_InformationResponse_RL_ReconfRspTDD_item", + { "RL-InformationResponse-RL-ReconfRspTDD", "rnsap.RL_InformationResponse_RL_ReconfRspTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.RL_InformationResponse_RL_ReconfRspTDD", HFILL }}, { &hf_rnsap_rL, @@ -43688,7 +43688,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.RL_InformationList_RL_FailureInd", HFILL }}, { &hf_rnsap_RL_InformationList_RL_FailureInd_item, - { "RL-InformationList-RL-FailureInd", "rnsap.RL_InformationList_RL_FailureInd_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_rL_Set_InformationList_RL_FailureInd, @@ -43696,7 +43696,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.RL_Set_InformationList_RL_FailureInd", HFILL }}, { &hf_rnsap_RL_Set_InformationList_RL_FailureInd_item, - { "RL-Set-InformationList-RL-FailureInd", "rnsap.RL_Set_InformationList_RL_FailureInd_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_cCTrCH_InformationList_RL_FailureInd, @@ -43704,19 +43704,19 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.CCTrCH_InformationList_RL_FailureInd", HFILL }}, { &hf_rnsap_CCTrCH_InformationList_RL_FailureInd_item, - { "CCTrCH-InformationList-RL-FailureInd", "rnsap.CCTrCH_InformationList_RL_FailureInd_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_RL_InformationList_RL_PreemptRequiredInd_item, - { "RL-InformationList-RL-PreemptRequiredInd", "rnsap.RL_InformationList_RL_PreemptRequiredInd_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_HSDSCHMacdFlowSpecificInformationList_RL_PreemptRequiredInd_item, - { "HSDSCHMacdFlowSpecificInformationList-RL-PreemptRequiredInd", "rnsap.HSDSCHMacdFlowSpecificInformationList_RL_PreemptRequiredInd_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_EDCH_MacdFlowSpecificInformationList_RL_PreemptRequiredInd_item, - { "EDCH-MacdFlowSpecificInformationList-RL-PreemptRequiredInd", "rnsap.EDCH_MacdFlowSpecificInformationList_RL_PreemptRequiredInd_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_rL_01, @@ -43736,7 +43736,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.RL_InformationList_RL_RestoreInd", HFILL }}, { &hf_rnsap_RL_InformationList_RL_RestoreInd_item, - { "RL-InformationList-RL-RestoreInd", "rnsap.RL_InformationList_RL_RestoreInd_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_rL_Set_InformationList_RL_RestoreInd, @@ -43744,7 +43744,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.RL_Set_InformationList_RL_RestoreInd", HFILL }}, { &hf_rnsap_RL_Set_InformationList_RL_RestoreInd_item, - { "RL-Set-InformationList-RL-RestoreInd", "rnsap.RL_Set_InformationList_RL_RestoreInd_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_cCTrCH_InformationList_RL_RestoreInd, @@ -43752,11 +43752,11 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.CCTrCH_InformationList_RL_RestoreInd", HFILL }}, { &hf_rnsap_CCTrCH_InformationList_RL_RestoreInd_item, - { "CCTrCH-InformationList-RL-RestoreInd", "rnsap.CCTrCH_InformationList_RL_RestoreInd_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_DL_ReferencePowerInformationList_DL_PC_Rqst_item, - { "DL-ReferencePowerInformationList-DL-PC-Rqst", "rnsap.DL_ReferencePowerInformationList_DL_PC_Rqst_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_dl_CodeInformation_03, @@ -43772,7 +43772,7 @@ void proto_register_rnsap(void) { FT_NONE, BASE_NONE, NULL, 0, "rnsap.DL_CCTrCH_InformationList_PhyChReconfRqstTDD", HFILL }}, { &hf_rnsap_UL_CCTrCH_InformationListIE_PhyChReconfRqstTDD_item, - { "UL-CCTrCH-InformationListIE-PhyChReconfRqstTDD", "rnsap.UL_CCTrCH_InformationListIE_PhyChReconfRqstTDD_item", + { "UL-CCTrCH-InformationItem-PhyChReconfRqstTDD", "rnsap.UL_CCTrCH_InformationItem_PhyChReconfRqstTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.UL_CCTrCH_InformationItem_PhyChReconfRqstTDD", HFILL }}, { &hf_rnsap_ul_DPCH_Information_02, @@ -43784,7 +43784,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.UL_Timeslot_InformationList_PhyChReconfRqstTDD", HFILL }}, { &hf_rnsap_UL_TimeslotLCR_InformationList_PhyChReconfRqstTDD_item, - { "UL-TimeslotLCR-InformationList-PhyChReconfRqstTDD", "rnsap.UL_TimeslotLCR_InformationList_PhyChReconfRqstTDD_item", + { "UL-TimeslotLCR-InformationItem-PhyChReconfRqstTDD", "rnsap.UL_TimeslotLCR_InformationItem_PhyChReconfRqstTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.UL_TimeslotLCR_InformationItem_PhyChReconfRqstTDD", HFILL }}, { &hf_rnsap_uL_Code_LCR_Information, @@ -43792,15 +43792,15 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.TDD_UL_Code_LCR_Information", HFILL }}, { &hf_rnsap_UL_Timeslot_InformationList_PhyChReconfRqstTDD_item, - { "UL-Timeslot-InformationList-PhyChReconfRqstTDD", "rnsap.UL_Timeslot_InformationList_PhyChReconfRqstTDD_item", + { "UL-Timeslot-InformationItem-PhyChReconfRqstTDD", "rnsap.UL_Timeslot_InformationItem_PhyChReconfRqstTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.UL_Timeslot_InformationItem_PhyChReconfRqstTDD", HFILL }}, { &hf_rnsap_UL_Timeslot_InformationList_PhyChReconfRqstTDD768_item, - { "UL-Timeslot-InformationList-PhyChReconfRqstTDD768", "rnsap.UL_Timeslot_InformationList_PhyChReconfRqstTDD768_item", + { "UL-Timeslot-InformationItem-PhyChReconfRqstTDD768", "rnsap.UL_Timeslot_InformationItem_PhyChReconfRqstTDD768", FT_NONE, BASE_NONE, NULL, 0, "rnsap.UL_Timeslot_InformationItem_PhyChReconfRqstTDD768", HFILL }}, { &hf_rnsap_DL_CCTrCH_InformationListIE_PhyChReconfRqstTDD_item, - { "DL-CCTrCH-InformationListIE-PhyChReconfRqstTDD", "rnsap.DL_CCTrCH_InformationListIE_PhyChReconfRqstTDD_item", + { "DL-CCTrCH-InformationItem-PhyChReconfRqstTDD", "rnsap.DL_CCTrCH_InformationItem_PhyChReconfRqstTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.DL_CCTrCH_InformationItem_PhyChReconfRqstTDD", HFILL }}, { &hf_rnsap_dl_DPCH_Information_02, @@ -43812,31 +43812,31 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.DL_Timeslot_InformationList_PhyChReconfRqstTDD", HFILL }}, { &hf_rnsap_DL_TimeslotLCR_InformationList_PhyChReconfRqstTDD_item, - { "DL-TimeslotLCR-InformationList-PhyChReconfRqstTDD", "rnsap.DL_TimeslotLCR_InformationList_PhyChReconfRqstTDD_item", + { "DL-TimeslotLCR-InformationItem-PhyChReconfRqstTDD", "rnsap.DL_TimeslotLCR_InformationItem_PhyChReconfRqstTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.DL_TimeslotLCR_InformationItem_PhyChReconfRqstTDD", HFILL }}, { &hf_rnsap_DL_Timeslot_InformationList_PhyChReconfRqstTDD_item, - { "DL-Timeslot-InformationList-PhyChReconfRqstTDD", "rnsap.DL_Timeslot_InformationList_PhyChReconfRqstTDD_item", + { "DL-Timeslot-InformationItem-PhyChReconfRqstTDD", "rnsap.DL_Timeslot_InformationItem_PhyChReconfRqstTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.DL_Timeslot_InformationItem_PhyChReconfRqstTDD", HFILL }}, { &hf_rnsap_DL_Timeslot_InformationList_PhyChReconfRqstTDD768_item, - { "DL-Timeslot-InformationList-PhyChReconfRqstTDD768", "rnsap.DL_Timeslot_InformationList_PhyChReconfRqstTDD768_item", + { "DL-Timeslot-InformationItem-PhyChReconfRqstTDD768", "rnsap.DL_Timeslot_InformationItem_PhyChReconfRqstTDD768", FT_NONE, BASE_NONE, NULL, 0, "rnsap.DL_Timeslot_InformationItem_PhyChReconfRqstTDD768", HFILL }}, { &hf_rnsap_HSPDSCH_Timeslot_InformationList_PhyChReconfRqstTDD_item, - { "HSPDSCH-Timeslot-InformationList-PhyChReconfRqstTDD", "rnsap.HSPDSCH_Timeslot_InformationList_PhyChReconfRqstTDD_item", + { "HSPDSCH-Timeslot-InformationItem-PhyChReconfRqstTDD", "rnsap.HSPDSCH_Timeslot_InformationItem_PhyChReconfRqstTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.HSPDSCH_Timeslot_InformationItem_PhyChReconfRqstTDD", HFILL }}, { &hf_rnsap_HSPDSCH_Timeslot_InformationListLCR_PhyChReconfRqstTDD_item, - { "HSPDSCH-Timeslot-InformationListLCR-PhyChReconfRqstTDD", "rnsap.HSPDSCH_Timeslot_InformationListLCR_PhyChReconfRqstTDD_item", + { "HSPDSCH-Timeslot-InformationItemLCR-PhyChReconfRqstTDD", "rnsap.HSPDSCH_Timeslot_InformationItemLCR_PhyChReconfRqstTDD", FT_NONE, BASE_NONE, NULL, 0, "rnsap.HSPDSCH_Timeslot_InformationItemLCR_PhyChReconfRqstTDD", HFILL }}, { &hf_rnsap_HSPDSCH_Timeslot_InformationList_PhyChReconfRqstTDD768_item, - { "HSPDSCH-Timeslot-InformationList-PhyChReconfRqstTDD768", "rnsap.HSPDSCH_Timeslot_InformationList_PhyChReconfRqstTDD768_item", + { "HSPDSCH-Timeslot-InformationItem-PhyChReconfRqstTDD768", "rnsap.HSPDSCH_Timeslot_InformationItem_PhyChReconfRqstTDD768", FT_NONE, BASE_NONE, NULL, 0, "rnsap.HSPDSCH_Timeslot_InformationItem_PhyChReconfRqstTDD768", HFILL }}, { &hf_rnsap_RL_InformationList_RL_CongestInd_item, - { "RL-InformationList-RL-CongestInd", "rnsap.RL_InformationList_RL_CongestInd_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_dCH_Rate_Information, @@ -43844,7 +43844,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.DCH_Rate_Information_RL_CongestInd", HFILL }}, { &hf_rnsap_DCH_Rate_Information_RL_CongestInd_item, - { "DCH-Rate-Information-RL-CongestInd", "rnsap.DCH_Rate_Information_RL_CongestInd_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_allowed_Rate_Information, @@ -43852,7 +43852,7 @@ void proto_register_rnsap(void) { FT_NONE, BASE_NONE, NULL, 0, "rnsap.Allowed_Rate_Information", HFILL }}, { &hf_rnsap_EDCH_MacdFlowSpecificInformationList_RL_CongestInd_item, - { "EDCH-MacdFlowSpecificInformationList-RL-CongestInd", "rnsap.EDCH_MacdFlowSpecificInformationList_RL_CongestInd_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_uRA, @@ -43896,15 +43896,15 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.RL_InformationList_DM_Rqst", HFILL }}, { &hf_rnsap_RL_InformationList_DM_Rqst_item, - { "RL-InformationList-DM-Rqst", "rnsap.RL_InformationList_DM_Rqst_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_HSSICH_Info_DM_Rqst_item, - { "HSSICH-Info-DM-Rqst", "rnsap.HSSICH_Info_DM_Rqst_item", + { "HS-SICH-ID", "rnsap.HS_SICH_ID", FT_UINT32, BASE_DEC, NULL, 0, "rnsap.HS_SICH_ID", HFILL }}, { &hf_rnsap_HSSICH_Info_DM_Rqst_Extension_item, - { "HSSICH-Info-DM-Rqst-Extension", "rnsap.HSSICH_Info_DM_Rqst_Extension_item", + { "HS-SICH-ID-Extension", "rnsap.HS_SICH_ID_Extension", FT_UINT32, BASE_DEC, NULL, 0, "rnsap.HS_SICH_ID_Extension", HFILL }}, { &hf_rnsap_rL_Set_InformationList_DM_Rqst, @@ -43912,7 +43912,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.RL_Set_InformationList_DM_Rqst", HFILL }}, { &hf_rnsap_RL_Set_InformationList_DM_Rqst_item, - { "RL-Set-InformationList-DM-Rqst", "rnsap.RL_Set_InformationList_DM_Rqst_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_rLs, @@ -43940,7 +43940,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.RL_Set_InformationList_DM_Rsp", HFILL }}, { &hf_rnsap_RL_InformationList_DM_Rsp_item, - { "RL-InformationList-DM-Rsp", "rnsap.RL_InformationList_DM_Rsp_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_dedicatedMeasurementValue, @@ -43948,23 +43948,23 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, VALS(rnsap_DedicatedMeasurementValue_vals), 0, "rnsap.DedicatedMeasurementValue", HFILL }}, { &hf_rnsap_RL_Set_InformationList_DM_Rsp_item, - { "RL-Set-InformationList-DM-Rsp", "rnsap.RL_Set_InformationList_DM_Rsp_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_Multiple_DedicatedMeasurementValueList_TDD_DM_Rsp_item, - { "Multiple-DedicatedMeasurementValueList-TDD-DM-Rsp", "rnsap.Multiple_DedicatedMeasurementValueList_TDD_DM_Rsp_item", + { "Multiple-DedicatedMeasurementValueItem-TDD-DM-Rsp", "rnsap.Multiple_DedicatedMeasurementValueItem_TDD_DM_Rsp", FT_NONE, BASE_NONE, NULL, 0, "rnsap.Multiple_DedicatedMeasurementValueItem_TDD_DM_Rsp", HFILL }}, { &hf_rnsap_Multiple_DedicatedMeasurementValueList_LCR_TDD_DM_Rsp_item, - { "Multiple-DedicatedMeasurementValueList-LCR-TDD-DM-Rsp", "rnsap.Multiple_DedicatedMeasurementValueList_LCR_TDD_DM_Rsp_item", + { "Multiple-DedicatedMeasurementValueItem-LCR-TDD-DM-Rsp", "rnsap.Multiple_DedicatedMeasurementValueItem_LCR_TDD_DM_Rsp", FT_NONE, BASE_NONE, NULL, 0, "rnsap.Multiple_DedicatedMeasurementValueItem_LCR_TDD_DM_Rsp", HFILL }}, { &hf_rnsap_Multiple_HSSICHMeasurementValueList_TDD_DM_Rsp_item, - { "Multiple-HSSICHMeasurementValueList-TDD-DM-Rsp", "rnsap.Multiple_HSSICHMeasurementValueList_TDD_DM_Rsp_item", + { "Multiple-HSSICHMeasurementValueItem-TDD-DM-Rsp", "rnsap.Multiple_HSSICHMeasurementValueItem_TDD_DM_Rsp", FT_NONE, BASE_NONE, NULL, 0, "rnsap.Multiple_HSSICHMeasurementValueItem_TDD_DM_Rsp", HFILL }}, { &hf_rnsap_Multiple_DedicatedMeasurementValueList_TDD768_DM_Rsp_item, - { "Multiple-DedicatedMeasurementValueList-TDD768-DM-Rsp", "rnsap.Multiple_DedicatedMeasurementValueList_TDD768_DM_Rsp_item", + { "Multiple-DedicatedMeasurementValueItem-TDD768-DM-Rsp", "rnsap.Multiple_DedicatedMeasurementValueItem_TDD768_DM_Rsp", FT_NONE, BASE_NONE, NULL, 0, "rnsap.Multiple_DedicatedMeasurementValueItem_TDD768_DM_Rsp", HFILL }}, { &hf_rnsap_rL_03, @@ -44000,7 +44000,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.RL_Set_Successful_InformationRespList_DM_Fail", HFILL }}, { &hf_rnsap_RL_Unsuccessful_InformationRespList_DM_Fail_item, - { "RL-Unsuccessful-InformationRespList-DM-Fail", "rnsap.RL_Unsuccessful_InformationRespList_DM_Fail_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_individualcause, @@ -44008,15 +44008,15 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, VALS(rnsap_Cause_vals), 0, "rnsap.Cause", HFILL }}, { &hf_rnsap_RL_Successful_InformationRespList_DM_Fail_item, - { "RL-Successful-InformationRespList-DM-Fail", "rnsap.RL_Successful_InformationRespList_DM_Fail_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_RL_Set_Unsuccessful_InformationRespList_DM_Fail_item, - { "RL-Set-Unsuccessful-InformationRespList-DM-Fail", "rnsap.RL_Set_Unsuccessful_InformationRespList_DM_Fail_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_RL_Set_Successful_InformationRespList_DM_Fail_item, - { "RL-Set-Successful-InformationRespList-DM-Fail", "rnsap.RL_Set_Successful_InformationRespList_DM_Fail_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_rLs_01, @@ -44044,7 +44044,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.RL_Set_InformationList_DM_Rprt", HFILL }}, { &hf_rnsap_RL_InformationList_DM_Rprt_item, - { "RL-InformationList-DM-Rprt", "rnsap.RL_InformationList_DM_Rprt_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_dedicatedMeasurementValueInformation, @@ -44052,7 +44052,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, VALS(rnsap_DedicatedMeasurementValueInformation_vals), 0, "rnsap.DedicatedMeasurementValueInformation", HFILL }}, { &hf_rnsap_RL_Set_InformationList_DM_Rprt_item, - { "RL-Set-InformationList-DM-Rprt", "rnsap.RL_Set_InformationList_DM_Rprt_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_rL_04, @@ -44080,11 +44080,11 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.RL_Set_Unsuccessful_InformationRespList_DM_Fail_Ind", HFILL }}, { &hf_rnsap_RL_Unsuccessful_InformationRespList_DM_Fail_Ind_item, - { "RL-Unsuccessful-InformationRespList-DM-Fail-Ind", "rnsap.RL_Unsuccessful_InformationRespList_DM_Fail_Ind_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_RL_Set_Unsuccessful_InformationRespList_DM_Fail_Ind_item, - { "RL-Set-Unsuccessful-InformationRespList-DM-Fail-Ind", "rnsap.RL_Set_Unsuccessful_InformationRespList_DM_Fail_Ind_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_fACH_FlowControlInformation, @@ -44104,7 +44104,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.NeighbouringCellMeasurementInfo", HFILL }}, { &hf_rnsap_NeighbouringCellMeasurementInfo_item, - { "NeighbouringCellMeasurementInfo", "rnsap.NeighbouringCellMeasurementInfo_item", + { "NeighbouringCellMeasurementInfo item", "rnsap.NeighbouringCellMeasurementInfo_item", FT_UINT32, BASE_DEC, VALS(rnsap_NeighbouringCellMeasurementInfo_item_vals), 0, "rnsap.NeighbouringCellMeasurementInfo_item", HFILL }}, { &hf_rnsap_neighbouringFDDCellMeasurementInformation, @@ -44152,7 +44152,7 @@ void proto_register_rnsap(void) { FT_NONE, BASE_NONE, NULL, 0, "rnsap.Extension_InformationExchangeObjectType_InfEx_Rsp", HFILL }}, { &hf_rnsap_MBMS_Bearer_Service_List_InfEx_Rsp_item, - { "MBMS-Bearer-Service-List-InfEx-Rsp", "rnsap.MBMS_Bearer_Service_List_InfEx_Rsp_item", + { "MBMS-Bearer-ServiceItemIEs-InfEx-Rsp", "rnsap.MBMS_Bearer_ServiceItemIEs_InfEx_Rsp", FT_NONE, BASE_NONE, NULL, 0, "rnsap.MBMS_Bearer_ServiceItemIEs_InfEx_Rsp", HFILL }}, { &hf_rnsap_cell_06, @@ -44180,7 +44180,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.ContextInfoList_Reset", HFILL }}, { &hf_rnsap_ContextInfoList_Reset_item, - { "ContextInfoList-Reset", "rnsap.ContextInfoList_Reset_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_contextType_Reset, @@ -44196,7 +44196,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, NULL, 0, "rnsap.ContextGroupInfoList_Reset", HFILL }}, { &hf_rnsap_ContextGroupInfoList_Reset_item, - { "ContextGroupInfoList-Reset", "rnsap.ContextGroupInfoList_Reset_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_s_RNTI_Group, @@ -44204,7 +44204,7 @@ void proto_register_rnsap(void) { FT_NONE, BASE_NONE, NULL, 0, "rnsap.S_RNTI_Group", HFILL }}, { &hf_rnsap_DelayedActivationInformationList_RL_ActivationCmdFDD_item, - { "DelayedActivationInformationList-RL-ActivationCmdFDD", "rnsap.DelayedActivationInformationList_RL_ActivationCmdFDD_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_delayed_activation_update, @@ -44212,11 +44212,11 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, VALS(rnsap_DelayedActivationUpdate_vals), 0, "rnsap.DelayedActivationUpdate", HFILL }}, { &hf_rnsap_DelayedActivationInformationList_RL_ActivationCmdTDD_item, - { "DelayedActivationInformationList-RL-ActivationCmdTDD", "rnsap.DelayedActivationInformationList_RL_ActivationCmdTDD_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_RL_ParameterUpdateIndicationFDD_RL_InformationList_item, - { "RL-ParameterUpdateIndicationFDD-RL-InformationList", "rnsap.RL_ParameterUpdateIndicationFDD_RL_InformationList_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_phase_Reference_Update_Indicator, @@ -44224,7 +44224,7 @@ void proto_register_rnsap(void) { FT_UINT32, BASE_DEC, VALS(rnsap_Phase_Reference_Update_Indicator_vals), 0, "rnsap.Phase_Reference_Update_Indicator", HFILL }}, { &hf_rnsap_ListOfInterfacesToTrace_item, - { "ListOfInterfacesToTrace", "rnsap.ListOfInterfacesToTrace_item", + { "ProtocolIE-Single-Container", "rnsap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "rnsap.ProtocolIE_Single_Container", HFILL }}, { &hf_rnsap_interface, diff --git a/epan/dissectors/packet-ros.c b/epan/dissectors/packet-ros.c index 9ea61c08e4..2961972528 100644 --- a/epan/dissectors/packet-ros.c +++ b/epan/dissectors/packet-ros.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-ros.c */ -/* ../../tools/asn2wrs.py -b -e -p ros -c ros.cnf -s packet-ros-template ros.asn Remote-Operations-Information-Objects.asn */ +/* ../../tools/asn2wrs.py -b -e -p ros -c ./ros.cnf -s ./packet-ros-template -D . ros.asn Remote-Operations-Information-Objects.asn */ /* Input file: packet-ros-template.c */ diff --git a/epan/dissectors/packet-ros.h b/epan/dissectors/packet-ros.h index 1ec08fc250..9f29bbc2ef 100644 --- a/epan/dissectors/packet-ros.h +++ b/epan/dissectors/packet-ros.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-ros.h */ -/* ../../tools/asn2wrs.py -b -e -p ros -c ros.cnf -s packet-ros-template ros.asn Remote-Operations-Information-Objects.asn */ +/* ../../tools/asn2wrs.py -b -e -p ros -c ./ros.cnf -s ./packet-ros-template -D . ros.asn Remote-Operations-Information-Objects.asn */ /* Input file: packet-ros-template.h */ diff --git a/epan/dissectors/packet-rrc.c b/epan/dissectors/packet-rrc.c index 22d642f4dd..6de186daac 100644 --- a/epan/dissectors/packet-rrc.c +++ b/epan/dissectors/packet-rrc.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-rrc.c */ -/* ../../tools/asn2wrs.py -p rrc -c rrc.cnf -s packet-rrc-template Class-definitions.asn PDU-definitions.asn InformationElements.asn Constant-definitions.asn Internode-definitions.asn */ +/* ../../tools/asn2wrs.py -p rrc -c ./rrc.cnf -s ./packet-rrc-template -D . Class-definitions.asn PDU-definitions.asn InformationElements.asn Constant-definitions.asn Internode-definitions.asn */ /* Input file: packet-rrc-template.c */ @@ -104652,7 +104652,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_maxURNTI_Group_OF_GroupReleaseInformation", HFILL }}, { &hf_rrc_groupIdentity_item, - { "groupIdentity", "rrc.groupIdentity_item", + { "GroupReleaseInformation", "rrc.GroupReleaseInformation", FT_NONE, BASE_NONE, NULL, 0, "rrc.GroupReleaseInformation", HFILL }}, { &hf_rrc_criticalExtensions_64, @@ -105536,7 +105536,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SegmentIndex", HFILL }}, { &hf_rrc_CompleteSIB_List_item, - { "CompleteSIB-List", "rrc.CompleteSIB_List_item", + { "CompleteSIBshort", "rrc.CompleteSIBshort", FT_NONE, BASE_NONE, NULL, 0, "rrc.CompleteSIBshort", HFILL }}, { &hf_rrc_sib_Data_fixed_01, @@ -106916,11 +106916,11 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.CN_DRX_CycleLengthCoefficient", HFILL }}, { &hf_rrc_CN_DomainInformationList_item, - { "CN-DomainInformationList", "rrc.CN_DomainInformationList_item", + { "CN-DomainInformation", "rrc.CN_DomainInformation", FT_NONE, BASE_NONE, NULL, 0, "rrc.CN_DomainInformation", HFILL }}, { &hf_rrc_CN_DomainInformationListFull_item, - { "CN-DomainInformationListFull", "rrc.CN_DomainInformationListFull_item", + { "CN-DomainInformationFull", "rrc.CN_DomainInformationFull", FT_NONE, BASE_NONE, NULL, 0, "rrc.CN_DomainInformationFull", HFILL }}, { &hf_rrc_cn_Type, @@ -106936,7 +106936,7 @@ void proto_register_rrc(void) { FT_BYTES, BASE_HEX, NULL, 0, "rrc.NAS_SystemInformationANSI_41", HFILL }}, { &hf_rrc_CN_DomainSysInfoList_item, - { "CN-DomainSysInfoList", "rrc.CN_DomainSysInfoList_item", + { "CN-DomainSysInfo", "rrc.CN_DomainSysInfo", FT_NONE, BASE_NONE, NULL, 0, "rrc.CN_DomainSysInfo", HFILL }}, { &hf_rrc_cn_CommonGSM_MAP_NAS_SysInfo, @@ -106996,11 +106996,11 @@ void proto_register_rrc(void) { FT_BOOLEAN, 8, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_IMEI_item, - { "IMEI", "rrc.IMEI_item", + { "IMEI-Digit", "rrc.IMEI_Digit", FT_UINT32, BASE_DEC, NULL, 0, "rrc.IMEI_Digit", HFILL }}, { &hf_rrc_IMSI_GSM_MAP_item, - { "IMSI-GSM-MAP", "rrc.IMSI_GSM_MAP_item", + { "Digit", "rrc.Digit", FT_UINT32, BASE_DEC, NULL, 0, "rrc.Digit", HFILL }}, { &hf_rrc_version, @@ -107036,11 +107036,11 @@ void proto_register_rrc(void) { FT_BYTES, BASE_HEX, NULL, 0, "rrc.BIT_STRING_SIZE_16", HFILL }}, { &hf_rrc_MCC_item, - { "MCC", "rrc.MCC_item", + { "Digit", "rrc.Digit", FT_UINT32, BASE_DEC, NULL, 0, "rrc.Digit", HFILL }}, { &hf_rrc_MNC_item, - { "MNC", "rrc.MNC_item", + { "Digit", "rrc.Digit", FT_UINT32, BASE_DEC, NULL, 0, "rrc.Digit", HFILL }}, { &hf_rrc_mibPLMN_Identity, @@ -107052,7 +107052,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_5_OF_PLMN_IdentityWithOptionalMCC_r6", HFILL }}, { &hf_rrc_multiplePLMNs_item, - { "multiplePLMNs", "rrc.multiplePLMNs_item", + { "PLMN-IdentityWithOptionalMCC-r6", "rrc.PLMN_IdentityWithOptionalMCC_r6", FT_NONE, BASE_NONE, NULL, 0, "rrc.PLMN_IdentityWithOptionalMCC_r6", HFILL }}, { &hf_rrc_mcc, @@ -107108,7 +107108,7 @@ void proto_register_rrc(void) { FT_BYTES, BASE_HEX, NULL, 0, "rrc.RoutingAreaCode", HFILL }}, { &hf_rrc_AccessClassBarredList_item, - { "AccessClassBarredList", "rrc.AccessClassBarredList_item", + { "AccessClassBarred", "rrc.AccessClassBarred", FT_UINT32, BASE_DEC, VALS(rrc_AccessClassBarred_vals), 0, "rrc.AccessClassBarred", HFILL }}, { &hf_rrc_cellBarred, @@ -107144,7 +107144,7 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.NULL", HFILL }}, { &hf_rrc_CellIdentity_PerRL_List_item, - { "CellIdentity-PerRL-List", "rrc.CellIdentity_PerRL_List_item", + { "CellIdentity", "rrc.CellIdentity", FT_BYTES, BASE_HEX, NULL, 0, "rrc.CellIdentity", HFILL }}, { &hf_rrc_mappingInfo, @@ -107300,11 +107300,11 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.UpperLimit", HFILL }}, { &hf_rrc_MappingFunctionParameterList_item, - { "MappingFunctionParameterList", "rrc.MappingFunctionParameterList_item", + { "MappingFunctionParameter", "rrc.MappingFunctionParameter", FT_NONE, BASE_NONE, NULL, 0, "rrc.MappingFunctionParameter", HFILL }}, { &hf_rrc_MappingInfo_item, - { "MappingInfo", "rrc.MappingInfo_item", + { "Mapping", "rrc.Mapping", FT_NONE, BASE_NONE, NULL, 0, "rrc.Mapping", HFILL }}, { &hf_rrc_rat_Identifier, @@ -107324,7 +107324,7 @@ void proto_register_rrc(void) { FT_INT32, BASE_DEC, NULL, 0, "rrc.S_SearchQual", HFILL }}, { &hf_rrc_RAT_FDD_InfoList_item, - { "RAT-FDD-InfoList", "rrc.RAT_FDD_InfoList_item", + { "RAT-FDD-Info", "rrc.RAT_FDD_Info", FT_NONE, BASE_NONE, NULL, 0, "rrc.RAT_FDD_Info", HFILL }}, { &hf_rrc_s_SearchRAT_01, @@ -107336,11 +107336,11 @@ void proto_register_rrc(void) { FT_INT32, BASE_DEC, NULL, 0, "rrc.S_SearchRXLEV", HFILL }}, { &hf_rrc_RAT_TDD_InfoList_item, - { "RAT-TDD-InfoList", "rrc.RAT_TDD_InfoList_item", + { "RAT-TDD-Info", "rrc.RAT_TDD_Info", FT_NONE, BASE_NONE, NULL, 0, "rrc.RAT_TDD_Info", HFILL }}, { &hf_rrc_URA_IdentityList_item, - { "URA-IdentityList", "rrc.URA_IdentityList_item", + { "URA-Identity", "rrc.URA_Identity", FT_BYTES, BASE_HEX, NULL, 0, "rrc.URA_Identity", HFILL }}, { &hf_rrc_n_AP_RetransMax, @@ -107472,15 +107472,15 @@ void proto_register_rrc(void) { FT_BOOLEAN, 8, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_CompressedModeMeasCapabFDDList_item, - { "CompressedModeMeasCapabFDDList", "rrc.CompressedModeMeasCapabFDDList_item", + { "CompressedModeMeasCapabFDD", "rrc.CompressedModeMeasCapabFDD", FT_NONE, BASE_NONE, NULL, 0, "rrc.CompressedModeMeasCapabFDD", HFILL }}, { &hf_rrc_CompressedModeMeasCapabFDDList2_item, - { "CompressedModeMeasCapabFDDList2", "rrc.CompressedModeMeasCapabFDDList2_item", + { "CompressedModeMeasCapabFDD2", "rrc.CompressedModeMeasCapabFDD2", FT_NONE, BASE_NONE, NULL, 0, "rrc.CompressedModeMeasCapabFDD2", HFILL }}, { &hf_rrc_CompressedModeMeasCapabFDDList_ext_item, - { "CompressedModeMeasCapabFDDList-ext", "rrc.CompressedModeMeasCapabFDDList_ext_item", + { "CompressedModeMeasCapabFDD-ext", "rrc.CompressedModeMeasCapabFDD_ext", FT_NONE, BASE_NONE, NULL, 0, "rrc.CompressedModeMeasCapabFDD_ext", HFILL }}, { &hf_rrc_radioFrequencyBandFDD, @@ -107500,7 +107500,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, VALS(rrc_RadioFrequencyBandFDD2_vals), 0, "rrc.RadioFrequencyBandFDD2", HFILL }}, { &hf_rrc_CompressedModeMeasCapabTDDList_item, - { "CompressedModeMeasCapabTDDList", "rrc.CompressedModeMeasCapabTDDList_item", + { "CompressedModeMeasCapabTDD", "rrc.CompressedModeMeasCapabTDD", FT_NONE, BASE_NONE, NULL, 0, "rrc.CompressedModeMeasCapabTDD", HFILL }}, { &hf_rrc_radioFrequencyBandTDD, @@ -107516,7 +107516,7 @@ void proto_register_rrc(void) { FT_BOOLEAN, 8, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_CompressedModeMeasCapabGSMList_item, - { "CompressedModeMeasCapabGSMList", "rrc.CompressedModeMeasCapabGSMList_item", + { "CompressedModeMeasCapabGSM", "rrc.CompressedModeMeasCapabGSM", FT_NONE, BASE_NONE, NULL, 0, "rrc.CompressedModeMeasCapabGSM", HFILL }}, { &hf_rrc_radioFrequencyBandGSM, @@ -107696,7 +107696,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.MaximumBitRate", HFILL }}, { &hf_rrc_DRAC_SysInfoList_item, - { "DRAC-SysInfoList", "rrc.DRAC_SysInfoList_item", + { "DRAC-SysInfo", "rrc.DRAC_SysInfo", FT_NONE, BASE_NONE, NULL, 0, "rrc.DRAC_SysInfo", HFILL }}, { &hf_rrc_configurationUnsupported, @@ -107772,7 +107772,7 @@ void proto_register_rrc(void) { FT_BYTES, BASE_HEX, NULL, 0, "rrc.ESN_DS_41", HFILL }}, { &hf_rrc_InitialPriorityDelayList_item, - { "InitialPriorityDelayList", "rrc.InitialPriorityDelayList_item", + { "NS-IP", "rrc.NS_IP", FT_UINT32, BASE_DEC, NULL, 0, "rrc.NS_IP", HFILL }}, { &hf_rrc_imsi, @@ -107892,7 +107892,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, VALS(rrc_T_supportOfPSHandoverToGAN_vals), 0, "rrc.T_supportOfPSHandoverToGAN", HFILL }}, { &hf_rrc_NetworkAssistedGANSS_Supported_List_item, - { "NetworkAssistedGANSS-Supported-List", "rrc.NetworkAssistedGANSS_Supported_List_item", + { "NetworkAssistedGANSS-Supported-List item", "rrc.NetworkAssistedGANSS_Supported_List_item", FT_NONE, BASE_NONE, NULL, 0, "rrc.NetworkAssistedGANSS_Supported_List_item", HFILL }}, { &hf_rrc_gANSS_Id, @@ -107952,15 +107952,15 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_maxURNTI_Group_OF_GroupIdentityWithReleaseInformation", HFILL }}, { &hf_rrc_utran_GroupIdentity_item, - { "utran-GroupIdentity", "rrc.utran_GroupIdentity_item", + { "GroupIdentityWithReleaseInformation", "rrc.GroupIdentityWithReleaseInformation", FT_NONE, BASE_NONE, NULL, 0, "rrc.GroupIdentityWithReleaseInformation", HFILL }}, { &hf_rrc_PagingRecordList_item, - { "PagingRecordList", "rrc.PagingRecordList_item", + { "PagingRecord", "rrc.PagingRecord", FT_UINT32, BASE_DEC, VALS(rrc_PagingRecord_vals), 0, "rrc.PagingRecord", HFILL }}, { &hf_rrc_PagingRecord2List_r5_item, - { "PagingRecord2List-r5", "rrc.PagingRecord2List_r5_item", + { "PagingRecord2-r5", "rrc.PagingRecord2_r5", FT_UINT32, BASE_DEC, VALS(rrc_PagingRecord2_r5_vals), 0, "rrc.PagingRecord2_r5", HFILL }}, { &hf_rrc_losslessSRNS_RelocationSupport, @@ -108272,7 +108272,7 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.T_release", HFILL }}, { &hf_rrc_RRC_MessageSequenceNumberList_item, - { "RRC-MessageSequenceNumberList", "rrc.RRC_MessageSequenceNumberList_item", + { "RRC-MessageSequenceNumber", "rrc.RRC_MessageSequenceNumber", FT_UINT32, BASE_DEC, NULL, 0, "rrc.RRC_MessageSequenceNumber", HFILL }}, { &hf_rrc_cipheringAlgorithmCap, @@ -108320,15 +108320,15 @@ void proto_register_rrc(void) { FT_BOOLEAN, 8, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_STARTList_item, - { "STARTList", "rrc.STARTList_item", + { "STARTSingle", "rrc.STARTSingle", FT_NONE, BASE_NONE, NULL, 0, "rrc.STARTSingle", HFILL }}, { &hf_rrc_SystemSpecificCapUpdateReqList_item, - { "SystemSpecificCapUpdateReqList", "rrc.SystemSpecificCapUpdateReqList_item", + { "SystemSpecificCapUpdateReq", "rrc.SystemSpecificCapUpdateReq", FT_UINT32, BASE_DEC, VALS(rrc_SystemSpecificCapUpdateReq_vals), 0, "rrc.SystemSpecificCapUpdateReq", HFILL }}, { &hf_rrc_SystemSpecificCapUpdateReqList_r5_item, - { "SystemSpecificCapUpdateReqList-r5", "rrc.SystemSpecificCapUpdateReqList_r5_item", + { "SystemSpecificCapUpdateReq-r5", "rrc.SystemSpecificCapUpdateReq_r5", FT_UINT32, BASE_DEC, VALS(rrc_SystemSpecificCapUpdateReq_r5_vals), 0, "rrc.SystemSpecificCapUpdateReq_r5", HFILL }}, { &hf_rrc_tmsi, @@ -108768,7 +108768,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, VALS(rrc_UE_SpecificCapabilityInformation_LCRTDD_vals), 0, "rrc.UE_SpecificCapabilityInformation_LCRTDD", HFILL }}, { &hf_rrc_UE_RadioAccessCapabBandFDDList2_item, - { "UE-RadioAccessCapabBandFDDList2", "rrc.UE_RadioAccessCapabBandFDDList2_item", + { "UE-RadioAccessCapabBandFDD2", "rrc.UE_RadioAccessCapabBandFDD2", FT_NONE, BASE_NONE, NULL, 0, "rrc.UE_RadioAccessCapabBandFDD2", HFILL }}, { &hf_rrc_fddRF_Capability_01, @@ -108800,11 +108800,11 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.UE_GANSSPositioning_Capability", HFILL }}, { &hf_rrc_UE_RadioAccessCapabBandFDDList_item, - { "UE-RadioAccessCapabBandFDDList", "rrc.UE_RadioAccessCapabBandFDDList_item", + { "UE-RadioAccessCapabBandFDD", "rrc.UE_RadioAccessCapabBandFDD", FT_NONE, BASE_NONE, NULL, 0, "rrc.UE_RadioAccessCapabBandFDD", HFILL }}, { &hf_rrc_UE_RadioAccessCapabBandFDDList_ext_item, - { "UE-RadioAccessCapabBandFDDList-ext", "rrc.UE_RadioAccessCapabBandFDDList_ext_item", + { "UE-RadioAccessCapabBandFDD-ext", "rrc.UE_RadioAccessCapabBandFDD_ext", FT_NONE, BASE_NONE, NULL, 0, "rrc.UE_RadioAccessCapabBandFDD_ext", HFILL }}, { &hf_rrc_fddRF_Capability_02, @@ -108948,11 +108948,11 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, VALS(rrc_RadioFrequencyBandTDDList_r7_vals), 0, "rrc.RadioFrequencyBandTDDList_r7", HFILL }}, { &hf_rrc_RF_CapabBandListFDDComp_item, - { "RF-CapabBandListFDDComp", "rrc.RF_CapabBandListFDDComp_item", + { "RF-CapabBandFDDComp", "rrc.RF_CapabBandFDDComp", FT_UINT32, BASE_DEC, VALS(rrc_RF_CapabBandFDDComp_vals), 0, "rrc.RF_CapabBandFDDComp", HFILL }}, { &hf_rrc_RF_CapabBandListFDDComp_ext_item, - { "RF-CapabBandListFDDComp-ext", "rrc.RF_CapabBandListFDDComp_ext_item", + { "RF-CapabBandFDDComp", "rrc.RF_CapabBandFDDComp", FT_UINT32, BASE_DEC, VALS(rrc_RF_CapabBandFDDComp_vals), 0, "rrc.RF_CapabBandFDDComp", HFILL }}, { &hf_rrc_pdcp_Capability_r5_ext, @@ -109188,15 +109188,15 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, VALS(rrc_DL_TransportChannelType_r7_vals), 0, "rrc.DL_TransportChannelType_r7", HFILL }}, { &hf_rrc_DL_LogicalChannelMappingList_item, - { "DL-LogicalChannelMappingList", "rrc.DL_LogicalChannelMappingList_item", + { "DL-LogicalChannelMapping", "rrc.DL_LogicalChannelMapping", FT_NONE, BASE_NONE, NULL, 0, "rrc.DL_LogicalChannelMapping", HFILL }}, { &hf_rrc_DL_LogicalChannelMappingList_r5_item, - { "DL-LogicalChannelMappingList-r5", "rrc.DL_LogicalChannelMappingList_r5_item", + { "DL-LogicalChannelMapping-r5", "rrc.DL_LogicalChannelMapping_r5", FT_NONE, BASE_NONE, NULL, 0, "rrc.DL_LogicalChannelMapping_r5", HFILL }}, { &hf_rrc_DL_LogicalChannelMappingList_r7_item, - { "DL-LogicalChannelMappingList-r7", "rrc.DL_LogicalChannelMappingList_r7_item", + { "DL-LogicalChannelMapping-r7", "rrc.DL_LogicalChannelMapping_r7", FT_NONE, BASE_NONE, NULL, 0, "rrc.DL_LogicalChannelMapping_r7", HFILL }}, { &hf_rrc_dummy_25, @@ -109332,7 +109332,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, VALS(rrc_AlgorithmSpecificInfo_vals), 0, "rrc.AlgorithmSpecificInfo", HFILL }}, { &hf_rrc_HeaderCompressionInfoList_item, - { "HeaderCompressionInfoList", "rrc.HeaderCompressionInfoList_item", + { "HeaderCompressionInfo", "rrc.HeaderCompressionInfo", FT_NONE, BASE_NONE, NULL, 0, "rrc.HeaderCompressionInfo", HFILL }}, { &hf_rrc_algorithmSpecificInfo_01, @@ -109340,7 +109340,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, VALS(rrc_AlgorithmSpecificInfo_r4_vals), 0, "rrc.AlgorithmSpecificInfo_r4", HFILL }}, { &hf_rrc_HeaderCompressionInfoList_r4_item, - { "HeaderCompressionInfoList-r4", "rrc.HeaderCompressionInfoList_r4_item", + { "HeaderCompressionInfo-r4", "rrc.HeaderCompressionInfo_r4", FT_NONE, BASE_NONE, NULL, 0, "rrc.HeaderCompressionInfo_r4", HFILL }}, { &hf_rrc_supported_13, @@ -109440,7 +109440,7 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.PreDefPhyChConfiguration_v770ext", HFILL }}, { &hf_rrc_PredefinedConfigStatusList_item, - { "PredefinedConfigStatusList", "rrc.PredefinedConfigStatusList_item", + { "PredefinedConfigStatusInfo", "rrc.PredefinedConfigStatusInfo", FT_UINT32, BASE_DEC, VALS(rrc_PredefinedConfigStatusInfo_vals), 0, "rrc.PredefinedConfigStatusInfo", HFILL }}, { &hf_rrc_storedWithValueTagSameAsPrevius, @@ -109468,7 +109468,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.PredefinedConfigStatusListVarSz", HFILL }}, { &hf_rrc_PredefinedConfigSetsWithDifferentValueTag_item, - { "PredefinedConfigSetsWithDifferentValueTag", "rrc.PredefinedConfigSetsWithDifferentValueTag_item", + { "PredefinedConfigSetWithDifferentValueTag", "rrc.PredefinedConfigSetWithDifferentValueTag", FT_NONE, BASE_NONE, NULL, 0, "rrc.PredefinedConfigSetWithDifferentValueTag", HFILL }}, { &hf_rrc_startPosition, @@ -109480,11 +109480,11 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.PredefinedConfigValueTagList", HFILL }}, { &hf_rrc_PredefinedConfigValueTagList_item, - { "PredefinedConfigValueTagList", "rrc.PredefinedConfigValueTagList_item", + { "PredefinedConfigValueTag", "rrc.PredefinedConfigValueTag", FT_UINT32, BASE_DEC, NULL, 0, "rrc.PredefinedConfigValueTag", HFILL }}, { &hf_rrc_PredefinedConfigStatusListVarSz_item, - { "PredefinedConfigStatusListVarSz", "rrc.PredefinedConfigStatusListVarSz_item", + { "PredefinedConfigStatusInfo", "rrc.PredefinedConfigStatusInfo", FT_UINT32, BASE_DEC, VALS(rrc_PredefinedConfigStatusInfo_vals), 0, "rrc.PredefinedConfigStatusInfo", HFILL }}, { &hf_rrc_rab_Identity, @@ -109504,15 +109504,15 @@ void proto_register_rrc(void) { FT_BYTES, BASE_HEX, NULL, 0, "rrc.OCTET_STRING_SIZE_3", HFILL }}, { &hf_rrc_RAB_InformationList_item, - { "RAB-InformationList", "rrc.RAB_InformationList_item", + { "RAB-Info", "rrc.RAB_Info", FT_NONE, BASE_NONE, NULL, 0, "rrc.RAB_Info", HFILL }}, { &hf_rrc_RAB_InformationList_r6_item, - { "RAB-InformationList-r6", "rrc.RAB_InformationList_r6_item", + { "RAB-Info-r6", "rrc.RAB_Info_r6", FT_NONE, BASE_NONE, NULL, 0, "rrc.RAB_Info_r6", HFILL }}, { &hf_rrc_RAB_InformationReconfigList_item, - { "RAB-InformationReconfigList", "rrc.RAB_InformationReconfigList_item", + { "RAB-InformationReconfig", "rrc.RAB_InformationReconfig", FT_NONE, BASE_NONE, NULL, 0, "rrc.RAB_InformationReconfig", HFILL }}, { &hf_rrc_rb_Identity, @@ -109520,7 +109520,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.RB_Identity", HFILL }}, { &hf_rrc_RAB_InformationMBMSPtpList_item, - { "RAB-InformationMBMSPtpList", "rrc.RAB_InformationMBMSPtpList_item", + { "RAB-InformationMBMSPtp", "rrc.RAB_InformationMBMSPtp", FT_NONE, BASE_NONE, NULL, 0, "rrc.RAB_InformationMBMSPtp", HFILL }}, { &hf_rrc_rab_Info_02, @@ -109568,39 +109568,39 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.CS_HSPA_Information", HFILL }}, { &hf_rrc_RAB_InformationSetupList_item, - { "RAB-InformationSetupList", "rrc.RAB_InformationSetupList_item", + { "RAB-InformationSetup", "rrc.RAB_InformationSetup", FT_NONE, BASE_NONE, NULL, 0, "rrc.RAB_InformationSetup", HFILL }}, { &hf_rrc_RAB_InformationSetupList_r4_item, - { "RAB-InformationSetupList-r4", "rrc.RAB_InformationSetupList_r4_item", + { "RAB-InformationSetup-r4", "rrc.RAB_InformationSetup_r4", FT_NONE, BASE_NONE, NULL, 0, "rrc.RAB_InformationSetup_r4", HFILL }}, { &hf_rrc_RAB_InformationSetupList_r5_item, - { "RAB-InformationSetupList-r5", "rrc.RAB_InformationSetupList_r5_item", + { "RAB-InformationSetup-r5", "rrc.RAB_InformationSetup_r5", FT_NONE, BASE_NONE, NULL, 0, "rrc.RAB_InformationSetup_r5", HFILL }}, { &hf_rrc_RAB_InformationSetupList_r6_item, - { "RAB-InformationSetupList-r6", "rrc.RAB_InformationSetupList_r6_item", + { "RAB-InformationSetup-r6", "rrc.RAB_InformationSetup_r6", FT_NONE, BASE_NONE, NULL, 0, "rrc.RAB_InformationSetup_r6", HFILL }}, { &hf_rrc_RAB_InformationSetupList_r6_ext_item, - { "RAB-InformationSetupList-r6-ext", "rrc.RAB_InformationSetupList_r6_ext_item", + { "RAB-InformationSetup-r6-ext", "rrc.RAB_InformationSetup_r6_ext", FT_NONE, BASE_NONE, NULL, 0, "rrc.RAB_InformationSetup_r6_ext", HFILL }}, { &hf_rrc_RAB_InformationSetupList_v6b0ext_item, - { "RAB-InformationSetupList-v6b0ext", "rrc.RAB_InformationSetupList_v6b0ext_item", + { "RAB-InformationSetup-v6b0ext", "rrc.RAB_InformationSetup_v6b0ext", FT_NONE, BASE_NONE, NULL, 0, "rrc.RAB_InformationSetup_v6b0ext", HFILL }}, { &hf_rrc_RAB_InformationSetupList_r7_item, - { "RAB-InformationSetupList-r7", "rrc.RAB_InformationSetupList_r7_item", + { "RAB-InformationSetup-r7", "rrc.RAB_InformationSetup_r7", FT_NONE, BASE_NONE, NULL, 0, "rrc.RAB_InformationSetup_r7", HFILL }}, { &hf_rrc_RAB_InformationSetupList_r8_item, - { "RAB-InformationSetupList-r8", "rrc.RAB_InformationSetupList_r8_item", + { "RAB-InformationSetup-r8", "rrc.RAB_InformationSetup_r8", FT_NONE, BASE_NONE, NULL, 0, "rrc.RAB_InformationSetup_r8", HFILL }}, { &hf_rrc_RAB_InformationSetupList_v820ext_item, - { "RAB-InformationSetupList-v820ext", "rrc.RAB_InformationSetupList_v820ext_item", + { "RAB-InformationSetup-v820ext", "rrc.RAB_InformationSetup_v820ext", FT_NONE, BASE_NONE, NULL, 0, "rrc.RAB_InformationSetup_v820ext", HFILL }}, { &hf_rrc_maxCS_Delay, @@ -109612,7 +109612,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.RLC_SequenceNumber", HFILL }}, { &hf_rrc_RB_ActivationTimeInfoList_item, - { "RB-ActivationTimeInfoList", "rrc.RB_ActivationTimeInfoList_item", + { "RB-ActivationTimeInfo", "rrc.RB_ActivationTimeInfo", FT_NONE, BASE_NONE, NULL, 0, "rrc.RB_ActivationTimeInfo", HFILL }}, { &hf_rrc_count_C_UL, @@ -109624,7 +109624,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.COUNT_C", HFILL }}, { &hf_rrc_RB_COUNT_C_InformationList_item, - { "RB-COUNT-C-InformationList", "rrc.RB_COUNT_C_InformationList_item", + { "RB-COUNT-C-Information", "rrc.RB_COUNT_C_Information", FT_NONE, BASE_NONE, NULL, 0, "rrc.RB_COUNT_C_Information", HFILL }}, { &hf_rrc_count_C_MSB_UL, @@ -109636,11 +109636,11 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.COUNT_C_MSB", HFILL }}, { &hf_rrc_RB_COUNT_C_MSB_InformationList_item, - { "RB-COUNT-C-MSB-InformationList", "rrc.RB_COUNT_C_MSB_InformationList_item", + { "RB-COUNT-C-MSB-Information", "rrc.RB_COUNT_C_MSB_Information", FT_NONE, BASE_NONE, NULL, 0, "rrc.RB_COUNT_C_MSB_Information", HFILL }}, { &hf_rrc_RB_IdentityList_item, - { "RB-IdentityList", "rrc.RB_IdentityList_item", + { "RB-Identity", "rrc.RB_Identity", FT_UINT32, BASE_DEC, NULL, 0, "rrc.RB_Identity", HFILL }}, { &hf_rrc_rb_MappingInfo, @@ -109664,23 +109664,23 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.RB_MappingInfo_r8", HFILL }}, { &hf_rrc_RB_InformationAffectedList_item, - { "RB-InformationAffectedList", "rrc.RB_InformationAffectedList_item", + { "RB-InformationAffected", "rrc.RB_InformationAffected", FT_NONE, BASE_NONE, NULL, 0, "rrc.RB_InformationAffected", HFILL }}, { &hf_rrc_RB_InformationAffectedList_r5_item, - { "RB-InformationAffectedList-r5", "rrc.RB_InformationAffectedList_r5_item", + { "RB-InformationAffected-r5", "rrc.RB_InformationAffected_r5", FT_NONE, BASE_NONE, NULL, 0, "rrc.RB_InformationAffected_r5", HFILL }}, { &hf_rrc_RB_InformationAffectedList_r6_item, - { "RB-InformationAffectedList-r6", "rrc.RB_InformationAffectedList_r6_item", + { "RB-InformationAffected-r6", "rrc.RB_InformationAffected_r6", FT_NONE, BASE_NONE, NULL, 0, "rrc.RB_InformationAffected_r6", HFILL }}, { &hf_rrc_RB_InformationAffectedList_r7_item, - { "RB-InformationAffectedList-r7", "rrc.RB_InformationAffectedList_r7_item", + { "RB-InformationAffected-r7", "rrc.RB_InformationAffected_r7", FT_NONE, BASE_NONE, NULL, 0, "rrc.RB_InformationAffected_r7", HFILL }}, { &hf_rrc_RB_InformationAffectedList_r8_item, - { "RB-InformationAffectedList-r8", "rrc.RB_InformationAffectedList_r8_item", + { "RB-InformationAffected-r8", "rrc.RB_InformationAffected_r8", FT_NONE, BASE_NONE, NULL, 0, "rrc.RB_InformationAffected_r8", HFILL }}, { &hf_rrc_rb_Change, @@ -109696,7 +109696,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.RB_Identity", HFILL }}, { &hf_rrc_RB_InformationChangedList_r6_item, - { "RB-InformationChangedList-r6", "rrc.RB_InformationChangedList_r6_item", + { "RB-InformationChanged-r6", "rrc.RB_InformationChanged_r6", FT_NONE, BASE_NONE, NULL, 0, "rrc.RB_InformationChanged_r6", HFILL }}, { &hf_rrc_pdcp_Info_02, @@ -109732,31 +109732,31 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.RLC_Info_r7", HFILL }}, { &hf_rrc_RB_InformationReconfigList_item, - { "RB-InformationReconfigList", "rrc.RB_InformationReconfigList_item", + { "RB-InformationReconfig", "rrc.RB_InformationReconfig", FT_NONE, BASE_NONE, NULL, 0, "rrc.RB_InformationReconfig", HFILL }}, { &hf_rrc_RB_InformationReconfigList_r4_item, - { "RB-InformationReconfigList-r4", "rrc.RB_InformationReconfigList_r4_item", + { "RB-InformationReconfig-r4", "rrc.RB_InformationReconfig_r4", FT_NONE, BASE_NONE, NULL, 0, "rrc.RB_InformationReconfig_r4", HFILL }}, { &hf_rrc_RB_InformationReconfigList_r5_item, - { "RB-InformationReconfigList-r5", "rrc.RB_InformationReconfigList_r5_item", + { "RB-InformationReconfig-r5", "rrc.RB_InformationReconfig_r5", FT_NONE, BASE_NONE, NULL, 0, "rrc.RB_InformationReconfig_r5", HFILL }}, { &hf_rrc_RB_InformationReconfigList_r6_item, - { "RB-InformationReconfigList-r6", "rrc.RB_InformationReconfigList_r6_item", + { "RB-InformationReconfig-r6", "rrc.RB_InformationReconfig_r6", FT_NONE, BASE_NONE, NULL, 0, "rrc.RB_InformationReconfig_r6", HFILL }}, { &hf_rrc_RB_InformationReconfigList_r7_item, - { "RB-InformationReconfigList-r7", "rrc.RB_InformationReconfigList_r7_item", + { "RB-InformationReconfig-r7", "rrc.RB_InformationReconfig_r7", FT_NONE, BASE_NONE, NULL, 0, "rrc.RB_InformationReconfig_r7", HFILL }}, { &hf_rrc_RB_InformationReconfigList_r8_item, - { "RB-InformationReconfigList-r8", "rrc.RB_InformationReconfigList_r8_item", + { "RB-InformationReconfig-r8", "rrc.RB_InformationReconfig_r8", FT_NONE, BASE_NONE, NULL, 0, "rrc.RB_InformationReconfig_r8", HFILL }}, { &hf_rrc_RB_InformationReleaseList_item, - { "RB-InformationReleaseList", "rrc.RB_InformationReleaseList_item", + { "RB-Identity", "rrc.RB_Identity", FT_UINT32, BASE_DEC, NULL, 0, "rrc.RB_Identity", HFILL }}, { &hf_rrc_rlc_InfoChoice, @@ -109776,47 +109776,47 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, VALS(rrc_RLC_InfoChoice_r7_vals), 0, "rrc.RLC_InfoChoice_r7", HFILL }}, { &hf_rrc_RB_InformationSetupList_item, - { "RB-InformationSetupList", "rrc.RB_InformationSetupList_item", + { "RB-InformationSetup", "rrc.RB_InformationSetup", FT_NONE, BASE_NONE, NULL, 0, "rrc.RB_InformationSetup", HFILL }}, { &hf_rrc_RB_InformationSetupList_r4_item, - { "RB-InformationSetupList-r4", "rrc.RB_InformationSetupList_r4_item", + { "RB-InformationSetup-r4", "rrc.RB_InformationSetup_r4", FT_NONE, BASE_NONE, NULL, 0, "rrc.RB_InformationSetup_r4", HFILL }}, { &hf_rrc_RB_InformationSetupList_r5_item, - { "RB-InformationSetupList-r5", "rrc.RB_InformationSetupList_r5_item", + { "RB-InformationSetup-r5", "rrc.RB_InformationSetup_r5", FT_NONE, BASE_NONE, NULL, 0, "rrc.RB_InformationSetup_r5", HFILL }}, { &hf_rrc_RB_InformationSetupList_r6_item, - { "RB-InformationSetupList-r6", "rrc.RB_InformationSetupList_r6_item", + { "RB-InformationSetup-r6", "rrc.RB_InformationSetup_r6", FT_NONE, BASE_NONE, NULL, 0, "rrc.RB_InformationSetup_r6", HFILL }}, { &hf_rrc_RB_InformationSetupList_r7_item, - { "RB-InformationSetupList-r7", "rrc.RB_InformationSetupList_r7_item", + { "RB-InformationSetup-r7", "rrc.RB_InformationSetup_r7", FT_NONE, BASE_NONE, NULL, 0, "rrc.RB_InformationSetup_r7", HFILL }}, { &hf_rrc_RB_InformationSetupList_r8_item, - { "RB-InformationSetupList-r8", "rrc.RB_InformationSetupList_r8_item", + { "RB-InformationSetup-r8", "rrc.RB_InformationSetup_r8", FT_NONE, BASE_NONE, NULL, 0, "rrc.RB_InformationSetup_r8", HFILL }}, { &hf_rrc_RB_MappingInfo_item, - { "RB-MappingInfo", "rrc.RB_MappingInfo_item", + { "RB-MappingOption", "rrc.RB_MappingOption", FT_NONE, BASE_NONE, NULL, 0, "rrc.RB_MappingOption", HFILL }}, { &hf_rrc_RB_MappingInfo_r5_item, - { "RB-MappingInfo-r5", "rrc.RB_MappingInfo_r5_item", + { "RB-MappingOption-r5", "rrc.RB_MappingOption_r5", FT_NONE, BASE_NONE, NULL, 0, "rrc.RB_MappingOption_r5", HFILL }}, { &hf_rrc_RB_MappingInfo_r6_item, - { "RB-MappingInfo-r6", "rrc.RB_MappingInfo_r6_item", + { "RB-MappingOption-r6", "rrc.RB_MappingOption_r6", FT_NONE, BASE_NONE, NULL, 0, "rrc.RB_MappingOption_r6", HFILL }}, { &hf_rrc_RB_MappingInfo_r7_item, - { "RB-MappingInfo-r7", "rrc.RB_MappingInfo_r7_item", + { "RB-MappingOption-r7", "rrc.RB_MappingOption_r7", FT_NONE, BASE_NONE, NULL, 0, "rrc.RB_MappingOption_r7", HFILL }}, { &hf_rrc_RB_MappingInfo_r8_item, - { "RB-MappingInfo-r8", "rrc.RB_MappingInfo_r8_item", + { "RB-MappingOption-r8", "rrc.RB_MappingOption_r8", FT_NONE, BASE_NONE, NULL, 0, "rrc.RB_MappingOption_r8", HFILL }}, { &hf_rrc_ul_LogicalChannelMappings, @@ -109852,11 +109852,11 @@ void proto_register_rrc(void) { FT_BOOLEAN, 8, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_RB_PDCPContextRelocationList_item, - { "RB-PDCPContextRelocationList", "rrc.RB_PDCPContextRelocationList_item", + { "RB-PDCPContextRelocation", "rrc.RB_PDCPContextRelocation", FT_NONE, BASE_NONE, NULL, 0, "rrc.RB_PDCPContextRelocation", HFILL }}, { &hf_rrc_RB_WithPDCP_InfoList_item, - { "RB-WithPDCP-InfoList", "rrc.RB_WithPDCP_InfoList_item", + { "RB-WithPDCP-Info", "rrc.RB_WithPDCP_Info", FT_NONE, BASE_NONE, NULL, 0, "rrc.RB_WithPDCP_Info", HFILL }}, { &hf_rrc_f_MAX_PERIOD, @@ -109956,7 +109956,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.INTEGER_0_1498", HFILL }}, { &hf_rrc_RLC_PDU_SizeList_item, - { "RLC-PDU-SizeList", "rrc.RLC_PDU_SizeList_item", + { "RLC-PDU-Size", "rrc.RLC_PDU_Size", FT_UINT32, BASE_DEC, VALS(rrc_OctetModeRLC_SizeInfoType1_vals), 0, "rrc.RLC_PDU_Size", HFILL }}, { &hf_rrc_rlc_SizeIndex, @@ -109964,51 +109964,51 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.INTEGER_1_maxTF", HFILL }}, { &hf_rrc_RLC_SizeExplicitList_item, - { "RLC-SizeExplicitList", "rrc.RLC_SizeExplicitList_item", + { "RLC-SizeInfo", "rrc.RLC_SizeInfo", FT_NONE, BASE_NONE, NULL, 0, "rrc.RLC_SizeInfo", HFILL }}, { &hf_rrc_ROHC_ProfileList_r4_item, - { "ROHC-ProfileList-r4", "rrc.ROHC_ProfileList_r4_item", + { "ROHC-Profile-r4", "rrc.ROHC_Profile_r4", FT_UINT32, BASE_DEC, NULL, 0, "rrc.ROHC_Profile_r4", HFILL }}, { &hf_rrc_ROHC_PacketSizeList_r4_item, - { "ROHC-PacketSizeList-r4", "rrc.ROHC_PacketSizeList_r4_item", + { "ROHC-PacketSize-r4", "rrc.ROHC_PacketSize_r4", FT_UINT32, BASE_DEC, NULL, 0, "rrc.ROHC_PacketSize_r4", HFILL }}, { &hf_rrc_SRB_InformationSetupList_item, - { "SRB-InformationSetupList", "rrc.SRB_InformationSetupList_item", + { "SRB-InformationSetup", "rrc.SRB_InformationSetup", FT_NONE, BASE_NONE, NULL, 0, "rrc.SRB_InformationSetup", HFILL }}, { &hf_rrc_SRB_InformationSetupList_r5_item, - { "SRB-InformationSetupList-r5", "rrc.SRB_InformationSetupList_r5_item", + { "SRB-InformationSetup-r5", "rrc.SRB_InformationSetup_r5", FT_NONE, BASE_NONE, NULL, 0, "rrc.SRB_InformationSetup_r5", HFILL }}, { &hf_rrc_SRB_InformationSetupList_r6_item, - { "SRB-InformationSetupList-r6", "rrc.SRB_InformationSetupList_r6_item", + { "SRB-InformationSetup-r6", "rrc.SRB_InformationSetup_r6", FT_NONE, BASE_NONE, NULL, 0, "rrc.SRB_InformationSetup_r6", HFILL }}, { &hf_rrc_SRB_InformationSetupList_r7_item, - { "SRB-InformationSetupList-r7", "rrc.SRB_InformationSetupList_r7_item", + { "SRB-InformationSetup-r7", "rrc.SRB_InformationSetup_r7", FT_NONE, BASE_NONE, NULL, 0, "rrc.SRB_InformationSetup_r7", HFILL }}, { &hf_rrc_SRB_InformationSetupList_r8_item, - { "SRB-InformationSetupList-r8", "rrc.SRB_InformationSetupList_r8_item", + { "SRB-InformationSetup-r8", "rrc.SRB_InformationSetup_r8", FT_NONE, BASE_NONE, NULL, 0, "rrc.SRB_InformationSetup_r8", HFILL }}, { &hf_rrc_SRB_InformationSetupList2_item, - { "SRB-InformationSetupList2", "rrc.SRB_InformationSetupList2_item", + { "SRB-InformationSetup", "rrc.SRB_InformationSetup", FT_NONE, BASE_NONE, NULL, 0, "rrc.SRB_InformationSetup", HFILL }}, { &hf_rrc_SRB_InformationSetupList2_r6_item, - { "SRB-InformationSetupList2-r6", "rrc.SRB_InformationSetupList2_r6_item", + { "SRB-InformationSetup-r6", "rrc.SRB_InformationSetup_r6", FT_NONE, BASE_NONE, NULL, 0, "rrc.SRB_InformationSetup_r6", HFILL }}, { &hf_rrc_SRB_InformationSetupList2_r7_item, - { "SRB-InformationSetupList2-r7", "rrc.SRB_InformationSetupList2_r7_item", + { "SRB-InformationSetup-r7", "rrc.SRB_InformationSetup_r7", FT_NONE, BASE_NONE, NULL, 0, "rrc.SRB_InformationSetup_r7", HFILL }}, { &hf_rrc_SRB_InformationSetupList2_r8_item, - { "SRB-InformationSetupList2-r8", "rrc.SRB_InformationSetupList2_r8_item", + { "SRB-InformationSetup-r8", "rrc.SRB_InformationSetup_r8", FT_NONE, BASE_NONE, NULL, 0, "rrc.SRB_InformationSetup_r8", HFILL }}, { &hf_rrc_timerBasedExplicit, @@ -110140,7 +110140,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_maxLoCHperRLC_OF_UL_LogicalChannelMapping", HFILL }}, { &hf_rrc_ul_LogicalChannelMapping_item, - { "ul-LogicalChannelMapping", "rrc.ul_LogicalChannelMapping_item", + { "UL-LogicalChannelMapping", "rrc.UL_LogicalChannelMapping", FT_NONE, BASE_NONE, NULL, 0, "rrc.UL_LogicalChannelMapping", HFILL }}, { &hf_rrc_ul_LogicalChannelMapping_01, @@ -110148,7 +110148,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_maxLoCHperRLC_OF_UL_LogicalChannelMapping_r6", HFILL }}, { &hf_rrc_ul_LogicalChannelMapping_item_01, - { "ul-LogicalChannelMapping", "rrc.ul_LogicalChannelMapping_item", + { "UL-LogicalChannelMapping-r6", "rrc.UL_LogicalChannelMapping_r6", FT_NONE, BASE_NONE, NULL, 0, "rrc.UL_LogicalChannelMapping_r6", HFILL }}, { &hf_rrc_ul_LogicalChannelMapping_02, @@ -110156,7 +110156,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_maxLoCHperRLC_OF_UL_LogicalChannelMapping_r8", HFILL }}, { &hf_rrc_ul_LogicalChannelMapping_item_02, - { "ul-LogicalChannelMapping", "rrc.ul_LogicalChannelMapping_item", + { "UL-LogicalChannelMapping-r8", "rrc.UL_LogicalChannelMapping_r8", FT_NONE, BASE_NONE, NULL, 0, "rrc.UL_LogicalChannelMapping_r8", HFILL }}, { &hf_rrc_oneLogicalChannel, @@ -110244,11 +110244,11 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.MAC_ehs_DelReordQ_List", HFILL }}, { &hf_rrc_AllowedTFC_List_item, - { "AllowedTFC-List", "rrc.AllowedTFC_List_item", + { "TFC-Value", "rrc.TFC_Value", FT_UINT32, BASE_DEC, NULL, 0, "rrc.TFC_Value", HFILL }}, { &hf_rrc_AllowedTFI_List_item, - { "AllowedTFI-List", "rrc.AllowedTFI_List_item", + { "AllowedTFI-List item", "rrc.AllowedTFI_List_item", FT_UINT32, BASE_DEC, NULL, 0, "rrc.INTEGER_0_31", HFILL }}, { &hf_rrc_sizeType1, @@ -110336,7 +110336,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_maxTF_OF_NumberOfTransportBlocks", HFILL }}, { &hf_rrc_numberOfTbSizeList_item, - { "numberOfTbSizeList", "rrc.numberOfTbSizeList_item", + { "NumberOfTransportBlocks", "rrc.NumberOfTransportBlocks", FT_UINT32, BASE_DEC, VALS(rrc_NumberOfTransportBlocks_vals), 0, "rrc.NumberOfTransportBlocks", HFILL }}, { &hf_rrc_logicalChannelList, @@ -110352,11 +110352,11 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.NumberOfTbSizeAndTTIList", HFILL }}, { &hf_rrc_CommonDynamicTF_InfoList_item, - { "CommonDynamicTF-InfoList", "rrc.CommonDynamicTF_InfoList_item", + { "CommonDynamicTF-Info", "rrc.CommonDynamicTF_Info", FT_NONE, BASE_NONE, NULL, 0, "rrc.CommonDynamicTF_Info", HFILL }}, { &hf_rrc_CommonDynamicTF_InfoList_DynamicTTI_item, - { "CommonDynamicTF-InfoList-DynamicTTI", "rrc.CommonDynamicTF_InfoList_DynamicTTI_item", + { "CommonDynamicTF-Info-DynamicTTI", "rrc.CommonDynamicTF_Info_DynamicTTI", FT_NONE, BASE_NONE, NULL, 0, "rrc.CommonDynamicTF_Info_DynamicTTI", HFILL }}, { &hf_rrc_tti, @@ -110408,7 +110408,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, VALS(rrc_MAC_hs_WindowSize_vals), 0, "rrc.MAC_hs_WindowSize", HFILL }}, { &hf_rrc_Common_MAC_ehs_ReorderingQueueList_item, - { "Common-MAC-ehs-ReorderingQueueList", "rrc.Common_MAC_ehs_ReorderingQueueList_item", + { "Common-MAC-ehs-ReorderingQueue", "rrc.Common_MAC_ehs_ReorderingQueue", FT_NONE, BASE_NONE, NULL, 0, "rrc.Common_MAC_ehs_ReorderingQueue", HFILL }}, { &hf_rrc_rlc_Size_01, @@ -110428,11 +110428,11 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, VALS(rrc_T_rlc_Size_02_vals), 0, "rrc.T_rlc_Size_02", HFILL }}, { &hf_rrc_DedicatedDynamicTF_InfoList_item, - { "DedicatedDynamicTF-InfoList", "rrc.DedicatedDynamicTF_InfoList_item", + { "DedicatedDynamicTF-Info", "rrc.DedicatedDynamicTF_Info", FT_NONE, BASE_NONE, NULL, 0, "rrc.DedicatedDynamicTF_Info", HFILL }}, { &hf_rrc_DedicatedDynamicTF_InfoList_DynamicTTI_item, - { "DedicatedDynamicTF-InfoList-DynamicTTI", "rrc.DedicatedDynamicTF_InfoList_DynamicTTI_item", + { "DedicatedDynamicTF-Info-DynamicTTI", "rrc.DedicatedDynamicTF_Info_DynamicTTI", FT_NONE, BASE_NONE, NULL, 0, "rrc.DedicatedDynamicTF_Info_DynamicTTI", HFILL }}, { &hf_rrc_tti_02, @@ -110460,23 +110460,23 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.DedicatedDynamicTF_InfoList_DynamicTTI", HFILL }}, { &hf_rrc_DL_AddReconfTransChInfo2List_item, - { "DL-AddReconfTransChInfo2List", "rrc.DL_AddReconfTransChInfo2List_item", + { "DL-AddReconfTransChInformation2", "rrc.DL_AddReconfTransChInformation2", FT_NONE, BASE_NONE, NULL, 0, "rrc.DL_AddReconfTransChInformation2", HFILL }}, { &hf_rrc_DL_AddReconfTransChInfoList_item, - { "DL-AddReconfTransChInfoList", "rrc.DL_AddReconfTransChInfoList_item", + { "DL-AddReconfTransChInformation", "rrc.DL_AddReconfTransChInformation", FT_NONE, BASE_NONE, NULL, 0, "rrc.DL_AddReconfTransChInformation", HFILL }}, { &hf_rrc_DL_AddReconfTransChInfoList_r4_item, - { "DL-AddReconfTransChInfoList-r4", "rrc.DL_AddReconfTransChInfoList_r4_item", + { "DL-AddReconfTransChInformation-r4", "rrc.DL_AddReconfTransChInformation_r4", FT_NONE, BASE_NONE, NULL, 0, "rrc.DL_AddReconfTransChInformation_r4", HFILL }}, { &hf_rrc_DL_AddReconfTransChInfoList_r5_item, - { "DL-AddReconfTransChInfoList-r5", "rrc.DL_AddReconfTransChInfoList_r5_item", + { "DL-AddReconfTransChInformation-r5", "rrc.DL_AddReconfTransChInformation_r5", FT_NONE, BASE_NONE, NULL, 0, "rrc.DL_AddReconfTransChInformation_r5", HFILL }}, { &hf_rrc_DL_AddReconfTransChInfoList_r7_item, - { "DL-AddReconfTransChInfoList-r7", "rrc.DL_AddReconfTransChInfoList_r7_item", + { "DL-AddReconfTransChInformation-r7", "rrc.DL_AddReconfTransChInformation_r7", FT_NONE, BASE_NONE, NULL, 0, "rrc.DL_AddReconfTransChInformation_r7", HFILL }}, { &hf_rrc_dl_TransportChannelType_03, @@ -110600,15 +110600,15 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.T_tdd_11", HFILL }}, { &hf_rrc_DL_DeletedTransChInfoList_item, - { "DL-DeletedTransChInfoList", "rrc.DL_DeletedTransChInfoList_item", + { "DL-TransportChannelIdentity", "rrc.DL_TransportChannelIdentity", FT_NONE, BASE_NONE, NULL, 0, "rrc.DL_TransportChannelIdentity", HFILL }}, { &hf_rrc_DL_DeletedTransChInfoList_r5_item, - { "DL-DeletedTransChInfoList-r5", "rrc.DL_DeletedTransChInfoList_r5_item", + { "DL-TransportChannelIdentity-r5", "rrc.DL_TransportChannelIdentity_r5", FT_NONE, BASE_NONE, NULL, 0, "rrc.DL_TransportChannelIdentity_r5", HFILL }}, { &hf_rrc_DL_DeletedTransChInfoList_r7_item, - { "DL-DeletedTransChInfoList-r7", "rrc.DL_DeletedTransChInfoList_r7_item", + { "DL-TransportChannelIdentity-r7", "rrc.DL_TransportChannelIdentity_r7", FT_NONE, BASE_NONE, NULL, 0, "rrc.DL_TransportChannelIdentity_r7", HFILL }}, { &hf_rrc_dl_TransportChannelIdentity, @@ -110644,7 +110644,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.DRAC_ClassIdentity", HFILL }}, { &hf_rrc_DRAC_StaticInformationList_item, - { "DRAC-StaticInformationList", "rrc.DRAC_StaticInformationList_item", + { "DRAC-StaticInformation", "rrc.DRAC_StaticInformation", FT_NONE, BASE_NONE, NULL, 0, "rrc.DRAC_StaticInformation", HFILL }}, { &hf_rrc_mac_d_FlowIdentity, @@ -110780,11 +110780,11 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.INTEGER_0_19", HFILL }}, { &hf_rrc_E_DCH_AddReconf_MAC_d_FlowList_item, - { "E-DCH-AddReconf-MAC-d-FlowList", "rrc.E_DCH_AddReconf_MAC_d_FlowList_item", + { "E-DCH-AddReconf-MAC-d-Flow", "rrc.E_DCH_AddReconf_MAC_d_Flow", FT_NONE, BASE_NONE, NULL, 0, "rrc.E_DCH_AddReconf_MAC_d_Flow", HFILL }}, { &hf_rrc_E_DCH_AddReconf_MAC_d_FlowList_r7_item, - { "E-DCH-AddReconf-MAC-d-FlowList-r7", "rrc.E_DCH_AddReconf_MAC_d_FlowList_r7_item", + { "E-DCH-AddReconf-MAC-d-Flow-r7", "rrc.E_DCH_AddReconf_MAC_d_Flow_r7", FT_NONE, BASE_NONE, NULL, 0, "rrc.E_DCH_AddReconf_MAC_d_Flow_r7", HFILL }}, { &hf_rrc_complete_18, @@ -110852,7 +110852,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_maxHProcesses_OF_HARQMemorySize", HFILL }}, { &hf_rrc_explicit_item, - { "explicit", "rrc.explicit_item", + { "HARQMemorySize", "rrc.HARQMemorySize", FT_UINT32, BASE_DEC, VALS(rrc_HARQMemorySize_vals), 0, "rrc.HARQMemorySize", HFILL }}, { &hf_rrc_numberOfProcesses_01, @@ -110872,7 +110872,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_maxHProcesses_OF_HARQMemorySize", HFILL }}, { &hf_rrc_memorySize_item, - { "memorySize", "rrc.memorySize_item", + { "HARQMemorySize", "rrc.HARQMemorySize", FT_UINT32, BASE_DEC, VALS(rrc_HARQMemorySize_vals), 0, "rrc.HARQMemorySize", HFILL }}, { &hf_rrc_additionalMemorySizesForMIMO, @@ -110880,7 +110880,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_maxHProcesses_OF_HARQMemorySize", HFILL }}, { &hf_rrc_additionalMemorySizesForMIMO_item, - { "additionalMemorySizesForMIMO", "rrc.additionalMemorySizesForMIMO_item", + { "HARQMemorySize", "rrc.HARQMemorySize", FT_UINT32, BASE_DEC, VALS(rrc_HARQMemorySize_vals), 0, "rrc.HARQMemorySize", HFILL }}, { &hf_rrc_dl_TFCS_Identity, @@ -110900,7 +110900,7 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.TFCS_Identity", HFILL }}, { &hf_rrc_IndividualDL_CCTrCH_InfoList_item, - { "IndividualDL-CCTrCH-InfoList", "rrc.IndividualDL_CCTrCH_InfoList_item", + { "IndividualDL-CCTrCH-Info", "rrc.IndividualDL_CCTrCH_Info", FT_NONE, BASE_NONE, NULL, 0, "rrc.IndividualDL_CCTrCH_Info", HFILL }}, { &hf_rrc_ul_TFCS_Identity, @@ -110916,7 +110916,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, VALS(rrc_TFC_Subset_vals), 0, "rrc.TFC_Subset", HFILL }}, { &hf_rrc_IndividualUL_CCTrCH_InfoList_item, - { "IndividualUL-CCTrCH-InfoList", "rrc.IndividualUL_CCTrCH_InfoList_item", + { "IndividualUL-CCTrCH-Info", "rrc.IndividualUL_CCTrCH_Info", FT_NONE, BASE_NONE, NULL, 0, "rrc.IndividualUL_CCTrCH_Info", HFILL }}, { &hf_rrc_logChOfRb, @@ -110928,7 +110928,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_15_OF_LogicalChannelByRB", HFILL }}, { &hf_rrc_explicitList_item, - { "explicitList", "rrc.explicitList_item", + { "LogicalChannelByRB", "rrc.LogicalChannelByRB", FT_NONE, BASE_NONE, NULL, 0, "rrc.LogicalChannelByRB", HFILL }}, { &hf_rrc_dch_transport_ch_id, @@ -110940,7 +110940,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.MAC_d_FlowIdentity", HFILL }}, { &hf_rrc_MAC_d_PDU_SizeInfo_List_item, - { "MAC-d-PDU-SizeInfo-List", "rrc.MAC_d_PDU_SizeInfo_List_item", + { "MAC-d-PDUsizeInfo", "rrc.MAC_d_PDUsizeInfo", FT_NONE, BASE_NONE, NULL, 0, "rrc.MAC_d_PDUsizeInfo", HFILL }}, { &hf_rrc_mac_d_PDU_Size, @@ -110952,7 +110952,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.INTEGER_0_7", HFILL }}, { &hf_rrc_MAC_hs_AddReconfQueue_List_item, - { "MAC-hs-AddReconfQueue-List", "rrc.MAC_hs_AddReconfQueue_List_item", + { "MAC-hs-AddReconfQueue", "rrc.MAC_hs_AddReconfQueue", FT_NONE, BASE_NONE, NULL, 0, "rrc.MAC_hs_AddReconfQueue", HFILL }}, { &hf_rrc_mac_hsQueueId, @@ -110976,15 +110976,15 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.MAC_d_PDU_SizeInfo_List", HFILL }}, { &hf_rrc_MAC_hs_DelQueue_List_item, - { "MAC-hs-DelQueue-List", "rrc.MAC_hs_DelQueue_List_item", + { "MAC-hs-DelQueue", "rrc.MAC_hs_DelQueue", FT_NONE, BASE_NONE, NULL, 0, "rrc.MAC_hs_DelQueue", HFILL }}, { &hf_rrc_MAC_ehs_AddReconfReordQ_List_item, - { "MAC-ehs-AddReconfReordQ-List", "rrc.MAC_ehs_AddReconfReordQ_List_item", + { "MAC-ehs-AddReconfReordQ", "rrc.MAC_ehs_AddReconfReordQ", FT_NONE, BASE_NONE, NULL, 0, "rrc.MAC_ehs_AddReconfReordQ", HFILL }}, { &hf_rrc_MAC_ehs_DelReordQ_List_item, - { "MAC-ehs-DelReordQ-List", "rrc.MAC_ehs_DelReordQ_List_item", + { "MAC-ehs-DelReordQ", "rrc.MAC_ehs_DelReordQ", FT_NONE, BASE_NONE, NULL, 0, "rrc.MAC_ehs_DelReordQ", HFILL }}, { &hf_rrc_hsdsch_mac_ehs_QueueId, @@ -110992,7 +110992,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.MAC_ehs_QueueId", HFILL }}, { &hf_rrc_NumberOfTbSizeAndTTIList_item, - { "NumberOfTbSizeAndTTIList", "rrc.NumberOfTbSizeAndTTIList_item", + { "NumberOfTbSizeAndTTIList item", "rrc.NumberOfTbSizeAndTTIList_item", FT_NONE, BASE_NONE, NULL, 0, "rrc.NumberOfTbSizeAndTTIList_item", HFILL }}, { &hf_rrc_numberOfTransportBlocks, @@ -111004,7 +111004,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, VALS(rrc_TransmissionTimeInterval_vals), 0, "rrc.TransmissionTimeInterval", HFILL }}, { &hf_rrc_Non_allowedTFC_List_item, - { "Non-allowedTFC-List", "rrc.Non_allowedTFC_List_item", + { "TFC-Value", "rrc.TFC_Value", FT_UINT32, BASE_DEC, NULL, 0, "rrc.TFC_Value", HFILL }}, { &hf_rrc_zero, @@ -111108,7 +111108,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.AllowedTFI_List", HFILL }}, { &hf_rrc_RestrictedTrChInfoList_item, - { "RestrictedTrChInfoList", "rrc.RestrictedTrChInfoList_item", + { "RestrictedTrChInfo", "rrc.RestrictedTrChInfo", FT_NONE, BASE_NONE, NULL, 0, "rrc.RestrictedTrChInfo", HFILL }}, { &hf_rrc_channelCodingType, @@ -111172,7 +111172,7 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.NULL", HFILL }}, { &hf_rrc_TFC_SubsetList_item, - { "TFC-SubsetList", "rrc.TFC_SubsetList_item", + { "TFC-SubsetList item", "rrc.TFC_SubsetList_item", FT_NONE, BASE_NONE, NULL, 0, "rrc.TFC_SubsetList_item", HFILL }}, { &hf_rrc_modeSpecificInfo_20, @@ -111200,7 +111200,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, VALS(rrc_TFCS_InfoForDSCH_vals), 0, "rrc.TFCS_InfoForDSCH", HFILL }}, { &hf_rrc_TFCI_RangeList_item, - { "TFCI-RangeList", "rrc.TFCI_RangeList_item", + { "TFCI-Range", "rrc.TFCI_Range", FT_NONE, BASE_NONE, NULL, 0, "rrc.TFCI_Range", HFILL }}, { &hf_rrc_normalTFCI_Signalling, @@ -111256,7 +111256,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.T_ctfc2Bit", HFILL }}, { &hf_rrc_ctfc2Bit_item, - { "ctfc2Bit", "rrc.ctfc2Bit_item", + { "ctfc2Bit item", "rrc.ctfc2Bit_item", FT_NONE, BASE_NONE, NULL, 0, "rrc.T_ctfc2Bit_item", HFILL }}, { &hf_rrc_ctfc2, @@ -111272,7 +111272,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.T_ctfc4Bit", HFILL }}, { &hf_rrc_ctfc4Bit_item, - { "ctfc4Bit", "rrc.ctfc4Bit_item", + { "ctfc4Bit item", "rrc.ctfc4Bit_item", FT_NONE, BASE_NONE, NULL, 0, "rrc.T_ctfc4Bit_item", HFILL }}, { &hf_rrc_ctfc4, @@ -111284,7 +111284,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.T_ctfc6Bit", HFILL }}, { &hf_rrc_ctfc6Bit_item, - { "ctfc6Bit", "rrc.ctfc6Bit_item", + { "ctfc6Bit item", "rrc.ctfc6Bit_item", FT_NONE, BASE_NONE, NULL, 0, "rrc.T_ctfc6Bit_item", HFILL }}, { &hf_rrc_ctfc6, @@ -111296,7 +111296,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.T_ctfc8Bit", HFILL }}, { &hf_rrc_ctfc8Bit_item, - { "ctfc8Bit", "rrc.ctfc8Bit_item", + { "ctfc8Bit item", "rrc.ctfc8Bit_item", FT_NONE, BASE_NONE, NULL, 0, "rrc.T_ctfc8Bit_item", HFILL }}, { &hf_rrc_ctfc8, @@ -111308,7 +111308,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.T_ctfc12Bit", HFILL }}, { &hf_rrc_ctfc12Bit_item, - { "ctfc12Bit", "rrc.ctfc12Bit_item", + { "ctfc12Bit item", "rrc.ctfc12Bit_item", FT_NONE, BASE_NONE, NULL, 0, "rrc.T_ctfc12Bit_item", HFILL }}, { &hf_rrc_ctfc12, @@ -111320,7 +111320,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.T_ctfc16Bit", HFILL }}, { &hf_rrc_ctfc16Bit_item, - { "ctfc16Bit", "rrc.ctfc16Bit_item", + { "ctfc16Bit item", "rrc.ctfc16Bit_item", FT_NONE, BASE_NONE, NULL, 0, "rrc.T_ctfc16Bit_item", HFILL }}, { &hf_rrc_ctfc16, @@ -111332,7 +111332,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.T_ctfc24Bit", HFILL }}, { &hf_rrc_ctfc24Bit_item, - { "ctfc24Bit", "rrc.ctfc24Bit_item", + { "ctfc24Bit item", "rrc.ctfc24Bit_item", FT_NONE, BASE_NONE, NULL, 0, "rrc.T_ctfc24Bit_item", HFILL }}, { &hf_rrc_ctfc24, @@ -111344,7 +111344,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.INTEGER_0_1023", HFILL }}, { &hf_rrc_TFCS_RemovalList_item, - { "TFCS-RemovalList", "rrc.TFCS_RemovalList_item", + { "TFCS-Removal", "rrc.TFCS_Removal", FT_NONE, BASE_NONE, NULL, 0, "rrc.TFCS_Removal", HFILL }}, { &hf_rrc_messType, @@ -111384,19 +111384,19 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.CommonTransChTFS_LCR", HFILL }}, { &hf_rrc_UL_AddReconfTransChInfoList_item, - { "UL-AddReconfTransChInfoList", "rrc.UL_AddReconfTransChInfoList_item", + { "UL-AddReconfTransChInformation", "rrc.UL_AddReconfTransChInformation", FT_NONE, BASE_NONE, NULL, 0, "rrc.UL_AddReconfTransChInformation", HFILL }}, { &hf_rrc_UL_AddReconfTransChInfoList_r6_item, - { "UL-AddReconfTransChInfoList-r6", "rrc.UL_AddReconfTransChInfoList_r6_item", + { "UL-AddReconfTransChInformation-r6", "rrc.UL_AddReconfTransChInformation_r6", FT_UINT32, BASE_DEC, VALS(rrc_UL_AddReconfTransChInformation_r6_vals), 0, "rrc.UL_AddReconfTransChInformation_r6", HFILL }}, { &hf_rrc_UL_AddReconfTransChInfoList_r7_item, - { "UL-AddReconfTransChInfoList-r7", "rrc.UL_AddReconfTransChInfoList_r7_item", + { "UL-AddReconfTransChInformation-r7", "rrc.UL_AddReconfTransChInformation_r7", FT_UINT32, BASE_DEC, VALS(rrc_UL_AddReconfTransChInformation_r7_vals), 0, "rrc.UL_AddReconfTransChInformation_r7", HFILL }}, { &hf_rrc_UL_AddReconfTransChInfoList_r8_item, - { "UL-AddReconfTransChInfoList-r8", "rrc.UL_AddReconfTransChInfoList_r8_item", + { "UL-AddReconfTransChInformation-r8", "rrc.UL_AddReconfTransChInformation_r8", FT_UINT32, BASE_DEC, VALS(rrc_UL_AddReconfTransChInformation_r8_vals), 0, "rrc.UL_AddReconfTransChInformation_r8", HFILL }}, { &hf_rrc_transportFormatSet, @@ -111508,15 +111508,15 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.TFC_SubsetList", HFILL }}, { &hf_rrc_UL_ControlledTrChList_item, - { "UL-ControlledTrChList", "rrc.UL_ControlledTrChList_item", + { "TransportChannelIdentity", "rrc.TransportChannelIdentity", FT_UINT32, BASE_DEC, NULL, 0, "rrc.TransportChannelIdentity", HFILL }}, { &hf_rrc_UL_DeletedTransChInfoList_item, - { "UL-DeletedTransChInfoList", "rrc.UL_DeletedTransChInfoList_item", + { "UL-TransportChannelIdentity", "rrc.UL_TransportChannelIdentity", FT_NONE, BASE_NONE, NULL, 0, "rrc.UL_TransportChannelIdentity", HFILL }}, { &hf_rrc_UL_DeletedTransChInfoList_r6_item, - { "UL-DeletedTransChInfoList-r6", "rrc.UL_DeletedTransChInfoList_r6_item", + { "UL-TransportChannelIdentity-r6", "rrc.UL_TransportChannelIdentity_r6", FT_UINT32, BASE_DEC, VALS(rrc_UL_TransportChannelIdentity_r6_vals), 0, "rrc.UL_TransportChannelIdentity_r6", HFILL }}, { &hf_rrc_ul_TransportChannelIdentity, @@ -111532,7 +111532,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.E_DCH_MAC_d_FlowIdentity", HFILL }}, { &hf_rrc_USCH_TransportChannelsInfo_item, - { "USCH-TransportChannelsInfo", "rrc.USCH_TransportChannelsInfo_item", + { "USCH-TransportChannelsInfo item", "rrc.USCH_TransportChannelsInfo_item", FT_NONE, BASE_NONE, NULL, 0, "rrc.USCH_TransportChannelsInfo_item", HFILL }}, { &hf_rrc_usch_TransportChannelIdentity, @@ -111544,7 +111544,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, VALS(rrc_TransportFormatSet_vals), 0, "rrc.TransportFormatSet", HFILL }}, { &hf_rrc_AC_To_ASC_MappingTable_item, - { "AC-To-ASC-MappingTable", "rrc.AC_To_ASC_MappingTable_item", + { "AC-To-ASC-Mapping", "rrc.AC_To_ASC_Mapping", FT_UINT32, BASE_DEC, NULL, 0, "rrc.AC_To_ASC_Mapping", HFILL }}, { &hf_rrc_availableSignatureStartIndex, @@ -111676,7 +111676,7 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.AdditionalPRACH_TF_and_TFCS_CCCH_IEs", HFILL }}, { &hf_rrc_AdditionalPRACH_TF_and_TFCS_CCCH_List_item, - { "AdditionalPRACH-TF-and-TFCS-CCCH-List", "rrc.AdditionalPRACH_TF_and_TFCS_CCCH_List_item", + { "AdditionalPRACH-TF-and-TFCS-CCCH", "rrc.AdditionalPRACH_TF_and_TFCS_CCCH", FT_NONE, BASE_NONE, NULL, 0, "rrc.AdditionalPRACH_TF_and_TFCS_CCCH", HFILL }}, { &hf_rrc_channelisationCode256, @@ -111724,19 +111724,19 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.AccessServiceClass_TDD_LCR_r4", HFILL }}, { &hf_rrc_AvailableAP_Signature_VCAMList_item, - { "AvailableAP-Signature-VCAMList", "rrc.AvailableAP_Signature_VCAMList_item", + { "AP-Signature-VCAM", "rrc.AP_Signature_VCAM", FT_NONE, BASE_NONE, NULL, 0, "rrc.AP_Signature_VCAM", HFILL }}, { &hf_rrc_AvailableAP_SignatureList_item, - { "AvailableAP-SignatureList", "rrc.AvailableAP_SignatureList_item", + { "AP-Signature", "rrc.AP_Signature", FT_UINT32, BASE_DEC, NULL, 0, "rrc.AP_Signature", HFILL }}, { &hf_rrc_AvailableAP_SubchannelList_item, - { "AvailableAP-SubchannelList", "rrc.AvailableAP_SubchannelList_item", + { "AP-Subchannel", "rrc.AP_Subchannel", FT_UINT32, BASE_DEC, NULL, 0, "rrc.AP_Subchannel", HFILL }}, { &hf_rrc_AvailableMinimumSF_ListVCAM_item, - { "AvailableMinimumSF-ListVCAM", "rrc.AvailableMinimumSF_ListVCAM_item", + { "AvailableMinimumSF-VCAM", "rrc.AvailableMinimumSF_VCAM", FT_NONE, BASE_NONE, NULL, 0, "rrc.AvailableMinimumSF_VCAM", HFILL }}, { &hf_rrc_minimumSpreadingFactor, @@ -111776,11 +111776,11 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, VALS(rrc_UL_DPCH_PowerControlInfo_r7_vals), 0, "rrc.UL_DPCH_PowerControlInfo_r7", HFILL }}, { &hf_rrc_CD_AccessSlotSubchannelList_item, - { "CD-AccessSlotSubchannelList", "rrc.CD_AccessSlotSubchannelList_item", + { "CD-AccessSlotSubchannel", "rrc.CD_AccessSlotSubchannel", FT_UINT32, BASE_DEC, NULL, 0, "rrc.CD_AccessSlotSubchannel", HFILL }}, { &hf_rrc_CD_SignatureCodeList_item, - { "CD-SignatureCodeList", "rrc.CD_SignatureCodeList_item", + { "CD-SignatureCode", "rrc.CD_SignatureCode", FT_UINT32, BASE_DEC, NULL, 0, "rrc.CD_SignatureCode", HFILL }}, { &hf_rrc_burstType, @@ -111840,7 +111840,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.DynamicPersistenceLevelTF_List", HFILL }}, { &hf_rrc_CPCH_PersistenceLevelsList_item, - { "CPCH-PersistenceLevelsList", "rrc.CPCH_PersistenceLevelsList_item", + { "CPCH-PersistenceLevels", "rrc.CPCH_PersistenceLevels", FT_NONE, BASE_NONE, NULL, 0, "rrc.CPCH_PersistenceLevels", HFILL }}, { &hf_rrc_ap_PreambleScramblingCode, @@ -111896,7 +111896,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.PCPCH_ChannelInfoList", HFILL }}, { &hf_rrc_CPCH_SetInfoList_item, - { "CPCH-SetInfoList", "rrc.CPCH_SetInfoList_item", + { "CPCH-SetInfo", "rrc.CPCH_SetInfo", FT_NONE, BASE_NONE, NULL, 0, "rrc.CPCH_SetInfo", HFILL }}, { &hf_rrc_timeInfo, @@ -111956,19 +111956,19 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.T_tdd128_10", HFILL }}, { &hf_rrc_DL_CCTrChList_item, - { "DL-CCTrChList", "rrc.DL_CCTrChList_item", + { "DL-CCTrCh", "rrc.DL_CCTrCh", FT_NONE, BASE_NONE, NULL, 0, "rrc.DL_CCTrCh", HFILL }}, { &hf_rrc_DL_CCTrChList_r7_item, - { "DL-CCTrChList-r7", "rrc.DL_CCTrChList_r7_item", + { "DL-CCTrCh-r7", "rrc.DL_CCTrCh_r7", FT_NONE, BASE_NONE, NULL, 0, "rrc.DL_CCTrCh_r7", HFILL }}, { &hf_rrc_DL_CCTrChList_r4_item, - { "DL-CCTrChList-r4", "rrc.DL_CCTrChList_r4_item", + { "DL-CCTrCh-r4", "rrc.DL_CCTrCh_r4", FT_NONE, BASE_NONE, NULL, 0, "rrc.DL_CCTrCh_r4", HFILL }}, { &hf_rrc_DL_CCTrChListToRemove_item, - { "DL-CCTrChListToRemove", "rrc.DL_CCTrChListToRemove_item", + { "TFCS-IdentityPlain", "rrc.TFCS_IdentityPlain", FT_UINT32, BASE_DEC, NULL, 0, "rrc.TFCS_IdentityPlain", HFILL }}, { &hf_rrc_secondaryScramblingCode, @@ -111984,7 +111984,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, VALS(rrc_ScramblingCodeChange_vals), 0, "rrc.ScramblingCodeChange", HFILL }}, { &hf_rrc_DL_ChannelisationCodeList_item, - { "DL-ChannelisationCodeList", "rrc.DL_ChannelisationCodeList_item", + { "DL-ChannelisationCode", "rrc.DL_ChannelisationCode", FT_NONE, BASE_NONE, NULL, 0, "rrc.DL_ChannelisationCode", HFILL }}, { &hf_rrc_dl_DPCH_InfoCommon, @@ -112520,7 +112520,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, VALS(rrc_T_dl_64QAM_Configured_vals), 0, "rrc.T_dl_64QAM_Configured", HFILL }}, { &hf_rrc_DL_HSPDSCH_MultiCarrier_Information_item, - { "DL-HSPDSCH-MultiCarrier-Information", "rrc.DL_HSPDSCH_MultiCarrier_Information_item", + { "DL-HSPDSCH-MultiCarrier-Information item", "rrc.DL_HSPDSCH_MultiCarrier_Information_item", FT_NONE, BASE_NONE, NULL, 0, "rrc.DL_HSPDSCH_MultiCarrier_Information_item", HFILL }}, { &hf_rrc_uarfcn_Carrier, @@ -112536,11 +112536,11 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_maxHSSCCHs_OF_HS_SCCH_TDD128_MultiCarrier", HFILL }}, { &hf_rrc_hs_SCCH_TDD128_MultiCarrier_item, - { "hs-SCCH-TDD128-MultiCarrier", "rrc.hs_SCCH_TDD128_MultiCarrier_item", + { "HS-SCCH-TDD128-MultiCarrier", "rrc.HS_SCCH_TDD128_MultiCarrier", FT_NONE, BASE_NONE, NULL, 0, "rrc.HS_SCCH_TDD128_MultiCarrier", HFILL }}, { &hf_rrc_DL_HSPDSCH_TS_Configuration_item, - { "DL-HSPDSCH-TS-Configuration", "rrc.DL_HSPDSCH_TS_Configuration_item", + { "DL-HSPDSCH-TS-Configuration item", "rrc.DL_HSPDSCH_TS_Configuration_item", FT_NONE, BASE_NONE, NULL, 0, "rrc.DL_HSPDSCH_TS_Configuration_item", HFILL }}, { &hf_rrc_midambleShiftAndBurstType, @@ -112548,7 +112548,7 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.MidambleShiftAndBurstType_DL", HFILL }}, { &hf_rrc_DL_HSPDSCH_TS_Configuration_VHCR_item, - { "DL-HSPDSCH-TS-Configuration-VHCR", "rrc.DL_HSPDSCH_TS_Configuration_VHCR_item", + { "DL-HSPDSCH-TS-Configuration-VHCR item", "rrc.DL_HSPDSCH_TS_Configuration_VHCR_item", FT_NONE, BASE_NONE, NULL, 0, "rrc.DL_HSPDSCH_TS_Configuration_VHCR_item", HFILL }}, { &hf_rrc_midambleShiftAndBurstType_01, @@ -112740,35 +112740,35 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.E_HICH_Information_TDD128", HFILL }}, { &hf_rrc_DL_InformationPerRL_List_item, - { "DL-InformationPerRL-List", "rrc.DL_InformationPerRL_List_item", + { "DL-InformationPerRL", "rrc.DL_InformationPerRL", FT_NONE, BASE_NONE, NULL, 0, "rrc.DL_InformationPerRL", HFILL }}, { &hf_rrc_DL_InformationPerRL_List_r4_item, - { "DL-InformationPerRL-List-r4", "rrc.DL_InformationPerRL_List_r4_item", + { "DL-InformationPerRL-r4", "rrc.DL_InformationPerRL_r4", FT_NONE, BASE_NONE, NULL, 0, "rrc.DL_InformationPerRL_r4", HFILL }}, { &hf_rrc_DL_InformationPerRL_List_r5_item, - { "DL-InformationPerRL-List-r5", "rrc.DL_InformationPerRL_List_r5_item", + { "DL-InformationPerRL-r5", "rrc.DL_InformationPerRL_r5", FT_NONE, BASE_NONE, NULL, 0, "rrc.DL_InformationPerRL_r5", HFILL }}, { &hf_rrc_DL_InformationPerRL_List_r6_item, - { "DL-InformationPerRL-List-r6", "rrc.DL_InformationPerRL_List_r6_item", + { "DL-InformationPerRL-r6", "rrc.DL_InformationPerRL_r6", FT_NONE, BASE_NONE, NULL, 0, "rrc.DL_InformationPerRL_r6", HFILL }}, { &hf_rrc_DL_InformationPerRL_List_v6b0ext_item, - { "DL-InformationPerRL-List-v6b0ext", "rrc.DL_InformationPerRL_List_v6b0ext_item", + { "DL-InformationPerRL-v6b0ext", "rrc.DL_InformationPerRL_v6b0ext", FT_NONE, BASE_NONE, NULL, 0, "rrc.DL_InformationPerRL_v6b0ext", HFILL }}, { &hf_rrc_DL_InformationPerRL_List_r5bis_item, - { "DL-InformationPerRL-List-r5bis", "rrc.DL_InformationPerRL_List_r5bis_item", + { "DL-InformationPerRL-r5bis", "rrc.DL_InformationPerRL_r5bis", FT_NONE, BASE_NONE, NULL, 0, "rrc.DL_InformationPerRL_r5bis", HFILL }}, { &hf_rrc_DL_InformationPerRL_List_r7_item, - { "DL-InformationPerRL-List-r7", "rrc.DL_InformationPerRL_List_r7_item", + { "DL-InformationPerRL-r7", "rrc.DL_InformationPerRL_r7", FT_NONE, BASE_NONE, NULL, 0, "rrc.DL_InformationPerRL_r7", HFILL }}, { &hf_rrc_DL_InformationPerRL_ListPostFDD_item, - { "DL-InformationPerRL-ListPostFDD", "rrc.DL_InformationPerRL_ListPostFDD_item", + { "DL-InformationPerRL-PostFDD", "rrc.DL_InformationPerRL_PostFDD", FT_NONE, BASE_NONE, NULL, 0, "rrc.DL_InformationPerRL_PostFDD", HFILL }}, { &hf_rrc_dl_DPCH_InfoPerRL_05, @@ -112808,7 +112808,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.RestrictedTrCH_InfoList", HFILL }}, { &hf_rrc_DL_TPC_PowerOffsetPerRL_List_item, - { "DL-TPC-PowerOffsetPerRL-List", "rrc.DL_TPC_PowerOffsetPerRL_List_item", + { "DL-TPC-PowerOffsetPerRL", "rrc.DL_TPC_PowerOffsetPerRL", FT_NONE, BASE_NONE, NULL, 0, "rrc.DL_TPC_PowerOffsetPerRL", HFILL }}, { &hf_rrc_codesRepresentation, @@ -112952,7 +112952,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_maxTS_1_OF_DownlinkAdditionalTimeslots", HFILL }}, { &hf_rrc_timeslotList_item, - { "timeslotList", "rrc.timeslotList_item", + { "DownlinkAdditionalTimeslots", "rrc.DownlinkAdditionalTimeslots", FT_NONE, BASE_NONE, NULL, 0, "rrc.DownlinkAdditionalTimeslots", HFILL }}, { &hf_rrc_firstIndividualTimeslotInfo_01, @@ -112972,7 +112972,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_maxTS_1_OF_DownlinkAdditionalTimeslots_VHCR", HFILL }}, { &hf_rrc_timeslotList_item_01, - { "timeslotList", "rrc.timeslotList_item", + { "DownlinkAdditionalTimeslots-VHCR", "rrc.DownlinkAdditionalTimeslots_VHCR", FT_NONE, BASE_NONE, NULL, 0, "rrc.DownlinkAdditionalTimeslots_VHCR", HFILL }}, { &hf_rrc_firstIndividualTimeslotInfo_02, @@ -112996,7 +112996,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_maxTS_LCR_1_OF_DownlinkAdditionalTimeslots_LCR_r4", HFILL }}, { &hf_rrc_timeslotList_item_02, - { "timeslotList", "rrc.timeslotList_item", + { "DownlinkAdditionalTimeslots-LCR-r4", "rrc.DownlinkAdditionalTimeslots_LCR_r4", FT_NONE, BASE_NONE, NULL, 0, "rrc.DownlinkAdditionalTimeslots_LCR_r4", HFILL }}, { &hf_rrc_firstIndividualTimeslotInfo_03, @@ -113016,7 +113016,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_maxTS_1_OF_DownlinkAdditionalTimeslots_r7", HFILL }}, { &hf_rrc_timeslotList_item_03, - { "timeslotList", "rrc.timeslotList_item", + { "DownlinkAdditionalTimeslots-r7", "rrc.DownlinkAdditionalTimeslots_r7", FT_NONE, BASE_NONE, NULL, 0, "rrc.DownlinkAdditionalTimeslots_r7", HFILL }}, { &hf_rrc_tgp_SequenceList, @@ -113032,7 +113032,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_maxTGPS_OF_TGP_SequenceShort", HFILL }}, { &hf_rrc_tgp_SequenceShortList_item, - { "tgp-SequenceShortList", "rrc.tgp_SequenceShortList_item", + { "TGP-SequenceShort", "rrc.TGP_SequenceShort", FT_NONE, BASE_NONE, NULL, 0, "rrc.TGP_SequenceShort", HFILL }}, { &hf_rrc_ue_drx_Cycle, @@ -113068,11 +113068,11 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.MultiCodeInfo", HFILL }}, { &hf_rrc_DSCH_MappingList_item, - { "DSCH-MappingList", "rrc.DSCH_MappingList_item", + { "DSCH-Mapping", "rrc.DSCH_Mapping", FT_NONE, BASE_NONE, NULL, 0, "rrc.DSCH_Mapping", HFILL }}, { &hf_rrc_DSCH_TransportChannelsInfo_item, - { "DSCH-TransportChannelsInfo", "rrc.DSCH_TransportChannelsInfo_item", + { "DSCH-TransportChannelsInfo item", "rrc.DSCH_TransportChannelsInfo_item", FT_NONE, BASE_NONE, NULL, 0, "rrc.DSCH_TransportChannelsInfo_item", HFILL }}, { &hf_rrc_dsch_transport_channel_identity, @@ -113160,11 +113160,11 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, VALS(rrc_UE_DPCCH_Burst_vals), 0, "rrc.UE_DPCCH_Burst", HFILL }}, { &hf_rrc_DynamicPersistenceLevelList_item, - { "DynamicPersistenceLevelList", "rrc.DynamicPersistenceLevelList_item", + { "DynamicPersistenceLevel", "rrc.DynamicPersistenceLevel", FT_UINT32, BASE_DEC, NULL, 0, "rrc.DynamicPersistenceLevel", HFILL }}, { &hf_rrc_DynamicPersistenceLevelTF_List_item, - { "DynamicPersistenceLevelTF-List", "rrc.DynamicPersistenceLevelTF_List_item", + { "DynamicPersistenceLevel", "rrc.DynamicPersistenceLevel", FT_UINT32, BASE_DEC, NULL, 0, "rrc.DynamicPersistenceLevel", HFILL }}, { &hf_rrc_tS_number, @@ -113260,15 +113260,15 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.E_AGCH_Set_Config_LCR", HFILL }}, { &hf_rrc_E_AGCH_Set_Config_item, - { "E-AGCH-Set-Config", "rrc.E_AGCH_Set_Config_item", + { "E-AGCH-Individual", "rrc.E_AGCH_Individual", FT_NONE, BASE_NONE, NULL, 0, "rrc.E_AGCH_Individual", HFILL }}, { &hf_rrc_E_AGCH_Set_Config_VHCR_item, - { "E-AGCH-Set-Config-VHCR", "rrc.E_AGCH_Set_Config_VHCR_item", + { "E-AGCH-Individual-VHCR", "rrc.E_AGCH_Individual_VHCR", FT_NONE, BASE_NONE, NULL, 0, "rrc.E_AGCH_Individual_VHCR", HFILL }}, { &hf_rrc_E_AGCH_Set_Config_LCR_item, - { "E-AGCH-Set-Config-LCR", "rrc.E_AGCH_Set_Config_LCR_item", + { "E-AGCH-Individual-LCR", "rrc.E_AGCH_Individual_LCR", FT_NONE, BASE_NONE, NULL, 0, "rrc.E_AGCH_Individual_LCR", HFILL }}, { &hf_rrc_e_DCH_RL_InfoNewServingCell, @@ -113280,7 +113280,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_maxEDCHRL_OF_E_DCH_RL_InfoOtherCell", HFILL }}, { &hf_rrc_e_DCH_RL_InfoOtherCellList_item, - { "e-DCH-RL-InfoOtherCellList", "rrc.e_DCH_RL_InfoOtherCellList_item", + { "E-DCH-RL-InfoOtherCell", "rrc.E_DCH_RL_InfoOtherCell", FT_NONE, BASE_NONE, NULL, 0, "rrc.E_DCH_RL_InfoOtherCell", HFILL }}, { &hf_rrc_e_DCH_RL_InfoNewServingCell_01, @@ -113384,11 +113384,11 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.INTEGER_0_31", HFILL }}, { &hf_rrc_E_DPDCH_Reference_E_TFCIList_item, - { "E-DPDCH-Reference-E-TFCIList", "rrc.E_DPDCH_Reference_E_TFCIList_item", + { "E-DPDCH-Reference-E-TFCI", "rrc.E_DPDCH_Reference_E_TFCI", FT_NONE, BASE_NONE, NULL, 0, "rrc.E_DPDCH_Reference_E_TFCI", HFILL }}, { &hf_rrc_E_DPDCH_Reference_E_TFCIList_r7_item, - { "E-DPDCH-Reference-E-TFCIList-r7", "rrc.E_DPDCH_Reference_E_TFCIList_r7_item", + { "E-DPDCH-Reference-E-TFCI-r7", "rrc.E_DPDCH_Reference_E_TFCI_r7", FT_NONE, BASE_NONE, NULL, 0, "rrc.E_DPDCH_Reference_E_TFCI_r7", HFILL }}, { &hf_rrc_periodicityOfSchedInfo_NoGrant, @@ -113464,7 +113464,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.E_HICH_Information_LCR_List", HFILL }}, { &hf_rrc_E_HICH_Information_LCR_List_item, - { "E-HICH-Information-LCR-List", "rrc.E_HICH_Information_LCR_List_item", + { "E-HICH-Information-LCR", "rrc.E_HICH_Information_LCR", FT_NONE, BASE_NONE, NULL, 0, "rrc.E_HICH_Information_LCR", HFILL }}, { &hf_rrc_e_TFCS_Info, @@ -113492,7 +113492,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_maxTS_2_OF_E_PUCH_TS_Slots", HFILL }}, { &hf_rrc_e_PUCH_TS_ConfigurationList_item, - { "e-PUCH-TS-ConfigurationList", "rrc.e_PUCH_TS_ConfigurationList_item", + { "E-PUCH-TS-Slots", "rrc.E_PUCH_TS_Slots", FT_NONE, BASE_NONE, NULL, 0, "rrc.E_PUCH_TS_Slots", HFILL }}, { &hf_rrc_e_PUCH_CodeHopping, @@ -113532,7 +113532,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_maxTS_LCR_1_OF_E_PUCH_TS_Slots_LCR", HFILL }}, { &hf_rrc_e_PUCH_TS_ConfigurationList_item_01, - { "e-PUCH-TS-ConfigurationList", "rrc.e_PUCH_TS_ConfigurationList_item", + { "E-PUCH-TS-Slots-LCR", "rrc.E_PUCH_TS_Slots_LCR", FT_NONE, BASE_NONE, NULL, 0, "rrc.E_PUCH_TS_Slots_LCR", HFILL }}, { &hf_rrc_ts_Number, @@ -113596,7 +113596,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_8_OF_SF16Codes", HFILL }}, { &hf_rrc_sF16_item, - { "sF16", "rrc.sF16_item", + { "SF16Codes", "rrc.SF16Codes", FT_UINT32, BASE_DEC, VALS(rrc_SF16Codes_vals), 0, "rrc.SF16Codes", HFILL }}, { &hf_rrc_sF8, @@ -113604,7 +113604,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_8_OF_SF8Codes", HFILL }}, { &hf_rrc_sF8_item, - { "sF8", "rrc.sF8_item", + { "SF8Codes", "rrc.SF8Codes", FT_UINT32, BASE_DEC, VALS(rrc_SF8Codes_vals), 0, "rrc.SF8Codes", HFILL }}, { &hf_rrc_tdd768_08, @@ -113616,7 +113616,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_16_OF_SF32Codes", HFILL }}, { &hf_rrc_sF32_item, - { "sF32", "rrc.sF32_item", + { "SF32Codes", "rrc.SF32Codes", FT_UINT32, BASE_DEC, VALS(rrc_SF32Codes_vals), 0, "rrc.SF32Codes", HFILL }}, { &hf_rrc_sF816, @@ -113624,7 +113624,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_16_OF_SF16Codes2", HFILL }}, { &hf_rrc_sF816_item, - { "sF816", "rrc.sF816_item", + { "SF16Codes2", "rrc.SF16Codes2", FT_UINT32, BASE_DEC, VALS(rrc_SF16Codes2_vals), 0, "rrc.SF16Codes2", HFILL }}, { &hf_rrc_tdd128_21, @@ -113660,7 +113660,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_8_OF_Reference_Beta_QPSK", HFILL }}, { &hf_rrc_reference_Beta_QPSK_List_item, - { "reference-Beta-QPSK-List", "rrc.reference_Beta_QPSK_List_item", + { "Reference-Beta-QPSK", "rrc.Reference_Beta_QPSK", FT_NONE, BASE_NONE, NULL, 0, "rrc.Reference_Beta_QPSK", HFILL }}, { &hf_rrc_reference_Beta_16QAM_List, @@ -113668,7 +113668,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_8_OF_Reference_Beta_16QAM", HFILL }}, { &hf_rrc_reference_Beta_16QAM_List_item, - { "reference-Beta-16QAM-List", "rrc.reference_Beta_16QAM_List_item", + { "Reference-Beta-16QAM", "rrc.Reference_Beta_16QAM", FT_NONE, BASE_NONE, NULL, 0, "rrc.Reference_Beta_16QAM", HFILL }}, { &hf_rrc_modeSpecificInfo_46, @@ -113696,7 +113696,7 @@ void proto_register_rrc(void) { FT_BOOLEAN, 8, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_FACH_PCH_InformationList_item, - { "FACH-PCH-InformationList", "rrc.FACH_PCH_InformationList_item", + { "FACH-PCH-Information", "rrc.FACH_PCH_Information", FT_NONE, BASE_NONE, NULL, 0, "rrc.FACH_PCH_Information", HFILL }}, { &hf_rrc_timeslot_01, @@ -113764,7 +113764,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_maxCommonHRNTI_OF_H_RNTI", HFILL }}, { &hf_rrc_common_H_RNTI_information_item, - { "common-H-RNTI-information", "rrc.common_H_RNTI_information_item", + { "H-RNTI", "rrc.H_RNTI", FT_BYTES, BASE_HEX, NULL, 0, "rrc.H_RNTI", HFILL }}, { &hf_rrc_bcchSpecific_H_RNTI, @@ -113780,7 +113780,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_maxSCCPCH_OF_PICH_ForHSDPASupportedPaging", HFILL }}, { &hf_rrc_pich_ForHSDPASupportedPagingList_item, - { "pich-ForHSDPASupportedPagingList", "rrc.pich_ForHSDPASupportedPagingList_item", + { "PICH-ForHSDPASupportedPaging", "rrc.PICH_ForHSDPASupportedPaging", FT_NONE, BASE_NONE, NULL, 0, "rrc.PICH_ForHSDPASupportedPaging", HFILL }}, { &hf_rrc_numberOfPcchTransmissions, @@ -113792,7 +113792,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_2_OF_TransportBlockSizeIndex", HFILL }}, { &hf_rrc_transportBlockSizeList_item, - { "transportBlockSizeList", "rrc.transportBlockSizeList_item", + { "TransportBlockSizeIndex", "rrc.TransportBlockSizeIndex", FT_UINT32, BASE_DEC, NULL, 0, "rrc.TransportBlockSizeIndex", HFILL }}, { &hf_rrc_midambleAllocationMode_04, @@ -113812,7 +113812,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_maxHSSCCHs_OF_HS_SCCH_Codes", HFILL }}, { &hf_rrc_hS_SCCHChannelisationCodeInfo_item, - { "hS-SCCHChannelisationCodeInfo", "rrc.hS_SCCHChannelisationCodeInfo_item", + { "HS-SCCH-Codes", "rrc.HS_SCCH_Codes", FT_UINT32, BASE_DEC, NULL, 0, "rrc.HS_SCCH_Codes", HFILL }}, { &hf_rrc_dl_ScramblingCode, @@ -113840,7 +113840,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_maxHSSCCHs_OF_HS_SCCH_TDD384", HFILL }}, { &hf_rrc_hS_SCCH_SetConfiguration_item, - { "hS-SCCH-SetConfiguration", "rrc.hS_SCCH_SetConfiguration_item", + { "HS-SCCH-TDD384", "rrc.HS_SCCH_TDD384", FT_NONE, BASE_NONE, NULL, 0, "rrc.HS_SCCH_TDD384", HFILL }}, { &hf_rrc_tdd128_22, @@ -113848,7 +113848,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_maxHSSCCHs_OF_HS_SCCH_TDD128", HFILL }}, { &hf_rrc_tdd128_item, - { "tdd128", "rrc.tdd128_item", + { "HS-SCCH-TDD128", "rrc.HS_SCCH_TDD128", FT_NONE, BASE_NONE, NULL, 0, "rrc.HS_SCCH_TDD128", HFILL }}, { &hf_rrc_modeSpecificInfo_49, @@ -113876,7 +113876,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_maxHSSCCHs_OF_HS_SCCH_TDD384_r6", HFILL }}, { &hf_rrc_hS_SCCH_SetConfiguration_item_01, - { "hS-SCCH-SetConfiguration", "rrc.hS_SCCH_SetConfiguration_item", + { "HS-SCCH-TDD384-r6", "rrc.HS_SCCH_TDD384_r6", FT_NONE, BASE_NONE, NULL, 0, "rrc.HS_SCCH_TDD384_r6", HFILL }}, { &hf_rrc_tdd128_23, @@ -113896,7 +113896,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_maxHSSCCHs_OF_HS_SCCH_TDD128_r6", HFILL }}, { &hf_rrc_hS_SCCH_SetConfiguration_item_02, - { "hS-SCCH-SetConfiguration", "rrc.hS_SCCH_SetConfiguration_item", + { "HS-SCCH-TDD128-r6", "rrc.HS_SCCH_TDD128_r6", FT_NONE, BASE_NONE, NULL, 0, "rrc.HS_SCCH_TDD128_r6", HFILL }}, { &hf_rrc_modeSpecificInfo_50, @@ -113928,7 +113928,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_maxHSSCCHs_OF_HS_SCCH_TDD768", HFILL }}, { &hf_rrc_hS_SCCH_SetConfiguration_item_03, - { "hS-SCCH-SetConfiguration", "rrc.hS_SCCH_SetConfiguration_item", + { "HS-SCCH-TDD768", "rrc.HS_SCCH_TDD768", FT_NONE, BASE_NONE, NULL, 0, "rrc.HS_SCCH_TDD768", HFILL }}, { &hf_rrc_tdd128_24, @@ -113968,7 +113968,7 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.HS_SCCH_Less_NewOperation", HFILL }}, { &hf_rrc_HS_SCCH_LessTFSList_item, - { "HS-SCCH-LessTFSList", "rrc.HS_SCCH_LessTFSList_item", + { "HS-SCCH-LessTFSList item", "rrc.HS_SCCH_LessTFSList_item", FT_NONE, BASE_NONE, NULL, 0, "rrc.HS_SCCH_LessTFSList_item", HFILL }}, { &hf_rrc_hs_scch_LessTFSI, @@ -114132,7 +114132,7 @@ void proto_register_rrc(void) { FT_INT32, BASE_DEC, NULL, 0, "rrc.TDD_UL_Interference", HFILL }}, { &hf_rrc_IndividualTS_InterferenceList_item, - { "IndividualTS-InterferenceList", "rrc.IndividualTS_InterferenceList_item", + { "IndividualTS-Interference", "rrc.IndividualTS_Interference", FT_NONE, BASE_NONE, NULL, 0, "rrc.IndividualTS_Interference", HFILL }}, { &hf_rrc_modeSpecificInfo_51, @@ -114496,7 +114496,7 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.UCSM_Info", HFILL }}, { &hf_rrc_PCPCH_ChannelInfoList_item, - { "PCPCH-ChannelInfoList", "rrc.PCPCH_ChannelInfoList_item", + { "PCPCH-ChannelInfo", "rrc.PCPCH_ChannelInfo", FT_NONE, BASE_NONE, NULL, 0, "rrc.PCPCH_ChannelInfo", HFILL }}, { &hf_rrc_pdsch_PowerControlInfo, @@ -114560,7 +114560,7 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.PDSCH_Info_r7", HFILL }}, { &hf_rrc_PDSCH_CodeInfoList_item, - { "PDSCH-CodeInfoList", "rrc.PDSCH_CodeInfoList_item", + { "PDSCH-CodeInfo", "rrc.PDSCH_CodeInfo", FT_NONE, BASE_NONE, NULL, 0, "rrc.PDSCH_CodeInfo", HFILL }}, { &hf_rrc_codeNumberStart, @@ -114572,7 +114572,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.CodeNumberDSCH", HFILL }}, { &hf_rrc_PDSCH_CodeMapList_item, - { "PDSCH-CodeMapList", "rrc.PDSCH_CodeMapList_item", + { "PDSCH-CodeMap", "rrc.PDSCH_CodeMap", FT_NONE, BASE_NONE, NULL, 0, "rrc.PDSCH_CodeMap", HFILL }}, { &hf_rrc_signallingMethod, @@ -114656,23 +114656,23 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.PDSCH_Info_LCR_r4", HFILL }}, { &hf_rrc_PDSCH_SysInfoList_item, - { "PDSCH-SysInfoList", "rrc.PDSCH_SysInfoList_item", + { "PDSCH-SysInfo", "rrc.PDSCH_SysInfo", FT_NONE, BASE_NONE, NULL, 0, "rrc.PDSCH_SysInfo", HFILL }}, { &hf_rrc_PDSCH_SysInfoList_VHCR_r7_item, - { "PDSCH-SysInfoList-VHCR-r7", "rrc.PDSCH_SysInfoList_VHCR_r7_item", + { "PDSCH-SysInfo-VHCR-r7", "rrc.PDSCH_SysInfo_VHCR_r7", FT_NONE, BASE_NONE, NULL, 0, "rrc.PDSCH_SysInfo_VHCR_r7", HFILL }}, { &hf_rrc_PDSCH_SysInfoList_HCR_r5_item, - { "PDSCH-SysInfoList-HCR-r5", "rrc.PDSCH_SysInfoList_HCR_r5_item", + { "PDSCH-SysInfo-HCR-r5", "rrc.PDSCH_SysInfo_HCR_r5", FT_NONE, BASE_NONE, NULL, 0, "rrc.PDSCH_SysInfo_HCR_r5", HFILL }}, { &hf_rrc_PDSCH_SysInfoList_LCR_r4_item, - { "PDSCH-SysInfoList-LCR-r4", "rrc.PDSCH_SysInfoList_LCR_r4_item", + { "PDSCH-SysInfo-LCR-r4", "rrc.PDSCH_SysInfo_LCR_r4", FT_NONE, BASE_NONE, NULL, 0, "rrc.PDSCH_SysInfo_LCR_r4", HFILL }}, { &hf_rrc_PDSCH_SysInfoList_SFN_item, - { "PDSCH-SysInfoList-SFN", "rrc.PDSCH_SysInfoList_SFN_item", + { "PDSCH-SysInfoList-SFN item", "rrc.PDSCH_SysInfoList_SFN_item", FT_NONE, BASE_NONE, NULL, 0, "rrc.PDSCH_SysInfoList_SFN_item", HFILL }}, { &hf_rrc_pdsch_SysInfo, @@ -114684,7 +114684,7 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.SFN_TimeInfo", HFILL }}, { &hf_rrc_PDSCH_SysInfoList_SFN_HCR_r5_item, - { "PDSCH-SysInfoList-SFN-HCR-r5", "rrc.PDSCH_SysInfoList_SFN_HCR_r5_item", + { "PDSCH-SysInfoList-SFN-HCR-r5 item", "rrc.PDSCH_SysInfoList_SFN_HCR_r5_item", FT_NONE, BASE_NONE, NULL, 0, "rrc.PDSCH_SysInfoList_SFN_HCR_r5_item", HFILL }}, { &hf_rrc_pdsch_SysInfo_01, @@ -114692,7 +114692,7 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.PDSCH_SysInfo_HCR_r5", HFILL }}, { &hf_rrc_PDSCH_SysInfoList_SFN_LCR_r4_item, - { "PDSCH-SysInfoList-SFN-LCR-r4", "rrc.PDSCH_SysInfoList_SFN_LCR_r4_item", + { "PDSCH-SysInfoList-SFN-LCR-r4 item", "rrc.PDSCH_SysInfoList_SFN_LCR_r4_item", FT_NONE, BASE_NONE, NULL, 0, "rrc.PDSCH_SysInfoList_SFN_LCR_r4_item", HFILL }}, { &hf_rrc_pdsch_SysInfo_02, @@ -114700,11 +114700,11 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.PDSCH_SysInfo_LCR_r4", HFILL }}, { &hf_rrc_PersistenceScalingFactorList_item, - { "PersistenceScalingFactorList", "rrc.PersistenceScalingFactorList_item", + { "PersistenceScalingFactor", "rrc.PersistenceScalingFactor", FT_UINT32, BASE_DEC, VALS(rrc_PersistenceScalingFactor_vals), 0, "rrc.PersistenceScalingFactor", HFILL }}, { &hf_rrc_PichChannelisationCodeList_LCR_r4_item, - { "PichChannelisationCodeList-LCR-r4", "rrc.PichChannelisationCodeList_LCR_r4_item", + { "DL-TS-ChannelisationCode", "rrc.DL_TS_ChannelisationCode", FT_UINT32, BASE_DEC, VALS(rrc_DL_TS_ChannelisationCode_vals), 0, "rrc.DL_TS_ChannelisationCode", HFILL }}, { &hf_rrc_hsdpa_AssociatedPichInfo, @@ -114780,11 +114780,11 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.NULL", HFILL }}, { &hf_rrc_PRACH_ChanCodes_LCR_r4_item, - { "PRACH-ChanCodes-LCR-r4", "rrc.PRACH_ChanCodes_LCR_r4_item", + { "TDD-PRACH-CCode-LCR-r4", "rrc.TDD_PRACH_CCode_LCR_r4", FT_UINT32, BASE_DEC, VALS(rrc_TDD_PRACH_CCode_LCR_r4_vals), 0, "rrc.TDD_PRACH_CCode_LCR_r4", HFILL }}, { &hf_rrc_PRACH_ChanCodes_List_LCR_item, - { "PRACH-ChanCodes-List-LCR", "rrc.PRACH_ChanCodes_List_LCR_item", + { "TDD-PRACH-CCode-LCR-r4", "rrc.TDD_PRACH_CCode_LCR_r4", FT_UINT32, BASE_DEC, VALS(rrc_TDD_PRACH_CCode_LCR_r4_vals), 0, "rrc.TDD_PRACH_CCode_LCR_r4", HFILL }}, { &hf_rrc_timeslot_02, @@ -114808,7 +114808,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_maxASC_OF_ASCSetting_FDD", HFILL }}, { &hf_rrc_fdd_item, - { "fdd", "rrc.fdd_item", + { "ASCSetting-FDD", "rrc.ASCSetting_FDD", FT_NONE, BASE_NONE, NULL, 0, "rrc.ASCSetting_FDD", HFILL }}, { &hf_rrc_tdd_44, @@ -114816,7 +114816,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_maxASC_OF_ASCSetting_TDD", HFILL }}, { &hf_rrc_tdd_item, - { "tdd", "rrc.tdd_item", + { "ASCSetting-TDD", "rrc.ASCSetting_TDD", FT_NONE, BASE_NONE, NULL, 0, "rrc.ASCSetting_TDD", HFILL }}, { &hf_rrc_tdd_45, @@ -114824,11 +114824,11 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_maxASC_OF_ASCSetting_TDD_r7", HFILL }}, { &hf_rrc_tdd_item_01, - { "tdd", "rrc.tdd_item", + { "ASCSetting-TDD-r7", "rrc.ASCSetting_TDD_r7", FT_NONE, BASE_NONE, NULL, 0, "rrc.ASCSetting_TDD_r7", HFILL }}, { &hf_rrc_PRACH_Partitioning_LCR_r4_item, - { "PRACH-Partitioning-LCR-r4", "rrc.PRACH_Partitioning_LCR_r4_item", + { "ASCSetting-TDD-LCR-r4", "rrc.ASCSetting_TDD_LCR_r4", FT_NONE, BASE_NONE, NULL, 0, "rrc.ASCSetting_TDD_LCR_r4", HFILL }}, { &hf_rrc_powerRampStep, @@ -114892,7 +114892,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_maxPRACH_FPACH_OF_PRACH_Definition_LCR_r4", HFILL }}, { &hf_rrc_prach_DefinitionList_item, - { "prach-DefinitionList", "rrc.prach_DefinitionList_item", + { "PRACH-Definition-LCR-r4", "rrc.PRACH_Definition_LCR_r4", FT_NONE, BASE_NONE, NULL, 0, "rrc.PRACH_Definition_LCR_r4", HFILL }}, { &hf_rrc_prach_RACH_Info, @@ -114972,19 +114972,19 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.PRACH_RACH_Info_LCR_v770ext", HFILL }}, { &hf_rrc_PRACH_SystemInformationList_item, - { "PRACH-SystemInformationList", "rrc.PRACH_SystemInformationList_item", + { "PRACH-SystemInformation", "rrc.PRACH_SystemInformation", FT_NONE, BASE_NONE, NULL, 0, "rrc.PRACH_SystemInformation", HFILL }}, { &hf_rrc_PRACH_SystemInformationList_VHCR_r7_item, - { "PRACH-SystemInformationList-VHCR-r7", "rrc.PRACH_SystemInformationList_VHCR_r7_item", + { "PRACH-SystemInformation-VHCR-r7", "rrc.PRACH_SystemInformation_VHCR_r7", FT_NONE, BASE_NONE, NULL, 0, "rrc.PRACH_SystemInformation_VHCR_r7", HFILL }}, { &hf_rrc_PRACH_SystemInformationList_LCR_r4_item, - { "PRACH-SystemInformationList-LCR-r4", "rrc.PRACH_SystemInformationList_LCR_r4_item", + { "PRACH-SystemInformation-LCR-r4", "rrc.PRACH_SystemInformation_LCR_r4", FT_NONE, BASE_NONE, NULL, 0, "rrc.PRACH_SystemInformation_LCR_r4", HFILL }}, { &hf_rrc_PRACH_SystemInformationList_LCR_v770ext_item, - { "PRACH-SystemInformationList-LCR-v770ext", "rrc.PRACH_SystemInformationList_LCR_v770ext_item", + { "PRACH-SystemInformation-LCR-v770ext", "rrc.PRACH_SystemInformation_LCR_v770ext", FT_NONE, BASE_NONE, NULL, 0, "rrc.PRACH_SystemInformation_LCR_v770ext", HFILL }}, { &hf_rrc_ul_DPCH_InfoPredef, @@ -115236,19 +115236,19 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.PUSCH_Info_LCR_r4", HFILL }}, { &hf_rrc_PUSCH_SysInfoList_item, - { "PUSCH-SysInfoList", "rrc.PUSCH_SysInfoList_item", + { "PUSCH-SysInfo", "rrc.PUSCH_SysInfo", FT_NONE, BASE_NONE, NULL, 0, "rrc.PUSCH_SysInfo", HFILL }}, { &hf_rrc_PUSCH_SysInfoList_HCR_r5_item, - { "PUSCH-SysInfoList-HCR-r5", "rrc.PUSCH_SysInfoList_HCR_r5_item", + { "PUSCH-SysInfo-HCR-r5", "rrc.PUSCH_SysInfo_HCR_r5", FT_NONE, BASE_NONE, NULL, 0, "rrc.PUSCH_SysInfo_HCR_r5", HFILL }}, { &hf_rrc_PUSCH_SysInfoList_LCR_r4_item, - { "PUSCH-SysInfoList-LCR-r4", "rrc.PUSCH_SysInfoList_LCR_r4_item", + { "PUSCH-SysInfo-LCR-r4", "rrc.PUSCH_SysInfo_LCR_r4", FT_NONE, BASE_NONE, NULL, 0, "rrc.PUSCH_SysInfo_LCR_r4", HFILL }}, { &hf_rrc_PUSCH_SysInfoList_SFN_item, - { "PUSCH-SysInfoList-SFN", "rrc.PUSCH_SysInfoList_SFN_item", + { "PUSCH-SysInfoList-SFN item", "rrc.PUSCH_SysInfoList_SFN_item", FT_NONE, BASE_NONE, NULL, 0, "rrc.PUSCH_SysInfoList_SFN_item", HFILL }}, { &hf_rrc_pusch_SysInfo, @@ -115256,7 +115256,7 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.PUSCH_SysInfo", HFILL }}, { &hf_rrc_PUSCH_SysInfoList_SFN_HCR_r5_item, - { "PUSCH-SysInfoList-SFN-HCR-r5", "rrc.PUSCH_SysInfoList_SFN_HCR_r5_item", + { "PUSCH-SysInfoList-SFN-HCR-r5 item", "rrc.PUSCH_SysInfoList_SFN_HCR_r5_item", FT_NONE, BASE_NONE, NULL, 0, "rrc.PUSCH_SysInfoList_SFN_HCR_r5_item", HFILL }}, { &hf_rrc_pusch_SysInfo_01, @@ -115264,7 +115264,7 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.PUSCH_SysInfo_HCR_r5", HFILL }}, { &hf_rrc_PUSCH_SysInfoList_SFN_LCR_r4_item, - { "PUSCH-SysInfoList-SFN-LCR-r4", "rrc.PUSCH_SysInfoList_SFN_LCR_r4_item", + { "PUSCH-SysInfoList-SFN-LCR-r4 item", "rrc.PUSCH_SysInfoList_SFN_LCR_r4_item", FT_NONE, BASE_NONE, NULL, 0, "rrc.PUSCH_SysInfoList_SFN_LCR_r4_item", HFILL }}, { &hf_rrc_pusch_SysInfo_02, @@ -115272,7 +115272,7 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.PUSCH_SysInfo_LCR_r4", HFILL }}, { &hf_rrc_PUSCH_SysInfoList_SFN_VHCR_item, - { "PUSCH-SysInfoList-SFN-VHCR", "rrc.PUSCH_SysInfoList_SFN_VHCR_item", + { "PUSCH-SysInfoList-SFN-VHCR item", "rrc.PUSCH_SysInfoList_SFN_VHCR_item", FT_NONE, BASE_NONE, NULL, 0, "rrc.PUSCH_SysInfoList_SFN_VHCR_item", HFILL }}, { &hf_rrc_pusch_SysInfo_VHCR, @@ -115404,7 +115404,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.MaxTFCI_Field2Value", HFILL }}, { &hf_rrc_ReplacedPDSCH_CodeInfoList_item, - { "ReplacedPDSCH-CodeInfoList", "rrc.ReplacedPDSCH_CodeInfoList_item", + { "ReplacedPDSCH-CodeInfo", "rrc.ReplacedPDSCH_CodeInfo", FT_NONE, BASE_NONE, NULL, 0, "rrc.ReplacedPDSCH_CodeInfo", HFILL }}, { &hf_rrc_rpp4_2, @@ -115456,7 +115456,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.AllowedTFI_List", HFILL }}, { &hf_rrc_RestrictedTrCH_InfoList_item, - { "RestrictedTrCH-InfoList", "rrc.RestrictedTrCH_InfoList_item", + { "RestrictedTrCH", "rrc.RestrictedTrCH", FT_NONE, BASE_NONE, NULL, 0, "rrc.RestrictedTrCH", HFILL }}, { &hf_rrc_dummy2_07, @@ -115476,35 +115476,35 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, VALS(rrc_T_dl_dpchInfo_03_vals), 0, "rrc.T_dl_dpchInfo_03", HFILL }}, { &hf_rrc_RL_AdditionInformationList_item, - { "RL-AdditionInformationList", "rrc.RL_AdditionInformationList_item", + { "RL-AdditionInformation", "rrc.RL_AdditionInformation", FT_NONE, BASE_NONE, NULL, 0, "rrc.RL_AdditionInformation", HFILL }}, { &hf_rrc_RL_AdditionInformationList_r6_item, - { "RL-AdditionInformationList-r6", "rrc.RL_AdditionInformationList_r6_item", + { "RL-AdditionInformation-r6", "rrc.RL_AdditionInformation_r6", FT_NONE, BASE_NONE, NULL, 0, "rrc.RL_AdditionInformation_r6", HFILL }}, { &hf_rrc_RL_AdditionInformationList_r7_item, - { "RL-AdditionInformationList-r7", "rrc.RL_AdditionInformationList_r7_item", + { "RL-AdditionInformation-r7", "rrc.RL_AdditionInformation_r7", FT_NONE, BASE_NONE, NULL, 0, "rrc.RL_AdditionInformation_r7", HFILL }}, { &hf_rrc_RL_AdditionInformation_list_v6b0ext_item, - { "RL-AdditionInformation-list-v6b0ext", "rrc.RL_AdditionInformation_list_v6b0ext_item", + { "RL-AdditionInformation-v6b0ext", "rrc.RL_AdditionInformation_v6b0ext", FT_NONE, BASE_NONE, NULL, 0, "rrc.RL_AdditionInformation_v6b0ext", HFILL }}, { &hf_rrc_RL_IdentifierList_item, - { "RL-IdentifierList", "rrc.RL_IdentifierList_item", + { "PrimaryCPICH-Info", "rrc.PrimaryCPICH_Info", FT_NONE, BASE_NONE, NULL, 0, "rrc.PrimaryCPICH_Info", HFILL }}, { &hf_rrc_RL_RemovalInformationList_item, - { "RL-RemovalInformationList", "rrc.RL_RemovalInformationList_item", + { "PrimaryCPICH-Info", "rrc.PrimaryCPICH_Info", FT_NONE, BASE_NONE, NULL, 0, "rrc.PrimaryCPICH_Info", HFILL }}, { &hf_rrc_SCCPCH_ChannelisationCodeList_item, - { "SCCPCH-ChannelisationCodeList", "rrc.SCCPCH_ChannelisationCodeList_item", + { "SCCPCH-ChannelisationCode", "rrc.SCCPCH_ChannelisationCode", FT_UINT32, BASE_DEC, VALS(rrc_SCCPCH_ChannelisationCode_vals), 0, "rrc.SCCPCH_ChannelisationCode", HFILL }}, { &hf_rrc_SCCPCH_ChannelisationCodeList_VHCR_item, - { "SCCPCH-ChannelisationCodeList-VHCR", "rrc.SCCPCH_ChannelisationCodeList_VHCR_item", + { "SCCPCH-ChannelisationCode-VHCR", "rrc.SCCPCH_ChannelisationCode_VHCR", FT_UINT32, BASE_DEC, VALS(rrc_SCCPCH_ChannelisationCode_VHCR_vals), 0, "rrc.SCCPCH_ChannelisationCode_VHCR", HFILL }}, { &hf_rrc_secondaryCCPCH_Info, @@ -115564,15 +115564,15 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.PICH_Info_HCR_VHCR_r7", HFILL }}, { &hf_rrc_SCCPCH_SystemInformationList_item, - { "SCCPCH-SystemInformationList", "rrc.SCCPCH_SystemInformationList_item", + { "SCCPCH-SystemInformation", "rrc.SCCPCH_SystemInformation", FT_NONE, BASE_NONE, NULL, 0, "rrc.SCCPCH_SystemInformation", HFILL }}, { &hf_rrc_SCCPCH_SystemInformationList_HCR_VHCR_r7_item, - { "SCCPCH-SystemInformationList-HCR-VHCR-r7", "rrc.SCCPCH_SystemInformationList_HCR_VHCR_r7_item", + { "SCCPCH-SystemInformation-HCR-VHCR-r7", "rrc.SCCPCH_SystemInformation_HCR_VHCR_r7", FT_NONE, BASE_NONE, NULL, 0, "rrc.SCCPCH_SystemInformation_HCR_VHCR_r7", HFILL }}, { &hf_rrc_SCCPCH_SystemInformationList_LCR_r4_ext_item, - { "SCCPCH-SystemInformationList-LCR-r4-ext", "rrc.SCCPCH_SystemInformationList_LCR_r4_ext_item", + { "SCCPCH-SystemInformation-LCR-r4-ext", "rrc.SCCPCH_SystemInformation_LCR_r4_ext", FT_NONE, BASE_NONE, NULL, 0, "rrc.SCCPCH_SystemInformation_LCR_r4_ext", HFILL }}, { &hf_rrc_secondaryCCPCHInfo_MBMS, @@ -115908,7 +115908,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, VALS(rrc_T_max_SYNC_UL_Transmissions_01_vals), 0, "rrc.T_max_SYNC_UL_Transmissions_01", HFILL }}, { &hf_rrc_TDD_MBSFNInformation_item, - { "TDD-MBSFNInformation", "rrc.TDD_MBSFNInformation_item", + { "TDD-MBSFNTSlotInfo", "rrc.TDD_MBSFNTSlotInfo", FT_NONE, BASE_NONE, NULL, 0, "rrc.TDD_MBSFNTSlotInfo", HFILL }}, { &hf_rrc_timeSlotNumber, @@ -115920,7 +115920,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_8_OF_TDD_PRACH_CCode8", HFILL }}, { &hf_rrc_sf8_item, - { "sf8", "rrc.sf8_item", + { "TDD-PRACH-CCode8", "rrc.TDD_PRACH_CCode8", FT_UINT32, BASE_DEC, VALS(rrc_TDD_PRACH_CCode8_vals), 0, "rrc.TDD_PRACH_CCode8", HFILL }}, { &hf_rrc_sf16_01, @@ -115928,7 +115928,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_8_OF_TDD_PRACH_CCode16", HFILL }}, { &hf_rrc_sf16_item, - { "sf16", "rrc.sf16_item", + { "TDD-PRACH-CCode16", "rrc.TDD_PRACH_CCode16", FT_UINT32, BASE_DEC, VALS(rrc_TDD_PRACH_CCode16_vals), 0, "rrc.TDD_PRACH_CCode16", HFILL }}, { &hf_rrc_sf32_01, @@ -115936,7 +115936,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_16_OF_TDD768_PRACH_CCode32", HFILL }}, { &hf_rrc_sf32_item, - { "sf32", "rrc.sf32_item", + { "TDD768-PRACH-CCode32", "rrc.TDD768_PRACH_CCode32", FT_UINT32, BASE_DEC, VALS(rrc_TDD768_PRACH_CCode32_vals), 0, "rrc.TDD768_PRACH_CCode32", HFILL }}, { &hf_rrc_sf16_02, @@ -115944,7 +115944,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_16_OF_TDD768_PRACH_CCode16", HFILL }}, { &hf_rrc_sf16_item_01, - { "sf16", "rrc.sf16_item", + { "TDD768-PRACH-CCode16", "rrc.TDD768_PRACH_CCode16", FT_UINT32, BASE_DEC, VALS(rrc_TDD768_PRACH_CCode16_vals), 0, "rrc.TDD768_PRACH_CCode16", HFILL }}, { &hf_rrc_tgpsi, @@ -115972,7 +115972,7 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.TGPS_ConfigurationParams", HFILL }}, { &hf_rrc_TGP_SequenceList_item, - { "TGP-SequenceList", "rrc.TGP_SequenceList_item", + { "TGP-Sequence", "rrc.TGP_Sequence", FT_NONE, BASE_NONE, NULL, 0, "rrc.TGP_Sequence", HFILL }}, { &hf_rrc_tgps_Status_01, @@ -116060,7 +116060,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.DurationTimeInfo", HFILL }}, { &hf_rrc_TimeslotList_item, - { "TimeslotList", "rrc.TimeslotList_item", + { "TimeslotNumber", "rrc.TimeslotNumber", FT_UINT32, BASE_DEC, NULL, 0, "rrc.TimeslotNumber", HFILL }}, { &hf_rrc_tdd384_29, @@ -116068,7 +116068,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_maxTS_OF_TimeslotNumber", HFILL }}, { &hf_rrc_tdd384_item, - { "tdd384", "rrc.tdd384_item", + { "TimeslotNumber", "rrc.TimeslotNumber", FT_UINT32, BASE_DEC, NULL, 0, "rrc.TimeslotNumber", HFILL }}, { &hf_rrc_tdd128_34, @@ -116076,7 +116076,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_maxTS_LCR_OF_TimeslotNumber_LCR_r4", HFILL }}, { &hf_rrc_tdd128_item_01, - { "tdd128", "rrc.tdd128_item", + { "TimeslotNumber-LCR-r4", "rrc.TimeslotNumber_LCR_r4", FT_UINT32, BASE_DEC, NULL, 0, "rrc.TimeslotNumber_LCR_r4", HFILL }}, { &hf_rrc_timing, @@ -116148,23 +116148,23 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.UplinkTimeslotsCodes_LCR_r7", HFILL }}, { &hf_rrc_UL_CCTrCHList_item, - { "UL-CCTrCHList", "rrc.UL_CCTrCHList_item", + { "UL-CCTrCH", "rrc.UL_CCTrCH", FT_NONE, BASE_NONE, NULL, 0, "rrc.UL_CCTrCH", HFILL }}, { &hf_rrc_UL_CCTrCHList_r4_item, - { "UL-CCTrCHList-r4", "rrc.UL_CCTrCHList_r4_item", + { "UL-CCTrCH-r4", "rrc.UL_CCTrCH_r4", FT_NONE, BASE_NONE, NULL, 0, "rrc.UL_CCTrCH_r4", HFILL }}, { &hf_rrc_UL_CCTrCHList_r7_item, - { "UL-CCTrCHList-r7", "rrc.UL_CCTrCHList_r7_item", + { "UL-CCTrCH-r7", "rrc.UL_CCTrCH_r7", FT_NONE, BASE_NONE, NULL, 0, "rrc.UL_CCTrCH_r7", HFILL }}, { &hf_rrc_UL_CCTrCHListToRemove_item, - { "UL-CCTrCHListToRemove", "rrc.UL_CCTrCHListToRemove_item", + { "TFCS-IdentityPlain", "rrc.TFCS_IdentityPlain", FT_UINT32, BASE_DEC, NULL, 0, "rrc.TFCS_IdentityPlain", HFILL }}, { &hf_rrc_UL_CCTrChTPCList_item, - { "UL-CCTrChTPCList", "rrc.UL_CCTrChTPCList_item", + { "TFCS-Identity", "rrc.TFCS_Identity", FT_NONE, BASE_NONE, NULL, 0, "rrc.TFCS_Identity", HFILL }}, { &hf_rrc_dummy_39, @@ -116644,11 +116644,11 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.T_enabled_03", HFILL }}, { &hf_rrc_UL_TS_ChannelisationCodeList_item, - { "UL-TS-ChannelisationCodeList", "rrc.UL_TS_ChannelisationCodeList_item", + { "UL-TS-ChannelisationCode", "rrc.UL_TS_ChannelisationCode", FT_UINT32, BASE_DEC, VALS(rrc_UL_TS_ChannelisationCode_vals), 0, "rrc.UL_TS_ChannelisationCode", HFILL }}, { &hf_rrc_UL_TS_ChannelisationCodeList_r7_item, - { "UL-TS-ChannelisationCodeList-r7", "rrc.UL_TS_ChannelisationCodeList_r7_item", + { "UL-TS-ChannelisationCodeList-r7 item", "rrc.UL_TS_ChannelisationCodeList_r7_item", FT_NONE, BASE_NONE, NULL, 0, "rrc.UL_TS_ChannelisationCodeList_r7_item", HFILL }}, { &hf_rrc_ul_TS_Channelisation_Code, @@ -116660,7 +116660,7 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.PLCCH_Info", HFILL }}, { &hf_rrc_UL_TS_ChannelisationCodeList_VHCR_item, - { "UL-TS-ChannelisationCodeList-VHCR", "rrc.UL_TS_ChannelisationCodeList_VHCR_item", + { "UL-TS-ChannelisationCode-VHCR", "rrc.UL_TS_ChannelisationCode_VHCR", FT_UINT32, BASE_DEC, VALS(rrc_UL_TS_ChannelisationCode_VHCR_vals), 0, "rrc.UL_TS_ChannelisationCode_VHCR", HFILL }}, { &hf_rrc_parameters_04, @@ -116744,7 +116744,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_maxTS_1_OF_UplinkAdditionalTimeslots", HFILL }}, { &hf_rrc_timeslotList_item_04, - { "timeslotList", "rrc.timeslotList_item", + { "UplinkAdditionalTimeslots", "rrc.UplinkAdditionalTimeslots", FT_NONE, BASE_NONE, NULL, 0, "rrc.UplinkAdditionalTimeslots", HFILL }}, { &hf_rrc_ul_TS_ChannelisationCodeList_02, @@ -116768,7 +116768,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_maxTS_1_OF_UplinkAdditionalTimeslots_VHCR", HFILL }}, { &hf_rrc_timeslotList_item_05, - { "timeslotList", "rrc.timeslotList_item", + { "UplinkAdditionalTimeslots-VHCR", "rrc.UplinkAdditionalTimeslots_VHCR", FT_NONE, BASE_NONE, NULL, 0, "rrc.UplinkAdditionalTimeslots_VHCR", HFILL }}, { &hf_rrc_moreTimeslots_06, @@ -116792,7 +116792,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_maxTS_LCR_1_OF_UplinkAdditionalTimeslots_LCR_r4", HFILL }}, { &hf_rrc_timeslotList_item_06, - { "timeslotList", "rrc.timeslotList_item", + { "UplinkAdditionalTimeslots-LCR-r4", "rrc.UplinkAdditionalTimeslots_LCR_r4", FT_NONE, BASE_NONE, NULL, 0, "rrc.UplinkAdditionalTimeslots_LCR_r4", HFILL }}, { &hf_rrc_moreTimeslots_07, @@ -116812,7 +116812,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_maxTS_LCR_1_OF_UplinkAdditionalTimeslots_LCR_r7", HFILL }}, { &hf_rrc_timeslotList_item_07, - { "timeslotList", "rrc.timeslotList_item", + { "UplinkAdditionalTimeslots-LCR-r7", "rrc.UplinkAdditionalTimeslots_LCR_r7", FT_NONE, BASE_NONE, NULL, 0, "rrc.UplinkAdditionalTimeslots_LCR_r7", HFILL }}, { &hf_rrc_satID, @@ -116848,11 +116848,11 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.AzimuthAndElevation", HFILL }}, { &hf_rrc_AcquisitionSatInfoList_item, - { "AcquisitionSatInfoList", "rrc.AcquisitionSatInfoList_item", + { "AcquisitionSatInfo", "rrc.AcquisitionSatInfo", FT_NONE, BASE_NONE, NULL, 0, "rrc.AcquisitionSatInfo", HFILL }}, { &hf_rrc_AdditionalMeasurementID_List_item, - { "AdditionalMeasurementID-List", "rrc.AdditionalMeasurementID_List_item", + { "MeasurementIdentity", "rrc.MeasurementIdentity", FT_UINT32, BASE_DEC, NULL, 0, "rrc.MeasurementIdentity", HFILL }}, { &hf_rrc_dataID, @@ -116904,7 +116904,7 @@ void proto_register_rrc(void) { FT_BYTES, BASE_HEX, NULL, 0, "rrc.BIT_STRING_SIZE_11", HFILL }}, { &hf_rrc_AlmanacSatInfoList_item, - { "AlmanacSatInfoList", "rrc.AlmanacSatInfoList_item", + { "AlmanacSatInfo", "rrc.AlmanacSatInfo", FT_NONE, BASE_NONE, NULL, 0, "rrc.AlmanacSatInfo", HFILL }}, { &hf_rrc_t_oa_01, @@ -116928,7 +116928,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.INTEGER_0_7", HFILL }}, { &hf_rrc_BadSatList_item, - { "BadSatList", "rrc.BadSatList_item", + { "BadSatList item", "rrc.BadSatList_item", FT_UINT32, BASE_DEC, NULL, 0, "rrc.INTEGER_0_63", HFILL }}, { &hf_rrc_dl_TransportChannelBLER, @@ -116936,11 +116936,11 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.DL_TransportChannelBLER", HFILL }}, { &hf_rrc_BLER_MeasurementResultsList_item, - { "BLER-MeasurementResultsList", "rrc.BLER_MeasurementResultsList_item", + { "BLER-MeasurementResults", "rrc.BLER_MeasurementResults", FT_NONE, BASE_NONE, NULL, 0, "rrc.BLER_MeasurementResults", HFILL }}, { &hf_rrc_BLER_TransChIdList_item, - { "BLER-TransChIdList", "rrc.BLER_TransChIdList_item", + { "TransportChannelIdentity", "rrc.TransportChannelIdentity", FT_UINT32, BASE_DEC, NULL, 0, "rrc.TransportChannelIdentity", HFILL }}, { &hf_rrc_verifiedBSIC, @@ -117148,7 +117148,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_maxCellMeas_OF_PrimaryCPICH_Info", HFILL }}, { &hf_rrc_fdd_item_01, - { "fdd", "rrc.fdd_item", + { "PrimaryCPICH-Info", "rrc.PrimaryCPICH_Info", FT_NONE, BASE_NONE, NULL, 0, "rrc.PrimaryCPICH_Info", HFILL }}, { &hf_rrc_tdd_72, @@ -117156,11 +117156,11 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_maxCellMeas_OF_PrimaryCCPCH_Info", HFILL }}, { &hf_rrc_tdd_item_02, - { "tdd", "rrc.tdd_item", + { "PrimaryCCPCH-Info", "rrc.PrimaryCCPCH_Info", FT_UINT32, BASE_DEC, VALS(rrc_PrimaryCCPCH_Info_vals), 0, "rrc.PrimaryCCPCH_Info", HFILL }}, { &hf_rrc_CellMeasurementEventResults_LCR_r4_item, - { "CellMeasurementEventResults-LCR-r4", "rrc.CellMeasurementEventResults_LCR_r4_item", + { "PrimaryCCPCH-Info-LCR-r4", "rrc.PrimaryCCPCH_Info_LCR_r4", FT_NONE, BASE_NONE, NULL, 0, "rrc.PrimaryCCPCH_Info_LCR_r4", HFILL }}, { &hf_rrc_dummy_41, @@ -117360,15 +117360,15 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.TreselectionScalingFactor", HFILL }}, { &hf_rrc_CellsForInterFreqMeasList_item, - { "CellsForInterFreqMeasList", "rrc.CellsForInterFreqMeasList_item", + { "InterFreqCellID", "rrc.InterFreqCellID", FT_UINT32, BASE_DEC, NULL, 0, "rrc.InterFreqCellID", HFILL }}, { &hf_rrc_CellsForInterRATMeasList_item, - { "CellsForInterRATMeasList", "rrc.CellsForInterRATMeasList_item", + { "InterRATCellID", "rrc.InterRATCellID", FT_UINT32, BASE_DEC, NULL, 0, "rrc.InterRATCellID", HFILL }}, { &hf_rrc_CellsForIntraFreqMeasList_item, - { "CellsForIntraFreqMeasList", "rrc.CellsForIntraFreqMeasList_item", + { "IntraFreqCellID", "rrc.IntraFreqCellID", FT_UINT32, BASE_DEC, NULL, 0, "rrc.IntraFreqCellID", HFILL }}, { &hf_rrc_modeSpecificInfo_83, @@ -117396,7 +117396,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, VALS(rrc_BSICReported_vals), 0, "rrc.BSICReported", HFILL }}, { &hf_rrc_CellToReportList_item, - { "CellToReportList", "rrc.CellToReportList_item", + { "CellToReport", "rrc.CellToReport", FT_NONE, BASE_NONE, NULL, 0, "rrc.CellToReport", HFILL }}, { &hf_rrc_countC_SFN_High, @@ -117416,7 +117416,7 @@ void proto_register_rrc(void) { FT_BYTES, BASE_HEX, NULL, 0, "rrc.BIT_STRING_SIZE_1_1024", HFILL }}, { &hf_rrc_DataBitAssistanceList_item, - { "DataBitAssistanceList", "rrc.DataBitAssistanceList_item", + { "DataBitAssistanceSat", "rrc.DataBitAssistanceSat", FT_NONE, BASE_NONE, NULL, 0, "rrc.DataBitAssistanceSat", HFILL }}, { &hf_rrc_satID_01, @@ -117428,7 +117428,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.DataBitAssistanceSgnList", HFILL }}, { &hf_rrc_DataBitAssistanceSgnList_item, - { "DataBitAssistanceSgnList", "rrc.DataBitAssistanceSgnList_item", + { "DataBitAssistance", "rrc.DataBitAssistance", FT_NONE, BASE_NONE, NULL, 0, "rrc.DataBitAssistance", HFILL }}, { &hf_rrc_deltaRSCP, @@ -117448,7 +117448,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.DGANSSSignalInformationList", HFILL }}, { &hf_rrc_DGANSSInfoList_item, - { "DGANSSInfoList", "rrc.DGANSSInfoList_item", + { "DGANSSInfo", "rrc.DGANSSInfo", FT_NONE, BASE_NONE, NULL, 0, "rrc.DGANSSInfo", HFILL }}, { &hf_rrc_satId, @@ -117472,7 +117472,7 @@ void proto_register_rrc(void) { FT_INT32, BASE_DEC, NULL, 0, "rrc.INTEGER_M127_127", HFILL }}, { &hf_rrc_DGANSSSignalInformationList_item, - { "DGANSSSignalInformationList", "rrc.DGANSSSignalInformationList_item", + { "DGANSSSignalInformation", "rrc.DGANSSSignalInformation", FT_NONE, BASE_NONE, NULL, 0, "rrc.DGANSSSignalInformation", HFILL }}, { &hf_rrc_iode, @@ -117504,7 +117504,7 @@ void proto_register_rrc(void) { FT_INT32, BASE_DEC, NULL, 0, "rrc.DeltaRRC", HFILL }}, { &hf_rrc_DGPS_CorrectionSatInfoList_item, - { "DGPS-CorrectionSatInfoList", "rrc.DGPS_CorrectionSatInfoList_item", + { "DGPS-CorrectionSatInfo", "rrc.DGPS_CorrectionSatInfo", FT_NONE, BASE_NONE, NULL, 0, "rrc.DGPS_CorrectionSatInfo", HFILL }}, { &hf_rrc_latitudeSign, @@ -117748,7 +117748,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_maxOtherRAT_OF_RAT_Type", HFILL }}, { &hf_rrc_inter_RAT_meas_ind_item, - { "inter-RAT-meas-ind", "rrc.inter_RAT_meas_ind_item", + { "RAT-Type", "rrc.RAT_Type", FT_UINT32, BASE_DEC, VALS(rrc_RAT_Type_vals), 0, "rrc.RAT_Type", HFILL }}, { &hf_rrc_inter_freq_TDD128_meas_ind, @@ -117764,15 +117764,15 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.PrimaryCCPCH_Info_LCR_r4", HFILL }}, { &hf_rrc_ForbiddenAffectCellList_item, - { "ForbiddenAffectCellList", "rrc.ForbiddenAffectCellList_item", + { "ForbiddenAffectCell", "rrc.ForbiddenAffectCell", FT_UINT32, BASE_DEC, VALS(rrc_ForbiddenAffectCell_vals), 0, "rrc.ForbiddenAffectCell", HFILL }}, { &hf_rrc_ForbiddenAffectCellList_r4_item, - { "ForbiddenAffectCellList-r4", "rrc.ForbiddenAffectCellList_r4_item", + { "ForbiddenAffectCell-r4", "rrc.ForbiddenAffectCell_r4", FT_UINT32, BASE_DEC, VALS(rrc_ForbiddenAffectCell_r4_vals), 0, "rrc.ForbiddenAffectCell_r4", HFILL }}, { &hf_rrc_ForbiddenAffectCellList_LCR_r4_item, - { "ForbiddenAffectCellList-LCR-r4", "rrc.ForbiddenAffectCellList_LCR_r4_item", + { "ForbiddenAffectCell-LCR-r4", "rrc.ForbiddenAffectCell_LCR_r4", FT_NONE, BASE_NONE, NULL, 0, "rrc.ForbiddenAffectCell_LCR_r4", HFILL }}, { &hf_rrc_ganssTod, @@ -117828,11 +117828,11 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.UE_Positioning_GANSS_UTCModel", HFILL }}, { &hf_rrc_GANSSGenericDataList_item, - { "GANSSGenericDataList", "rrc.GANSSGenericDataList_item", + { "GANSSGenericData", "rrc.GANSSGenericData", FT_NONE, BASE_NONE, NULL, 0, "rrc.GANSSGenericData", HFILL }}, { &hf_rrc_GANSSGenericMeasurementInfo_item, - { "GANSSGenericMeasurementInfo", "rrc.GANSSGenericMeasurementInfo_item", + { "GANSSGenericMeasurementInfo item", "rrc.GANSSGenericMeasurementInfo_item", FT_NONE, BASE_NONE, NULL, 0, "rrc.GANSSGenericMeasurementInfo_item", HFILL }}, { &hf_rrc_ganssCodePhaseAmbiguity, @@ -117844,7 +117844,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.GANSSMeasurementParameters", HFILL }}, { &hf_rrc_GANSSMeasurementParameters_item, - { "GANSSMeasurementParameters", "rrc.GANSSMeasurementParameters_item", + { "GANSSMeasurementParameters item", "rrc.GANSSMeasurementParameters_item", FT_NONE, BASE_NONE, NULL, 0, "rrc.GANSSMeasurementParameters_item", HFILL }}, { &hf_rrc_cSurNzero, @@ -117944,7 +117944,7 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.GanssNavigationModelAdditionalData", HFILL }}, { &hf_rrc_GanssRequestedGenericAssistanceDataList_item, - { "GanssRequestedGenericAssistanceDataList", "rrc.GanssRequestedGenericAssistanceDataList_item", + { "GanssReqGenericData", "rrc.GanssReqGenericData", FT_NONE, BASE_NONE, NULL, 0, "rrc.GanssReqGenericData", HFILL }}, { &hf_rrc_ganssSatId, @@ -117976,11 +117976,11 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.AzimuthAndElevation", HFILL }}, { &hf_rrc_GANSSSatelliteInformationList_item, - { "GANSSSatelliteInformationList", "rrc.GANSSSatelliteInformationList_item", + { "GANSSSatelliteInformation", "rrc.GANSSSatelliteInformation", FT_NONE, BASE_NONE, NULL, 0, "rrc.GANSSSatelliteInformation", HFILL }}, { &hf_rrc_GANSSTimeModelsList_item, - { "GANSSTimeModelsList", "rrc.GANSSTimeModelsList_item", + { "UE-Positioning-GANSS-TimeModel", "rrc.UE_Positioning_GANSS_TimeModel", FT_NONE, BASE_NONE, NULL, 0, "rrc.UE_Positioning_GANSS_TimeModel", HFILL }}, { &hf_rrc_svId, @@ -118028,7 +118028,7 @@ void proto_register_rrc(void) { FT_BYTES, BASE_HEX, NULL, 0, "rrc.BIT_STRING_SIZE_11", HFILL }}, { &hf_rrc_GANSS_SAT_Info_Almanac_KpList_item, - { "GANSS-SAT-Info-Almanac-KpList", "rrc.GANSS_SAT_Info_Almanac_KpList_item", + { "GANSS-SAT-Info-Almanac-Kp", "rrc.GANSS_SAT_Info_Almanac_Kp", FT_NONE, BASE_NONE, NULL, 0, "rrc.GANSS_SAT_Info_Almanac_Kp", HFILL }}, { &hf_rrc_svHealth, @@ -118048,7 +118048,7 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.UE_Positioning_GANSS_OrbitModel", HFILL }}, { &hf_rrc_Ganss_Sat_Info_NavList_item, - { "Ganss-Sat-Info-NavList", "rrc.Ganss_Sat_Info_NavList_item", + { "Ganss-Sat-Info-Nav", "rrc.Ganss_Sat_Info_Nav", FT_NONE, BASE_NONE, NULL, 0, "rrc.Ganss_Sat_Info_Nav", HFILL }}, { &hf_rrc_storm_flag_one, @@ -118100,7 +118100,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.INTEGER_0_63", HFILL }}, { &hf_rrc_GPS_MeasurementParamList_item, - { "GPS-MeasurementParamList", "rrc.GPS_MeasurementParamList_item", + { "GPS-MeasurementParam", "rrc.GPS_MeasurementParam", FT_NONE, BASE_NONE, NULL, 0, "rrc.GPS_MeasurementParam", HFILL }}, { &hf_rrc_gsm_CarrierRSSI, @@ -118116,7 +118116,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.ObservedTimeDifferenceToGSM", HFILL }}, { &hf_rrc_GSM_MeasuredResultsList_item, - { "GSM-MeasuredResultsList", "rrc.GSM_MeasuredResultsList_item", + { "GSM-MeasuredResults", "rrc.GSM_MeasuredResults", FT_NONE, BASE_NONE, NULL, 0, "rrc.GSM_MeasuredResults", HFILL }}, { &hf_rrc_tlm_Message, @@ -118136,7 +118136,7 @@ void proto_register_rrc(void) { FT_BOOLEAN, 8, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_GPS_TOW_AssistList_item, - { "GPS-TOW-AssistList", "rrc.GPS_TOW_AssistList_item", + { "GPS-TOW-Assist", "rrc.GPS_TOW_Assist", FT_NONE, BASE_NONE, NULL, 0, "rrc.GPS_TOW_Assist", HFILL }}, { &hf_rrc_penaltyTime, @@ -118256,15 +118256,15 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.NewInterFreqCellSI_List_HCS_ECN0_LCR_r4", HFILL }}, { &hf_rrc_InterFreqCellList_item, - { "InterFreqCellList", "rrc.InterFreqCellList_item", + { "InterFreqCell", "rrc.InterFreqCell", FT_NONE, BASE_NONE, NULL, 0, "rrc.InterFreqCell", HFILL }}, { &hf_rrc_InterFreqCellList_LCR_r4_ext_item, - { "InterFreqCellList-LCR-r4-ext", "rrc.InterFreqCellList_LCR_r4_ext_item", + { "InterFreqCell-LCR-r4", "rrc.InterFreqCell_LCR_r4", FT_NONE, BASE_NONE, NULL, 0, "rrc.InterFreqCell_LCR_r4", HFILL }}, { &hf_rrc_InterFreqCellMeasuredResultsList_item, - { "InterFreqCellMeasuredResultsList", "rrc.InterFreqCellMeasuredResultsList_item", + { "CellMeasuredResults", "rrc.CellMeasuredResults", FT_NONE, BASE_NONE, NULL, 0, "rrc.CellMeasuredResults", HFILL }}, { &hf_rrc_event2a, @@ -118316,15 +118316,15 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.Event2f_r6", HFILL }}, { &hf_rrc_InterFreqEventList_item, - { "InterFreqEventList", "rrc.InterFreqEventList_item", + { "InterFreqEvent", "rrc.InterFreqEvent", FT_UINT32, BASE_DEC, VALS(rrc_InterFreqEvent_vals), 0, "rrc.InterFreqEvent", HFILL }}, { &hf_rrc_InterFreqEventList_r6_item, - { "InterFreqEventList-r6", "rrc.InterFreqEventList_r6_item", + { "InterFreqEvent-r6", "rrc.InterFreqEvent_r6", FT_UINT32, BASE_DEC, VALS(rrc_InterFreqEvent_r6_vals), 0, "rrc.InterFreqEvent_r6", HFILL }}, { &hf_rrc_InterFrequencyMeasuredResultsList_v590ext_item, - { "InterFrequencyMeasuredResultsList-v590ext", "rrc.InterFrequencyMeasuredResultsList_v590ext_item", + { "DeltaRSCPPerCell", "rrc.DeltaRSCPPerCell", FT_NONE, BASE_NONE, NULL, 0, "rrc.DeltaRSCPPerCell", HFILL }}, { &hf_rrc_threholdUsedFrequency_delta, @@ -118336,15 +118336,15 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.ThreholdNonUsedFrequency_deltaList", HFILL }}, { &hf_rrc_Inter_FreqEventCriteriaList_v590ext_item, - { "Inter-FreqEventCriteriaList-v590ext", "rrc.Inter_FreqEventCriteriaList_v590ext_item", + { "Inter-FreqEventCriteria-v590ext", "rrc.Inter_FreqEventCriteria_v590ext", FT_NONE, BASE_NONE, NULL, 0, "rrc.Inter_FreqEventCriteria_v590ext", HFILL }}, { &hf_rrc_Intra_FreqEventCriteriaList_v590ext_item, - { "Intra-FreqEventCriteriaList-v590ext", "rrc.Intra_FreqEventCriteriaList_v590ext_item", + { "DeltaRSCP", "rrc.DeltaRSCP", FT_INT32, BASE_DEC, NULL, 0, "rrc.DeltaRSCP", HFILL }}, { &hf_rrc_IntraFrequencyMeasuredResultsList_v590ext_item, - { "IntraFrequencyMeasuredResultsList-v590ext", "rrc.IntraFrequencyMeasuredResultsList_v590ext_item", + { "DeltaRSCPPerCell", "rrc.DeltaRSCPPerCell", FT_NONE, BASE_NONE, NULL, 0, "rrc.DeltaRSCPPerCell", HFILL }}, { &hf_rrc_eventID, @@ -118408,7 +118408,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.InterFreqCellMeasuredResultsList", HFILL }}, { &hf_rrc_InterFreqMeasuredResultsList_item, - { "InterFreqMeasuredResultsList", "rrc.InterFreqMeasuredResultsList_item", + { "InterFreqMeasuredResults", "rrc.InterFreqMeasuredResults", FT_NONE, BASE_NONE, NULL, 0, "rrc.InterFreqMeasuredResults", HFILL }}, { &hf_rrc_interFreqCellInfoSI_List, @@ -118444,7 +118444,7 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.InterFreqCellInfoSI_List_HCS_ECN0_LCR", HFILL }}, { &hf_rrc_InterFreqRACHRepCellsList_item, - { "InterFreqRACHRepCellsList", "rrc.InterFreqRACHRepCellsList_item", + { "InterFreqCellID", "rrc.InterFreqCellID", FT_UINT32, BASE_DEC, NULL, 0, "rrc.InterFreqCellID", HFILL }}, { &hf_rrc_modeSpecificInfo_85, @@ -118536,7 +118536,7 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.CellReportingQuantities", HFILL }}, { &hf_rrc_InterFreqRepQuantityRACH_TDDList_item, - { "InterFreqRepQuantityRACH-TDDList", "rrc.InterFreqRepQuantityRACH_TDDList_item", + { "InterFreqRepQuantityRACH-TDD", "rrc.InterFreqRepQuantityRACH_TDD", FT_UINT32, BASE_DEC, VALS(rrc_InterFreqRepQuantityRACH_TDD_vals), 0, "rrc.InterFreqRepQuantityRACH_TDD", HFILL }}, { &hf_rrc_interFreqCellInfoList, @@ -118640,7 +118640,7 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.Event3d", HFILL }}, { &hf_rrc_InterRATEventList_item, - { "InterRATEventList", "rrc.InterRATEventList_item", + { "InterRATEvent", "rrc.InterRATEvent", FT_UINT32, BASE_DEC, VALS(rrc_InterRATEvent_vals), 0, "rrc.InterRATEvent", HFILL }}, { &hf_rrc_eventID_01, @@ -118704,7 +118704,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.GSM_MeasuredResultsList", HFILL }}, { &hf_rrc_InterRATMeasuredResultsList_item, - { "InterRATMeasuredResultsList", "rrc.InterRATMeasuredResultsList_item", + { "InterRATMeasuredResults", "rrc.InterRATMeasuredResults", FT_UINT32, BASE_DEC, VALS(rrc_InterRATMeasuredResults_vals), 0, "rrc.InterRATMeasuredResults", HFILL }}, { &hf_rrc_interRATCellInfoList, @@ -118908,23 +118908,23 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, VALS(rrc_IntraFreqEvent_r7_vals), 0, "rrc.IntraFreqEvent_r7", HFILL }}, { &hf_rrc_IntraFreqEventCriteriaList_item, - { "IntraFreqEventCriteriaList", "rrc.IntraFreqEventCriteriaList_item", + { "IntraFreqEventCriteria", "rrc.IntraFreqEventCriteria", FT_NONE, BASE_NONE, NULL, 0, "rrc.IntraFreqEventCriteria", HFILL }}, { &hf_rrc_IntraFreqEventCriteriaList_r4_item, - { "IntraFreqEventCriteriaList-r4", "rrc.IntraFreqEventCriteriaList_r4_item", + { "IntraFreqEventCriteria-r4", "rrc.IntraFreqEventCriteria_r4", FT_NONE, BASE_NONE, NULL, 0, "rrc.IntraFreqEventCriteria_r4", HFILL }}, { &hf_rrc_IntraFreqEventCriteriaList_LCR_r4_item, - { "IntraFreqEventCriteriaList-LCR-r4", "rrc.IntraFreqEventCriteriaList_LCR_r4_item", + { "IntraFreqEventCriteria-LCR-r4", "rrc.IntraFreqEventCriteria_LCR_r4", FT_NONE, BASE_NONE, NULL, 0, "rrc.IntraFreqEventCriteria_LCR_r4", HFILL }}, { &hf_rrc_IntraFreqEventCriteriaList_r6_item, - { "IntraFreqEventCriteriaList-r6", "rrc.IntraFreqEventCriteriaList_r6_item", + { "IntraFreqEventCriteria-r6", "rrc.IntraFreqEventCriteria_r6", FT_NONE, BASE_NONE, NULL, 0, "rrc.IntraFreqEventCriteria_r6", HFILL }}, { &hf_rrc_IntraFreqEventCriteriaList_r7_item, - { "IntraFreqEventCriteriaList-r7", "rrc.IntraFreqEventCriteriaList_r7_item", + { "IntraFreqEventCriteria-r7", "rrc.IntraFreqEventCriteria_r7", FT_NONE, BASE_NONE, NULL, 0, "rrc.IntraFreqEventCriteria_r7", HFILL }}, { &hf_rrc_eventID_02, @@ -118956,15 +118956,15 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.IntraFreqMeasQuantity_TDDList", HFILL }}, { &hf_rrc_IntraFreqMeasQuantity_TDDList_item, - { "IntraFreqMeasQuantity-TDDList", "rrc.IntraFreqMeasQuantity_TDDList_item", + { "IntraFreqMeasQuantity-TDD", "rrc.IntraFreqMeasQuantity_TDD", FT_UINT32, BASE_DEC, VALS(rrc_IntraFreqMeasQuantity_TDD_vals), 0, "rrc.IntraFreqMeasQuantity_TDD", HFILL }}, { &hf_rrc_IntraFreqMeasQuantity_TDD_sib3List_item, - { "IntraFreqMeasQuantity-TDD-sib3List", "rrc.IntraFreqMeasQuantity_TDD_sib3List_item", + { "IntraFreqMeasQuantity-TDD-sib3List item", "rrc.IntraFreqMeasQuantity_TDD_sib3List_item", FT_UINT32, BASE_DEC, VALS(rrc_IntraFreqMeasQuantity_TDD_sib3List_item_vals), 0, "rrc.IntraFreqMeasQuantity_TDD_sib3List_item", HFILL }}, { &hf_rrc_IntraFreqMeasuredResultsList_item, - { "IntraFreqMeasuredResultsList", "rrc.IntraFreqMeasuredResultsList_item", + { "CellMeasuredResults", "rrc.CellMeasuredResults", FT_NONE, BASE_NONE, NULL, 0, "rrc.CellMeasuredResults", HFILL }}, { &hf_rrc_intraFreqMeasurementID, @@ -119076,7 +119076,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.IntraFreqRepQuantityRACH_TDDList", HFILL }}, { &hf_rrc_IntraFreqRepQuantityRACH_TDDList_item, - { "IntraFreqRepQuantityRACH-TDDList", "rrc.IntraFreqRepQuantityRACH_TDDList_item", + { "IntraFreqRepQuantityRACH-TDD", "rrc.IntraFreqRepQuantityRACH_TDD", FT_UINT32, BASE_DEC, VALS(rrc_IntraFreqRepQuantityRACH_TDD_vals), 0, "rrc.IntraFreqRepQuantityRACH_TDD", HFILL }}, { &hf_rrc_intraFreqCellInfoList, @@ -119228,15 +119228,15 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.UE_Positioning_MeasuredResults", HFILL }}, { &hf_rrc_MeasuredResultsList_item, - { "MeasuredResultsList", "rrc.MeasuredResultsList_item", + { "MeasuredResults", "rrc.MeasuredResults", FT_UINT32, BASE_DEC, VALS(rrc_MeasuredResults_vals), 0, "rrc.MeasuredResults", HFILL }}, { &hf_rrc_MeasuredResultsList_LCR_r4_ext_item, - { "MeasuredResultsList-LCR-r4-ext", "rrc.MeasuredResultsList_LCR_r4_ext_item", + { "MeasuredResults-LCR-r4", "rrc.MeasuredResults_LCR_r4", FT_UINT32, BASE_DEC, VALS(rrc_MeasuredResults_LCR_r4_vals), 0, "rrc.MeasuredResults_LCR_r4", HFILL }}, { &hf_rrc_MeasuredResultsList_v770xet_item, - { "MeasuredResultsList-v770xet", "rrc.MeasuredResultsList_v770xet_item", + { "MeasuredResultsList-v770xet item", "rrc.MeasuredResultsList_v770xet_item", FT_NONE, BASE_NONE, NULL, 0, "rrc.MeasuredResultsList_v770xet_item", HFILL }}, { &hf_rrc_currentCell, @@ -119452,7 +119452,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_maxCellMeas_OF_CellSelectReselectInfo_v590ext", HFILL }}, { &hf_rrc_newIntraFrequencyCellInfoListAddon_r5_item, - { "newIntraFrequencyCellInfoListAddon-r5", "rrc.newIntraFrequencyCellInfoListAddon_r5_item", + { "CellSelectReselectInfo-v590ext", "rrc.CellSelectReselectInfo_v590ext", FT_NONE, BASE_NONE, NULL, 0, "rrc.CellSelectReselectInfo_v590ext", HFILL }}, { &hf_rrc_newInterFrequencyCellInfoListAddon_r5, @@ -119460,7 +119460,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_maxCellMeas_OF_CellSelectReselectInfo_v590ext", HFILL }}, { &hf_rrc_newInterFrequencyCellInfoListAddon_r5_item, - { "newInterFrequencyCellInfoListAddon-r5", "rrc.newInterFrequencyCellInfoListAddon_r5_item", + { "CellSelectReselectInfo-v590ext", "rrc.CellSelectReselectInfo_v590ext", FT_NONE, BASE_NONE, NULL, 0, "rrc.CellSelectReselectInfo_v590ext", HFILL }}, { &hf_rrc_newInterRATCellInfoListAddon_r5, @@ -119468,7 +119468,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_maxCellMeas_OF_CellSelectReselectInfo_v590ext", HFILL }}, { &hf_rrc_newInterRATCellInfoListAddon_r5_item, - { "newInterRATCellInfoListAddon-r5", "rrc.newInterRATCellInfoListAddon_r5_item", + { "CellSelectReselectInfo-v590ext", "rrc.CellSelectReselectInfo_v590ext", FT_NONE, BASE_NONE, NULL, 0, "rrc.CellSelectReselectInfo_v590ext", HFILL }}, { &hf_rrc_use_of_HCS_02, @@ -119660,7 +119660,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, VALS(rrc_T_ue_State_vals), 0, "rrc.T_ue_State", HFILL }}, { &hf_rrc_MonitoredCellRACH_List_item, - { "MonitoredCellRACH-List", "rrc.MonitoredCellRACH_List_item", + { "MonitoredCellRACH-Result", "rrc.MonitoredCellRACH_Result", FT_NONE, BASE_NONE, NULL, 0, "rrc.MonitoredCellRACH_Result", HFILL }}, { &hf_rrc_sfn_SFN_ObsTimeDifference, @@ -119700,7 +119700,7 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.EphemerisParameter", HFILL }}, { &hf_rrc_NavigationModelSatInfoList_item, - { "NavigationModelSatInfoList", "rrc.NavigationModelSatInfoList_item", + { "NavigationModelSatInfo", "rrc.NavigationModelSatInfo", FT_NONE, BASE_NONE, NULL, 0, "rrc.NavigationModelSatInfo", HFILL }}, { &hf_rrc_codeOnL2, @@ -119860,7 +119860,7 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.T_fdd_130", HFILL }}, { &hf_rrc_NeighbourList_item, - { "NeighbourList", "rrc.NeighbourList_item", + { "Neighbour", "rrc.Neighbour", FT_NONE, BASE_NONE, NULL, 0, "rrc.Neighbour", HFILL }}, { &hf_rrc_uarfcn, @@ -119868,11 +119868,11 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.UARFCN", HFILL }}, { &hf_rrc_NeighbourList_TDD_r7_item, - { "NeighbourList-TDD-r7", "rrc.NeighbourList_TDD_r7_item", + { "Neighbour-TDD-r7", "rrc.Neighbour_TDD_r7", FT_NONE, BASE_NONE, NULL, 0, "rrc.Neighbour_TDD_r7", HFILL }}, { &hf_rrc_NeighbourList_v390ext_item, - { "NeighbourList-v390ext", "rrc.NeighbourList_v390ext_item", + { "Neighbour-v390ext", "rrc.Neighbour_v390ext", FT_NONE, BASE_NONE, NULL, 0, "rrc.Neighbour_v390ext", HFILL }}, { &hf_rrc_ue_Positioning_OTDOA_Quality, @@ -119892,11 +119892,11 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.CellInfo_r4", HFILL }}, { &hf_rrc_NewInterFreqCellList_item, - { "NewInterFreqCellList", "rrc.NewInterFreqCellList_item", + { "NewInterFreqCell", "rrc.NewInterFreqCell", FT_NONE, BASE_NONE, NULL, 0, "rrc.NewInterFreqCell", HFILL }}, { &hf_rrc_NewInterFreqCellList_r4_item, - { "NewInterFreqCellList-r4", "rrc.NewInterFreqCellList_r4_item", + { "NewInterFreqCell-r4", "rrc.NewInterFreqCell_r4", FT_NONE, BASE_NONE, NULL, 0, "rrc.NewInterFreqCell_r4", HFILL }}, { &hf_rrc_cellInfo_02, @@ -119932,35 +119932,35 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.CellInfoSI_HCS_ECN0_LCR_r4", HFILL }}, { &hf_rrc_NewInterFreqCellSI_List_ECN0_item, - { "NewInterFreqCellSI-List-ECN0", "rrc.NewInterFreqCellSI_List_ECN0_item", + { "NewInterFreqCellSI-ECN0", "rrc.NewInterFreqCellSI_ECN0", FT_NONE, BASE_NONE, NULL, 0, "rrc.NewInterFreqCellSI_ECN0", HFILL }}, { &hf_rrc_NewInterFreqCellSI_List_HCS_RSCP_item, - { "NewInterFreqCellSI-List-HCS-RSCP", "rrc.NewInterFreqCellSI_List_HCS_RSCP_item", + { "NewInterFreqCellSI-HCS-RSCP", "rrc.NewInterFreqCellSI_HCS_RSCP", FT_NONE, BASE_NONE, NULL, 0, "rrc.NewInterFreqCellSI_HCS_RSCP", HFILL }}, { &hf_rrc_NewInterFreqCellSI_List_HCS_ECN0_item, - { "NewInterFreqCellSI-List-HCS-ECN0", "rrc.NewInterFreqCellSI_List_HCS_ECN0_item", + { "NewInterFreqCellSI-HCS-ECN0", "rrc.NewInterFreqCellSI_HCS_ECN0", FT_NONE, BASE_NONE, NULL, 0, "rrc.NewInterFreqCellSI_HCS_ECN0", HFILL }}, { &hf_rrc_NewInterFreqCellSI_List_RSCP_item, - { "NewInterFreqCellSI-List-RSCP", "rrc.NewInterFreqCellSI_List_RSCP_item", + { "NewInterFreqCellSI-RSCP", "rrc.NewInterFreqCellSI_RSCP", FT_NONE, BASE_NONE, NULL, 0, "rrc.NewInterFreqCellSI_RSCP", HFILL }}, { &hf_rrc_NewInterFreqCellSI_List_ECN0_LCR_r4_item, - { "NewInterFreqCellSI-List-ECN0-LCR-r4", "rrc.NewInterFreqCellSI_List_ECN0_LCR_r4_item", + { "NewInterFreqCellSI-ECN0-LCR-r4", "rrc.NewInterFreqCellSI_ECN0_LCR_r4", FT_NONE, BASE_NONE, NULL, 0, "rrc.NewInterFreqCellSI_ECN0_LCR_r4", HFILL }}, { &hf_rrc_NewInterFreqCellSI_List_HCS_RSCP_LCR_r4_item, - { "NewInterFreqCellSI-List-HCS-RSCP-LCR-r4", "rrc.NewInterFreqCellSI_List_HCS_RSCP_LCR_r4_item", + { "NewInterFreqCellSI-HCS-RSCP-LCR-r4", "rrc.NewInterFreqCellSI_HCS_RSCP_LCR_r4", FT_NONE, BASE_NONE, NULL, 0, "rrc.NewInterFreqCellSI_HCS_RSCP_LCR_r4", HFILL }}, { &hf_rrc_NewInterFreqCellSI_List_HCS_ECN0_LCR_r4_item, - { "NewInterFreqCellSI-List-HCS-ECN0-LCR-r4", "rrc.NewInterFreqCellSI_List_HCS_ECN0_LCR_r4_item", + { "NewInterFreqCellSI-HCS-ECN0-LCR-r4", "rrc.NewInterFreqCellSI_HCS_ECN0_LCR_r4", FT_NONE, BASE_NONE, NULL, 0, "rrc.NewInterFreqCellSI_HCS_ECN0_LCR_r4", HFILL }}, { &hf_rrc_NewInterFreqCellSI_List_RSCP_LCR_r4_item, - { "NewInterFreqCellSI-List-RSCP-LCR-r4", "rrc.NewInterFreqCellSI_List_RSCP_LCR_r4_item", + { "NewInterFreqCellSI-RSCP-LCR-r4", "rrc.NewInterFreqCellSI_RSCP_LCR_r4", FT_NONE, BASE_NONE, NULL, 0, "rrc.NewInterFreqCellSI_RSCP_LCR_r4", HFILL }}, { &hf_rrc_interRATCellID, @@ -120004,11 +120004,11 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.T_is_2000_02", HFILL }}, { &hf_rrc_NewInterRATCellList_item, - { "NewInterRATCellList", "rrc.NewInterRATCellList_item", + { "NewInterRATCell", "rrc.NewInterRATCell", FT_NONE, BASE_NONE, NULL, 0, "rrc.NewInterRATCell", HFILL }}, { &hf_rrc_NewInterRATCellList_B_item, - { "NewInterRATCellList-B", "rrc.NewInterRATCellList_B_item", + { "NewInterRATCell-B", "rrc.NewInterRATCell_B", FT_NONE, BASE_NONE, NULL, 0, "rrc.NewInterRATCell_B", HFILL }}, { &hf_rrc_intraFreqCellID, @@ -120016,43 +120016,43 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.IntraFreqCellID", HFILL }}, { &hf_rrc_NewIntraFreqCellList_item, - { "NewIntraFreqCellList", "rrc.NewIntraFreqCellList_item", + { "NewIntraFreqCell", "rrc.NewIntraFreqCell", FT_NONE, BASE_NONE, NULL, 0, "rrc.NewIntraFreqCell", HFILL }}, { &hf_rrc_NewIntraFreqCellList_r4_item, - { "NewIntraFreqCellList-r4", "rrc.NewIntraFreqCellList_r4_item", + { "NewIntraFreqCell-r4", "rrc.NewIntraFreqCell_r4", FT_NONE, BASE_NONE, NULL, 0, "rrc.NewIntraFreqCell_r4", HFILL }}, { &hf_rrc_NewIntraFreqCellSI_List_RSCP_item, - { "NewIntraFreqCellSI-List-RSCP", "rrc.NewIntraFreqCellSI_List_RSCP_item", + { "NewIntraFreqCellSI-RSCP", "rrc.NewIntraFreqCellSI_RSCP", FT_NONE, BASE_NONE, NULL, 0, "rrc.NewIntraFreqCellSI_RSCP", HFILL }}, { &hf_rrc_NewIntraFreqCellSI_List_ECN0_item, - { "NewIntraFreqCellSI-List-ECN0", "rrc.NewIntraFreqCellSI_List_ECN0_item", + { "NewIntraFreqCellSI-ECN0", "rrc.NewIntraFreqCellSI_ECN0", FT_NONE, BASE_NONE, NULL, 0, "rrc.NewIntraFreqCellSI_ECN0", HFILL }}, { &hf_rrc_NewIntraFreqCellSI_List_HCS_RSCP_item, - { "NewIntraFreqCellSI-List-HCS-RSCP", "rrc.NewIntraFreqCellSI_List_HCS_RSCP_item", + { "NewIntraFreqCellSI-HCS-RSCP", "rrc.NewIntraFreqCellSI_HCS_RSCP", FT_NONE, BASE_NONE, NULL, 0, "rrc.NewIntraFreqCellSI_HCS_RSCP", HFILL }}, { &hf_rrc_NewIntraFreqCellSI_List_HCS_ECN0_item, - { "NewIntraFreqCellSI-List-HCS-ECN0", "rrc.NewIntraFreqCellSI_List_HCS_ECN0_item", + { "NewIntraFreqCellSI-HCS-ECN0", "rrc.NewIntraFreqCellSI_HCS_ECN0", FT_NONE, BASE_NONE, NULL, 0, "rrc.NewIntraFreqCellSI_HCS_ECN0", HFILL }}, { &hf_rrc_NewIntraFreqCellSI_List_RSCP_LCR_r4_item, - { "NewIntraFreqCellSI-List-RSCP-LCR-r4", "rrc.NewIntraFreqCellSI_List_RSCP_LCR_r4_item", + { "NewIntraFreqCellSI-RSCP-LCR-r4", "rrc.NewIntraFreqCellSI_RSCP_LCR_r4", FT_NONE, BASE_NONE, NULL, 0, "rrc.NewIntraFreqCellSI_RSCP_LCR_r4", HFILL }}, { &hf_rrc_NewIntraFreqCellSI_List_ECN0_LCR_r4_item, - { "NewIntraFreqCellSI-List-ECN0-LCR-r4", "rrc.NewIntraFreqCellSI_List_ECN0_LCR_r4_item", + { "NewIntraFreqCellSI-ECN0-LCR-r4", "rrc.NewIntraFreqCellSI_ECN0_LCR_r4", FT_NONE, BASE_NONE, NULL, 0, "rrc.NewIntraFreqCellSI_ECN0_LCR_r4", HFILL }}, { &hf_rrc_NewIntraFreqCellSI_List_HCS_RSCP_LCR_r4_item, - { "NewIntraFreqCellSI-List-HCS-RSCP-LCR-r4", "rrc.NewIntraFreqCellSI_List_HCS_RSCP_LCR_r4_item", + { "NewIntraFreqCellSI-HCS-RSCP-LCR-r4", "rrc.NewIntraFreqCellSI_HCS_RSCP_LCR_r4", FT_NONE, BASE_NONE, NULL, 0, "rrc.NewIntraFreqCellSI_HCS_RSCP_LCR_r4", HFILL }}, { &hf_rrc_NewIntraFreqCellSI_List_HCS_ECN0_LCR_r4_item, - { "NewIntraFreqCellSI-List-HCS-ECN0-LCR-r4", "rrc.NewIntraFreqCellSI_List_HCS_ECN0_LCR_r4_item", + { "NewIntraFreqCellSI-HCS-ECN0-LCR-r4", "rrc.NewIntraFreqCellSI_HCS_ECN0_LCR_r4", FT_NONE, BASE_NONE, NULL, 0, "rrc.NewIntraFreqCellSI_HCS_ECN0_LCR_r4", HFILL }}, { &hf_rrc_nonUsedFreqThreshold, @@ -120068,15 +120068,15 @@ void proto_register_rrc(void) { FT_INT32, BASE_DEC, NULL, 0, "rrc.Threshold_r6", HFILL }}, { &hf_rrc_NonUsedFreqParameterList_item, - { "NonUsedFreqParameterList", "rrc.NonUsedFreqParameterList_item", + { "NonUsedFreqParameter", "rrc.NonUsedFreqParameter", FT_NONE, BASE_NONE, NULL, 0, "rrc.NonUsedFreqParameter", HFILL }}, { &hf_rrc_NonUsedFreqParameterList_r6_item, - { "NonUsedFreqParameterList-r6", "rrc.NonUsedFreqParameterList_r6_item", + { "NonUsedFreqParameter-r6", "rrc.NonUsedFreqParameter_r6", FT_NONE, BASE_NONE, NULL, 0, "rrc.NonUsedFreqParameter_r6", HFILL }}, { &hf_rrc_NonUsedFreqWList_r6_item, - { "NonUsedFreqWList-r6", "rrc.NonUsedFreqWList_r6_item", + { "W", "rrc.W", FT_UINT32, BASE_DEC, NULL, 0, "rrc.W", HFILL }}, { &hf_rrc_notUsed, @@ -120148,15 +120148,15 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.PLMNsOfInterRATCellsList", HFILL }}, { &hf_rrc_PLMNsOfInterFreqCellsList_item, - { "PLMNsOfInterFreqCellsList", "rrc.PLMNsOfInterFreqCellsList_item", + { "PLMNsOfInterFreqCellsList item", "rrc.PLMNsOfInterFreqCellsList_item", FT_NONE, BASE_NONE, NULL, 0, "rrc.PLMNsOfInterFreqCellsList_item", HFILL }}, { &hf_rrc_PLMNsOfIntraFreqCellsList_item, - { "PLMNsOfIntraFreqCellsList", "rrc.PLMNsOfIntraFreqCellsList_item", + { "PLMNsOfIntraFreqCellsList item", "rrc.PLMNsOfIntraFreqCellsList_item", FT_NONE, BASE_NONE, NULL, 0, "rrc.PLMNsOfIntraFreqCellsList_item", HFILL }}, { &hf_rrc_PLMNsOfInterRATCellsList_item, - { "PLMNsOfInterRATCellsList", "rrc.PLMNsOfInterRATCellsList_item", + { "PLMNsOfInterRATCellsList item", "rrc.PLMNsOfInterRATCellsList_item", FT_NONE, BASE_NONE, NULL, 0, "rrc.PLMNsOfInterRATCellsList_item", HFILL }}, { &hf_rrc_ellipsoidPoint, @@ -120180,7 +120180,7 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.EllipsoidPointAltitudeEllipsoide", HFILL }}, { &hf_rrc_QualityEventResults_item, - { "QualityEventResults", "rrc.QualityEventResults_item", + { "TransportChannelIdentity", "rrc.TransportChannelIdentity", FT_UINT32, BASE_DEC, NULL, 0, "rrc.TransportChannelIdentity", HFILL }}, { &hf_rrc_blerMeasurementResultsList, @@ -120216,7 +120216,7 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.NULL", HFILL }}, { &hf_rrc_QualityReportingCriteria_item, - { "QualityReportingCriteria", "rrc.QualityReportingCriteria_item", + { "QualityReportingCriteriaSingle", "rrc.QualityReportingCriteriaSingle", FT_NONE, BASE_NONE, NULL, 0, "rrc.QualityReportingCriteriaSingle", HFILL }}, { &hf_rrc_totalCRC, @@ -120280,7 +120280,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_maxCellMeas_OF_InterFreqCellID", HFILL }}, { &hf_rrc_removeSomeInterFreqCells_item, - { "removeSomeInterFreqCells", "rrc.removeSomeInterFreqCells_item", + { "InterFreqCellID", "rrc.InterFreqCellID", FT_UINT32, BASE_DEC, NULL, 0, "rrc.InterFreqCellID", HFILL }}, { &hf_rrc_removeNoInterFreqCells, @@ -120296,7 +120296,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_maxCellMeas_OF_InterRATCellID", HFILL }}, { &hf_rrc_removeSomeInterRATCells_item, - { "removeSomeInterRATCells", "rrc.removeSomeInterRATCells_item", + { "InterRATCellID", "rrc.InterRATCellID", FT_UINT32, BASE_DEC, NULL, 0, "rrc.InterRATCellID", HFILL }}, { &hf_rrc_removeNoInterRATCells, @@ -120312,7 +120312,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_maxCellMeas_OF_IntraFreqCellID", HFILL }}, { &hf_rrc_removeSomeIntraFreqCells_item, - { "removeSomeIntraFreqCells", "rrc.removeSomeIntraFreqCells_item", + { "IntraFreqCellID", "rrc.IntraFreqCellID", FT_UINT32, BASE_DEC, NULL, 0, "rrc.IntraFreqCellID", HFILL }}, { &hf_rrc_removeNoIntraFreqCells, @@ -120384,7 +120384,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, VALS(rrc_CellDCH_ReportCriteria_LCR_r4_vals), 0, "rrc.CellDCH_ReportCriteria_LCR_r4", HFILL }}, { &hf_rrc_ReqDataBitAssistanceList_item, - { "ReqDataBitAssistanceList", "rrc.ReqDataBitAssistanceList_item", + { "ReqDataBitAssistanceList item", "rrc.ReqDataBitAssistanceList_item", FT_NONE, BASE_NONE, NULL, 0, "rrc.ReqDataBitAssistanceList_item", HFILL }}, { &hf_rrc_ganssDataBitAssistance, @@ -120392,7 +120392,7 @@ void proto_register_rrc(void) { FT_BOOLEAN, 8, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_RL_AdditionInfoList_item, - { "RL-AdditionInfoList", "rrc.RL_AdditionInfoList_item", + { "PrimaryCPICH-Info", "rrc.PrimaryCPICH_Info", FT_NONE, BASE_NONE, NULL, 0, "rrc.PrimaryCPICH_Info", HFILL }}, { &hf_rrc_rl_AdditionInfoList, @@ -120404,7 +120404,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.RL_RemovalInformationList", HFILL }}, { &hf_rrc_SatDataList_item, - { "SatDataList", "rrc.SatDataList_item", + { "SatData", "rrc.SatData", FT_NONE, BASE_NONE, NULL, 0, "rrc.SatData", HFILL }}, { &hf_rrc_iod_01, @@ -120412,7 +120412,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.INTEGER_0_1023", HFILL }}, { &hf_rrc_SatellitesListRelatedDataList_item, - { "SatellitesListRelatedDataList", "rrc.SatellitesListRelatedDataList_item", + { "SatellitesListRelatedData", "rrc.SatellitesListRelatedData", FT_NONE, BASE_NONE, NULL, 0, "rrc.SatellitesListRelatedData", HFILL }}, { &hf_rrc_t_oc_lsb, @@ -120440,7 +120440,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.INTEGER_0_1", HFILL }}, { &hf_rrc_Satellite_clock_modelList_item, - { "Satellite-clock-modelList", "rrc.Satellite_clock_modelList_item", + { "Satellite-clock-model", "rrc.Satellite_clock_model", FT_NONE, BASE_NONE, NULL, 0, "rrc.Satellite_clock_model", HFILL }}, { &hf_rrc_type1_07, @@ -120460,7 +120460,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.INTEGER_0_38399", HFILL }}, { &hf_rrc_SIR_MeasurementList_item, - { "SIR-MeasurementList", "rrc.SIR_MeasurementList_item", + { "SIR-MeasurementResults", "rrc.SIR_MeasurementResults", FT_NONE, BASE_NONE, NULL, 0, "rrc.SIR_MeasurementResults", HFILL }}, { &hf_rrc_sir_TimeslotList, @@ -120468,11 +120468,11 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SIR_TimeslotList", HFILL }}, { &hf_rrc_SIR_TFCS_List_item, - { "SIR-TFCS-List", "rrc.SIR_TFCS_List_item", + { "SIR-TFCS", "rrc.SIR_TFCS", FT_UINT32, BASE_DEC, NULL, 0, "rrc.SIR_TFCS", HFILL }}, { &hf_rrc_SIR_TimeslotList_item, - { "SIR-TimeslotList", "rrc.SIR_TimeslotList_item", + { "SIR", "rrc.SIR", FT_UINT32, BASE_DEC, NULL, 0, "rrc.SIR", HFILL }}, { &hf_rrc_reserved1, @@ -120532,15 +120532,15 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, VALS(rrc_TemporaryOffset2_vals), 0, "rrc.TemporaryOffset2", HFILL }}, { &hf_rrc_ThreholdNonUsedFrequency_deltaList_item, - { "ThreholdNonUsedFrequency-deltaList", "rrc.ThreholdNonUsedFrequency_deltaList_item", + { "DeltaRSCPPerCell", "rrc.DeltaRSCPPerCell", FT_NONE, BASE_NONE, NULL, 0, "rrc.DeltaRSCPPerCell", HFILL }}, { &hf_rrc_TimeslotInfoList_item, - { "TimeslotInfoList", "rrc.TimeslotInfoList_item", + { "TimeslotInfo", "rrc.TimeslotInfo", FT_NONE, BASE_NONE, NULL, 0, "rrc.TimeslotInfo", HFILL }}, { &hf_rrc_TimeslotInfoList_LCR_r4_item, - { "TimeslotInfoList-LCR-r4", "rrc.TimeslotInfoList_LCR_r4_item", + { "TimeslotInfo-LCR-r4", "rrc.TimeslotInfo_LCR_r4", FT_NONE, BASE_NONE, NULL, 0, "rrc.TimeslotInfo_LCR_r4", HFILL }}, { &hf_rrc_tdd384_38, @@ -120548,7 +120548,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_maxTS_OF_TimeslotInfo", HFILL }}, { &hf_rrc_tdd384_item_01, - { "tdd384", "rrc.tdd384_item", + { "TimeslotInfo", "rrc.TimeslotInfo", FT_NONE, BASE_NONE, NULL, 0, "rrc.TimeslotInfo", HFILL }}, { &hf_rrc_tdd128_43, @@ -120556,15 +120556,15 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_maxTS_LCR_OF_TimeslotInfo_LCR_r4", HFILL }}, { &hf_rrc_tdd128_item_02, - { "tdd128", "rrc.tdd128_item", + { "TimeslotInfo-LCR-r4", "rrc.TimeslotInfo_LCR_r4", FT_NONE, BASE_NONE, NULL, 0, "rrc.TimeslotInfo_LCR_r4", HFILL }}, { &hf_rrc_TimeslotISCP_List_item, - { "TimeslotISCP-List", "rrc.TimeslotISCP_List_item", + { "TimeslotISCP", "rrc.TimeslotISCP", FT_UINT32, BASE_DEC, NULL, 0, "rrc.TimeslotISCP", HFILL }}, { &hf_rrc_TimeslotListWithISCP_item, - { "TimeslotListWithISCP", "rrc.TimeslotListWithISCP_item", + { "TimeslotWithISCP", "rrc.TimeslotWithISCP", FT_NONE, BASE_NONE, NULL, 0, "rrc.TimeslotWithISCP", HFILL }}, { &hf_rrc_timeslotISCP_01, @@ -120644,7 +120644,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, VALS(rrc_VarianceOfRLC_BufferPayload_vals), 0, "rrc.VarianceOfRLC_BufferPayload", HFILL }}, { &hf_rrc_TrafficVolumeMeasuredResultsList_item, - { "TrafficVolumeMeasuredResultsList", "rrc.TrafficVolumeMeasuredResultsList_item", + { "TrafficVolumeMeasuredResults", "rrc.TrafficVolumeMeasuredResults", FT_NONE, BASE_NONE, NULL, 0, "rrc.TrafficVolumeMeasuredResults", HFILL }}, { &hf_rrc_reportCriteria_12, @@ -120652,7 +120652,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, VALS(rrc_TrafficVolumeReportCriteria_vals), 0, "rrc.TrafficVolumeReportCriteria", HFILL }}, { &hf_rrc_TrafficVolumeMeasurementObjectList_item, - { "TrafficVolumeMeasurementObjectList", "rrc.TrafficVolumeMeasurementObjectList_item", + { "UL-TrCH-Identity", "rrc.UL_TrCH_Identity", FT_UINT32, BASE_DEC, VALS(rrc_UL_TrCH_Identity_vals), 0, "rrc.UL_TrCH_Identity", HFILL }}, { &hf_rrc_trafficVolumeReportingCriteria, @@ -120684,11 +120684,11 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_maxMeasParEvent_OF_TrafficVolumeEventParam", HFILL }}, { &hf_rrc_eventSpecificParameters_item, - { "eventSpecificParameters", "rrc.eventSpecificParameters_item", + { "TrafficVolumeEventParam", "rrc.TrafficVolumeEventParam", FT_NONE, BASE_NONE, NULL, 0, "rrc.TrafficVolumeEventParam", HFILL }}, { &hf_rrc_TransChCriteriaList_item, - { "TransChCriteriaList", "rrc.TransChCriteriaList_item", + { "TransChCriteria", "rrc.TransChCriteria", FT_NONE, BASE_NONE, NULL, 0, "rrc.TransChCriteria", HFILL }}, { &hf_rrc_transmittedPowerThreshold, @@ -120736,7 +120736,7 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.UE_6FG_Event", HFILL }}, { &hf_rrc_UE_InternalEventParamList_item, - { "UE-InternalEventParamList", "rrc.UE_InternalEventParamList_item", + { "UE-InternalEventParam", "rrc.UE_InternalEventParam", FT_UINT32, BASE_DEC, VALS(rrc_UE_InternalEventParam_vals), 0, "rrc.UE_InternalEventParam", HFILL }}, { &hf_rrc_event6a_01, @@ -120908,7 +120908,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.UE_RX_TX_TimeDifferenceType1", HFILL }}, { &hf_rrc_UE_RX_TX_ReportEntryList_item, - { "UE-RX-TX-ReportEntryList", "rrc.UE_RX_TX_ReportEntryList_item", + { "UE-RX-TX-ReportEntry", "rrc.UE_RX_TX_ReportEntry", FT_NONE, BASE_NONE, NULL, 0, "rrc.UE_RX_TX_ReportEntry", HFILL }}, { &hf_rrc_ue_RX_TX_TimeDifferenceType2, @@ -120916,7 +120916,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.UE_RX_TX_TimeDifferenceType2", HFILL }}, { &hf_rrc_UE_TransmittedPowerTDD_List_item, - { "UE-TransmittedPowerTDD-List", "rrc.UE_TransmittedPowerTDD_List_item", + { "UE-TransmittedPower", "rrc.UE_TransmittedPower", FT_UINT32, BASE_DEC, NULL, 0, "rrc.UE_TransmittedPower", HFILL }}, { &hf_rrc_rachorcpch, @@ -120972,11 +120972,11 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, VALS(rrc_UE_Positioning_EventSpecificInfo_r7_vals), 0, "rrc.UE_Positioning_EventSpecificInfo_r7", HFILL }}, { &hf_rrc_UE_Positioning_EventParamList_item, - { "UE-Positioning-EventParamList", "rrc.UE_Positioning_EventParamList_item", + { "UE-Positioning-EventParam", "rrc.UE_Positioning_EventParam", FT_NONE, BASE_NONE, NULL, 0, "rrc.UE_Positioning_EventParam", HFILL }}, { &hf_rrc_UE_Positioning_EventParamList_r7_item, - { "UE-Positioning-EventParamList-r7", "rrc.UE_Positioning_EventParamList_r7_item", + { "UE-Positioning-EventParam-r7", "rrc.UE_Positioning_EventParam_r7", FT_NONE, BASE_NONE, NULL, 0, "rrc.UE_Positioning_EventParam_r7", HFILL }}, { &hf_rrc_e7a, @@ -121120,7 +121120,7 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.KeplerianParameters", HFILL }}, { &hf_rrc_UE_Positioning_GANSS_RealTimeIntegrity_item, - { "UE-Positioning-GANSS-RealTimeIntegrity", "rrc.UE_Positioning_GANSS_RealTimeIntegrity_item", + { "UE-Positioning-GANSS-RealTimeIntegrity item", "rrc.UE_Positioning_GANSS_RealTimeIntegrity_item", FT_NONE, BASE_NONE, NULL, 0, "rrc.UE_Positioning_GANSS_RealTimeIntegrity_item", HFILL }}, { &hf_rrc_bad_ganss_satId, @@ -121208,7 +121208,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.INTEGER_0_8191", HFILL }}, { &hf_rrc_UE_Positioning_GANSS_TimeModels_item, - { "UE-Positioning-GANSS-TimeModels", "rrc.UE_Positioning_GANSS_TimeModels_item", + { "UE-Positioning-GANSS-TimeModel", "rrc.UE_Positioning_GANSS_TimeModel", FT_NONE, BASE_NONE, NULL, 0, "rrc.UE_Positioning_GANSS_TimeModel", HFILL }}, { &hf_rrc_a_one_utc, @@ -121720,7 +121720,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.UE_Positioning_OTDOA_NeighbourCellList_r7", HFILL }}, { &hf_rrc_UE_Positioning_IPDL_Parameters_TDDList_r4_ext_item, - { "UE-Positioning-IPDL-Parameters-TDDList-r4-ext", "rrc.UE_Positioning_IPDL_Parameters_TDDList_r4_ext_item", + { "UE-Positioning-IPDL-Parameters-TDD-r4-ext", "rrc.UE_Positioning_IPDL_Parameters_TDD_r4_ext", FT_NONE, BASE_NONE, NULL, 0, "rrc.UE_Positioning_IPDL_Parameters_TDD_r4_ext", HFILL }}, { &hf_rrc_neighbourList, @@ -121892,23 +121892,23 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.T_ueAssisted_02", HFILL }}, { &hf_rrc_UE_Positioning_OTDOA_NeighbourCellList_item, - { "UE-Positioning-OTDOA-NeighbourCellList", "rrc.UE_Positioning_OTDOA_NeighbourCellList_item", + { "UE-Positioning-OTDOA-NeighbourCellInfo", "rrc.UE_Positioning_OTDOA_NeighbourCellInfo", FT_NONE, BASE_NONE, NULL, 0, "rrc.UE_Positioning_OTDOA_NeighbourCellInfo", HFILL }}, { &hf_rrc_UE_Positioning_OTDOA_NeighbourCellList_r4_item, - { "UE-Positioning-OTDOA-NeighbourCellList-r4", "rrc.UE_Positioning_OTDOA_NeighbourCellList_r4_item", + { "UE-Positioning-OTDOA-NeighbourCellInfo-r4", "rrc.UE_Positioning_OTDOA_NeighbourCellInfo_r4", FT_NONE, BASE_NONE, NULL, 0, "rrc.UE_Positioning_OTDOA_NeighbourCellInfo_r4", HFILL }}, { &hf_rrc_UE_Positioning_OTDOA_NeighbourCellList_UEB_item, - { "UE-Positioning-OTDOA-NeighbourCellList-UEB", "rrc.UE_Positioning_OTDOA_NeighbourCellList_UEB_item", + { "UE-Positioning-OTDOA-NeighbourCellInfo-UEB", "rrc.UE_Positioning_OTDOA_NeighbourCellInfo_UEB", FT_NONE, BASE_NONE, NULL, 0, "rrc.UE_Positioning_OTDOA_NeighbourCellInfo_UEB", HFILL }}, { &hf_rrc_UE_Positioning_OTDOA_NeighbourCellList_UEB_ext_item, - { "UE-Positioning-OTDOA-NeighbourCellList-UEB-ext", "rrc.UE_Positioning_OTDOA_NeighbourCellList_UEB_ext_item", + { "UE-Positioning-OTDOA-NeighbourCellInfo-UEB-ext", "rrc.UE_Positioning_OTDOA_NeighbourCellInfo_UEB_ext", FT_NONE, BASE_NONE, NULL, 0, "rrc.UE_Positioning_OTDOA_NeighbourCellInfo_UEB_ext", HFILL }}, { &hf_rrc_UE_Positioning_OTDOA_NeighbourCellList_r7_item, - { "UE-Positioning-OTDOA-NeighbourCellList-r7", "rrc.UE_Positioning_OTDOA_NeighbourCellList_r7_item", + { "UE-Positioning-OTDOA-NeighbourCellInfo-r7", "rrc.UE_Positioning_OTDOA_NeighbourCellInfo_r7", FT_NONE, BASE_NONE, NULL, 0, "rrc.UE_Positioning_OTDOA_NeighbourCellInfo_r7", HFILL }}, { &hf_rrc_stdResolution, @@ -122244,11 +122244,11 @@ void proto_register_rrc(void) { FT_BYTES, BASE_HEX, NULL, 0, "rrc.BIT_STRING_SIZE_1_512", HFILL }}, { &hf_rrc_CDMA2000_MessageList_item, - { "CDMA2000-MessageList", "rrc.CDMA2000_MessageList_item", + { "CDMA2000-Message", "rrc.CDMA2000_Message", FT_NONE, BASE_NONE, NULL, 0, "rrc.CDMA2000_Message", HFILL }}, { &hf_rrc_CDMA2000_UMTS_Frequency_List_item, - { "CDMA2000-UMTS-Frequency-List", "rrc.CDMA2000_UMTS_Frequency_List_item", + { "FrequencyInfoCDMA2000", "rrc.FrequencyInfoCDMA2000", FT_NONE, BASE_NONE, NULL, 0, "rrc.FrequencyInfoCDMA2000", HFILL }}, { &hf_rrc_modeSpecificInfo_113, @@ -122272,7 +122272,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.IntraFreqMeasQuantity_TDD_sib3List", HFILL }}, { &hf_rrc_ExtSIBTypeInfoSchedulingInfo_List_item, - { "ExtSIBTypeInfoSchedulingInfo-List", "rrc.ExtSIBTypeInfoSchedulingInfo_List_item", + { "ExtSIBTypeInfoSchedulingInfo", "rrc.ExtSIBTypeInfoSchedulingInfo", FT_NONE, BASE_NONE, NULL, 0, "rrc.ExtSIBTypeInfoSchedulingInfo", HFILL }}, { &hf_rrc_extensionSIB_Type, @@ -122288,7 +122288,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, VALS(rrc_ValueTagInfo_vals), 0, "rrc.ValueTagInfo", HFILL }}, { &hf_rrc_FDD_UMTS_Frequency_List_item, - { "FDD-UMTS-Frequency-List", "rrc.FDD_UMTS_Frequency_List_item", + { "FrequencyInfoFDD", "rrc.FrequencyInfoFDD", FT_NONE, BASE_NONE, NULL, 0, "rrc.FrequencyInfoFDD", HFILL }}, { &hf_rrc_band_Class, @@ -122300,7 +122300,7 @@ void proto_register_rrc(void) { FT_BYTES, BASE_HEX, NULL, 0, "rrc.BIT_STRING_SIZE_11", HFILL }}, { &hf_rrc_GERAN_SystemInformation_item, - { "GERAN-SystemInformation", "rrc.GERAN_SystemInformation_item", + { "GERAN-SystemInfoBlock", "rrc.GERAN_SystemInfoBlock", FT_BYTES, BASE_HEX, NULL, 0, "rrc.GERAN_SystemInfoBlock", HFILL }}, { &hf_rrc_gsmLowRangeUARFCN, @@ -122312,15 +122312,15 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.UARFCN", HFILL }}, { &hf_rrc_GSM_BA_Range_List_item, - { "GSM-BA-Range-List", "rrc.GSM_BA_Range_List_item", + { "GSM-BA-Range", "rrc.GSM_BA_Range", FT_NONE, BASE_NONE, NULL, 0, "rrc.GSM_BA_Range", HFILL }}, { &hf_rrc_GSM_MessageList_item, - { "GSM-MessageList", "rrc.GSM_MessageList_item", + { "GSM-MessageList item", "rrc.GSM_MessageList_item", FT_BYTES, BASE_HEX, NULL, 0, "rrc.GSM_MessageList_item", HFILL }}, { &hf_rrc_GSM_TargetCellInfoList_item, - { "GSM-TargetCellInfoList", "rrc.GSM_TargetCellInfoList_item", + { "GSM-TargetCellInfo", "rrc.GSM_TargetCellInfo", FT_NONE, BASE_NONE, NULL, 0, "rrc.GSM_TargetCellInfo", HFILL }}, { &hf_rrc_receivedMessageType, @@ -122336,7 +122336,7 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.NULL", HFILL }}, { &hf_rrc_GERANIu_MessageList_item, - { "GERANIu-MessageList", "rrc.GERANIu_MessageList_item", + { "GERANIu-MessageList item", "rrc.GERANIu_MessageList_item", FT_BYTES, BASE_HEX, NULL, 0, "rrc.BIT_STRING_SIZE_1_32768", HFILL }}, { &hf_rrc_gsm_12, @@ -122356,7 +122356,7 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.T_cdma2000_01", HFILL }}, { &hf_rrc_InterRAT_UE_RadioAccessCapabilityList_item, - { "InterRAT-UE-RadioAccessCapabilityList", "rrc.InterRAT_UE_RadioAccessCapabilityList_item", + { "InterRAT-UE-RadioAccessCapability", "rrc.InterRAT_UE_RadioAccessCapability", FT_UINT32, BASE_DEC, VALS(rrc_InterRAT_UE_RadioAccessCapability_vals), 0, "rrc.InterRAT_UE_RadioAccessCapability", HFILL }}, { &hf_rrc_geranIu_RadioAccessCapability, @@ -122380,7 +122380,7 @@ void proto_register_rrc(void) { FT_BYTES, BASE_HEX, NULL, 0, "rrc.GsmSecurityCapability", HFILL }}, { &hf_rrc_InterRAT_UE_SecurityCapList_item, - { "InterRAT-UE-SecurityCapList", "rrc.InterRAT_UE_SecurityCapList_item", + { "InterRAT-UE-SecurityCapability", "rrc.InterRAT_UE_SecurityCapability", FT_UINT32, BASE_DEC, VALS(rrc_InterRAT_UE_SecurityCapability_vals), 0, "rrc.InterRAT_UE_SecurityCapability", HFILL }}, { &hf_rrc_interRAT_ProtocolError, @@ -122552,15 +122552,15 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SIBOccurValueTag", HFILL }}, { &hf_rrc_SIB_ReferenceList_item, - { "SIB-ReferenceList", "rrc.SIB_ReferenceList_item", + { "SchedulingInformationSIB", "rrc.SchedulingInformationSIB", FT_NONE, BASE_NONE, NULL, 0, "rrc.SchedulingInformationSIB", HFILL }}, { &hf_rrc_SIBSb_ReferenceList_item, - { "SIBSb-ReferenceList", "rrc.SIBSb_ReferenceList_item", + { "SchedulingInformationSIBSb", "rrc.SchedulingInformationSIBSb", FT_NONE, BASE_NONE, NULL, 0, "rrc.SchedulingInformationSIBSb", HFILL }}, { &hf_rrc_SIB_ReferenceListFACH_item, - { "SIB-ReferenceListFACH", "rrc.SIB_ReferenceListFACH_item", + { "SchedulingInformationSIB", "rrc.SchedulingInformationSIB", FT_NONE, BASE_NONE, NULL, 0, "rrc.SchedulingInformationSIB", HFILL }}, { &hf_rrc_sysInfoType1, @@ -122716,7 +122716,7 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.NULL", HFILL }}, { &hf_rrc_SibOFF_List_item, - { "SibOFF-List", "rrc.SibOFF_List_item", + { "SibOFF", "rrc.SibOFF", FT_UINT32, BASE_DEC, VALS(rrc_SibOFF_vals), 0, "rrc.SibOFF", HFILL }}, { &hf_rrc_cn_DomainSysInfoList, @@ -122868,7 +122868,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.LocationRegistrationAccessClassBarredList", HFILL }}, { &hf_rrc_LocationRegistrationAccessClassBarredList_item, - { "LocationRegistrationAccessClassBarredList", "rrc.LocationRegistrationAccessClassBarredList_item", + { "AccessClassBarred", "rrc.AccessClassBarred", FT_UINT32, BASE_DEC, VALS(rrc_AccessClassBarred_vals), 0, "rrc.AccessClassBarred", HFILL }}, { &hf_rrc_mapping_LCR, @@ -123380,7 +123380,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_maxCellMeas_OF_CellSelectReselectInfo_v590ext", HFILL }}, { &hf_rrc_newIntraFrequencyCellInfoList_v590ext_item, - { "newIntraFrequencyCellInfoList-v590ext", "rrc.newIntraFrequencyCellInfoList_v590ext_item", + { "CellSelectReselectInfo-v590ext", "rrc.CellSelectReselectInfo_v590ext", FT_NONE, BASE_NONE, NULL, 0, "rrc.CellSelectReselectInfo_v590ext", HFILL }}, { &hf_rrc_newInterFrequencyCellInfoList_v590ext, @@ -123388,7 +123388,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_maxCellMeas_OF_CellSelectReselectInfo_v590ext", HFILL }}, { &hf_rrc_newInterFrequencyCellInfoList_v590ext_item, - { "newInterFrequencyCellInfoList-v590ext", "rrc.newInterFrequencyCellInfoList_v590ext_item", + { "CellSelectReselectInfo-v590ext", "rrc.CellSelectReselectInfo_v590ext", FT_NONE, BASE_NONE, NULL, 0, "rrc.CellSelectReselectInfo_v590ext", HFILL }}, { &hf_rrc_newInterRATCellInfoList_v590ext, @@ -123396,7 +123396,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_maxCellMeas_OF_CellSelectReselectInfo_v590ext", HFILL }}, { &hf_rrc_newInterRATCellInfoList_v590ext_item, - { "newInterRATCellInfoList-v590ext", "rrc.newInterRATCellInfoList_v590ext_item", + { "CellSelectReselectInfo-v590ext", "rrc.CellSelectReselectInfo_v590ext", FT_NONE, BASE_NONE, NULL, 0, "rrc.CellSelectReselectInfo_v590ext", HFILL }}, { &hf_rrc_intraFreqEventCriteriaList_v590ext, @@ -123852,7 +123852,7 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.T_nonCriticalExtensions_182", HFILL }}, { &hf_rrc_TDD_UMTS_Frequency_List_item, - { "TDD-UMTS-Frequency-List", "rrc.TDD_UMTS_Frequency_List_item", + { "FrequencyInfoTDD", "rrc.FrequencyInfoTDD", FT_NONE, BASE_NONE, NULL, 0, "rrc.FrequencyInfoTDD", HFILL }}, { &hf_rrc_none, @@ -123880,7 +123880,7 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.RLC_Info_MTCH_r6", HFILL }}, { &hf_rrc_MBMS_CommonRBInformationList_r6_item, - { "MBMS-CommonRBInformationList-r6", "rrc.MBMS_CommonRBInformationList_r6_item", + { "MBMS-CommonRBInformation-r6", "rrc.MBMS_CommonRBInformation_r6", FT_NONE, BASE_NONE, NULL, 0, "rrc.MBMS_CommonRBInformation_r6", HFILL }}, { &hf_rrc_countingForUraPCH, @@ -123916,11 +123916,11 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.MBMS_TrCHInformation_CurrList", HFILL }}, { &hf_rrc_MBMS_CurrentCell_SCCPCHList_r6_item, - { "MBMS-CurrentCell-SCCPCHList-r6", "rrc.MBMS_CurrentCell_SCCPCHList_r6_item", + { "MBMS-CurrentCell-SCCPCH-r6", "rrc.MBMS_CurrentCell_SCCPCH_r6", FT_NONE, BASE_NONE, NULL, 0, "rrc.MBMS_CurrentCell_SCCPCH_r6", HFILL }}, { &hf_rrc_MBMS_FACHCarryingMTCH_List_item, - { "MBMS-FACHCarryingMTCH-List", "rrc.MBMS_FACHCarryingMTCH_List_item", + { "TransportFormatSet", "rrc.TransportFormatSet", FT_UINT32, BASE_DEC, VALS(rrc_TransportFormatSet_vals), 0, "rrc.TransportFormatSet", HFILL }}, { &hf_rrc_cycleOffset, @@ -123932,7 +123932,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.T_mtch_L1CombiningPeriodList", HFILL }}, { &hf_rrc_mtch_L1CombiningPeriodList_item, - { "mtch-L1CombiningPeriodList", "rrc.mtch_L1CombiningPeriodList_item", + { "mtch-L1CombiningPeriodList item", "rrc.mtch_L1CombiningPeriodList_item", FT_NONE, BASE_NONE, NULL, 0, "rrc.T_mtch_L1CombiningPeriodList_item", HFILL }}, { &hf_rrc_periodStart, @@ -123952,7 +123952,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.T_mtch_L1CombiningPeriodList_01", HFILL }}, { &hf_rrc_mtch_L1CombiningPeriodList_item_01, - { "mtch-L1CombiningPeriodList", "rrc.mtch_L1CombiningPeriodList_item", + { "mtch-L1CombiningPeriodList item", "rrc.mtch_L1CombiningPeriodList_item", FT_NONE, BASE_NONE, NULL, 0, "rrc.T_mtch_L1CombiningPeriodList_item_01", HFILL }}, { &hf_rrc_periodStart_01, @@ -123972,7 +123972,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.T_mtch_L1CombiningPeriodList_02", HFILL }}, { &hf_rrc_mtch_L1CombiningPeriodList_item_02, - { "mtch-L1CombiningPeriodList", "rrc.mtch_L1CombiningPeriodList_item", + { "mtch-L1CombiningPeriodList item", "rrc.mtch_L1CombiningPeriodList_item", FT_NONE, BASE_NONE, NULL, 0, "rrc.T_mtch_L1CombiningPeriodList_item_02", HFILL }}, { &hf_rrc_periodStart_02, @@ -123992,7 +123992,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.T_mtch_L1CombiningPeriodList_03", HFILL }}, { &hf_rrc_mtch_L1CombiningPeriodList_item_03, - { "mtch-L1CombiningPeriodList", "rrc.mtch_L1CombiningPeriodList_item", + { "mtch-L1CombiningPeriodList item", "rrc.mtch_L1CombiningPeriodList_item", FT_NONE, BASE_NONE, NULL, 0, "rrc.T_mtch_L1CombiningPeriodList_item_03", HFILL }}, { &hf_rrc_periodStart_03, @@ -124012,7 +124012,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.T_mtch_L1CombiningPeriodList_04", HFILL }}, { &hf_rrc_mtch_L1CombiningPeriodList_item_04, - { "mtch-L1CombiningPeriodList", "rrc.mtch_L1CombiningPeriodList_item", + { "mtch-L1CombiningPeriodList item", "rrc.mtch_L1CombiningPeriodList_item", FT_NONE, BASE_NONE, NULL, 0, "rrc.T_mtch_L1CombiningPeriodList_item_04", HFILL }}, { &hf_rrc_periodStart_04, @@ -124032,7 +124032,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.T_mtch_L1CombiningPeriodList_05", HFILL }}, { &hf_rrc_mtch_L1CombiningPeriodList_item_05, - { "mtch-L1CombiningPeriodList", "rrc.mtch_L1CombiningPeriodList_item", + { "mtch-L1CombiningPeriodList item", "rrc.mtch_L1CombiningPeriodList_item", FT_NONE, BASE_NONE, NULL, 0, "rrc.T_mtch_L1CombiningPeriodList_item_05", HFILL }}, { &hf_rrc_periodStart_05, @@ -124144,7 +124144,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.SEQUENCE_SIZE_1_2_OF_DL_TS_ChannelisationCode", HFILL }}, { &hf_rrc_channelisationCodeList_item, - { "channelisationCodeList", "rrc.channelisationCodeList_item", + { "DL-TS-ChannelisationCode", "rrc.DL_TS_ChannelisationCode", FT_UINT32, BASE_DEC, VALS(rrc_DL_TS_ChannelisationCode_vals), 0, "rrc.DL_TS_ChannelisationCode", HFILL }}, { &hf_rrc_mode_03, @@ -124196,7 +124196,7 @@ void proto_register_rrc(void) { FT_BOOLEAN, 8, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_MBMS_ModifedServiceList_r6_item, - { "MBMS-ModifedServiceList-r6", "rrc.MBMS_ModifedServiceList_r6_item", + { "MBMS-ModifedService-r6", "rrc.MBMS_ModifedService_r6", FT_NONE, BASE_NONE, NULL, 0, "rrc.MBMS_ModifedService_r6", HFILL }}, { &hf_rrc_mbsfnClusterFrequency, @@ -124204,7 +124204,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.MBSFN_ClusterFrequency_r7", HFILL }}, { &hf_rrc_MBMS_ModifiedServiceList_v770ext_item, - { "MBMS-ModifiedServiceList-v770ext", "rrc.MBMS_ModifiedServiceList_v770ext_item", + { "MBMS-ModifiedService-v770ext", "rrc.MBMS_ModifiedService_v770ext", FT_NONE, BASE_NONE, NULL, 0, "rrc.MBMS_ModifiedService_v770ext", HFILL }}, { &hf_rrc_mschShedulingInfo, @@ -124276,11 +124276,11 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.T_fdd_157", HFILL }}, { &hf_rrc_MBMS_NeighbouringCellSCCPCHList_r6_item, - { "MBMS-NeighbouringCellSCCPCHList-r6", "rrc.MBMS_NeighbouringCellSCCPCHList_r6_item", + { "MBMS-NeighbouringCellSCCPCH-r6", "rrc.MBMS_NeighbouringCellSCCPCH_r6", FT_NONE, BASE_NONE, NULL, 0, "rrc.MBMS_NeighbouringCellSCCPCH_r6", HFILL }}, { &hf_rrc_MBMS_NeighbouringCellSCCPCHList_v770ext_item, - { "MBMS-NeighbouringCellSCCPCHList-v770ext", "rrc.MBMS_NeighbouringCellSCCPCHList_v770ext_item", + { "MBMS-NeighbouringCellSCCPCH-v770ext", "rrc.MBMS_NeighbouringCellSCCPCH_v770ext", FT_NONE, BASE_NONE, NULL, 0, "rrc.MBMS_NeighbouringCellSCCPCH_v770ext", HFILL }}, { &hf_rrc_mbms_CommonPhyChIdentity, @@ -124288,11 +124288,11 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.MBMS_CommonPhyChIdentity", HFILL }}, { &hf_rrc_MBMS_PhyChInformationList_r6_item, - { "MBMS-PhyChInformationList-r6", "rrc.MBMS_PhyChInformationList_r6_item", + { "MBMS-PhyChInformation-r6", "rrc.MBMS_PhyChInformation_r6", FT_NONE, BASE_NONE, NULL, 0, "rrc.MBMS_PhyChInformation_r6", HFILL }}, { &hf_rrc_MBMS_PhyChInformationList_r7_item, - { "MBMS-PhyChInformationList-r7", "rrc.MBMS_PhyChInformationList_r7_item", + { "MBMS-PhyChInformation-r7", "rrc.MBMS_PhyChInformation_r7", FT_NONE, BASE_NONE, NULL, 0, "rrc.MBMS_PhyChInformation_r7", HFILL }}, { &hf_rrc_mbmsPreferredFrequency, @@ -124312,7 +124312,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.INTEGER_0_7", HFILL }}, { &hf_rrc_MBMS_PreferredFrequencyList_r6_item, - { "MBMS-PreferredFrequencyList-r6", "rrc.MBMS_PreferredFrequencyList_r6_item", + { "MBMS-PreferredFrequencyInfo-r6", "rrc.MBMS_PreferredFrequencyInfo_r6", FT_NONE, BASE_NONE, NULL, 0, "rrc.MBMS_PreferredFrequencyInfo_r6", HFILL }}, { &hf_rrc_rbInformation, @@ -124328,7 +124328,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.MBMS_LogicalChIdentity", HFILL }}, { &hf_rrc_MBMS_PTM_RBInformation_CList_item, - { "MBMS-PTM-RBInformation-CList", "rrc.MBMS_PTM_RBInformation_CList_item", + { "MBMS-PTM-RBInformation-C", "rrc.MBMS_PTM_RBInformation_C", FT_NONE, BASE_NONE, NULL, 0, "rrc.MBMS_PTM_RBInformation_C", HFILL }}, { &hf_rrc_layer1_CombiningStatus, @@ -124336,7 +124336,7 @@ void proto_register_rrc(void) { FT_BOOLEAN, 8, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_MBMS_PTM_RBInformation_NList_item, - { "MBMS-PTM-RBInformation-NList", "rrc.MBMS_PTM_RBInformation_NList_item", + { "MBMS-PTM-RBInformation-N", "rrc.MBMS_PTM_RBInformation_N", FT_NONE, BASE_NONE, NULL, 0, "rrc.MBMS_PTM_RBInformation_N", HFILL }}, { &hf_rrc_status, @@ -124348,11 +124348,11 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.MBMS_SelectedServicesListFull", HFILL }}, { &hf_rrc_MBMS_SelectedServicesListFull_item, - { "MBMS-SelectedServicesListFull", "rrc.MBMS_SelectedServicesListFull_item", + { "MBMS-ServiceIdentity-r6", "rrc.MBMS_ServiceIdentity_r6", FT_NONE, BASE_NONE, NULL, 0, "rrc.MBMS_ServiceIdentity_r6", HFILL }}, { &hf_rrc_MBMS_SelectedServicesListShort_item, - { "MBMS-SelectedServicesListShort", "rrc.MBMS_SelectedServicesListShort_item", + { "MBMS-ShortTransmissionID", "rrc.MBMS_ShortTransmissionID", FT_UINT32, BASE_DEC, NULL, 0, "rrc.MBMS_ShortTransmissionID", HFILL }}, { &hf_rrc_mbms_SelectedServicesList, @@ -124376,7 +124376,7 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.MBMS_ConnectedModeCountingScope", HFILL }}, { &hf_rrc_MBMS_ServiceAccessInfoList_r6_item, - { "MBMS-ServiceAccessInfoList-r6", "rrc.MBMS_ServiceAccessInfoList_r6_item", + { "MBMS-ServiceAccessInfo-r6", "rrc.MBMS_ServiceAccessInfo_r6", FT_NONE, BASE_NONE, NULL, 0, "rrc.MBMS_ServiceAccessInfo_r6", HFILL }}, { &hf_rrc_serviceIdentity, @@ -124412,7 +124412,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.INTEGER_0_31", HFILL }}, { &hf_rrc_MBMS_ServiceSchedulingInfoList_r6_item, - { "MBMS-ServiceSchedulingInfoList-r6", "rrc.MBMS_ServiceSchedulingInfoList_r6_item", + { "MBMS-ServiceSchedulingInfo-r6", "rrc.MBMS_ServiceSchedulingInfo_r6", FT_NONE, BASE_NONE, NULL, 0, "rrc.MBMS_ServiceSchedulingInfo_r6", HFILL }}, { &hf_rrc_start, @@ -124424,7 +124424,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.INTEGER_1_256", HFILL }}, { &hf_rrc_MBMS_ServiceTransmInfoList_item, - { "MBMS-ServiceTransmInfoList", "rrc.MBMS_ServiceTransmInfoList_item", + { "MBMS-ServiceTransmInfo", "rrc.MBMS_ServiceTransmInfo", FT_NONE, BASE_NONE, NULL, 0, "rrc.MBMS_ServiceTransmInfo", HFILL }}, { &hf_rrc_transpCHInformation_02, @@ -124432,7 +124432,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.MBMS_TrCHInformation_SIB5List", HFILL }}, { &hf_rrc_MBMS_SIBType5_SCCPCHList_r6_item, - { "MBMS-SIBType5-SCCPCHList-r6", "rrc.MBMS_SIBType5_SCCPCHList_r6_item", + { "MBMS-SIBType5-SCCPCH-r6", "rrc.MBMS_SIBType5_SCCPCH_r6", FT_NONE, BASE_NONE, NULL, 0, "rrc.MBMS_SIBType5_SCCPCH_r6", HFILL }}, { &hf_rrc_t_318, @@ -124448,11 +124448,11 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.MBMS_CommonCCTrChIdentity", HFILL }}, { &hf_rrc_MBMS_TranspChInfoForEachCCTrCh_r6_item, - { "MBMS-TranspChInfoForEachCCTrCh-r6", "rrc.MBMS_TranspChInfoForEachCCTrCh_r6_item", + { "MBMS-TranspChInfoForCCTrCh-r6", "rrc.MBMS_TranspChInfoForCCTrCh_r6", FT_NONE, BASE_NONE, NULL, 0, "rrc.MBMS_TranspChInfoForCCTrCh_r6", HFILL }}, { &hf_rrc_MBMS_TranspChInfoForEachTrCh_r6_item, - { "MBMS-TranspChInfoForEachTrCh-r6", "rrc.MBMS_TranspChInfoForEachTrCh_r6_item", + { "MBMS-TranspChInfoForTrCh-r6", "rrc.MBMS_TranspChInfoForTrCh_r6", FT_NONE, BASE_NONE, NULL, 0, "rrc.MBMS_TranspChInfoForTrCh_r6", HFILL }}, { &hf_rrc_commonTrChIdentity, @@ -124468,7 +124468,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.MBMS_PTM_RBInformation_CList", HFILL }}, { &hf_rrc_MBMS_TrCHInformation_CurrList_item, - { "MBMS-TrCHInformation-CurrList", "rrc.MBMS_TrCHInformation_CurrList_item", + { "MBMS-TrCHInformation-Curr", "rrc.MBMS_TrCHInformation_Curr", FT_NONE, BASE_NONE, NULL, 0, "rrc.MBMS_TrCHInformation_Curr", HFILL }}, { &hf_rrc_transpCh_CombiningStatus, @@ -124480,7 +124480,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.MBMS_PTM_RBInformation_NList", HFILL }}, { &hf_rrc_MBMS_TrCHInformation_NeighbList_item, - { "MBMS-TrCHInformation-NeighbList", "rrc.MBMS_TrCHInformation_NeighbList_item", + { "MBMS-TrCHInformation-Neighb", "rrc.MBMS_TrCHInformation_Neighb", FT_NONE, BASE_NONE, NULL, 0, "rrc.MBMS_TrCHInformation_Neighb", HFILL }}, { &hf_rrc_transpCh_Identity, @@ -124488,7 +124488,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.INTEGER_1_maxFACHPCH", HFILL }}, { &hf_rrc_MBMS_TrCHInformation_SIB5List_item, - { "MBMS-TrCHInformation-SIB5List", "rrc.MBMS_TrCHInformation_SIB5List_item", + { "MBMS-TrCHInformation-SIB5", "rrc.MBMS_TrCHInformation_SIB5", FT_NONE, BASE_NONE, NULL, 0, "rrc.MBMS_TrCHInformation_SIB5", HFILL }}, { &hf_rrc_mbms_RequiredUEAction_01, @@ -124500,15 +124500,15 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.MBMS_PFLIndex", HFILL }}, { &hf_rrc_MBMS_UnmodifiedServiceList_r6_item, - { "MBMS-UnmodifiedServiceList-r6", "rrc.MBMS_UnmodifiedServiceList_r6_item", + { "MBMS-UnmodifiedService-r6", "rrc.MBMS_UnmodifiedService_r6", FT_NONE, BASE_NONE, NULL, 0, "rrc.MBMS_UnmodifiedService_r6", HFILL }}, { &hf_rrc_MBMS_UnmodifiedServiceList_v770ext_item, - { "MBMS-UnmodifiedServiceList-v770ext", "rrc.MBMS_UnmodifiedServiceList_v770ext_item", + { "MBMS-UnmodifiedService-v770ext", "rrc.MBMS_UnmodifiedService_v770ext", FT_NONE, BASE_NONE, NULL, 0, "rrc.MBMS_UnmodifiedService_v770ext", HFILL }}, { &hf_rrc_MBSFNFrequencyList_item, - { "MBSFNFrequencyList", "rrc.MBSFNFrequencyList_item", + { "MBSFNFrequency", "rrc.MBSFNFrequency", FT_NONE, BASE_NONE, NULL, 0, "rrc.MBSFNFrequency", HFILL }}, { &hf_rrc_notificationOfAllMBSFNServicesInTheBand, @@ -124532,7 +124532,7 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.MBSFNservicesNotNotified_r7", HFILL }}, { &hf_rrc_MBSFN_InterFrequencyNeighbourList_r7_item, - { "MBSFN-InterFrequencyNeighbourList-r7", "rrc.MBSFN_InterFrequencyNeighbourList_r7_item", + { "MBSFNInterFrequencyNeighbour-r7", "rrc.MBSFNInterFrequencyNeighbour_r7", FT_NONE, BASE_NONE, NULL, 0, "rrc.MBSFNInterFrequencyNeighbour_r7", HFILL }}, { &hf_rrc_tDMPeriod, @@ -124548,7 +124548,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.INTEGER_1_8", HFILL }}, { &hf_rrc_MBSFN_TDM_Info_List_item, - { "MBSFN-TDM-Info-List", "rrc.MBSFN_TDM_Info_List_item", + { "MBSFN-TDM-Info", "rrc.MBSFN_TDM_Info", FT_NONE, BASE_NONE, NULL, 0, "rrc.MBSFN_TDM_Info", HFILL }}, { &hf_rrc_timeSlotNumber_01, @@ -124556,7 +124556,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.TimeslotNumber_LCR_r4", HFILL }}, { &hf_rrc_MBSFN_TDDInformation_item, - { "MBSFN-TDDInformation", "rrc.MBSFN_TDDInformation_item", + { "MBSFN-TDDTimeSlotInfo", "rrc.MBSFN_TDDTimeSlotInfo", FT_NONE, BASE_NONE, NULL, 0, "rrc.MBSFN_TDDTimeSlotInfo", HFILL }}, { &hf_rrc_frequencyIndex, @@ -124568,7 +124568,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.MBSFN_TDDInformation", HFILL }}, { &hf_rrc_MBSFN_TDDInformation_LCR_item, - { "MBSFN-TDDInformation-LCR", "rrc.MBSFN_TDDInformation_LCR_item", + { "MBSFN-TDDTimeSlotInfo-LCR", "rrc.MBSFN_TDDTimeSlotInfo_LCR", FT_NONE, BASE_NONE, NULL, 0, "rrc.MBSFN_TDDTimeSlotInfo_LCR", HFILL }}, { &hf_rrc_interRATHandoverInfo, @@ -124648,7 +124648,7 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.T_criticalExtensions_96", HFILL }}, { &hf_rrc_RFC3095_ContextInfoList_r5_item, - { "RFC3095-ContextInfoList-r5", "rrc.RFC3095_ContextInfoList_r5_item", + { "RFC3095-ContextInfo", "rrc.RFC3095_ContextInfo", FT_NONE, BASE_NONE, NULL, 0, "rrc.RFC3095_ContextInfo", HFILL }}, { &hf_rrc_r3_32, @@ -125076,11 +125076,11 @@ void proto_register_rrc(void) { FT_NONE, BASE_NONE, NULL, 0, "rrc.T_nonCriticalExtension", HFILL }}, { &hf_rrc_TPC_CombinationInfoList_item, - { "TPC-CombinationInfoList", "rrc.TPC_CombinationInfoList_item", + { "TPC-Combination-Info", "rrc.TPC_Combination_Info", FT_NONE, BASE_NONE, NULL, 0, "rrc.TPC_Combination_Info", HFILL }}, { &hf_rrc_STARTList2_item, - { "STARTList2", "rrc.STARTList2_item", + { "STARTSingle", "rrc.STARTSingle", FT_NONE, BASE_NONE, NULL, 0, "rrc.STARTSingle", HFILL }}, { &hf_rrc_storedCompressedModeInfo, @@ -125092,11 +125092,11 @@ void proto_register_rrc(void) { FT_BYTES, BASE_HEX, NULL, 0, "rrc.BIT_STRING_SIZE_7", HFILL }}, { &hf_rrc_CipheringStatusList_item, - { "CipheringStatusList", "rrc.CipheringStatusList_item", + { "CipheringStatusCNdomain", "rrc.CipheringStatusCNdomain", FT_NONE, BASE_NONE, NULL, 0, "rrc.CipheringStatusCNdomain", HFILL }}, { &hf_rrc_CodeChangeStatusList_item, - { "CodeChangeStatusList", "rrc.CodeChangeStatusList_item", + { "CodeChangeStatus", "rrc.CodeChangeStatus", FT_NONE, BASE_NONE, NULL, 0, "rrc.CodeChangeStatus", HFILL }}, { &hf_rrc_storedTGP_SequenceList, @@ -125108,7 +125108,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.CodeChangeStatusList", HFILL }}, { &hf_rrc_StoredTGP_SequenceList_item, - { "StoredTGP-SequenceList", "rrc.StoredTGP_SequenceList_item", + { "StoredTGP-Sequence", "rrc.StoredTGP_Sequence", FT_NONE, BASE_NONE, NULL, 0, "rrc.StoredTGP_Sequence", HFILL }}, { &hf_rrc_current_tgps_Status, @@ -125332,19 +125332,19 @@ void proto_register_rrc(void) { FT_BYTES, BASE_HEX, NULL, 0, "rrc.BIT_STRING_SIZE_20_25", HFILL }}, { &hf_rrc_CipheringInfoPerRB_List_item, - { "CipheringInfoPerRB-List", "rrc.CipheringInfoPerRB_List_item", + { "CipheringInfoPerRB", "rrc.CipheringInfoPerRB", FT_NONE, BASE_NONE, NULL, 0, "rrc.CipheringInfoPerRB", HFILL }}, { &hf_rrc_CipheringInfoPerRB_List_r4_item, - { "CipheringInfoPerRB-List-r4", "rrc.CipheringInfoPerRB_List_r4_item", + { "CipheringInfoPerRB-r4", "rrc.CipheringInfoPerRB_r4", FT_NONE, BASE_NONE, NULL, 0, "rrc.CipheringInfoPerRB_r4", HFILL }}, { &hf_rrc_CipheringStatusList_r4_item, - { "CipheringStatusList-r4", "rrc.CipheringStatusList_r4_item", + { "CipheringStatusCNdomain-r4", "rrc.CipheringStatusCNdomain_r4", FT_NONE, BASE_NONE, NULL, 0, "rrc.CipheringStatusCNdomain_r4", HFILL }}, { &hf_rrc_CN_DomainInformationList_v390ext_item, - { "CN-DomainInformationList-v390ext", "rrc.CN_DomainInformationList_v390ext_item", + { "CN-DomainInformation-v390ext", "rrc.CN_DomainInformation_v390ext", FT_NONE, BASE_NONE, NULL, 0, "rrc.CN_DomainInformation_v390ext", HFILL }}, { &hf_rrc_tdd384_Measurements, @@ -125352,7 +125352,7 @@ void proto_register_rrc(void) { FT_BOOLEAN, 8, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_COUNT_C_List_item, - { "COUNT-C-List", "rrc.COUNT_C_List_item", + { "COUNT-CSingle", "rrc.COUNT_CSingle", FT_NONE, BASE_NONE, NULL, 0, "rrc.COUNT_CSingle", HFILL }}, { &hf_rrc_count_C, @@ -125456,23 +125456,23 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, VALS(rrc_MeasurementCommandWithType_r7_vals), 0, "rrc.MeasurementCommandWithType_r7", HFILL }}, { &hf_rrc_OngoingMeasRepList_item, - { "OngoingMeasRepList", "rrc.OngoingMeasRepList_item", + { "OngoingMeasRep", "rrc.OngoingMeasRep", FT_NONE, BASE_NONE, NULL, 0, "rrc.OngoingMeasRep", HFILL }}, { &hf_rrc_OngoingMeasRepList_r4_item, - { "OngoingMeasRepList-r4", "rrc.OngoingMeasRepList_r4_item", + { "OngoingMeasRep-r4", "rrc.OngoingMeasRep_r4", FT_NONE, BASE_NONE, NULL, 0, "rrc.OngoingMeasRep_r4", HFILL }}, { &hf_rrc_OngoingMeasRepList_r5_item, - { "OngoingMeasRepList-r5", "rrc.OngoingMeasRepList_r5_item", + { "OngoingMeasRep-r5", "rrc.OngoingMeasRep_r5", FT_NONE, BASE_NONE, NULL, 0, "rrc.OngoingMeasRep_r5", HFILL }}, { &hf_rrc_OngoingMeasRepList_r6_item, - { "OngoingMeasRepList-r6", "rrc.OngoingMeasRepList_r6_item", + { "OngoingMeasRep-r6", "rrc.OngoingMeasRep_r6", FT_NONE, BASE_NONE, NULL, 0, "rrc.OngoingMeasRep_r6", HFILL }}, { &hf_rrc_OngoingMeasRepList_r7_item, - { "OngoingMeasRepList-r7", "rrc.OngoingMeasRepList_r7_item", + { "OngoingMeasRep-r7", "rrc.OngoingMeasRep_r7", FT_NONE, BASE_NONE, NULL, 0, "rrc.OngoingMeasRep_r7", HFILL }}, { &hf_rrc_supportForRfc2507_01, @@ -125576,7 +125576,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.RFC3095_Context_List", HFILL }}, { &hf_rrc_RFC3095_Context_List_item, - { "RFC3095-Context-List", "rrc.RFC3095_Context_List_item", + { "RFC3095-Context-List item", "rrc.RFC3095_Context_List_item", FT_NONE, BASE_NONE, NULL, 0, "rrc.RFC3095_Context_List_item", HFILL }}, { &hf_rrc_dl_RFC3095_Context, @@ -125608,7 +125608,7 @@ void proto_register_rrc(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrc.RRC_MessageSequenceNumber", HFILL }}, { &hf_rrc_SRB_SpecificIntegrityProtInfoList_item, - { "SRB-SpecificIntegrityProtInfoList", "rrc.SRB_SpecificIntegrityProtInfoList_item", + { "SRB-SpecificIntegrityProtInfo", "rrc.SRB_SpecificIntegrityProtInfo", FT_NONE, BASE_NONE, NULL, 0, "rrc.SRB_SpecificIntegrityProtInfo", HFILL }}, { &hf_rrc_validity_CellPCH_UraPCH_01, diff --git a/epan/dissectors/packet-rrc.h b/epan/dissectors/packet-rrc.h index 997a94dd6b..853db90cf5 100644 --- a/epan/dissectors/packet-rrc.h +++ b/epan/dissectors/packet-rrc.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-rrc.h */ -/* ../../tools/asn2wrs.py -p rrc -c rrc.cnf -s packet-rrc-template Class-definitions.asn PDU-definitions.asn InformationElements.asn Constant-definitions.asn Internode-definitions.asn */ +/* ../../tools/asn2wrs.py -p rrc -c ./rrc.cnf -s ./packet-rrc-template -D . Class-definitions.asn PDU-definitions.asn InformationElements.asn Constant-definitions.asn Internode-definitions.asn */ /* Input file: packet-rrc-template.h */ diff --git a/epan/dissectors/packet-rrlp.c b/epan/dissectors/packet-rrlp.c index c33d18c8e0..a3f7673351 100644 --- a/epan/dissectors/packet-rrlp.c +++ b/epan/dissectors/packet-rrlp.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-rrlp.c */ -/* ../../tools/asn2wrs.py -p rrlp -c rrlp.cnf -s packet-rrlp-template ../gsmmap/MAP-ExtensionDataTypes.asn ../gsmmap/MAP-LCS-DataTypes.asn RRLP-Messages.asn RRLP-Components.asn */ +/* ../../tools/asn2wrs.py -p rrlp -c ./rrlp.cnf -s ./packet-rrlp-template -D . ../gsmmap/MAP-ExtensionDataTypes.asn ../gsmmap/MAP-LCS-DataTypes.asn RRLP-Messages.asn RRLP-Components.asn */ /* Input file: packet-rrlp-template.c */ @@ -4602,7 +4602,7 @@ void proto_register_rrlp(void) { FT_NONE, BASE_NONE, NULL, 0, "rrlp.PCS_Extensions", HFILL }}, { &hf_rrlp_PrivateExtensionList_item, - { "PrivateExtensionList", "rrlp.PrivateExtensionList_item", + { "PrivateExtension", "rrlp.PrivateExtension", FT_NONE, BASE_NONE, NULL, 0, "rrlp.PrivateExtension", HFILL }}, { &hf_rrlp_extId, @@ -4798,7 +4798,7 @@ void proto_register_rrlp(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrlp.SeqOfMsrAssistBTS", HFILL }}, { &hf_rrlp_SeqOfMsrAssistBTS_item, - { "SeqOfMsrAssistBTS", "rrlp.SeqOfMsrAssistBTS_item", + { "MsrAssistBTS", "rrlp.MsrAssistBTS", FT_NONE, BASE_NONE, NULL, 0, "rrlp.MsrAssistBTS", HFILL }}, { &hf_rrlp_multiFrameOffset, @@ -4818,7 +4818,7 @@ void proto_register_rrlp(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrlp.SeqOfSystemInfoAssistBTS", HFILL }}, { &hf_rrlp_SeqOfSystemInfoAssistBTS_item, - { "SeqOfSystemInfoAssistBTS", "rrlp.SeqOfSystemInfoAssistBTS_item", + { "SystemInfoAssistBTS", "rrlp.SystemInfoAssistBTS", FT_UINT32, BASE_DEC, VALS(rrlp_SystemInfoAssistBTS_vals), 0, "rrlp.SystemInfoAssistBTS", HFILL }}, { &hf_rrlp_notPresent, @@ -4866,7 +4866,7 @@ void proto_register_rrlp(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrlp.SeqOfReferenceIdentityType", HFILL }}, { &hf_rrlp_SeqOfReferenceIdentityType_item, - { "SeqOfReferenceIdentityType", "rrlp.SeqOfReferenceIdentityType_item", + { "ReferenceIdentityType", "rrlp.ReferenceIdentityType", FT_UINT32, BASE_DEC, VALS(rrlp_ReferenceIdentityType_vals), 0, "rrlp.ReferenceIdentityType", HFILL }}, { &hf_rrlp_bsicAndCarrier, @@ -4910,7 +4910,7 @@ void proto_register_rrlp(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrlp.SeqOfOTD_MsrElementRest", HFILL }}, { &hf_rrlp_SeqOfOTD_MsrElementRest_item, - { "SeqOfOTD-MsrElementRest", "rrlp.SeqOfOTD_MsrElementRest_item", + { "OTD-MsrElementRest", "rrlp.OTD_MsrElementRest", FT_NONE, BASE_NONE, NULL, 0, "rrlp.OTD_MsrElementRest", HFILL }}, { &hf_rrlp_refFrameNumber, @@ -4938,7 +4938,7 @@ void proto_register_rrlp(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrlp.SeqOfOTD_FirstSetMsrs", HFILL }}, { &hf_rrlp_SeqOfOTD_FirstSetMsrs_item, - { "SeqOfOTD-FirstSetMsrs", "rrlp.SeqOfOTD_FirstSetMsrs_item", + { "OTD-FirstSetMsrs", "rrlp.OTD_FirstSetMsrs", FT_NONE, BASE_NONE, NULL, 0, "rrlp.OTD_FirstSetMsrs", HFILL }}, { &hf_rrlp_otd_MsrsOfOtherSets, @@ -4946,7 +4946,7 @@ void proto_register_rrlp(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrlp.SeqOfOTD_MsrsOfOtherSets", HFILL }}, { &hf_rrlp_SeqOfOTD_MsrsOfOtherSets_item, - { "SeqOfOTD-MsrsOfOtherSets", "rrlp.SeqOfOTD_MsrsOfOtherSets_item", + { "OTD-MsrsOfOtherSets", "rrlp.OTD_MsrsOfOtherSets", FT_UINT32, BASE_DEC, VALS(rrlp_OTD_MsrsOfOtherSets_vals), 0, "rrlp.OTD_MsrsOfOtherSets", HFILL }}, { &hf_rrlp_refQuality, @@ -5014,7 +5014,7 @@ void proto_register_rrlp(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrlp.SeqOfGPS_MsrSetElement", HFILL }}, { &hf_rrlp_SeqOfGPS_MsrSetElement_item, - { "SeqOfGPS-MsrSetElement", "rrlp.SeqOfGPS_MsrSetElement_item", + { "GPS-MsrSetElement", "rrlp.GPS_MsrSetElement", FT_NONE, BASE_NONE, NULL, 0, "rrlp.GPS_MsrSetElement", HFILL }}, { &hf_rrlp_gpsTOW_01, @@ -5026,7 +5026,7 @@ void proto_register_rrlp(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrlp.SeqOfGPS_MsrElement", HFILL }}, { &hf_rrlp_SeqOfGPS_MsrElement_item, - { "SeqOfGPS-MsrElement", "rrlp.SeqOfGPS_MsrElement_item", + { "GPS-MsrElement", "rrlp.GPS_MsrElement", FT_NONE, BASE_NONE, NULL, 0, "rrlp.GPS_MsrElement", HFILL }}, { &hf_rrlp_satelliteID, @@ -5134,7 +5134,7 @@ void proto_register_rrlp(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrlp.GPSWeek", HFILL }}, { &hf_rrlp_GPSTOWAssist_item, - { "GPSTOWAssist", "rrlp.GPSTOWAssist_item", + { "GPSTOWAssistElement", "rrlp.GPSTOWAssistElement", FT_NONE, BASE_NONE, NULL, 0, "rrlp.GPSTOWAssistElement", HFILL }}, { &hf_rrlp_tlmWord, @@ -5182,7 +5182,7 @@ void proto_register_rrlp(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrlp.SeqOfSatElement", HFILL }}, { &hf_rrlp_SeqOfSatElement_item, - { "SeqOfSatElement", "rrlp.SeqOfSatElement_item", + { "SatElement", "rrlp.SatElement", FT_NONE, BASE_NONE, NULL, 0, "rrlp.SatElement", HFILL }}, { &hf_rrlp_iode, @@ -5222,7 +5222,7 @@ void proto_register_rrlp(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrlp.SeqOfNavModelElement", HFILL }}, { &hf_rrlp_SeqOfNavModelElement_item, - { "SeqOfNavModelElement", "rrlp.SeqOfNavModelElement_item", + { "NavModelElement", "rrlp.NavModelElement", FT_NONE, BASE_NONE, NULL, 0, "rrlp.NavModelElement", HFILL }}, { &hf_rrlp_satStatus, @@ -5446,7 +5446,7 @@ void proto_register_rrlp(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrlp.SeqOfAlmanacElement", HFILL }}, { &hf_rrlp_SeqOfAlmanacElement_item, - { "SeqOfAlmanacElement", "rrlp.SeqOfAlmanacElement_item", + { "AlmanacElement", "rrlp.AlmanacElement", FT_NONE, BASE_NONE, NULL, 0, "rrlp.AlmanacElement", HFILL }}, { &hf_rrlp_almanacE, @@ -5502,7 +5502,7 @@ void proto_register_rrlp(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrlp.SeqOfAcquisElement", HFILL }}, { &hf_rrlp_SeqOfAcquisElement_item, - { "SeqOfAcquisElement", "rrlp.SeqOfAcquisElement_item", + { "AcquisElement", "rrlp.AcquisElement", FT_NONE, BASE_NONE, NULL, 0, "rrlp.AcquisElement", HFILL }}, { &hf_rrlp_gpsTOW_03, @@ -5558,7 +5558,7 @@ void proto_register_rrlp(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrlp.INTEGER_0_7", HFILL }}, { &hf_rrlp_SeqOf_BadSatelliteSet_item, - { "SeqOf-BadSatelliteSet", "rrlp.SeqOf_BadSatelliteSet_item", + { "SatelliteID", "rrlp.SatelliteID", FT_UINT32, BASE_DEC, NULL, 0, "rrlp.SatelliteID", HFILL }}, { &hf_rrlp_rel98_Ext_ExpOTD, @@ -5586,7 +5586,7 @@ void proto_register_rrlp(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrlp.SeqOfMsrAssistBTS_R98_ExpOTD", HFILL }}, { &hf_rrlp_SeqOfMsrAssistBTS_R98_ExpOTD_item, - { "SeqOfMsrAssistBTS-R98-ExpOTD", "rrlp.SeqOfMsrAssistBTS_R98_ExpOTD_item", + { "MsrAssistBTS-R98-ExpOTD", "rrlp.MsrAssistBTS_R98_ExpOTD", FT_NONE, BASE_NONE, NULL, 0, "rrlp.MsrAssistBTS_R98_ExpOTD", HFILL }}, { &hf_rrlp_expectedOTD, @@ -5602,7 +5602,7 @@ void proto_register_rrlp(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrlp.SeqOfSystemInfoAssistBTS_R98_ExpOTD", HFILL }}, { &hf_rrlp_SeqOfSystemInfoAssistBTS_R98_ExpOTD_item, - { "SeqOfSystemInfoAssistBTS-R98-ExpOTD", "rrlp.SeqOfSystemInfoAssistBTS_R98_ExpOTD_item", + { "SystemInfoAssistBTS-R98-ExpOTD", "rrlp.SystemInfoAssistBTS_R98_ExpOTD", FT_UINT32, BASE_DEC, VALS(rrlp_SystemInfoAssistBTS_R98_ExpOTD_vals), 0, "rrlp.SystemInfoAssistBTS_R98_ExpOTD", HFILL }}, { &hf_rrlp_present_01, @@ -5646,7 +5646,7 @@ void proto_register_rrlp(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrlp.SeqOfOTD_FirstSetMsrs_R98_Ext", HFILL }}, { &hf_rrlp_SeqOfOTD_FirstSetMsrs_R98_Ext_item, - { "SeqOfOTD-FirstSetMsrs-R98-Ext", "rrlp.SeqOfOTD_FirstSetMsrs_R98_Ext_item", + { "OTD-FirstSetMsrs", "rrlp.OTD_FirstSetMsrs", FT_NONE, BASE_NONE, NULL, 0, "rrlp.OTD_FirstSetMsrs", HFILL }}, { &hf_rrlp_extended_reference, @@ -5718,7 +5718,7 @@ void proto_register_rrlp(void) { FT_NONE, BASE_NONE, NULL, 0, "rrlp.GANSSIonosphericModel", HFILL }}, { &hf_rrlp_SeqOfGANSSGenericAssistDataElement_item, - { "SeqOfGANSSGenericAssistDataElement", "rrlp.SeqOfGANSSGenericAssistDataElement_item", + { "GANSSGenericAssistDataElement", "rrlp.GANSSGenericAssistDataElement", FT_NONE, BASE_NONE, NULL, 0, "rrlp.GANSSGenericAssistDataElement", HFILL }}, { &hf_rrlp_ganssID, @@ -5826,7 +5826,7 @@ void proto_register_rrlp(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrlp.INTEGER_0_1", HFILL }}, { &hf_rrlp_SeqOfGANSSTimeModel_item, - { "SeqOfGANSSTimeModel", "rrlp.SeqOfGANSSTimeModel_item", + { "GANSSTimeModelElement", "rrlp.GANSSTimeModelElement", FT_NONE, BASE_NONE, NULL, 0, "rrlp.GANSSTimeModelElement", HFILL }}, { &hf_rrlp_ganssTimeModelRefTime, @@ -5862,7 +5862,7 @@ void proto_register_rrlp(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrlp.SeqOfSgnTypeElement", HFILL }}, { &hf_rrlp_SeqOfSgnTypeElement_item, - { "SeqOfSgnTypeElement", "rrlp.SeqOfSgnTypeElement_item", + { "SgnTypeElement", "rrlp.SgnTypeElement", FT_NONE, BASE_NONE, NULL, 0, "rrlp.SgnTypeElement", HFILL }}, { &hf_rrlp_ganssSignalID, @@ -5878,7 +5878,7 @@ void proto_register_rrlp(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrlp.SeqOfDGANSSSgnElement", HFILL }}, { &hf_rrlp_SeqOfDGANSSSgnElement_item, - { "SeqOfDGANSSSgnElement", "rrlp.SeqOfDGANSSSgnElement_item", + { "DGANSSSgnElement", "rrlp.DGANSSSgnElement", FT_NONE, BASE_NONE, NULL, 0, "rrlp.DGANSSSgnElement", HFILL }}, { &hf_rrlp_svID, @@ -5910,7 +5910,7 @@ void proto_register_rrlp(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrlp.SeqOfGANSSSatelliteElement", HFILL }}, { &hf_rrlp_SeqOfGANSSSatelliteElement_item, - { "SeqOfGANSSSatelliteElement", "rrlp.SeqOfGANSSSatelliteElement_item", + { "GANSSSatelliteElement", "rrlp.GANSSSatelliteElement", FT_NONE, BASE_NONE, NULL, 0, "rrlp.GANSSSatelliteElement", HFILL }}, { &hf_rrlp_svHealth, @@ -5998,7 +5998,7 @@ void proto_register_rrlp(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrlp.SeqOfStandardClockModelElement", HFILL }}, { &hf_rrlp_SeqOfStandardClockModelElement_item, - { "SeqOfStandardClockModelElement", "rrlp.SeqOfStandardClockModelElement_item", + { "StandardClockModelElement", "rrlp.StandardClockModelElement", FT_NONE, BASE_NONE, NULL, 0, "rrlp.StandardClockModelElement", HFILL }}, { &hf_rrlp_stanClockTocLSB, @@ -6030,7 +6030,7 @@ void proto_register_rrlp(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrlp.SeqOfBadSignalElement", HFILL }}, { &hf_rrlp_SeqOfBadSignalElement_item, - { "SeqOfBadSignalElement", "rrlp.SeqOfBadSignalElement_item", + { "BadSignalElement", "rrlp.BadSignalElement", FT_NONE, BASE_NONE, NULL, 0, "rrlp.BadSignalElement", HFILL }}, { &hf_rrlp_badSVID, @@ -6054,7 +6054,7 @@ void proto_register_rrlp(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrlp.SeqOf_GANSSDataBits", HFILL }}, { &hf_rrlp_SeqOf_GANSSDataBits_item, - { "SeqOf-GANSSDataBits", "rrlp.SeqOf_GANSSDataBits_item", + { "GANSSDataBit", "rrlp.GANSSDataBit", FT_UINT32, BASE_DEC, NULL, 0, "rrlp.GANSSDataBit", HFILL }}, { &hf_rrlp_ganssSignalID_01, @@ -6066,7 +6066,7 @@ void proto_register_rrlp(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrlp.SeqOfGANSSRefMeasurementElement", HFILL }}, { &hf_rrlp_SeqOfGANSSRefMeasurementElement_item, - { "SeqOfGANSSRefMeasurementElement", "rrlp.SeqOfGANSSRefMeasurementElement_item", + { "GANSSRefMeasurementElement", "rrlp.GANSSRefMeasurementElement", FT_NONE, BASE_NONE, NULL, 0, "rrlp.GANSSRefMeasurementElement", HFILL }}, { &hf_rrlp_additionalDoppler, @@ -6110,7 +6110,7 @@ void proto_register_rrlp(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrlp.SeqOfGANSSAlmanacElement", HFILL }}, { &hf_rrlp_SeqOfGANSSAlmanacElement_item, - { "SeqOfGANSSAlmanacElement", "rrlp.SeqOfGANSSAlmanacElement_item", + { "GANSSAlmanacElement", "rrlp.GANSSAlmanacElement", FT_UINT32, BASE_DEC, VALS(rrlp_GANSSAlmanacElement_vals), 0, "rrlp.GANSSAlmanacElement", HFILL }}, { &hf_rrlp_keplerianAlmanacSet, @@ -6238,7 +6238,7 @@ void proto_register_rrlp(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrlp.SeqOfGANSS_MsrSetElement", HFILL }}, { &hf_rrlp_SeqOfGANSS_MsrSetElement_item, - { "SeqOfGANSS-MsrSetElement", "rrlp.SeqOfGANSS_MsrSetElement_item", + { "GANSS-MsrSetElement", "rrlp.GANSS_MsrSetElement", FT_NONE, BASE_NONE, NULL, 0, "rrlp.GANSS_MsrSetElement", HFILL }}, { &hf_rrlp_deltaGNASSTOD, @@ -6250,7 +6250,7 @@ void proto_register_rrlp(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrlp.SeqOfGANSS_SgnTypeElement", HFILL }}, { &hf_rrlp_SeqOfGANSS_SgnTypeElement_item, - { "SeqOfGANSS-SgnTypeElement", "rrlp.SeqOfGANSS_SgnTypeElement_item", + { "GANSS-SgnTypeElement", "rrlp.GANSS_SgnTypeElement", FT_NONE, BASE_NONE, NULL, 0, "rrlp.GANSS_SgnTypeElement", HFILL }}, { &hf_rrlp_ganssSignalID_02, @@ -6262,7 +6262,7 @@ void proto_register_rrlp(void) { FT_UINT32, BASE_DEC, NULL, 0, "rrlp.SeqOfGANSS_SgnElement", HFILL }}, { &hf_rrlp_SeqOfGANSS_SgnElement_item, - { "SeqOfGANSS-SgnElement", "rrlp.SeqOfGANSS_SgnElement_item", + { "GANSS-SgnElement", "rrlp.GANSS_SgnElement", FT_NONE, BASE_NONE, NULL, 0, "rrlp.GANSS_SgnElement", HFILL }}, { &hf_rrlp_mpathDet, diff --git a/epan/dissectors/packet-rtse.c b/epan/dissectors/packet-rtse.c index caa45bec84..b00ed57fd3 100644 --- a/epan/dissectors/packet-rtse.c +++ b/epan/dissectors/packet-rtse.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-rtse.c */ -/* ../../tools/asn2wrs.py -b -e -p rtse -c rtse.cnf -s packet-rtse-template rtse.asn */ +/* ../../tools/asn2wrs.py -b -e -p rtse -c ./rtse.cnf -s ./packet-rtse-template -D . rtse.asn */ /* Input file: packet-rtse-template.c */ diff --git a/epan/dissectors/packet-rtse.h b/epan/dissectors/packet-rtse.h index 6d077e3845..d1cc772e55 100644 --- a/epan/dissectors/packet-rtse.h +++ b/epan/dissectors/packet-rtse.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-rtse.h */ -/* ../../tools/asn2wrs.py -b -e -p rtse -c rtse.cnf -s packet-rtse-template rtse.asn */ +/* ../../tools/asn2wrs.py -b -e -p rtse -c ./rtse.cnf -s ./packet-rtse-template -D . rtse.asn */ /* Input file: packet-rtse-template.h */ 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, diff --git a/epan/dissectors/packet-s4406.c b/epan/dissectors/packet-s4406.c index 1df419e167..e961a177a7 100644 --- a/epan/dissectors/packet-s4406.c +++ b/epan/dissectors/packet-s4406.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-s4406.c */ -/* ../../tools/asn2wrs.py -b -p s4406 -c s4406.cnf -s packet-s4406-template s4406.asn */ +/* ../../tools/asn2wrs.py -b -p s4406 -c ./s4406.cnf -s ./packet-s4406-template -D . s4406.asn */ /* Input file: packet-s4406-template.c */ @@ -1005,7 +1005,7 @@ void proto_register_s4406(void) { FT_NONE, BASE_NONE, NULL, 0, "x420.IPN", HFILL }}, { &hf_s4406_ExemptedAddressSeq_item, - { "ExemptedAddressSeq", "s4406.ExemptedAddressSeq_item", + { "ExemptedAddress", "s4406.ExemptedAddress", FT_NONE, BASE_NONE, NULL, 0, "s4406.ExemptedAddress", HFILL }}, { &hf_s4406_sics, @@ -1013,7 +1013,7 @@ void proto_register_s4406(void) { FT_UINT32, BASE_DEC, NULL, 0, "s4406.SEQUENCE_OF_Sic", HFILL }}, { &hf_s4406_sics_item, - { "sics", "s4406.sics_item", + { "Sic", "s4406.Sic", FT_STRING, BASE_NONE, NULL, 0, "s4406.Sic", HFILL }}, { &hf_s4406_dist_Extensions, @@ -1021,7 +1021,7 @@ void proto_register_s4406(void) { FT_UINT32, BASE_DEC, NULL, 0, "s4406.SEQUENCE_OF_DistributionExtensionField", HFILL }}, { &hf_s4406_dist_Extensions_item, - { "dist-Extensions", "s4406.dist_Extensions_item", + { "DistributionExtensionField", "s4406.DistributionExtensionField", FT_NONE, BASE_NONE, NULL, 0, "s4406.DistributionExtensionField", HFILL }}, { &hf_s4406_dist_type, @@ -1033,11 +1033,11 @@ void proto_register_s4406(void) { FT_NONE, BASE_NONE, NULL, 0, "s4406.T_dist_value", HFILL }}, { &hf_s4406_HandlingInstructions_item, - { "HandlingInstructions", "s4406.HandlingInstructions_item", + { "MilitaryString", "s4406.MilitaryString", FT_STRING, BASE_NONE, NULL, 0, "s4406.MilitaryString", HFILL }}, { &hf_s4406_MessageInstructions_item, - { "MessageInstructions", "s4406.MessageInstructions_item", + { "MilitaryString", "s4406.MilitaryString", FT_STRING, BASE_NONE, NULL, 0, "s4406.MilitaryString", HFILL }}, { &hf_s4406_message_type_type, @@ -1049,7 +1049,7 @@ void proto_register_s4406(void) { FT_STRING, BASE_NONE, NULL, 0, "s4406.MessageIdentifier", HFILL }}, { &hf_s4406_AddressListDesignatorSeq_item, - { "AddressListDesignatorSeq", "s4406.AddressListDesignatorSeq_item", + { "AddressListDesignator", "s4406.AddressListDesignator", FT_NONE, BASE_NONE, NULL, 0, "s4406.AddressListDesignator", HFILL }}, { &hf_s4406_address_list_type, @@ -1069,7 +1069,7 @@ void proto_register_s4406(void) { FT_INT32, BASE_DEC, VALS(s4406_AddressListRequest_vals), 0, "s4406.AddressListRequest", HFILL }}, { &hf_s4406_OtherRecipientDesignatorSeq_item, - { "OtherRecipientDesignatorSeq", "s4406.OtherRecipientDesignatorSeq_item", + { "OtherRecipientDesignator", "s4406.OtherRecipientDesignator", FT_NONE, BASE_NONE, NULL, 0, "s4406.OtherRecipientDesignator", HFILL }}, { &hf_s4406_other_recipient_type, @@ -1081,7 +1081,7 @@ void proto_register_s4406(void) { FT_STRING, BASE_NONE, NULL, 0, "s4406.MilitaryString", HFILL }}, { &hf_s4406_PilotInformationSeq_item, - { "PilotInformationSeq", "s4406.PilotInformationSeq_item", + { "PilotInformation", "s4406.PilotInformation", FT_NONE, BASE_NONE, NULL, 0, "s4406.PilotInformation", HFILL }}, { &hf_s4406_pilotPrecedence, @@ -1093,7 +1093,7 @@ void proto_register_s4406(void) { FT_UINT32, BASE_DEC, NULL, 0, "s4406.SEQUENCE_OF_ORDescriptor", HFILL }}, { &hf_s4406_pilotRecipient_item, - { "pilotRecipient", "s4406.pilotRecipient_item", + { "ORDescriptor", "s4406.ORDescriptor", FT_NONE, BASE_NONE, NULL, 0, "x420.ORDescriptor", HFILL }}, { &hf_s4406_pilotSecurity, @@ -1105,7 +1105,7 @@ void proto_register_s4406(void) { FT_UINT32, BASE_DEC, NULL, 0, "s4406.SEQUENCE_OF_MilitaryString", HFILL }}, { &hf_s4406_pilotHandling_item, - { "pilotHandling", "s4406.pilotHandling_item", + { "MilitaryString", "s4406.MilitaryString", FT_STRING, BASE_NONE, NULL, 0, "s4406.MilitaryString", HFILL }}, { &hf_s4406_content_security_label, @@ -1121,7 +1121,7 @@ void proto_register_s4406(void) { FT_UINT32, BASE_DEC, NULL, 0, "s4406.SEQUENCE_OF_BodyPartSecurityLabel", HFILL }}, { &hf_s4406_body_part_security_labels_item, - { "body-part-security-labels", "s4406.body_part_security_labels_item", + { "BodyPartSecurityLabel", "s4406.BodyPartSecurityLabel", FT_NONE, BASE_NONE, NULL, 0, "s4406.BodyPartSecurityLabel", HFILL }}, { &hf_s4406_body_part_security_label, diff --git a/epan/dissectors/packet-s4406.h b/epan/dissectors/packet-s4406.h index 31397c2272..defd0711a7 100644 --- a/epan/dissectors/packet-s4406.h +++ b/epan/dissectors/packet-s4406.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-s4406.h */ -/* ../../tools/asn2wrs.py -b -p s4406 -c s4406.cnf -s packet-s4406-template s4406.asn */ +/* ../../tools/asn2wrs.py -b -p s4406 -c ./s4406.cnf -s ./packet-s4406-template -D . s4406.asn */ /* Input file: packet-s4406-template.h */ diff --git a/epan/dissectors/packet-sabp.c b/epan/dissectors/packet-sabp.c index 1b3ee4e70f..a219f95db6 100644 --- a/epan/dissectors/packet-sabp.c +++ b/epan/dissectors/packet-sabp.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-sabp.c */ -/* ../../tools/asn2wrs.py -p sabp -c sabp.cnf -s packet-sabp-template SABP-CommonDataTypes.asn SABP-Constants.asn SABP-Containers.asn SABP-IEs.asn SABP-PDU-Contents.asn SABP-PDU-Descriptions.asn */ +/* ../../tools/asn2wrs.py -p sabp -c ./sabp.cnf -s ./packet-sabp-template -D . SABP-CommonDataTypes.asn SABP-Constants.asn SABP-Containers.asn SABP-IEs.asn SABP-PDU-Contents.asn SABP-PDU-Descriptions.asn */ /* Input file: packet-sabp-template.c */ @@ -1826,7 +1826,7 @@ void proto_register_sabp(void) { FT_UINT32, BASE_DEC, VALS(sabp_SABP_PDU_vals), 0, "sabp.SABP_PDU", HFILL }}, { &hf_sabp_ProtocolIE_Container_item, - { "ProtocolIE-Container", "sabp.ProtocolIE_Container_item", + { "ProtocolIE-Field", "sabp.ProtocolIE_Field", FT_NONE, BASE_NONE, NULL, 0, "sabp.ProtocolIE_Field", HFILL }}, { &hf_sabp_id, @@ -1842,7 +1842,7 @@ void proto_register_sabp(void) { FT_NONE, BASE_NONE, NULL, 0, "sabp.ProtocolIE_Field_value", HFILL }}, { &hf_sabp_ProtocolExtensionContainer_item, - { "ProtocolExtensionContainer", "sabp.ProtocolExtensionContainer_item", + { "ProtocolExtensionField", "sabp.ProtocolExtensionField", FT_NONE, BASE_NONE, NULL, 0, "sabp.ProtocolExtensionField", HFILL }}, { &hf_sabp_ext_id, @@ -1874,7 +1874,7 @@ void proto_register_sabp(void) { FT_UINT32, BASE_DEC, NULL, 0, "sabp.ProtocolExtensionContainer", HFILL }}, { &hf_sabp_CriticalityDiagnostics_IE_List_item, - { "CriticalityDiagnostics-IE-List", "sabp.CriticalityDiagnostics_IE_List_item", + { "CriticalityDiagnostics-IE-List item", "sabp.CriticalityDiagnostics_IE_List_item", FT_NONE, BASE_NONE, NULL, 0, "sabp.CriticalityDiagnostics_IE_List_item", HFILL }}, { &hf_sabp_iECriticality, @@ -1890,7 +1890,7 @@ void proto_register_sabp(void) { FT_UINT32, BASE_DEC, NULL, 0, "sabp.RepetitionNumber0", HFILL }}, { &hf_sabp_MessageStructure_item, - { "MessageStructure", "sabp.MessageStructure_item", + { "MessageStructure item", "sabp.MessageStructure_item", FT_NONE, BASE_NONE, NULL, 0, "sabp.MessageStructure_item", HFILL }}, { &hf_sabp_repetitionNumber1, @@ -1898,7 +1898,7 @@ void proto_register_sabp(void) { FT_UINT32, BASE_DEC, NULL, 0, "sabp.RepetitionNumber1", HFILL }}, { &hf_sabp_Failure_List_item, - { "Failure-List", "sabp.Failure_List_item", + { "Failure-List-Item", "sabp.Failure_List_Item", FT_NONE, BASE_NONE, NULL, 0, "sabp.Failure_List_Item", HFILL }}, { &hf_sabp_service_area_identifier, @@ -1910,7 +1910,7 @@ void proto_register_sabp(void) { FT_UINT32, BASE_DEC, VALS(sabp_Cause_vals), 0, "sabp.Cause", HFILL }}, { &hf_sabp_Number_of_Broadcasts_Completed_List_item, - { "Number-of-Broadcasts-Completed-List", "sabp.Number_of_Broadcasts_Completed_List_item", + { "Number-of-Broadcasts-Completed-List-Item", "sabp.Number_of_Broadcasts_Completed_List_Item", FT_NONE, BASE_NONE, NULL, 0, "sabp.Number_of_Broadcasts_Completed_List_Item", HFILL }}, { &hf_sabp_number_of_broadcasts_completed, @@ -1922,7 +1922,7 @@ void proto_register_sabp(void) { FT_UINT32, BASE_DEC, VALS(sabp_Number_Of_Broadcasts_Completed_Info_vals), 0, "sabp.Number_Of_Broadcasts_Completed_Info", HFILL }}, { &hf_sabp_Radio_Resource_Loading_List_item, - { "Radio-Resource-Loading-List", "sabp.Radio_Resource_Loading_List_item", + { "Radio-Resource-Loading-List-Item", "sabp.Radio_Resource_Loading_List_Item", FT_NONE, BASE_NONE, NULL, 0, "sabp.Radio_Resource_Loading_List_Item", HFILL }}, { &hf_sabp_available_bandwidth, @@ -1942,7 +1942,7 @@ void proto_register_sabp(void) { FT_BYTES, BASE_HEX, NULL, 0, "sabp.OCTET_STRING_SIZE_2", HFILL }}, { &hf_sabp_Service_Areas_List_item, - { "Service-Areas-List", "sabp.Service_Areas_List_item", + { "Service-Area-Identifier", "sabp.Service_Area_Identifier", FT_NONE, BASE_NONE, NULL, 0, "sabp.Service_Area_Identifier", HFILL }}, { &hf_sabp_protocolIEs, diff --git a/epan/dissectors/packet-smrse.c b/epan/dissectors/packet-smrse.c index fd9121616b..94e72c7c1f 100644 --- a/epan/dissectors/packet-smrse.c +++ b/epan/dissectors/packet-smrse.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-smrse.c */ -/* ../../tools/asn2wrs.py -b -p smrse -c smrse.cnf -s packet-smrse-template SMRSE.asn */ +/* ../../tools/asn2wrs.py -b -p smrse -c ./smrse.cnf -s ./packet-smrse-template -D . SMRSE.asn */ /* Input file: packet-smrse-template.c */ diff --git a/epan/dissectors/packet-smrse.h b/epan/dissectors/packet-smrse.h index cb2fa2e7bb..7ae76b8017 100644 --- a/epan/dissectors/packet-smrse.h +++ b/epan/dissectors/packet-smrse.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-smrse.h */ -/* ../../tools/asn2wrs.py -b -p smrse -c smrse.cnf -s packet-smrse-template SMRSE.asn */ +/* ../../tools/asn2wrs.py -b -p smrse -c ./smrse.cnf -s ./packet-smrse-template -D . SMRSE.asn */ /* Input file: packet-smrse-template.h */ diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c index d5e9818daa..1a2b6a3736 100644 --- a/epan/dissectors/packet-snmp.c +++ b/epan/dissectors/packet-snmp.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-snmp.c */ -/* ../../tools/asn2wrs.py -b -p snmp -c snmp.cnf -s packet-snmp-template snmp.asn */ +/* ../../tools/asn2wrs.py -b -p snmp -c ./snmp.cnf -s ./packet-snmp-template -D . snmp.asn */ /* Input file: packet-snmp-template.c */ @@ -3307,7 +3307,7 @@ void proto_register_snmp(void) { FT_NONE, BASE_NONE, NULL, 0, "snmp.NULL", HFILL }}, { &hf_snmp_VarBindList_item, - { "VarBindList", "snmp.VarBindList_item", + { "VarBind", "snmp.VarBind", FT_NONE, BASE_NONE, NULL, 0, "snmp.VarBind", HFILL }}, { &hf_snmp_open, diff --git a/epan/dissectors/packet-snmp.h b/epan/dissectors/packet-snmp.h index 3aa0d29323..d246561083 100644 --- a/epan/dissectors/packet-snmp.h +++ b/epan/dissectors/packet-snmp.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-snmp.h */ -/* ../../tools/asn2wrs.py -b -p snmp -c snmp.cnf -s packet-snmp-template snmp.asn */ +/* ../../tools/asn2wrs.py -b -p snmp -c ./snmp.cnf -s ./packet-snmp-template -D . snmp.asn */ /* Input file: packet-snmp-template.h */ diff --git a/epan/dissectors/packet-spnego.c b/epan/dissectors/packet-spnego.c index 2714541d81..becf07b542 100644 --- a/epan/dissectors/packet-spnego.c +++ b/epan/dissectors/packet-spnego.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-spnego.c */ -/* ../../tools/asn2wrs.py -b -p spnego -c spnego.cnf -s packet-spnego-template spnego.asn */ +/* ../../tools/asn2wrs.py -b -p spnego -c ./spnego.cnf -s ./packet-spnego-template -D . spnego.asn */ /* Input file: packet-spnego-template.c */ @@ -1883,7 +1883,7 @@ void proto_register_spnego(void) { FT_NONE, BASE_NONE, NULL, 0, "spnego.NegTokenTarg", HFILL }}, { &hf_spnego_MechTypeList_item, - { "MechTypeList", "spnego.MechTypeList_item", + { "MechType", "spnego.MechType", FT_OID, BASE_NONE, NULL, 0, "spnego.MechType", HFILL }}, { &hf_spnego_principal, diff --git a/epan/dissectors/packet-spnego.h b/epan/dissectors/packet-spnego.h index 7dfc919ff9..12eb70901d 100644 --- a/epan/dissectors/packet-spnego.h +++ b/epan/dissectors/packet-spnego.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-spnego.h */ -/* ../../tools/asn2wrs.py -b -p spnego -c spnego.cnf -s packet-spnego-template spnego.asn */ +/* ../../tools/asn2wrs.py -b -p spnego -c ./spnego.cnf -s ./packet-spnego-template -D . spnego.asn */ /* Input file: packet-spnego-template.h */ diff --git a/epan/dissectors/packet-t125.c b/epan/dissectors/packet-t125.c index cae65584e7..c959d98b6d 100644 --- a/epan/dissectors/packet-t125.c +++ b/epan/dissectors/packet-t125.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-t125.c */ -/* ../../tools/asn2wrs.py -b -p t125 -c t125.cnf -s packet-t125-template MCS-PROTOCOL.asn */ +/* ../../tools/asn2wrs.py -b -p t125 -c ./t125.cnf -s ./packet-t125-template -D . MCS-PROTOCOL.asn */ /* Input file: packet-t125-template.c */ @@ -2296,7 +2296,7 @@ void proto_register_t125(void) { FT_UINT32, BASE_DEC, NULL, 0, "t125.SET_OF_UserId", HFILL }}, { &hf_t125_admitted_item, - { "admitted", "t125.admitted_item", + { "UserId", "t125.UserId", FT_UINT32, BASE_DEC, NULL, 0, "t125.UserId", HFILL }}, { &hf_t125_assigned, @@ -2312,7 +2312,7 @@ void proto_register_t125(void) { FT_UINT32, BASE_DEC, NULL, 0, "t125.SET_OF_ChannelAttributes", HFILL }}, { &hf_t125_mergeChannels_item, - { "mergeChannels", "t125.mergeChannels_item", + { "ChannelAttributes", "t125.ChannelAttributes", FT_UINT32, BASE_DEC, VALS(t125_ChannelAttributes_vals), 0, "t125.ChannelAttributes", HFILL }}, { &hf_t125_purgeChannelIds, @@ -2320,7 +2320,7 @@ void proto_register_t125(void) { FT_UINT32, BASE_DEC, NULL, 0, "t125.SET_OF_ChannelId", HFILL }}, { &hf_t125_purgeChannelIds_item, - { "purgeChannelIds", "t125.purgeChannelIds_item", + { "ChannelId", "t125.ChannelId", FT_UINT32, BASE_DEC, NULL, 0, "t125.ChannelId", HFILL }}, { &hf_t125_detachUserIds, @@ -2328,7 +2328,7 @@ void proto_register_t125(void) { FT_UINT32, BASE_DEC, NULL, 0, "t125.SET_OF_UserId", HFILL }}, { &hf_t125_detachUserIds_item, - { "detachUserIds", "t125.detachUserIds_item", + { "UserId", "t125.UserId", FT_UINT32, BASE_DEC, NULL, 0, "t125.UserId", HFILL }}, { &hf_t125_grabbed, @@ -2352,7 +2352,7 @@ void proto_register_t125(void) { FT_UINT32, BASE_DEC, NULL, 0, "t125.SET_OF_UserId", HFILL }}, { &hf_t125_inhibitors_item, - { "inhibitors", "t125.inhibitors_item", + { "UserId", "t125.UserId", FT_UINT32, BASE_DEC, NULL, 0, "t125.UserId", HFILL }}, { &hf_t125_giving, @@ -2376,7 +2376,7 @@ void proto_register_t125(void) { FT_UINT32, BASE_DEC, NULL, 0, "t125.SET_OF_TokenAttributes", HFILL }}, { &hf_t125_mergeTokens_item, - { "mergeTokens", "t125.mergeTokens_item", + { "TokenAttributes", "t125.TokenAttributes", FT_UINT32, BASE_DEC, VALS(t125_TokenAttributes_vals), 0, "t125.TokenAttributes", HFILL }}, { &hf_t125_purgeTokenIds, @@ -2384,7 +2384,7 @@ void proto_register_t125(void) { FT_UINT32, BASE_DEC, NULL, 0, "t125.SET_OF_TokenId", HFILL }}, { &hf_t125_purgeTokenIds_item, - { "purgeTokenIds", "t125.purgeTokenIds_item", + { "TokenId", "t125.TokenId", FT_UINT32, BASE_DEC, NULL, 0, "t125.TokenId", HFILL }}, { &hf_t125_reason, @@ -2408,7 +2408,7 @@ void proto_register_t125(void) { FT_UINT32, BASE_DEC, NULL, 0, "t125.SET_OF_UserId", HFILL }}, { &hf_t125_userIds_item, - { "userIds", "t125.userIds_item", + { "UserId", "t125.UserId", FT_UINT32, BASE_DEC, NULL, 0, "t125.UserId", HFILL }}, { &hf_t125_channelId_03, @@ -2424,7 +2424,7 @@ void proto_register_t125(void) { FT_UINT32, BASE_DEC, NULL, 0, "t125.SET_OF_ChannelId", HFILL }}, { &hf_t125_channelIds_item, - { "channelIds", "t125.channelIds_item", + { "ChannelId", "t125.ChannelId", FT_UINT32, BASE_DEC, NULL, 0, "t125.ChannelId", HFILL }}, { &hf_t125_segmentation, diff --git a/epan/dissectors/packet-t125.h b/epan/dissectors/packet-t125.h index 8c3581a029..b842dda62a 100644 --- a/epan/dissectors/packet-t125.h +++ b/epan/dissectors/packet-t125.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-t125.h */ -/* ../../tools/asn2wrs.py -b -p t125 -c t125.cnf -s packet-t125-template MCS-PROTOCOL.asn */ +/* ../../tools/asn2wrs.py -b -p t125 -c ./t125.cnf -s ./packet-t125-template -D . MCS-PROTOCOL.asn */ /* Input file: packet-t125-template.h */ diff --git a/epan/dissectors/packet-t38.c b/epan/dissectors/packet-t38.c index 13f4bf78ac..2d0e55aae3 100644 --- a/epan/dissectors/packet-t38.c +++ b/epan/dissectors/packet-t38.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-t38.c */ -/* ../../tools/asn2wrs.py -p t38 -c t38.cnf -s packet-t38-template T38_2002.asn */ +/* ../../tools/asn2wrs.py -p t38 -c ./t38.cnf -s ./packet-t38-template -D . T38_2002.asn */ /* Input file: packet-t38-template.c */ @@ -1292,7 +1292,7 @@ proto_register_t38(void) FT_UINT32, BASE_DEC, VALS(t38_T30_data_vals), 0, "t38.T30_data", HFILL }}, { &hf_t38_Data_Field_item, - { "Data-Field", "t38.Data_Field_item", + { "Data-Field item", "t38.Data_Field_item", FT_NONE, BASE_NONE, NULL, 0, "t38.Data_Field_item", HFILL }}, { &hf_t38_field_type, @@ -1320,7 +1320,7 @@ proto_register_t38(void) FT_UINT32, BASE_DEC, NULL, 0, "t38.T_secondary_ifp_packets", HFILL }}, { &hf_t38_secondary_ifp_packets_item, - { "secondary-ifp-packets", "t38.secondary_ifp_packets_item", + { "secondary-ifp-packets item", "t38.secondary_ifp_packets_item", FT_NONE, BASE_NONE, NULL, 0, "t38.OpenType_IFPPacket", HFILL }}, { &hf_t38_fec_info, @@ -1336,7 +1336,7 @@ proto_register_t38(void) FT_UINT32, BASE_DEC, NULL, 0, "t38.T_fec_data", HFILL }}, { &hf_t38_fec_data_item, - { "fec-data", "t38.fec_data_item", + { "fec-data item", "t38.fec_data_item", FT_BYTES, BASE_HEX, NULL, 0, "t38.OCTET_STRING", HFILL }}, diff --git a/epan/dissectors/packet-t38.h b/epan/dissectors/packet-t38.h index 8076714bd8..2dfb365635 100644 --- a/epan/dissectors/packet-t38.h +++ b/epan/dissectors/packet-t38.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-t38.h */ -/* ../../tools/asn2wrs.py -p t38 -c t38.cnf -s packet-t38-template T38_2002.asn */ +/* ../../tools/asn2wrs.py -p t38 -c ./t38.cnf -s ./packet-t38-template -D . T38_2002.asn */ /* Input file: packet-t38-template.h */ diff --git a/epan/dissectors/packet-tcap.c b/epan/dissectors/packet-tcap.c index 8ff5da26af..6c6fe3c79a 100644 --- a/epan/dissectors/packet-tcap.c +++ b/epan/dissectors/packet-tcap.c @@ -1671,7 +1671,7 @@ proto_register_tcap(void) FT_BYTES, BASE_HEX, NULL, 0, "tcap.DialoguePortion", HFILL }}, { &hf_tcap__untag_item, - { "_untag", "tcap._untag_item", + { "Component", "tcap.Component", FT_UINT32, BASE_DEC, VALS(tcap_Component_vals), 0, "tcap.Component", HFILL }}, { &hf_tcap_invoke, @@ -1783,7 +1783,7 @@ proto_register_tcap(void) FT_UINT32, BASE_DEC, NULL, 0, "tcap.AUDT_user_information", HFILL }}, { &hf_tcap_audt_user_information_item, - { "user-information", "tcap.user_information_item", + { "user-information item", "tcap.user_information_item", FT_NONE, BASE_NONE, NULL, 0, "tcap.EXTERNAL", HFILL }}, { &hf_tcap_dialogueRequest, @@ -1811,7 +1811,7 @@ proto_register_tcap(void) FT_UINT32, BASE_DEC, NULL, 0, "tcap.AARQ_user_information", HFILL }}, { &hf_tcap_aarq_user_information_item, - { "user-information", "tcap.user_information_item", + { "user-information item", "tcap.user_information_item", FT_NONE, BASE_NONE, NULL, 0, "tcap.EXTERNAL", HFILL }}, { &hf_tcap_aare_protocol_version, @@ -1835,7 +1835,7 @@ proto_register_tcap(void) FT_UINT32, BASE_DEC, NULL, 0, "tcap.AARE_user_information", HFILL }}, { &hf_tcap_aare_user_information_item, - { "user-information", "tcap.user_information_item", + { "user-information item", "tcap.user_information_item", FT_NONE, BASE_NONE, NULL, 0, "tcap.EXTERNAL", HFILL }}, { &hf_tcap_abort_source, @@ -1847,7 +1847,7 @@ proto_register_tcap(void) FT_UINT32, BASE_DEC, NULL, 0, "tcap.ABRT_user_information", HFILL }}, { &hf_tcap_abrt_user_information_item, - { "user-information", "tcap.user_information_item", + { "user-information item", "tcap.user_information_item", FT_NONE, BASE_NONE, NULL, 0, "tcap.EXTERNAL", HFILL }}, { &hf_tcap_dialogue_service_user, diff --git a/epan/dissectors/packet-ulp.c b/epan/dissectors/packet-ulp.c index e687829aed..9b236c2fda 100644 --- a/epan/dissectors/packet-ulp.c +++ b/epan/dissectors/packet-ulp.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-ulp.c */ -/* ../../tools/asn2wrs.py -p ulp -c ulp.cnf -s packet-ulp-template ULP.asn SUPL.asn ULP-Components.asn */ +/* ../../tools/asn2wrs.py -p ulp -c ./ulp.cnf -s ./packet-ulp-template -D . ULP.asn SUPL.asn ULP-Components.asn */ /* Input file: packet-ulp-template.c */ @@ -2470,7 +2470,7 @@ void proto_register_ulp(void) { FT_UINT32, BASE_DEC, NULL, 0, "ulp.SatelliteInfo", HFILL }}, { &hf_ulp_SatelliteInfo_item, - { "SatelliteInfo", "ulp.SatelliteInfo_item", + { "SatelliteInfoElement", "ulp.SatelliteInfoElement", FT_NONE, BASE_NONE, NULL, 0, "ulp.SatelliteInfoElement", HFILL }}, { &hf_ulp_satId, @@ -2766,7 +2766,7 @@ void proto_register_ulp(void) { FT_UINT32, BASE_DEC, NULL, 0, "ulp.UARFCN", HFILL }}, { &hf_ulp_NMR_item, - { "NMR", "ulp.NMR_item", + { "NMRelement", "ulp.NMRelement", FT_NONE, BASE_NONE, NULL, 0, "ulp.NMRelement", HFILL }}, { &hf_ulp_aRFCN, @@ -2782,7 +2782,7 @@ void proto_register_ulp(void) { FT_UINT32, BASE_DEC, NULL, 0, "ulp.INTEGER_0_63", HFILL }}, { &hf_ulp_MeasuredResultsList_item, - { "MeasuredResultsList", "ulp.MeasuredResultsList_item", + { "MeasuredResults", "ulp.MeasuredResults", FT_NONE, BASE_NONE, NULL, 0, "ulp.MeasuredResults", HFILL }}, { &hf_ulp_utra_CarrierRSSI, @@ -2794,7 +2794,7 @@ void proto_register_ulp(void) { FT_UINT32, BASE_DEC, NULL, 0, "ulp.CellMeasuredResultsList", HFILL }}, { &hf_ulp_CellMeasuredResultsList_item, - { "CellMeasuredResultsList", "ulp.CellMeasuredResultsList_item", + { "CellMeasuredResults", "ulp.CellMeasuredResults", FT_NONE, BASE_NONE, NULL, 0, "ulp.CellMeasuredResults", HFILL }}, { &hf_ulp_cellIdentity, @@ -2846,7 +2846,7 @@ void proto_register_ulp(void) { FT_UINT32, BASE_DEC, NULL, 0, "ulp.TimeslotISCP_List", HFILL }}, { &hf_ulp_TimeslotISCP_List_item, - { "TimeslotISCP-List", "ulp.TimeslotISCP_List_item", + { "TimeslotISCP", "ulp.TimeslotISCP", FT_UINT32, BASE_DEC, NULL, 0, "ulp.TimeslotISCP", HFILL }}, { &hf_ulp_horacc, diff --git a/epan/dissectors/packet-wlancertextn.c b/epan/dissectors/packet-wlancertextn.c index 21d76fd458..b05e23d67c 100644 --- a/epan/dissectors/packet-wlancertextn.c +++ b/epan/dissectors/packet-wlancertextn.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-wlancertextn.c */ -/* ../../tools/asn2wrs.py -b -p wlancertextn -c wlancertextn.cnf -s packet-wlancertextn-template WLANCERTEXTN.asn */ +/* ../../tools/asn2wrs.py -b -p wlancertextn -c ./wlancertextn.cnf -s ./packet-wlancertextn-template -D . WLANCERTEXTN.asn */ /* Input file: packet-wlancertextn-template.c */ @@ -125,7 +125,7 @@ void proto_register_wlancertextn(void) { FT_UINT32, BASE_DEC, NULL, 0, "wlancertextn.SSIDList", HFILL }}, { &hf_wlancertextn_SSIDList_item, - { "SSIDList", "wlancertextn.SSIDList_item", + { "SSID", "wlancertextn.SSID", FT_BYTES, BASE_HEX, NULL, 0, "wlancertextn.SSID", HFILL }}, diff --git a/epan/dissectors/packet-wlancertextn.h b/epan/dissectors/packet-wlancertextn.h index dbb5510f82..d51022bb40 100644 --- a/epan/dissectors/packet-wlancertextn.h +++ b/epan/dissectors/packet-wlancertextn.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-wlancertextn.h */ -/* ../../tools/asn2wrs.py -b -p wlancertextn -c wlancertextn.cnf -s packet-wlancertextn-template WLANCERTEXTN.asn */ +/* ../../tools/asn2wrs.py -b -p wlancertextn -c ./wlancertextn.cnf -s ./packet-wlancertextn-template -D . WLANCERTEXTN.asn */ /* Input file: packet-wlancertextn-template.h */ 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, diff --git a/epan/dissectors/packet-x411.c b/epan/dissectors/packet-x411.c index c9499d9953..0a8e14beba 100644 --- a/epan/dissectors/packet-x411.c +++ b/epan/dissectors/packet-x411.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-x411.c */ -/* ../../tools/asn2wrs.py -b -e -p x411 -c x411.cnf -s packet-x411-template MTAAbstractService.asn MTSAbstractService.asn */ +/* ../../tools/asn2wrs.py -b -e -p x411 -c ./x411.cnf -s ./packet-x411-template -D . MTAAbstractService.asn MTSAbstractService.asn */ /* Input file: packet-x411-template.c */ @@ -7672,7 +7672,7 @@ void proto_register_x411(void) { FT_UINT32, BASE_DEC, NULL, 0, "x411.SEQUENCE_OF_PerDomainBilateralInformation", HFILL }}, { &hf_x411_per_domain_bilateral_information_item, - { "per-domain-bilateral-information", "x411.per_domain_bilateral_information_item", + { "PerDomainBilateralInformation", "x411.PerDomainBilateralInformation", FT_NONE, BASE_NONE, NULL, 0, "x411.PerDomainBilateralInformation", HFILL }}, { &hf_x411_trace_information, @@ -7684,7 +7684,7 @@ void proto_register_x411(void) { FT_UINT32, BASE_DEC, NULL, 0, "x411.SET_OF_ExtensionField", HFILL }}, { &hf_x411_extensions_item, - { "extensions", "x411.extensions_item", + { "ExtensionField", "x411.ExtensionField", FT_NONE, BASE_NONE, NULL, 0, "x411.ExtensionField", HFILL }}, { &hf_x411_per_recipient_message_fields, @@ -7692,7 +7692,7 @@ void proto_register_x411(void) { FT_UINT32, BASE_DEC, NULL, 0, "x411.SEQUENCE_OF_PerRecipientMessageTransferFields", HFILL }}, { &hf_x411_per_recipient_message_fields_item, - { "per-recipient-fields", "x411.per_recipient_fields_item", + { "PerRecipientMessageTransferFields", "x411.PerRecipientMessageTransferFields", FT_NONE, BASE_NONE, NULL, 0, "x411.PerRecipientMessageTransferFields", HFILL }}, { &hf_x411_recipient_name, @@ -7724,7 +7724,7 @@ void proto_register_x411(void) { FT_UINT32, BASE_DEC, NULL, 0, "x411.SEQUENCE_OF_PerRecipientProbeTransferFields", HFILL }}, { &hf_x411_per_recipient_probe_transfer_fields_item, - { "per-recipient-fields", "x411.per_recipient_fields_item", + { "PerRecipientProbeTransferFields", "x411.PerRecipientProbeTransferFields", FT_NONE, BASE_NONE, NULL, 0, "x411.PerRecipientProbeTransferFields", HFILL }}, { &hf_x411_report_identifier, @@ -7756,7 +7756,7 @@ void proto_register_x411(void) { FT_UINT32, BASE_DEC, NULL, 0, "x411.SEQUENCE_OF_PerRecipientReportTransferFields", HFILL }}, { &hf_x411_per_recipient_report_fields_item, - { "per-recipient-fields", "x411.per_recipient_fields_item", + { "PerRecipientReportTransferFields", "x411.PerRecipientReportTransferFields", FT_NONE, BASE_NONE, NULL, 0, "x411.PerRecipientReportTransferFields", HFILL }}, { &hf_x411_mta_actual_recipient_name, @@ -7812,7 +7812,7 @@ void proto_register_x411(void) { FT_UINT32, BASE_DEC, VALS(x411_ReportType_vals), 0, "x411.ReportType", HFILL }}, { &hf_x411_InternalTraceInformation_item, - { "InternalTraceInformation", "x411.InternalTraceInformation_item", + { "InternalTraceInformationElement", "x411.InternalTraceInformationElement", FT_NONE, BASE_NONE, NULL, 0, "x411.InternalTraceInformationElement", HFILL }}, { &hf_x411_global_domain_identifier, @@ -7852,7 +7852,7 @@ void proto_register_x411(void) { FT_BYTES, BASE_HEX, NULL, 0, "x411.OtherActions", HFILL }}, { &hf_x411__untag_item, - { "_untag", "x411._untag_item", + { "TraceInformationElement", "x411.TraceInformationElement", FT_NONE, BASE_NONE, NULL, 0, "x411.TraceInformationElement", HFILL }}, { &hf_x411_domain_supplied_information, @@ -7956,7 +7956,7 @@ void proto_register_x411(void) { FT_BYTES, BASE_HEX, NULL, 0, "x411.BIT_STRING", HFILL }}, { &hf_x411_SecurityContext_item, - { "SecurityContext", "x411.SecurityContext_item", + { "SecurityLabel", "x411.SecurityLabel", FT_NONE, BASE_NONE, NULL, 0, "x411.SecurityLabel", HFILL }}, { &hf_x411_message_submission_envelope, @@ -7964,7 +7964,7 @@ void proto_register_x411(void) { FT_NONE, BASE_NONE, NULL, 0, "x411.MessageSubmissionEnvelope", HFILL }}, { &hf_x411_ImproperlySpecifiedRecipients_item, - { "ImproperlySpecifiedRecipients", "x411.ImproperlySpecifiedRecipients_item", + { "MTSRecipientName", "x411.MTSRecipientName", FT_NONE, BASE_NONE, NULL, 0, "x411.MTSRecipientName", HFILL }}, { &hf_x411_waiting_operations, @@ -7980,7 +7980,7 @@ void proto_register_x411(void) { FT_UINT32, BASE_DEC, NULL, 0, "x411.SET_OF_ContentType", HFILL }}, { &hf_x411_waiting_content_types_item, - { "waiting-content-types", "x411.waiting_content_types_item", + { "ContentType", "x411.ContentType", FT_UINT32, BASE_DEC, VALS(x411_ContentType_vals), 0, "x411.ContentType", HFILL }}, { &hf_x411_waiting_encoded_information_types, @@ -7996,7 +7996,7 @@ void proto_register_x411(void) { FT_UINT32, BASE_DEC, NULL, 0, "x411.SEQUENCE_OF_PerRecipientReportDeliveryFields", HFILL }}, { &hf_x411_per_recipient_report_delivery_fields_item, - { "per-recipient-fields", "x411.per_recipient_fields_item", + { "PerRecipientReportDeliveryFields", "x411.PerRecipientReportDeliveryFields", FT_NONE, BASE_NONE, NULL, 0, "x411.PerRecipientReportDeliveryFields", HFILL }}, { &hf_x411_refused_argument, @@ -8056,7 +8056,7 @@ void proto_register_x411(void) { FT_UINT32, BASE_DEC, NULL, 0, "x411.SET_OF_DeliverableClass", HFILL }}, { &hf_x411_deliverable_class_item, - { "deliverable-class", "x411.deliverable_class_item", + { "DeliverableClass", "x411.DeliverableClass", FT_NONE, BASE_NONE, NULL, 0, "x411.DeliverableClass", HFILL }}, { &hf_x411_default_delivery_controls, @@ -8104,7 +8104,7 @@ void proto_register_x411(void) { FT_NONE, BASE_NONE, NULL, 0, "x411.PSAPAddress", HFILL }}, { &hf_x411_Redirections_item, - { "Redirections", "x411.Redirections_item", + { "RecipientRedirection", "x411.RecipientRedirection", FT_NONE, BASE_NONE, NULL, 0, "x411.RecipientRedirection", HFILL }}, { &hf_x411_redirection_classes, @@ -8112,7 +8112,7 @@ void proto_register_x411(void) { FT_UINT32, BASE_DEC, NULL, 0, "x411.SET_OF_RedirectionClass", HFILL }}, { &hf_x411_redirection_classes_item, - { "redirection-classes", "x411.redirection_classes_item", + { "RedirectionClass", "x411.RedirectionClass", FT_NONE, BASE_NONE, NULL, 0, "x411.RedirectionClass", HFILL }}, { &hf_x411_recipient_assigned_alternate_recipient, @@ -8140,7 +8140,7 @@ void proto_register_x411(void) { FT_UINT32, BASE_DEC, NULL, 0, "x411.SET_OF_Priority", HFILL }}, { &hf_x411_class_priority_item, - { "priority", "x411.priority_item", + { "Priority", "x411.Priority", FT_UINT32, BASE_DEC, VALS(x411_Priority_U_vals), 0, "x411.Priority", HFILL }}, { &hf_x411_objects, @@ -8152,7 +8152,7 @@ void proto_register_x411(void) { FT_UINT32, BASE_DEC, NULL, 0, "x411.SEQUENCE_OF_Restriction", HFILL }}, { &hf_x411_applies_only_to_item, - { "applies-only-to", "x411.applies_only_to_item", + { "Restriction", "x411.Restriction", FT_NONE, BASE_NONE, NULL, 0, "x411.Restriction", HFILL }}, { &hf_x411_unacceptable_eits, @@ -8168,7 +8168,7 @@ void proto_register_x411(void) { FT_UINT32, BASE_DEC, NULL, 0, "x411.ExtendedEncodedInformationTypes", HFILL }}, { &hf_x411_RestrictedDelivery_item, - { "RestrictedDelivery", "x411.RestrictedDelivery_item", + { "Restriction", "x411.Restriction", FT_NONE, BASE_NONE, NULL, 0, "x411.Restriction", HFILL }}, { &hf_x411_permitted, @@ -8200,7 +8200,7 @@ void proto_register_x411(void) { FT_UINT32, BASE_DEC, NULL, 0, "x411.T_type_extensions", HFILL }}, { &hf_x411_type_extensions_item, - { "extensions", "x411.extensions_item", + { "extensions item", "x411.extensions_item", FT_NONE, BASE_NONE, NULL, 0, "x411.T_type_extensions_item", HFILL }}, { &hf_x411_mts_originator_name, @@ -8212,7 +8212,7 @@ void proto_register_x411(void) { FT_UINT32, BASE_DEC, NULL, 0, "x411.SEQUENCE_OF_PerRecipientMessageSubmissionFields", HFILL }}, { &hf_x411_per_recipient_message_submission_fields_item, - { "per-recipient-fields", "x411.per_recipient_fields_item", + { "PerRecipientMessageSubmissionFields", "x411.PerRecipientMessageSubmissionFields", FT_NONE, BASE_NONE, NULL, 0, "x411.PerRecipientMessageSubmissionFields", HFILL }}, { &hf_x411_submission_recipient_name, @@ -8228,7 +8228,7 @@ void proto_register_x411(void) { FT_UINT32, BASE_DEC, NULL, 0, "x411.SEQUENCE_OF_PerRecipientProbeSubmissionFields", HFILL }}, { &hf_x411_per_recipient_probe_submission_fields_item, - { "per-recipient-fields", "x411.per_recipient_fields_item", + { "PerRecipientProbeSubmissionFields", "x411.PerRecipientProbeSubmissionFields", FT_NONE, BASE_NONE, NULL, 0, "x411.PerRecipientProbeSubmissionFields", HFILL }}, { &hf_x411_probe_recipient_name, @@ -8304,7 +8304,7 @@ void proto_register_x411(void) { FT_UINT32, BASE_DEC, VALS(x411_NonDeliveryDiagnosticCode_vals), 0, "x411.NonDeliveryDiagnosticCode", HFILL }}, { &hf_x411_ContentTypes_item, - { "ContentTypes", "x411.ContentTypes_item", + { "ContentType", "x411.ContentType", FT_UINT32, BASE_DEC, VALS(x411_ContentType_vals), 0, "x411.ContentType", HFILL }}, { &hf_x411_built_in, @@ -8316,7 +8316,7 @@ void proto_register_x411(void) { FT_OID, BASE_NONE, NULL, 0, "x411.ExtendedContentType", HFILL }}, { &hf_x411_OtherRecipientNames_item, - { "OtherRecipientNames", "x411.OtherRecipientNames_item", + { "OtherRecipientName", "x411.OtherRecipientName", FT_NONE, BASE_NONE, NULL, 0, "x411.OtherRecipientName", HFILL }}, { &hf_x411_standard_extension, @@ -8340,7 +8340,7 @@ void proto_register_x411(void) { FT_NONE, BASE_NONE, NULL, 0, "x411.ExtensionValue", HFILL }}, { &hf_x411_RequestedDeliveryMethod_item, - { "RequestedDeliveryMethod", "x411.RequestedDeliveryMethod_item", + { "RequestedDeliveryMethod item", "x411.RequestedDeliveryMethod_item", FT_UINT32, BASE_DEC, VALS(x411_RequestedDeliveryMethod_item_vals), 0, "x411.RequestedDeliveryMethod_item", HFILL }}, { &hf_x411_ia5text, @@ -8352,7 +8352,7 @@ void proto_register_x411(void) { FT_BYTES, BASE_HEX, NULL, 0, "x411.OCTET_STRING", HFILL }}, { &hf_x411_RedirectionHistory_item, - { "RedirectionHistory", "x411.RedirectionHistory_item", + { "Redirection", "x411.Redirection", FT_NONE, BASE_NONE, NULL, 0, "x411.Redirection", HFILL }}, { &hf_x411_intended_recipient_name, @@ -8372,7 +8372,7 @@ void proto_register_x411(void) { FT_STRING, BASE_NONE, NULL, 0, "x411.Time", HFILL }}, { &hf_x411_DLExpansionHistory_item, - { "DLExpansionHistory", "x411.DLExpansionHistory_item", + { "DLExpansion", "x411.DLExpansion", FT_NONE, BASE_NONE, NULL, 0, "x411.DLExpansion", HFILL }}, { &hf_x411_dl, @@ -8384,7 +8384,7 @@ void proto_register_x411(void) { FT_STRING, BASE_NONE, NULL, 0, "x411.Time", HFILL }}, { &hf_x411_OriginatorAndDLExpansionHistory_item, - { "OriginatorAndDLExpansionHistory", "x411.OriginatorAndDLExpansionHistory_item", + { "OriginatorAndDLExpansion", "x411.OriginatorAndDLExpansion", FT_NONE, BASE_NONE, NULL, 0, "x411.OriginatorAndDLExpansion", HFILL }}, { &hf_x411_originator_or_dl_name, @@ -8416,7 +8416,7 @@ void proto_register_x411(void) { FT_UINT32, BASE_DEC, VALS(x509if_Name_vals), 0, "x509if.Name", HFILL }}, { &hf_x411_ExtendedCertificates_item, - { "ExtendedCertificates", "x411.ExtendedCertificates_item", + { "ExtendedCertificate", "x411.ExtendedCertificate", FT_UINT32, BASE_DEC, VALS(x411_ExtendedCertificate_vals), 0, "x411.ExtendedCertificate", HFILL }}, { &hf_x411_directory_entry, @@ -8424,7 +8424,7 @@ void proto_register_x411(void) { FT_UINT32, BASE_DEC, VALS(x509if_Name_vals), 0, "x509if.Name", HFILL }}, { &hf_x411_DLExemptedRecipients_item, - { "DLExemptedRecipients", "x411.DLExemptedRecipients_item", + { "ORAddressAndOrDirectoryName", "x411.ORAddressAndOrDirectoryName", FT_NONE, BASE_NONE, NULL, 0, "x411.ORAddressAndOrDirectoryName", HFILL }}, { &hf_x411_encryption_recipient, @@ -8544,11 +8544,11 @@ void proto_register_x411(void) { FT_STRING, BASE_NONE, NULL, 0, "x411.T_printable_generation_qualifier", HFILL }}, { &hf_x411_OrganizationalUnitNames_item, - { "OrganizationalUnitNames", "x411.OrganizationalUnitNames_item", + { "OrganizationalUnitName", "x411.OrganizationalUnitName", FT_STRING, BASE_NONE, NULL, 0, "x411.OrganizationalUnitName", HFILL }}, { &hf_x411_BuiltInDomainDefinedAttributes_item, - { "BuiltInDomainDefinedAttributes", "x411.BuiltInDomainDefinedAttributes_item", + { "BuiltInDomainDefinedAttribute", "x411.BuiltInDomainDefinedAttribute", FT_NONE, BASE_NONE, NULL, 0, "x411.BuiltInDomainDefinedAttribute", HFILL }}, { &hf_x411_printable_type, @@ -8560,7 +8560,7 @@ void proto_register_x411(void) { FT_STRING, BASE_NONE, NULL, 0, "x411.T_printable_value", HFILL }}, { &hf_x411_ExtensionAttributes_item, - { "ExtensionAttributes", "x411.ExtensionAttributes_item", + { "ExtensionAttribute", "x411.ExtensionAttribute", FT_NONE, BASE_NONE, NULL, 0, "x411.ExtensionAttribute", HFILL }}, { &hf_x411_extension_attribute_type, @@ -8604,11 +8604,11 @@ void proto_register_x411(void) { FT_NONE, BASE_NONE, NULL, 0, "x411.UniversalOrBMPString", HFILL }}, { &hf_x411_TeletexOrganizationalUnitNames_item, - { "TeletexOrganizationalUnitNames", "x411.TeletexOrganizationalUnitNames_item", + { "TeletexOrganizationalUnitName", "x411.TeletexOrganizationalUnitName", FT_STRING, BASE_NONE, NULL, 0, "x411.TeletexOrganizationalUnitName", HFILL }}, { &hf_x411_UniversalOrganizationalUnitNames_item, - { "UniversalOrganizationalUnitNames", "x411.UniversalOrganizationalUnitNames_item", + { "UniversalOrganizationalUnitName", "x411.UniversalOrganizationalUnitName", FT_NONE, BASE_NONE, NULL, 0, "x411.UniversalOrganizationalUnitName", HFILL }}, { &hf_x411_character_encoding, @@ -8640,7 +8640,7 @@ void proto_register_x411(void) { FT_UINT32, BASE_DEC, NULL, 0, "x411.T_printable_address", HFILL }}, { &hf_x411_printable_address_item, - { "printable-address", "x411.printable_address_item", + { "printable-address item", "x411.printable_address_item", FT_STRING, BASE_NONE, NULL, 0, "x411.PrintableString", HFILL }}, { &hf_x411_teletex_string, @@ -8668,7 +8668,7 @@ void proto_register_x411(void) { FT_NONE, BASE_NONE, NULL, 0, "x509sat.PresentationAddress", HFILL }}, { &hf_x411_TeletexDomainDefinedAttributes_item, - { "TeletexDomainDefinedAttributes", "x411.TeletexDomainDefinedAttributes_item", + { "TeletexDomainDefinedAttribute", "x411.TeletexDomainDefinedAttribute", FT_NONE, BASE_NONE, NULL, 0, "x411.TeletexDomainDefinedAttribute", HFILL }}, { &hf_x411_type, @@ -8680,7 +8680,7 @@ void proto_register_x411(void) { FT_STRING, BASE_NONE, NULL, 0, "x411.AddrTeletexString", HFILL }}, { &hf_x411_UniversalDomainDefinedAttributes_item, - { "UniversalDomainDefinedAttributes", "x411.UniversalDomainDefinedAttributes_item", + { "UniversalDomainDefinedAttribute", "x411.UniversalDomainDefinedAttribute", FT_NONE, BASE_NONE, NULL, 0, "x411.UniversalDomainDefinedAttribute", HFILL }}, { &hf_x411_universal_type, @@ -8708,7 +8708,7 @@ void proto_register_x411(void) { FT_UINT32, BASE_DEC, NULL, 0, "x411.ExtendedEncodedInformationTypes", HFILL }}, { &hf_x411_ExtendedEncodedInformationTypes_item, - { "ExtendedEncodedInformationTypes", "x411.ExtendedEncodedInformationTypes_item", + { "ExtendedEncodedInformationType", "x411.ExtendedEncodedInformationType", FT_OID, BASE_NONE, NULL, 0, "x411.ExtendedEncodedInformationType", HFILL }}, { &hf_x411_graphic_character_sets, @@ -8832,7 +8832,7 @@ void proto_register_x411(void) { FT_UINT32, BASE_DEC, NULL, 0, "x411.SecurityCategories", HFILL }}, { &hf_x411_SecurityCategories_item, - { "SecurityCategories", "x411.SecurityCategories_item", + { "SecurityCategory", "x411.SecurityCategory", FT_NONE, BASE_NONE, NULL, 0, "x411.SecurityCategory", HFILL }}, { &hf_x411_category_type, diff --git a/epan/dissectors/packet-x411.h b/epan/dissectors/packet-x411.h index d864520f43..83eeb26eed 100644 --- a/epan/dissectors/packet-x411.h +++ b/epan/dissectors/packet-x411.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-x411.h */ -/* ../../tools/asn2wrs.py -b -e -p x411 -c x411.cnf -s packet-x411-template MTAAbstractService.asn MTSAbstractService.asn */ +/* ../../tools/asn2wrs.py -b -e -p x411 -c ./x411.cnf -s ./packet-x411-template -D . MTAAbstractService.asn MTSAbstractService.asn */ /* Input file: packet-x411-template.h */ diff --git a/epan/dissectors/packet-x420.c b/epan/dissectors/packet-x420.c index 179e656c51..9c400cf285 100644 --- a/epan/dissectors/packet-x420.c +++ b/epan/dissectors/packet-x420.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-x420.c */ -/* ../../tools/asn2wrs.py -b -e -p x420 -c x420.cnf -s packet-x420-template IPMSInformationObjects.asn IPMSHeadingExtensions.asn IPMSExtendedBodyPartTypes2.asn IPMSFileTransferBodyPartType.asn IPMSExtendedVoiceBodyPartType.asn IPMSForwardedContentBodyPartType.asn IPMSMessageStoreAttributes.asn IPMSSecurityExtensions.asn IPMSObjectIdentifiers.asn */ +/* ../../tools/asn2wrs.py -b -e -p x420 -c ./x420.cnf -s ./packet-x420-template -D . IPMSInformationObjects.asn IPMSHeadingExtensions.asn IPMSExtendedBodyPartTypes2.asn IPMSFileTransferBodyPartType.asn IPMSExtendedVoiceBodyPartType.asn IPMSForwardedContentBodyPartType.asn IPMSMessageStoreAttributes.asn IPMSSecurityExtensions.asn IPMSObjectIdentifiers.asn */ /* Input file: packet-x420-template.c */ @@ -4777,43 +4777,43 @@ void proto_register_x420(void) { FT_STRING, BASE_NONE, NULL, 0, "x420.TelephoneNumber", HFILL }}, { &hf_x420_RecipientExtensionsField_item, - { "RecipientExtensionsField", "x420.RecipientExtensionsField_item", + { "IPMSExtension", "x420.IPMSExtension", FT_NONE, BASE_NONE, NULL, 0, "x420.IPMSExtension", HFILL }}, { &hf_x420_AuthorizingUsersField_item, - { "AuthorizingUsersField", "x420.AuthorizingUsersField_item", + { "AuthorizingUsersSubfield", "x420.AuthorizingUsersSubfield", FT_NONE, BASE_NONE, NULL, 0, "x420.AuthorizingUsersSubfield", HFILL }}, { &hf_x420_PrimaryRecipientsField_item, - { "PrimaryRecipientsField", "x420.PrimaryRecipientsField_item", + { "PrimaryRecipientsSubfield", "x420.PrimaryRecipientsSubfield", FT_NONE, BASE_NONE, NULL, 0, "x420.PrimaryRecipientsSubfield", HFILL }}, { &hf_x420_CopyRecipientsField_item, - { "CopyRecipientsField", "x420.CopyRecipientsField_item", + { "CopyRecipientsSubfield", "x420.CopyRecipientsSubfield", FT_NONE, BASE_NONE, NULL, 0, "x420.CopyRecipientsSubfield", HFILL }}, { &hf_x420_BlindCopyRecipientsField_item, - { "BlindCopyRecipientsField", "x420.BlindCopyRecipientsField_item", + { "BlindCopyRecipientsSubfield", "x420.BlindCopyRecipientsSubfield", FT_NONE, BASE_NONE, NULL, 0, "x420.BlindCopyRecipientsSubfield", HFILL }}, { &hf_x420_ObsoletedIPMsField_item, - { "ObsoletedIPMsField", "x420.ObsoletedIPMsField_item", + { "ObsoletedIPMsSubfield", "x420.ObsoletedIPMsSubfield", FT_NONE, BASE_NONE, NULL, 0, "x420.ObsoletedIPMsSubfield", HFILL }}, { &hf_x420_RelatedIPMsField_item, - { "RelatedIPMsField", "x420.RelatedIPMsField_item", + { "RelatedIPMsSubfield", "x420.RelatedIPMsSubfield", FT_NONE, BASE_NONE, NULL, 0, "x420.RelatedIPMsSubfield", HFILL }}, { &hf_x420_ReplyRecipientsField_item, - { "ReplyRecipientsField", "x420.ReplyRecipientsField_item", + { "ReplyRecipientsSubfield", "x420.ReplyRecipientsSubfield", FT_NONE, BASE_NONE, NULL, 0, "x420.ReplyRecipientsSubfield", HFILL }}, { &hf_x420_ExtensionsField_item, - { "ExtensionsField", "x420.ExtensionsField_item", + { "IPMSExtension", "x420.IPMSExtension", FT_NONE, BASE_NONE, NULL, 0, "x420.IPMSExtension", HFILL }}, { &hf_x420_Body_item, - { "Body", "x420.Body_item", + { "BodyPart", "x420.BodyPart", FT_UINT32, BASE_DEC, VALS(x420_BodyPart_vals), 0, "x420.BodyPart", HFILL }}, { &hf_x420_basic, @@ -4901,15 +4901,15 @@ void proto_register_x420(void) { FT_BYTES, BASE_HEX, NULL, 0, "x411.G3FacsimileNonBasicParameters", HFILL }}, { &hf_x420_G3FacsimileData_item, - { "G3FacsimileData", "x420.G3FacsimileData_item", + { "G3FacsimileData item", "x420.G3FacsimileData_item", FT_BYTES, BASE_HEX, NULL, 0, "x420.BIT_STRING", HFILL }}, { &hf_x420_G4Class1BodyPart_item, - { "G4Class1BodyPart", "x420.G4Class1BodyPart_item", + { "Interchange-Data-Element", "x420.Interchange_Data_Element", FT_NONE, BASE_NONE, NULL, 0, "x420.Interchange_Data_Element", HFILL }}, { &hf_x420_MixedModeBodyPart_item, - { "MixedModeBodyPart", "x420.MixedModeBodyPart_item", + { "Interchange-Data-Element", "x420.Interchange_Data_Element", FT_NONE, BASE_NONE, NULL, 0, "x420.Interchange_Data_Element", HFILL }}, { &hf_x420_teletex_parameters, @@ -4929,7 +4929,7 @@ void proto_register_x420(void) { FT_NONE, BASE_NONE, NULL, 0, "x411.TeletexNonBasicParameters", HFILL }}, { &hf_x420_TeletexData_item, - { "TeletexData", "x420.TeletexData_item", + { "TeletexData item", "x420.TeletexData_item", FT_STRING, BASE_NONE, NULL, 0, "x420.TeletexString", HFILL }}, { &hf_x420_videotex_parameters, @@ -5033,19 +5033,19 @@ void proto_register_x420(void) { FT_UINT32, BASE_DEC, NULL, 0, "x420.RNExtensionsField", HFILL }}, { &hf_x420_NotificationExtensionsField_item, - { "NotificationExtensionsField", "x420.NotificationExtensionsField_item", + { "IPMSExtension", "x420.IPMSExtension", FT_NONE, BASE_NONE, NULL, 0, "x420.IPMSExtension", HFILL }}, { &hf_x420_NRNExtensionsField_item, - { "NRNExtensionsField", "x420.NRNExtensionsField_item", + { "IPMSExtension", "x420.IPMSExtension", FT_NONE, BASE_NONE, NULL, 0, "x420.IPMSExtension", HFILL }}, { &hf_x420_RNExtensionsField_item, - { "RNExtensionsField", "x420.RNExtensionsField_item", + { "IPMSExtension", "x420.IPMSExtension", FT_NONE, BASE_NONE, NULL, 0, "x420.IPMSExtension", HFILL }}, { &hf_x420_OtherNotificationTypeFields_item, - { "OtherNotificationTypeFields", "x420.OtherNotificationTypeFields_item", + { "IPMSExtension", "x420.IPMSExtension", FT_NONE, BASE_NONE, NULL, 0, "x420.IPMSExtension", HFILL }}, { &hf_x420_advice, @@ -5069,7 +5069,7 @@ void proto_register_x420(void) { FT_UINT32, BASE_DEC, NULL, 0, "x420.BodyPartReferences", HFILL }}, { &hf_x420_BodyPartReferences_item, - { "BodyPartReferences", "x420.BodyPartReferences_item", + { "BodyPartReference", "x420.BodyPartReference", FT_UINT32, BASE_DEC, VALS(x420_BodyPartReference_vals), 0, "x420.BodyPartReference", HFILL }}, { &hf_x420_stored_entry, @@ -5097,11 +5097,11 @@ void proto_register_x420(void) { FT_UINT32, BASE_DEC, NULL, 0, "x420.BodyPartNumber", HFILL }}, { &hf_x420_Languages_item, - { "Languages", "x420.Languages_item", + { "Language", "x420.Language", FT_STRING, BASE_NONE, NULL, 0, "x420.Language", HFILL }}, { &hf_x420_BodyPartSignatures_item, - { "BodyPartSignatures", "x420.BodyPartSignatures_item", + { "BodyPartSignatures item", "x420.BodyPartSignatures_item", FT_NONE, BASE_NONE, NULL, 0, "x420.BodyPartSignatures_item", HFILL }}, { &hf_x420_body_part_signature, @@ -5133,7 +5133,7 @@ void proto_register_x420(void) { FT_UINT32, BASE_DEC, NULL, 0, "x420.SEQUENCE_OF_BodyPartSecurityLabel", HFILL }}, { &hf_x420_body_part_security_labels_item, - { "body-part-security-labels", "x420.body_part_security_labels_item", + { "BodyPartSecurityLabel", "x420.BodyPartSecurityLabel", FT_UINT32, BASE_DEC, VALS(x420_BodyPartSecurityLabel_vals), 0, "x420.BodyPartSecurityLabel", HFILL }}, { &hf_x420_body_part_unlabelled, @@ -5145,7 +5145,7 @@ void proto_register_x420(void) { FT_NONE, BASE_NONE, NULL, 0, "x411.SecurityLabel", HFILL }}, { &hf_x420_CirculationList_item, - { "CirculationList", "x420.CirculationList_item", + { "CirculationMember", "x420.CirculationMember", FT_NONE, BASE_NONE, NULL, 0, "x420.CirculationMember", HFILL }}, { &hf_x420_circulation_recipient, @@ -5181,7 +5181,7 @@ void proto_register_x420(void) { FT_NONE, BASE_NONE, NULL, 0, "x420.CirculationSignatureData", HFILL }}, { &hf_x420_DistributionCodes_item, - { "DistributionCodes", "x420.DistributionCodes_item", + { "DistributionCode", "x420.DistributionCode", FT_NONE, BASE_NONE, NULL, 0, "x420.DistributionCode", HFILL }}, { &hf_x420_oid_code, @@ -5197,7 +5197,7 @@ void proto_register_x420(void) { FT_NONE, BASE_NONE, NULL, 0, "x420.ORDescriptor", HFILL }}, { &hf_x420_InformationCategories_item, - { "InformationCategories", "x420.InformationCategories_item", + { "InformationCategory", "x420.InformationCategory", FT_NONE, BASE_NONE, NULL, 0, "x420.InformationCategory", HFILL }}, { &hf_x420_reference, @@ -5209,11 +5209,11 @@ void proto_register_x420(void) { FT_NONE, BASE_NONE, NULL, 0, "x420.DescriptionString", HFILL }}, { &hf_x420_ManualHandlingInstructions_item, - { "ManualHandlingInstructions", "x420.ManualHandlingInstructions_item", + { "ManualHandlingInstruction", "x420.ManualHandlingInstruction", FT_NONE, BASE_NONE, NULL, 0, "x420.ManualHandlingInstruction", HFILL }}, { &hf_x420_GeneralTextParameters_item, - { "GeneralTextParameters", "x420.GeneralTextParameters_item", + { "CharacterSetRegistration", "x420.CharacterSetRegistration", FT_UINT32, BASE_DEC, NULL, 0, "x420.CharacterSetRegistration", HFILL }}, { &hf_x420_related_stored_file, @@ -5237,11 +5237,11 @@ void proto_register_x420(void) { FT_NONE, BASE_NONE, NULL, 0, "x420.FileAttributes", HFILL }}, { &hf_x420_FileTransferData_item, - { "FileTransferData", "x420.FileTransferData_item", + { "FileTransferData item", "x420.FileTransferData_item", FT_NONE, BASE_NONE, NULL, 0, "x420.EXTERNAL", HFILL }}, { &hf_x420_RelatedStoredFile_item, - { "RelatedStoredFile", "x420.RelatedStoredFile_item", + { "RelatedStoredFile item", "x420.RelatedStoredFile_item", FT_NONE, BASE_NONE, NULL, 0, "x420.RelatedStoredFile_item", HFILL }}, { &hf_x420_file_identifier, @@ -5333,7 +5333,7 @@ void proto_register_x420(void) { FT_UINT32, BASE_DEC, NULL, 0, "x420.T_user_visible_string", HFILL }}, { &hf_x420_user_visible_string_item, - { "user-visible-string", "x420.user_visible_string_item", + { "user-visible-string item", "x420.user_visible_string_item", FT_STRING, BASE_NONE, NULL, 0, "x420.GraphicString", HFILL }}, { &hf_x420_registered_identifier, @@ -5345,7 +5345,7 @@ void proto_register_x420(void) { FT_UINT32, BASE_DEC, NULL, 0, "x420.T_descriptive_identifier", HFILL }}, { &hf_x420_descriptive_identifier_item, - { "descriptive-identifier", "x420.descriptive_identifier_item", + { "descriptive-identifier item", "x420.descriptive_identifier_item", FT_STRING, BASE_NONE, NULL, 0, "x420.GraphicString", HFILL }}, { &hf_x420_compression_algorithm_id, @@ -5449,7 +5449,7 @@ void proto_register_x420(void) { FT_UINT32, BASE_DEC, NULL, 0, "x420.SET_OF_Access_Control_Element", HFILL }}, { &hf_x420_actual_values_item, - { "actual-values", "x420.actual_values_item", + { "Access-Control-Element", "x420.Access_Control_Element", FT_NONE, BASE_NONE, NULL, 0, "x420.Access_Control_Element", HFILL }}, { &hf_x420_action_list, @@ -5521,7 +5521,7 @@ void proto_register_x420(void) { FT_BYTES, BASE_HEX, NULL, 0, "x420.OCTET_STRING", HFILL }}, { &hf_x420_Pass_Passwords_item, - { "Pass-Passwords", "x420.Pass_Passwords_item", + { "Password", "x420.Password", FT_UINT32, BASE_DEC, VALS(x420_Password_vals), 0, "x420.Password", HFILL }}, { &hf_x420_ap_title, @@ -5565,7 +5565,7 @@ void proto_register_x420(void) { FT_NONE, BASE_NONE, NULL, 0, "x411.MessageSubmissionEnvelope", HFILL }}, { &hf_x420_IPMSynopsis_item, - { "IPMSynopsis", "x420.IPMSynopsis_item", + { "BodyPartSynopsis", "x420.BodyPartSynopsis", FT_UINT32, BASE_DEC, VALS(x420_BodyPartSynopsis_vals), 0, "x420.BodyPartSynopsis", HFILL }}, { &hf_x420_message_synopsis, @@ -5617,7 +5617,7 @@ void proto_register_x420(void) { FT_INT32, BASE_DEC, NULL, 0, "x420.INTEGER", HFILL }}, { &hf_x420_BodyPartSignatureVerification_item, - { "BodyPartSignatureVerification", "x420.BodyPartSignatureVerification_item", + { "BodyPartSignatureVerification item", "x420.BodyPartSignatureVerification_item", FT_NONE, BASE_NONE, NULL, 0, "x420.BodyPartSignatureVerification_item", HFILL }}, { &hf_x420_body_part_sequence_number, @@ -5633,7 +5633,7 @@ void proto_register_x420(void) { FT_UINT32, BASE_DEC, NULL, 0, "x420.SET_OF_SequenceNumber", HFILL }}, { &hf_x420_stored_item, - { "stored", "x420.stored_item", + { "SequenceNumber", "x420.SequenceNumber", FT_UINT32, BASE_DEC, NULL, 0, "p7.SequenceNumber", HFILL }}, { &hf_x420_absent, @@ -5649,7 +5649,7 @@ void proto_register_x420(void) { FT_UINT32, BASE_DEC, NULL, 0, "x420.SEQUENCE_OF_SequenceNumber", HFILL }}, { &hf_x420_received_replies_item, - { "received-replies", "x420.received_replies_item", + { "SequenceNumber", "x420.SequenceNumber", FT_UINT32, BASE_DEC, NULL, 0, "p7.SequenceNumber", HFILL }}, { &hf_x420_no_ipn_received, @@ -5661,7 +5661,7 @@ void proto_register_x420(void) { FT_UINT32, BASE_DEC, NULL, 0, "x420.SEQUENCE_OF_SequenceNumber", HFILL }}, { &hf_x420_ipns_received_item, - { "ipns-received", "x420.ipns_received_item", + { "SequenceNumber", "x420.SequenceNumber", FT_UINT32, BASE_DEC, NULL, 0, "p7.SequenceNumber", HFILL }}, { &hf_x420_content_or_arguments, @@ -5693,7 +5693,7 @@ void proto_register_x420(void) { FT_INT32, BASE_DEC, VALS(x420_SecurityDiagnosticCode_vals), 0, "x420.SecurityDiagnosticCode", HFILL }}, { &hf_x420_BodyPartTokens_item, - { "BodyPartTokens", "x420.BodyPartTokens_item", + { "BodyPartTokens item", "x420.BodyPartTokens_item", FT_NONE, BASE_NONE, NULL, 0, "x420.BodyPartTokens_item", HFILL }}, { &hf_x420_body_part_choice, @@ -5725,7 +5725,7 @@ void proto_register_x420(void) { FT_NONE, BASE_NONE, NULL, 0, "x509af.Certificates", HFILL }}, { &hf_x420_ForwardedContentToken_item, - { "ForwardedContentToken", "x420.ForwardedContentToken_item", + { "ForwardedContentToken item", "x420.ForwardedContentToken_item", FT_NONE, BASE_NONE, NULL, 0, "x420.ForwardedContentToken_item", HFILL }}, { &hf_x420_body_part_token_choice, diff --git a/epan/dissectors/packet-x420.h b/epan/dissectors/packet-x420.h index 50880c519c..27ecad8fb3 100644 --- a/epan/dissectors/packet-x420.h +++ b/epan/dissectors/packet-x420.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-x420.h */ -/* ../../tools/asn2wrs.py -b -e -p x420 -c x420.cnf -s packet-x420-template IPMSInformationObjects.asn IPMSHeadingExtensions.asn IPMSExtendedBodyPartTypes2.asn IPMSFileTransferBodyPartType.asn IPMSExtendedVoiceBodyPartType.asn IPMSForwardedContentBodyPartType.asn IPMSMessageStoreAttributes.asn IPMSSecurityExtensions.asn IPMSObjectIdentifiers.asn */ +/* ../../tools/asn2wrs.py -b -e -p x420 -c ./x420.cnf -s ./packet-x420-template -D . IPMSInformationObjects.asn IPMSHeadingExtensions.asn IPMSExtendedBodyPartTypes2.asn IPMSFileTransferBodyPartType.asn IPMSExtendedVoiceBodyPartType.asn IPMSForwardedContentBodyPartType.asn IPMSMessageStoreAttributes.asn IPMSSecurityExtensions.asn IPMSObjectIdentifiers.asn */ /* Input file: packet-x420-template.h */ diff --git a/epan/dissectors/packet-x509af.c b/epan/dissectors/packet-x509af.c index 6769f9630d..1e0fc0ea40 100644 --- a/epan/dissectors/packet-x509af.c +++ b/epan/dissectors/packet-x509af.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-x509af.c */ -/* ../../tools/asn2wrs.py -b -e -p x509af -c x509af.cnf -s packet-x509af-template AuthenticationFramework.asn */ +/* ../../tools/asn2wrs.py -b -e -p x509af -c ./x509af.cnf -s ./packet-x509af-template -D . AuthenticationFramework.asn */ /* Input file: packet-x509af-template.c */ @@ -1050,7 +1050,7 @@ void proto_register_x509af(void) { FT_STRING, BASE_NONE, NULL, 0, "x509af.GeneralizedTime", HFILL }}, { &hf_x509af_Extensions_item, - { "Extensions", "x509af.Extensions_item", + { "Extension", "x509af.Extension", FT_NONE, BASE_NONE, NULL, 0, "x509af.Extension", HFILL }}, { &hf_x509af_extnId, @@ -1074,11 +1074,11 @@ void proto_register_x509af(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509af.ForwardCertificationPath", HFILL }}, { &hf_x509af_ForwardCertificationPath_item, - { "ForwardCertificationPath", "x509af.ForwardCertificationPath_item", + { "CrossCertificates", "x509af.CrossCertificates", FT_UINT32, BASE_DEC, NULL, 0, "x509af.CrossCertificates", HFILL }}, { &hf_x509af_CrossCertificates_item, - { "CrossCertificates", "x509af.CrossCertificates_item", + { "Certificate", "x509af.Certificate", FT_NONE, BASE_NONE, NULL, 0, "x509af.Certificate", HFILL }}, { &hf_x509af_theCACertificates, @@ -1086,7 +1086,7 @@ void proto_register_x509af(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509af.SEQUENCE_OF_CertificatePair", HFILL }}, { &hf_x509af_theCACertificates_item, - { "theCACertificates", "x509af.theCACertificates_item", + { "CertificatePair", "x509af.CertificatePair", FT_NONE, BASE_NONE, NULL, 0, "x509af.CertificatePair", HFILL }}, { &hf_x509af_issuedByThisCA, @@ -1114,7 +1114,7 @@ void proto_register_x509af(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509af.T_revokedCertificates", HFILL }}, { &hf_x509af_revokedCertificates_item, - { "revokedCertificates", "x509af.revokedCertificates_item", + { "revokedCertificates item", "x509af.revokedCertificates_item", FT_NONE, BASE_NONE, NULL, 0, "x509af.T_revokedCertificates_item", HFILL }}, { &hf_x509af_revokedUserCertificate, @@ -1142,7 +1142,7 @@ void proto_register_x509af(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509af.SEQUENCE_OF_ACPathData", HFILL }}, { &hf_x509af_acPath_item, - { "acPath", "x509af.acPath_item", + { "ACPathData", "x509af.ACPathData", FT_NONE, BASE_NONE, NULL, 0, "x509af.ACPathData", HFILL }}, { &hf_x509af_certificate, @@ -1178,7 +1178,7 @@ void proto_register_x509af(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509af.SEQUENCE_OF_Attribute", HFILL }}, { &hf_x509af_attributes_item, - { "attributes", "x509af.attributes_item", + { "Attribute", "x509af.Attribute", FT_NONE, BASE_NONE, NULL, 0, "x509if.Attribute", HFILL }}, { &hf_x509af_issuerUniqueID, @@ -1222,7 +1222,7 @@ void proto_register_x509af(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509af.SET_OF_AttributeType", HFILL }}, { &hf_x509af_attType_item, - { "attType", "x509af.attType_item", + { "AttributeType", "x509af.AttributeType", FT_OID, BASE_NONE, NULL, 0, "x509if.AttributeType", HFILL }}, { &hf_x509af_p, diff --git a/epan/dissectors/packet-x509af.h b/epan/dissectors/packet-x509af.h index 5baa6bcfca..0d9ccd433b 100644 --- a/epan/dissectors/packet-x509af.h +++ b/epan/dissectors/packet-x509af.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-x509af.h */ -/* ../../tools/asn2wrs.py -b -e -p x509af -c x509af.cnf -s packet-x509af-template AuthenticationFramework.asn */ +/* ../../tools/asn2wrs.py -b -e -p x509af -c ./x509af.cnf -s ./packet-x509af-template -D . AuthenticationFramework.asn */ /* Input file: packet-x509af-template.h */ diff --git a/epan/dissectors/packet-x509ce.c b/epan/dissectors/packet-x509ce.c index e62ec176b8..8e33edeb58 100644 --- a/epan/dissectors/packet-x509ce.c +++ b/epan/dissectors/packet-x509ce.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-x509ce.c */ -/* ../../tools/asn2wrs.py -b -e -p x509ce -c x509ce.cnf -s packet-x509ce-template CertificateExtensions.asn */ +/* ../../tools/asn2wrs.py -b -e -p x509ce -c ./x509ce.cnf -s ./packet-x509ce-template -D . CertificateExtensions.asn */ /* Input file: packet-x509ce-template.c */ @@ -1955,7 +1955,7 @@ void proto_register_x509ce(void) { FT_INT32, BASE_DEC, NULL, 0, "x509af.CertificateSerialNumber", HFILL }}, { &hf_x509ce_KeyPurposeIDs_item, - { "KeyPurposeIDs", "x509ce.KeyPurposeIDs_item", + { "KeyPurposeId", "x509ce.KeyPurposeId", FT_OID, BASE_NONE, NULL, 0, "x509ce.KeyPurposeId", HFILL }}, { &hf_x509ce_notBefore, @@ -1967,7 +1967,7 @@ void proto_register_x509ce(void) { FT_STRING, BASE_NONE, NULL, 0, "x509ce.GeneralizedTime", HFILL }}, { &hf_x509ce_CertificatePoliciesSyntax_item, - { "CertificatePoliciesSyntax", "x509ce.CertificatePoliciesSyntax_item", + { "PolicyInformation", "x509ce.PolicyInformation", FT_NONE, BASE_NONE, NULL, 0, "x509ce.PolicyInformation", HFILL }}, { &hf_x509ce_policyIdentifier, @@ -1979,7 +1979,7 @@ void proto_register_x509ce(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509ce.SEQUENCE_SIZE_1_MAX_OF_PolicyQualifierInfo", HFILL }}, { &hf_x509ce_policyQualifiers_item, - { "policyQualifiers", "x509ce.policyQualifiers_item", + { "PolicyQualifierInfo", "x509ce.PolicyQualifierInfo", FT_NONE, BASE_NONE, NULL, 0, "x509ce.PolicyQualifierInfo", HFILL }}, { &hf_x509ce_policyQualifierId, @@ -1991,7 +1991,7 @@ void proto_register_x509ce(void) { FT_NONE, BASE_NONE, NULL, 0, "x509ce.T_qualifier", HFILL }}, { &hf_x509ce_PolicyMappingsSyntax_item, - { "PolicyMappingsSyntax", "x509ce.PolicyMappingsSyntax_item", + { "PolicyMappingsSyntax item", "x509ce.PolicyMappingsSyntax_item", FT_NONE, BASE_NONE, NULL, 0, "x509ce.PolicyMappingsSyntax_item", HFILL }}, { &hf_x509ce_issuerDomainPolicy, @@ -2003,7 +2003,7 @@ void proto_register_x509ce(void) { FT_OID, BASE_NONE, NULL, 0, "x509ce.CertPolicyId", HFILL }}, { &hf_x509ce_GeneralNames_item, - { "GeneralNames", "x509ce.GeneralNames_item", + { "GeneralName", "x509ce.GeneralName", FT_UINT32, BASE_DEC, VALS(x509ce_GeneralName_vals), 0, "x509ce.GeneralName", HFILL }}, { &hf_x509ce_otherName, @@ -2059,7 +2059,7 @@ void proto_register_x509ce(void) { FT_UINT32, BASE_DEC, VALS(x509sat_DirectoryString_vals), 0, "x509sat.DirectoryString", HFILL }}, { &hf_x509ce_AttributesSyntax_item, - { "AttributesSyntax", "x509ce.AttributesSyntax_item", + { "Attribute", "x509ce.Attribute", FT_NONE, BASE_NONE, NULL, 0, "x509if.Attribute", HFILL }}, { &hf_x509ce_cA, @@ -2079,7 +2079,7 @@ void proto_register_x509ce(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509ce.GeneralSubtrees", HFILL }}, { &hf_x509ce_GeneralSubtrees_item, - { "GeneralSubtrees", "x509ce.GeneralSubtrees_item", + { "GeneralSubtree", "x509ce.GeneralSubtree", FT_NONE, BASE_NONE, NULL, 0, "x509ce.GeneralSubtree", HFILL }}, { &hf_x509ce_base, @@ -2103,7 +2103,7 @@ void proto_register_x509ce(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509ce.SkipCerts", HFILL }}, { &hf_x509ce_CRLScopeSyntax_item, - { "CRLScopeSyntax", "x509ce.CRLScopeSyntax_item", + { "PerAuthorityScope", "x509ce.PerAuthorityScope", FT_NONE, BASE_NONE, NULL, 0, "x509ce.PerAuthorityScope", HFILL }}, { &hf_x509ce_authorityName, @@ -2163,7 +2163,7 @@ void proto_register_x509ce(void) { FT_STRING, BASE_NONE, NULL, 0, "x509ce.GeneralizedTime", HFILL }}, { &hf_x509ce_StatusReferrals_item, - { "StatusReferrals", "x509ce.StatusReferrals_item", + { "StatusReferral", "x509ce.StatusReferral", FT_UINT32, BASE_DEC, VALS(x509ce_StatusReferral_vals), 0, "x509ce.StatusReferral", HFILL }}, { &hf_x509ce_cRLReferral, @@ -2207,7 +2207,7 @@ void proto_register_x509ce(void) { FT_STRING, BASE_NONE, NULL, 0, "x509ce.GeneralizedTime", HFILL }}, { &hf_x509ce_CRLDistPointsSyntax_item, - { "CRLDistPointsSyntax", "x509ce.CRLDistPointsSyntax_item", + { "DistributionPoint", "x509ce.DistributionPoint", FT_NONE, BASE_NONE, NULL, 0, "x509ce.DistributionPoint", HFILL }}, { &hf_x509ce_reasons, @@ -2239,7 +2239,7 @@ void proto_register_x509ce(void) { FT_BOOLEAN, 8, NULL, 0, "x509ce.BOOLEAN", HFILL }}, { &hf_x509ce_ToBeRevokedSyntax_item, - { "ToBeRevokedSyntax", "x509ce.ToBeRevokedSyntax_item", + { "ToBeRevokedGroup", "x509ce.ToBeRevokedGroup", FT_NONE, BASE_NONE, NULL, 0, "x509ce.ToBeRevokedGroup", HFILL }}, { &hf_x509ce_certificateIssuer, @@ -2279,11 +2279,11 @@ void proto_register_x509ce(void) { FT_UINT32, BASE_DEC, VALS(x509ce_GeneralName_vals), 0, "x509ce.GeneralName", HFILL }}, { &hf_x509ce_CertificateSerialNumbers_item, - { "CertificateSerialNumbers", "x509ce.CertificateSerialNumbers_item", + { "CertificateSerialNumber", "x509ce.CertificateSerialNumber", FT_INT32, BASE_DEC, NULL, 0, "x509af.CertificateSerialNumber", HFILL }}, { &hf_x509ce_RevokedGroupsSyntax_item, - { "RevokedGroupsSyntax", "x509ce.RevokedGroupsSyntax_item", + { "RevokedGroup", "x509ce.RevokedGroup", FT_NONE, BASE_NONE, NULL, 0, "x509ce.RevokedGroup", HFILL }}, { &hf_x509ce_invalidityDate, @@ -2367,7 +2367,7 @@ void proto_register_x509ce(void) { FT_OID, BASE_NONE, NULL, 0, "x509ce.OBJECT_IDENTIFIER", HFILL }}, { &hf_x509ce_CertPolicySet_item, - { "CertPolicySet", "x509ce.CertPolicySet_item", + { "CertPolicyId", "x509ce.CertPolicyId", FT_OID, BASE_NONE, NULL, 0, "x509ce.CertPolicyId", HFILL }}, { &hf_x509ce_cpea_issuedToThisCAAssertion, diff --git a/epan/dissectors/packet-x509ce.h b/epan/dissectors/packet-x509ce.h index f09aa4ccc5..d04ee652c5 100644 --- a/epan/dissectors/packet-x509ce.h +++ b/epan/dissectors/packet-x509ce.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-x509ce.h */ -/* ../../tools/asn2wrs.py -b -e -p x509ce -c x509ce.cnf -s packet-x509ce-template CertificateExtensions.asn */ +/* ../../tools/asn2wrs.py -b -e -p x509ce -c ./x509ce.cnf -s ./packet-x509ce-template -D . CertificateExtensions.asn */ /* Input file: packet-x509ce-template.h */ diff --git a/epan/dissectors/packet-x509if.c b/epan/dissectors/packet-x509if.c index 71a3dae2e3..e9d0a7a8b2 100644 --- a/epan/dissectors/packet-x509if.c +++ b/epan/dissectors/packet-x509if.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-x509if.c */ -/* ../../tools/asn2wrs.py -b -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn ServiceAdministration.asn */ +/* ../../tools/asn2wrs.py -b -e -p x509if -c ./x509if.cnf -s ./packet-x509if-template -D . InformationFramework.asn ServiceAdministration.asn */ /* Input file: packet-x509if-template.c */ @@ -2156,7 +2156,7 @@ void proto_register_x509if(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509if.T_values", HFILL }}, { &hf_x509if_values_item, - { "values", "x509if.values_item", + { "values item", "x509if.values_item", FT_NONE, BASE_NONE, NULL, 0, "x509if.T_values_item", HFILL }}, { &hf_x509if_valuesWithContext, @@ -2164,7 +2164,7 @@ void proto_register_x509if(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509if.T_valuesWithContext", HFILL }}, { &hf_x509if_valuesWithContext_item, - { "valuesWithContext", "x509if.valuesWithContext_item", + { "valuesWithContext item", "x509if.valuesWithContext_item", FT_NONE, BASE_NONE, NULL, 0, "x509if.T_valuesWithContext_item", HFILL }}, { &hf_x509if_value, @@ -2176,7 +2176,7 @@ void proto_register_x509if(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509if.SET_SIZE_1_MAX_OF_Context", HFILL }}, { &hf_x509if_contextList_item, - { "contextList", "x509if.contextList_item", + { "Context", "x509if.Context", FT_NONE, BASE_NONE, NULL, 0, "x509if.Context", HFILL }}, { &hf_x509if_contextType, @@ -2188,7 +2188,7 @@ void proto_register_x509if(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509if.T_contextValues", HFILL }}, { &hf_x509if_contextValues_item, - { "contextValues", "x509if.contextValues_item", + { "contextValues item", "x509if.contextValues_item", FT_NONE, BASE_NONE, NULL, 0, "x509if.T_contextValues_item", HFILL }}, { &hf_x509if_fallback, @@ -2216,7 +2216,7 @@ void proto_register_x509if(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509if.SET_SIZE_1_MAX_OF_ContextAssertion", HFILL }}, { &hf_x509if_selectedContexts_item, - { "selectedContexts", "x509if.selectedContexts_item", + { "ContextAssertion", "x509if.ContextAssertion", FT_NONE, BASE_NONE, NULL, 0, "x509if.ContextAssertion", HFILL }}, { &hf_x509if_ca_contextType, @@ -2228,7 +2228,7 @@ void proto_register_x509if(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509if.T_ca_contextValues", HFILL }}, { &hf_x509if_ca_contextValues_item, - { "contextValues", "x509if.contextValues_item", + { "contextValues item", "x509if.contextValues_item", FT_NONE, BASE_NONE, NULL, 0, "x509if.T_ca_contextValues_item", HFILL }}, { &hf_x509if_type_02, @@ -2240,7 +2240,7 @@ void proto_register_x509if(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509if.SEQUENCE_SIZE_1_MAX_OF_ContextAssertion", HFILL }}, { &hf_x509if_ata_assertedContexts_item, - { "assertedContexts", "x509if.assertedContexts_item", + { "ContextAssertion", "x509if.ContextAssertion", FT_NONE, BASE_NONE, NULL, 0, "x509if.ContextAssertion", HFILL }}, { &hf_x509if_rdnSequence, @@ -2248,11 +2248,11 @@ void proto_register_x509if(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509if.RDNSequence", HFILL }}, { &hf_x509if_RDNSequence_item, - { "RDNSequence", "x509if.RDNSequence_item", + { "RDNSequence item", "x509if.RDNSequence_item", FT_UINT32, BASE_DEC, NULL, 0, "x509if.RDNSequence_item", HFILL }}, { &hf_x509if_RelativeDistinguishedName_item, - { "RelativeDistinguishedName", "x509if.RelativeDistinguishedName_item", + { "RelativeDistinguishedName item", "x509if.RelativeDistinguishedName_item", FT_NONE, BASE_NONE, NULL, 0, "x509if.RelativeDistinguishedName_item", HFILL }}, { &hf_x509if_type_03, @@ -2272,7 +2272,7 @@ void proto_register_x509if(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509if.T_valWithContext", HFILL }}, { &hf_x509if_valueswithContext_item, - { "valuesWithContext", "x509if.valuesWithContext_item", + { "valuesWithContext item", "x509if.valuesWithContext_item", FT_NONE, BASE_NONE, NULL, 0, "x509if.T_valWithContext_item", HFILL }}, { &hf_x509if_distingAttrValue, @@ -2284,7 +2284,7 @@ void proto_register_x509if(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509if.T_chopSpecificExclusions", HFILL }}, { &hf_x509if_chopSpecificExclusions_item, - { "specificExclusions", "x509if.specificExclusions_item", + { "specificExclusions item", "x509if.specificExclusions_item", FT_UINT32, BASE_DEC, VALS(x509if_T_chopSpecificExclusions_item_vals), 0, "x509if.T_chopSpecificExclusions_item", HFILL }}, { &hf_x509if_chopBefore, @@ -2312,7 +2312,7 @@ void proto_register_x509if(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509if.SET_OF_Refinement", HFILL }}, { &hf_x509if_refinement_and_item, - { "and", "x509if.and_item", + { "Refinement", "x509if.Refinement", FT_UINT32, BASE_DEC, VALS(x509if_Refinement_vals), 0, "x509if.Refinement", HFILL }}, { &hf_x509if_refinement_or, @@ -2320,7 +2320,7 @@ void proto_register_x509if(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509if.SET_OF_Refinement", HFILL }}, { &hf_x509if_refinement_or_item, - { "or", "x509if.or_item", + { "Refinement", "x509if.Refinement", FT_UINT32, BASE_DEC, VALS(x509if_Refinement_vals), 0, "x509if.Refinement", HFILL }}, { &hf_x509if_refinement_not, @@ -2340,7 +2340,7 @@ void proto_register_x509if(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509if.SET_SIZE_1_MAX_OF_RuleIdentifier", HFILL }}, { &hf_x509if_superiorStructureRules_item, - { "superiorStructureRules", "x509if.superiorStructureRules_item", + { "RuleIdentifier", "x509if.RuleIdentifier", FT_INT32, BASE_DEC, NULL, 0, "x509if.RuleIdentifier", HFILL }}, { &hf_x509if_structuralObjectClass, @@ -2352,7 +2352,7 @@ void proto_register_x509if(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509if.T_auxiliaries", HFILL }}, { &hf_x509if_auxiliaries_item, - { "auxiliaries", "x509if.auxiliaries_item", + { "auxiliaries item", "x509if.auxiliaries_item", FT_OID, BASE_NONE, NULL, 0, "x509if.OBJECT_IDENTIFIER", HFILL }}, { &hf_x509if_mandatory, @@ -2360,7 +2360,7 @@ void proto_register_x509if(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509if.T_mandatory", HFILL }}, { &hf_x509if_mandatory_item, - { "mandatory", "x509if.mandatory_item", + { "mandatory item", "x509if.mandatory_item", FT_OID, BASE_NONE, NULL, 0, "x509if.OBJECT_IDENTIFIER", HFILL }}, { &hf_x509if_optional, @@ -2368,7 +2368,7 @@ void proto_register_x509if(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509if.T_optional", HFILL }}, { &hf_x509if_optional_item, - { "optional", "x509if.optional_item", + { "optional item", "x509if.optional_item", FT_OID, BASE_NONE, NULL, 0, "x509if.OBJECT_IDENTIFIER", HFILL }}, { &hf_x509if_precluded, @@ -2376,7 +2376,7 @@ void proto_register_x509if(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509if.T_precluded", HFILL }}, { &hf_x509if_precluded_item, - { "precluded", "x509if.precluded_item", + { "precluded item", "x509if.precluded_item", FT_OID, BASE_NONE, NULL, 0, "x509if.OBJECT_IDENTIFIER", HFILL }}, { &hf_x509if_attributeType, @@ -2388,7 +2388,7 @@ void proto_register_x509if(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509if.T_mandatoryContexts", HFILL }}, { &hf_x509if_mandatoryContexts_item, - { "mandatoryContexts", "x509if.mandatoryContexts_item", + { "mandatoryContexts item", "x509if.mandatoryContexts_item", FT_OID, BASE_NONE, NULL, 0, "x509if.OBJECT_IDENTIFIER", HFILL }}, { &hf_x509if_optionalContexts, @@ -2396,7 +2396,7 @@ void proto_register_x509if(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509if.T_optionalContexts", HFILL }}, { &hf_x509if_optionalContexts_item, - { "optionalContexts", "x509if.optionalContexts_item", + { "optionalContexts item", "x509if.optionalContexts_item", FT_OID, BASE_NONE, NULL, 0, "x509if.OBJECT_IDENTIFIER", HFILL }}, { &hf_x509if_id, @@ -2420,7 +2420,7 @@ void proto_register_x509if(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509if.T_ra_selectedValues", HFILL }}, { &hf_x509if_ra_selectedValues_item, - { "selectedValues", "x509if.selectedValues_item", + { "selectedValues item", "x509if.selectedValues_item", FT_NONE, BASE_NONE, NULL, 0, "x509if.T_ra_selectedValues_item", HFILL }}, { &hf_x509if_defaultValues, @@ -2428,7 +2428,7 @@ void proto_register_x509if(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509if.T_defaultValues", HFILL }}, { &hf_x509if_defaultValues_item, - { "defaultValues", "x509if.defaultValues_item", + { "defaultValues item", "x509if.defaultValues_item", FT_NONE, BASE_NONE, NULL, 0, "x509if.T_defaultValues_item", HFILL }}, { &hf_x509if_entryType, @@ -2440,7 +2440,7 @@ void proto_register_x509if(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509if.T_ra_values", HFILL }}, { &hf_x509if_ra_values_item, - { "values", "x509if.values_item", + { "values item", "x509if.values_item", FT_NONE, BASE_NONE, NULL, 0, "x509if.T_ra_values_item", HFILL }}, { &hf_x509if_contexts, @@ -2448,7 +2448,7 @@ void proto_register_x509if(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509if.SEQUENCE_SIZE_0_MAX_OF_ContextProfile", HFILL }}, { &hf_x509if_contexts_item, - { "contexts", "x509if.contexts_item", + { "ContextProfile", "x509if.ContextProfile", FT_NONE, BASE_NONE, NULL, 0, "x509if.ContextProfile", HFILL }}, { &hf_x509if_contextCombination, @@ -2460,7 +2460,7 @@ void proto_register_x509if(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509if.SEQUENCE_SIZE_1_MAX_OF_MatchingUse", HFILL }}, { &hf_x509if_matchingUse_item, - { "matchingUse", "x509if.matchingUse_item", + { "MatchingUse", "x509if.MatchingUse", FT_NONE, BASE_NONE, NULL, 0, "x509if.MatchingUse", HFILL }}, { &hf_x509if_contextType_01, @@ -2472,7 +2472,7 @@ void proto_register_x509if(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509if.T_contextValue", HFILL }}, { &hf_x509if_contextValue_item, - { "contextValue", "x509if.contextValue_item", + { "contextValue item", "x509if.contextValue_item", FT_NONE, BASE_NONE, NULL, 0, "x509if.T_contextValue_item", HFILL }}, { &hf_x509if_context, @@ -2484,7 +2484,7 @@ void proto_register_x509if(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509if.SEQUENCE_OF_ContextCombination", HFILL }}, { &hf_x509if_contextcombination_and_item, - { "and", "x509if.and_item", + { "ContextCombination", "x509if.ContextCombination", FT_UINT32, BASE_DEC, VALS(x509if_ContextCombination_vals), 0, "x509if.ContextCombination", HFILL }}, { &hf_x509if_contextcombination_or, @@ -2492,7 +2492,7 @@ void proto_register_x509if(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509if.SEQUENCE_OF_ContextCombination", HFILL }}, { &hf_x509if_contextcombination_or_item, - { "or", "x509if.or_item", + { "ContextCombination", "x509if.ContextCombination", FT_UINT32, BASE_DEC, VALS(x509if_ContextCombination_vals), 0, "x509if.ContextCombination", HFILL }}, { &hf_x509if_contextcombination_not, @@ -2516,7 +2516,7 @@ void proto_register_x509if(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509if.SEQUENCE_OF_AttributeCombination", HFILL }}, { &hf_x509if_and_item, - { "and", "x509if.and_item", + { "AttributeCombination", "x509if.AttributeCombination", FT_UINT32, BASE_DEC, VALS(x509if_AttributeCombination_vals), 0, "x509if.AttributeCombination", HFILL }}, { &hf_x509if_or, @@ -2524,7 +2524,7 @@ void proto_register_x509if(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509if.SEQUENCE_OF_AttributeCombination", HFILL }}, { &hf_x509if_or_item, - { "or", "x509if.or_item", + { "AttributeCombination", "x509if.AttributeCombination", FT_UINT32, BASE_DEC, VALS(x509if_AttributeCombination_vals), 0, "x509if.AttributeCombination", HFILL }}, { &hf_x509if_not, @@ -2544,7 +2544,7 @@ void proto_register_x509if(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509if.T_selectedValues", HFILL }}, { &hf_x509if_selectedValues_item, - { "selectedValues", "x509if.selectedValues_item", + { "selectedValues item", "x509if.selectedValues_item", FT_NONE, BASE_NONE, NULL, 0, "x509if.T_selectedValues_item", HFILL }}, { &hf_x509if_matchedValuesOnly, @@ -2584,7 +2584,7 @@ void proto_register_x509if(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509if.SEQUENCE_SIZE_1_MAX_OF_MRMapping", HFILL }}, { &hf_x509if_tightenings_item, - { "tightenings", "x509if.tightenings_item", + { "MRMapping", "x509if.MRMapping", FT_NONE, BASE_NONE, NULL, 0, "x509if.MRMapping", HFILL }}, { &hf_x509if_relaxations, @@ -2592,7 +2592,7 @@ void proto_register_x509if(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509if.SEQUENCE_SIZE_1_MAX_OF_MRMapping", HFILL }}, { &hf_x509if_relaxations_item, - { "relaxations", "x509if.relaxations_item", + { "MRMapping", "x509if.MRMapping", FT_NONE, BASE_NONE, NULL, 0, "x509if.MRMapping", HFILL }}, { &hf_x509if_maximum_relaxation, @@ -2608,7 +2608,7 @@ void proto_register_x509if(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509if.SEQUENCE_SIZE_1_MAX_OF_Mapping", HFILL }}, { &hf_x509if_mapping_item, - { "mapping", "x509if.mapping_item", + { "Mapping", "x509if.Mapping", FT_NONE, BASE_NONE, NULL, 0, "x509if.Mapping", HFILL }}, { &hf_x509if_substitution, @@ -2616,7 +2616,7 @@ void proto_register_x509if(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509if.SEQUENCE_SIZE_1_MAX_OF_MRSubstitution", HFILL }}, { &hf_x509if_substitution_item, - { "substitution", "x509if.substitution_item", + { "MRSubstitution", "x509if.MRSubstitution", FT_NONE, BASE_NONE, NULL, 0, "x509if.MRSubstitution", HFILL }}, { &hf_x509if_mappingFunction, @@ -2644,7 +2644,7 @@ void proto_register_x509if(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509if.T_specificExclusions", HFILL }}, { &hf_x509if_specificExclusions_item, - { "specificExclusions", "x509if.specificExclusions_item", + { "specificExclusions item", "x509if.specificExclusions_item", FT_UINT32, BASE_DEC, VALS(x509if_T_specificExclusions_item_vals), 0, "x509if.T_specificExclusions_item", HFILL }}, { &hf_x509if_specificationFilter, @@ -2664,7 +2664,7 @@ void proto_register_x509if(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509if.SEQUENCE_SIZE_0_MAX_OF_RequestAttribute", HFILL }}, { &hf_x509if_inputAttributeTypes_item, - { "inputAttributeTypes", "x509if.inputAttributeTypes_item", + { "RequestAttribute", "x509if.RequestAttribute", FT_NONE, BASE_NONE, NULL, 0, "x509if.RequestAttribute", HFILL }}, { &hf_x509if_attributeCombination, @@ -2676,7 +2676,7 @@ void proto_register_x509if(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509if.SEQUENCE_SIZE_1_MAX_OF_ResultAttribute", HFILL }}, { &hf_x509if_outputAttributeTypes_item, - { "outputAttributeTypes", "x509if.outputAttributeTypes_item", + { "ResultAttribute", "x509if.ResultAttribute", FT_NONE, BASE_NONE, NULL, 0, "x509if.ResultAttribute", HFILL }}, { &hf_x509if_defaultControls, @@ -2708,7 +2708,7 @@ void proto_register_x509if(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509if.SEQUENCE_SIZE_1_MAX_OF_AttributeType", HFILL }}, { &hf_x509if_additionalControl_item, - { "additionalControl", "x509if.additionalControl_item", + { "AttributeType", "x509if.AttributeType", FT_OID, BASE_NONE, NULL, 0, "x509if.AttributeType", HFILL }}, { &hf_x509if_allowedSubset, @@ -2728,7 +2728,7 @@ void proto_register_x509if(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509if.SET_SIZE_1_MAX_OF_DirectoryString", HFILL }}, { &hf_x509if_name_item, - { "name", "x509if.name_item", + { "DirectoryString", "x509if.DirectoryString", FT_UINT32, BASE_DEC, VALS(x509sat_DirectoryString_vals), 0, "x509sat.DirectoryString", HFILL }}, { &hf_x509if_description, diff --git a/epan/dissectors/packet-x509if.h b/epan/dissectors/packet-x509if.h index f10bc243bd..aed6c004d0 100644 --- a/epan/dissectors/packet-x509if.h +++ b/epan/dissectors/packet-x509if.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-x509if.h */ -/* ../../tools/asn2wrs.py -b -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn ServiceAdministration.asn */ +/* ../../tools/asn2wrs.py -b -e -p x509if -c ./x509if.cnf -s ./packet-x509if-template -D . InformationFramework.asn ServiceAdministration.asn */ /* Input file: packet-x509if-template.h */ diff --git a/epan/dissectors/packet-x509sat.c b/epan/dissectors/packet-x509sat.c index 49de976ef7..06bd50a3cf 100644 --- a/epan/dissectors/packet-x509sat.c +++ b/epan/dissectors/packet-x509sat.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-x509sat.c */ -/* ../../tools/asn2wrs.py -b -e -p x509sat -c x509sat.cnf -s packet-x509sat-template SelectedAttributeTypes.asn */ +/* ../../tools/asn2wrs.py -b -e -p x509sat -c ./x509sat.cnf -s ./packet-x509sat-template -D . SelectedAttributeTypes.asn */ /* Input file: packet-x509sat-template.c */ @@ -1901,7 +1901,7 @@ void proto_register_x509sat(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509sat.SET_OF_Criteria", HFILL }}, { &hf_x509sat_and_item, - { "and", "x509sat.and_item", + { "Criteria", "x509sat.Criteria", FT_UINT32, BASE_DEC, VALS(x509sat_Criteria_vals), 0, "x509sat.Criteria", HFILL }}, { &hf_x509sat_or, @@ -1909,7 +1909,7 @@ void proto_register_x509sat(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509sat.SET_OF_Criteria", HFILL }}, { &hf_x509sat_or_item, - { "or", "x509sat.or_item", + { "Criteria", "x509sat.Criteria", FT_UINT32, BASE_DEC, VALS(x509sat_Criteria_vals), 0, "x509sat.Criteria", HFILL }}, { &hf_x509sat_not, @@ -1941,7 +1941,7 @@ void proto_register_x509sat(void) { FT_INT32, BASE_DEC, VALS(x509sat_T_subset_vals), 0, "x509sat.T_subset", HFILL }}, { &hf_x509sat_PostalAddress_item, - { "PostalAddress", "x509sat.PostalAddress_item", + { "DirectoryString", "x509sat.DirectoryString", FT_UINT32, BASE_DEC, VALS(x509sat_DirectoryString_vals), 0, "x509sat.DirectoryString", HFILL }}, { &hf_x509sat_telexNumber, @@ -1965,7 +1965,7 @@ void proto_register_x509sat(void) { FT_BYTES, BASE_HEX, NULL, 0, "x411.G3FacsimileNonBasicParameters", HFILL }}, { &hf_x509sat_PreferredDeliveryMethod_item, - { "PreferredDeliveryMethod", "x509sat.PreferredDeliveryMethod_item", + { "PreferredDeliveryMethod item", "x509sat.PreferredDeliveryMethod_item", FT_INT32, BASE_DEC, VALS(x509sat_PreferredDeliveryMethod_item_vals), 0, "x509sat.PreferredDeliveryMethod_item", HFILL }}, { &hf_x509sat_pSelector, @@ -1985,7 +1985,7 @@ void proto_register_x509sat(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509sat.T_nAddresses", HFILL }}, { &hf_x509sat_nAddresses_item, - { "nAddresses", "x509sat.nAddresses_item", + { "nAddresses item", "x509sat.nAddresses_item", FT_BYTES, BASE_HEX, NULL, 0, "x509sat.OCTET_STRING", HFILL }}, { &hf_x509sat_nAddress, @@ -1997,7 +1997,7 @@ void proto_register_x509sat(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509sat.T_profiles", HFILL }}, { &hf_x509sat_profiles_item, - { "profiles", "x509sat.profiles_item", + { "profiles item", "x509sat.profiles_item", FT_OID, BASE_NONE, NULL, 0, "x509sat.OBJECT_IDENTIFIER", HFILL }}, { &hf_x509sat_dn, @@ -2017,11 +2017,11 @@ void proto_register_x509sat(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509sat.SEQUENCE_OF_AttributeValueAssertion", HFILL }}, { &hf_x509sat_attributeList_item, - { "attributeList", "x509sat.attributeList_item", + { "AttributeValueAssertion", "x509sat.AttributeValueAssertion", FT_NONE, BASE_NONE, NULL, 0, "x509if.AttributeValueAssertion", HFILL }}, { &hf_x509sat_SubstringAssertion_item, - { "SubstringAssertion", "x509sat.SubstringAssertion_item", + { "SubstringAssertion item", "x509sat.SubstringAssertion_item", FT_UINT32, BASE_DEC, VALS(x509sat_SubstringAssertion_item_vals), 0, "x509sat.SubstringAssertion_item", HFILL }}, { &hf_x509sat_initial, @@ -2041,11 +2041,11 @@ void proto_register_x509sat(void) { FT_NONE, BASE_NONE, NULL, 0, "x509if.Attribute", HFILL }}, { &hf_x509sat_CaseIgnoreListMatch_item, - { "CaseIgnoreListMatch", "x509sat.CaseIgnoreListMatch_item", + { "DirectoryString", "x509sat.DirectoryString", FT_UINT32, BASE_DEC, VALS(x509sat_DirectoryString_vals), 0, "x509sat.DirectoryString", HFILL }}, { &hf_x509sat_OctetSubstringAssertion_item, - { "OctetSubstringAssertion", "x509sat.OctetSubstringAssertion_item", + { "OctetSubstringAssertion item", "x509sat.OctetSubstringAssertion_item", FT_UINT32, BASE_DEC, VALS(x509sat_OctetSubstringAssertion_item_vals), 0, "x509sat.OctetSubstringAssertion_item", HFILL }}, { &hf_x509sat_initial_substring, @@ -2061,7 +2061,7 @@ void proto_register_x509sat(void) { FT_BYTES, BASE_HEX, NULL, 0, "x509sat.OCTET_STRING", HFILL }}, { &hf_x509sat_ZonalSelect_item, - { "ZonalSelect", "x509sat.ZonalSelect_item", + { "AttributeType", "x509sat.AttributeType", FT_OID, BASE_NONE, NULL, 0, "x509if.AttributeType", HFILL }}, { &hf_x509sat_time, @@ -2085,7 +2085,7 @@ void proto_register_x509sat(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509sat.SET_OF_Period", HFILL }}, { &hf_x509sat_periodic_item, - { "periodic", "x509sat.periodic_item", + { "Period", "x509sat.Period", FT_NONE, BASE_NONE, NULL, 0, "x509sat.Period", HFILL }}, { &hf_x509sat_notThisTime, @@ -2101,7 +2101,7 @@ void proto_register_x509sat(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509sat.SET_OF_DayTimeBand", HFILL }}, { &hf_x509sat_timesOfDay_item, - { "timesOfDay", "x509sat.timesOfDay_item", + { "DayTimeBand", "x509sat.DayTimeBand", FT_NONE, BASE_NONE, NULL, 0, "x509sat.DayTimeBand", HFILL }}, { &hf_x509sat_days, @@ -2113,7 +2113,7 @@ void proto_register_x509sat(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509sat.T_intDay", HFILL }}, { &hf_x509sat_intDay_item, - { "intDay", "x509sat.intDay_item", + { "intDay item", "x509sat.intDay_item", FT_INT32, BASE_DEC, NULL, 0, "x509sat.INTEGER", HFILL }}, { &hf_x509sat_bitDay, @@ -2137,7 +2137,7 @@ void proto_register_x509sat(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509sat.T_intWeek", HFILL }}, { &hf_x509sat_intWeek_item, - { "intWeek", "x509sat.intWeek_item", + { "intWeek item", "x509sat.intWeek_item", FT_INT32, BASE_DEC, NULL, 0, "x509sat.INTEGER", HFILL }}, { &hf_x509sat_bitWeek, @@ -2157,7 +2157,7 @@ void proto_register_x509sat(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509sat.T_intMonth", HFILL }}, { &hf_x509sat_intMonth_item, - { "intMonth", "x509sat.intMonth_item", + { "intMonth item", "x509sat.intMonth_item", FT_INT32, BASE_DEC, NULL, 0, "x509sat.INTEGER", HFILL }}, { &hf_x509sat_bitMonth, @@ -2169,7 +2169,7 @@ void proto_register_x509sat(void) { FT_UINT32, BASE_DEC, NULL, 0, "x509sat.T_years", HFILL }}, { &hf_x509sat_years_item, - { "years", "x509sat.years_item", + { "years item", "x509sat.years_item", FT_INT32, BASE_DEC, NULL, 0, "x509sat.INTEGER", HFILL }}, { &hf_x509sat_first_dayof, diff --git a/epan/dissectors/packet-x509sat.h b/epan/dissectors/packet-x509sat.h index 29233b0e89..433cd87e38 100644 --- a/epan/dissectors/packet-x509sat.h +++ b/epan/dissectors/packet-x509sat.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-x509sat.h */ -/* ../../tools/asn2wrs.py -b -e -p x509sat -c x509sat.cnf -s packet-x509sat-template SelectedAttributeTypes.asn */ +/* ../../tools/asn2wrs.py -b -e -p x509sat -c ./x509sat.cnf -s ./packet-x509sat-template -D . SelectedAttributeTypes.asn */ /* Input file: packet-x509sat-template.h */ |