Regenerate all asn2wrs generated dissectors.
authorstig <stig@f5534014-38df-0310-8fa8-9805f1628bb7>
Sat, 16 May 2009 22:07:03 +0000 (22:07 +0000)
committerstig <stig@f5534014-38df-0310-8fa8-9805f1628bb7>
Sat, 16 May 2009 22:07:03 +0000 (22:07 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28379 f5534014-38df-0310-8fa8-9805f1628bb7

132 files changed:
epan/dissectors/packet-acp133.c
epan/dissectors/packet-acp133.h
epan/dissectors/packet-acse.c
epan/dissectors/packet-ansi_map.c
epan/dissectors/packet-ansi_map.h
epan/dissectors/packet-ansi_tcap.c
epan/dissectors/packet-ansi_tcap.h
epan/dissectors/packet-camel.c
epan/dissectors/packet-camel.h
epan/dissectors/packet-charging_ase.c
epan/dissectors/packet-charging_ase.h
epan/dissectors/packet-cmip.c
epan/dissectors/packet-cmip.h
epan/dissectors/packet-cmp.c
epan/dissectors/packet-cmp.h
epan/dissectors/packet-cms.c
epan/dissectors/packet-cms.h
epan/dissectors/packet-crmf.c
epan/dissectors/packet-crmf.h
epan/dissectors/packet-dap.c
epan/dissectors/packet-disp.c
epan/dissectors/packet-disp.h
epan/dissectors/packet-dop.c
epan/dissectors/packet-dop.h
epan/dissectors/packet-dsp.c
epan/dissectors/packet-dsp.h
epan/dissectors/packet-ess.c
epan/dissectors/packet-ess.h
epan/dissectors/packet-ftam.c
epan/dissectors/packet-ftam.h
epan/dissectors/packet-gnm.c
epan/dissectors/packet-gnm.h
epan/dissectors/packet-goose.c
epan/dissectors/packet-gsm_map.c
epan/dissectors/packet-gsm_map.h
epan/dissectors/packet-h225.c
epan/dissectors/packet-h225.h
epan/dissectors/packet-h235.c
epan/dissectors/packet-h235.h
epan/dissectors/packet-h245.c
epan/dissectors/packet-h245.h
epan/dissectors/packet-h248.c
epan/dissectors/packet-h248.h
epan/dissectors/packet-h282.c
epan/dissectors/packet-h283.c
epan/dissectors/packet-h323.c
epan/dissectors/packet-h323.h
epan/dissectors/packet-h450-ros.c
epan/dissectors/packet-h450-ros.h
epan/dissectors/packet-h450.c
epan/dissectors/packet-h460.c
epan/dissectors/packet-h501.c
epan/dissectors/packet-inap.c
epan/dissectors/packet-inap.h
epan/dissectors/packet-ldap.c
epan/dissectors/packet-logotypecertextn.c
epan/dissectors/packet-logotypecertextn.h
epan/dissectors/packet-lte-rrc.c
epan/dissectors/packet-mms.c
epan/dissectors/packet-mms.h
epan/dissectors/packet-mpeg-audio.c
epan/dissectors/packet-mpeg-pes.c
epan/dissectors/packet-nbap.c
epan/dissectors/packet-ns_cert_exts.c
epan/dissectors/packet-ocsp.c
epan/dissectors/packet-ocsp.h
epan/dissectors/packet-p7.c
epan/dissectors/packet-p7.h
epan/dissectors/packet-pcap.c
epan/dissectors/packet-pkcs1.c
epan/dissectors/packet-pkcs1.h
epan/dissectors/packet-pkcs12.c
epan/dissectors/packet-pkcs12.h
epan/dissectors/packet-pkinit.c
epan/dissectors/packet-pkinit.h
epan/dissectors/packet-pkix1explicit.c
epan/dissectors/packet-pkix1explicit.h
epan/dissectors/packet-pkix1implicit.c
epan/dissectors/packet-pkix1implicit.h
epan/dissectors/packet-pkixproxy.c
epan/dissectors/packet-pkixproxy.h
epan/dissectors/packet-pkixqualified.c
epan/dissectors/packet-pkixqualified.h
epan/dissectors/packet-pkixtsp.c
epan/dissectors/packet-pkixtsp.h
epan/dissectors/packet-pres.c
epan/dissectors/packet-q932-ros.c
epan/dissectors/packet-q932.c
epan/dissectors/packet-q932.h
epan/dissectors/packet-qsig.c
epan/dissectors/packet-qsig.h
epan/dissectors/packet-ranap.c
epan/dissectors/packet-ranap.h
epan/dissectors/packet-rnsap.c
epan/dissectors/packet-ros.c
epan/dissectors/packet-ros.h
epan/dissectors/packet-rrc.c
epan/dissectors/packet-rrc.h
epan/dissectors/packet-rrlp.c
epan/dissectors/packet-rtse.c
epan/dissectors/packet-rtse.h
epan/dissectors/packet-s1ap.c
epan/dissectors/packet-s4406.c
epan/dissectors/packet-s4406.h
epan/dissectors/packet-sabp.c
epan/dissectors/packet-smrse.c
epan/dissectors/packet-smrse.h
epan/dissectors/packet-snmp.c
epan/dissectors/packet-snmp.h
epan/dissectors/packet-spnego.c
epan/dissectors/packet-spnego.h
epan/dissectors/packet-t125.c
epan/dissectors/packet-t125.h
epan/dissectors/packet-t38.c
epan/dissectors/packet-t38.h
epan/dissectors/packet-tcap.c
epan/dissectors/packet-ulp.c
epan/dissectors/packet-wlancertextn.c
epan/dissectors/packet-wlancertextn.h
epan/dissectors/packet-x2ap.c
epan/dissectors/packet-x411.c
epan/dissectors/packet-x411.h
epan/dissectors/packet-x420.c
epan/dissectors/packet-x420.h
epan/dissectors/packet-x509af.c
epan/dissectors/packet-x509af.h
epan/dissectors/packet-x509ce.c
epan/dissectors/packet-x509ce.h
epan/dissectors/packet-x509if.c
epan/dissectors/packet-x509if.h
epan/dissectors/packet-x509sat.c
epan/dissectors/packet-x509sat.h

index 5d8de981de9a7aded6d7ab16a6fde4eee226581c..a12c28e8e3ae272057b7e99693c2883f347e09b8 100644 (file)
@@ -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,
index f54ed107181278f4083275a85147b7f69b71f503..3f9577b21e065d051b4da7aa82b53d96b292b44a 100644 (file)
@@ -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 */
 
index a47f6c29a4c39c96de88962e82c718aa16014f56..ff30c540e2da26df1e4bb25db5d58dd25d5646f2 100644 (file)
@@ -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,
index f1aa6da859b32381f4b87f6c7b2c4358d27b108d..faa1cca0ffeb6ce1493f6564520a0764d5dda916 100644 (file)
@@ -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,
index c84e5a1a37d534debdf2e7c5dd95888260c2f4c9..af25f1ca224e1d44e8b4622bb5d174cdc0c833dd 100644 (file)
@@ -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 */
 
index 37abcf429d7599dcb98f17f0a2ff4e30e79d5d9b..2ea6b427d06f564606bd5bd2f784d7acca2596e7 100644 (file)
@@ -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,
index 37d293ff7a3e6a55599566c1ab295a0353fcc744..ba905f3e73b8d574693cb0cf9b61a429d10533a4 100644 (file)
@@ -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 */
 
index 202c846dfd5eeee999905f1c4acfa552127d5a8b..3ab8bd3202f2b3d4bb96aba821f587d1465e1f94 100644 (file)
@@ -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,
index a2b0ccbf5a8810f13e8ee57d2ea5de14aaf571b3..f1249ade169848a085f1701c1842e6dca7b34536 100644 (file)
@@ -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 */
 
index 4f8780ef0b1408ba346ada19de740afc9525fdae..a6cfedd042bc2a808bbfa8d6c9f94e53e8554cda 100644 (file)
@@ -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,
index 53a1d38065ea30464e0d4cd3d7d7477be7100c82..3425785a31b8c8199d2df8f396dd5f8b1f4ba764 100644 (file)
@@ -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 */
 
index 4da5a9c2a67776c5ab191940886ee4f9849cf1b2..ed887a748d007b6d18b3c0c3def89595f90cd345 100644 (file)
@@ -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,
index ab3276de76823799b7c1929e620664127a741067..68918745c6fefae2e34102320fd275fb63786699 100644 (file)
@@ -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 */
 
index cb4df8ad264250eea5bef5ec87aff17a476a9e92..4c88ef087d9b9245691baee4e20ee3d46d3b71dc 100644 (file)
@@ -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,
index 12cd23fdcaa4444b71d635263bca7c4f9e5ae1d7..c4e48730c4c9b221333ceb1656802faacb617db8 100644 (file)
@@ -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 */
 
index 5719964d20d09015f5d2779f1cde1cd69b066848..9d6951f9a188536d65d9cf85ac2949776444155c 100644 (file)
@@ -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,
index c12015f23b9c2df56b29772324b505b031fc2f07..24e016f6a51f1e3e3971e268154ceeaea9fb1c6e 100644 (file)
@@ -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 */
 
index 224585d5aff177a03f5afb6a3e6b441e45022c2d..0e5ecfdf0e227ec3dbc835ae1107a3b5d8ab4dd5 100644 (file)
@@ -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 }},
 
