ASN.1 dissectors regenerated with new asn2wrs to get updated field blurb

svn path=/trunk/; revision=18921

1 files changed, 59 insertions, 59 deletions

diff --git a/epan/dissectors/packet-s4406.c b/epan/dissectors/packet-s4406.c
index 6f2eb14596..a157880792 100644
--- a/epan/dissectors/packet-s4406.c
+++ b/epan/dissectors/packet-s4406.c
@@ -1,6 +1,6 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
-/* ./packet-s4406.c                                                           */
+/* .\packet-s4406.c                                                           */
 /* ../../tools/asn2wrs.py -b -e -p s4406 -c s4406.cnf -s packet-s4406-template s4406.asn */
 
 /* Input file: packet-s4406-template.c */
@@ -985,235 +985,235 @@ void proto_register_s4406(void) {
     { &hf_s4406_InformationObject_PDU,
       { "InformationObject", "s4406.InformationObject",
         FT_UINT32, BASE_DEC, VALS(x420_InformationObject_vals), 0,
-        "InformationObject", HFILL }},
+        "s4406.InformationObject", HFILL }},
     { &hf_s4406_MMMessageData_PDU,
       { "MMMessageData", "s4406.MMMessageData",
         FT_NONE, BASE_NONE, NULL, 0,
-        "MMMessageData", HFILL }},
+        "s4406.MMMessageData", HFILL }},
     { &hf_s4406_MMMessageParameters_PDU,
       { "MMMessageParameters", "s4406.MMMessageParameters",
         FT_NONE, BASE_NONE, NULL, 0,
-        "MMMessageParameters", HFILL }},
+        "s4406.MMMessageParameters", HFILL }},
     { &hf_s4406_ExemptedAddressSeq_PDU,
       { "ExemptedAddressSeq", "s4406.ExemptedAddressSeq",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ExemptedAddressSeq", HFILL }},
+        "s4406.ExemptedAddressSeq", HFILL }},
     { &hf_s4406_ExemptedAddress_PDU,
       { "ExemptedAddress", "s4406.ExemptedAddress",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ExemptedAddress", HFILL }},
+        "s4406.ExemptedAddress", HFILL }},
     { &hf_s4406_ExtendedAuthorisationInfo_PDU,
       { "ExtendedAuthorisationInfo", "s4406.ExtendedAuthorisationInfo",
         FT_STRING, BASE_NONE, NULL, 0,
-        "ExtendedAuthorisationInfo", HFILL }},
+        "s4406.ExtendedAuthorisationInfo", HFILL }},
     { &hf_s4406_DistributionCodes_PDU,
       { "DistributionCodes", "s4406.DistributionCodes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "DistributionCodes", HFILL }},
+        "s4406.DistributionCodes", HFILL }},
     { &hf_s4406_HandlingInstructions_PDU,
       { "HandlingInstructions", "s4406.HandlingInstructions",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "HandlingInstructions", HFILL }},
+        "s4406.HandlingInstructions", HFILL }},
     { &hf_s4406_MessageInstructions_PDU,
       { "MessageInstructions", "s4406.MessageInstructions",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "MessageInstructions", HFILL }},
+        "s4406.MessageInstructions", HFILL }},
     { &hf_s4406_CodressMessage_PDU,
       { "CodressMessage", "s4406.CodressMessage",
         FT_INT32, BASE_DEC, NULL, 0,
-        "CodressMessage", HFILL }},
+        "s4406.CodressMessage", HFILL }},
     { &hf_s4406_OriginatorReference_PDU,
       { "OriginatorReference", "s4406.OriginatorReference",
         FT_STRING, BASE_NONE, NULL, 0,
-        "OriginatorReference", HFILL }},
+        "s4406.OriginatorReference", HFILL }},
     { &hf_s4406_PrimaryPrecedence_PDU,
       { "PrimaryPrecedence", "s4406.PrimaryPrecedence",
         FT_INT32, BASE_DEC, VALS(s4406_PrimaryPrecedence_vals), 0,
-        "PrimaryPrecedence", HFILL }},
+        "s4406.PrimaryPrecedence", HFILL }},
     { &hf_s4406_CopyPrecedence_PDU,
       { "CopyPrecedence", "s4406.CopyPrecedence",
         FT_INT32, BASE_DEC, VALS(s4406_CopyPrecedence_vals), 0,
-        "CopyPrecedence", HFILL }},
+        "s4406.CopyPrecedence", HFILL }},
     { &hf_s4406_MessageType_PDU,
       { "MessageType", "s4406.MessageType",
         FT_NONE, BASE_NONE, NULL, 0,
-        "MessageType", HFILL }},
+        "s4406.MessageType", HFILL }},
     { &hf_s4406_AddressListDesignatorSeq_PDU,
       { "AddressListDesignatorSeq", "s4406.AddressListDesignatorSeq",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "AddressListDesignatorSeq", HFILL }},
