From c47e788c94af5656ffbc83ebbe03a8539cdcde72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stig=20Bj=C3=B8rlykke?= Date: Sat, 16 May 2009 22:07:03 +0000 Subject: Regenerate all asn2wrs generated dissectors. svn path=/trunk/; revision=28379 --- epan/dissectors/packet-x420.c | 82 +++++++++++++++++++++---------------------- 1 file changed, 41 insertions(+), 41 deletions(-) (limited to 'epan/dissectors/packet-x420.c') diff --git a/epan/dissectors/packet-x420.c b/epan/dissectors/packet-x420.c index 179e656c51..9c400cf285 100644 --- a/epan/dissectors/packet-x420.c +++ b/epan/dissectors/packet-x420.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-x420.c */ -/* ../../tools/asn2wrs.py -b -e -p x420 -c x420.cnf -s packet-x420-template IPMSInformationObjects.asn IPMSHeadingExtensions.asn IPMSExtendedBodyPartTypes2.asn IPMSFileTransferBodyPartType.asn IPMSExtendedVoiceBodyPartType.asn IPMSForwardedContentBodyPartType.asn IPMSMessageStoreAttributes.asn IPMSSecurityExtensions.asn IPMSObjectIdentifiers.asn */ +/* ../../tools/asn2wrs.py -b -e -p x420 -c ./x420.cnf -s ./packet-x420-template -D . IPMSInformationObjects.asn IPMSHeadingExtensions.asn IPMSExtendedBodyPartTypes2.asn IPMSFileTransferBodyPartType.asn IPMSExtendedVoiceBodyPartType.asn IPMSForwardedContentBodyPartType.asn IPMSMessageStoreAttributes.asn IPMSSecurityExtensions.asn IPMSObjectIdentifiers.asn */ /* Input file: packet-x420-template.c */ @@ -4777,43 +4777,43 @@ void proto_register_x420(void) { FT_STRING, BASE_NONE, NULL, 0, "x420.TelephoneNumber", HFILL }}, { &hf_x420_RecipientExtensionsField_item, - { "RecipientExtensionsField", "x420.RecipientExtensionsField_item", + { "IPMSExtension", "x420.IPMSExtension", FT_NONE, BASE_NONE, NULL, 0, "x420.IPMSExtension", HFILL }}, { &hf_x420_AuthorizingUsersField_item, - { "AuthorizingUsersField", "x420.AuthorizingUsersField_item", + { "AuthorizingUsersSubfield", "x420.AuthorizingUsersSubfield", FT_NONE, BASE_NONE, NULL, 0, "x420.AuthorizingUsersSubfield", HFILL }}, { &hf_x420_PrimaryRecipientsField_item, - { "PrimaryRecipientsField", "x420.PrimaryRecipientsField_item", + { "PrimaryRecipientsSubfield", "x420.PrimaryRecipientsSubfield", FT_NONE, BASE_NONE, NULL, 0, "x420.PrimaryRecipientsSubfield", HFILL }}, { &hf_x420_CopyRecipientsField_item, - { "CopyRecipientsField", "x420.CopyRecipientsField_item", + { "CopyRecipientsSubfield", "x420.CopyRecipientsSubfield", FT_NONE, BASE_NONE, NULL, 0, "x420.CopyRecipientsSubfield", HFILL }}, { &hf_x420_BlindCopyRecipientsField_item, - { "BlindCopyRecipientsField", "x420.BlindCopyRecipientsField_item", + { "BlindCopyRecipientsSubfield", "x420.BlindCopyRecipientsSubfield", FT_NONE, BASE_NONE, NULL, 0, "x420.BlindCopyRecipientsSubfield", HFILL }}, { &hf_x420_ObsoletedIPMsField_item, - { "ObsoletedIPMsField", "x420.ObsoletedIPMsField_item", + { "ObsoletedIPMsSubfield", "x420.ObsoletedIPMsSubfield", FT_NONE, BASE_NONE, NULL, 0, "x420.ObsoletedIPMsSubfield", HFILL }}, { &hf_x420_RelatedIPMsField_item, - { "RelatedIPMsField", "x420.RelatedIPMsField_item", + { "RelatedIPMsSubfield", "x420.RelatedIPMsSubfield", FT_NONE, BASE_NONE, NULL, 0, "x420.RelatedIPMsSubfield", HFILL }}, { &hf_x420_ReplyRecipientsField_item, - { "ReplyRecipientsField", "x420.ReplyRecipientsField_item", + { "ReplyRecipientsSubfield", "x420.ReplyRecipientsSubfield", FT_NONE, BASE_NONE, NULL, 0, "x420.ReplyRecipientsSubfield", HFILL }}, { &hf_x420_ExtensionsField_item, - { "ExtensionsField", "x420.ExtensionsField_item", + { "IPMSExtension", "x420.IPMSExtension", FT_NONE, BASE_NONE, NULL, 0, "x420.IPMSExtension", HFILL }}, { &hf_x420_Body_item, - { "Body", "x420.Body_item", + { "BodyPart", "x420.BodyPart", FT_UINT32, BASE_DEC, VALS(x420_BodyPart_vals), 0, "x420.BodyPart", HFILL }}, { &hf_x420_basic, @@ -4901,15 +4901,15 @@ void proto_register_x420(void) { FT_BYTES, BASE_HEX, NULL, 0, "x411.G3FacsimileNonBasicParameters", HFILL }}, { &hf_x420_G3FacsimileData_item, - { "G3FacsimileData", "x420.G3FacsimileData_item", + { "G3FacsimileData item", "x420.G3FacsimileData_item", FT_BYTES, BASE_HEX, NULL, 0, "x420.BIT_STRING", HFILL }}, { &hf_x420_G4Class1BodyPart_item, - { "G4Class1BodyPart", "x420.G4Class1BodyPart_item", + { "Interchange-Data-Element", "x420.Interchange_Data_Element", FT_NONE, BASE_NONE, NULL, 0, "x420.Interchange_Data_Element", HFILL }}, { &hf_x420_MixedModeBodyPart_item, - { "MixedModeBodyPart", "x420.MixedModeBodyPart_item", + { "Interchange-Data-Element", "x420.Interchange_Data_Element", FT_NONE, BASE_NONE, NULL, 0, "x420.Interchange_Data_Element", HFILL }}, { &hf_x420_teletex_parameters, @@ -4929,7 +4929,7 @@ void proto_register_x420(void) { FT_NONE, BASE_NONE, NULL, 0, "x411.TeletexNonBasicParameters", HFILL }}, { &hf_x420_TeletexData_item, - { "TeletexData", "x420.TeletexData_item", + { "TeletexData item", "x420.TeletexData_item", FT_STRING, BASE_NONE, NULL, 0, "x420.TeletexString", HFILL }}, { &hf_x420_videotex_parameters, @@ -5033,19 +5033,19 @@ void proto_register_x420(void) { FT_UINT32, BASE_DEC, NULL, 0, "x420.RNExtensionsField", HFILL }}, { &hf_x420_NotificationExtensionsField_item, - { "NotificationExtensionsField", "x420.NotificationExtensionsField_item", + { "IPMSExtension", "x420.IPMSExtension", FT_NONE, BASE_NONE, NULL, 0, "x420.IPMSExtension", HFILL }}, { &hf_x420_NRNExtensionsField_item, - { "NRNExtensionsField", "x420.NRNExtensionsField_item", + { "IPMSExtension", "x420.IPMSExtension", FT_NONE, BASE_NONE, NULL, 0, "x420.IPMSExtension", HFILL }}, { &hf_x420_RNExtensionsField_item, - { "RNExtensionsField", "x420.RNExtensionsField_item", + { "IPMSExtension", "x420.IPMSExtension", FT_NONE, BASE_NONE, NULL, 0, "x420.IPMSExtension", HFILL }}, { &hf_x420_OtherNotificationTypeFields_item, - { "OtherNotificationTypeFields", "x420.OtherNotificationTypeFields_item", + { "IPMSExtension", "x420.IPMSExtension", FT_NONE, BASE_NONE, NULL, 0, "x420.IPMSExtension", HFILL }}, { &hf_x420_advice, @@ -5069,7 +5069,7 @@ void proto_register_x420(void) { FT_UINT32, BASE_DEC, NULL, 0, "x420.BodyPartReferences", HFILL }}, { &hf_x420_BodyPartReferences_item, - { "BodyPartReferences", "x420.BodyPartReferences_item", + { "BodyPartReference", "x420.BodyPartReference", FT_UINT32, BASE_DEC, VALS(x420_BodyPartReference_vals), 0, "x420.BodyPartReference", HFILL }}, { &hf_x420_stored_entry, @@ -5097,11 +5097,11 @@ void proto_register_x420(void) { FT_UINT32, BASE_DEC, NULL, 0, "x420.BodyPartNumber", HFILL }}, { &hf_x420_Languages_item, - { "Languages", "x420.Languages_item", + { "Language", "x420.Language", FT_STRING, BASE_NONE, NULL, 0, "x420.Language", HFILL }}, { &hf_x420_BodyPartSignatures_item, - { "BodyPartSignatures", "x420.BodyPartSignatures_item", + { "BodyPartSignatures item", "x420.BodyPartSignatures_item", FT_NONE, BASE_NONE, NULL, 0, "x420.BodyPartSignatures_item", HFILL }}, { &hf_x420_body_part_signature, @@ -5133,7 +5133,7 @@ void proto_register_x420(void) { FT_UINT32, BASE_DEC, NULL, 0, "x420.SEQUENCE_OF_BodyPartSecurityLabel", HFILL }}, { &hf_x420_body_part_security_labels_item, - { "body-part-security-labels", "x420.body_part_security_labels_item", + { "BodyPartSecurityLabel", "x420.BodyPartSecurityLabel", FT_UINT32, BASE_DEC, VALS(x420_BodyPartSecurityLabel_vals), 0, "x420.BodyPartSecurityLabel", HFILL }}, { &hf_x420_body_part_unlabelled, @@ -5145,7 +5145,7 @@ void proto_register_x420(void) { FT_NONE, BASE_NONE, NULL, 0, "x411.SecurityLabel", HFILL }}, { &hf_x420_CirculationList_item, - { "CirculationList", "x420.CirculationList_item", + { "CirculationMember", "x420.CirculationMember", FT_NONE, BASE_NONE, NULL, 0, "x420.CirculationMember", HFILL }}, { &hf_x420_circulation_recipient, @@ -5181,7 +5181,7 @@ void proto_register_x420(void) { FT_NONE, BASE_NONE, NULL, 0, "x420.CirculationSignatureData", HFILL }}, { &hf_x420_DistributionCodes_item, - { "DistributionCodes", "x420.DistributionCodes_item", + { "DistributionCode", "x420.DistributionCode", FT_NONE, BASE_NONE, NULL, 0, "x420.DistributionCode", HFILL }}, { &hf_x420_oid_code, @@ -5197,7 +5197,7 @@ void proto_register_x420(void) { FT_NONE, BASE_NONE, NULL, 0, "x420.ORDescriptor", HFILL }}, { &hf_x420_InformationCategories_item, - { "InformationCategories", "x420.InformationCategories_item", + { "InformationCategory", "x420.InformationCategory", FT_NONE, BASE_NONE, NULL, 0, "x420.InformationCategory", HFILL }}, { &hf_x420_reference, @@ -5209,11 +5209,11 @@ void proto_register_x420(void) { FT_NONE, BASE_NONE, NULL, 0, "x420.DescriptionString", HFILL }}, { &hf_x420_ManualHandlingInstructions_item, - { "ManualHandlingInstructions", "x420.ManualHandlingInstructions_item", + { "ManualHandlingInstruction", "x420.ManualHandlingInstruction", FT_NONE, BASE_NONE, NULL, 0, "x420.ManualHandlingInstruction", HFILL }}, { &hf_x420_GeneralTextParameters_item, - { "GeneralTextParameters", "x420.GeneralTextParameters_item", + { "CharacterSetRegistration", "x420.CharacterSetRegistration", FT_UINT32, BASE_DEC, NULL, 0, "x420.CharacterSetRegistration", HFILL }}, { &hf_x420_related_stored_file, @@ -5237,11 +5237,11 @@ void proto_register_x420(void) { FT_NONE, BASE_NONE, NULL, 0, "x420.FileAttributes", HFILL }}, { &hf_x420_FileTransferData_item, - { "FileTransferData", "x420.FileTransferData_item", + { "FileTransferData item", "x420.FileTransferData_item", FT_NONE, BASE_NONE, NULL, 0, "x420.EXTERNAL", HFILL }}, { &hf_x420_RelatedStoredFile_item, - { "RelatedStoredFile", "x420.RelatedStoredFile_item", + { "RelatedStoredFile item", "x420.RelatedStoredFile_item", FT_NONE, BASE_NONE, NULL, 0, "x420.RelatedStoredFile_item", HFILL }}, { &hf_x420_file_identifier, @@ -5333,7 +5333,7 @@ void proto_register_x420(void) { FT_UINT32, BASE_DEC, NULL, 0, "x420.T_user_visible_string", HFILL }}, { &hf_x420_user_visible_string_item, - { "user-visible-string", "x420.user_visible_string_item", + { "user-visible-string item", "x420.user_visible_string_item", FT_STRING, BASE_NONE, NULL, 0, "x420.GraphicString", HFILL }}, { &hf_x420_registered_identifier, @@ -5345,7 +5345,7 @@ void proto_register_x420(void) { FT_UINT32, BASE_DEC, NULL, 0, "x420.T_descriptive_identifier", HFILL }}, { &hf_x420_descriptive_identifier_item, - { "descriptive-identifier", "x420.descriptive_identifier_item", + { "descriptive-identifier item", "x420.descriptive_identifier_item", FT_STRING, BASE_NONE, NULL, 0, "x420.GraphicString", HFILL }}, { &hf_x420_compression_algorithm_id, @@ -5449,7 +5449,7 @@ void proto_register_x420(void) { FT_UINT32, BASE_DEC, NULL, 0, "x420.SET_OF_Access_Control_Element", HFILL }}, { &hf_x420_actual_values_item, - { "actual-values", "x420.actual_values_item", + { "Access-Control-Element", "x420.Access_Control_Element", FT_NONE, BASE_NONE, NULL, 0, "x420.Access_Control_Element", HFILL }}, { &hf_x420_action_list, @@ -5521,7 +5521,7 @@ void proto_register_x420(void) { FT_BYTES, BASE_HEX, NULL, 0, "x420.OCTET_STRING", HFILL }}, { &hf_x420_Pass_Passwords_item, - { "Pass-Passwords", "x420.Pass_Passwords_item", + { "Password", "x420.Password", FT_UINT32, BASE_DEC, VALS(x420_Password_vals), 0, "x420.Password", HFILL }}, { &hf_x420_ap_title, @@ -5565,7 +5565,7 @@ void proto_register_x420(void) { FT_NONE, BASE_NONE, NULL, 0, "x411.MessageSubmissionEnvelope", HFILL }}, { &hf_x420_IPMSynopsis_item, - { "IPMSynopsis", "x420.IPMSynopsis_item", + { "BodyPartSynopsis", "x420.BodyPartSynopsis", FT_UINT32, BASE_DEC, VALS(x420_BodyPartSynopsis_vals), 0, "x420.BodyPartSynopsis", HFILL }}, { &hf_x420_message_synopsis, @@ -5617,7 +5617,7 @@ void proto_register_x420(void) { FT_INT32, BASE_DEC, NULL, 0, "x420.INTEGER", HFILL }}, { &hf_x420_BodyPartSignatureVerification_item, - { "BodyPartSignatureVerification", "x420.BodyPartSignatureVerification_item", + { "BodyPartSignatureVerification item", "x420.BodyPartSignatureVerification_item", FT_NONE, BASE_NONE, NULL, 0, "x420.BodyPartSignatureVerification_item", HFILL }}, { &hf_x420_body_part_sequence_number, @@ -5633,7 +5633,7 @@ void proto_register_x420(void) { FT_UINT32, BASE_DEC, NULL, 0, "x420.SET_OF_SequenceNumber", HFILL }}, { &hf_x420_stored_item, - { "stored", "x420.stored_item", + { "SequenceNumber", "x420.SequenceNumber", FT_UINT32, BASE_DEC, NULL, 0, "p7.SequenceNumber", HFILL }}, { &hf_x420_absent, @@ -5649,7 +5649,7 @@ void proto_register_x420(void) { FT_UINT32, BASE_DEC, NULL, 0, "x420.SEQUENCE_OF_SequenceNumber", HFILL }}, { &hf_x420_received_replies_item, - { "received-replies", "x420.received_replies_item", + { "SequenceNumber", "x420.SequenceNumber", FT_UINT32, BASE_DEC, NULL, 0, "p7.SequenceNumber", HFILL }}, { &hf_x420_no_ipn_received, @@ -5661,7 +5661,7 @@ void proto_register_x420(void) { FT_UINT32, BASE_DEC, NULL, 0, "x420.SEQUENCE_OF_SequenceNumber", HFILL }}, { &hf_x420_ipns_received_item, - { "ipns-received", "x420.ipns_received_item", + { "SequenceNumber", "x420.SequenceNumber", FT_UINT32, BASE_DEC, NULL, 0, "p7.SequenceNumber", HFILL }}, { &hf_x420_content_or_arguments, @@ -5693,7 +5693,7 @@ void proto_register_x420(void) { FT_INT32, BASE_DEC, VALS(x420_SecurityDiagnosticCode_vals), 0, "x420.SecurityDiagnosticCode", HFILL }}, { &hf_x420_BodyPartTokens_item, - { "BodyPartTokens", "x420.BodyPartTokens_item", + { "BodyPartTokens item", "x420.BodyPartTokens_item", FT_NONE, BASE_NONE, NULL, 0, "x420.BodyPartTokens_item", HFILL }}, { &hf_x420_body_part_choice, @@ -5725,7 +5725,7 @@ void proto_register_x420(void) { FT_NONE, BASE_NONE, NULL, 0, "x509af.Certificates", HFILL }}, { &hf_x420_ForwardedContentToken_item, - { "ForwardedContentToken", "x420.ForwardedContentToken_item", + { "ForwardedContentToken item", "x420.ForwardedContentToken_item", FT_NONE, BASE_NONE, NULL, 0, "x420.ForwardedContentToken_item", HFILL }}, { &hf_x420_body_part_token_choice, -- cgit v1.2.3