Regenerate with the latest asn2eth, to get FT_OID used, and to add #line.

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

1 files changed, 48 insertions, 25 deletions

diff --git a/epan/dissectors/packet-acse.c b/epan/dissectors/packet-acse.c
index 86b2078e5c..4452ec806d 100644
--- a/epan/dissectors/packet-acse.c
+++ b/epan/dissectors/packet-acse.c
@@ -1,10 +1,11 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-acse.c                                                            */
+/* ./packet-acse.c                                                            */
 /* ../../tools/asn2eth.py -X -b -e -p acse -c acse.cnf -s packet-acse-template acse.asn */
 
 /* Input file: packet-acse-template.c */
 
+#line 1 "packet-acse-template.c"
 /*XXX
   There is a bug in asn2eth that it can not yet handle tagged assignments such
   as EXTERNAL  ::=  [UNIVERSAL 8] IMPLICIT SEQUENCE {
@@ -69,7 +70,7 @@
 int proto_acse = -1;
 
 /*--- Included file: packet-acse-hf.c ---*/
-
+#line 1 "packet-acse-hf.c"
 static int hf_acse_direct_reference = -1;         /* T_direct_reference */
 static int hf_acse_indirect_reference = -1;       /* T_indirect_reference */
 static int hf_acse_data_value_descriptor = -1;    /* ObjectDescriptor */
@@ -178,13 +179,13 @@ static int hf_acse_ACSE_requirements_higher_level_association = -1;
 static int hf_acse_ACSE_requirements_nested_association = -1;
 
 /*--- End of included file: packet-acse-hf.c ---*/
-
+#line 64 "packet-acse-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_acse = -1;
 
 /*--- Included file: packet-acse-ett.c ---*/
-
+#line 1 "packet-acse-ett.c"
 static gint ett_acse_EXTERNAL = -1;
 static gint ett_acse_T_encoding = -1;
 static gint ett_acse_ACSE_apdu = -1;
@@ -222,7 +223,7 @@ static gint ett_acse_Authentication_value_other = -1;
 static gint ett_acse_Authentication_value = -1;
 
 /*--- End of included file: packet-acse-ett.c ---*/
-
+#line 68 "packet-acse-template.c"
 
 static struct SESSION_DATA_STRUCTURE* session = NULL;
 
@@ -300,7 +301,7 @@ find_oid_by_ctx_id(packet_info *pinfo _U_, guint32 idx)
 
 
 /*--- Included file: packet-acse-fn.c ---*/
-
+#line 1 "packet-acse-fn.c"
 /*--- Fields for imported types ---*/
 
 