+        "s4406.AddressListDesignatorSeq", HFILL }},
     { &hf_s4406_AddressListDesignator_PDU,
       { "AddressListDesignator", "s4406.AddressListDesignator",
         FT_NONE, BASE_NONE, NULL, 0,
-        "AddressListDesignator", HFILL }},
+        "s4406.AddressListDesignator", HFILL }},
     { &hf_s4406_OtherRecipientDesignatorSeq_PDU,
       { "OtherRecipientDesignatorSeq", "s4406.OtherRecipientDesignatorSeq",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "OtherRecipientDesignatorSeq", HFILL }},
+        "s4406.OtherRecipientDesignatorSeq", HFILL }},
     { &hf_s4406_OtherRecipientDesignator_PDU,
       { "OtherRecipientDesignator", "s4406.OtherRecipientDesignator",
         FT_NONE, BASE_NONE, NULL, 0,
-        "OtherRecipientDesignator", HFILL }},
+        "s4406.OtherRecipientDesignator", HFILL }},
     { &hf_s4406_PilotInformationSeq_PDU,
       { "PilotInformationSeq", "s4406.PilotInformationSeq",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "PilotInformationSeq", HFILL }},
+        "s4406.PilotInformationSeq", HFILL }},
     { &hf_s4406_PilotInformation_PDU,
       { "PilotInformation", "s4406.PilotInformation",
         FT_NONE, BASE_NONE, NULL, 0,
-        "PilotInformation", HFILL }},
+        "s4406.PilotInformation", HFILL }},
     { &hf_s4406_Acp127MessageIdentifier_PDU,
       { "Acp127MessageIdentifier", "s4406.Acp127MessageIdentifier",
         FT_STRING, BASE_NONE, NULL, 0,
-        "Acp127MessageIdentifier", HFILL }},
+        "s4406.Acp127MessageIdentifier", HFILL }},
     { &hf_s4406_OriginatorPlad_PDU,
       { "OriginatorPlad", "s4406.OriginatorPlad",
         FT_STRING, BASE_NONE, NULL, 0,
-        "OriginatorPlad", HFILL }},
+        "s4406.OriginatorPlad", HFILL }},
     { &hf_s4406_Acp127NotificationType_PDU,
       { "Acp127NotificationType", "s4406.Acp127NotificationType",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "Acp127NotificationType", HFILL }},
+        "s4406.Acp127NotificationType", HFILL }},
     { &hf_s4406_SecurityInformationLabels_PDU,
       { "SecurityInformationLabels", "s4406.SecurityInformationLabels",
         FT_NONE, BASE_NONE, NULL, 0,
-        "SecurityInformationLabels", HFILL }},
+        "s4406.SecurityInformationLabels", HFILL }},
     { &hf_s4406_PriorityLevelQualifier_PDU,
       { "PriorityLevelQualifier", "s4406.PriorityLevelQualifier",
         FT_UINT32, BASE_DEC, VALS(s4406_PriorityLevelQualifier_vals), 0,
-        "PriorityLevelQualifier", HFILL }},
+        "s4406.PriorityLevelQualifier", HFILL }},
     { &hf_s4406_mm,
       { "mm", "s4406.mm",
         FT_NONE, BASE_NONE, NULL, 0,
-        "InformationObject/mm", HFILL }},
+        "x420.IPM", HFILL }},
     { &hf_s4406_mn,
       { "mn", "s4406.mn",
         FT_NONE, BASE_NONE, NULL, 0,
-        "InformationObject/mn", HFILL }},
+        "x420.IPN", HFILL }},
     { &hf_s4406_sics,
       { "sics", "s4406.sics",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "DistributionCodes/sics", HFILL }},