index 5c8afb41cc5ec31017c3dee248d117ab7d4f64ed..9eba6b7a8f82b46b88d26212e2ccdbfa1bb7406c 100644 (file)
@@ -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 */
 
index 1f4034c97589d7d15108ac11c815c5701047c232..1aa2f08f764d78e6b7a56ab32be3999d51ede436 100644 (file)
@@ -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,
index 3e93a661facb6e61fc6e104a1b71b9e8ca1e28dc..389bbb4e87d4f1d2f3cce4d7df9134e5afbf88e1 100644 (file)
@@ -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,
index 06fd2b530813ca643552e02f76c85bd10d141408..436f5509c5299da25190a2180b3899b35f8b3dcb 100644 (file)
@@ -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 */
 
index 8de4c3932bc8f2bc64a73bbbaa5c43ec3ccd4154..96e0e3990b8d60b50ba7e7da48deb67d8d96d6d3 100644 (file)
@@ -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,
index 4df2a61a4ee31103d536ff24a2eadc65b146c527..416df3e56bb2006011b3eb08b0d3b735c3b2de51 100644 (file)
@@ -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 */
 
index 132d361a1f36e03c1ee292d867c95596c8a0032c..394cf3986aeb2694c4b4af47e64e1f09a19b9b0b 100644 (file)
@@ -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,
index 34d65bd4800d9b9f97905836922a21e6a2dd7802..24f0a4c85e4fd4ccbd461bf649def01c8f7a486d 100644 (file)
@@ -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 */
 