@@ -320,6 +321,7 @@ static int dissect_direct_reference(packet_info *pinfo, proto_tree *tree, tvbuff
 
 static int
 dissect_acse_T_indirect_reference(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 86 "acse.cnf"
   char *oid;
   offset = dissect_ber_integer(FALSE, pinfo, tree, tvb, offset,
                 hf_acse_indirect_reference,
@@ -334,6 +336,7 @@ dissect_acse_T_indirect_reference(gboolean implicit_tag _U_, tvbuff_t *tvb, int
 	session->pres_ctx_id = indir_ref;
 
 
+
   return offset;
 }
 static int dissect_indirect_reference(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -358,9 +361,11 @@ static int dissect_data_value_descriptor(packet_info *pinfo, proto_tree *tree, t
 
 static int
 dissect_acse_T_single_ASN1_type(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 103 "acse.cnf"
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, top_tree ? top_tree : tree);
 
 
+
   return offset;
 }
 static int dissect_single_ASN1_type(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -435,6 +440,7 @@ static const ber_sequence_t EXTERNAL_sequence[] = {
 
 int
 dissect_acse_EXTERNAL(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 44 "acse.cnf"
   gint8 class;
   gboolean pc, ind_field;
   gint32 tag;
@@ -452,6 +458,7 @@ dissect_acse_EXTERNAL(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pack
                                 EXTERNAL_sequence, hf_index, ett_acse_EXTERNAL);
 
 
+
   return offset;
 }
 static int dissect_Association_data_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -495,10 +502,12 @@ static int dissect_ASO_context_name_list_item(packet_info *pinfo, proto_tree *tr
 
 static int
 dissect_acse_T_AARQ_aSO_context_name(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 70 "acse.cnf"
   offset = dissect_ber_object_identifier_str(FALSE, pinfo, tree, tvb, offset,
                                          hf_index, &object_identifier_id);
 
 
+
   return offset;
 }
 static int dissect_aARQ_aSO_context_name(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -773,9 +782,11 @@ static int dissect_other_mechanism_name(packet_info *pinfo, proto_tree *tree, tv
 
 static int
 dissect_acse_T_other_mechanism_value(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 64 "acse.cnf"
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, top_tree);
 
 
+
   return offset;
 }
 static int dissect_other_mechanism_value(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -1159,10 +1170,12 @@ static int dissect_aARE_protocol_version_impl(packet_info *pinfo, proto_tree *tr
 
 static int
 dissect_acse_T_AARE_aSO_context_name(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 74 "acse.cnf"
   offset = dissect_ber_object_identifier_str(FALSE, pinfo, tree, tvb, offset,
                                          hf_index, &object_identifier_id);
 
 
+
   return offset;
 }
 static int dissect_aARE_aSO_context_name(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -1398,6 +1411,7 @@ static const value_string acse_Release_request_reason_vals[] = {
 
 static int
 dissect_acse_Release_request_reason(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 109 "acse.cnf"
   int reason = -1;
  
     offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
@@ -1409,6 +1423,7 @@ dissect_acse_Release_request_reason(gboolean implicit_tag _U_, tvbuff_t *tvb, in
 
 
 
+
   return offset;
 }
 static int dissect_rLRQ_reason_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -1446,6 +1461,7 @@ static const value_string acse_Release_response_reason_vals[] = {
 
 static int
 dissect_acse_Release_response_reason(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 121 "acse.cnf"
   int reason = -1;
  
     offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
@@ -1459,6 +1475,7 @@ dissect_acse_Release_response_reason(gboolean implicit_tag _U_, tvbuff_t *tvb, i
 
 
 
+
   return offset;
 }
 static int dissect_rLRE_reason_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -1580,9 +1597,11 @@ static int dissect_simply_encoded_data(packet_info *pinfo, proto_tree *tree, tvb
 
 static int
 dissect_acse_T_simple_ASN1_type(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 67 "acse.cnf"
 /*XXX not implemented yet */
 
 
+
   return offset;
 }
 static int dissect_simple_ASN1_type(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -1685,10 +1704,12 @@ static int dissect_adt_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
 
 static int
 dissect_acse_T_ACRQ_aSO_context_name(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 78 "acse.cnf"
   offset = dissect_ber_object_identifier_str(FALSE, pinfo, tree, tvb, offset,
                                          hf_index, &object_identifier_id);
 
 
+
   return offset;
 }
 static int dissect_aCRQ_aSO_context_name_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -1721,10 +1742,12 @@ static int dissect_acrq_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
 
 static int
 dissect_acse_T_ACRP_aSO_context_name(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 82 "acse.cnf"
   offset = dissect_ber_object_identifier_str(FALSE, pinfo, tree, tvb, offset,
                                          hf_index, &object_identifier_id);
 
 
+
   return offset;
 }
 static int dissect_aSO_context_name_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -1852,7 +1875,7 @@ dissect_acse_AE_title(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pack
 
 
 /*--- End of included file: packet-acse-fn.c ---*/
-
+#line 144 "packet-acse-template.c"
 
 
 /*
@@ -1958,10 +1981,10 @@ void proto_register_acse(void) {
   static hf_register_info hf[] = {
 
 /*--- Included file: packet-acse-hfarr.c ---*/
-
+#line 1 "packet-acse-hfarr.c"
     { &hf_acse_direct_reference,
       { "direct-reference", "acse.direct_reference",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "EXTERNAL/direct-reference", HFILL }},
     { &hf_acse_indirect_reference,
       { "indirect-reference", "acse.indirect_reference",
@@ -2025,7 +2048,7 @@ void proto_register_acse(void) {
         "AARQ-apdu/protocol-version", HFILL }},
     { &hf_acse_aARQ_aSO_context_name,
       { "aSO-context-name", "acse.aSO_context_name",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "AARQ-apdu/aSO-context-name", HFILL }},
     { &hf_acse_called_AP_title,
       { "called-AP-title", "acse.called_AP_title",
@@ -2065,7 +2088,7 @@ void proto_register_acse(void) {
         "AARQ-apdu/sender-acse-requirements", HFILL }},
     { &hf_acse_mechanism_name,
       { "mechanism-name", "acse.mechanism_name",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "", HFILL }},
     { &hf_acse_calling_authentication_value,
       { "calling-authentication-value", "acse.calling_authentication_value",
@@ -2101,7 +2124,7 @@ void proto_register_acse(void) {
         "AARE-apdu/protocol-version", HFILL }},
     { &hf_acse_aARE_aSO_context_name,
       { "aSO-context-name", "acse.aSO_context_name",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "AARE-apdu/aSO-context-name", HFILL }},
     { &hf_acse_aARE_result,
       { "result", "acse.result",
@@ -2185,7 +2208,7 @@ void proto_register_acse(void) {
         "A-DT-apdu/a-user-data", HFILL }},
     { &hf_acse_aCRQ_aSO_context_name,
       { "aSO-context-name", "acse.aSO_context_name",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "ACRQ-apdu/aSO-context-name", HFILL }},
     { &hf_acse_user_information,
       { "user-information", "acse.user_information",
@@ -2201,7 +2224,7 @@ void proto_register_acse(void) {
         "AP-title/ap-title-form1", HFILL }},
     { &hf_acse_ap_title_form2,
       { "ap-title-form2", "acse.ap_title_form2",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "AP-title/ap-title-form2", HFILL }},
     { &hf_acse_ap_title_form3,
       { "ap-title-form3", "acse.ap_title_form3",
@@ -2225,7 +2248,7 @@ void proto_register_acse(void) {
         "AE-title/ae-title-form1", HFILL }},
     { &hf_acse_ae_title_form2,
       { "ae-title-form2", "acse.ae_title_form2",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "AE-title/ae-title-form2", HFILL }},
     { &hf_acse_ASOI_tag_item,
       { "Item", "acse.ASOI_tag_item",
@@ -2241,7 +2264,7 @@ void proto_register_acse(void) {
         "ASOI-tag/_item/identifier", HFILL }},
     { &hf_acse_ASO_context_name_list_item,
       { "Item", "acse.ASO_context_name_list_item",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "ASO-context-name-list/_item", HFILL }},
     { &hf_acse_context_list,
       { "context-list", "acse.context_list",
@@ -2261,7 +2284,7 @@ void proto_register_acse(void) {
         "Context-list/_item/pci", HFILL }},
     { &hf_acse_abstract_syntax,
       { "abstract-syntax", "acse.abstract_syntax",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "Context-list/_item/abstract-syntax", HFILL }},
     { &hf_acse_transfer_syntaxes,
       { "transfer-syntaxes", "acse.transfer_syntaxes",
@@ -2269,7 +2292,7 @@ void proto_register_acse(void) {
         "Context-list/_item/transfer-syntaxes", HFILL }},
     { &hf_acse_transfer_syntaxes_item,
       { "Item", "acse.transfer_syntaxes_item",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "Context-list/_item/transfer-syntaxes/_item", HFILL }},
     { &hf_acse_Default_Context_List_item,
       { "Item", "acse.Default_Context_List_item",
@@ -2277,11 +2300,11 @@ void proto_register_acse(void) {
         "Default-Context-List/_item", HFILL }},
     { &hf_acse_abstract_syntax_name,
       { "abstract-syntax-name", "acse.abstract_syntax_name",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "Default-Context-List/_item/abstract-syntax-name", HFILL }},
     { &hf_acse_transfer_syntax_name,
       { "transfer-syntax-name", "acse.transfer_syntax_name",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "", HFILL }},
     { &hf_acse_P_context_result_list_item,
       { "Item", "acse.P_context_result_list_item",
@@ -2293,7 +2316,7 @@ void proto_register_acse(void) {
         "P-context-result-list/_item/result", HFILL }},
     { &hf_acse_concrete_syntax_name,
       { "concrete-syntax-name", "acse.concrete_syntax_name",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "P-context-result-list/_item/concrete-syntax-name", HFILL }},
     { &hf_acse_provider_reason,
       { "provider-reason", "acse.provider_reason",
@@ -2333,7 +2356,7 @@ void proto_register_acse(void) {
         "PDV-list/presentation-data-values/simple-ASN1-type", HFILL }},
     { &hf_acse_other_mechanism_name,
       { "other-mechanism-name", "acse.other_mechanism_name",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "Authentication-value-other/other-mechanism-name", HFILL }},
     { &hf_acse_other_mechanism_value,
       { "other-mechanism-value", "acse.other_mechanism_value",
@@ -2381,7 +2404,7 @@ void proto_register_acse(void) {
         "", HFILL }},
 
 /*--- End of included file: packet-acse-hfarr.c ---*/
-
+#line 248 "packet-acse-template.c"
   };
 
   /* List of subtrees */
@@ -2389,7 +2412,7 @@ void proto_register_acse(void) {
     &ett_acse,
 
 /*--- Included file: packet-acse-ettarr.c ---*/
-
+#line 1 "packet-acse-ettarr.c"
     &ett_acse_EXTERNAL,
     &ett_acse_T_encoding,
     &ett_acse_ACSE_apdu,
@@ -2427,7 +2450,7 @@ void proto_register_acse(void) {
     &ett_acse_Authentication_value,
 
 /*--- End of included file: packet-acse-ettarr.c ---*/
-
+#line 254 "packet-acse-template.c"
   };
 
   /* Register protocol */