+        "s4406.SEQUENCE_OF_Sic", HFILL }},
     { &hf_s4406_sics_item,
       { "Item", "s4406.sics_item",
         FT_STRING, BASE_NONE, NULL, 0,
-        "DistributionCodes/sics/_item", HFILL }},
+        "s4406.Sic", HFILL }},
     { &hf_s4406_dist_Extensions,
       { "dist-Extensions", "s4406.dist_Extensions",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "DistributionCodes/dist-Extensions", HFILL }},
+        "s4406.SEQUENCE_OF_DistributionExtensionField", HFILL }},
     { &hf_s4406_dist_Extensions_item,
       { "Item", "s4406.dist_Extensions_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "DistributionCodes/dist-Extensions/_item", HFILL }},
+        "s4406.DistributionExtensionField", HFILL }},
     { &hf_s4406_dist_type,
       { "dist-type", "s4406.dist_type",
         FT_OID, BASE_NONE, NULL, 0,
-        "DistributionExtensionField/dist-type", HFILL }},
+        "s4406.OBJECT_IDENTIFIER", HFILL }},
     { &hf_s4406_dist_value,
       { "dist-value", "s4406.dist_value",
         FT_NONE, BASE_NONE, NULL, 0,
-        "DistributionExtensionField/dist-value", HFILL }},
+        "s4406.T_dist_value", HFILL }},
     { &hf_s4406_HandlingInstructions_item,
       { "Item", "s4406.HandlingInstructions_item",
         FT_STRING, BASE_NONE, NULL, 0,
-        "HandlingInstructions/_item", HFILL }},
+        "s4406.MilitaryString", HFILL }},
     { &hf_s4406_MessageInstructions_item,
       { "Item", "s4406.MessageInstructions_item",
         FT_STRING, BASE_NONE, NULL, 0,
-        "MessageInstructions/_item", HFILL }},
+        "s4406.MilitaryString", HFILL }},
     { &hf_s4406_message_type_type,
       { "type", "s4406.type",
         FT_INT32, BASE_DEC, VALS(s4406_TypeMessage_vals), 0,
-        "MessageType/type", HFILL }},
+        "s4406.TypeMessage", HFILL }},
     { &hf_s4406_identifier,
       { "identifier", "s4406.identifier",
         FT_STRING, BASE_NONE, NULL, 0,
-        "MessageType/identifier", HFILL }},
+        "s4406.MessageIdentifier", HFILL }},
     { &hf_s4406_AddressListDesignatorSeq_item,
       { "Item", "s4406.AddressListDesignatorSeq_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "AddressListDesignatorSeq/_item", HFILL }},
+        "s4406.AddressListDesignator", HFILL }},
     { &hf_s4406_address_list_type,
       { "type", "s4406.type",
         FT_INT32, BASE_DEC, VALS(s4406_AddressListType_vals), 0,
-        "AddressListDesignator/type", HFILL }},
+        "s4406.AddressListType", HFILL }},
     { &hf_s4406_listName,
       { "listName", "s4406.listName",
         FT_NONE, BASE_NONE, NULL, 0,
-        "AddressListDesignator/listName", HFILL }},
+        "x420.ORDescriptor", HFILL }},
     { &hf_s4406_notificationRequest,
       { "notificationRequest", "s4406.notificationRequest",
         FT_INT32, BASE_DEC, VALS(s4406_AddressListRequest_vals), 0,
-        "AddressListDesignator/notificationRequest", HFILL }},
+        "s4406.AddressListRequest", HFILL }},
     { &hf_s4406_replyRequest,
       { "replyRequest", "s4406.replyRequest",
         FT_INT32, BASE_DEC, VALS(s4406_AddressListRequest_vals), 0,
-        "AddressListDesignator/replyRequest", HFILL }},
+        "s4406.AddressListRequest", HFILL }},
     { &hf_s4406_OtherRecipientDesignatorSeq_item,
       { "Item", "s4406.OtherRecipientDesignatorSeq_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "OtherRecipientDesignatorSeq/_item", HFILL }},
+        "s4406.OtherRecipientDesignator", HFILL }},
     { &hf_s4406_other_recipient_type,
       { "type", "s4406.type",
         FT_INT32, BASE_DEC, VALS(s4406_OtherRecipientType_vals), 0,
-        "OtherRecipientDesignator/type", HFILL }},
+        "s4406.OtherRecipientType", HFILL }},
     { &hf_s4406_designator,
       { "designator", "s4406.designator",
         FT_STRING, BASE_NONE, NULL, 0,
-        "OtherRecipientDesignator/designator", HFILL }},
+        "s4406.MilitaryString", HFILL }},
     { &hf_s4406_PilotInformationSeq_item,
       { "Item", "s4406.PilotInformationSeq_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "PilotInformationSeq/_item", HFILL }},
+        "s4406.PilotInformation", HFILL }},
     { &hf_s4406_pilotPrecedence,
       { "pilotPrecedence", "s4406.pilotPrecedence",
         FT_INT32, BASE_DEC, VALS(s4406_PilotPrecedence_vals), 0,
-        "PilotInformation/pilotPrecedence", HFILL }},
+        "s4406.PilotPrecedence", HFILL }},
     { &hf_s4406_pilotRecipient,
       { "pilotRecipient", "s4406.pilotRecipient",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "PilotInformation/pilotRecipient", HFILL }},