index f949b6723e0e72debae6196b63d3af7fb601fc80..167692f37e0b586a1f99f935ace0c30d3b10a9ae 100644 (file)
@@ -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,
index 87ef6f1b4b31f8dfee317fa69317840126b422f5..987641d605aec709de8bc5b1db1a8dd8e6c55127 100644 (file)
@@ -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 */
 
index 96a4157069a8d984723b87f036dac7f902c68365..585b6ea9e61df162116e5362f9408881a1d85d8b 100644 (file)
@@ -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,
index d9670b25fe6cb8b26456ff12cc5513e8c4c0c442..ddc5b5f42b1a2859814e3e666df400f8cf902674 100644 (file)
@@ -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 */
 
index 5d60c9de8b488f9f3639435b0936f2990b33ef09..e4a0a3e83f05a6ad79791f1c2f41644f5a44158e 100644 (file)
@@ -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,
index 1ef57e3411bb85df516156db5554fb8ee02e6849..0f37fa13622dc8fcaa92d039d6f2621543df4f2f 100644 (file)
@@ -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 */
 
index ef4eacec9d23e381c4616b254035b79b06bb1d9d..4fec0387cec8c9f9866e5438ebf0792cfb89ad28 100644 (file)
@@ -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,
index 6fd960bb2b3407bd092f6705797c88a09be634f6..e3e5ab44c6139e66e360aa7c30996650efe59631 100644 (file)
@@ -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,
index 0f2b05ae8275f13b8e998cdfcc3e99500eae47d9..f4ee5ffae1310dbdb6e3313c8d0614696048f9d7 100644 (file)
@@ -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 */
 
index cfffbdfa583b1a5e6d0500811ba8255542c9fdff..b59c654632fca79ac182af15c0bc1dfc4561c200 100644 (file)
@@ -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,
index 8521fab2aaf09318f1669f12cb60d402f76851e4..b9145b3d0e4eefda89b5aef66fb9bd8e655bcfeb 100644 (file)
@@ -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 */
 
index e79fe1be5e2ddba3fedabccefd230af16ada5b21..e2cd10ed918b9920d0cd0e0739583d873d2d163f 100644 (file)
@@ -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,
index 2bd6f3a98d1b028074df7b13a5a38732013b0800..832a7b30663d55b4b8711970a5424ad3fea9395e 100644 (file)
@@ -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 */
 
index bed07c3427110fe4ae80104a32d5cf3f8a615eb0..99cfda6932bedd78a3c59728c72058d5ec7137b9 100644 (file)
@@ -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,
index 4376792099864722580bb59cfb077a850ed42592..386f1d077576dfa1797f589f27b3a923ab04d09f 100644 (file)
@@ -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 */
 
index ae5487c676ae79260b5101f8d2e923c3926aa834..47aceb896027e8e3ce00e26b15a2fddc8aecbf9e 100644 (file)
@@ -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,
index 60a4a6f3b65338c6b569a18c5350e3312ae5de55..d168a5792373eeb9e2bc2e3831a98441bbf81640 100644 (file)
@@ -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 */
 
index 57159587eb45462aa1e2a0ef60b943d0ed721e76..27d4939adacaf85ff6d7702946f82e26f70a4809 100644 (file)
@@ -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,
@@