+        "s4406.SEQUENCE_OF_ORDescriptor", HFILL }},
     { &hf_s4406_pilotRecipient_item,
       { "Item", "s4406.pilotRecipient_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "PilotInformation/pilotRecipient/_item", HFILL }},
+        "x420.ORDescriptor", HFILL }},
     { &hf_s4406_pilotSecurity,
       { "pilotSecurity", "s4406.pilotSecurity",
         FT_NONE, BASE_NONE, NULL, 0,
-        "PilotInformation/pilotSecurity", HFILL }},
+        "x411.SecurityLabel", HFILL }},
     { &hf_s4406_pilotHandling,
       { "pilotHandling", "s4406.pilotHandling",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "PilotInformation/pilotHandling", HFILL }},
+        "s4406.SEQUENCE_OF_MilitaryString", HFILL }},
     { &hf_s4406_pilotHandling_item,
       { "Item", "s4406.pilotHandling_item",
         FT_STRING, BASE_NONE, NULL, 0,
-        "PilotInformation/pilotHandling/_item", HFILL }},
+        "s4406.MilitaryString", HFILL }},
     { &hf_s4406_content_security_label,
       { "content-security-label", "s4406.content_security_label",
         FT_NONE, BASE_NONE, NULL, 0,
-        "SecurityInformationLabels/content-security-label", HFILL }},
+        "x411.SecurityLabel", HFILL }},
     { &hf_s4406_heading_security_label,
       { "heading-security-label", "s4406.heading_security_label",
         FT_NONE, BASE_NONE, NULL, 0,
-        "SecurityInformationLabels/heading-security-label", HFILL }},
+        "x411.SecurityLabel", HFILL }},
     { &hf_s4406_body_part_security_labels,
       { "body-part-security-labels", "s4406.body_part_security_labels",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "SecurityInformationLabels/body-part-security-labels", HFILL }},
+        "s4406.SEQUENCE_OF_BodyPartSecurityLabel", HFILL }},
     { &hf_s4406_body_part_security_labels_item,
       { "Item", "s4406.body_part_security_labels_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "SecurityInformationLabels/body-part-security-labels/_item", HFILL }},
+        "s4406.BodyPartSecurityLabel", HFILL }},
     { &hf_s4406_body_part_security_label,
       { "body-part-security-label", "s4406.body_part_security_label",
         FT_NONE, BASE_NONE, NULL, 0,
-        "BodyPartSecurityLabel/body-part-security-label", HFILL }},
+        "x411.SecurityLabel", HFILL }},
     { &hf_s4406_body_part_sequence_number,
       { "body-part-sequence-number", "s4406.body_part_sequence_number",
         FT_INT32, BASE_DEC, NULL, 0,
-        "BodyPartSecurityLabel/body-part-sequence-number", HFILL }},
+        "s4406.BodyPartSequenceNumber", HFILL }},
     { &hf_s4406_Acp127NotificationType_negative,
       { "negative", "s4406.negative",
         FT_BOOLEAN, 8, NULL, 0x80,