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

svn path=/trunk/; revision=16736

75 files changed, 1345 insertions, 747 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 */
diff --git a/epan/dissectors/packet-acse.h b/epan/dissectors/packet-acse.h
index 595d67750d..dd679fdd04 100644
--- a/epan/dissectors/packet-acse.h
+++ b/epan/dissectors/packet-acse.h
@@ -1,10 +1,11 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-acse.h                                                            */
+/* ./packet-acse.h                                                            */
 /* ../../tools/asn2eth.py -X -b -e -p acse -c acse.cnf -s packet-acse-template acse.asn */
 
 /* Input file: packet-acse-template.h */
 
+#line 1 "packet-acse-template.h"
 /* packet-acse.h
  * Routines for ACSE packet dissection
  *   Ronnie Sahlberg 2005
@@ -35,7 +36,7 @@
 
 
 /*--- Included file: packet-acse-exp.h ---*/
-
+#line 1 "packet-acse-exp.h"
 extern const value_string acse_AP_title_vals[];
 extern const value_string acse_ASO_qualifier_vals[];
 int dissect_acse_EXTERNAL(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
@@ -46,7 +47,7 @@ int dissect_acse_AE_invocation_identifier(gboolean implicit_tag, tvbuff_t *tvb,
 int dissect_acse_AP_invocation_identifier(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
 
 /*--- End of included file: packet-acse-exp.h ---*/
-
+#line 30 "packet-acse-template.h"
 
 #endif  /* PACKET_ACSE_H */
 
diff --git a/epan/dissectors/packet-cdt.c b/epan/dissectors/packet-cdt.c
index 1183b773fd..db17a8ded1 100644
--- a/epan/dissectors/packet-cdt.c
+++ b/epan/dissectors/packet-cdt.c
@@ -1,10 +1,11 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-cdt.c                                                             */
+/* ./packet-cdt.c                                                             */
 /* ../../tools/asn2eth.py -X -b -e -p cdt -c cdt.cnf -s packet-cdt-template cdt.asn */
 
 /* Input file: packet-cdt-template.c */
 
+#line 1 "packet-cdt-template.c"
 /* packet-cdt.c
  *
  * Routines for Compressed Data Type packet dissection.
@@ -54,7 +55,7 @@ static proto_item *cdt_item = NULL;
 int proto_cdt = -1;
 
 /*--- Included file: packet-cdt-hf.c ---*/
-
+#line 1 "packet-cdt-hf.c"
 static int hf_cdt_CompressedData_PDU = -1;        /* CompressedData */
 static int hf_cdt_compressionAlgorithm = -1;      /* CompressionAlgorithmIdentifier */
 static int hf_cdt_compressedContentInfo = -1;     /* CompressedContentInfo */
@@ -66,23 +67,23 @@ static int hf_cdt_contentType_OID = -1;           /* OBJECT_IDENTIFIER */
 static int hf_cdt_compressedContent = -1;         /* CompressedContent */
 
 /*--- End of included file: packet-cdt-hf.c ---*/
-
+#line 49 "packet-cdt-template.c"
 
 /* Initialize the subtree pointers */
 
 /*--- Included file: packet-cdt-ett.c ---*/
-
+#line 1 "packet-cdt-ett.c"
 static gint ett_cdt_CompressedData = -1;
 static gint ett_cdt_CompressionAlgorithmIdentifier = -1;
 static gint ett_cdt_CompressedContentInfo = -1;
 static gint ett_cdt_T_contentType = -1;
 
 /*--- End of included file: packet-cdt-ett.c ---*/
-
+#line 52 "packet-cdt-template.c"
 
 
 /*--- Included file: packet-cdt-fn.c ---*/
-
+#line 1 "packet-cdt-fn.c"
 /*--- Fields for imported types ---*/
 
 
@@ -95,6 +96,7 @@ static const value_string cdt_AlgorithmID_ShortForm_vals[] = {
 
 static int
 dissect_cdt_AlgorithmID_ShortForm(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 16 "cdt.cnf"
   guint32 value;
 
     offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
@@ -110,6 +112,7 @@ dissect_cdt_AlgorithmID_ShortForm(gboolean implicit_tag _U_, tvbuff_t *tvb, int
                                  "unknown"));
 
 
+
   return offset;
 }
 static int dissect_algorithmID_ShortForm_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -120,6 +123,7 @@ static int dissect_algorithmID_ShortForm_impl(packet_info *pinfo, proto_tree *tr
 
 static int
 dissect_cdt_OBJECT_IDENTIFIER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 48 "cdt.cnf"
   const char *obj_id = NULL;
 
     offset = dissect_ber_object_identifier_str(implicit_tag, pinfo, tree, tvb, offset, hf_index, &obj_id);
@@ -138,6 +142,7 @@ dissect_cdt_OBJECT_IDENTIFIER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs
   }
 
 
+
   return offset;
 }
 static int dissect_algorithmID_OID_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -185,6 +190,7 @@ static const value_string cdt_ContentType_ShortForm_vals[] = {
 
 static int
 dissect_cdt_ContentType_ShortForm(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 32 "cdt.cnf"
   guint32 value;
 
     offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
@@ -200,6 +206,7 @@ dissect_cdt_ContentType_ShortForm(gboolean implicit_tag _U_, tvbuff_t *tvb, int
                                  "unknown"));
 
 
+
   return offset;
 }
 static int dissect_contentType_ShortForm_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -235,6 +242,7 @@ static int dissect_contentType(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
 
 static int
 dissect_cdt_CompressedContent(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 68 "cdt.cnf"
   tvbuff_t   *next_tvb = NULL, *compr_tvb = NULL;
   int         save_offset = offset;
 
@@ -267,6 +275,7 @@ dissect_cdt_CompressedContent(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs
   dissect_x411_mts_apdu (next_tvb, pinfo, top_tree);
   
 
+
   return offset;
 }
 static int dissect_compressedContent(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -314,7 +323,7 @@ static void dissect_CompressedData_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_
 
 
 /*--- End of included file: packet-cdt-fn.c ---*/
-
+#line 54 "packet-cdt-template.c"
 
 
 /*--- proto_register_cdt -------------------------------------------*/
@@ -348,7 +357,7 @@ void proto_register_cdt (void) {
   static hf_register_info hf[] = {
 
 /*--- Included file: packet-cdt-hfarr.c ---*/
-
+#line 1 "packet-cdt-hfarr.c"
     { &hf_cdt_CompressedData_PDU,
       { "CompressedData", "cdt.CompressedData",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -367,7 +376,7 @@ void proto_register_cdt (void) {
         "CompressionAlgorithmIdentifier/algorithmID-ShortForm", HFILL }},
     { &hf_cdt_algorithmID_OID,
       { "algorithmID-OID", "cdt.algorithmID_OID",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "CompressionAlgorithmIdentifier/algorithmID-OID", HFILL }},
     { &hf_cdt_contentType,
       { "contentType", "cdt.contentType",
@@ -379,7 +388,7 @@ void proto_register_cdt (void) {
         "CompressedContentInfo/contentType/contentType-ShortForm", HFILL }},
     { &hf_cdt_contentType_OID,
       { "contentType-OID", "cdt.contentType_OID",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "CompressedContentInfo/contentType/contentType-OID", HFILL }},
     { &hf_cdt_compressedContent,
       { "compressedContent", "cdt.compressedContent",
@@ -387,21 +396,21 @@ void proto_register_cdt (void) {
         "CompressedContentInfo/compressedContent", HFILL }},
 
 /*--- End of included file: packet-cdt-hfarr.c ---*/
-
+#line 86 "packet-cdt-template.c"
   };
 
   /* List of subtrees */
   static gint *ett[] = {
 
 /*--- Included file: packet-cdt-ettarr.c ---*/
-
+#line 1 "packet-cdt-ettarr.c"
     &ett_cdt_CompressedData,
     &ett_cdt_CompressionAlgorithmIdentifier,
     &ett_cdt_CompressedContentInfo,
     &ett_cdt_T_contentType,
 
 /*--- End of included file: packet-cdt-ettarr.c ---*/
-
+#line 91 "packet-cdt-template.c"
   };
 
   /* Register protocol */
@@ -418,10 +427,10 @@ void proto_register_cdt (void) {
 void proto_reg_handoff_cdt (void) {
 
 /*--- Included file: packet-cdt-dis-tab.c ---*/
-
+#line 1 "packet-cdt-dis-tab.c"
   register_ber_oid_dissector("1.3.26.0.4406.0.4.2", dissect_CompressedData_PDU, proto_cdt, "cdt");
 
 
 /*--- End of included file: packet-cdt-dis-tab.c ---*/
-
+#line 106 "packet-cdt-template.c"
 }
diff --git a/epan/dissectors/packet-cdt.h b/epan/dissectors/packet-cdt.h
index 5c5a724ac9..454d4ad362 100644
--- a/epan/dissectors/packet-cdt.h
+++ b/epan/dissectors/packet-cdt.h
@@ -1,10 +1,11 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-cdt.h                                                             */
+/* ./packet-cdt.h                                                             */
 /* ../../tools/asn2eth.py -X -b -e -p cdt -c cdt.cnf -s packet-cdt-template cdt.asn */
 
 /* Input file: packet-cdt-template.h */
 
+#line 1 "packet-cdt-template.h"
 /* packet-cdt.h
  *
  * Routines for Compressed Data Type packet dissection.
@@ -38,11 +39,11 @@
 void dissect_cdt (tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree);
 
 /*--- Included file: packet-cdt-exp.h ---*/
-
+#line 1 "packet-cdt-exp.h"
 int dissect_cdt_CompressedData(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
 
 /*--- End of included file: packet-cdt-exp.h ---*/
-
+#line 33 "packet-cdt-template.h"
 
 #endif  /* PACKET_CDT_H */
 
diff --git a/epan/dissectors/packet-cmip.c b/epan/dissectors/packet-cmip.c
index 8f993eae59..a5712cc62f 100644
--- a/epan/dissectors/packet-cmip.c
+++ b/epan/dissectors/packet-cmip.c
@@ -1,10 +1,11 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-cmip.c                                                            */
+/* ./packet-cmip.c                                                            */
 /* ../../tools/asn2eth.py -X -b -e -p cmip -c cmip.cnf -s packet-cmip-template CMIP.asn */
 
 /* Input file: packet-cmip-template.c */
 
+#line 1 "packet-cmip-template.c"
 /* packet-cmip.c
  * Routines for X.711 CMIP packet dissection
  *   Ronnie Sahlberg 2004
@@ -67,7 +68,7 @@ static int hf_ObjectClass = -1;
 static int hf_OperationalState = -1;
 
 /*--- Included file: packet-cmip-hf.c ---*/
-
+#line 1 "packet-cmip-hf.c"
 static int hf_cmip_modifyOperator = -1;           /* ModifyOperator */
 static int hf_cmip_attributeId = -1;              /* T_attributeId */
 static int hf_cmip_attributeValue = -1;           /* T_attributeValue */
@@ -211,13 +212,13 @@ static int hf_cmip_ProtocolVersion_version1 = -1;
 static int hf_cmip_ProtocolVersion_version2 = -1;
 
 /*--- End of included file: packet-cmip-hf.c ---*/
-
+#line 62 "packet-cmip-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_cmip = -1;
 
 /*--- Included file: packet-cmip-ett.c ---*/
-
+#line 1 "packet-cmip-ett.c"
 static gint ett_cmip_ModificationItem = -1;
 static gint ett_cmip_GetListError = -1;
 static gint ett_cmip_SET_OF_GetInfoStatus = -1;
@@ -290,7 +291,7 @@ static gint ett_cmip_CMIPUserInfo = -1;
 static gint ett_cmip_ProtocolVersion = -1;
 
 /*--- End of included file: packet-cmip-ett.c ---*/
-
+#line 66 "packet-cmip-template.c"
 
 static guint32 opcode;
 
@@ -316,7 +317,7 @@ static const char *objectclass_identifier_id;
 
 
 /*--- Included file: packet-cmip-fn.c ---*/
-
+#line 1 "packet-cmip-fn.c"
 /*--- Cyclic dependencies ---*/
 
 /* CMISFilter -> CMISFilter/and -> CMISFilter */
@@ -383,9 +384,11 @@ static int dissect_attributeId(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
 
 static int
 dissect_cmip_T_attributeValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 214 "cmip.cnf"
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree);
 
 
+
   return offset;
 }
 static int dissect_attributeValue(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -415,7 +418,9 @@ static int dissect_modificationList_item(packet_info *pinfo, proto_tree *tree, t
 
 static int
 dissect_cmip_T_ocglobalForm(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 179 "cmip.cnf"
   objectclassform = OBJECTCLASS_GLOBAL_FORM;
+
   offset = dissect_ber_object_identifier_str(implicit_tag, pinfo, tree, tvb, offset, hf_index, &objectclass_identifier_id);
 
   return offset;
@@ -428,8 +433,10 @@ static int dissect_ocglobalForm_impl(packet_info *pinfo, proto_tree *tree, tvbuf
 
 static int
 dissect_cmip_T_oclocalForm(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 184 "cmip.cnf"
   objectclassform = OBJECTCLASS_LOCAL_FORM;
 
+
   offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
                                   NULL);
 
@@ -483,9 +490,11 @@ static int dissect_id1(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int
 
 static int
 dissect_cmip_T_value1(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 102 "cmip.cnf"
     offset=call_ber_oid_callback(attributevalueassertion_id, tvb, offset, pinfo, tree);
 
 
+
   return offset;
 }
 static int dissect_value1(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -644,11 +653,13 @@ static int dissect_errorStatus(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
 
 static int
 dissect_cmip_T_globalForm(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 86 "cmip.cnf"
   attributeform = ATTRIBUTE_GLOBAL_FORM;
     offset = dissect_ber_object_identifier_str(implicit_tag, pinfo, tree, tvb, offset, hf_index, &attribute_identifier_id);
 
 
 
+
   return offset;
 }
 static int dissect_globalForm_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -659,10 +670,12 @@ static int dissect_globalForm_impl(packet_info *pinfo, proto_tree *tree, tvbuff_
 
 static int
 dissect_cmip_T_localForm(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 90 "cmip.cnf"
   attributeform = ATTRIBUTE_LOCAL_FORM;
   offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_cmip_localForm, NULL);
 
 
+
   return offset;
 }
 static int dissect_localForm_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -725,11 +738,13 @@ static int dissect_attributeIdError_impl(packet_info *pinfo, proto_tree *tree, t
 
 static int
 dissect_cmip_T_value(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 94 "cmip.cnf"
   /*XXX handle local form here */
   if(attributeform==ATTRIBUTE_GLOBAL_FORM){
     offset=call_ber_oid_callback(attribute_identifier_id, tvb, offset, pinfo, tree);
   }
 
+
   return offset;
 }
 static int dissect_value(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -883,9 +898,11 @@ static int dissect_attributeId2(packet_info *pinfo, proto_tree *tree, tvbuff_t *
 
 static int
 dissect_cmip_T_attributeValue1(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 226 "cmip.cnf"
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree);
 
 
+
   return offset;
 }
 static int dissect_attributeValue1(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -1107,9 +1124,11 @@ static int dissect_actionType3(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
 
 static int
 dissect_cmip_T_actionInfoArg(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 190 "cmip.cnf"
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree);
 
 
+
   return offset;
 }
 static int dissect_actionInfoArg(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -1153,9 +1172,11 @@ static int dissect_eventType1(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
 
 static int
 dissect_cmip_T_eventInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 241 "cmip.cnf"
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree);
 
 
+
   return offset;
 }
 static int dissect_eventInfo(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -1286,9 +1307,11 @@ static int dissect_errorId(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
 
 static int
 dissect_cmip_T_errorInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 220 "cmip.cnf"
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree);
 
 
+
   return offset;
 }
 static int dissect_errorInfo(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -1697,9 +1720,11 @@ static int dissect_actionType2(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
 
 static int
 dissect_cmip_T_actionReplyInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 196 "cmip.cnf"
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree);
 
 
+
   return offset;
 }
 static int dissect_actionReplyInfo(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -1815,9 +1840,11 @@ static int dissect_eventType2(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
 
 static int
 dissect_cmip_T_eventReplyInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 208 "cmip.cnf"
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree);
 
 
+
   return offset;
 }
 static int dissect_eventReplyInfo(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -1875,9 +1902,11 @@ static int dissect_eventType3(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
 
 static int
 dissect_cmip_T_eventInfo1(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 202 "cmip.cnf"
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree);
 
 
+
   return offset;
 }
 static int dissect_eventInfo1(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -2217,6 +2246,7 @@ dissect_cmip_GetArgument(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, p
 
 static int
 dissect_cmip_Argument(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 105 "cmip.cnf"
   switch(opcode_type){
   case OPCODE_INVOKE:
     switch(opcode){
@@ -2291,6 +2321,7 @@ dissect_cmip_Argument(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pack
   }
 
 
+
   return offset;
 }
 static int dissect_argument(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -2316,6 +2347,7 @@ static const value_string cmip_Opcode_vals[] = {
 
 static int
 dissect_cmip_Opcode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 51 "cmip.cnf"
     offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
                                   &opcode);
 
@@ -2323,6 +2355,7 @@ dissect_cmip_Opcode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet
     col_prepend_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str(opcode, cmip_Opcode_vals, " Unknown Opcode:%d"));
   }
 
+
   return offset;
 }
 static int dissect_opcode(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -2430,10 +2463,12 @@ static const ber_sequence_t Invoke_sequence[] = {
 
 static int
 dissect_cmip_Invoke(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 58 "cmip.cnf"
   opcode_type=OPCODE_INVOKE;
   if(check_col(pinfo->cinfo, COL_INFO)){
     col_prepend_fstr(pinfo->cinfo, COL_INFO, "Invoke ");
   }
+
   offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
                                    Invoke_sequence, hf_index, ett_cmip_Invoke);
 
@@ -2452,10 +2487,12 @@ static const ber_sequence_t ReturnResult_sequence[] = {
 
 static int
 dissect_cmip_ReturnResult(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 65 "cmip.cnf"
   opcode_type=OPCODE_RETURN_RESULT;
   if(check_col(pinfo->cinfo, COL_INFO)){
     col_prepend_fstr(pinfo->cinfo, COL_INFO, "ReturnResult ");
   }
+
   offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
                                    ReturnResult_sequence, hf_index, ett_cmip_ReturnResult);
 
@@ -2473,10 +2510,12 @@ static const ber_sequence_t ReturnError_sequence[] = {
 
 static int
 dissect_cmip_ReturnError(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 72 "cmip.cnf"
   opcode_type=OPCODE_RETURN_ERROR;
   if(check_col(pinfo->cinfo, COL_INFO)){
     col_prepend_fstr(pinfo->cinfo, COL_INFO, "ReturnError ");
   }
+
   offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
                                    ReturnError_sequence, hf_index, ett_cmip_ReturnError);
 
@@ -2644,10 +2683,12 @@ static const ber_sequence_t Reject_sequence[] = {
 
 static int
 dissect_cmip_Reject(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 79 "cmip.cnf"
   opcode_type=OPCODE_REJECT;
   if(check_col(pinfo->cinfo, COL_INFO)){
     col_prepend_fstr(pinfo->cinfo, COL_INFO, "Reject ");
   }
+
   offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
                                    Reject_sequence, hf_index, ett_cmip_Reject);
 
@@ -2693,6 +2734,7 @@ static const value_string cmip_CMIPAbortSource_vals[] = {
 
 static int
 dissect_cmip_CMIPAbortSource(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 42 "cmip.cnf"
   guint32 value;
 
     offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
@@ -2702,6 +2744,7 @@ dissect_cmip_CMIPAbortSource(gboolean implicit_tag _U_, tvbuff_t *tvb, int offse
     col_append_fstr(pinfo->cinfo, COL_INFO, " AbortSource:%s", val_to_str(value, cmip_CMIPAbortSource_vals, " Unknown AbortSource:%d"));
   }
 
+
   return offset;
 }
 static int dissect_abortSource_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -2717,9 +2760,11 @@ static const ber_sequence_t CMIPAbortInfo_sequence[] = {
 
 int
 dissect_cmip_CMIPAbortInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 30 "cmip.cnf"
   if(check_col(pinfo->cinfo, COL_INFO)){
     col_append_fstr(pinfo->cinfo, COL_INFO, "CMIP-A-ABORT");
   }
+
   offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
                                    CMIPAbortInfo_sequence, hf_index, ett_cmip_CMIPAbortInfo);
 
@@ -2778,9 +2823,11 @@ static const ber_sequence_t CMIPUserInfo_sequence[] = {
 
 int
 dissect_cmip_CMIPUserInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 36 "cmip.cnf"
   if(check_col(pinfo->cinfo, COL_INFO)){
     col_append_fstr(pinfo->cinfo, COL_INFO, "CMIP-A-ASSOCIATE");
   }
+
   offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
                                    CMIPUserInfo_sequence, hf_index, ett_cmip_CMIPUserInfo);
 
@@ -2789,7 +2836,7 @@ dissect_cmip_CMIPUserInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset,
 
 
 /*--- End of included file: packet-cmip-fn.c ---*/
-
+#line 90 "packet-cmip-template.c"
 
 
 static void
@@ -2932,14 +2979,14 @@ void proto_register_cmip(void) {
 
 
 /*--- Included file: packet-cmip-hfarr.c ---*/
-
+#line 1 "packet-cmip-hfarr.c"
     { &hf_cmip_modifyOperator,
       { "modifyOperator", "cmip.modifyOperator",
         FT_INT32, BASE_DEC, VALS(cmip_ModifyOperator_vals), 0,
         "", HFILL }},
     { &hf_cmip_attributeId,
       { "attributeId", "cmip.attributeId",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "ModificationItem/attributeId", HFILL }},
     { &hf_cmip_attributeValue,
       { "attributeValue", "cmip.attributeValue",
@@ -3015,7 +3062,7 @@ void proto_register_cmip(void) {
         "SetInfoStatus/attributeError", HFILL }},
     { &hf_cmip_errorId,
       { "errorId", "cmip.errorId",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "SpecificErrorInfo/errorId", HFILL }},
     { &hf_cmip_errorInfo,
       { "errorInfo", "cmip.errorInfo",
@@ -3023,11 +3070,11 @@ void proto_register_cmip(void) {
         "SpecificErrorInfo/errorInfo", HFILL }},
     { &hf_cmip_actionType,
       { "actionType", "cmip.actionType",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "NoSuchArgumentAction/actionType", HFILL }},
     { &hf_cmip_eventType,
       { "eventType", "cmip.eventType",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "NoSuchArgumentEvent/eventType", HFILL }},
     { &hf_cmip_actionId,
       { "actionId", "cmip.actionId",
@@ -3039,7 +3086,7 @@ void proto_register_cmip(void) {
         "NoSuchArgument/eventId", HFILL }},
     { &hf_cmip_eventType1,
       { "eventType", "cmip.eventType",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "InvalidArgumentValueEventValue/eventType", HFILL }},
     { &hf_cmip_eventInfo,
       { "eventInfo", "cmip.eventInfo",
@@ -3055,7 +3102,7 @@ void proto_register_cmip(void) {
         "InvalidArgumentValue/eventValue", HFILL }},
     { &hf_cmip_actionType1,
       { "actionType", "cmip.actionType",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "ErrorInfo/actionType", HFILL }},
     { &hf_cmip_actionArgument,
       { "actionArgument", "cmip.actionArgument",
@@ -3079,7 +3126,7 @@ void proto_register_cmip(void) {
         "AttributeError/errorStatus", HFILL }},
     { &hf_cmip_attributeId2,
       { "attributeId", "cmip.attributeId",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "AttributeError/attributeId", HFILL }},
     { &hf_cmip_attributeValue1,
       { "attributeValue", "cmip.attributeValue",
@@ -3163,7 +3210,7 @@ void proto_register_cmip(void) {
         "LinkedReplyArgument/deleteError", HFILL }},
     { &hf_cmip_eventType2,
       { "eventType", "cmip.eventType",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "EventReply/eventType", HFILL }},
     { &hf_cmip_eventReplyInfo,
       { "eventReplyInfo", "cmip.eventReplyInfo",
@@ -3179,7 +3226,7 @@ void proto_register_cmip(void) {
         "EventReportArgument/eventTime", HFILL }},
     { &hf_cmip_eventType3,
       { "eventType", "cmip.eventType",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "EventReportArgument/eventType", HFILL }},
     { &hf_cmip_eventInfo1,
       { "eventInfo", "cmip.eventInfo",
@@ -3199,7 +3246,7 @@ void proto_register_cmip(void) {
         "CreateArgument/referenceObjectInstance", HFILL }},
     { &hf_cmip_actionType2,
       { "actionType", "cmip.actionType",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "ActionReply/actionType", HFILL }},
     { &hf_cmip_actionReplyInfo,
       { "actionReplyInfo", "cmip.actionReplyInfo",
@@ -3215,7 +3262,7 @@ void proto_register_cmip(void) {
         "ActionArgument/actionInfo", HFILL }},
     { &hf_cmip_actionType3,
       { "actionType", "cmip.actionType",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "ActionInfo/actionType", HFILL }},
     { &hf_cmip_actionInfoArg,
       { "actionInfoArg", "cmip.actionInfoArg",
@@ -3223,7 +3270,7 @@ void proto_register_cmip(void) {
         "ActionInfo/actionInfoArg", HFILL }},
     { &hf_cmip_ocglobalForm,
       { "ocglobalForm", "cmip.ocglobalForm",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "ObjectClass/ocglobalForm", HFILL }},
     { &hf_cmip_oclocalForm,
       { "oclocalForm", "cmip.oclocalForm",
@@ -3243,7 +3290,7 @@ void proto_register_cmip(void) {
         "ObjectInstance/localDistinguishedName", HFILL }},
     { &hf_cmip_globalForm,
       { "globalForm", "cmip.globalForm",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "AttributeId/globalForm", HFILL }},
     { &hf_cmip_localForm,
       { "localForm", "cmip.localForm",
@@ -3259,7 +3306,7 @@ void proto_register_cmip(void) {
         "Attribute/value", HFILL }},
     { &hf_cmip_id1,
       { "id", "cmip.id",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "AttributeValueAssertion/id", HFILL }},
     { &hf_cmip_value1,
       { "value", "cmip.value",
@@ -3331,7 +3378,7 @@ void proto_register_cmip(void) {
         "AE-title/ae-title-form1", HFILL }},
     { &hf_cmip_ae_title_form2,
       { "ae-title-form2", "cmip.ae_title_form2",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "AE-title/ae-title-form2", HFILL }},
     { &hf_cmip_rdnSequence,
       { "rdnSequence", "cmip.rdnSequence",
@@ -3495,7 +3542,7 @@ void proto_register_cmip(void) {
         "", HFILL }},
 
 /*--- End of included file: packet-cmip-hfarr.c ---*/
-
+#line 231 "packet-cmip-template.c"
   };
 
   /* List of subtrees */
@@ -3503,7 +3550,7 @@ void proto_register_cmip(void) {
     &ett_cmip,
 
 /*--- Included file: packet-cmip-ettarr.c ---*/
-
+#line 1 "packet-cmip-ettarr.c"
     &ett_cmip_ModificationItem,
     &ett_cmip_GetListError,
     &ett_cmip_SET_OF_GetInfoStatus,
@@ -3576,7 +3623,7 @@ void proto_register_cmip(void) {
     &ett_cmip_ProtocolVersion,
 
 /*--- End of included file: packet-cmip-ettarr.c ---*/
-
+#line 237 "packet-cmip-template.c"
   };
 
   /* Register protocol */
diff --git a/epan/dissectors/packet-cmip.h b/epan/dissectors/packet-cmip.h
index 51e72d4c77..010e9440a4 100644
--- a/epan/dissectors/packet-cmip.h
+++ b/epan/dissectors/packet-cmip.h
@@ -1,10 +1,11 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-cmip.h                                                            */
+/* ./packet-cmip.h                                                            */
 /* ../../tools/asn2eth.py -X -b -e -p cmip -c cmip.cnf -s packet-cmip-template CMIP.asn */
 
 /* Input file: packet-cmip-template.h */
 
+#line 1 "packet-cmip-template.h"
 /* packet-cmip.h
  * Routines for X.711 CMIP packet dissection
  *   Ronnie Sahlberg 2004
@@ -35,7 +36,7 @@
 
 
 /*--- Included file: packet-cmip-exp.h ---*/
-
+#line 1 "packet-cmip-exp.h"
 extern const value_string cmip_ObjectClass_vals[];
 extern const value_string cmip_ObjectInstance_vals[];
 extern const value_string cmip_ROS_vals[];
@@ -49,7 +50,7 @@ int dissect_cmip_CMIPAbortInfo(gboolean implicit_tag, tvbuff_t *tvb, int offset,
 int dissect_cmip_CMIPUserInfo(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
 
 /*--- End of included file: packet-cmip-exp.h ---*/
-
+#line 30 "packet-cmip-template.h"
 
 #endif  /* PACKET_CMIP_H */
 
diff --git a/epan/dissectors/packet-cmp.c b/epan/dissectors/packet-cmp.c
index e3490e0910..7d050212dd 100644
--- a/epan/dissectors/packet-cmp.c
+++ b/epan/dissectors/packet-cmp.c
@@ -1,10 +1,11 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-cmp.c                                                             */
+/* ./packet-cmp.c                                                             */
 /* ../../tools/asn2eth.py -X -b -e -p cmp -c cmp.cnf -s packet-cmp-template CMP.asn */
 
 /* Input file: packet-cmp-template.c */
 
+#line 1 "packet-cmp-template.c"
 /* packet-cmp.c
  * Routines for RFC2510 Certificate Management Protocol packet dissection
  *   Ronnie Sahlberg 2004
@@ -69,7 +70,7 @@ static int hf_cmp_next_poll_ref = -1;
 static int hf_cmp_ttcb = -1;
 
 /*--- Included file: packet-cmp-hf.c ---*/
-
+#line 1 "packet-cmp-hf.c"
 static int hf_cmp_header = -1;                    /* PKIHeader */
 static int hf_cmp_body = -1;                      /* PKIBody */
 static int hf_cmp_protection = -1;                /* PKIProtection */
@@ -181,13 +182,13 @@ static int hf_cmp_PKIFailureInfo_missingTimeStamp = -1;
 static int hf_cmp_PKIFailureInfo_badPOP = -1;
 
 /*--- End of included file: packet-cmp-hf.c ---*/
-
+#line 64 "packet-cmp-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_cmp = -1;
 
 /*--- Included file: packet-cmp-ett.c ---*/
-
+#line 1 "packet-cmp-ett.c"
 static gint ett_cmp_PKIMessage = -1;
 static gint ett_cmp_SEQUENCE_SIZE_1_MAX_OF_Certificate = -1;
 static gint ett_cmp_PKIHeader = -1;
@@ -225,14 +226,14 @@ static gint ett_cmp_GenRepContent = -1;
 static gint ett_cmp_ErrorMsgContent = -1;
 
 /*--- End of included file: packet-cmp-ett.c ---*/
-
+#line 68 "packet-cmp-template.c"
 
 static const char *object_identifier_id;
 
 
 
 /*--- Included file: packet-cmp-fn.c ---*/
-
+#line 1 "packet-cmp-fn.c"
 /*--- Cyclic dependencies ---*/
 
 /* PKIMessage -> PKIBody -> NestedMessageContent -> PKIMessage */
@@ -468,9 +469,11 @@ static int dissect_infoType(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
 
 static int
 dissect_cmp_T_infoValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 66 "cmp.cnf"
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree);
 
 
+
   return offset;
 }
 static int dissect_infoValue(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -1312,7 +1315,7 @@ dissect_cmp_OOBCertHash(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pa
 
 
 /*--- End of included file: packet-cmp-fn.c ---*/
-
+#line 73 "packet-cmp-template.c"
 
 static int
 dissect_cmp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
@@ -1520,7 +1523,7 @@ void proto_register_cmp(void) {
         "", HFILL }},
 
 /*--- Included file: packet-cmp-hfarr.c ---*/
-
+#line 1 "packet-cmp-hfarr.c"
     { &hf_cmp_header,
       { "header", "cmp.header",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -1887,7 +1890,7 @@ void proto_register_cmp(void) {
         "CRLAnnContent/_item", HFILL }},
     { &hf_cmp_infoType,
       { "infoType", "cmp.infoType",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "InfoTypeAndValue/infoType", HFILL }},
     { &hf_cmp_infoValue,
       { "infoValue", "cmp.infoValue",
@@ -1955,7 +1958,7 @@ void proto_register_cmp(void) {
         "", HFILL }},
 
 /*--- End of included file: packet-cmp-hfarr.c ---*/
-
+#line 279 "packet-cmp-template.c"
   };
 
   /* List of subtrees */
@@ -1963,7 +1966,7 @@ void proto_register_cmp(void) {
     &ett_cmp,
 
 /*--- Included file: packet-cmp-ettarr.c ---*/
-
+#line 1 "packet-cmp-ettarr.c"
     &ett_cmp_PKIMessage,
     &ett_cmp_SEQUENCE_SIZE_1_MAX_OF_Certificate,
     &ett_cmp_PKIHeader,
@@ -2001,7 +2004,7 @@ void proto_register_cmp(void) {
     &ett_cmp_ErrorMsgContent,
 
 /*--- End of included file: packet-cmp-ettarr.c ---*/
-
+#line 285 "packet-cmp-template.c"
   };
   module_t *cmp_module;
 
diff --git a/epan/dissectors/packet-cmp.h b/epan/dissectors/packet-cmp.h
index f1a421bbd4..041856832a 100644
--- a/epan/dissectors/packet-cmp.h
+++ b/epan/dissectors/packet-cmp.h
@@ -5,6 +5,7 @@
 
 /* Input file: packet-cmp-template.h */
 
+#line 1 "packet-cmp-template.h"
 /* packet-cmp.h
  * Routines for RFC2510 Certificate Management Protocol packet dissection
  *   Ronnie Sahlberg 2004
@@ -35,7 +36,7 @@
 
 
 /*--- Included file: packet-cmp-exp.h ---*/
-
+#line 1 "packet-cmp-exp.h"
 extern const value_string cmp_PKIBody_vals[];
 extern const value_string cmp_PKIStatus_vals[];
 extern const value_string cmp_CertOrEncCert_vals[];
@@ -77,7 +78,7 @@ int dissect_cmp_GenRepContent(gboolean implicit_tag, tvbuff_t *tvb, int offset,
 int dissect_cmp_ErrorMsgContent(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
 
 /*--- End of included file: packet-cmp-exp.h ---*/
-
+#line 30 "packet-cmp-template.h"
 
 #endif  /* PACKET_CMP_H */
 
diff --git a/epan/dissectors/packet-crmf.c b/epan/dissectors/packet-crmf.c
index 2a87725cba..d690ee1c3a 100644
--- a/epan/dissectors/packet-crmf.c
+++ b/epan/dissectors/packet-crmf.c
@@ -1,10 +1,11 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-crmf.c                                                            */
+/* ./packet-crmf.c                                                            */
 /* ../../tools/asn2eth.py -X -b -e -p crmf -c crmf.cnf -s packet-crmf-template CRMF.asn */
 
 /* Input file: packet-crmf-template.c */
 
+#line 1 "packet-crmf-template.c"
 /* packet-crmf.c
  * Routines for RFC2511 Certificate Request Message Format packet dissection
  *   Ronnie Sahlberg 2004
@@ -56,7 +57,7 @@ int proto_crmf = -1;
 static int hf_crmf_type_oid = -1;
 
 /*--- Included file: packet-crmf-hf.c ---*/
-
+#line 1 "packet-crmf-hf.c"
 static int hf_crmf_PBMParameter_PDU = -1;         /* PBMParameter */
 static int hf_crmf_utcTime = -1;                  /* UTCTime */
 static int hf_crmf_generalTime = -1;              /* GeneralizedTime */
@@ -121,12 +122,12 @@ static int hf_crmf_encValue = -1;                 /* BIT_STRING */
 static int hf_crmf_issuer = -1;                   /* GeneralName */
 
 /*--- End of included file: packet-crmf-hf.c ---*/
-
+#line 51 "packet-crmf-template.c"
 
 /* Initialize the subtree pointers */
 
 /*--- Included file: packet-crmf-ett.c ---*/
-
+#line 1 "packet-crmf-ett.c"
 static gint ett_crmf_Time = -1;
 static gint ett_crmf_CertReqMessages = -1;
 static gint ett_crmf_CertReqMsg = -1;
@@ -152,13 +153,13 @@ static gint ett_crmf_EncryptedValue = -1;
 static gint ett_crmf_CertId = -1;
 
 /*--- End of included file: packet-crmf-ett.c ---*/
-
+#line 54 "packet-crmf-template.c"
 
 static const char *object_identifier_id;
 
 
 /*--- Included file: packet-crmf-fn.c ---*/
-
+#line 1 "packet-crmf-fn.c"
 /*--- Fields for imported types ---*/
 
 static int dissect_signingAlg_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -386,9 +387,11 @@ static int dissect_type(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int
 
 static int
 dissect_crmf_T_value(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 60 "crmf.cnf"
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree);
 
 
+
   return offset;
 }
 static int dissect_value(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -999,7 +1002,7 @@ static void dissect_PBMParameter_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tr
 
 
 /*--- End of included file: packet-crmf-fn.c ---*/
-
+#line 58 "packet-crmf-template.c"
 
 
 /*--- proto_register_crmf ----------------------------------------------*/
@@ -1013,7 +1016,7 @@ void proto_register_crmf(void) {
         "Type of AttributeTypeAndValue", HFILL }},
 
 /*--- Included file: packet-crmf-hfarr.c ---*/
-
+#line 1 "packet-crmf-hfarr.c"
     { &hf_crmf_PBMParameter_PDU,
       { "PBMParameter", "crmf.PBMParameter",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -1112,7 +1115,7 @@ void proto_register_crmf(void) {
         "Controls/_item", HFILL }},
     { &hf_crmf_type,
       { "type", "crmf.type",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "AttributeTypeAndValue/type", HFILL }},
     { &hf_crmf_value,
       { "value", "crmf.value",
@@ -1264,14 +1267,14 @@ void proto_register_crmf(void) {
         "CertId/issuer", HFILL }},
 
 /*--- End of included file: packet-crmf-hfarr.c ---*/
-
+#line 70 "packet-crmf-template.c"
   };
 
   /* List of subtrees */
   static gint *ett[] = {
 
 /*--- Included file: packet-crmf-ettarr.c ---*/
-
+#line 1 "packet-crmf-ettarr.c"
     &ett_crmf_Time,
     &ett_crmf_CertReqMessages,
     &ett_crmf_CertReqMsg,
@@ -1297,7 +1300,7 @@ void proto_register_crmf(void) {
     &ett_crmf_CertId,
 
 /*--- End of included file: packet-crmf-ettarr.c ---*/
-
+#line 75 "packet-crmf-template.c"
   };
 
   /* Register protocol */
@@ -1314,11 +1317,11 @@ void proto_register_crmf(void) {
 void proto_reg_handoff_crmf(void) {
 
 /*--- Included file: packet-crmf-dis-tab.c ---*/
-
+#line 1 "packet-crmf-dis-tab.c"
   register_ber_oid_dissector("1.2.840.113533.7.66.13", dissect_PBMParameter_PDU, proto_crmf, "PasswordBasedMac");
 
 
 /*--- End of included file: packet-crmf-dis-tab.c ---*/
-
+#line 90 "packet-crmf-template.c"
 }
 
diff --git a/epan/dissectors/packet-crmf.h b/epan/dissectors/packet-crmf.h
index b9cb15f1c8..6aed1c004d 100644
--- a/epan/dissectors/packet-crmf.h
+++ b/epan/dissectors/packet-crmf.h
@@ -5,6 +5,7 @@
 
 /* Input file: packet-crmf-template.h */
 
+#line 1 "packet-crmf-template.h"
 /* packet-crmf.h
  * Routines for RFC2511 Certificate Request Message Format packet dissection
  *   Ronnie Sahlberg 2004
@@ -35,7 +36,7 @@
 
 
 /*--- Included file: packet-crmf-exp.h ---*/
-
+#line 1 "packet-crmf-exp.h"
 extern const value_string crmf_ProofOfPossession_vals[];
 extern const value_string crmf_POPOPrivKey_vals[];
 extern const value_string crmf_SubsequentMessage_vals[];
@@ -70,7 +71,7 @@ int dissect_crmf_UTF8Pairs(gboolean implicit_tag, tvbuff_t *tvb, int offset, pac
 int dissect_crmf_CertReq(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
 
 /*--- End of included file: packet-crmf-exp.h ---*/
-
+#line 30 "packet-crmf-template.h"
 
 #endif  /* PACKET_CRMF_H */
 
diff --git a/epan/dissectors/packet-ess.c b/epan/dissectors/packet-ess.c
index f80a50f183..6761462ab5 100644
--- a/epan/dissectors/packet-ess.c
+++ b/epan/dissectors/packet-ess.c
@@ -1,10 +1,11 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-ess.c                                                             */
+/* ./packet-ess.c                                                             */
 /* ../../tools/asn2eth.py -X -b -k -e -p ess -c ess.cnf -s packet-ess-template ExtendedSecurityServices.asn */
 
 /* Input file: packet-ess-template.c */
 
+#line 1 "packet-ess-template.c"
 /* packet-ess.c
  * Routines for RFC2634 Extended Security Services packet dissection
  *   Ronnie Sahlberg 2004
@@ -55,7 +56,7 @@ static int proto_ess = -1;
 static int hf_ess_SecurityCategory_type_OID = -1;
 
 /*--- Included file: packet-ess-hf.c ---*/
-
+#line 1 "packet-ess-hf.c"
 static int hf_ess_ReceiptRequest_PDU = -1;        /* ReceiptRequest */
 static int hf_ess_ContentIdentifier_PDU = -1;     /* ContentIdentifier */
 static int hf_ess_Receipt_PDU = -1;               /* Receipt */
@@ -120,12 +121,12 @@ static int hf_ess_issuer = -1;                    /* GeneralNames */
 static int hf_ess_serialNumber = -1;              /* CertificateSerialNumber */
 
 /*--- End of included file: packet-ess-hf.c ---*/
-
+#line 50 "packet-ess-template.c"
 
 /* Initialize the subtree pointers */
 
 /*--- Included file: packet-ess-ett.c ---*/
-
+#line 1 "packet-ess-ett.c"
 static gint ett_ess_ReceiptRequest = -1;
 static gint ett_ess_SEQUENCE_OF_GeneralNames = -1;
 static gint ett_ess_ReceiptsFrom = -1;
@@ -154,13 +155,13 @@ static gint ett_ess_ESSCertID = -1;
 static gint ett_ess_IssuerSerial = -1;
 
 /*--- End of included file: packet-ess-ett.c ---*/
-
+#line 53 "packet-ess-template.c"
 
 static const char *object_identifier_id;
 
 
 /*--- Included file: packet-ess-fn.c ---*/
-
+#line 1 "packet-ess-fn.c"
 /*--- Fields for imported types ---*/
 
 static int dissect_receiptsTo_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -488,9 +489,11 @@ static int dissect_type_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
 
 static int
 dissect_ess_T_value(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 47 "ess.cnf"
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree);
 
 
+
   return offset;
 }
 static int dissect_value(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -964,7 +967,7 @@ static void dissect_SigningCertificate_PDU(tvbuff_t *tvb, packet_info *pinfo, pr
 
 
 /*--- End of included file: packet-ess-fn.c ---*/
-
+#line 57 "packet-ess-template.c"
 
 
 /*--- proto_register_ess ----------------------------------------------*/
@@ -977,7 +980,7 @@ void proto_register_ess(void) {
 	"Type of Security Category", HFILL }},
 
 /*--- Included file: packet-ess-hfarr.c ---*/
-
+#line 1 "packet-ess-hfarr.c"
     { &hf_ess_ReceiptRequest_PDU,
       { "ReceiptRequest", "ess.ReceiptRequest",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -1068,7 +1071,7 @@ void proto_register_ess(void) {
         "Receipt/version", HFILL }},
     { &hf_ess_contentType,
       { "contentType", "ess.contentType",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "", HFILL }},
     { &hf_ess_originatorSignatureValue,
       { "originatorSignatureValue", "ess.originatorSignatureValue",
@@ -1080,7 +1083,7 @@ void proto_register_ess(void) {
         "ContentHints/contentDescription", HFILL }},
     { &hf_ess_security_policy_identifier,
       { "security-policy-identifier", "ess.security_policy_identifier",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "ESSSecurityLabel/security-policy-identifier", HFILL }},
     { &hf_ess_security_classification,
       { "security-classification", "ess.security_classification",
@@ -1108,7 +1111,7 @@ void proto_register_ess(void) {
         "SecurityCategories/_item", HFILL }},
     { &hf_ess_type,
       { "type", "ess.type",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "SecurityCategory/type", HFILL }},
     { &hf_ess_value,
       { "value", "ess.value",
@@ -1116,7 +1119,7 @@ void proto_register_ess(void) {
         "SecurityCategory/value", HFILL }},
     { &hf_ess_tagName,
       { "tagName", "ess.tagName",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "", HFILL }},
     { &hf_ess_attributeFlags,
       { "attributeFlags", "ess.attributeFlags",
@@ -1228,14 +1231,14 @@ void proto_register_ess(void) {
         "IssuerSerial/serialNumber", HFILL }},
 
 /*--- End of included file: packet-ess-hfarr.c ---*/
-
+#line 68 "packet-ess-template.c"
   };
 
   /* List of subtrees */
   static gint *ett[] = {
 
 /*--- Included file: packet-ess-ettarr.c ---*/
-
+#line 1 "packet-ess-ettarr.c"
     &ett_ess_ReceiptRequest,
     &ett_ess_SEQUENCE_OF_GeneralNames,
     &ett_ess_ReceiptsFrom,
@@ -1264,7 +1267,7 @@ void proto_register_ess(void) {
     &ett_ess_IssuerSerial,
 
 /*--- End of included file: packet-ess-ettarr.c ---*/
-
+#line 73 "packet-ess-template.c"
   };
 
   /* Register protocol */
@@ -1281,7 +1284,7 @@ void proto_register_ess(void) {
 void proto_reg_handoff_ess(void) {
 
 /*--- Included file: packet-ess-dis-tab.c ---*/
-
+#line 1 "packet-ess-dis-tab.c"
   register_ber_oid_dissector("1.2.840.113549.1.9.16.2.1", dissect_ReceiptRequest_PDU, proto_ess, "id-aa-receiptRequest");
   register_ber_oid_dissector("1.2.840.113549.1.9.16.2.7", dissect_ContentIdentifier_PDU, proto_ess, "id-aa-contentIdentifier");
   register_ber_oid_dissector("1.2.840.113549.1.9.16.1.1", dissect_Receipt_PDU, proto_ess, "id-ct-receipt");
@@ -1300,6 +1303,6 @@ void proto_reg_handoff_ess(void) {
 
 
 /*--- End of included file: packet-ess-dis-tab.c ---*/
-
+#line 88 "packet-ess-template.c"
 }
 
diff --git a/epan/dissectors/packet-ess.h b/epan/dissectors/packet-ess.h
index 0b9f1a171f..3fe99c2397 100644
--- a/epan/dissectors/packet-ess.h
+++ b/epan/dissectors/packet-ess.h
@@ -1,10 +1,11 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-ess.h                                                             */
+/* ./packet-ess.h                                                             */
 /* ../../tools/asn2eth.py -X -b -k -e -p ess -c ess.cnf -s packet-ess-template ExtendedSecurityServices.asn */
 
 /* Input file: packet-ess-template.h */
 
+#line 1 "packet-ess-template.h"
 /* packet-ess.h
  * Routines for RFC2634 Extended Security Services packet dissection
  *    Ronnie Sahlberg 2004
diff --git a/epan/dissectors/packet-ftam.c b/epan/dissectors/packet-ftam.c
index c9097d8ec6..dc64fcde1b 100644
--- a/epan/dissectors/packet-ftam.c
+++ b/epan/dissectors/packet-ftam.c
@@ -1,10 +1,11 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-ftam.c                                                            */
+/* ./packet-ftam.c                                                            */
 /* ../../tools/asn2eth.py -X -b -e -p ftam -c ftam.cnf -s packet-ftam-template ISO8571-FTAM.asn */
 
 /* Input file: packet-ftam-template.c */
 
+#line 1 "packet-ftam-template.c"
 /* packet-ftam_asn1.c
  * Routine to dissect OSI ISO 8571 FTAM Protocol packets
  * based on the ASN.1 specification from http://www.itu.int/ITU-T/asn1/database/iso/8571-4/1988/
@@ -63,7 +64,7 @@ static int dissect_ftam_OR_Set(gboolean implicit_tag _U_, tvbuff_t *tvb, int off
 
 
 /*--- Included file: packet-ftam-hf.c ---*/
-
+#line 1 "packet-ftam-hf.c"
 static int hf_ftam_fTAM_Regime_PDU = -1;          /* FTAM_Regime_PDU */
 static int hf_ftam_file_PDU = -1;                 /* File_PDU */
 static int hf_ftam_bulk_Data_PDU = -1;            /* Bulk_Data_PDU */
@@ -484,13 +485,13 @@ static int hf_ftam_Attribute_Names_read_legal_qualifiCatiOnS = -1;
 static int hf_ftam_Attribute_Names_read_private_use = -1;
 
 /*--- End of included file: packet-ftam-hf.c ---*/
-
+#line 58 "packet-ftam-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_ftam = -1;
 
 /*--- Included file: packet-ftam-ett.c ---*/
-
+#line 1 "packet-ftam-ett.c"
 static gint ett_ftam_PDU = -1;
 static gint ett_ftam_FTAM_Regime_PDU = -1;
 static gint ett_ftam_F_INITIALIZE_request = -1;
@@ -658,11 +659,11 @@ static gint ett_ftam_AE_title = -1;
 static gint ett_ftam_Attribute_Value_Assertions = -1;
 
 /*--- End of included file: packet-ftam-ett.c ---*/
-
+#line 62 "packet-ftam-template.c"
 
 
 /*--- Included file: packet-ftam-fn.c ---*/
-
+#line 1 "packet-ftam-fn.c"
 /*--- Fields for imported types ---*/
 
 static int dissect_actual_values4_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -678,6 +679,7 @@ static const asn_namedbit Protocol_Version_bits[] = {
 
 static int
 dissect_ftam_Protocol_Version(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 108 "ftam.cnf"
  gint8 class;
  gboolean pc, ind_field;
  gint32 tag;
@@ -695,6 +697,7 @@ dissect_ftam_Protocol_Version(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs
                                  NULL);
 
 
+
   return offset;
 }
 static int dissect_protocol_Version(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -705,6 +708,7 @@ static int dissect_protocol_Version(packet_info *pinfo, proto_tree *tree, tvbuff
 
 static int
 dissect_ftam_Implementation_Information(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 91 "ftam.cnf"
  gint8 class;
  gboolean pc, ind_field;
  gint32 tag;
@@ -722,6 +726,7 @@ dissect_ftam_Implementation_Information(gboolean implicit_tag _U_, tvbuff_t *tvb
                                          NULL);
 
 
+
   return offset;
 }
 static int dissect_implementation_information(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -767,6 +772,7 @@ static const asn_namedbit Service_Class_bits[] = {
 
 static int
 dissect_ftam_Service_Class(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 125 "ftam.cnf"
  gint8 class;
  gboolean pc, ind_field;
  gint32 tag;
@@ -784,6 +790,7 @@ dissect_ftam_Service_Class(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset,
                                  NULL);
 
 
+
   return offset;
 }
 static int dissect_service_class(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -812,6 +819,7 @@ static const asn_namedbit Functional_Units_bits[] = {
 
 static int
 dissect_ftam_Functional_Units(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 142 "ftam.cnf"
  gint8 class;
  gboolean pc, ind_field;
  gint32 tag;
@@ -830,6 +838,7 @@ dissect_ftam_Functional_Units(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs
 
 
 
+
   return offset;
 }
 static int dissect_functional_units(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -847,6 +856,7 @@ static const asn_namedbit Attribute_Groups_bits[] = {
 
 static int
 dissect_ftam_Attribute_Groups(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 160 "ftam.cnf"
  gint8 class;
  gboolean pc, ind_field;
  gint32 tag;
@@ -865,6 +875,7 @@ dissect_ftam_Attribute_Groups(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs
 
 
 
+
   return offset;
 }
 static int dissect_attribute_groups(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -898,6 +909,7 @@ static const value_string ftam_FTAM_Quality_of_Service_vals[] = {
 
 static int
 dissect_ftam_FTAM_Quality_of_Service(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 178 "ftam.cnf"
  gint8 class;
  gboolean pc, ind_field;
  gint32 tag;
@@ -914,6 +926,7 @@ dissect_ftam_FTAM_Quality_of_Service(gboolean implicit_tag _U_, tvbuff_t *tvb, i
                                   NULL);
 
 
+
   return offset;
 }
 static int dissect_ftam_quality_of_Service(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -924,6 +937,7 @@ static int dissect_ftam_quality_of_Service(packet_info *pinfo, proto_tree *tree,
 
 static int
 dissect_ftam_Document_Type_Name(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 457 "ftam.cnf"
  gint8 class;
  gboolean pc, ind_field;
  gint32 tag;
@@ -940,6 +954,7 @@ dissect_ftam_Document_Type_Name(gboolean implicit_tag _U_, tvbuff_t *tvb, int of
 
 
 
+
   return offset;
 }
 static int dissect_document_type_name(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -950,6 +965,7 @@ static int dissect_document_type_name(packet_info *pinfo, proto_tree *tree, tvbu
 
 static int
 dissect_ftam_Abstract_Syntax_Name(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 243 "ftam.cnf"
  gint8 class;
  gboolean pc, ind_field;
  gint32 tag;
@@ -967,6 +983,7 @@ dissect_ftam_Abstract_Syntax_Name(gboolean implicit_tag _U_, tvbuff_t *tvb, int
 
 
 
+
   return offset;
 }
 static int dissect_abstract_Syntax_name(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -1011,6 +1028,7 @@ static const ber_sequence_t Contents_Type_List_sequence_of[1] = {
 
 static int
 dissect_ftam_Contents_Type_List(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 194 "ftam.cnf"
  gint8 class;
  gboolean pc, ind_field;
  gint32 tag;
@@ -1028,6 +1046,7 @@ dissect_ftam_Contents_Type_List(gboolean implicit_tag _U_, tvbuff_t *tvb, int of
 
 
 
+
   return offset;
 }
 static int dissect_contents_type_list(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -1038,6 +1057,7 @@ static int dissect_contents_type_list(packet_info *pinfo, proto_tree *tree, tvbu
 
 static int
 dissect_ftam_User_Identity(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 536 "ftam.cnf"
  gint8 class;
  gboolean pc, ind_field;
  gint32 tag;
@@ -1054,6 +1074,7 @@ dissect_ftam_User_Identity(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset,
                                          pinfo, tree, tvb, offset, hf_index,
                                          NULL);
 
+
   return offset;
 }
 static int dissect_initiator_identity(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -1070,6 +1091,7 @@ static int dissect_actual_values6(packet_info *pinfo, proto_tree *tree, tvbuff_t
 
 static int
 dissect_ftam_Account(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 308 "ftam.cnf"
  gint8 class;
  gboolean pc, ind_field;
  gint32 tag;
@@ -1086,6 +1108,7 @@ dissect_ftam_Account(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packe
                                          pinfo, tree, tvb, offset, hf_index,
                                          NULL);
 
+
   return offset;
 }
 static int dissect_account(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -1158,6 +1181,7 @@ static const ber_choice_t Password_choice[] = {
 
 static int
 dissect_ftam_Password(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 662 "ftam.cnf"
  gint8 class;
  gboolean pc, ind_field;
  gint32 tag;
@@ -1175,6 +1199,7 @@ dissect_ftam_Password(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pack
 
 
 
+
   return offset;
 }
 static int dissect_filestore_password(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -1362,6 +1387,7 @@ static const value_string ftam_State_Result_vals[] = {
 
 static int
 dissect_ftam_State_Result(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 520 "ftam.cnf"
  gint8 class;
  gboolean pc, ind_field;
  gint32 tag;
@@ -1378,6 +1404,7 @@ dissect_ftam_State_Result(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset,
                                   NULL);
 
 
+
   return offset;
 }
 static int dissect_state_result(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -1395,6 +1422,7 @@ static const value_string ftam_Action_Result_vals[] = {
 
 static int
 dissect_ftam_Action_Result(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 324 "ftam.cnf"
  gint8 class;
  gboolean pc, ind_field;
  gint32 tag;
@@ -1412,6 +1440,7 @@ dissect_ftam_Action_Result(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset,
 
 
 
+
   return offset;
 }
 static int dissect_action_result(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -1493,6 +1522,7 @@ static const ber_sequence_t Diagnostic_sequence_of[1] = {
 
 static int
 dissect_ftam_Diagnostic(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 440 "ftam.cnf"
  gint8 class;
  gboolean pc, ind_field;
  gint32 tag;
@@ -1510,6 +1540,7 @@ dissect_ftam_Diagnostic(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pa
 
 
 
+
   return offset;
 }
 static int dissect_diagnostic(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -1588,6 +1619,7 @@ static const ber_sequence_t Charging_sequence_of[1] = {
 
 static int
 dissect_ftam_Charging(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 374 "ftam.cnf"
  gint8 class;
  gboolean pc, ind_field;
  gint32 tag;
@@ -1605,6 +1637,7 @@ dissect_ftam_Charging(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pack
 
 
 
+
   return offset;
 }
 static int dissect_charging(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -1688,6 +1721,7 @@ static const ber_choice_t FTAM_Regime_PDU_choice[] = {
 
 static int
 dissect_ftam_FTAM_Regime_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 713 "ftam.cnf"
   gint branch_taken;
 
     offset = dissect_ber_choice(pinfo, tree, tvb, offset,
@@ -1702,6 +1736,7 @@ dissect_ftam_FTAM_Regime_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offse
   }
 
 
+
   return offset;
 }
 static int dissect_fTAM_Regime_PDU(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -1778,6 +1813,7 @@ static const ber_sequence_t Select_Attributes_sequence[] = {
 
 static int
 dissect_ftam_Select_Attributes(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 504 "ftam.cnf"
  gint8 class;
  gboolean pc, ind_field;
  gint32 tag;
@@ -1794,6 +1830,7 @@ dissect_ftam_Select_Attributes(gboolean implicit_tag _U_, tvbuff_t *tvb, int off
                                 Select_Attributes_sequence, hf_index, ett_ftam_Select_Attributes);
 
 
+
   return offset;
 }
 static int dissect_select_attributes(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -1815,6 +1852,7 @@ static const asn_namedbit Access_Request_bits[] = {
 
 static int
 dissect_ftam_Access_Request(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 292 "ftam.cnf"
  gint8 class;
  gboolean pc, ind_field;
  gint32 tag;
@@ -1831,6 +1869,7 @@ dissect_ftam_Access_Request(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset
                                  Access_Request_bits, hf_index, ett_ftam_Access_Request,
                                  NULL);
 
+
   return offset;
 }
 static int dissect_requested_access(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -1873,6 +1912,7 @@ static const ber_sequence_t Access_Passwords_sequence[] = {
 
 static int
 dissect_ftam_Access_Passwords(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 276 "ftam.cnf"
  gint8 class;
  gboolean pc, ind_field;
  gint32 tag;
@@ -1889,6 +1929,7 @@ dissect_ftam_Access_Passwords(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs
                                 Access_Passwords_sequence, hf_index, ett_ftam_Access_Passwords);
 
 
+
   return offset;
 }
 static int dissect_access_passwords(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -1931,6 +1972,7 @@ static const ber_sequence_t Path_Access_Passwords_sequence_of[1] = {
 
 static int
 dissect_ftam_Path_Access_Passwords(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 585 "ftam.cnf"
  gint8 class;
  gboolean pc, ind_field;
  gint32 tag;
@@ -1947,6 +1989,7 @@ dissect_ftam_Path_Access_Passwords(gboolean implicit_tag _U_, tvbuff_t *tvb, int
                                    Path_Access_Passwords_sequence_of, hf_index, ett_ftam_Path_Access_Passwords);
 
 
+
   return offset;
 }
 static int dissect_path_access_passwords(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -2010,6 +2053,7 @@ static const ber_sequence_t Concurrency_Control_sequence[] = {
 
 static int
 dissect_ftam_Concurrency_Control(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 391 "ftam.cnf"
  gint8 class;
  gboolean pc, ind_field;
  gint32 tag;
@@ -2027,6 +2071,7 @@ dissect_ftam_Concurrency_Control(gboolean implicit_tag _U_, tvbuff_t *tvb, int o
 
 
 
+
   return offset;
 }
 static int dissect_concurrency_control(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -2060,6 +2105,7 @@ static int dissect_f_select_request_impl(packet_info *pinfo, proto_tree *tree, t
 
 static int
 dissect_ftam_Referent_Indicator(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 647 "ftam.cnf"
  gint8 class;
  gboolean pc, ind_field;
  gint32 tag;
@@ -2075,6 +2121,7 @@ dissect_ftam_Referent_Indicator(gboolean implicit_tag _U_, tvbuff_t *tvb, int of
   offset = dissect_ber_boolean(TRUE, pinfo, tree, tvb, offset, hf_index);
 
 
+
   return offset;
 }
 static int dissect_referent_indicator(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -2215,9 +2262,11 @@ static int dissect_permitted_actions_impl(packet_info *pinfo, proto_tree *tree,
 
 static int
 dissect_ftam_T_parameter(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 74 "ftam.cnf"
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree);
 
 
+
   return offset;
 }
 static int dissect_parameter(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -2246,6 +2295,7 @@ static int dissect_document_type_impl(packet_info *pinfo, proto_tree *tree, tvbu
 
 static int
 dissect_ftam_Constraint_Set_Name(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 408 "ftam.cnf"
  gint8 class;
  gboolean pc, ind_field;
  gint32 tag;
@@ -2262,6 +2312,7 @@ dissect_ftam_Constraint_Set_Name(gboolean implicit_tag _U_, tvbuff_t *tvb, int o
                                             NULL);
 
 
+
   return offset;
 }
 static int dissect_constraint_set_name(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -2502,8 +2553,10 @@ static int dissect_concurrency_access_impl(packet_info *pinfo, proto_tree *tree,
 
 static int
 dissect_ftam_AP_title(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 86 "ftam.cnf"
 	/* XXX have no idea about this one */
 
+
   return offset;
 }
 static int dissect_ap(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -2514,9 +2567,11 @@ static int dissect_ap(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int o
 
 static int
 dissect_ftam_AE_qualifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 88 "ftam.cnf"
 	/* XXX have no idea about this one */
 
 
+
   return offset;
 }
 static int dissect_ae(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -2710,9 +2765,11 @@ static int dissect_extension_attribute_identifier(packet_info *pinfo, proto_tree
 
 static int
 dissect_ftam_T_extension_attribute(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 77 "ftam.cnf"
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree);
 
 
+
   return offset;
 }
 static int dissect_extension_attribute(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -2806,6 +2863,7 @@ static const ber_sequence_t Create_Attributes_sequence[] = {
 
 static int
 dissect_ftam_Create_Attributes(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 424 "ftam.cnf"
  gint8 class;
  gboolean pc, ind_field;
  gint32 tag;
@@ -2822,6 +2880,7 @@ dissect_ftam_Create_Attributes(gboolean implicit_tag _U_, tvbuff_t *tvb, int off
                                 Create_Attributes_sequence, hf_index, ett_ftam_Create_Attributes);
 
 
+
   return offset;
 }
 static int dissect_initial_attributes(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -3161,6 +3220,7 @@ static const ber_sequence_t Read_Attributes_sequence[] = {
 
 static int
 dissect_ftam_Read_Attributes(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 488 "ftam.cnf"
  gint8 class;
  gboolean pc, ind_field;
  gint32 tag;
@@ -3177,6 +3237,7 @@ dissect_ftam_Read_Attributes(gboolean implicit_tag _U_, tvbuff_t *tvb, int offse
                                 Read_Attributes_sequence, hf_index, ett_ftam_Read_Attributes);
 
 
+
   return offset;
 }
 static int dissect_read_attributes(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -3273,6 +3334,7 @@ static const ber_sequence_t Change_Attributes_sequence[] = {
 
 static int
 dissect_ftam_Change_Attributes(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 357 "ftam.cnf"
  gint8 class;
  gboolean pc, ind_field;
  gint32 tag;
@@ -3290,6 +3352,7 @@ dissect_ftam_Change_Attributes(gboolean implicit_tag _U_, tvbuff_t *tvb, int off
 
 
 
+
   return offset;
 }
 static int dissect_attributes(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -3383,6 +3446,7 @@ static int dissect_open_contents_type(packet_info *pinfo, proto_tree *tree, tvbu
 
 static int
 dissect_ftam_Activity_Identifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 341 "ftam.cnf"
  gint8 class;
  gboolean pc, ind_field;
  gint32 tag;
@@ -3399,6 +3463,7 @@ dissect_ftam_Activity_Identifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int o
                                   NULL);
 
 
+
   return offset;
 }
 static int dissect_activity_identifier(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -3455,6 +3520,7 @@ static const value_string ftam_Degree_Of_Overlap_vals[] = {
 
 static int
 dissect_ftam_Degree_Of_Overlap(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 211 "ftam.cnf"
  gint8 class;
  gboolean pc, ind_field;
  gint32 tag;
@@ -3471,6 +3537,7 @@ dissect_ftam_Degree_Of_Overlap(gboolean implicit_tag _U_, tvbuff_t *tvb, int off
                                   NULL);
 
 
+
   return offset;
 }
 static int dissect_degree_of_overlap(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -3817,6 +3884,7 @@ static const ber_choice_t FADU_Identity_choice[] = {
 
 static int
 dissect_ftam_FADU_Identity(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 679 "ftam.cnf"
  gint8 class;
  gboolean pc, ind_field;
  gint32 tag;
@@ -3833,6 +3901,7 @@ dissect_ftam_FADU_Identity(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset,
                               FADU_Identity_choice, hf_index, ett_ftam_FADU_Identity, NULL);
 
 
+
   return offset;
 }
 static int dissect_file_access_data_unit_identity(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -3849,6 +3918,7 @@ static const value_string ftam_FADU_Lock_vals[] = {
 
 static int
 dissect_ftam_FADU_Lock(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 472 "ftam.cnf"
  gint8 class;
  gboolean pc, ind_field;
  gint32 tag;
@@ -3865,6 +3935,7 @@ dissect_ftam_FADU_Lock(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pac
                                   NULL);
 
 
+
   return offset;
 }
 static int dissect_fadu_lock(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -4006,6 +4077,7 @@ static const ber_choice_t File_PDU_choice[] = {
 
 static int
 dissect_ftam_File_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 727 "ftam.cnf"
   gint branch_taken;
 
     offset = dissect_ber_choice(pinfo, tree, tvb, offset,
@@ -4020,6 +4092,7 @@ dissect_ftam_File_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pack
   }
 
 
+
   return offset;
 }
 static int dissect_file_PDU(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -4059,6 +4132,7 @@ static const ber_sequence_t Access_Context_sequence[] = {
 
 static int
 dissect_ftam_Access_Context(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 260 "ftam.cnf"
  gint8 class;
  gboolean pc, ind_field;
  gint32 tag;
@@ -4075,6 +4149,7 @@ dissect_ftam_Access_Context(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset
                                 Access_Context_sequence, hf_index, ett_ftam_Access_Context);
 
 
+
   return offset;
 }
 static int dissect_read_access_context(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -4169,6 +4244,7 @@ static const value_string ftam_Request_Type_vals[] = {
 
 static int
 dissect_ftam_Request_Type(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 227 "ftam.cnf"
  gint8 class;
  gboolean pc, ind_field;
  gint32 tag;
@@ -4185,6 +4261,7 @@ dissect_ftam_Request_Type(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset,
                                   NULL);
 
 
+
   return offset;
 }
 static int dissect_request_type(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -4358,6 +4435,7 @@ static const ber_choice_t Bulk_Data_PDU_choice[] = {
 
 static int
 dissect_ftam_Bulk_Data_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 741 "ftam.cnf"
   gint branch_taken;
 
     offset = dissect_ber_choice(pinfo, tree, tvb, offset,
@@ -4372,6 +4450,7 @@ dissect_ftam_Bulk_Data_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset,
   }
 
 
+
   return offset;
 }
 static int dissect_bulk_Data_PDU(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -4828,9 +4907,11 @@ static int dissect_attribute_extension_attribute_identifier(packet_info *pinfo,
 
 static int
 dissect_ftam_T_extension_attribute_Pattern(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 83 "ftam.cnf"
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree);
 
 
+
   return offset;
 }
 static int dissect_extension_attribute_Pattern(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -4994,6 +5075,7 @@ static const ber_sequence_t Attribute_Value_Assertions_sequence_of[1] = {
 
 static int
 dissect_ftam_Attribute_Value_Assertions(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 632 "ftam.cnf"
  gint8 class;
  gboolean pc, ind_field;
  gint32 tag;
@@ -5009,6 +5091,7 @@ dissect_ftam_Attribute_Value_Assertions(gboolean implicit_tag _U_, tvbuff_t *tvb
   offset = dissect_ftam_OR_Set(TRUE, tvb, offset, pinfo, tree, hf_index);
 
 
+
   return offset;
 }
 static int dissect_attribute_value_asset_tions(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -5062,6 +5145,7 @@ static const ber_sequence_t Scope_sequence_of[1] = {
 
 static int
 dissect_ftam_Scope(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 552 "ftam.cnf"
  gint8 class;
  gboolean pc, ind_field;
  gint32 tag;
@@ -5078,6 +5162,7 @@ dissect_ftam_Scope(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_
                                    Scope_sequence_of, hf_index, ett_ftam_Scope);
 
 
+
   return offset;
 }
 static int dissect_scope(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -5113,6 +5198,7 @@ static const ber_sequence_t Objects_Attributes_List_sequence_of[1] = {
 
 static int
 dissect_ftam_Objects_Attributes_List(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 568 "ftam.cnf"
  gint8 class;
  gboolean pc, ind_field;
  gint32 tag;
@@ -5130,6 +5216,7 @@ dissect_ftam_Objects_Attributes_List(gboolean implicit_tag _U_, tvbuff_t *tvb, i
 
 
 
+
   return offset;
 }
 static int dissect_objects_attributes_list(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -5209,6 +5296,7 @@ static const value_string ftam_Request_Operation_Result_vals[] = {
 
 static int
 dissect_ftam_Request_Operation_Result(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 601 "ftam.cnf"
  gint8 class;
  gboolean pc, ind_field;
  gint32 tag;
@@ -5225,6 +5313,7 @@ dissect_ftam_Request_Operation_Result(gboolean implicit_tag _U_, tvbuff_t *tvb,
                                   NULL);
 
 
+
   return offset;
 }
 static int dissect_request_Operation_result(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -5280,6 +5369,7 @@ static const ber_choice_t Operation_Result_choice[] = {
 
 static int
 dissect_ftam_Operation_Result(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 695 "ftam.cnf"
  gint8 class;
  gboolean pc, ind_field;
  gint32 tag;
@@ -5295,6 +5385,7 @@ dissect_ftam_Operation_Result(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs
   offset = dissect_ber_choice(pinfo, tree, tvb, offset,
                               Operation_Result_choice, hf_index, ett_ftam_Operation_Result, NULL);
 
+
   return offset;
 }
 static int dissect_operation_result(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -5903,6 +5994,7 @@ static const ber_choice_t FSM_PDU_choice[] = {
 
 static int
 dissect_ftam_FSM_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 755 "ftam.cnf"
   gint branch_taken;
 
     offset = dissect_ber_choice(pinfo, tree, tvb, offset,
@@ -5916,6 +6008,7 @@ dissect_ftam_FSM_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packe
 	}
   }
 
+
   return offset;
 }
 static int dissect_fSM_PDU(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -6004,7 +6097,7 @@ dissect_ftam_Other_Pattern(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset,
 
 
 /*--- End of included file: packet-ftam-fn.c ---*/
-
+#line 64 "packet-ftam-template.c"
 
 /*
 * Dissect FTAM PDUs inside a PPDU.
@@ -6046,7 +6139,7 @@ void proto_register_ftam(void) {
   {
 
 /*--- Included file: packet-ftam-hfarr.c ---*/
-
+#line 1 "packet-ftam-hfarr.c"
     { &hf_ftam_fTAM_Regime_PDU,
       { "fTAM-Regime-PDU", "ftam.fTAM_Regime_PDU",
         FT_UINT32, BASE_DEC, VALS(ftam_FTAM_Regime_PDU_vals), 0,
@@ -6161,11 +6254,11 @@ void proto_register_ftam(void) {
         "Contents-Type-List/_item", HFILL }},
     { &hf_ftam_document_type_name,
       { "document-type-name", "ftam.document_type_name",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "", HFILL }},
     { &hf_ftam_abstract_Syntax_name,
       { "abstract-Syntax-name", "ftam.abstract_Syntax_name",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "", HFILL }},
     { &hf_ftam_charging,
       { "charging", "ftam.charging",
@@ -6361,7 +6454,7 @@ void proto_register_ftam(void) {
         "", HFILL }},
     { &hf_ftam_remove_contexts_item,
       { "Item", "ftam.remove_contexts_item",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "", HFILL }},
     { &hf_ftam_define_contexts,
       { "define-contexts", "ftam.define_contexts",
@@ -6369,7 +6462,7 @@ void proto_register_ftam(void) {
         "", HFILL }},
     { &hf_ftam_define_contexts_item,
       { "Item", "ftam.define_contexts_item",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "", HFILL }},
     { &hf_ftam_degree_of_overlap,
       { "degree-of-overlap", "ftam.degree_of_overlap",
@@ -6861,7 +6954,7 @@ void proto_register_ftam(void) {
         "Contents-Type-Attribute/constraint-set-and-abstract-Syntax", HFILL }},
     { &hf_ftam_constraint_set_name,
       { "constraint-set-name", "ftam.constraint_set_name",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "Contents-Type-Attribute/constraint-set-and-abstract-Syntax/constraint-set-name", HFILL }},
     { &hf_ftam_actual_values5,
       { "actual-values", "ftam.actual_values",
@@ -7097,7 +7190,7 @@ void proto_register_ftam(void) {
         "Attribute-Extension-Names/_item", HFILL }},
     { &hf_ftam_extension_set_identifier,
       { "extension-set-identifier", "ftam.extension_set_identifier",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "", HFILL }},
     { &hf_ftam_extension_attribute_names,
       { "extension-attribute-names", "ftam.extension_attribute_names",
@@ -7105,7 +7198,7 @@ void proto_register_ftam(void) {
         "Attribute-Extension-Set-Name/extension-attribute-names", HFILL }},
     { &hf_ftam_extension_attribute_names_item,
       { "Item", "ftam.extension_attribute_names_item",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "Attribute-Extension-Set-Name/extension-attribute-names/_item", HFILL }},
     { &hf_ftam_Attribute_Extensions_item,
       { "Item", "ftam.Attribute_Extensions_item",
@@ -7121,7 +7214,7 @@ void proto_register_ftam(void) {
         "Attribute-Extension-Set/extension-set-attributes/_item", HFILL }},
     { &hf_ftam_extension_attribute_identifier,
       { "extension-attribute-identifier", "ftam.extension_attribute_identifier",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "Extension-Attribute/extension-attribute-identifier", HFILL }},
     { &hf_ftam_extension_attribute,
       { "extension-attribute", "ftam.extension_attribute",
@@ -7293,7 +7386,7 @@ void proto_register_ftam(void) {
         "Integer-Pattern/integer-value", HFILL }},
     { &hf_ftam_object_identifier_value,
       { "object-identifier-value", "ftam.object_identifier_value",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "Object-Identifier-Pattern/object-identifier-value", HFILL }},
     { &hf_ftam_boolean_value,
       { "boolean-value", "ftam.boolean_value",
@@ -7329,7 +7422,7 @@ void proto_register_ftam(void) {
         "Attribute-Extensions-Pattern/_item/extension-set-attribute-Patterns/_item", HFILL }},
     { &hf_ftam_attribute_extension_attribute_identifier,
       { "extension-attribute-identifier", "ftam.extension_attribute_identifier",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "Attribute-Extensions-Pattern/_item/extension-set-attribute-Patterns/_item/extension-attribute-identifier", HFILL }},
     { &hf_ftam_extension_attribute_Pattern,
       { "extension-attribute-Pattern", "ftam.extension_attribute_Pattern",
@@ -7717,7 +7810,7 @@ void proto_register_ftam(void) {
         "", HFILL }},
 
 /*--- End of included file: packet-ftam-hfarr.c ---*/
-
+#line 104 "packet-ftam-template.c"
   };
 
   /* List of subtrees */
@@ -7725,7 +7818,7 @@ void proto_register_ftam(void) {
     &ett_ftam,
 
 /*--- Included file: packet-ftam-ettarr.c ---*/
-
+#line 1 "packet-ftam-ettarr.c"
     &ett_ftam_PDU,
     &ett_ftam_FTAM_Regime_PDU,
     &ett_ftam_F_INITIALIZE_request,
@@ -7893,7 +7986,7 @@ void proto_register_ftam(void) {
     &ett_ftam_Attribute_Value_Assertions,
 
 /*--- End of included file: packet-ftam-ettarr.c ---*/
-
+#line 110 "packet-ftam-template.c"
   };
 
   /* Register protocol */
diff --git a/epan/dissectors/packet-ftam.h b/epan/dissectors/packet-ftam.h
index f7dbf28b88..7503710254 100644
--- a/epan/dissectors/packet-ftam.h
+++ b/epan/dissectors/packet-ftam.h
@@ -1,10 +1,11 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-ftam.h                                                            */
+/* ./packet-ftam.h                                                            */
 /* ../../tools/asn2eth.py -X -b -e -p ftam -c ftam.cnf -s packet-ftam-template ISO8571-FTAM.asn */
 
 /* Input file: packet-ftam-template.h */
 
+#line 1 "packet-ftam-template.h"
 /* packet-ftam.h
  * Routine to dissect OSI ISO 8571 FTAM Protocol packets
  * based on the ASN.1 specification from http://www.itu.int/ITU-T/asn1/database/iso/8571-4/1988/
@@ -40,7 +41,7 @@
 
 
 /*--- Included file: packet-ftam-exp.h ---*/
-
+#line 1 "packet-ftam-exp.h"
 extern const value_string ftam_Date_and_Time_Attribute_vals[];
 extern const value_string ftam_Object_Availability_Attribute_vals[];
 extern const value_string ftam_Object_Size_Attribute_vals[];
@@ -57,6 +58,6 @@ int dissect_ftam_Attribute_Extensions(gboolean implicit_tag, tvbuff_t *tvb, int
 int dissect_ftam_Pathname(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
 
 /*--- End of included file: packet-ftam-exp.h ---*/
-
+#line 35 "packet-ftam-template.h"
 
 #endif  /* PACKET_FTAM_H */
diff --git a/epan/dissectors/packet-ftbp.c b/epan/dissectors/packet-ftbp.c
index a853b0f6b4..961f501bf9 100644
--- a/epan/dissectors/packet-ftbp.c
+++ b/epan/dissectors/packet-ftbp.c
@@ -1,10 +1,11 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-ftbp.c                                                            */
+/* ./packet-ftbp.c                                                            */
 /* ../../tools/asn2eth.py -X -b -e -p ftbp -c ftbp.cnf -s packet-ftbp-template ftbp.asn */
 
 /* Input file: packet-ftbp-template.c */
 
+#line 1 "packet-ftbp-template.c"
 /* packet-ftbp.c
  * Routines for File Transfer Body Part (FTBP) dissection (used in X.420 content)
  * Graeme Lunt 2005
@@ -59,7 +60,7 @@ int proto_ftbp = -1;
 
 
 /*--- Included file: packet-ftbp-hf.c ---*/
-
+#line 1 "packet-ftbp-hf.c"
 static int hf_ftbp_FileTransferParameters_PDU = -1;  /* FileTransferParameters */
 static int hf_ftbp_FileTransferData_PDU = -1;     /* FileTransferData */
 static int hf_ftbp_related_stored_file = -1;      /* RelatedStoredFile */
@@ -154,13 +155,13 @@ static int hf_ftbp_Access_Request_change_attribute = -1;
 static int hf_ftbp_Access_Request_delete_object = -1;
 
 /*--- End of included file: packet-ftbp-hf.c ---*/
-
+#line 54 "packet-ftbp-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_ftbp = -1;
 
 /*--- Included file: packet-ftbp-ett.c ---*/
-
+#line 1 "packet-ftbp-ett.c"
 static gint ett_ftbp_FileTransferParameters = -1;
 static gint ett_ftbp_FileTransferData = -1;
 static gint ett_ftbp_RelatedStoredFile = -1;
@@ -192,11 +193,11 @@ static gint ett_ftbp_Pass_Passwords = -1;
 static gint ett_ftbp_Application_Entity_Title = -1;
 
 /*--- End of included file: packet-ftbp-ett.c ---*/
-
+#line 58 "packet-ftbp-template.c"
 
 
 /*--- Included file: packet-ftbp-fn.c ---*/
-
+#line 1 "packet-ftbp-fn.c"
 /*--- Fields for imported types ---*/
 
 static int dissect_extensions_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -530,9 +531,11 @@ static int dissect_document_type_name(packet_info *pinfo, proto_tree *tree, tvbu
 
 static int
 dissect_ftbp_T_parameter(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 26 "ftbp.cnf"
 /* XXX: Not implemented yet */
 
 
+
   return offset;
 }
 static int dissect_parameter_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -735,7 +738,9 @@ static int dissect_environment_impl(packet_info *pinfo, proto_tree *tree, tvbuff
 
 static int
 dissect_ftbp_T_compression_algorithm_param(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 29 "ftbp.cnf"
 /* XXX: Not implemented yet */
+
   return offset;
 }
 static int dissect_compression_algorithm_param_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -1138,7 +1143,7 @@ static void dissect_FileTransferData_PDU(tvbuff_t *tvb, packet_info *pinfo, prot
 
 
 /*--- End of included file: packet-ftbp-fn.c ---*/
-
+#line 60 "packet-ftbp-template.c"
 
 
 /*--- proto_register_ftbp -------------------------------------------*/
@@ -1149,7 +1154,7 @@ void proto_register_ftbp(void) {
   {
 
 /*--- Included file: packet-ftbp-hfarr.c ---*/
-
+#line 1 "packet-ftbp-hfarr.c"
     { &hf_ftbp_FileTransferParameters_PDU,
       { "FileTransferParameters", "ftbp.FileTransferParameters",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -1248,7 +1253,7 @@ void proto_register_ftbp(void) {
         "Contents-Type-Attribute/document-type", HFILL }},
     { &hf_ftbp_document_type_name,
       { "document-type-name", "ftbp.document_type_name",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "Contents-Type-Attribute/document-type/document-type-name", HFILL }},
     { &hf_ftbp_parameter,
       { "parameter", "ftbp.parameter",
@@ -1260,11 +1265,11 @@ void proto_register_ftbp(void) {
         "Contents-Type-Attribute/constraint-set-and-abstract-syntax", HFILL }},
     { &hf_ftbp_constraint_set_name,
       { "constraint-set-name", "ftbp.constraint_set_name",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "Contents-Type-Attribute/constraint-set-and-abstract-syntax/constraint-set-name", HFILL }},
     { &hf_ftbp_abstract_syntax_name,
       { "abstract-syntax-name", "ftbp.abstract_syntax_name",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "Contents-Type-Attribute/constraint-set-and-abstract-syntax/abstract-syntax-name", HFILL }},
     { &hf_ftbp_application_reference,
       { "application-reference", "ftbp.application_reference",
@@ -1276,7 +1281,7 @@ void proto_register_ftbp(void) {
         "EnvironmentParameter/machine", HFILL }},
     { &hf_ftbp_operating_system,
       { "operating-system", "ftbp.operating_system",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "EnvironmentParameter/operating-system", HFILL }},
     { &hf_ftbp_user_visible_string,
       { "user-visible-string", "ftbp.user_visible_string",
@@ -1288,7 +1293,7 @@ void proto_register_ftbp(void) {
         "EnvironmentParameter/user-visible-string/_item", HFILL }},
     { &hf_ftbp_registered_identifier,
       { "registered-identifier", "ftbp.registered_identifier",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "GeneralIdentifier/registered-identifier", HFILL }},
     { &hf_ftbp_descriptive_identifier,
       { "descriptive-identifier", "ftbp.descriptive_identifier",
@@ -1300,7 +1305,7 @@ void proto_register_ftbp(void) {
         "GeneralIdentifier/descriptive-identifier/_item", HFILL }},
     { &hf_ftbp_compression_algorithm_id,
       { "compression-algorithm-id", "ftbp.compression_algorithm_id",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "CompressionParameter/compression-algorithm-id", HFILL }},
     { &hf_ftbp_compression_algorithm_param,
       { "compression-algorithm-param", "ftbp.compression_algorithm_param",
@@ -1516,7 +1521,7 @@ void proto_register_ftbp(void) {
         "", HFILL }},
 
 /*--- End of included file: packet-ftbp-hfarr.c ---*/
-
+#line 69 "packet-ftbp-template.c"
   };
 
   /* List of subtrees */
@@ -1524,7 +1529,7 @@ void proto_register_ftbp(void) {
     &ett_ftbp,
 
 /*--- Included file: packet-ftbp-ettarr.c ---*/
-
+#line 1 "packet-ftbp-ettarr.c"
     &ett_ftbp_FileTransferParameters,
     &ett_ftbp_FileTransferData,
     &ett_ftbp_RelatedStoredFile,
@@ -1556,7 +1561,7 @@ void proto_register_ftbp(void) {
     &ett_ftbp_Application_Entity_Title,
 
 /*--- End of included file: packet-ftbp-ettarr.c ---*/
-
+#line 75 "packet-ftbp-template.c"
   };
 
   /* Register protocol */
@@ -1573,12 +1578,12 @@ void proto_register_ftbp(void) {
 void proto_reg_handoff_ftbp(void) {
 
 /*--- Included file: packet-ftbp-dis-tab.c ---*/
-
+#line 1 "packet-ftbp-dis-tab.c"
   register_ber_oid_dissector("2.6.1.11.12", dissect_FileTransferParameters_PDU, proto_ftbp, "id-ep-file-transfer");
   register_ber_oid_dissector("2.6.1.4.12", dissect_FileTransferData_PDU, proto_ftbp, "id-et-file-transfer");
 
 
 /*--- End of included file: packet-ftbp-dis-tab.c ---*/
-
+#line 90 "packet-ftbp-template.c"
 
 }
diff --git a/epan/dissectors/packet-ftbp.h b/epan/dissectors/packet-ftbp.h
index 8af964a2fb..4e4ae47c15 100644
--- a/epan/dissectors/packet-ftbp.h
+++ b/epan/dissectors/packet-ftbp.h
@@ -1,10 +1,11 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-ftbp.h                                                            */
+/* ./packet-ftbp.h                                                            */
 /* ../../tools/asn2eth.py -X -b -e -p ftbp -c ftbp.cnf -s packet-ftbp-template ftbp.asn */
 
 /* Input file: packet-ftbp-template.h */
 
+#line 1 "packet-ftbp-template.h"
 /* packet-ftbp.h
  * Routines for File Transfer Body Part (FTBP) dissection (used in X.420 content)
  * Graeme Lunt 2005
diff --git a/epan/dissectors/packet-gnm.c b/epan/dissectors/packet-gnm.c
index 968b7d78a9..6e81dca602 100644
--- a/epan/dissectors/packet-gnm.c
+++ b/epan/dissectors/packet-gnm.c
@@ -1,10 +1,11 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-gnm.c                                                             */
+/* ./packet-gnm.c                                                             */
 /* ../../tools/asn2eth.py -X -b -e -p gnm -c gnm.cnf -s packet-gnm-template GNM.asn */
 
 /* Input file: packet-gnm-template.c */
 
+#line 1 "packet-gnm-template.c"
 /* packet-gnm.c
  * Routines for GENERIC NETWORK INFORMATION MODEL Data dissection
  *
@@ -58,7 +59,7 @@ int proto_gnm = -1;
 static int hf_gnm_AdministrativeState = -1;
 
 /*--- Included file: packet-gnm-hf.c ---*/
-
+#line 1 "packet-gnm-hf.c"
 static int hf_gnm_AdministrativeState_PDU = -1;   /* AdministrativeState */
 static int hf_gnm_ControlStatus_PDU = -1;         /* ControlStatus */
 static int hf_gnm_Packages_PDU = -1;              /* Packages */
@@ -283,12 +284,12 @@ static int hf_gnm_TransmissionCharacteristics_dCME = -1;
 static int hf_gnm_TransmissionCharacteristics_echoControl = -1;
 
 /*--- End of included file: packet-gnm-hf.c ---*/
-
+#line 53 "packet-gnm-template.c"
 
 /* Initialize the subtree pointers */
 
 /*--- Included file: packet-gnm-ett.c ---*/
-
+#line 1 "packet-gnm-ett.c"
 static gint ett_gnm_ProbableCause = -1;
 static gint ett_gnm_AvailabilityStatus = -1;
 static gint ett_gnm_AttributeList = -1;
@@ -397,11 +398,11 @@ static gint ett_gnm_TpsInGtpList = -1;
 static gint ett_gnm_TransmissionCharacteristics = -1;
 
 /*--- End of included file: packet-gnm-ett.c ---*/
-
+#line 56 "packet-gnm-template.c"
 
 
 /*--- Included file: packet-gnm-fn.c ---*/
-
+#line 1 "packet-gnm-fn.c"
 /*--- Fields for imported types ---*/
 
 static int dissect_AttributeList_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -723,9 +724,11 @@ static int dissect_redline1(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
 
 static int
 dissect_gnm_T_information(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 27 "gnm.cnf"
 /* FIX ME */
 
 
+
   return offset;
 }
 static int dissect_information_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -3366,7 +3369,7 @@ static void dissect_Version_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t
 
 
 /*--- End of included file: packet-gnm-fn.c ---*/
-
+#line 58 "packet-gnm-template.c"
 
 
 
@@ -3378,7 +3381,7 @@ dissect_gnm_attribute_ObjectInstance(tvbuff_t *tvb, packet_info *pinfo, proto_tr
 
 }
 
-static void
+void
 dissect_gnm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 {
   /* Dymmy function */
@@ -3396,7 +3399,7 @@ void proto_register_gnm(void) {
 
 
 /*--- Included file: packet-gnm-hfarr.c ---*/
-
+#line 1 "packet-gnm-hfarr.c"
     { &hf_gnm_AdministrativeState_PDU,
       { "AdministrativeState", "gnm.AdministrativeState",
         FT_UINT32, BASE_DEC, VALS(gnm_AdministrativeState_vals), 0,
@@ -3435,7 +3438,7 @@ void proto_register_gnm(void) {
         "ChannelNumber", HFILL }},
     { &hf_gnm_CharacteristicInformation_PDU,
       { "CharacteristicInformation", "gnm.CharacteristicInformation",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "CharacteristicInformation", HFILL }},
     { &hf_gnm_CircuitDirectionality_PDU,
       { "CircuitDirectionality", "gnm.CircuitDirectionality",
@@ -3575,7 +3578,7 @@ void proto_register_gnm(void) {
         "Version", HFILL }},
     { &hf_gnm_globalValue,
       { "globalValue", "gnm.globalValue",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "", HFILL }},
     { &hf_gnm_localValue,
       { "localValue", "gnm.localValue",
@@ -3599,7 +3602,7 @@ void proto_register_gnm(void) {
         "ControlStatus/_item", HFILL }},
     { &hf_gnm_identifier,
       { "identifier", "gnm.identifier",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "ManagementExtension/identifier", HFILL }},
     { &hf_gnm_significance,
       { "significance", "gnm.significance",
@@ -3611,23 +3614,23 @@ void proto_register_gnm(void) {
         "ManagementExtension/information", HFILL }},
     { &hf_gnm_MappingList_item,
       { "Item", "gnm.MappingList_item",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "MappingList/_item", HFILL }},
     { &hf_gnm_Packages_item,
       { "Item", "gnm.Packages_item",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "Packages/_item", HFILL }},
     { &hf_gnm_objectClass,
       { "objectClass", "gnm.objectClass",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "SignalRate/objectClass", HFILL }},
     { &hf_gnm_characteristicInformation,
       { "characteristicInformation", "gnm.characteristicInformation",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "SignalRate/characteristicInformation", HFILL }},
     { &hf_gnm_SupportedTOClasses_item,
       { "Item", "gnm.SupportedTOClasses_item",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "SupportedTOClasses/_item", HFILL }},
     { &hf_gnm_AcceptableCircuitPackTypeList_item,
       { "Item", "gnm.AcceptableCircuitPackTypeList_item",
@@ -3727,7 +3730,7 @@ void proto_register_gnm(void) {
         "AlarmSeverityAssignmentList/_item", HFILL }},
     { &hf_gnm_characteristicInfoType,
       { "characteristicInfoType", "gnm.characteristicInfoType",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "Bundle/characteristicInfoType", HFILL }},
     { &hf_gnm_bundlingFactor,
       { "bundlingFactor", "gnm.bundlingFactor",
@@ -3971,7 +3974,7 @@ void proto_register_gnm(void) {
         "IndividualResult/pass", HFILL }},
     { &hf_gnm_ListOfCharacteristicInformation_item,
       { "Item", "gnm.ListOfCharacteristicInformation_item",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "ListOfCharacteristicInformation/_item", HFILL }},
     { &hf_gnm_ListOfTPs_item,
       { "Item", "gnm.ListOfTPs_item",
@@ -4167,7 +4170,7 @@ void proto_register_gnm(void) {
         "SignalRateAndMappingList/_item/wavelength", HFILL }},
     { &hf_gnm_simple,
       { "simple", "gnm.simple",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "SignalType/simple", HFILL }},
     { &hf_gnm_bundle,
       { "bundle", "gnm.bundle",
@@ -4283,14 +4286,14 @@ void proto_register_gnm(void) {
         "", HFILL }},
 
 /*--- End of included file: packet-gnm-hfarr.c ---*/
-
+#line 86 "packet-gnm-template.c"
   };
 
   /* List of subtrees */
   static gint *ett[] = {
 
 /*--- Included file: packet-gnm-ettarr.c ---*/
-
+#line 1 "packet-gnm-ettarr.c"
     &ett_gnm_ProbableCause,
     &ett_gnm_AvailabilityStatus,
     &ett_gnm_AttributeList,
@@ -4399,7 +4402,7 @@ void proto_register_gnm(void) {
     &ett_gnm_TransmissionCharacteristics,
 
 /*--- End of included file: packet-gnm-ettarr.c ---*/
-
+#line 91 "packet-gnm-template.c"
   };
 
   /* Register protocol */
@@ -4416,7 +4419,7 @@ void proto_register_gnm(void) {
 void proto_reg_handoff_gnm(void) {
 
 /*--- Included file: packet-gnm-dis-tab.c ---*/
-
+#line 1 "packet-gnm-dis-tab.c"
   register_ber_oid_dissector("0.0.13.3100.0.7.1", dissect_RelatedObjectInstance_PDU, proto_gnm, "a-TPInstance(1)");
   register_ber_oid_dissector("0.0.13.3100.0.7.2", dissect_ObjectList_PDU, proto_gnm, "affectedObjectList(2)");
   register_ber_oid_dissector("0.0.13.3100.0.7.3", dissect_AlarmSeverityAssignmentList_PDU, proto_gnm, "alarmSeverityAssignmentList(3)");
@@ -4489,7 +4492,7 @@ void proto_reg_handoff_gnm(void) {
 
 
 /*--- End of included file: packet-gnm-dis-tab.c ---*/
-
+#line 106 "packet-gnm-template.c"
 	register_ber_oid_dissector("0.0.13.3100.0.7.9", dissect_gnm_attribute_ObjectInstance, proto_gnm, "clientConnection(9)");
 	register_ber_oid_dissector("0.0.13.3100.0.7.10", dissect_gnm_attribute_ObjectInstance, proto_gnm, "clientTrail(10)");
 	register_ber_oid_dissector("0.0.13.3100.0.7.31", dissect_gnm_attribute_ObjectInstance, proto_gnm, "networkLevelPointer(31)");
diff --git a/epan/dissectors/packet-gnm.h b/epan/dissectors/packet-gnm.h
index d5eee5b69e..4d82856de8 100644
--- a/epan/dissectors/packet-gnm.h
+++ b/epan/dissectors/packet-gnm.h
@@ -1,10 +1,11 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-gnm.h                                                             */
+/* ./packet-gnm.h                                                             */
 /* ../../tools/asn2eth.py -X -b -e -p gnm -c gnm.cnf -s packet-gnm-template GNM.asn */
 
 /* Input file: packet-gnm-template.h */
 
+#line 1 "packet-gnm-template.h"
 /* packet-gnm.c
  * Routines for GENERIC NETWORK INFORMATION MODEL Data dissection
  *
diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c
index a162472aa4..cb2e302c06 100644
--- a/epan/dissectors/packet-gsm_map.c
+++ b/epan/dissectors/packet-gsm_map.c
@@ -1,10 +1,11 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-gsm_map.c                                                         */
+/* ./packet-gsm_map.c                                                         */
 /* ../../tools/asn2eth.py -X -b -e -p gsm_map -c gsmmap.cnf -s packet-gsm_map-template GSMMAP.asn */
 
 /* Input file: packet-gsm_map-template.c */
 
+#line 1 "packet-gsm_map-template.c"
 /* packet-gsm_map-template.c
  * Routines for GSM MobileApplication packet dissection
  * Copyright 2004 - 2005 , Anders Broman <anders.broman [AT] ericsson.com>
@@ -99,7 +100,7 @@ static int hf_gsm_map_ietf_pdp_type_number = -1;
 
 
 /*--- Included file: packet-gsm_map-hf.c ---*/
-
+#line 1 "packet-gsm_map-hf.c"
 static int hf_gsm_map_protocolId = -1;            /* ProtocolId */
 static int hf_gsm_map_signalInfo = -1;            /* SignalInfo */
 static int hf_gsm_map_extensionContainer = -1;    /* ExtensionContainer */
@@ -896,7 +897,7 @@ static int hf_gsm_map_SupportedGADShapes_ellipsoidPointWithAltitudeAndUncertaint
 static int hf_gsm_map_SupportedGADShapes_ellipsoidArc = -1;
 
 /*--- End of included file: packet-gsm_map-hf.c ---*/
-
+#line 94 "packet-gsm_map-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_gsm_map = -1;
@@ -910,7 +911,7 @@ static gint ett_gsm_map_GSMMAPPDU = -1;
 
 
 /*--- Included file: packet-gsm_map-ett.c ---*/
-
+#line 1 "packet-gsm_map-ett.c"
 static gint ett_gsm_map_Bss_APDU = -1;
 static gint ett_gsm_map_SupportedCamelPhases = -1;
 static gint ett_gsm_map_UpdateLocationArg = -1;
@@ -1288,7 +1289,7 @@ static gint ett_gsm_map_UnknownOrUnreachableLCSClient_Param = -1;
 static gint ett_gsm_map_ExtensionContainer = -1;
 
 /*--- End of included file: packet-gsm_map-ett.c ---*/
-
+#line 106 "packet-gsm_map-template.c"
 
 static dissector_table_t	sms_dissector_table;	/* SMS TPDU */
 static dissector_handle_t data_handle;
@@ -1347,7 +1348,7 @@ unpack_digits(tvbuff_t *tvb, int offset){
 
 
 /*--- Included file: packet-gsm_map-fn.c ---*/
-
+#line 1 "packet-gsm_map-fn.c"
 /*--- Fields for imported types ---*/
 
 
@@ -1376,6 +1377,7 @@ static int dissect_protocolId(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
 
 static int
 dissect_gsm_map_SignalInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 306 "gsmmap.cnf"
 
  tvbuff_t	*parameter_tvb;
  guint8		octet;
@@ -1417,6 +1419,7 @@ dissect_gsm_map_SignalInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset,
 }
 
 
+
   return offset;
 }
 static int dissect_signalInfo(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -1442,12 +1445,14 @@ static int dissect_globalValue(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
 
 static int
 dissect_gsm_map_T_extType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 381 "gsmmap.cnf"
 
   proto_tree_add_text(tree, tvb, offset, -1, "Extension Data");
   call_dissector(data_handle, tvb, pinfo, tree);	
   offset = tvb_length_remaining(tvb,offset);		
 
 
+
   return offset;
 }
 static int dissect_extType(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -1597,6 +1602,7 @@ static int dissect_supportedCAMELPhases_impl(packet_info *pinfo, proto_tree *tre
 
 int
 dissect_gsm_map_IMSI(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 144 "gsmmap.cnf"
 
  tvbuff_t	*parameter_tvb;
  char		*digit_str;
@@ -1615,6 +1621,7 @@ dissect_gsm_map_IMSI(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packe
 
 
 
+
   return offset;
 }
 static int dissect_imsi(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -1628,6 +1635,7 @@ static int dissect_imsi_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
 
 int
 dissect_gsm_map_ISDN_AddressString(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 191 "gsmmap.cnf"
 
  tvbuff_t	*parameter_tvb;
  char		*digit_str;
@@ -1651,6 +1659,7 @@ dissect_gsm_map_ISDN_AddressString(gboolean implicit_tag _U_, tvbuff_t *tvb, int
 
 
 
+
   return offset;
 }
 static int dissect_msc_Number(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -3065,6 +3074,7 @@ static int dissect_accessNetworkProtocolId(packet_info *pinfo, proto_tree *tree,
 
 static int
 dissect_gsm_map_LongSignalInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 350 "gsmmap.cnf"
 
  tvbuff_t	*parameter_tvb;
  guint8		octet;
@@ -3097,6 +3107,7 @@ dissect_gsm_map_LongSignalInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int off
 
  }
 
+
   return offset;
 }
 static int dissect_longsignalInfo(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -4662,6 +4673,7 @@ static int dissect_BasicServiceCriteria_item(packet_info *pinfo, proto_tree *tre
 
 static int
 dissect_gsm_map_Ext_SS_Status(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 268 "gsmmap.cnf"
  /* Note Ext-SS-Status can have more than one byte */
 
  tvbuff_t	*parameter_tvb;
@@ -4686,6 +4698,7 @@ dissect_gsm_map_Ext_SS_Status(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs
 
 
 
+
   return offset;
 }
 static int dissect_ext_ss_Status(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -4727,12 +4740,14 @@ static int
 dissect_gsm_map_T_forwardingOptions(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_gsm_map_Ext_ForwOptions(implicit_tag, tvb, offset, pinfo, tree, hf_index);
 
+#line 394 "gsmmap.cnf"
 
 	proto_tree_add_item(tree, hf_gsm_map_notification_to_forwarding_party, tvb, 0,1,FALSE);
 	proto_tree_add_item(tree, hf_gsm_map_redirecting_presentation, tvb, 0,1,FALSE);
 	proto_tree_add_item(tree, hf_gsm_map_notification_to_calling_party, tvb, 0,1,FALSE);
 	proto_tree_add_item(tree, hf_gsm_map_forwarding_reason, tvb, 0,1,FALSE);
 
+
   return offset;
 }
 static int dissect_ext_forwardingOptions_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -4756,6 +4771,7 @@ static int dissect_ext_noReplyConditionTime_impl(packet_info *pinfo, proto_tree
 
 int
 dissect_gsm_map_AddressString(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 218 "gsmmap.cnf"
 
  tvbuff_t	*parameter_tvb;
  char		*digit_str;
@@ -4776,6 +4792,7 @@ dissect_gsm_map_AddressString(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs
  proto_tree_add_string(tree, hf_gsm_map_address_digits, parameter_tvb, 1, -1, digit_str);
 
 
+
   return offset;
 }
 static int dissect_forwardedToNumber_addr_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -6152,6 +6169,7 @@ static int dissect_pdp_ContextIdentifier_impl(packet_info *pinfo, proto_tree *tr
 
 static int
 dissect_gsm_map_PDP_Type(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 405 "gsmmap.cnf"
 	guint8 pdp_type_org;
 	tvbuff_t	*parameter_tvb;
 
@@ -6176,6 +6194,7 @@ dissect_gsm_map_PDP_Type(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, p
 	}
 
 
+
   return offset;
 }
 static int dissect_pdp_Type_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -6199,6 +6218,7 @@ static int dissect_pdp_Address_impl(packet_info *pinfo, proto_tree *tree, tvbuff
 
 int
 dissect_gsm_map_QoS_Subscribed(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 431 "gsmmap.cnf"
 
 	tvbuff_t	*parameter_tvb;
 
@@ -6212,6 +6232,7 @@ dissect_gsm_map_QoS_Subscribed(gboolean implicit_tag _U_, tvbuff_t *tvb, int off
 	de_sm_qos(parameter_tvb, tree, 0, 3, NULL,0);
 
 
+
   return offset;
 }
 static int dissect_qos_Subscribed_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -6244,6 +6265,7 @@ static int dissect_lcsAPN_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
 
 int
 dissect_gsm_map_Ext_QoS_Subscribed(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 446 "gsmmap.cnf"
 
 	tvbuff_t	*parameter_tvb;
 
@@ -6257,6 +6279,7 @@ dissect_gsm_map_Ext_QoS_Subscribed(gboolean implicit_tag _U_, tvbuff_t *tvb, int
 	de_sm_qos(parameter_tvb, tree, 0, 9, NULL, 0);
 
 
+
   return offset;
 }
 static int dissect_ext_QoS_Subscribed_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -7344,6 +7367,7 @@ dissect_gsm_map_DeleteSubscriberDataRes(gboolean implicit_tag _U_, tvbuff_t *tvb
 
 int
 dissect_gsm_map_SS_Status(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 241 "gsmmap.cnf"
 
  tvbuff_t	*parameter_tvb;
  guint8		octet;
@@ -7367,6 +7391,7 @@ dissect_gsm_map_SS_Status(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset,
 
 
 
+
   return offset;
 }
 static int dissect_ss_Status(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -7471,11 +7496,13 @@ dissect_gsm_map_ForwardingOptions(gboolean implicit_tag _U_, tvbuff_t *tvb, int
   offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index,
                                        NULL);
 
+#line 388 "gsmmap.cnf"
 
 	proto_tree_add_item(tree, hf_gsm_map_notification_to_forwarding_party, tvb, 0,1,FALSE);
 	proto_tree_add_item(tree, hf_gsm_map_redirecting_presentation, tvb, 0,1,FALSE);
 	proto_tree_add_item(tree, hf_gsm_map_notification_to_calling_party, tvb, 0,1,FALSE);
 	proto_tree_add_item(tree, hf_gsm_map_forwarding_reason, tvb, 0,1,FALSE);
+
   return offset;
 }
 static int dissect_forwardingOptions_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -9976,6 +10003,7 @@ dissect_gsm_map_EraseCC_EntryRes(gboolean implicit_tag _U_, tvbuff_t *tvb, int o
 
 static int
 dissect_gsm_map_ServiceCentreAddress(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 166 "gsmmap.cnf"
 
  tvbuff_t	*parameter_tvb;
  char		*digit_str;
@@ -9997,6 +10025,7 @@ dissect_gsm_map_ServiceCentreAddress(gboolean implicit_tag _U_, tvbuff_t *tvb, i
  pinfo->p2p_dir = P2P_DIR_SENT;
 
 
+
   return offset;
 }
 static int dissect_serviceCentreAddress(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -10180,6 +10209,7 @@ static int dissect_sm_RP_OA(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
 
 static int
 dissect_gsm_map_Sm_RP_UI(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 125 "gsmmap.cnf"
 
   tvbuff_t	*tpdu_tvb;
   	
@@ -10195,6 +10225,7 @@ dissect_gsm_map_Sm_RP_UI(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, p
 
     dissector_try_port(sms_dissector_table, 0, tpdu_tvb, pinfo, top_tree);
 
+
   return offset;
 }
 static int dissect_sm_RP_UI(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -13394,7 +13425,7 @@ dissect_gsm_map_UnknownOrUnreachableLCSClient_Param(gboolean implicit_tag _U_, t
 
 
 /*--- End of included file: packet-gsm_map-fn.c ---*/
-
+#line 163 "packet-gsm_map-template.c"
 
 const value_string gsm_map_opr_code_strings[] = {
   {   2, "updateLocation" },
@@ -14828,7 +14859,7 @@ void proto_register_gsm_map(void) {
 
 
 /*--- Included file: packet-gsm_map-hfarr.c ---*/
-
+#line 1 "packet-gsm_map-hfarr.c"
     { &hf_gsm_map_protocolId,
       { "protocolId", "gsm_map.protocolId",
         FT_UINT32, BASE_DEC, VALS(gsm_map_ProtocolId_vals), 0,
@@ -14935,7 +14966,7 @@ void proto_register_gsm_map(void) {
         "PrivateExtensionList/_item", HFILL }},
     { &hf_gsm_map_extId,
       { "extId", "gsm_map.extId",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "PrivateExtension/extId", HFILL }},
     { &hf_gsm_map_extType,
       { "extType", "gsm_map.extType",
@@ -17519,7 +17550,7 @@ void proto_register_gsm_map(void) {
         "", HFILL }},
     { &hf_gsm_map_globalValue,
       { "globalValue", "gsm_map.globalValue",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "", HFILL }},
     { &hf_gsm_map_networkResource,
       { "networkResource", "gsm_map.networkResource",
@@ -18003,7 +18034,7 @@ void proto_register_gsm_map(void) {
         "", HFILL }},
 
 /*--- End of included file: packet-gsm_map-hfarr.c ---*/
-
+#line 1595 "packet-gsm_map-template.c"
   };
 
   /* List of subtrees */
@@ -18018,7 +18049,7 @@ void proto_register_gsm_map(void) {
     &ett_gsm_map_GSMMAPPDU,
 
 /*--- Included file: packet-gsm_map-ettarr.c ---*/
-
+#line 1 "packet-gsm_map-ettarr.c"
     &ett_gsm_map_Bss_APDU,
     &ett_gsm_map_SupportedCamelPhases,
     &ett_gsm_map_UpdateLocationArg,
@@ -18396,7 +18427,7 @@ void proto_register_gsm_map(void) {
     &ett_gsm_map_ExtensionContainer,
 
 /*--- End of included file: packet-gsm_map-ettarr.c ---*/
-
+#line 1608 "packet-gsm_map-template.c"
   };
 
   /* Register protocol */
diff --git a/epan/dissectors/packet-gsm_map.h b/epan/dissectors/packet-gsm_map.h
index a52a3c73a2..b6921db311 100644
--- a/epan/dissectors/packet-gsm_map.h
+++ b/epan/dissectors/packet-gsm_map.h
@@ -1,10 +1,11 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-gsm_map.h                                                         */
+/* ./packet-gsm_map.h                                                         */
 /* ../../tools/asn2eth.py -X -b -e -p gsm_map -c gsmmap.cnf -s packet-gsm_map-template GSMMAP.asn */
 
 /* Input file: packet-gsm_map-template.h */
 
+#line 1 "packet-gsm_map-template.h"
 /* packet-gsm_map-template.h
  * Routines for GSM MAP packet dissection
  * Copyright 2004, Anders Broman <anders.broman@ericsson.com>
@@ -48,7 +49,7 @@ char* unpack_digits(tvbuff_t *tvb, int offset);
 extern const value_string ssCode_vals[];
 
 /*--- Included file: packet-gsm_map-exp.h ---*/
-
+#line 1 "packet-gsm_map-exp.h"
 extern const value_string gsm_map_NotificationToMSUser_vals[];
 extern const value_string gsm_map_SubscriberState_vals[];
 extern const value_string gsm_map_SS_Info_vals[];
@@ -117,6 +118,6 @@ int dissect_gsm_map_ProtectedPayload(gboolean implicit_tag, tvbuff_t *tvb, int o
 int dissect_gsm_map_ExtensionContainer(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
 
 /*--- End of included file: packet-gsm_map-exp.h ---*/
-
+#line 43 "packet-gsm_map-template.h"
 
 #endif  /* PACKET_GSM_MAP_H */
diff --git a/epan/dissectors/packet-gsm_ss.c b/epan/dissectors/packet-gsm_ss.c
index 17a5591a51..c4de2240ab 100644
--- a/epan/dissectors/packet-gsm_ss.c
+++ b/epan/dissectors/packet-gsm_ss.c
@@ -1,10 +1,11 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-gsm_ss.c                                                          */
+/* ./packet-gsm_ss.c                                                          */
 /* ../../tools/asn2eth.py -X -b -e -p gsm_ss -c gsm_ss.cnf -s packet-gsm_ss-template SS-Operations.asn */
 
 /* Input file: packet-gsm_ss-template.c */
 
+#line 1 "packet-gsm_ss-template.c"
 /* packet-gsm_ss-template.c
  * Routines for GSM Supplementary Services dissection
  * Copyright 2005, Anders Broman <anders.broman@ericsson.com>
@@ -170,7 +171,7 @@ static int hf_gsm_ss_currentPassword = -1;
 static int hf_gsm_ss_SS_Code = -1;
 
 /*--- Included file: packet-gsm_ss-hf.c ---*/
-
+#line 1 "packet-gsm_ss-hf.c"
 static int hf_gsm_ss_notifySS = -1;               /* NotifySS_Arg */
 static int hf_gsm_ss_processUnstructuredSS_Data = -1;  /* SS_UserData */
 static int hf_gsm_ss_forwardCUG_Info = -1;        /* ForwardCUG_InfoArg */
@@ -259,12 +260,12 @@ static int hf_gsm_ss_deferredLocationEventType = -1;  /* DeferredLocationEventTy
 static int hf_gsm_ss_areaEventInfo = -1;          /* AreaEventInfo */
 
 /*--- End of included file: packet-gsm_ss-hf.c ---*/
-
+#line 165 "packet-gsm_ss-template.c"
 
 /* Initialize the subtree pointers */
 
 /*--- Included file: packet-gsm_ss-ett.c ---*/
-
+#line 1 "packet-gsm_ss-ett.c"
 static gint ett_gsm_ss_DummySS_operationsArg = -1;
 static gint ett_gsm_ss_DummySS_operationsRes = -1;
 static gint ett_gsm_ss_NotifySS_Arg = -1;
@@ -292,7 +293,7 @@ static gint ett_gsm_ss_LCS_AreaEventReportArg = -1;
 static gint ett_gsm_ss_LCS_AreaEventCancellationArg = -1;
 
 /*--- End of included file: packet-gsm_ss-ett.c ---*/
-
+#line 168 "packet-gsm_ss-template.c"
 
 static dissector_table_t	sms_dissector_table;	/* SMS TPDU */
 
@@ -303,7 +304,7 @@ static proto_tree *top_tree;
 
 
 /*--- Included file: packet-gsm_ss-fn.c ---*/
-
+#line 1 "packet-gsm_ss-fn.c"
 /*--- Fields for imported types ---*/
 
 static int dissect_ss_Code_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -1332,7 +1333,7 @@ dissect_gsm_ss_UserUserServiceArg(gboolean implicit_tag _U_, tvbuff_t *tvb, int
 
 
 /*--- End of included file: packet-gsm_ss-fn.c ---*/
-
+#line 177 "packet-gsm_ss-template.c"
 
 
 int
@@ -1551,7 +1552,7 @@ void proto_register_gsm_ss(void) {
 
 
 /*--- Included file: packet-gsm_ss-hfarr.c ---*/
-
+#line 1 "packet-gsm_ss-hfarr.c"
     { &hf_gsm_ss_notifySS,
       { "notifySS", "gsm_ss.notifySS",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -1898,14 +1899,14 @@ void proto_register_gsm_ss(void) {
         "LCS-AreaEventRequestArg/areaEventInfo", HFILL }},
 
 /*--- End of included file: packet-gsm_ss-hfarr.c ---*/
-
+#line 394 "packet-gsm_ss-template.c"
   };
 
   /* List of subtrees */
   static gint *ett[] = {
 
 /*--- Included file: packet-gsm_ss-ettarr.c ---*/
-
+#line 1 "packet-gsm_ss-ettarr.c"
     &ett_gsm_ss_DummySS_operationsArg,
     &ett_gsm_ss_DummySS_operationsRes,
     &ett_gsm_ss_NotifySS_Arg,
@@ -1933,7 +1934,7 @@ void proto_register_gsm_ss(void) {
     &ett_gsm_ss_LCS_AreaEventCancellationArg,
 
 /*--- End of included file: packet-gsm_ss-ettarr.c ---*/
-
+#line 399 "packet-gsm_ss-template.c"
   };
 
   /* Register protocol */
diff --git a/epan/dissectors/packet-gsm_ss.h b/epan/dissectors/packet-gsm_ss.h
index 2b3178e51a..fdfb10fa8b 100644
--- a/epan/dissectors/packet-gsm_ss.h
+++ b/epan/dissectors/packet-gsm_ss.h
@@ -1,10 +1,11 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-gsm_ss.h                                                          */
+/* ./packet-gsm_ss.h                                                          */
 /* ../../tools/asn2eth.py -X -b -e -p gsm_ss -c gsm_ss.cnf -s packet-gsm_ss-template SS-Operations.asn */
 
 /* Input file: packet-gsm_ss-template.h */
 
+#line 1 "packet-gsm_ss-template.h"
 /* packet-gsm_map-template.h
  * Routines for GSM Supplementary Services dissection
  * Copyright 2005, Anders Broman <anders.broman@ericsson.com>
diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c
index ca68c4556c..4c3e94033d 100644
--- a/epan/dissectors/packet-h225.c
+++ b/epan/dissectors/packet-h225.c
@@ -1,10 +1,11 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-h225.c                                                            */
+/* ./packet-h225.c                                                            */
 /* ../../tools/asn2eth.py -X -e -p h225 -c h225.cnf -s packet-h225-template h225.asn */
 
 /* Input file: packet-h225-template.c */
 
+#line 1 "packet-h225-template.c"
 /* packet-h225.c
  * Routines for h225 packet dissection
  * Copyright 2005, Anders Broman <anders.broman@ericsson.com>
@@ -175,7 +176,7 @@ static int hf_h225_fastStart_item_length = -1;
 
 
 /*--- Included file: packet-h225-hf.c ---*/
-
+#line 1 "packet-h225-hf.c"
 static int hf_h225_h323_uu_pdu = -1;              /* H323_UU_PDU */
 static int hf_h225_user_data = -1;                /* T_user_data */
 static int hf_h225_protocol_discriminator = -1;   /* INTEGER_0_255 */
@@ -924,13 +925,13 @@ static int hf_h225_stopped = -1;                  /* NULL */
 static int hf_h225_notAvailable = -1;             /* NULL */
 
 /*--- End of included file: packet-h225-hf.c ---*/
-
+#line 170 "packet-h225-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_h225 = -1;
 
 /*--- Included file: packet-h225-ett.c ---*/
-
+#line 1 "packet-h225-ett.c"
 static gint ett_h225_H323_UserInformation = -1;
 static gint ett_h225_T_user_data = -1;
 static gint ett_h225_H323_UU_PDU = -1;
@@ -1164,7 +1165,7 @@ static gint ett_h225_ServiceControlResponse = -1;
 static gint ett_h225_T_result = -1;
 
 /*--- End of included file: packet-h225-ett.c ---*/
-
+#line 174 "packet-h225-template.c"
 
 /* Preferences */
 static gboolean h225_reassembly = TRUE;
@@ -1190,7 +1191,7 @@ static const char *tpOID;
 
 
 /*--- Included file: packet-h225-fn.c ---*/
-
+#line 1 "packet-h225-fn.c"
 /*--- Cyclic dependencies ---*/
 
 /* EnumeratedParameter -> Content -> Content/compound -> EnumeratedParameter */
@@ -1281,6 +1282,7 @@ static int dissect_protocolIdentifier(tvbuff_t *tvb, int offset, packet_info *pi
 
 static int
 dissect_h225_T_h245ipv4(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+#line 219 "h225.cnf"
   tvbuff_t *value_tvb;
 
   ipv4_address = 0;
@@ -1290,6 +1292,7 @@ dissect_h225_T_h245ipv4(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto
   if (value_tvb)
     ipv4_address = tvb_get_ipv4(value_tvb, 0);
 
+
   return offset;
 }
 static int dissect_h245ipv4(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -2128,14 +2131,18 @@ static const per_sequence_t H221NonStandard_sequence[] = {
 
 static int
 dissect_h225_H221NonStandard(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+#line 513 "h225.cnf"
   t35CountryCode = 0;
   t35Extension = 0;
   manufacturerCode = 0;
+
   offset = dissect_per_sequence(tvb, offset, pinfo, tree, hf_index,
                                    ett_h225_H221NonStandard, H221NonStandard_sequence);
 
+#line 517 "h225.cnf"
   h221NonStandard = ((t35CountryCode * 256) + t35Extension) * 65536 + manufacturerCode;
   proto_tree_add_uint(tree, hf_h221Manufacturer, tvb, (offset>>3)-4, 4, h221NonStandard);
+
   return offset;
 }
 static int dissect_vendorIdentifier_vendor(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -2160,6 +2167,7 @@ static const per_choice_t NonStandardIdentifier_choice[] = {
 
 static int
 dissect_h225_NonStandardIdentifier(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+#line 494 "h225.cnf"
 	guint32 value;
 
 	nsiOID = "";
@@ -2180,6 +2188,7 @@ dissect_h225_NonStandardIdentifier(tvbuff_t *tvb, int offset, packet_info *pinfo
 			nsp_handle = NULL;
     }
 
+
   return offset;
 }
 static int dissect_nonStandardIdentifier(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -2190,6 +2199,7 @@ static int dissect_nonStandardIdentifier(tvbuff_t *tvb, int offset, packet_info
 
 static int
 dissect_h225_T_data(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+#line 528 "h225.cnf"
   tvbuff_t *next_tvb = NULL;
 
   offset = dissect_per_octet_string(tvb, offset, pinfo, tree, hf_index,
@@ -2199,6 +2209,7 @@ dissect_h225_T_data(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre
     call_dissector((nsp_handle)?nsp_handle:data_handle, next_tvb, pinfo, tree);
   }
 
+
   return offset;
 }
 static int dissect_nsp_data(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -2214,7 +2225,9 @@ static const per_sequence_t NonStandardParameter_sequence[] = {
 
 int
 dissect_h225_NonStandardParameter(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+#line 526 "h225.cnf"
   nsp_handle = NULL;
+
   offset = dissect_per_sequence(tvb, offset, pinfo, tree, hf_index,
                                    ett_h225_NonStandardParameter, NonStandardParameter_sequence);
 
@@ -2267,13 +2280,16 @@ static const per_choice_t H245TransportAddress_choice[] = {
 
 static int
 dissect_h225_H245TransportAddress(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+#line 323 "h225.cnf"
 	ipv4_address=0;
 	ipv4_port=0;
 
+
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
                                  ett_h225_H245TransportAddress, H245TransportAddress_choice,
                                  NULL);
 
+#line 329 "h225.cnf"
 	/* we need this info for TAPing */
 	h225_pi->is_h245 = TRUE;
 	h225_pi->h245_address = ipv4_address;	
@@ -2294,6 +2310,7 @@ dissect_h225_H245TransportAddress(tvbuff_t *tvb, int offset, packet_info *pinfo
 		}
 	}
 
+
   return offset;
 }
 static int dissect_h245Address(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -2304,6 +2321,7 @@ static int dissect_h245Address(tvbuff_t *tvb, int offset, packet_info *pinfo, pr
 
 static int
 dissect_h225_DialedDigits(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+#line 201 "h225.cnf"
   tvbuff_t *value_tvb = NULL;
   guint len = 0;
 
@@ -2323,6 +2341,7 @@ dissect_h225_DialedDigits(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, pro
     h225_pi->is_destinationInfo = FALSE;
   }
 
+
   return offset;
 }
 static int dissect_dialedDigits(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -3901,11 +3920,15 @@ static const per_sequence_t TunnelledProtocol_sequence[] = {
 
 static int
 dissect_h225_TunnelledProtocol(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+#line 471 "h225.cnf"
   tpOID = "";
+
   offset = dissect_per_sequence(tvb, offset, pinfo, tree, hf_index,
                                    ett_h225_TunnelledProtocol, TunnelledProtocol_sequence);
 
+#line 473 "h225.cnf"
   tp_handle = dissector_get_string_handle(tp_dissector_table, tpOID);
+
   return offset;
 }
 static int dissect_tunnelledProtocolID(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -4147,11 +4170,13 @@ static int dissect_callType(tvbuff_t *tvb, int offset, packet_info *pinfo, proto
 
 static int
 dissect_h225_T_guid(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+#line 450 "h225.cnf"
   tvbuff_t *guid_tvb;
 
   offset = dissect_per_octet_string(tvb,offset,pinfo,tree,hf_index,16,16,&guid_tvb);
   tvb_memcpy(guid_tvb,h225_pi->guid,0,tvb_length(guid_tvb));
 
+
   return offset;
 }
 static int dissect_guid(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -4406,6 +4431,7 @@ static int dissect_cryptoTokens(tvbuff_t *tvb, int offset, packet_info *pinfo, p
 
 static int
 dissect_h225_FastStart_item(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+#line 168 "h225.cnf"
 	tvbuff_t *value_tvb = NULL;
 	char codec_str[50];
 
@@ -4422,6 +4448,7 @@ dissect_h225_FastStart_item(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, p
 	contains_faststart = TRUE;
 	h225_pi->is_faststart = TRUE;
 
+
   return offset;
 }
 static int dissect_FastStart_item(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -5462,6 +5489,7 @@ static int dissect_supportedFeatures(tvbuff_t *tvb, int offset, packet_info *pin
 
 static int
 dissect_h225_ParallelH245Control_item(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+#line 230 "h225.cnf"
 	tvbuff_t *h245_tvb = NULL;
 
   offset = dissect_per_octet_string(tvb, offset, pinfo, tree, hf_index,
@@ -5469,6 +5497,7 @@ dissect_h225_ParallelH245Control_item(tvbuff_t *tvb, int offset, packet_info *pi
 
   next_tvb_add(&h245_list, h245_tvb, (h225_h245_in_tree)?tree:NULL, h245dg_handle);
 
+
   return offset;
 }
 static int dissect_ParallelH245Control_item(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -5586,16 +5615,20 @@ static const per_sequence_t Setup_UUIE_sequence[] = {
 
 static int
 dissect_h225_Setup_UUIE(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+#line 277 "h225.cnf"
   contains_faststart = FALSE;
+
   offset = dissect_per_sequence(tvb, offset, pinfo, tree, hf_index,
                                    ett_h225_Setup_UUIE, Setup_UUIE_sequence);
 
+#line 281 "h225.cnf"
   /* Add to packet info */
   h225_pi->cs_type = H225_SETUP;
   if (contains_faststart == TRUE )
       g_snprintf(h225_pi->frame_label, 50, "%s OLC (%s)", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>"), h225_pi->frame_label);
   else
       g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>"));
+
   return offset;
 }
 static int dissect_setup(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -5644,12 +5677,14 @@ dissect_h225_CallProceeding_UUIE(tvbuff_t *tvb, int offset, packet_info *pinfo _
   offset = dissect_per_sequence(tvb, offset, pinfo, tree, hf_index,
                                    ett_h225_CallProceeding_UUIE, CallProceeding_UUIE_sequence);
 
+#line 290 "h225.cnf"
   /* Add to packet info */
   h225_pi->cs_type = H225_CALL_PROCEDING;
   if (contains_faststart == TRUE )
         g_snprintf(h225_pi->frame_label, 50, "%s OLC (%s)", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>"), h225_pi->frame_label);
   else
         g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>"));
+
   return offset;
 }
 static int dissect_callProceeding(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -5685,12 +5720,14 @@ dissect_h225_Connect_UUIE(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, pro
   offset = dissect_per_sequence(tvb, offset, pinfo, tree, hf_index,
                                    ett_h225_Connect_UUIE, Connect_UUIE_sequence);
 
+#line 314 "h225.cnf"
   /* Add to packet info */
   h225_pi->cs_type = H225_CONNECT;
   if (contains_faststart == TRUE )
       g_snprintf(h225_pi->frame_label, 50, "%s OLC (%s)", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>"), h225_pi->frame_label);
   else 
       g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>"));
+
   return offset;
 }
 static int dissect_connect(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -5724,12 +5761,14 @@ dissect_h225_Alerting_UUIE(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, pr
   offset = dissect_per_sequence(tvb, offset, pinfo, tree, hf_index,
                                    ett_h225_Alerting_UUIE, Alerting_UUIE_sequence);
 
+#line 299 "h225.cnf"
   /* Add to packet info */
   h225_pi->cs_type = H225_ALERTING;
   if (contains_faststart == TRUE )
        g_snprintf(h225_pi->frame_label, 50, "%s OLC (%s)", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>"), h225_pi->frame_label);
   else 
        g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>"));
+
   return offset;
 }
 static int dissect_alerting(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -5753,9 +5792,11 @@ dissect_h225_Information_UUIE(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
   offset = dissect_per_sequence(tvb, offset, pinfo, tree, hf_index,
                                    ett_h225_Information_UUIE, Information_UUIE_sequence);
 
+#line 254 "h225.cnf"
   /* Add to packet info */
   h225_pi->cs_type = H225_INFORMATION;
   g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>"));
+
   return offset;
 }
 static int dissect_information(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -5882,6 +5923,7 @@ static const per_choice_t ReleaseCompleteReason_choice[] = {
 
 static int
 dissect_h225_ReleaseCompleteReason(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+#line 443 "h225.cnf"
   guint32 value;
 	
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
@@ -5890,6 +5932,7 @@ dissect_h225_ReleaseCompleteReason(tvbuff_t *tvb, int offset, packet_info *pinfo
 
   h225_pi->reason = value;
 
+
   return offset;
 }
 static int dissect_releaseCompleteReason(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -5917,9 +5960,11 @@ dissect_h225_ReleaseComplete_UUIE(tvbuff_t *tvb, int offset, packet_info *pinfo
   offset = dissect_per_sequence(tvb, offset, pinfo, tree, hf_index,
                                    ett_h225_ReleaseComplete_UUIE, ReleaseComplete_UUIE_sequence);
 
+#line 308 "h225.cnf"
   /* Add to packet info */
   h225_pi->cs_type = H225_RELEASE_COMPLET;
   g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>"));
+
   return offset;
 }
 static int dissect_releaseComplete(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -5959,6 +6004,7 @@ static const per_choice_t FacilityReason_choice[] = {
 
 static int
 dissect_h225_FacilityReason(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+#line 367 "h225.cnf"
 	guint32 value;
 	
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
@@ -5967,6 +6013,7 @@ dissect_h225_FacilityReason(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, p
 
 	h225_pi->reason = value;
 
+
   return offset;
 }
 static int dissect_facilityReason(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -6039,9 +6086,11 @@ dissect_h225_Facility_UUIE(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, pr
   offset = dissect_per_sequence(tvb, offset, pinfo, tree, hf_index,
                                    ett_h225_Facility_UUIE, Facility_UUIE_sequence);
 
+#line 269 "h225.cnf"
   /* Add to packet info */
   h225_pi->cs_type = H225_FACILITY;
   g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>"));
+
   return offset;
 }
 static int dissect_facility(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -6069,12 +6118,14 @@ dissect_h225_Progress_UUIE(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, pr
   offset = dissect_per_sequence(tvb, offset, pinfo, tree, hf_index,
                                    ett_h225_Progress_UUIE, Progress_UUIE_sequence);
 
+#line 260 "h225.cnf"
   /* Add to packet info */
   h225_pi->cs_type = H225_PROGRESS;
   if (contains_faststart == TRUE )
         g_snprintf(h225_pi->frame_label, 50, "%s OLC (%s)", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>"), h225_pi->frame_label);
   else 
         g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>"));
+
   return offset;
 }
 static int dissect_progress(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -6087,7 +6138,9 @@ static int
 dissect_h225_T_empty(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
   offset = dissect_per_null(tvb, offset, pinfo, tree, hf_index);
 
+#line 244 "h225.cnf"
   h225_pi->cs_type = H225_EMPTY;
+
   return offset;
 }
 static int dissect_empty_flg(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -6108,9 +6161,11 @@ dissect_h225_Status_UUIE(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, prot
   offset = dissect_per_sequence(tvb, offset, pinfo, tree, hf_index,
                                    ett_h225_Status_UUIE, Status_UUIE_sequence);
 
+#line 248 "h225.cnf"
   /* Add to packet info */
   h225_pi->cs_type = H225_STATUS;
   g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>"));
+
   return offset;
 }
 static int dissect_status(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -6214,6 +6269,7 @@ static const per_choice_t T_h323_message_body_choice[] = {
 
 static int
 dissect_h225_T_h323_message_body(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+#line 141 "h225.cnf"
 	guint32 message_body_val;
 
 	contains_faststart = FALSE;
@@ -6242,6 +6298,7 @@ dissect_h225_T_h323_message_body(tvbuff_t *tvb, int offset, packet_info *pinfo _
 	col_set_fence(pinfo->cinfo,COL_INFO);
 
 
+
   return offset;
 }
 static int dissect_h323_message_body(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -6252,6 +6309,7 @@ static int dissect_h323_message_body(tvbuff_t *tvb, int offset, packet_info *pin
 
 static int
 dissect_h225_T_h4501SupplementaryService_item(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+#line 459 "h225.cnf"
 	tvbuff_t *h4501_tvb = NULL;
 
   offset = dissect_per_octet_string(tvb, offset, pinfo, tree, hf_index,
@@ -6261,6 +6319,7 @@ dissect_h225_T_h4501SupplementaryService_item(tvbuff_t *tvb, int offset, packet_
 		call_dissector(h4501_handle, h4501_tvb, pinfo, tree);
 	}
 
+
   return offset;
 }
 static int dissect_h4501SupplementaryService_item(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -6300,6 +6359,7 @@ static int dissect_h245Tunneling(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 static int
 dissect_h225_H245Control_item(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+#line 237 "h225.cnf"
 	tvbuff_t *h245_tvb = NULL;
 
   offset = dissect_per_octet_string(tvb, offset, pinfo, tree, hf_index,
@@ -6307,6 +6367,7 @@ dissect_h225_H245Control_item(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
 
   next_tvb_add(&h245_list, h245_tvb, (h225_h245_in_tree)?tree:NULL, h245dg_handle);
 
+
   return offset;
 }
 static int dissect_H245Control_item(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -6373,6 +6434,7 @@ static int dissect_callLinkage(tvbuff_t *tvb, int offset, packet_info *pinfo, pr
 
 static int
 dissect_h225_T_messageContent_item(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+#line 481 "h225.cnf"
   tvbuff_t *next_tvb = NULL;
 
   offset = dissect_per_octet_string(tvb, offset, pinfo, tree, hf_index,
@@ -6380,6 +6442,7 @@ dissect_h225_T_messageContent_item(tvbuff_t *tvb, int offset, packet_info *pinfo
 
   next_tvb_add(&tp_list, next_tvb, (h225_tp_in_tree)?tree:NULL, tp_handle);
 
+
   return offset;
 }
 static int dissect_messageContent_item(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -6413,7 +6476,9 @@ static const per_sequence_t T_tunnelledSignallingMessage_sequence[] = {
 
 static int
 dissect_h225_T_tunnelledSignallingMessage(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+#line 479 "h225.cnf"
   tp_handle = NULL;
+
   offset = dissect_per_sequence(tvb, offset, pinfo, tree, hf_index,
                                    ett_h225_T_tunnelledSignallingMessage, T_tunnelledSignallingMessage_sequence);
 
@@ -7433,6 +7498,7 @@ static const per_choice_t GatekeeperRejectReason_choice[] = {
 
 static int
 dissect_h225_GatekeeperRejectReason(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+#line 374 "h225.cnf"
   guint32 value;
 	
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
@@ -7441,6 +7507,7 @@ dissect_h225_GatekeeperRejectReason(tvbuff_t *tvb, int offset, packet_info *pinf
 
   h225_pi->reason = value;
 
+
   return offset;
 }
 static int dissect_gatekeeperRejectReason(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -7723,6 +7790,7 @@ static const per_choice_t RegistrationRejectReason_choice[] = {
 
 static int
 dissect_h225_RegistrationRejectReason(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+#line 429 "h225.cnf"
   guint32 value;
 
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
@@ -7731,6 +7799,7 @@ dissect_h225_RegistrationRejectReason(tvbuff_t *tvb, int offset, packet_info *pi
 
   h225_pi->reason = value;
 
+
   return offset;
 }
 static int dissect_registrationRejectReason(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -7787,6 +7856,7 @@ static const per_choice_t UnregRequestReason_choice[] = {
 
 static int
 dissect_h225_UnregRequestReason(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+#line 381 "h225.cnf"
   guint32 value;
 	
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
@@ -7795,6 +7865,7 @@ dissect_h225_UnregRequestReason(tvbuff_t *tvb, int offset, packet_info *pinfo _U
 
   h225_pi->reason = value;
 
+
   return offset;
 }
 static int dissect_unregRequestReason(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -7877,6 +7948,7 @@ static const per_choice_t UnregRejectReason_choice[] = {
 
 static int
 dissect_h225_UnregRejectReason(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+#line 388 "h225.cnf"
   guint32 value;
 
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
@@ -7885,6 +7957,7 @@ dissect_h225_UnregRejectReason(tvbuff_t *tvb, int offset, packet_info *pinfo _U_
 
   h225_pi->reason = value;
 
+
   return offset;
 }
 static int dissect_unregRejectReason(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -7944,8 +8017,10 @@ static int dissect_callModel(tvbuff_t *tvb, int offset, packet_info *pinfo, prot
 
 static int
 dissect_h225_DestinationInfo_item(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+#line 196 "h225.cnf"
 
   h225_pi->is_destinationInfo = TRUE;
+
   offset = dissect_h225_AliasAddress(tvb, offset, pinfo, tree, hf_index);
 
   return offset;
@@ -8198,6 +8273,7 @@ static const per_choice_t AdmissionRejectReason_choice[] = {
 
 static int
 dissect_h225_AdmissionRejectReason(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+#line 415 "h225.cnf"
   guint32 value;
 
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
@@ -8206,6 +8282,7 @@ dissect_h225_AdmissionRejectReason(tvbuff_t *tvb, int offset, packet_info *pinfo
 
   h225_pi->reason = value;
 
+
   return offset;
 }
 static int dissect_rejectReason(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -8340,6 +8417,7 @@ static const per_choice_t BandRejectReason_choice[] = {
 
 static int
 dissect_h225_BandRejectReason(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+#line 395 "h225.cnf"
   guint32 value;
 
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
@@ -8348,6 +8426,7 @@ dissect_h225_BandRejectReason(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
 
   h225_pi->reason = value;
 
+
   return offset;
 }
 static int dissect_bandRejectReason(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -8396,6 +8475,7 @@ static const per_choice_t DisengageReason_choice[] = {
 
 static int
 dissect_h225_DisengageReason(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+#line 402 "h225.cnf"
   guint32 value;
 	
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
@@ -8404,6 +8484,7 @@ dissect_h225_DisengageReason(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
 
   h225_pi->reason = value;
 
+
   return offset;
 }
 static int dissect_disengageReason(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -8489,6 +8570,7 @@ static const per_choice_t DisengageRejectReason_choice[] = {
 
 static int
 dissect_h225_DisengageRejectReason(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+#line 408 "h225.cnf"
   guint32 value;
 	
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
@@ -8497,6 +8579,7 @@ dissect_h225_DisengageRejectReason(tvbuff_t *tvb, int offset, packet_info *pinfo
 
   h225_pi->reason = value;
 
+
   return offset;
 }
 static int dissect_disengageRejectReason(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -8644,6 +8727,7 @@ static const per_choice_t LocationRejectReason_choice[] = {
 
 static int
 dissect_h225_LocationRejectReason(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+#line 422 "h225.cnf"
   guint32 value;
 
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
@@ -8652,6 +8736,7 @@ dissect_h225_LocationRejectReason(tvbuff_t *tvb, int offset, packet_info *pinfo
 
   h225_pi->reason = value;
 
+
   return offset;
 }
 static int dissect_locationRejectReason(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -9069,6 +9154,7 @@ static const per_choice_t InfoRequestNakReason_choice[] = {
 
 static int
 dissect_h225_InfoRequestNakReason(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+#line 436 "h225.cnf"
   guint32 value;
 	
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
@@ -9077,6 +9163,7 @@ dissect_h225_InfoRequestNakReason(tvbuff_t *tvb, int offset, packet_info *pinfo
 
   h225_pi->reason = value;
 
+
   return offset;
 }
 static int dissect_nakReason(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -9299,6 +9386,7 @@ static const per_choice_t RasMessage_choice[] = {
 
 int
 dissect_h225_RasMessage(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+#line 184 "h225.cnf"
   	guint32 rasmessage_value;
 
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
@@ -9312,12 +9400,13 @@ dissect_h225_RasMessage(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto
 
 	h225_pi->msg_tag = rasmessage_value;
 
+
   return offset;
 }
 
 
 /*--- End of included file: packet-h225-fn.c ---*/
-
+#line 198 "packet-h225-template.c"
 
 
 static int
@@ -9428,7 +9517,7 @@ void proto_register_h225(void) {
 
 
 /*--- Included file: packet-h225-hfarr.c ---*/
-
+#line 1 "packet-h225-hfarr.c"
     { &hf_h225_h323_uu_pdu,
       { "h323-uu-pdu", "h225.h323_uu_pdu",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -12415,7 +12504,7 @@ void proto_register_h225(void) {
         "ServiceControlResponse/result/notAvailable", HFILL }},
 
 /*--- End of included file: packet-h225-hfarr.c ---*/
-
+#line 307 "packet-h225-template.c"
   };
 
   /* List of subtrees */
@@ -12423,7 +12512,7 @@ void proto_register_h225(void) {
 	  &ett_h225,
 
 /*--- Included file: packet-h225-ettarr.c ---*/
-
+#line 1 "packet-h225-ettarr.c"
     &ett_h225_H323_UserInformation,
     &ett_h225_T_user_data,
     &ett_h225_H323_UU_PDU,
@@ -12657,7 +12746,7 @@ void proto_register_h225(void) {
     &ett_h225_T_result,
 
 /*--- End of included file: packet-h225-ettarr.c ---*/
-
+#line 313 "packet-h225-template.c"
   };
   module_t *h225_module;
 
diff --git a/epan/dissectors/packet-h225.h b/epan/dissectors/packet-h225.h
index 95ed26dad0..d7b73f64b7 100644
--- a/epan/dissectors/packet-h225.h
+++ b/epan/dissectors/packet-h225.h
@@ -1,10 +1,11 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-h225.h                                                            */
+/* ./packet-h225.h                                                            */
 /* ../../tools/asn2eth.py -X -e -p h225 -c h225.cnf -s packet-h225-template h225.asn */
 
 /* Input file: packet-h225-template.h */
 
+#line 1 "packet-h225-template.h"
 /* packet-h225.h
  * Routines for h225 packet dissection
  * Copyright 2005, Anders Broman <anders.broman@ericsson.com>
@@ -86,7 +87,7 @@ typedef struct _h225_packet_info {
 
 
 /*--- Included file: packet-h225-exp.h ---*/
-
+#line 1 "packet-h225-exp.h"
 ETH_VAR_IMPORT const value_string T_h323_message_body_vals[];
 ETH_VAR_IMPORT const value_string ReleaseCompleteReason_vals[];
 extern const value_string h225_PresentationIndicator_vals[];
@@ -114,7 +115,7 @@ int dissect_h225_CallIdentifier(tvbuff_t *tvb, int offset, packet_info *pinfo, p
 int dissect_h225_RasMessage(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
 
 /*--- End of included file: packet-h225-exp.h ---*/
-
+#line 81 "packet-h225-template.h"
 
 #endif  /* PACKET_H225_H */
 
diff --git a/epan/dissectors/packet-h235.c b/epan/dissectors/packet-h235.c
index 931071675c..6990741f10 100644
--- a/epan/dissectors/packet-h235.c
+++ b/epan/dissectors/packet-h235.c
@@ -1,10 +1,11 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-h235.c                                                            */
-/* ../../tools/asn2eth.py -X -e -p h235 -c h235.cnf -s packet-h235-template H235-SECURITY-MESSAGES.asn */
+/* ./packet-h235.c                                                            */
+/* ../../tools/asn2eth.py -X -p h235 -c h235.cnf -s packet-h235-template H235-SECURITY-MESSAGES.asn */
 
 /* Input file: packet-h235-template.c */
 
+#line 1 "packet-h235-template.c"
 /* packet-h235.c
  * Routines for H.235 packet dissection
  * 2004  Tomas Kukosa
@@ -52,7 +53,7 @@
 int proto_h235 = -1;
 
 /*--- Included file: packet-h235-hf.c ---*/
-
+#line 1 "packet-h235-hf.c"
 static int hf_h235_nonStandardIdentifier = -1;    /* OBJECT_IDENTIFIER */
 static int hf_h235_data = -1;                     /* OCTET_STRING */
 static int hf_h235_halfkey = -1;                  /* BIT_STRING_SIZE_0_2048 */
@@ -121,12 +122,12 @@ static int hf_h235_paramSsalt = -1;               /* Params */
 static int hf_h235_keyDerivationOID = -1;         /* OBJECT_IDENTIFIER */
 
 /*--- End of included file: packet-h235-hf.c ---*/
-
+#line 47 "packet-h235-template.c"
 
 /* Initialize the subtree pointers */
 
 /*--- Included file: packet-h235-ett.c ---*/
-
+#line 1 "packet-h235-ett.c"
 static gint ett_h235_NonStandardParameter = -1;
 static gint ett_h235_DHset = -1;
 static gint ett_h235_ECpoint = -1;
@@ -149,7 +150,7 @@ static gint ett_h235_H235Key = -1;
 static gint ett_h235_V3KeySyncMaterial = -1;
 
 /*--- End of included file: packet-h235-ett.c ---*/
-
+#line 50 "packet-h235-template.c"
 
 static guint32
 dissect_xxx_ToBeSigned(tvbuff_t *tvb, guint32 offset, packet_info *pinfo, proto_tree *tree, int hf_index _U_) {
@@ -159,7 +160,7 @@ PER_NOT_DECODED_YET("ToBeSigned");
 
 
 /*--- Included file: packet-h235-fn.c ---*/
-
+#line 1 "packet-h235-fn.c"
 /*--- Fields for imported types ---*/
 
 static int dissect_toBeSigned(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -660,7 +661,9 @@ static const per_sequence_t ENCRYPTEDxxx_sequence[] = {
 
 int
 dissect_h235_ENCRYPTEDxxx(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+#line 48 "h235.cnf"
   proto_tree_add_item_hidden(tree, proto_h235, tvb, offset, 0, FALSE);
+
   offset = dissect_per_sequence(tvb, offset, pinfo, tree, hf_index,
                                    ett_h235_ENCRYPTEDxxx, ENCRYPTEDxxx_sequence);
 
@@ -703,7 +706,9 @@ static const per_sequence_t SIGNEDxxx_sequence[] = {
 
 int
 dissect_h235_SIGNEDxxx(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+#line 45 "h235.cnf"
   proto_tree_add_item_hidden(tree, proto_h235, tvb, offset, 0, FALSE);
+
   offset = dissect_per_sequence(tvb, offset, pinfo, tree, hf_index,
                                    ett_h235_SIGNEDxxx, SIGNEDxxx_sequence);
 
@@ -788,7 +793,9 @@ static const per_sequence_t ClearToken_sequence[] = {
 
 int
 dissect_h235_ClearToken(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+#line 55 "h235.cnf"
   proto_tree_add_item_hidden(tree, proto_h235, tvb, offset, 0, FALSE);
+
   offset = dissect_per_sequence(tvb, offset, pinfo, tree, hf_index,
                                    ett_h235_ClearToken, ClearToken_sequence);
 
@@ -808,7 +815,9 @@ static const per_sequence_t HASHEDxxx_sequence[] = {
 
 int
 dissect_h235_HASHEDxxx(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+#line 51 "h235.cnf"
   proto_tree_add_item_hidden(tree, proto_h235, tvb, offset, 0, FALSE);
+
   offset = dissect_per_sequence(tvb, offset, pinfo, tree, hf_index,
                                    ett_h235_HASHEDxxx, HASHEDxxx_sequence);
 
@@ -892,7 +901,9 @@ static const per_choice_t CryptoToken_choice[] = {
 
 int
 dissect_h235_CryptoToken(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+#line 59 "h235.cnf"
   proto_tree_add_item_hidden(tree, proto_h235, tvb, offset, 0, FALSE);
+
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
                                  ett_h235_CryptoToken, CryptoToken_choice,
                                  NULL);
@@ -902,7 +913,7 @@ dissect_h235_CryptoToken(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, prot
 
 
 /*--- End of included file: packet-h235-fn.c ---*/
-
+#line 58 "packet-h235-template.c"
 
 
 /*--- proto_register_h235 ----------------------------------------------*/
@@ -912,7 +923,7 @@ void proto_register_h235(void) {
   static hf_register_info hf[] = {
 
 /*--- Included file: packet-h235-hfarr.c ---*/
-
+#line 1 "packet-h235-hfarr.c"
     { &hf_h235_nonStandardIdentifier,
       { "nonStandardIdentifier", "h235.nonStandardIdentifier",
         FT_OID, BASE_NONE, NULL, 0,
@@ -1179,14 +1190,14 @@ void proto_register_h235(void) {
         "V3KeySyncMaterial/keyDerivationOID", HFILL }},
 
 /*--- End of included file: packet-h235-hfarr.c ---*/
-
+#line 66 "packet-h235-template.c"
   };
 
   /* List of subtrees */
   static gint *ett[] = {
 
 /*--- Included file: packet-h235-ettarr.c ---*/
-
+#line 1 "packet-h235-ettarr.c"
     &ett_h235_NonStandardParameter,
     &ett_h235_DHset,
     &ett_h235_ECpoint,
@@ -1209,7 +1220,7 @@ void proto_register_h235(void) {
     &ett_h235_V3KeySyncMaterial,
 
 /*--- End of included file: packet-h235-ettarr.c ---*/
-
+#line 71 "packet-h235-template.c"
   };
 
   /* Register protocol */
diff --git a/epan/dissectors/packet-h235.h b/epan/dissectors/packet-h235.h
index af912f6b1d..6edbb73f79 100644
--- a/epan/dissectors/packet-h235.h
+++ b/epan/dissectors/packet-h235.h
@@ -1,10 +1,11 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-h235.h                                                            */
-/* ../../tools/asn2eth.py -X -e -p h235 -c h235.cnf -s packet-h235-template H235-SECURITY-MESSAGES.asn */
+/* ./packet-h235.h                                                            */
+/* ../../tools/asn2eth.py -X -p h235 -c h235.cnf -s packet-h235-template H235-SECURITY-MESSAGES.asn */
 
 /* Input file: packet-h235-template.h */
 
+#line 1 "packet-h235-template.h"
 /* packet-h235.h
  * Routines for H.235 packet dissection
  * 2004  Tomas Kukosa
@@ -35,7 +36,7 @@
 
 
 /*--- Included file: packet-h235-exp.h ---*/
-
+#line 1 "packet-h235-exp.h"
 extern const value_string h235_AuthenticationMechanism_vals[];
 extern const value_string h235_CryptoToken_vals[];
 int dissect_h235_TimeStamp(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
@@ -47,7 +48,7 @@ int dissect_h235_HASHEDxxx(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_
 int dissect_h235_CryptoToken(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
 
 /*--- End of included file: packet-h235-exp.h ---*/
-
+#line 30 "packet-h235-template.h"
 
 #endif  /* PACKET_H235_H */
 
diff --git a/epan/dissectors/packet-h450.c b/epan/dissectors/packet-h450.c
index e097ac1914..74089e3c79 100644
--- a/epan/dissectors/packet-h450.c
+++ b/epan/dissectors/packet-h450.c
@@ -1,10 +1,11 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-h450.c                                                            */
+/* ./packet-h450.c                                                            */
 /* ../../tools/asn2eth.py -X -e -p h450 -c h450.cnf -s packet-h450-template h4501.asn */
 
 /* Input file: packet-h450-template.c */
 
+#line 1 "packet-h450-template.c"
 /* packet-h450.c
  * Routines for h450 packet dissection
  * Based on the previous h450 dissector by:
@@ -207,7 +208,7 @@ static int hf_h4501_ROS = -1;
 
 
 /*--- Included file: packet-h450-hf.c ---*/
-
+#line 1 "packet-h450-hf.c"
 static int hf_h450_networkFacilityExtension = -1;  /* NetworkFacilityExtension */
 static int hf_h450_interpretationApdu = -1;       /* InterpretationApdu */
 static int hf_h450_serviceApdu = -1;              /* ServiceApdus */
@@ -437,7 +438,7 @@ static int hf_h450_extensionId = -1;              /* OBJECT_IDENTIFIER */
 static int hf_h450_extensionArgument = -1;        /* ExtensionArgument */
 
 /*--- End of included file: packet-h450-hf.c ---*/
-
+#line 202 "packet-h450-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_h4501 = -1;
@@ -454,7 +455,7 @@ static gint ett_h4501_ROS = -1;
 
 
 /*--- Included file: packet-h450-ett.c ---*/
-
+#line 1 "packet-h450-ett.c"
 static gint ett_h450_H4501SupplementaryService = -1;
 static gint ett_h450_NetworkFacilityExtension = -1;
 static gint ett_h450_EntityType = -1;
@@ -578,7 +579,7 @@ static gint ett_h450_Unspecified = -1;
 static gint ett_h450_Extension = -1;
 
 /*--- End of included file: packet-h450-ett.c ---*/
-
+#line 217 "packet-h450-template.c"
 
 /* Global variables */
 static guint32 localOpcode;
@@ -677,7 +678,7 @@ static int dissect_ros_ROSxxx(tvbuff_t *tvb, int offset, packet_info *pinfo, pro
 
 
 /*--- Included file: packet-h450-fn.c ---*/
-
+#line 1 "packet-h450-fn.c"
 /*--- Fields for imported types ---*/
 
 static int dissect_rosApdus_item(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -4112,7 +4113,7 @@ dissect_h450_Unspecified(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, prot
 
 
 /*--- End of included file: packet-h450-fn.c ---*/
-
+#line 314 "packet-h450-template.c"
 
 static const value_string InvokeProblem_vals[] = {
    {  0, "duplicateInvocation"},
@@ -4851,7 +4852,7 @@ void proto_register_h450(void) {
 
 
 /*--- Included file: packet-h450-hfarr.c ---*/
-
+#line 1 "packet-h450-hfarr.c"
     { &hf_h450_networkFacilityExtension,
       { "networkFacilityExtension", "h450.networkFacilityExtension",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -5762,7 +5763,7 @@ void proto_register_h450(void) {
         "Extension/extensionArgument", HFILL }},
 
 /*--- End of included file: packet-h450-hfarr.c ---*/
-
+#line 1051 "packet-h450-template.c"
   };
 
   /* List of subtrees */
@@ -5780,7 +5781,7 @@ void proto_register_h450(void) {
 	  &ett_h4501_ROS,
 
 /*--- Included file: packet-h450-ettarr.c ---*/
-
+#line 1 "packet-h450-ettarr.c"
     &ett_h450_H4501SupplementaryService,
     &ett_h450_NetworkFacilityExtension,
     &ett_h450_EntityType,
@@ -5904,7 +5905,7 @@ void proto_register_h450(void) {
     &ett_h450_Extension,
 
 /*--- End of included file: packet-h450-ettarr.c ---*/
-
+#line 1067 "packet-h450-template.c"
   };
 
 
diff --git a/epan/dissectors/packet-h450.h b/epan/dissectors/packet-h450.h
index 8f2f90d1c4..2bba17a7e2 100644
--- a/epan/dissectors/packet-h450.h
+++ b/epan/dissectors/packet-h450.h
@@ -1,10 +1,11 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-h450.h                                                            */
+/* ./packet-h450.h                                                            */
 /* ../../tools/asn2eth.py -X -e -p h450 -c h450.cnf -s packet-h450-template h4501.asn */
 
 /* Input file: packet-h450-template.h */
 
+#line 1 "packet-h450-template.h"
 /* packet-h450.h
  * Routines for h450 packet dissection
  * Copyright 2005, Anders Broman <anders.broman@ericsson.com>
diff --git a/epan/dissectors/packet-inap.c b/epan/dissectors/packet-inap.c
index 705e0b2110..9ec870c0ae 100644
--- a/epan/dissectors/packet-inap.c
+++ b/epan/dissectors/packet-inap.c
@@ -1,10 +1,11 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-inap.c                                                            */
+/* ./packet-inap.c                                                            */
 /* ../../tools/asn2eth.py -X -b -e -p inap -c inap.cnf -s packet-inap-template inap.asn */
 
 /* Input file: packet-inap-template.c */
 
+#line 1 "packet-inap-template.c"
 /* packet-inap-template.c
  * Routines for INAP
  * Copyright 2004, Tim Endean <endeant@hotmail.com>
@@ -70,7 +71,7 @@ static int hf_inap_currentPassword = -1;
 static int hf_inap_genproblem = -1;
 
 /*--- Included file: packet-inap-hf.c ---*/
-
+#line 1 "packet-inap-hf.c"
 static int hf_inap_ActivateServiceFilteringArg_PDU = -1;  /* ActivateServiceFilteringArg */
 static int hf_inap_AnalysedInformationArg_PDU = -1;  /* AnalysedInformationArg */
 static int hf_inap_AnalyseInformationArg_PDU = -1;  /* AnalyseInformationArg */
@@ -347,7 +348,7 @@ static int hf_inap_rrp = -1;                      /* ReturnResultProblem */
 static int hf_inap_rep = -1;                      /* ReturnErrorProblem */
 
 /*--- End of included file: packet-inap-hf.c ---*/
-
+#line 65 "packet-inap-template.c"
 
 static guint tcap_itu_ssn = 106;
 static guint tcap_itu_ssn1 = 241;
@@ -367,7 +368,7 @@ static gint ett_inap_INAPPDU = -1;
 static gint ett_inapisup_parameter = -1;
 
 /*--- Included file: packet-inap-ett.c ---*/
-
+#line 1 "packet-inap-ett.c"
 static gint ett_inap_AddPartyArg = -1;
 static gint ett_inap_AttachArg = -1;
 static gint ett_inap_CallPartyHandlingResultsArg = -1;
@@ -492,13 +493,13 @@ static gint ett_inap_T_rinvokeID = -1;
 static gint ett_inap_T_rproblem = -1;
 
 /*--- End of included file: packet-inap-ett.c ---*/
-
+#line 83 "packet-inap-template.c"
 
 static int  dissect_invokeCmd(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset);
 
 
 /*--- Included file: packet-inap-fn.c ---*/
-
+#line 1 "packet-inap-fn.c"
 /*--- Fields for imported types ---*/
 
 
@@ -1609,6 +1610,7 @@ static int dissect_serviceAddressInformation_impl(packet_info *pinfo, proto_tree
 
 static int
 dissect_inap_BearerCap(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 105 "inap.cnf"
 
  tvbuff_t	*parameter_tvb;
 
@@ -1622,6 +1624,7 @@ dissect_inap_BearerCap(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pac
  dissect_q931_bearer_capability_ie(parameter_tvb, 0, tvb_length_remaining(parameter_tvb,0), tree);
 
 
+
   return offset;
 }
 static int dissect_bearerCap_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -1670,6 +1673,7 @@ static int dissect_bearerCapability_impl(packet_info *pinfo, proto_tree *tree, t
 
 static int
 dissect_inap_CalledPartyNumber(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 76 "inap.cnf"
   tvbuff_t *parameter_tvb;
 
   offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index,
@@ -1682,6 +1686,7 @@ dissect_inap_CalledPartyNumber(gboolean implicit_tag _U_, tvbuff_t *tvb, int off
 dissect_isup_called_party_number_parameter(parameter_tvb, tree, NULL);
 
 
+
   return offset;
 }
 static int dissect_dialledDigits_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -1704,6 +1709,7 @@ static int dissect_calledPartynumber_impl(packet_info *pinfo, proto_tree *tree,
 
 static int
 dissect_inap_CallingPartyNumber(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 90 "inap.cnf"
   tvbuff_t *parameter_tvb;
 
   offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index,
@@ -1717,6 +1723,7 @@ dissect_inap_CallingPartyNumber(gboolean implicit_tag _U_, tvbuff_t *tvb, int of
 
 
 
+
   return offset;
 }
 static int dissect_callingPartyNumber_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -1967,6 +1974,7 @@ static int dissect_calledFacilityGroupMember_impl(packet_info *pinfo, proto_tree
 
 static int
 dissect_inap_OriginalCalledPartyID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 135 "inap.cnf"
 
  tvbuff_t	*parameter_tvb;
 
@@ -1979,6 +1987,7 @@ dissect_inap_OriginalCalledPartyID(gboolean implicit_tag _U_, tvbuff_t *tvb, int
  dissect_isup_original_called_number_parameter(parameter_tvb, tree, NULL);
 
 
+
   return offset;
 }
 static int dissect_originalCalledPartyID_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -1989,6 +1998,7 @@ static int dissect_originalCalledPartyID_impl(packet_info *pinfo, proto_tree *tr
 
 static int
 dissect_inap_RedirectingPartyID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 149 "inap.cnf"
 
  tvbuff_t	*parameter_tvb;
 
@@ -2002,6 +2012,7 @@ dissect_inap_RedirectingPartyID(gboolean implicit_tag _U_, tvbuff_t *tvb, int of
 
 
 
+
   return offset;
 }
 static int dissect_redirectingPartyID_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -2012,6 +2023,7 @@ static int dissect_redirectingPartyID_impl(packet_info *pinfo, proto_tree *tree,
 
 static int
 dissect_inap_RedirectionInformation(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 120 "inap.cnf"
 
  tvbuff_t	*parameter_tvb;
 
@@ -2025,6 +2037,7 @@ dissect_inap_RedirectionInformation(gboolean implicit_tag _U_, tvbuff_t *tvb, in
  dissect_isup_redirection_information_parameter(parameter_tvb, tree, NULL);
 
 
+
   return offset;
 }
 static int dissect_redirectionInformation_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -4972,7 +4985,7 @@ static void dissect_TNoAnswerArg_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tr
 
 
 /*--- End of included file: packet-inap-fn.c ---*/
-
+#line 87 "packet-inap-template.c"
 
 
 const value_string inap_opr_code_strings[] = {
@@ -5545,7 +5558,7 @@ void proto_register_inap(void) {
 
 
 /*--- Included file: packet-inap-hfarr.c ---*/
-
+#line 1 "packet-inap-hfarr.c"
     { &hf_inap_ActivateServiceFilteringArg_PDU,
       { "ActivateServiceFilteringArg", "inap.ActivateServiceFilteringArg",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -6644,7 +6657,7 @@ void proto_register_inap(void) {
         "RejectPDU/rproblem/rep", HFILL }},
 
 /*--- End of included file: packet-inap-hfarr.c ---*/
-
+#line 658 "packet-inap-template.c"
   };
 
 
@@ -6664,7 +6677,7 @@ void proto_register_inap(void) {
     &ett_inapisup_parameter,
 
 /*--- Included file: packet-inap-ettarr.c ---*/
-
+#line 1 "packet-inap-ettarr.c"
     &ett_inap_AddPartyArg,
     &ett_inap_AttachArg,
     &ett_inap_CallPartyHandlingResultsArg,
@@ -6789,7 +6802,7 @@ void proto_register_inap(void) {
     &ett_inap_T_rproblem,
 
 /*--- End of included file: packet-inap-ettarr.c ---*/
-
+#line 676 "packet-inap-template.c"
   };
 
   /* Register protocol */
diff --git a/epan/dissectors/packet-inap.h b/epan/dissectors/packet-inap.h
index 354c49fb34..d6f872e73d 100644
--- a/epan/dissectors/packet-inap.h
+++ b/epan/dissectors/packet-inap.h
@@ -1,10 +1,11 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-inap.h                                                            */
+/* ./packet-inap.h                                                            */
 /* ../../tools/asn2eth.py -X -b -e -p inap -c inap.cnf -s packet-inap-template inap.asn */
 
 /* Input file: packet-inap-template.h */
 
+#line 1 "packet-inap-template.h"
 /* packet-inap.h
  *
  * $Id$
diff --git a/epan/dissectors/packet-logotypecertextn.c b/epan/dissectors/packet-logotypecertextn.c
index 39dd21ac77..f5cf9a6756 100644
--- a/epan/dissectors/packet-logotypecertextn.c
+++ b/epan/dissectors/packet-logotypecertextn.c
@@ -5,6 +5,7 @@
 
 /* Input file: packet-logotype-cert-extn-template.c */
 
+#line 1 "packet-logotype-cert-extn-template.c"
 /* packet-logotype-cert-extn.c
  * Routines for RFC3709 Logotype Certificate Extensions packet dissection
  *   Ronnie Sahlberg 2004
@@ -52,7 +53,7 @@
 static int proto_logotypecertextn = -1;
 
 /*--- Included file: packet-logotypecertextn-hf.c ---*/
-
+#line 1 "packet-logotypecertextn-hf.c"
 static int hf_logotypecertextn_LogotypeExtn_PDU = -1;  /* LogotypeExtn */
 static int hf_logotypecertextn_communityLogos = -1;  /* SEQUENCE_OF_LogotypeInfo */
 static int hf_logotypecertextn_communityLogos_item = -1;  /* LogotypeInfo */
@@ -96,12 +97,12 @@ static int hf_logotypecertextn_hashAlg = -1;      /* AlgorithmIdentifier */
 static int hf_logotypecertextn_hashValue = -1;    /* OCTET_STRING */
 
 /*--- End of included file: packet-logotypecertextn-hf.c ---*/
-
+#line 47 "packet-logotype-cert-extn-template.c"
 
 /* Initialize the subtree pointers */
 
 /*--- Included file: packet-logotypecertextn-ett.c ---*/
-
+#line 1 "packet-logotypecertextn-ett.c"
 static gint ett_logotypecertextn_LogotypeExtn = -1;
 static gint ett_logotypecertextn_SEQUENCE_OF_LogotypeInfo = -1;
 static gint ett_logotypecertextn_SEQUENCE_OF_OtherLogotypeInfo = -1;
@@ -123,12 +124,12 @@ static gint ett_logotypecertextn_T_refStructURI = -1;
 static gint ett_logotypecertextn_HashAlgAndValue = -1;
 
 /*--- End of included file: packet-logotypecertextn-ett.c ---*/
-
+#line 50 "packet-logotype-cert-extn-template.c"
 
 
 
 /*--- Included file: packet-logotypecertextn-fn.c ---*/
-
+#line 1 "packet-logotypecertextn-fn.c"
 /*--- Fields for imported types ---*/
 
 static int dissect_hashAlg(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -544,8 +545,7 @@ static int dissect_communityLogos(packet_info *pinfo, proto_tree *tree, tvbuff_t
 
 static int
 dissect_logotypecertextn_OBJECT_IDENTIFIER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, hf_index,
-                                            NULL);
+  offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -612,7 +612,7 @@ static void dissect_LogotypeExtn_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tr
 
 
 /*--- End of included file: packet-logotypecertextn-fn.c ---*/
-
+#line 53 "packet-logotype-cert-extn-template.c"
 
 
 /*--- proto_register_logotypecertextn ----------------------------------------------*/
@@ -622,7 +622,7 @@ void proto_register_logotypecertextn(void) {
   static hf_register_info hf[] = {
 
 /*--- Included file: packet-logotypecertextn-hfarr.c ---*/
-
+#line 1 "packet-logotypecertextn-hfarr.c"
     { &hf_logotypecertextn_LogotypeExtn_PDU,
       { "LogotypeExtn", "logotypecertextn.LogotypeExtn",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -757,7 +757,7 @@ void proto_register_logotypecertextn(void) {
         "LogotypeAudioInfo/sampleRate", HFILL }},
     { &hf_logotypecertextn_logotypeType,
       { "logotypeType", "logotypecertextn.logotypeType",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "OtherLogotypeInfo/logotypeType", HFILL }},
     { &hf_logotypecertextn_info,
       { "info", "logotypecertextn.info",
@@ -789,14 +789,14 @@ void proto_register_logotypecertextn(void) {
         "HashAlgAndValue/hashValue", HFILL }},
 
 /*--- End of included file: packet-logotypecertextn-hfarr.c ---*/
-
+#line 61 "packet-logotype-cert-extn-template.c"
   };
 
   /* List of subtrees */
   static gint *ett[] = {
 
 /*--- Included file: packet-logotypecertextn-ettarr.c ---*/
-
+#line 1 "packet-logotypecertextn-ettarr.c"
     &ett_logotypecertextn_LogotypeExtn,
     &ett_logotypecertextn_SEQUENCE_OF_LogotypeInfo,
     &ett_logotypecertextn_SEQUENCE_OF_OtherLogotypeInfo,
@@ -818,7 +818,7 @@ void proto_register_logotypecertextn(void) {
     &ett_logotypecertextn_HashAlgAndValue,
 
 /*--- End of included file: packet-logotypecertextn-ettarr.c ---*/
-
+#line 66 "packet-logotype-cert-extn-template.c"
   };
 
   /* Register protocol */
@@ -835,13 +835,13 @@ void proto_register_logotypecertextn(void) {
 void proto_reg_handoff_logotypecertextn(void) {
 
 /*--- Included file: packet-logotypecertextn-dis-tab.c ---*/
-
+#line 1 "packet-logotypecertextn-dis-tab.c"
   register_ber_oid_dissector("1.3.6.1.5.5.7.1.12", dissect_LogotypeExtn_PDU, proto_logotypecertextn, "id-pe-logotype");
   register_ber_oid_dissector("1.3.6.1.5.5.7.20.1", dissect_LogotypeExtn_PDU, proto_logotypecertextn, "id-pe-logo-loyalty");
   register_ber_oid_dissector("1.3.6.1.5.5.7.20.2", dissect_LogotypeExtn_PDU, proto_logotypecertextn, "id-pe-logo-background");
 
 
 /*--- End of included file: packet-logotypecertextn-dis-tab.c ---*/
-
+#line 81 "packet-logotype-cert-extn-template.c"
 }
 
diff --git a/epan/dissectors/packet-logotypecertextn.h b/epan/dissectors/packet-logotypecertextn.h
index 42e64fef5a..9c857aa35b 100644
--- a/epan/dissectors/packet-logotypecertextn.h
+++ b/epan/dissectors/packet-logotypecertextn.h
@@ -5,6 +5,7 @@
 
 /* Input file: packet-logotype-cert-extn-template.h */
 
+#line 1 "packet-logotype-cert-extn-template.h"
 /* packet-logotype-cert-extn.h
  * Routines for RFC3907 Logotype Certificate Extensions packet dissection
  *    Ronnie Sahlberg 2004
diff --git a/epan/dissectors/packet-mms.c b/epan/dissectors/packet-mms.c
index 04ecb7d02e..3c5da2a1c1 100644
--- a/epan/dissectors/packet-mms.c
+++ b/epan/dissectors/packet-mms.c
@@ -1,10 +1,11 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-mms.c                                                             */
+/* ./packet-mms.c                                                             */
 /* ../../tools/asn2eth.py -X -b -e -p mms -c mms.cnf -s packet-mms-template mms.asn */
 
 /* Input file: packet-mms-template.c */
 
+#line 1 "packet-mms-template.c"
 /* packet-mms_asn1.c
  *
  * Ronnie Sahlberg 2005
@@ -56,7 +57,7 @@ static char object_identifier_id[MAX_OID_STR_LEN];
 
 
 /*--- Included file: packet-mms-hf.c ---*/
-
+#line 1 "packet-mms-hf.c"
 static int hf_mms_confirmed_RequestPDU = -1;      /* Confirmed_RequestPDU */
 static int hf_mms_confirmed_ResponsePDU = -1;     /* Confirmed_ResponsePDU */
 static int hf_mms_confirmed_ErrorPDU = -1;        /* Confirmed_ErrorPDU */
@@ -719,13 +720,13 @@ static int hf_mms_Transitions_idle_to_active = -1;
 static int hf_mms_Transitions_any_to_deleted = -1;
 
 /*--- End of included file: packet-mms-hf.c ---*/
-
+#line 51 "packet-mms-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_mms = -1;
 
 /*--- Included file: packet-mms-ett.c ---*/
-
+#line 1 "packet-mms-ett.c"
 static gint ett_mms_MMSpdu = -1;
 static gint ett_mms_Confirmed_RequestPDU = -1;
 static gint ett_mms_SEQUENCE_OF_Modifier = -1;
@@ -933,11 +934,11 @@ static gint ett_mms_DirectoryEntry = -1;
 static gint ett_mms_FileAttributes = -1;
 
 /*--- End of included file: packet-mms-ett.c ---*/
-
+#line 55 "packet-mms-template.c"
 
 
 /*--- Included file: packet-mms-fn.c ---*/
-
+#line 1 "packet-mms-fn.c"
 /*--- Cyclic dependencies ---*/
 
 /* TypeSpecification -> TypeSpecification/array -> TypeSpecification */
@@ -2841,9 +2842,11 @@ static int dissect_output_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
 
 static int
 dissect_mms_T_ap_title(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 23 "mms.cnf"
   offset=dissect_acse_AP_title(FALSE, tvb, offset, pinfo, tree, hf_mms_ap_title);
 
 
+
   return offset;
 }
 static int dissect_ap_title(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -2854,9 +2857,11 @@ static int dissect_ap_title(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
 
 static int
 dissect_mms_T_ap_invocation_id(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 26 "mms.cnf"
   offset=dissect_acse_AP_invocation_identifier(FALSE, tvb, offset, pinfo, tree, hf_mms_ap_invocation_id);
 
 
+
   return offset;
 }
 static int dissect_ap_invocation_id(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -2867,9 +2872,11 @@ static int dissect_ap_invocation_id(packet_info *pinfo, proto_tree *tree, tvbuff
 
 static int
 dissect_mms_T_ae_qualifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 29 "mms.cnf"
   offset=dissect_acse_AE_qualifier(FALSE, tvb, offset, pinfo, tree, hf_mms_ae_qualifier);
 
 
+
   return offset;
 }
 static int dissect_ae_qualifier(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -2880,8 +2887,10 @@ static int dissect_ae_qualifier(packet_info *pinfo, proto_tree *tree, tvbuff_t *
 
 static int
 dissect_mms_T_ae_invocation_id(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 32 "mms.cnf"
   offset=dissect_acse_AE_invocation_identifier(FALSE, tvb, offset, pinfo, tree, hf_mms_ae_invocation_id);
 
+
   return offset;
 }
 static int dissect_ae_invocation_id(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -5467,8 +5476,7 @@ static int dissect_getNameList1_impl(packet_info *pinfo, proto_tree *tree, tvbuf
 
 static int
 dissect_mms_OBJECT_IDENTIFIER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, hf_index,
-                                            NULL);
+  offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -8526,7 +8534,7 @@ dissect_mms_MMSpdu(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_
 
 
 /*--- End of included file: packet-mms-fn.c ---*/
-
+#line 57 "packet-mms-template.c"
 
 /*
 * Dissect MMS PDUs inside a PPDU.
@@ -8568,7 +8576,7 @@ void proto_register_mms(void) {
   {
 
 /*--- Included file: packet-mms-hfarr.c ---*/
-
+#line 1 "packet-mms-hfarr.c"
     { &hf_mms_confirmed_RequestPDU,
       { "confirmed-RequestPDU", "mms.confirmed_RequestPDU",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -9335,19 +9343,19 @@ void proto_register_mms(void) {
         "ObjectName/aa-specific", HFILL }},
     { &hf_mms_ap_title,
       { "ap-title", "mms.ap_title",
-        FT_NONE, BASE_NONE, NULL, 0,
+        FT_UINT32, BASE_DEC, VALS(acse_AP_title_vals), 0,
         "ApplicationReference/ap-title", HFILL }},
     { &hf_mms_ap_invocation_id,
       { "ap-invocation-id", "mms.ap_invocation_id",
-        FT_NONE, BASE_NONE, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "ApplicationReference/ap-invocation-id", HFILL }},
     { &hf_mms_ae_qualifier,
       { "ae-qualifier", "mms.ae_qualifier",
-        FT_NONE, BASE_NONE, NULL, 0,
+        FT_UINT32, BASE_DEC, VALS(acse_ASO_qualifier_vals), 0,
         "ApplicationReference/ae-qualifier", HFILL }},
     { &hf_mms_ae_invocation_id,
       { "ae-invocation-id", "mms.ae_invocation_id",
-        FT_NONE, BASE_NONE, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "ApplicationReference/ae-invocation-id", HFILL }},
     { &hf_mms_localDetailCalling,
       { "localDetailCalling", "mms.localDetailCalling",
@@ -9643,7 +9651,7 @@ void proto_register_mms(void) {
         "Identify-Response/listOfAbstractSyntaxes", HFILL }},
     { &hf_mms_listOfAbstractSyntaxes_item,
       { "Item", "mms.listOfAbstractSyntaxes_item",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "Identify-Response/listOfAbstractSyntaxes/_item", HFILL }},
     { &hf_mms_extendedObjectClass1,
       { "extendedObjectClass", "mms.extendedObjectClass",
@@ -11207,7 +11215,7 @@ void proto_register_mms(void) {
         "", HFILL }},
 
 /*--- End of included file: packet-mms-hfarr.c ---*/
-
+#line 97 "packet-mms-template.c"
   };
 
   /* List of subtrees */
@@ -11215,7 +11223,7 @@ void proto_register_mms(void) {
     &ett_mms,
 
 /*--- Included file: packet-mms-ettarr.c ---*/
-
+#line 1 "packet-mms-ettarr.c"
     &ett_mms_MMSpdu,
     &ett_mms_Confirmed_RequestPDU,
     &ett_mms_SEQUENCE_OF_Modifier,
@@ -11423,7 +11431,7 @@ void proto_register_mms(void) {
     &ett_mms_FileAttributes,
 
 /*--- End of included file: packet-mms-ettarr.c ---*/
-
+#line 103 "packet-mms-template.c"
   };
 
   /* Register protocol */
diff --git a/epan/dissectors/packet-mms.h b/epan/dissectors/packet-mms.h
index 70ad66e147..66d0c527a0 100644
--- a/epan/dissectors/packet-mms.h
+++ b/epan/dissectors/packet-mms.h
@@ -1,10 +1,11 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-mms.h                                                             */
+/* ./packet-mms.h                                                             */
 /* ../../tools/asn2eth.py -X -b -e -p mms -c mms.cnf -s packet-mms-template mms.asn */
 
 /* Input file: packet-mms-template.h */
 
+#line 1 "packet-mms-template.h"
 /* packet-mms.h
  * Routines for MMS packet dissection
  *   Ronnie Sahlberg 2005
@@ -35,12 +36,12 @@
 
 
 /*--- Included file: packet-mms-exp.h ---*/
-
+#line 1 "packet-mms-exp.h"
 extern const value_string mms_MMSpdu_vals[];
 int dissect_mms_MMSpdu(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
 
 /*--- End of included file: packet-mms-exp.h ---*/
-
+#line 30 "packet-mms-template.h"
 
 #endif  /* PACKET_MMS_H */
 
diff --git a/epan/dissectors/packet-nbap.c b/epan/dissectors/packet-nbap.c
index b4ba2efc88..bdc1e9ecd9 100644
--- a/epan/dissectors/packet-nbap.c
+++ b/epan/dissectors/packet-nbap.c
@@ -1,10 +1,11 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-nbap.c                                                            */
+/* ./packet-nbap.c                                                            */
 /* ../../tools/asn2eth.py -X -e -p nbap -c nbap.cnf -s packet-nbap-template nbap.asn */
 
 /* Input file: packet-nbap-template.c */
 
+#line 1 "packet-nbap-template.c"
 /* packet-nbap.c
  * Routines for UMTS Node B Application Part(NBAP) packet dissection
  * Copyright 2005, Anders Broman <anders.broman@ericsson.com>
@@ -63,7 +64,7 @@ static int hf_nbap_IE_length = -1;
 
 
 /*--- Included file: packet-nbap-hf.c ---*/
-
+#line 1 "packet-nbap-hf.c"
 static int hf_nbap_NBAP_PDU_PDU = -1;             /* NBAP_PDU */
 static int hf_nbap_initiatingMessage = -1;        /* InitiatingMessage */
 static int hf_nbap_succesfulOutcome = -1;         /* SuccessfulOutcome */
@@ -2067,7 +2068,7 @@ static int hf_nbap_RACH_SubChannelNumbers_subCh1 = -1;
 static int hf_nbap_RACH_SubChannelNumbers_subCh0 = -1;
 
 /*--- End of included file: packet-nbap-hf.c ---*/
-
+#line 58 "packet-nbap-template.c"
 
 /* Initialize the subtree pointers */
 static int ett_nbap = -1;
@@ -2078,7 +2079,7 @@ static int ett_nbap_UnsuccessfulOutcomeValue = -1;
 
 
 /*--- Included file: packet-nbap-ett.c ---*/
-
+#line 1 "packet-nbap-ett.c"
 static gint ett_nbap_NBAP_PDU = -1;
 static gint ett_nbap_InitiatingMessage = -1;
 static gint ett_nbap_SuccessfulOutcome = -1;
@@ -3087,7 +3088,7 @@ static gint ett_nbap_PrivateIE_Container = -1;
 static gint ett_nbap_PrivateIE_Field = -1;
 
 /*--- End of included file: packet-nbap-ett.c ---*/
-
+#line 67 "packet-nbap-template.c"
 
 /* Global variables */
 static proto_tree *top_tree;
@@ -3760,7 +3761,7 @@ static int dissect_nbap_UnsuccessfulOutcomeValueValue(tvbuff_t *tvb, int offset,
 static int dissect_nbap_ProtocolIEValueValue(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree);
 
 /*--- Included file: packet-nbap-fn.c ---*/
-
+#line 1 "packet-nbap-fn.c"
 /*--- Fields for imported types ---*/
 
 
@@ -3828,10 +3829,12 @@ dissect_nbap_ProcedureCode(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, pr
   offset = dissect_per_constrained_integer(tvb, offset, pinfo, tree, hf_index,
                                               0U, 255U, &ProcedureCode, NULL, FALSE);
 
+#line 23 "nbap.cnf"
 	if (check_col(pinfo->cinfo, COL_INFO))
        col_add_fstr(pinfo->cinfo, COL_INFO, "%s ",
                    val_to_str(ProcedureCode, nbap_ProcedureCode_vals,
                               "unknown message"));
+
   return offset;
 }
 static int dissect_procedureCode(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -3988,10 +3991,12 @@ static int dissect_transactionID(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 static int
 dissect_nbap_InitiatingMessageValue(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+#line 44 "nbap.cnf"
 
 	offset = dissect_nbap_InitiatingMessageValueValue(tvb, offset, pinfo, tree);
 
 
+
   return offset;
 }
 static int dissect_initiatingMessageValue(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -4023,10 +4028,12 @@ static int dissect_initiatingMessage(tvbuff_t *tvb, int offset, packet_info *pin
 
 static int
 dissect_nbap_SuccessfulOutcomeValue(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+#line 48 "nbap.cnf"
 
 	offset = dissect_nbap_SuccessfulOutcomeValueValue(tvb, offset, pinfo, tree);
 
 
+
   return offset;
 }
 static int dissect_successfulOutcomeValue(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -4058,10 +4065,12 @@ static int dissect_succesfulOutcome(tvbuff_t *tvb, int offset, packet_info *pinf
 
 static int
 dissect_nbap_UnsuccessfulOutcomeValue(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+#line 60 "nbap.cnf"
 
 	offset = dissect_nbap_UnsuccessfulOutcomeValueValue(tvb, offset, pinfo, tree);
 
 
+
   return offset;
 }
 static int dissect_unsuccessfulOutcomeValue(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -4093,6 +4102,7 @@ static int dissect_unsuccesfulOutcome(tvbuff_t *tvb, int offset, packet_info *pi
 
 static int
 dissect_nbap_OutcomeValue(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+#line 52 "nbap.cnf"
 	/* FIX ME */
 	guint length;
 
@@ -4101,6 +4111,7 @@ dissect_nbap_OutcomeValue(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, pro
 	BYTE_ALIGN_OFFSET(offset)
 
 
+
   return offset;
 }
 static int dissect_outcomeValue(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -4772,10 +4783,12 @@ static int dissect_id(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
 
 static int
 dissect_nbap_ProtocolIEValue(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+#line 64 "nbap.cnf"
 
 	offset = dissect_nbap_ProtocolIEValueValue(tvb, offset, pinfo, tree);
 
 
+
   return offset;
 }
 static int dissect_value(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -4825,6 +4838,7 @@ static int dissect_ProtocolIE_ContainerList_item(tvbuff_t *tvb, int offset, pack
 
 static int
 dissect_nbap_Extension(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+#line 36 "nbap.cnf"
 	/* FIX ME */
 	guint length;
 
@@ -4833,6 +4847,7 @@ dissect_nbap_Extension(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_
 	BYTE_ALIGN_OFFSET(offset)
 
 
+
   return offset;
 }
 static int dissect_extensionValue(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -5409,6 +5424,7 @@ static int dissect_privateIEid(tvbuff_t *tvb, int offset, packet_info *pinfo, pr
 
 static int
 dissect_nbap_PrivateIEvalue(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+#line 85 "nbap.cnf"
 	/* FIX ME */
 	guint length;
 
@@ -5416,6 +5432,7 @@ dissect_nbap_PrivateIEvalue(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, p
 	offset = offset + length;
 	BYTE_ALIGN_OFFSET(offset)
 
+
   return offset;
 }
 static int dissect_privateIEvalue(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -18079,7 +18096,7 @@ static int dissect_segment_Type(tvbuff_t *tvb, int offset, packet_info *pinfo, p
 static int
 dissect_nbap_IB_SG_DATA(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
   offset = dissect_per_bit_string(tvb, offset, pinfo, tree, hf_index,
-                                     -1, -1, FALSE);
+                                     NO_BOUND, NO_BOUND, FALSE);
 
   return offset;
 }
@@ -34441,6 +34458,7 @@ dissect_nbap_Presence(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_t
 
 static int
 dissect_nbap_FirstValue(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+#line 68 "nbap.cnf"
 	/* FIX ME */
 	guint length;
 
@@ -34449,6 +34467,7 @@ dissect_nbap_FirstValue(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto
 	BYTE_ALIGN_OFFSET(offset)
 
 
+
   return offset;
 }
 static int dissect_firstValue(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -34459,6 +34478,7 @@ static int dissect_firstValue(tvbuff_t *tvb, int offset, packet_info *pinfo, pro
 
 static int
 dissect_nbap_SecondValue(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+#line 76 "nbap.cnf"
 	/* FIX ME */
 	guint length;
 
@@ -34468,6 +34488,7 @@ dissect_nbap_SecondValue(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, prot
 
 
 
+
   return offset;
 }
 static int dissect_secondValue(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -34548,7 +34569,7 @@ static void dissect_NBAP_PDU_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
 
 
 /*--- End of included file: packet-nbap-fn.c ---*/
-
+#line 738 "packet-nbap-template.c"
 
 
 static int dissect_nbap_InitiatingMessageValueValue(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree){
@@ -36737,7 +36758,7 @@ void proto_register_nbap(void) {
 		NULL, 0, "Number of octets in the IE", HFILL }},
 
 /*--- Included file: packet-nbap-hfarr.c ---*/
-
+#line 1 "packet-nbap-hfarr.c"
     { &hf_nbap_NBAP_PDU_PDU,
       { "NBAP-PDU", "nbap.NBAP_PDU",
         FT_UINT32, BASE_DEC, VALS(nbap_NBAP_PDU_vals), 0,
@@ -37428,7 +37449,7 @@ void proto_register_nbap(void) {
         "DymmyProtocolIE-ID/id-DL-ReferencePowerInformationItem-DL-PC-Rqst", HFILL }},
     { &hf_nbap_id_DLReferencePower,
       { "id-DLReferencePower", "nbap.id_DLReferencePower",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "DymmyProtocolIE-ID/id-DLReferencePower", HFILL }},
     { &hf_nbap_id_DLReferencePowerList_DL_PC_Rqst,
       { "id-DLReferencePowerList-DL-PC-Rqst", "nbap.id_DLReferencePowerList_DL_PC_Rqst",
@@ -38152,7 +38173,7 @@ void proto_register_nbap(void) {
         "DymmyProtocolIE-ID/id-DPC-Mode", HFILL }},
     { &hf_nbap_id_DPCHConstant,
       { "id-DPCHConstant", "nbap.id_DPCHConstant",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "DymmyProtocolIE-ID/id-DPCHConstant", HFILL }},
     { &hf_nbap_id_FACH_ParametersList_CTCH_SetupRsp,
       { "id-FACH-ParametersList-CTCH-SetupRsp", "nbap.id_FACH_ParametersList_CTCH_SetupRsp",
@@ -38176,7 +38197,7 @@ void proto_register_nbap(void) {
         "DymmyProtocolIE-ID/id-PICH-ParametersItem-CTCH-ReconfRqstFDD", HFILL }},
     { &hf_nbap_id_PRACHConstant,
       { "id-PRACHConstant", "nbap.id_PRACHConstant",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "DymmyProtocolIE-ID/id-PRACHConstant", HFILL }},
     { &hf_nbap_id_PRACH_ParametersListIE_CTCH_ReconfRqstFDD,
       { "id-PRACH-ParametersListIE-CTCH-ReconfRqstFDD", "nbap.id_PRACH_ParametersListIE_CTCH_ReconfRqstFDD",
@@ -38184,7 +38205,7 @@ void proto_register_nbap(void) {
         "DymmyProtocolIE-ID/id-PRACH-ParametersListIE-CTCH-ReconfRqstFDD", HFILL }},
     { &hf_nbap_id_PUSCHConstant,
       { "id-PUSCHConstant", "nbap.id_PUSCHConstant",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "DymmyProtocolIE-ID/id-PUSCHConstant", HFILL }},
     { &hf_nbap_id_RACH_Parameters_CTCH_SetupRsp,
       { "id-RACH-Parameters-CTCH-SetupRsp", "nbap.id_RACH_Parameters_CTCH_SetupRsp",
@@ -38448,11 +38469,11 @@ void proto_register_nbap(void) {
         "DymmyProtocolIE-ID/id-DwPCH-LCR-Information-ResourceStatusInd", HFILL }},
     { &hf_nbap_id_maxFACH_Power_LCR_CTCH_SetupRqstTDD,
       { "id-maxFACH-Power-LCR-CTCH-SetupRqstTDD", "nbap.id_maxFACH_Power_LCR_CTCH_SetupRqstTDD",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "DymmyProtocolIE-ID/id-maxFACH-Power-LCR-CTCH-SetupRqstTDD", HFILL }},
     { &hf_nbap_id_maxFACH_Power_LCR_CTCH_ReconfRqstTDD,
       { "id-maxFACH-Power-LCR-CTCH-ReconfRqstTDD", "nbap.id_maxFACH_Power_LCR_CTCH_ReconfRqstTDD",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "DymmyProtocolIE-ID/id-maxFACH-Power-LCR-CTCH-ReconfRqstTDD", HFILL }},
     { &hf_nbap_id_FPACH_LCR_Information,
       { "id-FPACH-LCR-Information", "nbap.id_FPACH_LCR_Information",
@@ -38484,11 +38505,11 @@ void proto_register_nbap(void) {
         "DymmyProtocolIE-ID/id-PCCPCH-LCR-Information-Cell-SetupRqstTDD", HFILL }},
     { &hf_nbap_id_PCH_Power_LCR_CTCH_SetupRqstTDD,
       { "id-PCH-Power-LCR-CTCH-SetupRqstTDD", "nbap.id_PCH_Power_LCR_CTCH_SetupRqstTDD",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "DymmyProtocolIE-ID/id-PCH-Power-LCR-CTCH-SetupRqstTDD", HFILL }},
     { &hf_nbap_id_PCH_Power_LCR_CTCH_ReconfRqstTDD,
       { "id-PCH-Power-LCR-CTCH-ReconfRqstTDD", "nbap.id_PCH_Power_LCR_CTCH_ReconfRqstTDD",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "DymmyProtocolIE-ID/id-PCH-Power-LCR-CTCH-ReconfRqstTDD", HFILL }},
     { &hf_nbap_id_PICH_LCR_Parameters_CTCH_SetupRqstTDD,
       { "id-PICH-LCR-Parameters-CTCH-SetupRqstTDD", "nbap.id_PICH_LCR_Parameters_CTCH_SetupRqstTDD",
@@ -38572,7 +38593,7 @@ void proto_register_nbap(void) {
         "DymmyProtocolIE-ID/id-UL-TimeslotLCR-Information-RL-ReconfPrepTDD", HFILL }},
     { &hf_nbap_id_UL_SIRTarget,
       { "id-UL-SIRTarget", "nbap.id_UL_SIRTarget",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "DymmyProtocolIE-ID/id-UL-SIRTarget", HFILL }},
     { &hf_nbap_id_PDSCH_AddInformation_LCR_PSCH_ReconfRqst,
       { "id-PDSCH-AddInformation-LCR-PSCH-ReconfRqst", "nbap.id_PDSCH_AddInformation_LCR_PSCH_ReconfRqst",
@@ -38640,7 +38661,7 @@ void proto_register_nbap(void) {
         "DymmyProtocolIE-ID/id-PUSCH-Info-DM-Rprt", HFILL }},
     { &hf_nbap_id_InitDL_Power,
       { "id-InitDL-Power", "nbap.id_InitDL_Power",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "DymmyProtocolIE-ID/id-InitDL-Power", HFILL }},
     { &hf_nbap_id_cellSyncBurstRepetitionPeriod,
       { "id-cellSyncBurstRepetitionPeriod", "nbap.id_cellSyncBurstRepetitionPeriod",
@@ -38688,15 +38709,15 @@ void proto_register_nbap(void) {
         "DymmyProtocolIE-ID/id-DL-PowerBalancing-UpdatedIndicator", HFILL }},
     { &hf_nbap_id_CCTrCH_Initial_DL_Power_RL_SetupRqstTDD,
       { "id-CCTrCH-Initial-DL-Power-RL-SetupRqstTDD", "nbap.id_CCTrCH_Initial_DL_Power_RL_SetupRqstTDD",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "DymmyProtocolIE-ID/id-CCTrCH-Initial-DL-Power-RL-SetupRqstTDD", HFILL }},
     { &hf_nbap_id_CCTrCH_Initial_DL_Power_RL_AdditionRqstTDD,
       { "id-CCTrCH-Initial-DL-Power-RL-AdditionRqstTDD", "nbap.id_CCTrCH_Initial_DL_Power_RL_AdditionRqstTDD",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "DymmyProtocolIE-ID/id-CCTrCH-Initial-DL-Power-RL-AdditionRqstTDD", HFILL }},
     { &hf_nbap_id_CCTrCH_Initial_DL_Power_RL_ReconfPrepTDD,
       { "id-CCTrCH-Initial-DL-Power-RL-ReconfPrepTDD", "nbap.id_CCTrCH_Initial_DL_Power_RL_ReconfPrepTDD",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "DymmyProtocolIE-ID/id-CCTrCH-Initial-DL-Power-RL-ReconfPrepTDD", HFILL }},
     { &hf_nbap_id_IPDLParameter_Information_LCR_Cell_SetupRqstTDD,
       { "id-IPDLParameter-Information-LCR-Cell-SetupRqstTDD", "nbap.id_IPDLParameter_Information_LCR_Cell_SetupRqstTDD",
@@ -38808,7 +38829,7 @@ void proto_register_nbap(void) {
         "DymmyProtocolIE-ID/id-NSubCyclesPerCyclePeriod-CellSyncReconfRqstTDD", HFILL }},
     { &hf_nbap_id_DwPCH_Power,
       { "id-DwPCH-Power", "nbap.id_DwPCH_Power",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "DymmyProtocolIE-ID/id-DwPCH-Power", HFILL }},
     { &hf_nbap_id_AccumulatedClockupdate_CellSyncReprtTDD,
       { "id-AccumulatedClockupdate-CellSyncReprtTDD", "nbap.id_AccumulatedClockupdate_CellSyncReprtTDD",
@@ -38908,43 +38929,43 @@ void proto_register_nbap(void) {
         "DymmyProtocolIE-ID/id-TDD-TPC-DownlinkStepSize-InformationAdd-RL-ReconfPrepTDD", HFILL }},
     { &hf_nbap_id_CCTrCH_Maximum_DL_Power_RL_SetupRqstTDD,
       { "id-CCTrCH-Maximum-DL-Power-RL-SetupRqstTDD", "nbap.id_CCTrCH_Maximum_DL_Power_RL_SetupRqstTDD",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "DymmyProtocolIE-ID/id-CCTrCH-Maximum-DL-Power-RL-SetupRqstTDD", HFILL }},
     { &hf_nbap_id_CCTrCH_Minimum_DL_Power_RL_SetupRqstTDD,
       { "id-CCTrCH-Minimum-DL-Power-RL-SetupRqstTDD", "nbap.id_CCTrCH_Minimum_DL_Power_RL_SetupRqstTDD",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "DymmyProtocolIE-ID/id-CCTrCH-Minimum-DL-Power-RL-SetupRqstTDD", HFILL }},
     { &hf_nbap_id_CCTrCH_Maximum_DL_Power_RL_AdditionRqstTDD,
       { "id-CCTrCH-Maximum-DL-Power-RL-AdditionRqstTDD", "nbap.id_CCTrCH_Maximum_DL_Power_RL_AdditionRqstTDD",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "DymmyProtocolIE-ID/id-CCTrCH-Maximum-DL-Power-RL-AdditionRqstTDD", HFILL }},
     { &hf_nbap_id_CCTrCH_Minimum_DL_Power_RL_AdditionRqstTDD,
       { "id-CCTrCH-Minimum-DL-Power-RL-AdditionRqstTDD", "nbap.id_CCTrCH_Minimum_DL_Power_RL_AdditionRqstTDD",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "DymmyProtocolIE-ID/id-CCTrCH-Minimum-DL-Power-RL-AdditionRqstTDD", HFILL }},
     { &hf_nbap_id_CCTrCH_Maximum_DL_Power_InformationAdd_RL_ReconfPrepTDD,
       { "id-CCTrCH-Maximum-DL-Power-InformationAdd-RL-ReconfPrepTDD", "nbap.id_CCTrCH_Maximum_DL_Power_InformationAdd_RL_ReconfPrepTDD",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "DymmyProtocolIE-ID/id-CCTrCH-Maximum-DL-Power-InformationAdd-RL-ReconfPrepTDD", HFILL }},
     { &hf_nbap_id_CCTrCH_Minimum_DL_Power_InformationAdd_RL_ReconfPrepTDD,
       { "id-CCTrCH-Minimum-DL-Power-InformationAdd-RL-ReconfPrepTDD", "nbap.id_CCTrCH_Minimum_DL_Power_InformationAdd_RL_ReconfPrepTDD",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "DymmyProtocolIE-ID/id-CCTrCH-Minimum-DL-Power-InformationAdd-RL-ReconfPrepTDD", HFILL }},
     { &hf_nbap_id_CCTrCH_Maximum_DL_Power_InformationModify_RL_ReconfPrepTDD,
       { "id-CCTrCH-Maximum-DL-Power-InformationModify-RL-ReconfPrepTDD", "nbap.id_CCTrCH_Maximum_DL_Power_InformationModify_RL_ReconfPrepTDD",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "DymmyProtocolIE-ID/id-CCTrCH-Maximum-DL-Power-InformationModify-RL-ReconfPrepTDD", HFILL }},
     { &hf_nbap_id_CCTrCH_Minimum_DL_Power_InformationModify_RL_ReconfPrepTDD,
       { "id-CCTrCH-Minimum-DL-Power-InformationModify-RL-ReconfPrepTDD", "nbap.id_CCTrCH_Minimum_DL_Power_InformationModify_RL_ReconfPrepTDD",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "DymmyProtocolIE-ID/id-CCTrCH-Minimum-DL-Power-InformationModify-RL-ReconfPrepTDD", HFILL }},
     { &hf_nbap_id_Maximum_DL_Power_Modify_LCR_InformationModify_RL_ReconfPrepTDD,
       { "id-Maximum-DL-Power-Modify-LCR-InformationModify-RL-ReconfPrepTDD", "nbap.id_Maximum_DL_Power_Modify_LCR_InformationModify_RL_ReconfPrepTDD",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "DymmyProtocolIE-ID/id-Maximum-DL-Power-Modify-LCR-InformationModify-RL-ReconfPrepTDD", HFILL }},
     { &hf_nbap_id_Minimum_DL_Power_Modify_LCR_InformationModify_RL_ReconfPrepTDD,
       { "id-Minimum-DL-Power-Modify-LCR-InformationModify-RL-ReconfPrepTDD", "nbap.id_Minimum_DL_Power_Modify_LCR_InformationModify_RL_ReconfPrepTDD",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "DymmyProtocolIE-ID/id-Minimum-DL-Power-Modify-LCR-InformationModify-RL-ReconfPrepTDD", HFILL }},
     { &hf_nbap_id_DL_DPCH_LCR_InformationModify_ModifyList_RL_ReconfRqstTDD,
       { "id-DL-DPCH-LCR-InformationModify-ModifyList-RL-ReconfRqstTDD", "nbap.id_DL_DPCH_LCR_InformationModify_ModifyList_RL_ReconfRqstTDD",
@@ -38952,23 +38973,23 @@ void proto_register_nbap(void) {
         "DymmyProtocolIE-ID/id-DL-DPCH-LCR-InformationModify-ModifyList-RL-ReconfRqstTDD", HFILL }},
     { &hf_nbap_id_CCTrCH_Maximum_DL_Power_InformationModify_RL_ReconfRqstTDD,
       { "id-CCTrCH-Maximum-DL-Power-InformationModify-RL-ReconfRqstTDD", "nbap.id_CCTrCH_Maximum_DL_Power_InformationModify_RL_ReconfRqstTDD",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "DymmyProtocolIE-ID/id-CCTrCH-Maximum-DL-Power-InformationModify-RL-ReconfRqstTDD", HFILL }},
     { &hf_nbap_id_CCTrCH_Minimum_DL_Power_InformationModify_RL_ReconfRqstTDD,
       { "id-CCTrCH-Minimum-DL-Power-InformationModify-RL-ReconfRqstTDD", "nbap.id_CCTrCH_Minimum_DL_Power_InformationModify_RL_ReconfRqstTDD",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "DymmyProtocolIE-ID/id-CCTrCH-Minimum-DL-Power-InformationModify-RL-ReconfRqstTDD", HFILL }},
     { &hf_nbap_id_Initial_DL_Power_TimeslotLCR_InformationItem,
       { "id-Initial-DL-Power-TimeslotLCR-InformationItem", "nbap.id_Initial_DL_Power_TimeslotLCR_InformationItem",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "DymmyProtocolIE-ID/id-Initial-DL-Power-TimeslotLCR-InformationItem", HFILL }},
     { &hf_nbap_id_Maximum_DL_Power_TimeslotLCR_InformationItem,
       { "id-Maximum-DL-Power-TimeslotLCR-InformationItem", "nbap.id_Maximum_DL_Power_TimeslotLCR_InformationItem",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "DymmyProtocolIE-ID/id-Maximum-DL-Power-TimeslotLCR-InformationItem", HFILL }},
     { &hf_nbap_id_Minimum_DL_Power_TimeslotLCR_InformationItem,
       { "id-Minimum-DL-Power-TimeslotLCR-InformationItem", "nbap.id_Minimum_DL_Power_TimeslotLCR_InformationItem",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "DymmyProtocolIE-ID/id-Minimum-DL-Power-TimeslotLCR-InformationItem", HFILL }},
     { &hf_nbap_id_HS_DSCHProvidedBitRateValueInformation,
       { "id-HS-DSCHProvidedBitRateValueInformation", "nbap.id_HS_DSCHProvidedBitRateValueInformation",
@@ -39120,7 +39141,7 @@ void proto_register_nbap(void) {
         "DymmyProtocolIE-ID/id-UpPTSInterferenceValue", HFILL }},
     { &hf_nbap_id_PrimaryCCPCH_RSCP_Delta,
       { "id-PrimaryCCPCH-RSCP-Delta", "nbap.id_PrimaryCCPCH_RSCP_Delta",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "DymmyProtocolIE-ID/id-PrimaryCCPCH-RSCP-Delta", HFILL }},
     { &hf_nbap_id_MeasurementRecoveryBehavior,
       { "id-MeasurementRecoveryBehavior", "nbap.id_MeasurementRecoveryBehavior",
@@ -39520,11 +39541,11 @@ void proto_register_nbap(void) {
         "", HFILL }},
     { &hf_nbap_maxFACH_Power,
       { "maxFACH-Power", "nbap.maxFACH_Power",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "", HFILL }},
     { &hf_nbap_pCH_Power,
       { "pCH-Power", "nbap.pCH_Power",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "", HFILL }},
     { &hf_nbap_pICH_Parameters,
       { "pICH-Parameters", "nbap.pICH_Parameters",
@@ -39536,7 +39557,7 @@ void proto_register_nbap(void) {
         "", HFILL }},
     { &hf_nbap_pICH_Power,
       { "pICH-Power", "nbap.pICH_Power",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "", HFILL }},
     { &hf_nbap_pICH_Mode,
       { "pICH-Mode", "nbap.pICH_Mode",
@@ -39544,7 +39565,7 @@ void proto_register_nbap(void) {
         "PICH-Parameters-CTCH-SetupRqstFDD/pICH-Mode", HFILL }},
     { &hf_nbap_mICH_Power,
       { "mICH-Power", "nbap.mICH_Power",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "", HFILL }},
     { &hf_nbap_mICH_Mode,
       { "mICH-Mode", "nbap.mICH_Mode",
@@ -39596,7 +39617,7 @@ void proto_register_nbap(void) {
         "AICH-Parameters-CTCH-SetupRqstFDD/aICH-TransmissionTiming", HFILL }},
     { &hf_nbap_aICH_Power,
       { "aICH-Power", "nbap.aICH_Power",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "", HFILL }},
     { &hf_nbap_secondary_CCPCH_parameters1,
       { "secondary-CCPCH-parameters", "nbap.secondary_CCPCH_parameters",
@@ -39660,7 +39681,7 @@ void proto_register_nbap(void) {
         "", HFILL }},
     { &hf_nbap_s_CCPCH_Power,
       { "s-CCPCH-Power", "nbap.s_CCPCH_Power",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "", HFILL }},
     { &hf_nbap_FACH_ParametersListIE_CTCH_SetupRqstTDD_item,
       { "Item", "nbap.FACH_ParametersListIE_CTCH_SetupRqstTDD_item",
@@ -39776,7 +39797,7 @@ void proto_register_nbap(void) {
         "PRACH-LCR-ParametersList-CTCH-SetupRqstTDD/_item", HFILL }},
     { &hf_nbap_fPACH_Power,
       { "fPACH-Power", "nbap.fPACH_Power",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "FPACH-LCR-Parameters-CTCH-SetupRqstTDD/fPACH-Power", HFILL }},
     { &hf_nbap_FACH_CommonTransportChannel_InformationResponse_item,
       { "Item", "nbap.FACH_CommonTransportChannel_InformationResponse_item",
@@ -39852,7 +39873,7 @@ void proto_register_nbap(void) {
         "Secondary-CCPCHListIE-CTCH-ReconfRqstTDD/_item", HFILL }},
     { &hf_nbap_sCCPCH_Power,
       { "sCCPCH-Power", "nbap.sCCPCH_Power",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "Secondary-CCPCHItem-CTCH-ReconfRqstTDD/sCCPCH-Power", HFILL }},
     { &hf_nbap_FACH_ParametersList_CTCH_ReconfRqstTDD_item,
       { "Item", "nbap.FACH_ParametersList_CTCH_ReconfRqstTDD_item",
@@ -39864,7 +39885,7 @@ void proto_register_nbap(void) {
         "", HFILL }},
     { &hf_nbap_fPACHPower,
       { "fPACHPower", "nbap.fPACHPower",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "FPACH-LCR-Parameters-CTCH-ReconfRqstTDD/fPACHPower", HFILL }},
     { &hf_nbap_Secondary_CCPCH_parameterExtendedList_CTCH_ReconfRqstTDD_item,
       { "Item", "nbap.Secondary_CCPCH_parameterExtendedList_CTCH_ReconfRqstTDD_item",
@@ -40112,15 +40133,15 @@ void proto_register_nbap(void) {
         "", HFILL }},
     { &hf_nbap_primarySCH_Power,
       { "primarySCH-Power", "nbap.primarySCH_Power",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "", HFILL }},
     { &hf_nbap_secondarySCH_Power,
       { "secondarySCH-Power", "nbap.secondarySCH_Power",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "", HFILL }},
     { &hf_nbap_primaryCPICH_Power,
       { "primaryCPICH-Power", "nbap.primaryCPICH_Power",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "", HFILL }},
     { &hf_nbap_transmitDiversityIndicator,
       { "transmitDiversityIndicator", "nbap.transmitDiversityIndicator",
@@ -40136,7 +40157,7 @@ void proto_register_nbap(void) {
         "SecondaryCPICH-InformationItem-Cell-SetupRqstFDD/fDD-DL-ChannelisationCodeNumber", HFILL }},
     { &hf_nbap_secondaryCPICH_Power,
       { "secondaryCPICH-Power", "nbap.secondaryCPICH_Power",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "", HFILL }},
     { &hf_nbap_bCH_information,
       { "bCH-information", "nbap.bCH_information",
@@ -40144,7 +40165,7 @@ void proto_register_nbap(void) {
         "PrimaryCCPCH-Information-Cell-SetupRqstFDD/bCH-information", HFILL }},
     { &hf_nbap_bCH_Power,
       { "bCH-Power", "nbap.bCH_Power",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "", HFILL }},
     { &hf_nbap_powerRaiseLimit,
       { "powerRaiseLimit", "nbap.powerRaiseLimit",
@@ -40184,7 +40205,7 @@ void proto_register_nbap(void) {
         "SCH-Information-Cell-SetupRqstTDD/syncCaseIndicator", HFILL }},
     { &hf_nbap_sCH_Power,
       { "sCH-Power", "nbap.sCH_Power",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "", HFILL }},
     { &hf_nbap_case1,
       { "case1", "nbap.case1",
@@ -40200,7 +40221,7 @@ void proto_register_nbap(void) {
         "Case2-Cell-SetupRqstTDD/sCH-TimeSlot", HFILL }},
     { &hf_nbap_pCCPCH_Power,
       { "pCCPCH-Power", "nbap.pCCPCH_Power",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "", HFILL }},
     { &hf_nbap_sCTD_Indicator,
       { "sCTD-Indicator", "nbap.sCTD_Indicator",
@@ -40224,7 +40245,7 @@ void proto_register_nbap(void) {
         "TimeSlotConfigurationList-LCR-Cell-SetupRqstTDD/_item", HFILL }},
     { &hf_nbap_dwPCH_Power,
       { "dwPCH-Power", "nbap.dwPCH_Power",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "", HFILL }},
     { &hf_nbap_iPDL_TDD_Parameters,
       { "iPDL-TDD-Parameters", "nbap.iPDL_TDD_Parameters",
@@ -40496,7 +40517,7 @@ void proto_register_nbap(void) {
         "", HFILL }},
     { &hf_nbap_ul_SIR_Target,
       { "ul-SIR-Target", "nbap.ul_SIR_Target",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "", HFILL }},
     { &hf_nbap_diversityMode,
       { "diversityMode", "nbap.diversityMode",
@@ -40580,15 +40601,15 @@ void proto_register_nbap(void) {
         "", HFILL }},
     { &hf_nbap_initialDL_transmissionPower,
       { "initialDL-transmissionPower", "nbap.initialDL_transmissionPower",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "", HFILL }},
     { &hf_nbap_maximumDL_power,
       { "maximumDL-power", "nbap.maximumDL_power",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "", HFILL }},
     { &hf_nbap_minimumDL_power,
       { "minimumDL-power", "nbap.minimumDL_power",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "", HFILL }},
     { &hf_nbap_not_Used_sSDT_Cell_Identity,
       { "not-Used-sSDT-Cell-Identity", "nbap.not_Used_sSDT_Cell_Identity",
@@ -40796,15 +40817,15 @@ void proto_register_nbap(void) {
         "RL-InformationList-RL-AdditionRqstFDD/_item", HFILL }},
     { &hf_nbap_initialDL_TransmissionPower,
       { "initialDL-TransmissionPower", "nbap.initialDL_TransmissionPower",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "RL-InformationItem-RL-AdditionRqstFDD/initialDL-TransmissionPower", HFILL }},
     { &hf_nbap_maximumDL_Power,
       { "maximumDL-Power", "nbap.maximumDL_Power",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "", HFILL }},
     { &hf_nbap_minimumDL_Power,
       { "minimumDL-Power", "nbap.minimumDL_Power",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "", HFILL }},
     { &hf_nbap_not_Used_sSDT_CellIdentity,
       { "not-Used-sSDT-CellIdentity", "nbap.not_Used_sSDT_CellIdentity",
@@ -40828,7 +40849,7 @@ void proto_register_nbap(void) {
         "DL-CCTrCH-InformationItem-RL-AdditionRqstTDD/dL-DPCH-Information", HFILL }},
     { &hf_nbap_initial_DL_Transmission_Power,
       { "initial-DL-Transmission-Power", "nbap.initial_DL_Transmission_Power",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "RL-Information-RL-AdditionRqstTDD/initial-DL-Transmission-Power", HFILL }},
     { &hf_nbap_RL_InformationResponseList_RL_AdditionRspFDD_item,
       { "Item", "nbap.RL_InformationResponseList_RL_AdditionRspFDD_item",
@@ -40944,11 +40965,11 @@ void proto_register_nbap(void) {
         "RL-InformationList-RL-ReconfPrepFDD/_item", HFILL }},
     { &hf_nbap_maxDL_Power,
       { "maxDL-Power", "nbap.maxDL_Power",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "", HFILL }},
     { &hf_nbap_minDL_Power,
       { "minDL-Power", "nbap.minDL_Power",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "", HFILL }},
     { &hf_nbap_not_Used_sSDT_Indication,
       { "not-Used-sSDT-Indication", "nbap.not_Used_sSDT_Indication",
@@ -40976,7 +40997,7 @@ void proto_register_nbap(void) {
         "MultipleRL-UL-DPCH-InformationAddListIE-RL-ReconfPrepTDD/ul-DPCH-InformationListLCR", HFILL }},
     { &hf_nbap_ul_sir_target,
       { "ul-sir-target", "nbap.ul_sir_target",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "", HFILL }},
     { &hf_nbap_tDD_TPC_UplinkStepSize_LCR,
       { "tDD-TPC-UplinkStepSize-LCR", "nbap.tDD_TPC_UplinkStepSize_LCR",
@@ -41076,7 +41097,7 @@ void proto_register_nbap(void) {
         "MultipleRL-DL-DPCH-InformationAddListIE-RL-ReconfPrepTDD/dl-DPCH-InformationListLCR", HFILL }},
     { &hf_nbap_cCTrCH_Initial_DL_Power,
       { "cCTrCH-Initial-DL-Power", "nbap.cCTrCH_Initial_DL_Power",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "MultipleRL-DL-DPCH-InformationAddListIE-RL-ReconfPrepTDD/cCTrCH-Initial-DL-Power", HFILL }},
     { &hf_nbap_tDD_TPC_DownlinkStepSize,
       { "tDD-TPC-DownlinkStepSize", "nbap.tDD_TPC_DownlinkStepSize",
@@ -41084,11 +41105,11 @@ void proto_register_nbap(void) {
         "MultipleRL-DL-DPCH-InformationAddListIE-RL-ReconfPrepTDD/tDD-TPC-DownlinkStepSize", HFILL }},
     { &hf_nbap_cCTrCH_Maximum_DL_Power_InformationAdd_RL_ReconfPrepTDD,
       { "cCTrCH-Maximum-DL-Power-InformationAdd-RL-ReconfPrepTDD", "nbap.cCTrCH_Maximum_DL_Power_InformationAdd_RL_ReconfPrepTDD",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "MultipleRL-DL-DPCH-InformationAddListIE-RL-ReconfPrepTDD/cCTrCH-Maximum-DL-Power-InformationAdd-RL-ReconfPrepTDD", HFILL }},
     { &hf_nbap_cCTrCH_Minimum_DL_Power_InformationAdd_RL_ReconfPrepTDD,
       { "cCTrCH-Minimum-DL-Power-InformationAdd-RL-ReconfPrepTDD", "nbap.cCTrCH_Minimum_DL_Power_InformationAdd_RL_ReconfPrepTDD",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "MultipleRL-DL-DPCH-InformationAddListIE-RL-ReconfPrepTDD/cCTrCH-Minimum-DL-Power-InformationAdd-RL-ReconfPrepTDD", HFILL }},
     { &hf_nbap_CCTrCH_TPCAddList_RL_ReconfPrepTDD_item,
       { "Item", "nbap.CCTrCH_TPCAddList_RL_ReconfPrepTDD_item",
@@ -41132,11 +41153,11 @@ void proto_register_nbap(void) {
         "MultipleRL-DL-DPCH-InformationModifyListIE-RL-ReconfPrepTDD/tDD-TPC-DownlinkStepSize-InformationModify-RL-ReconfPrepTDD", HFILL }},
     { &hf_nbap_cCTrCH_Maximum_DL_Power_InformationModify_RL_ReconfPrepTDD,
       { "cCTrCH-Maximum-DL-Power-InformationModify-RL-ReconfPrepTDD", "nbap.cCTrCH_Maximum_DL_Power_InformationModify_RL_ReconfPrepTDD",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "MultipleRL-DL-DPCH-InformationModifyListIE-RL-ReconfPrepTDD/cCTrCH-Maximum-DL-Power-InformationModify-RL-ReconfPrepTDD", HFILL }},
     { &hf_nbap_cCTrCH_Minimum_DL_Power_InformationModify_RL_ReconfPrepTDD,
       { "cCTrCH-Minimum-DL-Power-InformationModify-RL-ReconfPrepTDD", "nbap.cCTrCH_Minimum_DL_Power_InformationModify_RL_ReconfPrepTDD",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "MultipleRL-DL-DPCH-InformationModifyListIE-RL-ReconfPrepTDD/cCTrCH-Minimum-DL-Power-InformationModify-RL-ReconfPrepTDD", HFILL }},
     { &hf_nbap_CCTrCH_TPCModifyList_RL_ReconfPrepTDD_item,
       { "Item", "nbap.CCTrCH_TPCModifyList_RL_ReconfPrepTDD_item",
@@ -41292,11 +41313,11 @@ void proto_register_nbap(void) {
         "MultipleRL-DL-CCTrCH-InformationModifyListIE-RL-ReconfRqstTDD/dl-DPCH-LCR-InformationModifyList", HFILL }},
     { &hf_nbap_cCTrCH_Maximum_DL_Power_InformationModify_RL_ReconfRqstTDD,
       { "cCTrCH-Maximum-DL-Power-InformationModify-RL-ReconfRqstTDD", "nbap.cCTrCH_Maximum_DL_Power_InformationModify_RL_ReconfRqstTDD",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "MultipleRL-DL-CCTrCH-InformationModifyListIE-RL-ReconfRqstTDD/cCTrCH-Maximum-DL-Power-InformationModify-RL-ReconfRqstTDD", HFILL }},
     { &hf_nbap_cCTrCH_Minimum_DL_Power_InformationModify_RL_ReconfRqstTDD,
       { "cCTrCH-Minimum-DL-Power-InformationModify-RL-ReconfRqstTDD", "nbap.cCTrCH_Minimum_DL_Power_InformationModify_RL_ReconfRqstTDD",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "MultipleRL-DL-CCTrCH-InformationModifyListIE-RL-ReconfRqstTDD/cCTrCH-Minimum-DL-Power-InformationModify-RL-ReconfRqstTDD", HFILL }},
     { &hf_nbap_dL_Timeslot_LCR_InformationModify_ModifyList_RL_ReconfRqstTDD,
       { "dL-Timeslot-LCR-InformationModify-ModifyList-RL-ReconfRqstTDD", "nbap.dL_Timeslot_LCR_InformationModify_ModifyList_RL_ReconfRqstTDD",
@@ -41308,11 +41329,11 @@ void proto_register_nbap(void) {
         "DL-Timeslot-LCR-InformationModify-ModifyList-RL-ReconfRqstTDD/_item", HFILL }},
     { &hf_nbap_maxPowerLCR,
       { "maxPowerLCR", "nbap.maxPowerLCR",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "DL-Timeslot-LCR-InformationModify-ModifyItem-RL-ReconfRqstTDD/maxPowerLCR", HFILL }},
     { &hf_nbap_minPowerLCR,
       { "minPowerLCR", "nbap.minPowerLCR",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "DL-Timeslot-LCR-InformationModify-ModifyItem-RL-ReconfRqstTDD/minPowerLCR", HFILL }},
     { &hf_nbap_DL_CCTrCH_InformationDeleteList_RL_ReconfRqstTDD_item,
       { "Item", "nbap.DL_CCTrCH_InformationDeleteList_RL_ReconfRqstTDD_item",
@@ -41344,7 +41365,7 @@ void proto_register_nbap(void) {
         "DL-ReferencePowerInformationList-DL-PC-Rqst/_item", HFILL }},
     { &hf_nbap_dl_ReferencePower,
       { "dl-ReferencePower", "nbap.dl_ReferencePower",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "DL-ReferencePowerInformationItem-DL-PC-Rqst/dl-ReferencePower", HFILL }},
     { &hf_nbap_rL,
       { "rL", "nbap.rL",
@@ -41832,7 +41853,7 @@ void proto_register_nbap(void) {
         "", HFILL }},
     { &hf_nbap_hS_SCCH_MaxPower,
       { "hS-SCCH-MaxPower", "nbap.hS_SCCH_MaxPower",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "", HFILL }},
     { &hf_nbap_hS_SICH_Information,
       { "hS-SICH-Information", "nbap.hS_SICH_Information",
@@ -41988,7 +42009,7 @@ void proto_register_nbap(void) {
         "", HFILL }},
     { &hf_nbap_initialDLTransPower,
       { "initialDLTransPower", "nbap.initialDLTransPower",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "CellSyncBurstTransInit-CellSyncInitiationRqstTDD/initialDLTransPower", HFILL }},
     { &hf_nbap_TimeslotInfo_CellSyncInitiationRqstTDD_item,
       { "Item", "nbap.TimeslotInfo_CellSyncInitiationRqstTDD_item",
@@ -42024,7 +42045,7 @@ void proto_register_nbap(void) {
         "CellSyncBurstTransInfoItem-CellSyncReconfRqstTDD/syncFrameNumberToTransmit", HFILL }},
     { &hf_nbap_dlTransPower,
       { "dlTransPower", "nbap.dlTransPower",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "CellSyncBurstTransInfoItem-CellSyncReconfRqstTDD/dlTransPower", HFILL }},
     { &hf_nbap_cellSyncBurstMeasInfoList_CellSyncReconfRqstTDD,
       { "cellSyncBurstMeasInfoList-CellSyncReconfRqstTDD", "nbap.cellSyncBurstMeasInfoList_CellSyncReconfRqstTDD",
@@ -42096,7 +42117,7 @@ void proto_register_nbap(void) {
         "CellAdjustmentInfoItem-SyncAdjustmentRqstTDD/timingAdjustmentValue", HFILL }},
     { &hf_nbap_dLTransPower,
       { "dLTransPower", "nbap.dLTransPower",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "CellAdjustmentInfoItem-SyncAdjustmentRqstTDD/dLTransPower", HFILL }},
     { &hf_nbap_generalCause6,
       { "generalCause", "nbap.generalCause",
@@ -42592,7 +42613,7 @@ void proto_register_nbap(void) {
         "Activate-Info/activation-type", HFILL }},
     { &hf_nbap_initial_dl_tx_power,
       { "initial-dl-tx-power", "nbap.initial_dl_tx_power",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "Activate-Info/initial-dl-tx-power", HFILL }},
     { &hf_nbap_firstRLS_Indicator,
       { "firstRLS-Indicator", "nbap.firstRLS_Indicator",
@@ -42652,7 +42673,7 @@ void proto_register_nbap(void) {
         "DL-PowerBalancing-Information/powerAdjustmentType", HFILL }},
     { &hf_nbap_dLReferencePower,
       { "dLReferencePower", "nbap.dLReferencePower",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "DL-PowerBalancing-Information/dLReferencePower", HFILL }},
     { &hf_nbap_dLReferencePowerList_DL_PC_Rqst,
       { "dLReferencePowerList-DL-PC-Rqst", "nbap.dLReferencePowerList_DL_PC_Rqst",
@@ -42676,7 +42697,7 @@ void proto_register_nbap(void) {
         "DL-ReferencePowerInformationList/_item", HFILL }},
     { &hf_nbap_dl_Reference_Power,
       { "dl-Reference-Power", "nbap.dl_Reference_Power",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "DL-ReferencePowerInformationItem/dl-Reference-Power", HFILL }},
     { &hf_nbap_DL_TimeslotISCPInfo_item,
       { "Item", "nbap.DL_TimeslotISCPInfo_item",
@@ -43140,7 +43161,7 @@ void proto_register_nbap(void) {
         "GPS-RX-POS/latitude", HFILL }},
     { &hf_nbap_longitude,
       { "longitude", "nbap.longitude",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "GPS-RX-POS/longitude", HFILL }},
     { &hf_nbap_directionOfAltitude,
       { "directionOfAltitude", "nbap.directionOfAltitude",
@@ -43292,11 +43313,11 @@ void proto_register_nbap(void) {
         "", HFILL }},
     { &hf_nbap_measurement_Power_Offset,
       { "measurement-Power-Offset", "nbap.measurement_Power_Offset",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "", HFILL }},
     { &hf_nbap_tDD_AckNack_Power_Offset,
       { "tDD-AckNack-Power-Offset", "nbap.tDD_AckNack_Power_Offset",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "HSDSCH-TDD-Information/tDD-AckNack-Power-Offset", HFILL }},
     { &hf_nbap_hsDSCH_MACdFlow_Specific_Info_to_Modify,
       { "hsDSCH-MACdFlow-Specific-Info-to-Modify", "nbap.hsDSCH_MACdFlow_Specific_Info_to_Modify",
@@ -43312,7 +43333,7 @@ void proto_register_nbap(void) {
         "HSDSCH-Information-to-Modify/hSSCCHCodeChangeGrant", HFILL }},
     { &hf_nbap_tDDAckNackPowerOffset,
       { "tDDAckNackPowerOffset", "nbap.tDDAckNackPowerOffset",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "", HFILL }},
     { &hf_nbap_HSDSCH_MACdFlow_Specific_InfoList_to_Modify_item,
       { "Item", "nbap.HSDSCH_MACdFlow_Specific_InfoList_to_Modify_item",
@@ -43996,11 +44017,11 @@ void proto_register_nbap(void) {
         "SAT-Info-DGPSCorrections-Item/udre", HFILL }},
     { &hf_nbap_prc,
       { "prc", "nbap.prc",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "SAT-Info-DGPSCorrections-Item/prc", HFILL }},
     { &hf_nbap_range_correction_rate,
       { "range-correction-rate", "nbap.range_correction_rate",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "SAT-Info-DGPSCorrections-Item/range-correction-rate", HFILL }},
     { &hf_nbap_SATInfo_RealTime_Integrity_item,
       { "Item", "nbap.SATInfo_RealTime_Integrity_item",
@@ -44052,7 +44073,7 @@ void proto_register_nbap(void) {
         "SFNSFNMeasurementValueInformation/successfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation/_item/sFNSFNQuality", HFILL }},
     { &hf_nbap_sFNSFNDriftRate,
       { "sFNSFNDriftRate", "nbap.sFNSFNDriftRate",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "SFNSFNMeasurementValueInformation/successfullNeighbouringCellSFNSFNObservedTimeDifferenceMeasurementInformation/_item/sFNSFNDriftRate", HFILL }},
     { &hf_nbap_sFNSFNDriftRateQuality,
       { "sFNSFNDriftRateQuality", "nbap.sFNSFNDriftRateQuality",
@@ -44476,7 +44497,7 @@ void proto_register_nbap(void) {
         "TUTRANGPSMeasurementValueInformation/tUTRANGPSQuality", HFILL }},
     { &hf_nbap_tUTRANGPSDriftRate,
       { "tUTRANGPSDriftRate", "nbap.tUTRANGPSDriftRate",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "TUTRANGPSMeasurementValueInformation/tUTRANGPSDriftRate", HFILL }},
     { &hf_nbap_tUTRANGPSDriftRateQuality,
       { "tUTRANGPSDriftRateQuality", "nbap.tUTRANGPSDriftRateQuality",
@@ -44548,7 +44569,7 @@ void proto_register_nbap(void) {
         "PrivateIE-ID/local", HFILL }},
     { &hf_nbap_global,
       { "global", "nbap.global",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "PrivateIE-ID/global", HFILL }},
     { &hf_nbap_procedureCode,
       { "procedureCode", "nbap.procedureCode",
@@ -44740,7 +44761,7 @@ void proto_register_nbap(void) {
         "", HFILL }},
 
 /*--- End of included file: packet-nbap-hfarr.c ---*/
-
+#line 2925 "packet-nbap-template.c"
   };
 
   /* List of subtrees */
@@ -44752,7 +44773,7 @@ void proto_register_nbap(void) {
 		  &ett_nbap_UnsuccessfulOutcomeValue,
 
 /*--- Included file: packet-nbap-ettarr.c ---*/
-
+#line 1 "packet-nbap-ettarr.c"
     &ett_nbap_NBAP_PDU,
     &ett_nbap_InitiatingMessage,
     &ett_nbap_SuccessfulOutcome,
@@ -45761,7 +45782,7 @@ void proto_register_nbap(void) {
     &ett_nbap_PrivateIE_Field,
 
 /*--- End of included file: packet-nbap-ettarr.c ---*/
-
+#line 2935 "packet-nbap-template.c"
   };
 
 
diff --git a/epan/dissectors/packet-nbap.h b/epan/dissectors/packet-nbap.h
index 3f9db3268e..bde6e5adea 100644
--- a/epan/dissectors/packet-nbap.h
+++ b/epan/dissectors/packet-nbap.h
@@ -1,10 +1,11 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-nbap.h                                                            */
+/* ./packet-nbap.h                                                            */
 /* ../../tools/asn2eth.py -X -e -p nbap -c nbap.cnf -s packet-nbap-template nbap.asn */
 
 /* Input file: packet-nbap-template.h */
 
+#line 1 "packet-nbap-template.h"
 /* packet-nbap.h
  * Routines for UMTS Node B Application Part(NBAP) packet dissection
  * Copyright 2005, Anders Broman <anders.broman@ericsson.com>
diff --git a/epan/dissectors/packet-ns_cert_exts.c b/epan/dissectors/packet-ns_cert_exts.c
index 9a13d01bfd..eb08d90a56 100644
--- a/epan/dissectors/packet-ns_cert_exts.c
+++ b/epan/dissectors/packet-ns_cert_exts.c
@@ -5,6 +5,7 @@
 
 /* Input file: packet-ns_cert_exts-template.c */
 
+#line 1 "packet-ns_cert_exts-template.c"
 /* packet-ns_cert_exts.c
  * Routines for NetScape Certificate Extensions packet dissection
  *   Ronnie Sahlberg 2004
@@ -51,7 +52,7 @@
 int proto_ns_cert_exts = -1;
 
 /*--- Included file: packet-ns_cert_exts-hf.c ---*/
-
+#line 1 "packet-ns_cert_exts-hf.c"
 static int hf_ns_cert_exts_BaseUrl_PDU = -1;      /* BaseUrl */
 static int hf_ns_cert_exts_RevocationUrl_PDU = -1;  /* RevocationUrl */
 static int hf_ns_cert_exts_CaRevocationUrl_PDU = -1;  /* CaRevocationUrl */
@@ -66,20 +67,20 @@ static int hf_ns_cert_exts_CertType_server = -1;
 static int hf_ns_cert_exts_CertType_ca = -1;
 
 /*--- End of included file: packet-ns_cert_exts-hf.c ---*/
-
+#line 46 "packet-ns_cert_exts-template.c"
 
 /* Initialize the subtree pointers */
 
 /*--- Included file: packet-ns_cert_exts-ett.c ---*/
-
+#line 1 "packet-ns_cert_exts-ett.c"
 static gint ett_ns_cert_exts_CertType = -1;
 
 /*--- End of included file: packet-ns_cert_exts-ett.c ---*/
-
+#line 49 "packet-ns_cert_exts-template.c"
 
 
 /*--- Included file: packet-ns_cert_exts-fn.c ---*/
-
+#line 1 "packet-ns_cert_exts-fn.c"
 /*--- Fields for imported types ---*/
 
 
@@ -206,7 +207,7 @@ static void dissect_CertType_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
 
 
 /*--- End of included file: packet-ns_cert_exts-fn.c ---*/
-
+#line 51 "packet-ns_cert_exts-template.c"
 
 
 /*--- proto_register_ns_cert_exts -------------------------------------------*/
@@ -216,7 +217,7 @@ void proto_register_ns_cert_exts(void) {
   static hf_register_info hf[] = {
 
 /*--- Included file: packet-ns_cert_exts-hfarr.c ---*/
-
+#line 1 "packet-ns_cert_exts-hfarr.c"
     { &hf_ns_cert_exts_BaseUrl_PDU,
       { "BaseUrl", "ns_cert_exts.BaseUrl",
         FT_STRING, BASE_NONE, NULL, 0,
@@ -263,18 +264,18 @@ void proto_register_ns_cert_exts(void) {
         "", HFILL }},
 
 /*--- End of included file: packet-ns_cert_exts-hfarr.c ---*/
-
+#line 59 "packet-ns_cert_exts-template.c"
   };
 
   /* List of subtrees */
   static gint *ett[] = {
 
 /*--- Included file: packet-ns_cert_exts-ettarr.c ---*/
-
+#line 1 "packet-ns_cert_exts-ettarr.c"
     &ett_ns_cert_exts_CertType,
 
 /*--- End of included file: packet-ns_cert_exts-ettarr.c ---*/
-
+#line 64 "packet-ns_cert_exts-template.c"
   };
 
   /* Register protocol */
@@ -291,7 +292,7 @@ void proto_register_ns_cert_exts(void) {
 void proto_reg_handoff_ns_cert_exts(void) {
 
 /*--- Included file: packet-ns_cert_exts-dis-tab.c ---*/
-
+#line 1 "packet-ns_cert_exts-dis-tab.c"
   register_ber_oid_dissector("2.16.840.1.113730.1.1", dissect_CertType_PDU, proto_ns_cert_exts, "ns-cert-exts.cert_type");
   register_ber_oid_dissector("2.16.840.1.113730.1.2", dissect_BaseUrl_PDU, proto_ns_cert_exts, "ns-cert-exts.base_url");
   register_ber_oid_dissector("2.16.840.1.113730.1.3", dissect_RevocationUrl_PDU, proto_ns_cert_exts, "ns-cert-exts.revocation-url");
@@ -303,6 +304,6 @@ void proto_reg_handoff_ns_cert_exts(void) {
 
 
 /*--- End of included file: packet-ns_cert_exts-dis-tab.c ---*/
-
+#line 79 "packet-ns_cert_exts-template.c"
 }
 
diff --git a/epan/dissectors/packet-ocsp.c b/epan/dissectors/packet-ocsp.c
index 27de186e3e..b26fc1a095 100644
--- a/epan/dissectors/packet-ocsp.c
+++ b/epan/dissectors/packet-ocsp.c
@@ -1,10 +1,11 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-ocsp.c                                                            */
+/* ./packet-ocsp.c                                                            */
 /* ../../tools/asn2eth.py -X -b -e -p ocsp -c ocsp.cnf -s packet-ocsp-template OCSP.asn */
 
 /* Input file: packet-ocsp-template.c */
 
+#line 1 "packet-ocsp-template.c"
 /* packet-ocsp.c
  * Routines for Online Certificate Status Protocol (RFC2560) packet dissection
  *  Ronnie Sahlberg 2004
@@ -56,7 +57,7 @@ static int proto_ocsp = -1;
 static int hf_ocsp_responseType_id = -1;
 
 /*--- Included file: packet-ocsp-hf.c ---*/
-
+#line 1 "packet-ocsp-hf.c"
 static int hf_ocsp_BasicOCSPResponse_PDU = -1;    /* BasicOCSPResponse */
 static int hf_ocsp_ArchiveCutoff_PDU = -1;        /* ArchiveCutoff */
 static int hf_ocsp_AcceptableResponses_PDU = -1;  /* AcceptableResponses */
@@ -109,13 +110,13 @@ static int hf_ocsp_crlNum = -1;                   /* INTEGER */
 static int hf_ocsp_crlTime = -1;                  /* GeneralizedTime */
 
 /*--- End of included file: packet-ocsp-hf.c ---*/
-
+#line 51 "packet-ocsp-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_ocsp = -1;
 
 /*--- Included file: packet-ocsp-ett.c ---*/
-
+#line 1 "packet-ocsp-ett.c"
 static gint ett_ocsp_OCSPRequest = -1;
 static gint ett_ocsp_TBSRequest = -1;
 static gint ett_ocsp_SEQUENCE_OF_Request = -1;
@@ -137,14 +138,14 @@ static gint ett_ocsp_ServiceLocator = -1;
 static gint ett_ocsp_CrlID = -1;
 
 /*--- End of included file: packet-ocsp-ett.c ---*/
-
+#line 55 "packet-ocsp-template.c"
 
 static const char *responseType_id;
 
 
 
 /*--- Included file: packet-ocsp-fn.c ---*/
-
+#line 1 "packet-ocsp-fn.c"
 /*--- Fields for imported types ---*/
 
 static int dissect_requestorName(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -401,6 +402,7 @@ static int dissect_responseType(packet_info *pinfo, proto_tree *tree, tvbuff_t *
 
 static int
 dissect_ocsp_T_response(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 38 "ocsp.cnf"
   gint8 class;
   gboolean pc, ind;
   gint32 tag;
@@ -411,6 +413,7 @@ dissect_ocsp_T_response(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pa
   offset=call_ber_oid_callback(responseType_id, tvb, offset, pinfo, tree);
 
 
+
   return offset;
 }
 static int dissect_response(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -768,7 +771,7 @@ static void dissect_CrlID_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre
 
 
 /*--- End of included file: packet-ocsp-fn.c ---*/
-
+#line 60 "packet-ocsp-template.c"
 
 
 static int
@@ -831,7 +834,7 @@ void proto_register_ocsp(void) {
         "ResponseType Id", HFILL }},
 
 /*--- Included file: packet-ocsp-hfarr.c ---*/
-
+#line 1 "packet-ocsp-hfarr.c"
     { &hf_ocsp_BasicOCSPResponse_PDU,
       { "BasicOCSPResponse", "ocsp.BasicOCSPResponse",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -930,7 +933,7 @@ void proto_register_ocsp(void) {
         "OCSPResponse/responseBytes", HFILL }},
     { &hf_ocsp_responseType,
       { "responseType", "ocsp.responseType",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "ResponseBytes/responseType", HFILL }},
     { &hf_ocsp_response,
       { "response", "ocsp.response",
@@ -1010,7 +1013,7 @@ void proto_register_ocsp(void) {
         "RevokedInfo/revocationReason", HFILL }},
     { &hf_ocsp_AcceptableResponses_item,
       { "Item", "ocsp.AcceptableResponses_item",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "AcceptableResponses/_item", HFILL }},
     { &hf_ocsp_issuer,
       { "issuer", "ocsp.issuer",
@@ -1034,7 +1037,7 @@ void proto_register_ocsp(void) {
         "CrlID/crlTime", HFILL }},
 
 /*--- End of included file: packet-ocsp-hfarr.c ---*/
-
+#line 121 "packet-ocsp-template.c"
   };
 
   /* List of subtrees */
@@ -1042,7 +1045,7 @@ void proto_register_ocsp(void) {
     &ett_ocsp,
 
 /*--- Included file: packet-ocsp-ettarr.c ---*/
-
+#line 1 "packet-ocsp-ettarr.c"
     &ett_ocsp_OCSPRequest,
     &ett_ocsp_TBSRequest,
     &ett_ocsp_SEQUENCE_OF_Request,
@@ -1064,7 +1067,7 @@ void proto_register_ocsp(void) {
     &ett_ocsp_CrlID,
 
 /*--- End of included file: packet-ocsp-ettarr.c ---*/
-
+#line 127 "packet-ocsp-template.c"
   };
 
   /* Register protocol */
@@ -1089,7 +1092,7 @@ void proto_reg_handoff_ocsp(void) {
 
 
 /*--- Included file: packet-ocsp-dis-tab.c ---*/
-
+#line 1 "packet-ocsp-dis-tab.c"
   register_ber_oid_dissector("1.3.6.1.5.5.7.48.1.1", dissect_BasicOCSPResponse_PDU, proto_ocsp, "id-pkix-ocsp-basic");
   register_ber_oid_dissector("1.3.6.1.5.5.7.48.1.3", dissect_CrlID_PDU, proto_ocsp, "id-pkix-ocsp-crl");
   register_ber_oid_dissector("1.3.6.1.5.5.7.48.1.4", dissect_AcceptableResponses_PDU, proto_ocsp, "id-pkix-ocsp-response");
@@ -1098,6 +1101,6 @@ void proto_reg_handoff_ocsp(void) {
 
 
 /*--- End of included file: packet-ocsp-dis-tab.c ---*/
-
+#line 150 "packet-ocsp-template.c"
 }
 
diff --git a/epan/dissectors/packet-ocsp.h b/epan/dissectors/packet-ocsp.h
index 8752fb3fa8..f568032a8e 100644
--- a/epan/dissectors/packet-ocsp.h
+++ b/epan/dissectors/packet-ocsp.h
@@ -5,6 +5,7 @@
 
 /* Input file: packet-ocsp-template.h */
 
+#line 1 "packet-ocsp-template.h"
 /* packet-ocsp.h
  * Routines for Online Certificate Status Protocol (RFC2560) packet dissection
  *  Ronnie Sahlberg 2004
diff --git a/epan/dissectors/packet-pkcs1.c b/epan/dissectors/packet-pkcs1.c
index 4b2dc26b65..ad3c80951f 100644
--- a/epan/dissectors/packet-pkcs1.c
+++ b/epan/dissectors/packet-pkcs1.c
@@ -5,6 +5,7 @@
 
 /* Input file: packet-pkcs1-template.c */
 
+#line 1 "packet-pkcs1-template.c"
 /* packet-pkcs1.c
  * Routines for PKCS#1/RFC2313 packet dissection
  *  Ronnie Sahlberg 2004
@@ -53,7 +54,7 @@
 static int proto_pkcs1 = -1;
 
 /*--- Included file: packet-pkcs1-hf.c ---*/
-
+#line 1 "packet-pkcs1-hf.c"
 static int hf_pkcs1_modulus = -1;                 /* INTEGER */
 static int hf_pkcs1_publicExponent = -1;          /* INTEGER */
 static int hf_pkcs1_version = -1;                 /* Version */
@@ -67,22 +68,22 @@ static int hf_pkcs1_digestAlgorithm = -1;         /* DigestAlgorithmIdentifier *
 static int hf_pkcs1_digest = -1;                  /* Digest */
 
 /*--- End of included file: packet-pkcs1-hf.c ---*/
-
+#line 48 "packet-pkcs1-template.c"
 
 /* Initialize the subtree pointers */
 
 /*--- Included file: packet-pkcs1-ett.c ---*/
-
+#line 1 "packet-pkcs1-ett.c"
 static gint ett_pkcs1_RSAPublicKey = -1;
 static gint ett_pkcs1_RSAPrivateKey = -1;
 static gint ett_pkcs1_DigestInfo = -1;
 
 /*--- End of included file: packet-pkcs1-ett.c ---*/
-
+#line 51 "packet-pkcs1-template.c"
 
 
 /*--- Included file: packet-pkcs1-fn.c ---*/
-
+#line 1 "packet-pkcs1-fn.c"
 /*--- Fields for imported types ---*/
 
 
@@ -90,7 +91,8 @@ static gint ett_pkcs1_DigestInfo = -1;
 
 static int
 dissect_pkcs1_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
+                                  NULL);
 
   return offset;
 }
@@ -119,6 +121,7 @@ static int dissect_coefficient(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
   return dissect_pkcs1_INTEGER(FALSE, tvb, offset, pinfo, tree, hf_pkcs1_coefficient);
 }
 
+
 static const ber_sequence_t RSAPublicKey_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_modulus },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_publicExponent },
@@ -128,7 +131,7 @@ static const ber_sequence_t RSAPublicKey_sequence[] = {
 int
 dissect_pkcs1_RSAPublicKey(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
-                                RSAPublicKey_sequence, hf_index, ett_pkcs1_RSAPublicKey);
+                                   RSAPublicKey_sequence, hf_index, ett_pkcs1_RSAPublicKey);
 
   return offset;
 }
@@ -137,7 +140,8 @@ dissect_pkcs1_RSAPublicKey(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset,
 
 static int
 dissect_pkcs1_Version(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
+                                  NULL);
 
   return offset;
 }
@@ -145,6 +149,7 @@ static int dissect_version(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
   return dissect_pkcs1_Version(FALSE, tvb, offset, pinfo, tree, hf_pkcs1_version);
 }
 
+
 static const ber_sequence_t RSAPrivateKey_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_modulus },
@@ -161,12 +166,13 @@ static const ber_sequence_t RSAPrivateKey_sequence[] = {
 int
 dissect_pkcs1_RSAPrivateKey(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
-                                RSAPrivateKey_sequence, hf_index, ett_pkcs1_RSAPrivateKey);
+                                   RSAPrivateKey_sequence, hf_index, ett_pkcs1_RSAPrivateKey);
 
   return offset;
 }
 
 
+
 static int
 dissect_pkcs1_DigestAlgorithmIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_x509af_AlgorithmIdentifier(implicit_tag, tvb, offset, pinfo, tree, hf_index);
@@ -178,10 +184,11 @@ static int dissect_digestAlgorithm(packet_info *pinfo, proto_tree *tree, tvbuff_
 }
 
 
+
 static int
 dissect_pkcs1_Digest(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index,
-                                    NULL);
+                                       NULL);
 
   return offset;
 }
@@ -189,6 +196,7 @@ static int dissect_digest(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
   return dissect_pkcs1_Digest(FALSE, tvb, offset, pinfo, tree, hf_pkcs1_digest);
 }
 
+
 static const ber_sequence_t DigestInfo_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_digestAlgorithm },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_digest },
@@ -198,14 +206,14 @@ static const ber_sequence_t DigestInfo_sequence[] = {
 int
 dissect_pkcs1_DigestInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
-                                DigestInfo_sequence, hf_index, ett_pkcs1_DigestInfo);
+                                   DigestInfo_sequence, hf_index, ett_pkcs1_DigestInfo);
 
   return offset;
 }
 
 
 /*--- End of included file: packet-pkcs1-fn.c ---*/
-
+#line 53 "packet-pkcs1-template.c"
 
 /*--- proto_register_pkcs1 ----------------------------------------------*/
 void proto_register_pkcs1(void) {
@@ -214,7 +222,7 @@ void proto_register_pkcs1(void) {
   static hf_register_info hf[] = {
 
 /*--- Included file: packet-pkcs1-hfarr.c ---*/
-
+#line 1 "packet-pkcs1-hfarr.c"
     { &hf_pkcs1_modulus,
       { "modulus", "pkcs1.modulus",
         FT_INT32, BASE_DEC, NULL, 0,
@@ -261,20 +269,20 @@ void proto_register_pkcs1(void) {
         "DigestInfo/digest", HFILL }},
 
 /*--- End of included file: packet-pkcs1-hfarr.c ---*/
-
+#line 60 "packet-pkcs1-template.c"
   };
 
   /* List of subtrees */
   static gint *ett[] = {
 
 /*--- Included file: packet-pkcs1-ettarr.c ---*/
-
+#line 1 "packet-pkcs1-ettarr.c"
     &ett_pkcs1_RSAPublicKey,
     &ett_pkcs1_RSAPrivateKey,
     &ett_pkcs1_DigestInfo,
 
 /*--- End of included file: packet-pkcs1-ettarr.c ---*/
-
+#line 65 "packet-pkcs1-template.c"
   };
 
   /* Register protocol */
diff --git a/epan/dissectors/packet-pkcs1.h b/epan/dissectors/packet-pkcs1.h
index 45fade9beb..45ea6c0b3a 100644
--- a/epan/dissectors/packet-pkcs1.h
+++ b/epan/dissectors/packet-pkcs1.h
@@ -5,6 +5,7 @@
 
 /* Input file: packet-pkcs1-template.h */
 
+#line 1 "packet-pkcs1-template.h"
 /* packet-pkcs1.h
  * Routines for PKCS#1/RFC2313 packet dissection
  *  Ronnie Sahlberg 2004
@@ -35,13 +36,13 @@
 
 
 /*--- Included file: packet-pkcs1-exp.h ---*/
-
+#line 1 "packet-pkcs1-exp.h"
 int dissect_pkcs1_RSAPublicKey(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
 int dissect_pkcs1_RSAPrivateKey(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
 int dissect_pkcs1_DigestInfo(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
 
 /*--- End of included file: packet-pkcs1-exp.h ---*/
-
+#line 30 "packet-pkcs1-template.h"
 
 #endif  /* PACKET_PKCS1_H */
 
diff --git a/epan/dissectors/packet-pkinit.c b/epan/dissectors/packet-pkinit.c
index f76246d575..93186a9de0 100644
--- a/epan/dissectors/packet-pkinit.c
+++ b/epan/dissectors/packet-pkinit.c
@@ -5,6 +5,7 @@
 
 /* Input file: packet-pkinit-template.c */
 
+#line 1 "packet-pkinit-template.c"
 /* packet-pkinit.c
  * Routines for PKINIT packet dissection
  *  Ronnie Sahlberg 2004
@@ -55,7 +56,7 @@
 static int proto_pkinit = -1;
 
 /*--- Included file: packet-pkinit-hf.c ---*/
-
+#line 1 "packet-pkinit-hf.c"
 static int hf_pkinit_AuthPack_PDU = -1;           /* AuthPack */
 static int hf_pkinit_KDCDHKeyInfo_PDU = -1;       /* KDCDHKeyInfo */
 static int hf_pkinit_signedAuthPack = -1;         /* ContentInfo */
@@ -79,12 +80,12 @@ static int hf_pkinit_dhNonce = -1;                /* INTEGER */
 static int hf_pkinit_dhKeyExpiration = -1;        /* KerberosTime */
 
 /*--- End of included file: packet-pkinit-hf.c ---*/
-
+#line 50 "packet-pkinit-template.c"
 
 /* Initialize the subtree pointers */
 
 /*--- Included file: packet-pkinit-ett.c ---*/
-
+#line 1 "packet-pkinit-ett.c"
 static gint ett_pkinit_PaPkAsReq = -1;
 static gint ett_pkinit_SEQUENCE_OF_TrustedCA = -1;
 static gint ett_pkinit_TrustedCA = -1;
@@ -95,14 +96,14 @@ static gint ett_pkinit_PaPkAsRep = -1;
 static gint ett_pkinit_KDCDHKeyInfo = -1;
 
 /*--- End of included file: packet-pkinit-ett.c ---*/
-
+#line 53 "packet-pkinit-template.c"
 
 static int dissect_KerberosV5Spec2_KerberosTime(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index _U_);
 static int dissect_KerberosV5Spec2_Checksum(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index _U_);
 
 
 /*--- Included file: packet-pkinit-fn.c ---*/
-
+#line 1 "packet-pkinit-fn.c"
 /*--- Fields for imported types ---*/
 
 static int dissect_signedAuthPack(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -340,7 +341,7 @@ static void dissect_KDCDHKeyInfo_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tr
 
 
 /*--- End of included file: packet-pkinit-fn.c ---*/
-
+#line 58 "packet-pkinit-template.c"
 
 int
 dissect_pkinit_PA_PK_AS_REQ(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -374,7 +375,7 @@ void proto_register_pkinit(void) {
   static hf_register_info hf[] = {
 
 /*--- Included file: packet-pkinit-hfarr.c ---*/
-
+#line 1 "packet-pkinit-hfarr.c"
     { &hf_pkinit_AuthPack_PDU,
       { "AuthPack", "pkinit.AuthPack",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -461,14 +462,14 @@ void proto_register_pkinit(void) {
         "KDCDHKeyInfo/dhKeyExpiration", HFILL }},
 
 /*--- End of included file: packet-pkinit-hfarr.c ---*/
-
+#line 90 "packet-pkinit-template.c"
   };
 
   /* List of subtrees */
   static gint *ett[] = {
 
 /*--- Included file: packet-pkinit-ettarr.c ---*/
-
+#line 1 "packet-pkinit-ettarr.c"
     &ett_pkinit_PaPkAsReq,
     &ett_pkinit_SEQUENCE_OF_TrustedCA,
     &ett_pkinit_TrustedCA,
@@ -479,7 +480,7 @@ void proto_register_pkinit(void) {
     &ett_pkinit_KDCDHKeyInfo,
 
 /*--- End of included file: packet-pkinit-ettarr.c ---*/
-
+#line 95 "packet-pkinit-template.c"
   };
 
   /* Register protocol */
@@ -496,12 +497,12 @@ void proto_register_pkinit(void) {
 void proto_reg_handoff_pkinit(void) {
 
 /*--- Included file: packet-pkinit-dis-tab.c ---*/
-
+#line 1 "packet-pkinit-dis-tab.c"
   register_ber_oid_dissector("1.3.6.1.5.2.3.1", dissect_AuthPack_PDU, proto_pkinit, "id-pkauthdata");
   register_ber_oid_dissector("1.3.6.1.5.2.3.2", dissect_KDCDHKeyInfo_PDU, proto_pkinit, "id-pkdhkeydata");
 
 
 /*--- End of included file: packet-pkinit-dis-tab.c ---*/
-
+#line 110 "packet-pkinit-template.c"
 }
 
diff --git a/epan/dissectors/packet-pkinit.h b/epan/dissectors/packet-pkinit.h
index ec5f8bc65d..0afaba0b79 100644
--- a/epan/dissectors/packet-pkinit.h
+++ b/epan/dissectors/packet-pkinit.h
@@ -5,6 +5,7 @@
 
 /* Input file: packet-pkinit-template.h */
 
+#line 1 "packet-pkinit-template.h"
 /* packet-pkinit.h
  * Routines for PKINIT packet dissection
  *  Ronnie Sahlberg 2004
diff --git a/epan/dissectors/packet-pkix1explicit.c b/epan/dissectors/packet-pkix1explicit.c
index 9486db1fd7..c333660f72 100644
--- a/epan/dissectors/packet-pkix1explicit.c
+++ b/epan/dissectors/packet-pkix1explicit.c
@@ -1,10 +1,11 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-pkix1explicit.c                                                   */
+/* ./packet-pkix1explicit.c                                                   */
 /* ../../tools/asn2eth.py -e -X -b -p pkix1explicit -c pkix1explicit.cnf -s packet-pkix1explicit-template PKIX1EXPLICIT93.asn */
 
 /* Input file: packet-pkix1explicit-template.c */
 
+#line 1 "packet-pkix1explicit-template.c"
 #define BER_UNI_TAG_TeletexString	    20  /* workaround bug in asn2eth */
 
 /* packet-pkix1explicit.c
@@ -57,7 +58,7 @@ static int proto_pkix1explicit = -1;
 static int hf_pkix1explicit_object_identifier_id = -1;
 
 /*--- Included file: packet-pkix1explicit-hf.c ---*/
-
+#line 1 "packet-pkix1explicit-hf.c"
 static int hf_pkix1explicit_DomainParameters_PDU = -1;  /* DomainParameters */
 static int hf_pkix1explicit_DirectoryString_PDU = -1;  /* DirectoryString */
 static int hf_pkix1explicit_Extensions_item = -1;  /* Extension */
@@ -79,12 +80,12 @@ static int hf_pkix1explicit_type1 = -1;           /* TeletexString */
 static int hf_pkix1explicit_value1 = -1;          /* TeletexString */
 
 /*--- End of included file: packet-pkix1explicit-hf.c ---*/
-
+#line 52 "packet-pkix1explicit-template.c"
 
 /* Initialize the subtree pointers */
 
 /*--- Included file: packet-pkix1explicit-ett.c ---*/
-
+#line 1 "packet-pkix1explicit-ett.c"
 static gint ett_pkix1explicit_Extensions = -1;
 static gint ett_pkix1explicit_Extension = -1;
 static gint ett_pkix1explicit_DomainParameters = -1;
@@ -95,7 +96,7 @@ static gint ett_pkix1explicit_RelativeDistinguishedName = -1;
 static gint ett_pkix1explicit_TeletexDomainDefinedAttribute = -1;
 
 /*--- End of included file: packet-pkix1explicit-ett.c ---*/
-
+#line 55 "packet-pkix1explicit-template.c"
 
 
 static const char *object_identifier_id;
@@ -141,7 +142,7 @@ dissect_pkix1explicit_SubjectPublicKeyInfo(gboolean implicit_tag, tvbuff_t *tvb,
 
 
 /*--- Included file: packet-pkix1explicit-fn.c ---*/
-
+#line 1 "packet-pkix1explicit-fn.c"
 /*--- Fields for imported types ---*/
 
 
@@ -183,6 +184,7 @@ static int dissect_critical(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
 
 static int
 dissect_pkix1explicit_T_extnValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 44 "pkix1explicit.cnf"
   gint8 class;
   gboolean pc, ind;
   gint32 tag;
@@ -194,6 +196,7 @@ dissect_pkix1explicit_T_extnValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int
 
 
 
+
   return offset;
 }
 static int dissect_extnValue(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -323,9 +326,11 @@ static int dissect_type(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int
 
 static int
 dissect_pkix1explicit_T_value(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 38 "pkix1explicit.cnf"
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree);
 
 
+
   return offset;
 }
 static int dissect_value(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -383,9 +388,11 @@ dissect_pkix1explicit_RDNSequence(gboolean implicit_tag _U_, tvbuff_t *tvb, int
 
 int
 dissect_pkix1explicit_DirectoryString(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 32 "pkix1explicit.cnf"
 	offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
 
+
   return offset;
 }
 
@@ -452,7 +459,7 @@ static void dissect_DirectoryString_PDU(tvbuff_t *tvb, packet_info *pinfo, proto
 
 
 /*--- End of included file: packet-pkix1explicit-fn.c ---*/
-
+#line 99 "packet-pkix1explicit-template.c"
 
 
 /*--- proto_register_pkix1explicit ----------------------------------------------*/
@@ -465,7 +472,7 @@ void proto_register_pkix1explicit(void) {
 	"Object identifier Id", HFILL }},
 
 /*--- Included file: packet-pkix1explicit-hfarr.c ---*/
-
+#line 1 "packet-pkix1explicit-hfarr.c"
     { &hf_pkix1explicit_DomainParameters_PDU,
       { "DomainParameters", "pkix1explicit.DomainParameters",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -480,7 +487,7 @@ void proto_register_pkix1explicit(void) {
         "Extensions/_item", HFILL }},
     { &hf_pkix1explicit_extnId,
       { "extnId", "pkix1explicit.extnId",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "Extension/extnId", HFILL }},
     { &hf_pkix1explicit_critical,
       { "critical", "pkix1explicit.critical",
@@ -520,7 +527,7 @@ void proto_register_pkix1explicit(void) {
         "ValidationParms/pgenCounter", HFILL }},
     { &hf_pkix1explicit_type,
       { "type", "pkix1explicit.type",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "AttributeTypeAndValue/type", HFILL }},
     { &hf_pkix1explicit_value,
       { "value", "pkix1explicit.value",
@@ -544,14 +551,14 @@ void proto_register_pkix1explicit(void) {
         "TeletexDomainDefinedAttribute/value", HFILL }},
 
 /*--- End of included file: packet-pkix1explicit-hfarr.c ---*/
-
+#line 110 "packet-pkix1explicit-template.c"
   };
 
   /* List of subtrees */
   static gint *ett[] = {
 
 /*--- Included file: packet-pkix1explicit-ettarr.c ---*/
-
+#line 1 "packet-pkix1explicit-ettarr.c"
     &ett_pkix1explicit_Extensions,
     &ett_pkix1explicit_Extension,
     &ett_pkix1explicit_DomainParameters,
@@ -562,7 +569,7 @@ void proto_register_pkix1explicit(void) {
     &ett_pkix1explicit_TeletexDomainDefinedAttribute,
 
 /*--- End of included file: packet-pkix1explicit-ettarr.c ---*/
-
+#line 115 "packet-pkix1explicit-template.c"
   };
 
   /* Register protocol */
@@ -579,12 +586,12 @@ void proto_register_pkix1explicit(void) {
 void proto_reg_handoff_pkix1explicit(void) {
 
 /*--- Included file: packet-pkix1explicit-dis-tab.c ---*/
-
+#line 1 "packet-pkix1explicit-dis-tab.c"
   register_ber_oid_dissector("1.3.6.1.5.5.7.2.1", dissect_DirectoryString_PDU, proto_pkix1explicit, "id-qt-cps");
   register_ber_oid_dissector("1.2.840.10046.2.1", dissect_DomainParameters_PDU, proto_pkix1explicit, "dhpublicnumber");
 
 
 /*--- End of included file: packet-pkix1explicit-dis-tab.c ---*/
-
+#line 130 "packet-pkix1explicit-template.c"
 }
 
diff --git a/epan/dissectors/packet-pkix1explicit.h b/epan/dissectors/packet-pkix1explicit.h
index 0e693a2262..8fb5b0e332 100644
--- a/epan/dissectors/packet-pkix1explicit.h
+++ b/epan/dissectors/packet-pkix1explicit.h
@@ -5,6 +5,7 @@
 
 /* Input file: packet-pkix1explicit-template.h */
 
+#line 1 "packet-pkix1explicit-template.h"
 /* packet-pkix1explicit.h
  * Routines for PKIX1Explicit packet dissection
  *
@@ -43,7 +44,7 @@ int dissect_pkix1explicit_SubjectPublicKeyInfo(gboolean implicit_tag, tvbuff_t *
 
 
 /*--- Included file: packet-pkix1explicit-exp.h ---*/
-
+#line 1 "packet-pkix1explicit-exp.h"
 extern const value_string pkix1explicit_TerminalType_vals[];
 int dissect_pkix1explicit_CertificateSerialNumber(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
 int dissect_pkix1explicit_Extensions(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
@@ -56,7 +57,7 @@ int dissect_pkix1explicit_TerminalType(gboolean implicit_tag, tvbuff_t *tvb, int
 int dissect_pkix1explicit_TeletexDomainDefinedAttribute(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
 
 /*--- End of included file: packet-pkix1explicit-exp.h ---*/
-
+#line 38 "packet-pkix1explicit-template.h"
 
 #endif  /* PACKET_PKIX1EXPLICIT_H */
 
diff --git a/epan/dissectors/packet-pkix1implicit.c b/epan/dissectors/packet-pkix1implicit.c
index fb4b7792b1..2f6e818cb5 100644
--- a/epan/dissectors/packet-pkix1implicit.c
+++ b/epan/dissectors/packet-pkix1implicit.c
@@ -5,6 +5,7 @@
 
 /* Input file: packet-pkix1implicit-template.c */
 
+#line 1 "packet-pkix1implicit-template.c"
 /* packet-pkix1implicit.c
  * Routines for PKIX1Implitic packet dissection
  *
@@ -53,7 +54,7 @@
 static int proto_pkix1implicit = -1;
 
 /*--- Included file: packet-pkix1implicit-hf.c ---*/
-
+#line 1 "packet-pkix1implicit-hf.c"
 static int hf_pkix1implicit_Dummy_PDU = -1;       /* Dummy */
 static int hf_pkix1implicit_AuthorityInfoAccessSyntax_PDU = -1;  /* AuthorityInfoAccessSyntax */
 static int hf_pkix1implicit_nameAssigner = -1;    /* DirectoryString */
@@ -71,12 +72,12 @@ static int hf_pkix1implicit_bmpString = -1;       /* BMPString */
 static int hf_pkix1implicit_utf8String = -1;      /* UTF8String */
 
 /*--- End of included file: packet-pkix1implicit-hf.c ---*/
-
+#line 48 "packet-pkix1implicit-template.c"
 
 /* Initialize the subtree pointers */
 
 /*--- Included file: packet-pkix1implicit-ett.c ---*/
-
+#line 1 "packet-pkix1implicit-ett.c"
 static gint ett_pkix1implicit_EDIPartyName = -1;
 static gint ett_pkix1implicit_AuthorityInfoAccessSyntax = -1;
 static gint ett_pkix1implicit_AccessDescription = -1;
@@ -86,7 +87,7 @@ static gint ett_pkix1implicit_T_noticeNumbers = -1;
 static gint ett_pkix1implicit_DisplayText = -1;
 
 /*--- End of included file: packet-pkix1implicit-ett.c ---*/
-
+#line 51 "packet-pkix1implicit-template.c"
 
 
 int
@@ -104,7 +105,7 @@ dissect_pkix1implicit_GeneralName(gboolean implicit_tag _U_, tvbuff_t *tvb, int
 
 
 /*--- Included file: packet-pkix1implicit-fn.c ---*/
-
+#line 1 "packet-pkix1implicit-fn.c"
 /*--- Fields for imported types ---*/
 
 static int dissect_nameAssigner_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -145,8 +146,7 @@ dissect_pkix1implicit_EDIPartyName(gboolean implicit_tag _U_, tvbuff_t *tvb, int
 
 static int
 dissect_pkix1implicit_OBJECT_IDENTIFIER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, hf_index,
-                                            NULL);
+  offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -330,7 +330,7 @@ static void dissect_AuthorityInfoAccessSyntax_PDU(tvbuff_t *tvb, packet_info *pi
 
 
 /*--- End of included file: packet-pkix1implicit-fn.c ---*/
-
+#line 67 "packet-pkix1implicit-template.c"
 
 
 /*--- proto_register_pkix1implicit ----------------------------------------------*/
@@ -340,7 +340,7 @@ void proto_register_pkix1implicit(void) {
   static hf_register_info hf[] = {
 
 /*--- Included file: packet-pkix1implicit-hfarr.c ---*/
-
+#line 1 "packet-pkix1implicit-hfarr.c"
     { &hf_pkix1implicit_Dummy_PDU,
       { "Dummy", "pkix1implicit.Dummy",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -363,7 +363,7 @@ void proto_register_pkix1implicit(void) {
         "AuthorityInfoAccessSyntax/_item", HFILL }},
     { &hf_pkix1implicit_accessMethod,
       { "accessMethod", "pkix1implicit.accessMethod",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "AccessDescription/accessMethod", HFILL }},
     { &hf_pkix1implicit_accessLocation,
       { "accessLocation", "pkix1implicit.accessLocation",
@@ -403,14 +403,14 @@ void proto_register_pkix1implicit(void) {
         "DisplayText/utf8String", HFILL }},
 
 /*--- End of included file: packet-pkix1implicit-hfarr.c ---*/
-
+#line 75 "packet-pkix1implicit-template.c"
   };
 
   /* List of subtrees */
   static gint *ett[] = {
 
 /*--- Included file: packet-pkix1implicit-ettarr.c ---*/
-
+#line 1 "packet-pkix1implicit-ettarr.c"
     &ett_pkix1implicit_EDIPartyName,
     &ett_pkix1implicit_AuthorityInfoAccessSyntax,
     &ett_pkix1implicit_AccessDescription,
@@ -420,7 +420,7 @@ void proto_register_pkix1implicit(void) {
     &ett_pkix1implicit_DisplayText,
 
 /*--- End of included file: packet-pkix1implicit-ettarr.c ---*/
-
+#line 80 "packet-pkix1implicit-template.c"
   };
 
   /* Register protocol */
@@ -437,7 +437,7 @@ void proto_register_pkix1implicit(void) {
 void proto_reg_handoff_pkix1implicit(void) {
 
 /*--- Included file: packet-pkix1implicit-dis-tab.c ---*/
-
+#line 1 "packet-pkix1implicit-dis-tab.c"
   register_ber_oid_dissector("1.3.6.1.5.5.7.1.1", dissect_AuthorityInfoAccessSyntax_PDU, proto_pkix1implicit, "id-pe-authorityInfoAccessSyntax");
   register_ber_oid_dissector("1.3.6.1.5.5.7.3.1", dissect_Dummy_PDU, proto_pkix1implicit, "id-kp-serverAuth");
   register_ber_oid_dissector("1.3.6.1.5.5.7.3.2", dissect_Dummy_PDU, proto_pkix1implicit, "id-kp-clientAuth");
@@ -451,6 +451,6 @@ void proto_reg_handoff_pkix1implicit(void) {
 
 
 /*--- End of included file: packet-pkix1implicit-dis-tab.c ---*/
-
+#line 95 "packet-pkix1implicit-template.c"
 }
 
diff --git a/epan/dissectors/packet-pkix1implicit.h b/epan/dissectors/packet-pkix1implicit.h
index 511d04fafd..6d94864e0d 100644
--- a/epan/dissectors/packet-pkix1implicit.h
+++ b/epan/dissectors/packet-pkix1implicit.h
@@ -5,6 +5,7 @@
 
 /* Input file: packet-pkix1implicit-template.h */
 
+#line 1 "packet-pkix1implicit-template.h"
 /* packet-pkix1implicit.h
  * Routines for PKIX1Implicit packet dissection
  *
@@ -37,12 +38,12 @@ int dissect_pkix1implicit_ReasonFlags(gboolean implicit_tag _U_, tvbuff_t *tvb,
 
 
 /*--- Included file: packet-pkix1implicit-exp.h ---*/
-
+#line 1 "packet-pkix1implicit-exp.h"
 int dissect_pkix1implicit_AuthorityInfoAccessSyntax(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
 int dissect_pkix1implicit_UserNotice(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
 
 /*--- End of included file: packet-pkix1implicit-exp.h ---*/
-
+#line 32 "packet-pkix1implicit-template.h"
 
 #endif  /* PACKET_PKIX1IMPLICIT_H */
 
diff --git a/epan/dissectors/packet-pkixproxy.c b/epan/dissectors/packet-pkixproxy.c
index fb65a2bca5..4773ff5489 100644
--- a/epan/dissectors/packet-pkixproxy.c
+++ b/epan/dissectors/packet-pkixproxy.c
@@ -5,6 +5,7 @@
 
 /* Input file: packet-pkixproxy-template.c */
 
+#line 1 "packet-pkixproxy-template.c"
 /* packet-pkixproxy.c
  * Routines for RFC3820 PKIXProxy packet dissection
  *  Ronnie Sahlberg 2004
@@ -51,7 +52,7 @@
 static int proto_pkixproxy = -1;
 
 /*--- Included file: packet-pkixproxy-hf.c ---*/
-
+#line 1 "packet-pkixproxy-hf.c"
 static int hf_pkixproxy_ProxyCertInfoExtension_PDU = -1;  /* ProxyCertInfoExtension */
 static int hf_pkixproxy_pCPathLenConstraint = -1;  /* ProxyCertPathLengthConstraint */
 static int hf_pkixproxy_proxyPolicy = -1;         /* ProxyPolicy */
@@ -59,21 +60,21 @@ static int hf_pkixproxy_policyLanguage = -1;      /* OBJECT_IDENTIFIER */
 static int hf_pkixproxy_policy = -1;              /* OCTET_STRING */
 
 /*--- End of included file: packet-pkixproxy-hf.c ---*/
-
+#line 46 "packet-pkixproxy-template.c"
 
 /* Initialize the subtree pointers */
 
 /*--- Included file: packet-pkixproxy-ett.c ---*/
-
+#line 1 "packet-pkixproxy-ett.c"
 static gint ett_pkixproxy_ProxyCertInfoExtension = -1;
 static gint ett_pkixproxy_ProxyPolicy = -1;
 
 /*--- End of included file: packet-pkixproxy-ett.c ---*/
-
+#line 49 "packet-pkixproxy-template.c"
 
 
 /*--- Included file: packet-pkixproxy-fn.c ---*/
-
+#line 1 "packet-pkixproxy-fn.c"
 /*--- Fields for imported types ---*/
 
 
@@ -81,7 +82,8 @@ static gint ett_pkixproxy_ProxyPolicy = -1;
 
 static int
 dissect_pkixproxy_ProxyCertPathLengthConstraint(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
+                                  NULL);
 
   return offset;
 }
@@ -90,10 +92,10 @@ static int dissect_pCPathLenConstraint(packet_info *pinfo, proto_tree *tree, tvb
 }
 
 
+
 static int
 dissect_pkixproxy_OBJECT_IDENTIFIER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset,
-                                         hf_index, NULL);
+  offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -102,10 +104,11 @@ static int dissect_policyLanguage(packet_info *pinfo, proto_tree *tree, tvbuff_t
 }
 
 
+
 static int
 dissect_pkixproxy_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index,
-                                    NULL);
+                                       NULL);
 
   return offset;
 }
@@ -113,6 +116,7 @@ static int dissect_policy(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
   return dissect_pkixproxy_OCTET_STRING(FALSE, tvb, offset, pinfo, tree, hf_pkixproxy_policy);
 }
 
+
 static const ber_sequence_t ProxyPolicy_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_policyLanguage },
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_policy },
@@ -122,7 +126,7 @@ static const ber_sequence_t ProxyPolicy_sequence[] = {
 static int
 dissect_pkixproxy_ProxyPolicy(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
-                                ProxyPolicy_sequence, hf_index, ett_pkixproxy_ProxyPolicy);
+                                   ProxyPolicy_sequence, hf_index, ett_pkixproxy_ProxyPolicy);
 
   return offset;
 }
@@ -130,6 +134,7 @@ static int dissect_proxyPolicy(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
   return dissect_pkixproxy_ProxyPolicy(FALSE, tvb, offset, pinfo, tree, hf_pkixproxy_proxyPolicy);
 }
 
+
 static const ber_sequence_t ProxyCertInfoExtension_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_pCPathLenConstraint },
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_proxyPolicy },
@@ -139,7 +144,7 @@ static const ber_sequence_t ProxyCertInfoExtension_sequence[] = {
 static int
 dissect_pkixproxy_ProxyCertInfoExtension(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
-                                ProxyCertInfoExtension_sequence, hf_index, ett_pkixproxy_ProxyCertInfoExtension);
+                                   ProxyCertInfoExtension_sequence, hf_index, ett_pkixproxy_ProxyCertInfoExtension);
 
   return offset;
 }
@@ -152,7 +157,7 @@ static void dissect_ProxyCertInfoExtension_PDU(tvbuff_t *tvb, packet_info *pinfo
 
 
 /*--- End of included file: packet-pkixproxy-fn.c ---*/
-
+#line 51 "packet-pkixproxy-template.c"
 
 
 /*--- proto_register_pkixproxy ----------------------------------------------*/
@@ -162,7 +167,7 @@ void proto_register_pkixproxy(void) {
   static hf_register_info hf[] = {
 
 /*--- Included file: packet-pkixproxy-hfarr.c ---*/
-
+#line 1 "packet-pkixproxy-hfarr.c"
     { &hf_pkixproxy_ProxyCertInfoExtension_PDU,
       { "ProxyCertInfoExtension", "pkixproxy.ProxyCertInfoExtension",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -177,7 +182,7 @@ void proto_register_pkixproxy(void) {
         "ProxyCertInfoExtension/proxyPolicy", HFILL }},
     { &hf_pkixproxy_policyLanguage,
       { "policyLanguage", "pkixproxy.policyLanguage",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "ProxyPolicy/policyLanguage", HFILL }},
     { &hf_pkixproxy_policy,
       { "policy", "pkixproxy.policy",
@@ -185,19 +190,19 @@ void proto_register_pkixproxy(void) {
         "ProxyPolicy/policy", HFILL }},
 
 /*--- End of included file: packet-pkixproxy-hfarr.c ---*/
-
+#line 59 "packet-pkixproxy-template.c"
   };
 
   /* List of subtrees */
   static gint *ett[] = {
 
 /*--- Included file: packet-pkixproxy-ettarr.c ---*/
-
+#line 1 "packet-pkixproxy-ettarr.c"
     &ett_pkixproxy_ProxyCertInfoExtension,
     &ett_pkixproxy_ProxyPolicy,
 
 /*--- End of included file: packet-pkixproxy-ettarr.c ---*/
-
+#line 64 "packet-pkixproxy-template.c"
   };
 
   /* Register protocol */
@@ -214,12 +219,12 @@ void proto_register_pkixproxy(void) {
 void proto_reg_handoff_pkixproxy(void) {
 
 /*--- Included file: packet-pkixproxy-dis-tab.c ---*/
-
- register_ber_oid_dissector("1.3.6.1.5.5.7.1.14", dissect_ProxyCertInfoExtension_PDU, proto_pkixproxy, "id-pe-proxyCertInfo");
+#line 1 "packet-pkixproxy-dis-tab.c"
+  register_ber_oid_dissector("1.3.6.1.5.5.7.1.14", dissect_ProxyCertInfoExtension_PDU, proto_pkixproxy, "id-pe-proxyCertInfo");
 
 
 /*--- End of included file: packet-pkixproxy-dis-tab.c ---*/
-
+#line 79 "packet-pkixproxy-template.c"
   register_ber_oid_name("1.3.6.1.5.5.7.21.0", "id-ppl-anyLanguage");
   register_ber_oid_name("1.3.6.1.5.5.7.21.1", "id-ppl-inheritAll");
   register_ber_oid_name("1.3.6.1.5.5.7.21.2", "id-ppl-independent");
diff --git a/epan/dissectors/packet-pkixproxy.h b/epan/dissectors/packet-pkixproxy.h
index 4f90d51fbe..8e92821b09 100644
--- a/epan/dissectors/packet-pkixproxy.h
+++ b/epan/dissectors/packet-pkixproxy.h
@@ -5,6 +5,7 @@
 
 /* Input file: packet-pkixproxy-template.h */
 
+#line 1 "packet-pkixproxy-template.h"
 /* packet-pkixproxy.h
  * Routines for RFC3820 PKIXProxy packet dissection
  *  Ronnie Sahlberg 2004
diff --git a/epan/dissectors/packet-pkixqualified.c b/epan/dissectors/packet-pkixqualified.c
index d409ce5e53..28973b1237 100644
--- a/epan/dissectors/packet-pkixqualified.c
+++ b/epan/dissectors/packet-pkixqualified.c
@@ -1,10 +1,11 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-pkixqualified.c                                                   */
+/* ./packet-pkixqualified.c                                                   */
 /* ../../tools/asn2eth.py -X -b -e -p pkixqualified -c pkixqualified.cnf -s packet-pkixqualified-template PKIXqualified.asn */
 
 /* Input file: packet-pkixqualified-template.c */
 
+#line 1 "packet-pkixqualified-template.c"
 /* packet-pkixqualified.c
  * Routines for RFC3739 PKIXqualified packet dissection
  *  Ronnie Sahlberg 2004
@@ -55,7 +56,7 @@
 int proto_pkixqualified = -1;
 
 /*--- Included file: packet-pkixqualified-hf.c ---*/
-
+#line 1 "packet-pkixqualified-hf.c"
 static int hf_pkixqualified_Generalizedtime_PDU = -1;  /* Generalizedtime */
 static int hf_pkixqualified_Directorystring_PDU = -1;  /* Directorystring */
 static int hf_pkixqualified_Printablestring_PDU = -1;  /* Printablestring */
@@ -77,12 +78,12 @@ static int hf_pkixqualified_nameRegistrationAuthorities = -1;  /* NameRegistrati
 static int hf_pkixqualified_NameRegistrationAuthorities_item = -1;  /* GeneralName */
 
 /*--- End of included file: packet-pkixqualified-hf.c ---*/
-
+#line 50 "packet-pkixqualified-template.c"
 
 /* Initialize the subtree pointers */
 
 /*--- Included file: packet-pkixqualified-ett.c ---*/
-
+#line 1 "packet-pkixqualified-ett.c"
 static gint ett_pkixqualified_BiometricSyntax = -1;
 static gint ett_pkixqualified_BiometricData = -1;
 static gint ett_pkixqualified_TypeOfBiometricData = -1;
@@ -92,13 +93,13 @@ static gint ett_pkixqualified_SemanticsInformation = -1;
 static gint ett_pkixqualified_NameRegistrationAuthorities = -1;
 
 /*--- End of included file: packet-pkixqualified-ett.c ---*/
-
+#line 53 "packet-pkixqualified-template.c"
 
 static const char *object_identifier_id;
 
 
 /*--- Included file: packet-pkixqualified-fn.c ---*/
-
+#line 1 "packet-pkixqualified-fn.c"
 /*--- Fields for imported types ---*/
 
 static int dissect_hashAlgorithm(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -272,9 +273,11 @@ static int dissect_statementId(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
 
 static int
 dissect_pkixqualified_T_statementInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 38 "pkixqualified.cnf"
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree);
 
 
+
   return offset;
 }
 static int dissect_statementInfo(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -366,7 +369,7 @@ static void dissect_SemanticsInformation_PDU(tvbuff_t *tvb, packet_info *pinfo,
 
 
 /*--- End of included file: packet-pkixqualified-fn.c ---*/
-
+#line 57 "packet-pkixqualified-template.c"
 
 
 /*--- proto_register_pkixqualified ----------------------------------------------*/
@@ -376,7 +379,7 @@ void proto_register_pkixqualified(void) {
   static hf_register_info hf[] = {
 
 /*--- Included file: packet-pkixqualified-hfarr.c ---*/
-
+#line 1 "packet-pkixqualified-hfarr.c"
     { &hf_pkixqualified_Generalizedtime_PDU,
       { "Generalizedtime", "pkixqualified.Generalizedtime",
         FT_STRING, BASE_NONE, NULL, 0,
@@ -427,7 +430,7 @@ void proto_register_pkixqualified(void) {
         "TypeOfBiometricData/predefinedBiometricType", HFILL }},
     { &hf_pkixqualified_biometricDataOid,
       { "biometricDataOid", "pkixqualified.biometricDataOid",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "TypeOfBiometricData/biometricDataOid", HFILL }},
     { &hf_pkixqualified_QCStatements_item,
       { "Item", "pkixqualified.QCStatements_item",
@@ -435,7 +438,7 @@ void proto_register_pkixqualified(void) {
         "QCStatements/_item", HFILL }},
     { &hf_pkixqualified_statementId,
       { "statementId", "pkixqualified.statementId",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "QCStatement/statementId", HFILL }},
     { &hf_pkixqualified_statementInfo,
       { "statementInfo", "pkixqualified.statementInfo",
@@ -443,7 +446,7 @@ void proto_register_pkixqualified(void) {
         "QCStatement/statementInfo", HFILL }},
     { &hf_pkixqualified_semanticsIdentifier,
       { "semanticsIdentifier", "pkixqualified.semanticsIdentifier",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "SemanticsInformation/semanticsIdentifier", HFILL }},
     { &hf_pkixqualified_nameRegistrationAuthorities,
       { "nameRegistrationAuthorities", "pkixqualified.nameRegistrationAuthorities",
@@ -455,14 +458,14 @@ void proto_register_pkixqualified(void) {
         "NameRegistrationAuthorities/_item", HFILL }},
 
 /*--- End of included file: packet-pkixqualified-hfarr.c ---*/
-
+#line 65 "packet-pkixqualified-template.c"
   };
 
   /* List of subtrees */
   static gint *ett[] = {
 
 /*--- Included file: packet-pkixqualified-ettarr.c ---*/
-
+#line 1 "packet-pkixqualified-ettarr.c"
     &ett_pkixqualified_BiometricSyntax,
     &ett_pkixqualified_BiometricData,
     &ett_pkixqualified_TypeOfBiometricData,
@@ -472,7 +475,7 @@ void proto_register_pkixqualified(void) {
     &ett_pkixqualified_NameRegistrationAuthorities,
 
 /*--- End of included file: packet-pkixqualified-ettarr.c ---*/
-
+#line 70 "packet-pkixqualified-template.c"
   };
 
   /* Register protocol */
@@ -489,7 +492,7 @@ void proto_register_pkixqualified(void) {
 void proto_reg_handoff_pkixqualified(void) {
 
 /*--- Included file: packet-pkixqualified-dis-tab.c ---*/
-
+#line 1 "packet-pkixqualified-dis-tab.c"
   register_ber_oid_dissector("1.3.6.1.5.5.7.1.2", dissect_BiometricSyntax_PDU, proto_pkixqualified, "id-pe-biometricInfo");
   register_ber_oid_dissector("1.3.6.1.5.5.7.1.3", dissect_QCStatements_PDU, proto_pkixqualified, "id-pe-qcStatements");
   register_ber_oid_dissector("1.3.6.1.5.5.7.11.1", dissect_SemanticsInformation_PDU, proto_pkixqualified, "id-qcs-pkixQCSyntax-v1");
@@ -502,6 +505,6 @@ void proto_reg_handoff_pkixqualified(void) {
 
 
 /*--- End of included file: packet-pkixqualified-dis-tab.c ---*/
-
+#line 85 "packet-pkixqualified-template.c"
 }
 
diff --git a/epan/dissectors/packet-pkixqualified.h b/epan/dissectors/packet-pkixqualified.h
index 40118c05aa..45cdbe8481 100644
--- a/epan/dissectors/packet-pkixqualified.h
+++ b/epan/dissectors/packet-pkixqualified.h
@@ -5,6 +5,7 @@
 
 /* Input file: packet-pkixqualified-template.h */
 
+#line 1 "packet-pkixqualified-template.h"
 /* packet-pkixqualified.h
  * Routines for RFC3739 PKIXqualified packet dissection
  *  Ronnie Sahlberg 2004
diff --git a/epan/dissectors/packet-pkixtsp.c b/epan/dissectors/packet-pkixtsp.c
index 0f57c4479f..8019271577 100644
--- a/epan/dissectors/packet-pkixtsp.c
+++ b/epan/dissectors/packet-pkixtsp.c
@@ -5,6 +5,7 @@
 
 /* Input file: packet-pkixtsp-template.c */
 
+#line 1 "packet-pkixtsp-template.c"
 /* packet-pkixtsp.c
  * Routines for RFC2634 Extended Security Services packet dissection
  *   Ronnie Sahlberg 2004
@@ -54,7 +55,7 @@
 static int proto_pkixtsp = -1;
 
 /*--- Included file: packet-pkixtsp-hf.c ---*/
-
+#line 1 "packet-pkixtsp-hf.c"
 static int hf_pkixtsp_version = -1;               /* T_version */
 static int hf_pkixtsp_messageImprint = -1;        /* MessageImprint */
 static int hf_pkixtsp_reqPolicy = -1;             /* TSAPolicyId */
@@ -88,13 +89,13 @@ static int hf_pkixtsp_PKIFailureInfo_addInfoNotAvailable = -1;
 static int hf_pkixtsp_PKIFailureInfo_systemFailure = -1;
 
 /*--- End of included file: packet-pkixtsp-hf.c ---*/
-
+#line 49 "packet-pkixtsp-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_pkixtsp = -1;
 
 /*--- Included file: packet-pkixtsp-ett.c ---*/
-
+#line 1 "packet-pkixtsp-ett.c"
 static gint ett_pkixtsp_TimeStampReq = -1;
 static gint ett_pkixtsp_MessageImprint = -1;
 static gint ett_pkixtsp_TimeStampResp = -1;
@@ -104,12 +105,12 @@ static gint ett_pkixtsp_TSTInfo = -1;
 static gint ett_pkixtsp_Accuracy = -1;
 
 /*--- End of included file: packet-pkixtsp-ett.c ---*/
-
+#line 53 "packet-pkixtsp-template.c"
 
 
 
 /*--- Included file: packet-pkixtsp-fn.c ---*/
-
+#line 1 "packet-pkixtsp-fn.c"
 /*--- Fields for imported types ---*/
 
 static int dissect_extensions_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -175,8 +176,7 @@ static int dissect_messageImprint(packet_info *pinfo, proto_tree *tree, tvbuff_t
 
 static int
 dissect_pkixtsp_TSAPolicyId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, hf_index,
-                                            NULL);
+  offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -423,7 +423,7 @@ dissect_pkixtsp_TSTInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pa
 
 
 /*--- End of included file: packet-pkixtsp-fn.c ---*/
-
+#line 56 "packet-pkixtsp-template.c"
 
 
 static int
@@ -482,7 +482,7 @@ void proto_register_pkixtsp(void) {
   static hf_register_info hf[] = {
 
 /*--- Included file: packet-pkixtsp-hfarr.c ---*/
-
+#line 1 "packet-pkixtsp-hfarr.c"
     { &hf_pkixtsp_version,
       { "version", "pkixtsp.version",
         FT_INT32, BASE_DEC, VALS(pkixtsp_T_version_vals), 0,
@@ -493,7 +493,7 @@ void proto_register_pkixtsp(void) {
         "", HFILL }},
     { &hf_pkixtsp_reqPolicy,
       { "reqPolicy", "pkixtsp.reqPolicy",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "TimeStampReq/reqPolicy", HFILL }},
     { &hf_pkixtsp_nonce,
       { "nonce", "pkixtsp.nonce",
@@ -537,7 +537,7 @@ void proto_register_pkixtsp(void) {
         "TSTInfo/version", HFILL }},
     { &hf_pkixtsp_policy,
       { "policy", "pkixtsp.policy",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "TSTInfo/policy", HFILL }},
     { &hf_pkixtsp_serialNumber,
       { "serialNumber", "pkixtsp.serialNumber",
@@ -605,7 +605,7 @@ void proto_register_pkixtsp(void) {
         "", HFILL }},
 
 /*--- End of included file: packet-pkixtsp-hfarr.c ---*/
-
+#line 113 "packet-pkixtsp-template.c"
   };
 
   /* List of subtrees */
@@ -613,7 +613,7 @@ void proto_register_pkixtsp(void) {
 	&ett_pkixtsp,
 
 /*--- Included file: packet-pkixtsp-ettarr.c ---*/
-
+#line 1 "packet-pkixtsp-ettarr.c"
     &ett_pkixtsp_TimeStampReq,
     &ett_pkixtsp_MessageImprint,
     &ett_pkixtsp_TimeStampResp,
@@ -623,7 +623,7 @@ void proto_register_pkixtsp(void) {
     &ett_pkixtsp_Accuracy,
 
 /*--- End of included file: packet-pkixtsp-ettarr.c ---*/
-
+#line 119 "packet-pkixtsp-template.c"
   };
 
   /* Register protocol */
diff --git a/epan/dissectors/packet-pkixtsp.h b/epan/dissectors/packet-pkixtsp.h
index 6f2723a9bc..faec6452f7 100644
--- a/epan/dissectors/packet-pkixtsp.h
+++ b/epan/dissectors/packet-pkixtsp.h
@@ -5,6 +5,7 @@
 
 /* Input file: packet-pkixtsp-template.h */
 
+#line 1 "packet-pkixtsp-template.h"
 /* packet-pkixtsp.h
  * Routines for RFC3161 Time-Stamp Protocol packet dissection
  *    Ronnie Sahlberg 2004
diff --git a/epan/dissectors/packet-pres.c b/epan/dissectors/packet-pres.c
index b9744bd848..4a8bd03dc4 100644
--- a/epan/dissectors/packet-pres.c
+++ b/epan/dissectors/packet-pres.c
@@ -5,6 +5,7 @@
 
 /* Input file: packet-pres-template.c */
 
+#line 1 "packet-pres-template.c"
 /* packet-pres.c
  * Routine to dissect ISO 8823 OSI Presentation Protocol packets
  * Based on the dissector by 
@@ -84,7 +85,7 @@ static int hf_pres_Typed_data_type = -1;
 
 
 /*--- Included file: packet-pres-hf.c ---*/
-
+#line 1 "packet-pres-hf.c"
 static int hf_pres_mode_selector = -1;            /* Mode_selector */
 static int hf_pres_x410_mode_parameters = -1;     /* RTORQapdu */
 static int hf_pres_normal_mode_parameters = -1;   /* T_normal_mode_parameters */
@@ -164,14 +165,14 @@ static int hf_pres_User_session_requirements_symmetric_synchronize = -1;
 static int hf_pres_User_session_requirements_data_separation = -1;
 
 /*--- End of included file: packet-pres-hf.c ---*/
-
+#line 79 "packet-pres-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_pres           = -1;
 
 
 /*--- Included file: packet-pres-ett.c ---*/
-
+#line 1 "packet-pres-ett.c"
 static gint ett_pres_CP_type = -1;
 static gint ett_pres_T_normal_mode_parameters = -1;
 static gint ett_pres_T_extensions = -1;
@@ -209,7 +210,7 @@ static gint ett_pres_T_presentation_data_values = -1;
 static gint ett_pres_User_session_requirements = -1;
 
 /*--- End of included file: packet-pres-ett.c ---*/
-
+#line 84 "packet-pres-template.c"
 
 
 static guint
@@ -277,7 +278,7 @@ find_oid_by_pres_ctx_id(packet_info *pinfo _U_, guint32 idx)
 
 
 /*--- Included file: packet-pres-fn.c ---*/
-
+#line 1 "packet-pres-fn.c"
 /*--- Fields for imported types ---*/
 
 static int dissect_x410_mode_parameters_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -385,6 +386,7 @@ static int dissect_called_presentation_selector_impl(packet_info *pinfo, proto_t
 
 static int
 dissect_pres_Presentation_context_identifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 72 "pres.cnf"
 
     offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
                                   &presentation_context_identifier);
@@ -394,6 +396,7 @@ dissect_pres_Presentation_context_identifier(gboolean implicit_tag _U_, tvbuff_t
 	session->pres_ctx_id = presentation_context_identifier;
 
 
+
   return offset;
 }
 static int dissect_initiators_nominated_context(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -468,11 +471,15 @@ static const ber_sequence_t Context_list_item_sequence[] = {
 
 static int
 dissect_pres_Context_list_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 79 "pres.cnf"
 	abstract_syntax_name_oid=NULL;
+
   offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
                                    Context_list_item_sequence, hf_index, ett_pres_Context_list_item);
 
+#line 82 "pres.cnf"
 	register_ctx_id_and_oid(pinfo, presentation_context_identifier, abstract_syntax_name_oid);
+
   return offset;
 }
 static int dissect_Context_list_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -624,6 +631,7 @@ static int dissect_simply_encoded_data_impl(packet_info *pinfo, proto_tree *tree
 
 static int
 dissect_pres_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 38 "pres.cnf"
 
  tvbuff_t	*next_tvb;
  char *oid; 
@@ -639,6 +647,7 @@ dissect_pres_T_single_ASN1_type(gboolean implicit_tag _U_, tvbuff_t *tvb, int of
 	
 	}
 
+
   return offset;
 }
 static int dissect_single_ASN1_type_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -649,6 +658,7 @@ static int dissect_single_ASN1_type_impl(packet_info *pinfo, proto_tree *tree, t
 
 static int
 dissect_pres_T_octet_aligned(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 51 "pres.cnf"
 
  tvbuff_t	*next_tvb;
  char *oid; 
@@ -666,6 +676,7 @@ dissect_pres_T_octet_aligned(gboolean implicit_tag _U_, tvbuff_t *tvb, int offse
 
 
 
+
   return offset;
 }
 static int dissect_octet_aligned_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -1406,7 +1417,7 @@ dissect_pres_RSA_PPDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pack
 
 
 /*--- End of included file: packet-pres-fn.c ---*/
-
+#line 150 "packet-pres-template.c"
 
 
 /*
@@ -1481,7 +1492,7 @@ dissect_ppdu(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 	return offset;
 }
 
-static void
+void
 dissect_pres(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 {
 	int offset = 0, old_offset;
@@ -1544,7 +1555,7 @@ void proto_register_pres(void) {
 
 
 /*--- Included file: packet-pres-hfarr.c ---*/
-
+#line 1 "packet-pres-hfarr.c"
     { &hf_pres_mode_selector,
       { "mode-selector", "pres.mode_selector",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -1703,7 +1714,7 @@ void proto_register_pres(void) {
         "", HFILL }},
     { &hf_pres_abstract_syntax_name,
       { "abstract-syntax-name", "pres.abstract_syntax_name",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "", HFILL }},
     { &hf_pres_transfer_syntax_name_list,
       { "transfer-syntax-name-list", "pres.transfer_syntax_name_list",
@@ -1711,11 +1722,11 @@ void proto_register_pres(void) {
         "Context-list/_item/transfer-syntax-name-list", HFILL }},
     { &hf_pres_transfer_syntax_name_list_item,
       { "Item", "pres.transfer_syntax_name_list_item",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "Context-list/_item/transfer-syntax-name-list/_item", HFILL }},
     { &hf_pres_transfer_syntax_name,
       { "transfer-syntax-name", "pres.transfer_syntax_name",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "", HFILL }},
     { &hf_pres_mode_value,
       { "mode-value", "pres.mode_value",
@@ -1851,7 +1862,7 @@ void proto_register_pres(void) {
         "", HFILL }},
 
 /*--- End of included file: packet-pres-hfarr.c ---*/
-
+#line 286 "packet-pres-template.c"
   };
 
   /* List of subtrees */
@@ -1859,7 +1870,7 @@ void proto_register_pres(void) {
 		&ett_pres,
 
 /*--- Included file: packet-pres-ettarr.c ---*/
-
+#line 1 "packet-pres-ettarr.c"
     &ett_pres_CP_type,
     &ett_pres_T_normal_mode_parameters,
     &ett_pres_T_extensions,
@@ -1897,7 +1908,7 @@ void proto_register_pres(void) {
     &ett_pres_User_session_requirements,
 
 /*--- End of included file: packet-pres-ettarr.c ---*/
-
+#line 292 "packet-pres-template.c"
   };
 
   /* Register protocol */
diff --git a/epan/dissectors/packet-pres.h b/epan/dissectors/packet-pres.h
index 24c32e1e12..f78afa9e29 100644
--- a/epan/dissectors/packet-pres.h
+++ b/epan/dissectors/packet-pres.h
@@ -5,6 +5,7 @@
 
 /* Input file: packet-pres-template.h */
 
+#line 1 "packet-pres-template.h"
 /* packet-pres.h
  * Routines for pres packet dissection
  *
diff --git a/epan/dissectors/packet-ranap.c b/epan/dissectors/packet-ranap.c
index 80bf0e4d5a..e2a602e1ba 100644
--- a/epan/dissectors/packet-ranap.c
+++ b/epan/dissectors/packet-ranap.c
@@ -1,10 +1,11 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-ranap.c                                                           */
+/* ./packet-ranap.c                                                           */
 /* ../../tools/asn2eth.py -X -e -p ranap -c ranap.cnf -s packet-ranap-template ranap.asn */
 
 /* Input file: packet-ranap-template.c */
 
+#line 1 "packet-ranap-template.c"
 /* packet-ranap-template.c
  * Routines for Radio Access Network Application Part Protocol dissection
  * Copyright 2005, Anders Broman <anders.broman@ericsson.com>
@@ -72,7 +73,7 @@ static int hf_ranap_IE_length = -1;
 
 
 /*--- Included file: packet-ranap-hf.c ---*/
-
+#line 1 "packet-ranap-hf.c"
 static int hf_ranap_initiatingMessage = -1;       /* InitiatingMessage */
 static int hf_ranap_successfulOutcome = -1;       /* SuccessfulOutcome */
 static int hf_ranap_unsuccessfulOutcome = -1;     /* UnsuccessfulOutcome */
@@ -590,13 +591,13 @@ static int hf_ranap_private_id = -1;              /* PrivateIE_ID */
 static int hf_ranap_private_value = -1;           /* RANAP_PRIVATE_IES_Value */
 
 /*--- End of included file: packet-ranap-hf.c ---*/
-
+#line 67 "packet-ranap-template.c"
 
 /* Initialize the subtree pointers */
 static int ett_ranap;
 
 /*--- Included file: packet-ranap-ett.c ---*/
-
+#line 1 "packet-ranap-ett.c"
 static gint ett_ranap_RANAP_PDU = -1;
 static gint ett_ranap_InitiatingMessage = -1;
 static gint ett_ranap_SuccessfulOutcome = -1;
@@ -856,7 +857,7 @@ static gint ett_ranap_PrivateIE_Container = -1;
 static gint ett_ranap_PrivateIE_Field = -1;
 
 /*--- End of included file: packet-ranap-ett.c ---*/
-
+#line 71 "packet-ranap-template.c"
 
 
 /* Global variables */
@@ -871,7 +872,7 @@ static int dissect_ranap_SecondValue_ies(tvbuff_t *tvb, int offset, packet_info
 static int dissect_ranap_messages(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree);
 
 /*--- Included file: packet-ranap-fn.c ---*/
-
+#line 1 "packet-ranap-fn.c"
 /*--- Fields for imported types ---*/
 
 
@@ -928,10 +929,12 @@ dissect_ranap_ProcedureCode(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, p
   offset = dissect_per_constrained_integer(tvb, offset, pinfo, tree, hf_index,
                                               0U, 255U, &ProcedureCode, NULL, FALSE);
 
+#line 32 "ranap.cnf"
 	if (check_col(pinfo->cinfo, COL_INFO))
        col_add_fstr(pinfo->cinfo, COL_INFO, "%s ",
                    val_to_str(ProcedureCode, ranap_ProcedureCode_vals,
                               "unknown message"));
+
   return offset;
 }
 static int dissect_procedureCode(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -974,10 +977,12 @@ static int dissect_secondCriticality(tvbuff_t *tvb, int offset, packet_info *pin
 
 static int
 dissect_ranap_Value(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+#line 41 "ranap.cnf"
 	
 	offset = dissect_ranap_messages(tvb, offset, pinfo, tree);
 
 
+
   return offset;
 }
 static int dissect_value(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -1264,10 +1269,12 @@ static int dissect_id(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
 
 static int
 dissect_ranap_RANAP_PROTOCOL_IES_Value(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+#line 45 "ranap.cnf"
 
 	offset = dissect_ranap_ies(tvb, offset, pinfo, tree);
 
 
+
   return offset;
 }
 static int dissect_ie_field_value(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -1339,10 +1346,12 @@ static int dissect_ext_id(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t
 
 static int
 dissect_ranap_Extension(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+#line 68 "ranap.cnf"
 
 	offset = dissect_ranap_ies(tvb, offset, pinfo, tree);
 
 
+
   return offset;
 }
 static int dissect_extensionValue(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -1895,9 +1904,11 @@ static int dissect_private_id(tvbuff_t *tvb, int offset, packet_info *pinfo, pro
 
 static int
 dissect_ranap_RANAP_PRIVATE_IES_Value(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+#line 72 "ranap.cnf"
 /* FIX ME */
 
 
+
   return offset;
 }
 static int dissect_private_value(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -4204,7 +4215,7 @@ static int dissect_chosenIntegrityProtectionAlgorithm(tvbuff_t *tvb, int offset,
 static int
 dissect_ranap_ClassmarkInformation2(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
   offset = dissect_per_octet_string(tvb, offset, pinfo, tree, hf_index,
-                                       -1, -1, NULL);
+                                       NO_BOUND, NO_BOUND, NULL);
 
   return offset;
 }
@@ -4217,7 +4228,7 @@ static int dissect_id_ClassmarkInformation2(tvbuff_t *tvb, int offset, packet_in
 static int
 dissect_ranap_ClassmarkInformation3(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
   offset = dissect_per_octet_string(tvb, offset, pinfo, tree, hf_index,
-                                       -1, -1, NULL);
+                                       NO_BOUND, NO_BOUND, NULL);
 
   return offset;
 }
@@ -4548,17 +4559,19 @@ static int dissect_id_DRX_CycleLengthCoefficient(tvbuff_t *tvb, int offset, pack
 
 static int
 dissect_ranap_NAS_PDU(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+#line 53 "ranap.cnf"
 
 tvbuff_t *nas_pdu_tvb=NULL;
 
   offset = dissect_per_octet_string(tvb, offset, pinfo, tree, hf_index,
-                                       -1, -1, &nas_pdu_tvb);
+                                       NO_BOUND, NO_BOUND, &nas_pdu_tvb);
 
 
 	if (nas_pdu_tvb)
 		dissector_try_port(nas_pdu_dissector_table, 0x1, nas_pdu_tvb, pinfo, top_tree);
 
 
+
   return offset;
 }
 static int dissect_id_NAS_PDU(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -4739,7 +4752,7 @@ static int dissect_id_FrequenceLayerConvergenceFlag(tvbuff_t *tvb, int offset, p
 static int
 dissect_ranap_GERAN_BSC_Container(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
   offset = dissect_per_octet_string(tvb, offset, pinfo, tree, hf_index,
-                                       -1, -1, NULL);
+                                       NO_BOUND, NO_BOUND, NULL);
 
   return offset;
 }
@@ -4752,7 +4765,7 @@ static int dissect_id_GERAN_BSC_Container(tvbuff_t *tvb, int offset, packet_info
 static int
 dissect_ranap_GERAN_Classmark(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
   offset = dissect_per_octet_string(tvb, offset, pinfo, tree, hf_index,
-                                       -1, -1, NULL);
+                                       NO_BOUND, NO_BOUND, NULL);
 
   return offset;
 }
@@ -5445,7 +5458,7 @@ static int dissect_id_IntegrityProtectionInformation(tvbuff_t *tvb, int offset,
 static int
 dissect_ranap_RIMInformation(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
   offset = dissect_per_octet_string(tvb, offset, pinfo, tree, hf_index,
-                                       -1, -1, NULL);
+                                       NO_BOUND, NO_BOUND, NULL);
 
   return offset;
 }
@@ -5817,7 +5830,7 @@ static int dissect_id_KeyStatus(tvbuff_t *tvb, int offset, packet_info *pinfo, p
 static int
 dissect_ranap_L3_Information(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
   offset = dissect_per_octet_string(tvb, offset, pinfo, tree, hf_index,
-                                       -1, -1, NULL);
+                                       NO_BOUND, NO_BOUND, NULL);
 
   return offset;
 }
@@ -6305,7 +6318,7 @@ static int dissect_id_NAS_SequenceNumber(tvbuff_t *tvb, int offset, packet_info
 static int
 dissect_ranap_NewBSS_To_OldBSS_Information(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
   offset = dissect_per_octet_string(tvb, offset, pinfo, tree, hf_index,
-                                       -1, -1, NULL);
+                                       NO_BOUND, NO_BOUND, NULL);
 
   return offset;
 }
@@ -6363,7 +6376,7 @@ static int dissect_id_OMC_ID(tvbuff_t *tvb, int offset, packet_info *pinfo, prot
 static int
 dissect_ranap_OldBSS_ToNewBSS_Information(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
   offset = dissect_per_octet_string(tvb, offset, pinfo, tree, hf_index,
-                                       -1, -1, NULL);
+                                       NO_BOUND, NO_BOUND, NULL);
 
   return offset;
 }
@@ -6547,7 +6560,7 @@ static int dissect_id_PositionData(tvbuff_t *tvb, int offset, packet_info *pinfo
 static int
 dissect_ranap_PositionDataSpecificToGERANIuMode(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
   offset = dissect_per_octet_string(tvb, offset, pinfo, tree, hf_index,
-                                       -1, -1, NULL);
+                                       NO_BOUND, NO_BOUND, NULL);
 
   return offset;
 }
@@ -8170,9 +8183,11 @@ static int dissect_id_RAB_SetupOrModifiedList(tvbuff_t *tvb, int offset, packet_
 
 static int
 dissect_ranap_FirstValue(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+#line 65 "ranap.cnf"
 	offset = dissect_ranap_FirstValue_ies(tvb, offset, pinfo, tree);
 
 
+
   return offset;
 }
 static int dissect_firstValue(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -8183,9 +8198,11 @@ static int dissect_firstValue(tvbuff_t *tvb, int offset, packet_info *pinfo, pro
 
 static int
 dissect_ranap_SecondValue(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+#line 62 "ranap.cnf"
 	offset = dissect_ranap_SecondValue_ies(tvb, offset, pinfo, tree);
 
 
+
   return offset;
 }
 static int dissect_secondValue(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@@ -8632,7 +8649,7 @@ static int dissect_id_SourceID(tvbuff_t *tvb, int offset, packet_info *pinfo, pr
 static int
 dissect_ranap_RRC_Container(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
   offset = dissect_per_octet_string(tvb, offset, pinfo, tree, hf_index,
-                                       -1, -1, NULL);
+                                       NO_BOUND, NO_BOUND, NULL);
 
   return offset;
 }
@@ -9717,7 +9734,7 @@ dissect_ranap_ProtocolIE_ContainerPairList(tvbuff_t *tvb, int offset, packet_inf
 
 
 /*--- End of included file: packet-ranap-fn.c ---*/
-
+#line 84 "packet-ranap-template.c"
 
 
 
@@ -10782,7 +10799,7 @@ void proto_register_ranap(void) {
 
 
 /*--- Included file: packet-ranap-hfarr.c ---*/
-
+#line 1 "packet-ranap-hfarr.c"
     { &hf_ranap_initiatingMessage,
       { "initiatingMessage", "ranap.initiatingMessage",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -12169,7 +12186,7 @@ void proto_register_ranap(void) {
         "GeographicalCoordinates/latitude", HFILL }},
     { &hf_ranap_longitude,
       { "longitude", "ranap.longitude",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, NULL, 0,
         "GeographicalCoordinates/longitude", HFILL }},
     { &hf_ranap_directionOfAltitude,
       { "directionOfAltitude", "ranap.directionOfAltitude",
@@ -12761,7 +12778,7 @@ void proto_register_ranap(void) {
         "PrivateIE-ID/local", HFILL }},
     { &hf_ranap_global,
       { "global", "ranap.global",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "PrivateIE-ID/global", HFILL }},
     { &hf_ranap_ProtocolIE_Container_item,
       { "Item", "ranap.ProtocolIE_Container_item",
@@ -12845,7 +12862,7 @@ void proto_register_ranap(void) {
         "PrivateIE-Field/value", HFILL }},
 
 /*--- End of included file: packet-ranap-hfarr.c ---*/
-
+#line 1147 "packet-ranap-template.c"
   };
 
   /* List of subtrees */
@@ -12853,7 +12870,7 @@ void proto_register_ranap(void) {
 	  &ett_ranap,
 
 /*--- Included file: packet-ranap-ettarr.c ---*/
-
+#line 1 "packet-ranap-ettarr.c"
     &ett_ranap_RANAP_PDU,
     &ett_ranap_InitiatingMessage,
     &ett_ranap_SuccessfulOutcome,
@@ -13113,7 +13130,7 @@ void proto_register_ranap(void) {
     &ett_ranap_PrivateIE_Field,
 
 /*--- End of included file: packet-ranap-ettarr.c ---*/
-
+#line 1153 "packet-ranap-template.c"
   };
 
   /* Register protocol */
diff --git a/epan/dissectors/packet-ranap.h b/epan/dissectors/packet-ranap.h
index a9c3ddc247..ef60591bcf 100644
--- a/epan/dissectors/packet-ranap.h
+++ b/epan/dissectors/packet-ranap.h
@@ -1,10 +1,11 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-ranap.h                                                           */
+/* ./packet-ranap.h                                                           */
 /* ../../tools/asn2eth.py -X -e -p ranap -c ranap.cnf -s packet-ranap-template ranap.asn */
 
 /* Input file: packet-ranap-template.h */
 
+#line 1 "packet-ranap-template.h"
 /* packet-ranap-template.h
  * Routines for GSM Supplementary Services dissection
  * Copyright 2005, Anders Broman <anders.broman@ericsson.com>
diff --git a/epan/dissectors/packet-ros.c b/epan/dissectors/packet-ros.c
index 68b7cd1286..69eb36b463 100644
--- a/epan/dissectors/packet-ros.c
+++ b/epan/dissectors/packet-ros.c
@@ -1,10 +1,11 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-ros.c                                                             */
+/* ./packet-ros.c                                                             */
 /* ../../tools/asn2eth.py -X -b -e -p ros -c ros.cnf -s packet-ros-template ros.asn */
 
 /* Input file: packet-ros-template.c */
 
+#line 1 "packet-ros-template.c"
 /* packet-ros_asn1.c
  * Routines for ROS packet dissection
  * Graeme Lunt 2005
@@ -61,7 +62,7 @@ static  dissector_handle_t ros_handle = NULL;
 
 
 /*--- Included file: packet-ros-hf.c ---*/
-
+#line 1 "packet-ros-hf.c"
 static int hf_ros_invoke = -1;                    /* Invoke */
 static int hf_ros_returnResult = -1;              /* ReturnResult */
 static int hf_ros_returnError = -1;               /* ReturnError */
@@ -91,13 +92,13 @@ static int hf_ros_local = -1;                     /* INTEGER */
 static int hf_ros_global = -1;                    /* OBJECT_IDENTIFIER */
 
 /*--- End of included file: packet-ros-hf.c ---*/
-
+#line 56 "packet-ros-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_ros = -1;
 
 /*--- Included file: packet-ros-ett.c ---*/
-
+#line 1 "packet-ros-ett.c"
 static gint ett_ros_ROS = -1;
 static gint ett_ros_Invoke = -1;
 static gint ett_ros_ReturnResult = -1;
@@ -109,7 +110,7 @@ static gint ett_ros_InvokeId = -1;
 static gint ett_ros_Code = -1;
 
 /*--- End of included file: packet-ros-ett.c ---*/
-
+#line 60 "packet-ros-template.c"
 
 static dissector_table_t ros_oid_dissector_table=NULL;
 static GHashTable *oid_table=NULL;
@@ -154,7 +155,7 @@ call_ros_oid_callback(const char *oid, tvbuff_t *tvb, int offset, packet_info *p
 
 
 /*--- Included file: packet-ros-fn.c ---*/
-
+#line 1 "packet-ros-fn.c"
 /*--- Fields for imported types ---*/
 
 
@@ -218,11 +219,13 @@ static int dissect_invokeId(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
 
 static int
 dissect_ros_OperationCode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 15 "ros.cnf"
 
   offset = dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_index,
                                   &opcode);
 
 
+
   return offset;
 }
 static int dissect_opcode(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -233,6 +236,7 @@ static int dissect_opcode(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
 
 static int
 dissect_ros_T_argument(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 31 "ros.cnf"
   char *oid;
   /* not sure what the length should be - -1 for now */
   proto_tree_add_text(tree, tvb, offset,-1, "invoke argument");
@@ -246,6 +250,7 @@ dissect_ros_T_argument(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pac
   }
 
 
+
   return offset;
 }
 static int dissect_argument(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -276,6 +281,7 @@ static int dissect_invoke_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
 
 static int
 dissect_ros_OperationResult(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 44 "ros.cnf"
   char *oid;
   /* not sure what the length should be - -1 for now */
   proto_tree_add_text(tree, tvb, offset,-1, "return result");
@@ -289,6 +295,7 @@ dissect_ros_OperationResult(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset
   }
 
 
+
   return offset;
 }
 static int dissect_operationResult(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -335,11 +342,13 @@ static int dissect_returnResult_impl(packet_info *pinfo, proto_tree *tree, tvbuf
 
 static int
 dissect_ros_ErrorCode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 20 "ros.cnf"
 
   offset = dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_index,
                                   &opcode);
 
 
+
   return offset;
 }
 static int dissect_errcode(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -350,6 +359,7 @@ static int dissect_errcode(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
 
 static int
 dissect_ros_T_parameter(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 57 "ros.cnf"
   char *oid;
   /* not sure what the length should be - -1 for now */
   proto_tree_add_text(tree, tvb, offset,-1, "return result");
@@ -364,6 +374,7 @@ dissect_ros_T_parameter(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pa
 
 
 
+
   return offset;
 }
 static int dissect_parameter(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -527,6 +538,7 @@ static int dissect_reject_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
 
 static int
 dissect_ros_T_bind_invoke(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 71 "ros.cnf"
   char *oid;
   /* not sure what the length should be - -1 for now */
   proto_tree_add_text(tree, tvb, offset,-1, "bind-invoke");
@@ -538,6 +550,7 @@ dissect_ros_T_bind_invoke(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset,
   }
 
 
+
   return offset;
 }
 static int dissect_bind_invoke_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -548,6 +561,7 @@ static int dissect_bind_invoke_impl(packet_info *pinfo, proto_tree *tree, tvbuff
 
 static int
 dissect_ros_T_bind_result(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 82 "ros.cnf"
   char *oid;
   /* not sure what the length should be - -1 for now */
   proto_tree_add_text(tree, tvb, offset,-1, "bind-result");
@@ -559,6 +573,7 @@ dissect_ros_T_bind_result(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset,
   }
 
 
+
   return offset;
 }
 static int dissect_bind_result_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -569,6 +584,7 @@ static int dissect_bind_result_impl(packet_info *pinfo, proto_tree *tree, tvbuff
 
 static int
 dissect_ros_T_bind_error(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 93 "ros.cnf"
   char *oid;
   /* not sure what the length should be - -1 for now */
   proto_tree_add_text(tree, tvb, offset,-1, "bind-error");
@@ -581,6 +597,7 @@ dissect_ros_T_bind_error(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, p
 
 
 
+
   return offset;
 }
 static int dissect_bind_error_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -591,6 +608,7 @@ static int dissect_bind_error_impl(packet_info *pinfo, proto_tree *tree, tvbuff_
 
 static int
 dissect_ros_T_unbind_invoke(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 105 "ros.cnf"
   char *oid;
   /* not sure what the length should be - -1 for now */
   proto_tree_add_text(tree, tvb, offset,-1, "unbind-invoke");
@@ -603,6 +621,7 @@ dissect_ros_T_unbind_invoke(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset
 
 
 
+
   return offset;
 }
 static int dissect_unbind_invoke_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -613,6 +632,7 @@ static int dissect_unbind_invoke_impl(packet_info *pinfo, proto_tree *tree, tvbu
 
 static int
 dissect_ros_T_unbind_result(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 117 "ros.cnf"
   char *oid;
   /* not sure what the length should be - -1 for now */
   proto_tree_add_text(tree, tvb, offset,-1, "unbind-result");
@@ -624,6 +644,7 @@ dissect_ros_T_unbind_result(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset
   }
 
 
+
   return offset;
 }
 static int dissect_unbind_result_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -634,6 +655,7 @@ static int dissect_unbind_result_impl(packet_info *pinfo, proto_tree *tree, tvbu
 
 static int
 dissect_ros_T_unbind_error(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 128 "ros.cnf"
   char *oid;
   /* not sure what the length should be - -1 for now */
   proto_tree_add_text(tree, tvb, offset,-1, "unbind-error");
@@ -644,6 +666,7 @@ dissect_ros_T_unbind_error(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset,
     offset = call_ros_oid_callback(oid, tvb, offset, pinfo, top_tree);
   }
 
+
   return offset;
 }
 static int dissect_unbind_error_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -767,7 +790,7 @@ dissect_ros_Priority(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packe
 
 
 /*--- End of included file: packet-ros-fn.c ---*/
-
+#line 103 "packet-ros-template.c"
 
 
 /*
@@ -825,7 +848,7 @@ void proto_register_ros(void) {
   {
 
 /*--- Included file: packet-ros-hfarr.c ---*/
-
+#line 1 "packet-ros-hfarr.c"
     { &hf_ros_invoke,
       { "invoke", "ros.invoke",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -932,11 +955,11 @@ void proto_register_ros(void) {
         "Code/local", HFILL }},
     { &hf_ros_global,
       { "global", "ros.global",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "Code/global", HFILL }},
 
 /*--- End of included file: packet-ros-hfarr.c ---*/
-
+#line 159 "packet-ros-template.c"
   };
 
   /* List of subtrees */
@@ -945,7 +968,7 @@ void proto_register_ros(void) {
     &ett_ros_unknown,
 
 /*--- Included file: packet-ros-ettarr.c ---*/
-
+#line 1 "packet-ros-ettarr.c"
     &ett_ros_ROS,
     &ett_ros_Invoke,
     &ett_ros_ReturnResult,
@@ -957,7 +980,7 @@ void proto_register_ros(void) {
     &ett_ros_Code,
 
 /*--- End of included file: packet-ros-ettarr.c ---*/
-
+#line 166 "packet-ros-template.c"
   };
 
   /* Register protocol */
diff --git a/epan/dissectors/packet-ros.h b/epan/dissectors/packet-ros.h
index adb24e9702..1e725b9e49 100644
--- a/epan/dissectors/packet-ros.h
+++ b/epan/dissectors/packet-ros.h
@@ -1,10 +1,11 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-ros.h                                                             */
+/* ./packet-ros.h                                                             */
 /* ../../tools/asn2eth.py -X -b -e -p ros -c ros.cnf -s packet-ros-template ros.asn */
 
 /* Input file: packet-ros-template.h */
 
+#line 1 "packet-ros-template.h"
 /* packet-ros.h
  * Routines for ROS packet dissection
  * Graeme Lunt 2005
@@ -35,14 +36,14 @@
 
 
 /*--- Included file: packet-ros-exp.h ---*/
-
+#line 1 "packet-ros-exp.h"
 extern const value_string ros_InvokeId_vals[];
 extern const value_string ros_Code_vals[];
 int dissect_ros_InvokeId(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
 int dissect_ros_Code(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
 
 /*--- End of included file: packet-ros-exp.h ---*/
-
+#line 30 "packet-ros-template.h"
 
 # include "packet-ses.h"
 
diff --git a/epan/dissectors/packet-rtse.c b/epan/dissectors/packet-rtse.c
index bd976a3a19..3ccdc6d5d9 100644
--- a/epan/dissectors/packet-rtse.c
+++ b/epan/dissectors/packet-rtse.c
@@ -1,10 +1,11 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-rtse.c                                                            */
+/* ./packet-rtse.c                                                            */
 /* ../../tools/asn2eth.py -X -b -e -p rtse -c rtse.cnf -s packet-rtse-template rtse.asn */
 
 /* Input file: packet-rtse-template.c */
 
+#line 1 "packet-rtse-template.c"
 /* packet-rtse_asn1.c
  * Routines for RTSE packet dissection
  * Graeme Lunt 2005
@@ -70,7 +71,7 @@ static  dissector_handle_t ros_handle = NULL;
 
 
 /*--- Included file: packet-rtse-hf.c ---*/
-
+#line 1 "packet-rtse-hf.c"
 static int hf_rtse_rtorq_apdu = -1;               /* RTORQapdu */
 static int hf_rtse_rtoac_apdu = -1;               /* RTOACapdu */
 static int hf_rtse_rtorj_apdu = -1;               /* RTORJapdu */
@@ -104,13 +105,13 @@ static int hf_rtse_octet_aligned = -1;            /* OCTET_STRING */
 static int hf_rtse_arbitrary = -1;                /* BIT_STRING */
 
 /*--- End of included file: packet-rtse-hf.c ---*/
-
+#line 65 "packet-rtse-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_rtse = -1;
 
 /*--- Included file: packet-rtse-ett.c ---*/
-
+#line 1 "packet-rtse-ett.c"
 static gint ett_rtse_RTSE_apdus = -1;
 static gint ett_rtse_RTORQapdu = -1;
 static gint ett_rtse_RTOACapdu = -1;
@@ -123,7 +124,7 @@ static gint ett_rtse_EXTERNAL = -1;
 static gint ett_rtse_T_encoding = -1;
 
 /*--- End of included file: packet-rtse-ett.c ---*/
-
+#line 69 "packet-rtse-template.c"
 
 
 static dissector_table_t rtse_oid_dissector_table=NULL;
@@ -181,7 +182,7 @@ call_rtse_oid_callback(const char *oid, tvbuff_t *tvb, int offset, packet_info *
 
 
 /*--- Included file: packet-rtse-fn.c ---*/
-
+#line 1 "packet-rtse-fn.c"
 /*--- Fields for imported types ---*/
 
 
@@ -224,6 +225,7 @@ static int dissect_dialogueMode_impl(packet_info *pinfo, proto_tree *tree, tvbuf
 
 static int
 dissect_rtse_T_open(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 53 "rtse.cnf"
 
 	char *oid = NULL;
 
@@ -251,6 +253,7 @@ dissect_rtse_T_open(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet
 	/* else XXX: need to flag we can't find the presentation context */
 
 
+
   return offset;
 }
 static int dissect_open(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -261,6 +264,7 @@ static int dissect_open(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int
 
 static int
 dissect_rtse_T61String(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 143 "rtse.cnf"
   tvbuff_t *string = NULL;
     offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_TeletexString,
                                             pinfo, tree, tvb, offset, hf_index,
@@ -270,6 +274,7 @@ dissect_rtse_T61String(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pac
     col_append_fstr(pinfo->cinfo, COL_INFO, " %s", tvb_format_text(string, 0, tvb_length(string)));
 
 
+
   return offset;
 }
 static int dissect_t61String(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -280,6 +285,7 @@ static int dissect_t61String(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
 
 static int
 dissect_rtse_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 159 "rtse.cnf"
   tvbuff_t *string = NULL;
     offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index,
                                        &string);
@@ -288,6 +294,7 @@ dissect_rtse_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset,
     col_append_fstr(pinfo->cinfo, COL_INFO, " %s", tvb_format_text(string, 0, tvb_length(string)));
 
 
+
   return offset;
 }
 static int dissect_octetString(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -326,6 +333,7 @@ static int dissect_callingSSuserReference(packet_info *pinfo, proto_tree *tree,
 
 static int
 dissect_rtse_CommonReference(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 151 "rtse.cnf"
   tvbuff_t *string = NULL;
     offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_UTCTime,
                                             pinfo, tree, tvb, offset, hf_index,
@@ -335,6 +343,7 @@ dissect_rtse_CommonReference(gboolean implicit_tag _U_, tvbuff_t *tvb, int offse
     col_append_fstr(pinfo->cinfo, COL_INFO, " %s", tvb_format_text(string, 0, tvb_length(string)));
 
 
+
   return offset;
 }
 static int dissect_commonReference(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -365,6 +374,7 @@ static const ber_sequence_t SessionConnectionIdentifier_sequence[] = {
 
 static int
 dissect_rtse_SessionConnectionIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 136 "rtse.cnf"
   if(open_request && check_col(pinfo->cinfo, COL_INFO))
     col_append_fstr(pinfo->cinfo, COL_INFO, "Recover");
     offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
@@ -372,6 +382,7 @@ dissect_rtse_SessionConnectionIdentifier(gboolean implicit_tag _U_, tvbuff_t *tv
 
 
 
+
   return offset;
 }
 static int dissect_recover_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -416,10 +427,12 @@ static const value_string rtse_T_applicationProtocol_vals[] = {
 
 static int
 dissect_rtse_T_applicationProtocol(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 132 "rtse.cnf"
 
   offset = dissect_ber_integer(TRUE, pinfo, tree, tvb, offset, hf_index, &app_proto);
 
 
+
   return offset;
 }
 static int dissect_applicationProtocol_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -438,6 +451,7 @@ static const ber_sequence_t RTORQapdu_set[] = {
 
 int
 dissect_rtse_RTORQapdu(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 38 "rtse.cnf"
 
   if((session = (struct SESSION_DATA_STRUCTURE*)(pinfo->private_data)) != NULL)
 	session->ros_op = (ROS_OP_BIND | ROS_OP_ARGUMENT);
@@ -448,6 +462,7 @@ dissect_rtse_RTORQapdu(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pac
   open_request=FALSE;
 
 
+
   return offset;
 }
 static int dissect_rtorq_apdu_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -464,6 +479,7 @@ static const ber_sequence_t RTOACapdu_set[] = {
 
 int
 dissect_rtse_RTOACapdu(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 46 "rtse.cnf"
 
   if((session = (struct SESSION_DATA_STRUCTURE*)(pinfo->private_data)) != NULL)
 	session->ros_op = (ROS_OP_BIND | ROS_OP_RESULT);
@@ -473,6 +489,7 @@ dissect_rtse_RTOACapdu(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pac
 
 
 
+
   return offset;
 }
 static int dissect_rtoac_apdu_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -504,6 +521,7 @@ static int dissect_refuseReason_impl(packet_info *pinfo, proto_tree *tree, tvbuf
 
 static int
 dissect_rtse_T_userDataRJ(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 9 "rtse.cnf"
 	char *oid = NULL;
 
 	switch(app_proto)  {
@@ -530,6 +548,7 @@ dissect_rtse_T_userDataRJ(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset,
 	}
 
 
+
   return offset;
 }
 static int dissect_userDataRJ(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -571,6 +590,7 @@ static int dissect_rttp_apdu(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
 
 static int
 dissect_rtse_RTTRapdu(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 80 "rtse.cnf"
 	tvbuff_t *next_tvb = NULL;
 
 	offset = dissect_ber_octet_string(FALSE, pinfo, tree, tvb, offset, hf_index, &next_tvb);
@@ -588,6 +608,7 @@ dissect_rtse_RTTRapdu(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pack
 	}
 
 
+
   return offset;
 }
 static int dissect_rttr_apdu(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -640,9 +661,11 @@ static int dissect_arbitrary_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t
 
 static int
 dissect_rtse_T_userdataAB(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 35 "rtse.cnf"
 /*XXX not implemented yet */
 
 
+
   return offset;
 }
 static int dissect_userdataAB(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -714,6 +737,7 @@ static int dissect_direct_reference(packet_info *pinfo, proto_tree *tree, tvbuff
 
 static int
 dissect_rtse_T_indirect_reference(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 115 "rtse.cnf"
   char *oid;
 
   offset = dissect_ber_integer(FALSE, pinfo, tree, tvb, offset,
@@ -727,6 +751,7 @@ dissect_rtse_T_indirect_reference(gboolean implicit_tag _U_, tvbuff_t *tvb, int
 	
 
 
+
   return offset;
 }
 static int dissect_indirect_reference(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -751,10 +776,12 @@ static int dissect_data_value_descriptor(packet_info *pinfo, proto_tree *tree, t
 
 static int
 dissect_rtse_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 128 "rtse.cnf"
   offset=call_rtse_oid_callback(object_identifier_id, tvb, offset, pinfo, top_tree);
 
 
 
+
   return offset;
 }
 static int dissect_single_ASN1_type(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -799,6 +826,7 @@ static const ber_sequence_t EXTERNAL_sequence[] = {
 
 int
 dissect_rtse_EXTERNAL(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 97 "rtse.cnf"
   gint8 class;
   gboolean pc, ind_field;
   gint32 tag;
@@ -817,12 +845,13 @@ dissect_rtse_EXTERNAL(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pack
                                 EXTERNAL_sequence, hf_index, ett_rtse_EXTERNAL);
 
 
+
   return offset;
 }
 
 
 /*--- End of included file: packet-rtse-fn.c ---*/
-
+#line 125 "packet-rtse-template.c"
 
 /*
 * Dissect RTSE PDUs inside a PPDU.
@@ -881,7 +910,7 @@ void proto_register_rtse(void) {
   {
 
 /*--- Included file: packet-rtse-hfarr.c ---*/
-
+#line 1 "packet-rtse-hfarr.c"
     { &hf_rtse_rtorq_apdu,
       { "rtorq-apdu", "rtse.rtorq_apdu",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -980,7 +1009,7 @@ void proto_register_rtse(void) {
         "CallingSSuserReference/octetString", HFILL }},
     { &hf_rtse_direct_reference,
       { "direct-reference", "rtse.direct_reference",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "EXTERNAL/direct-reference", HFILL }},
     { &hf_rtse_indirect_reference,
       { "indirect-reference", "rtse.indirect_reference",
@@ -1008,7 +1037,7 @@ void proto_register_rtse(void) {
         "EXTERNAL/encoding/arbitrary", HFILL }},
 
 /*--- End of included file: packet-rtse-hfarr.c ---*/
-
+#line 182 "packet-rtse-template.c"
   };
 
   /* List of subtrees */
@@ -1017,7 +1046,7 @@ void proto_register_rtse(void) {
     &ett_rtse_unknown,
 
 /*--- Included file: packet-rtse-ettarr.c ---*/
-
+#line 1 "packet-rtse-ettarr.c"
     &ett_rtse_RTSE_apdus,
     &ett_rtse_RTORQapdu,
     &ett_rtse_RTOACapdu,
@@ -1030,7 +1059,7 @@ void proto_register_rtse(void) {
     &ett_rtse_T_encoding,
 
 /*--- End of included file: packet-rtse-ettarr.c ---*/
-
+#line 189 "packet-rtse-template.c"
   };
 
   /* Register protocol */
diff --git a/epan/dissectors/packet-rtse.h b/epan/dissectors/packet-rtse.h
index 32e25ebb39..721cb0eff2 100644
--- a/epan/dissectors/packet-rtse.h
+++ b/epan/dissectors/packet-rtse.h
@@ -1,10 +1,11 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-rtse.h                                                            */
+/* ./packet-rtse.h                                                            */
 /* ../../tools/asn2eth.py -X -b -e -p rtse -c rtse.cnf -s packet-rtse-template rtse.asn */
 
 /* Input file: packet-rtse-template.h */
 
+#line 1 "packet-rtse-template.h"
 /* packet-rtse.h
  * Routines for RTSE packet dissection
  * Graeme Lunt 2005
@@ -35,7 +36,7 @@
 
 
 /*--- Included file: packet-rtse-exp.h ---*/
-
+#line 1 "packet-rtse-exp.h"
 int dissect_rtse_RTORQapdu(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
 int dissect_rtse_RTOACapdu(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
 int dissect_rtse_RTORJapdu(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
@@ -43,7 +44,7 @@ int dissect_rtse_RTABapdu(gboolean implicit_tag, tvbuff_t *tvb, int offset, pack
 int dissect_rtse_EXTERNAL(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
 
 /*--- End of included file: packet-rtse-exp.h ---*/
-
+#line 30 "packet-rtse-template.h"
 
 void register_rtse_oid_dissector_handle(const char *oid, dissector_handle_t dissector, int proto _U_, const char *name, gboolean uses_ros);
 
diff --git a/epan/dissectors/packet-s4406.c b/epan/dissectors/packet-s4406.c
index c205ccae4c..3db687e7a1 100644
--- a/epan/dissectors/packet-s4406.c
+++ b/epan/dissectors/packet-s4406.c
@@ -1,10 +1,11 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-s4406.c                                                           */
+/* ./packet-s4406.c                                                           */
 /* ../../tools/asn2eth.py -X -b -e -p s4406 -c s4406.cnf -s packet-s4406-template s4406.asn */
 
 /* Input file: packet-s4406-template.c */
 
+#line 1 "packet-s4406-template.c"
 /* packet-s4406.c
  * Routines for STANAG 4406 (X.400 Military Message Extensions)  packet dissection
  * Graeme Lunt 2005
@@ -58,7 +59,7 @@ int proto_s4406 = -1;
 
 
 /*--- Included file: packet-s4406-hf.c ---*/
-
+#line 1 "packet-s4406-hf.c"
 static int hf_s4406_ExemptedAddress_PDU = -1;     /* ExemptedAddress */
 static int hf_s4406_ExtendedAuthorisationInfo_PDU = -1;  /* ExtendedAuthorisationInfo */
 static int hf_s4406_DistributionCodes_PDU = -1;   /* DistributionCodes */
@@ -106,13 +107,13 @@ static int hf_s4406_body_part_security_label = -1;  /* SecurityLabel */
 static int hf_s4406_body_part_sequence_number = -1;  /* BodyPartSequenceNumber */
 
 /*--- End of included file: packet-s4406-hf.c ---*/
-
+#line 53 "packet-s4406-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_s4406 = -1;
 
 /*--- Included file: packet-s4406-ett.c ---*/
-
+#line 1 "packet-s4406-ett.c"
 static gint ett_s4406_DistributionCodes = -1;
 static gint ett_s4406_SEQUENCE_OF_Sic = -1;
 static gint ett_s4406_SEQUENCE_OF_DistributionExtensionField = -1;
@@ -130,11 +131,11 @@ static gint ett_s4406_SEQUENCE_OF_BodyPartSecurityLabel = -1;
 static gint ett_s4406_BodyPartSecurityLabel = -1;
 
 /*--- End of included file: packet-s4406-ett.c ---*/
-
+#line 57 "packet-s4406-template.c"
 
 
 /*--- Included file: packet-s4406-fn.c ---*/
-
+#line 1 "packet-s4406-fn.c"
 /*--- Fields for imported types ---*/
 
 static int dissect_listName_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -222,9 +223,11 @@ static int dissect_dist_type(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
 
 static int
 dissect_s4406_T_dist_value(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 56 "s4406.cnf"
 /* XXX: not implemented */
 
 
+
   return offset;
 }
 static int dissect_dist_value(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -365,6 +368,7 @@ static const value_string s4406_PrimaryPrecedence_vals[] = {
 
 static int
 dissect_s4406_PrimaryPrecedence(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 61 "s4406.cnf"
   int precedence = -1;
     offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
                                   &precedence);
@@ -373,6 +377,7 @@ dissect_s4406_PrimaryPrecedence(gboolean implicit_tag _U_, tvbuff_t *tvb, int of
    col_append_fstr(pinfo->cinfo, COL_INFO, " (primary=%s)", val_to_str(precedence, s4406_PrimaryPrecedence_vals, "precedence(%d)"));
 
 
+
   return offset;
 }
 
@@ -393,6 +398,7 @@ static const value_string s4406_CopyPrecedence_vals[] = {
 
 static int
 dissect_s4406_CopyPrecedence(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 69 "s4406.cnf"
   int precedence = -1;
     offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
                                   &precedence);
@@ -400,6 +406,7 @@ dissect_s4406_CopyPrecedence(gboolean implicit_tag _U_, tvbuff_t *tvb, int offse
   if((precedence != -1) && check_col(pinfo->cinfo, COL_INFO))
    col_append_fstr(pinfo->cinfo, COL_INFO, " (copy=%s)", val_to_str(precedence, s4406_CopyPrecedence_vals, "precedence(%d)"));
 
+
   return offset;
 }
 
@@ -772,7 +779,7 @@ static void dissect_PriorityLevelQualifier_PDU(tvbuff_t *tvb, packet_info *pinfo
 
 
 /*--- End of included file: packet-s4406-fn.c ---*/
-
+#line 59 "packet-s4406-template.c"
 
 
 /*
@@ -808,7 +815,7 @@ void proto_register_s4406(void) {
   {
 
 /*--- Included file: packet-s4406-hfarr.c ---*/
-
+#line 1 "packet-s4406-hfarr.c"
     { &hf_s4406_ExemptedAddress_PDU,
       { "ExemptedAddress", "s4406.ExemptedAddress",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -895,7 +902,7 @@ void proto_register_s4406(void) {
         "DistributionCodes/dist-Extensions/_item", HFILL }},
     { &hf_s4406_dist_type,
       { "dist-type", "s4406.dist_type",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "DistributionExtensionField/dist-type", HFILL }},
     { &hf_s4406_dist_value,
       { "dist-value", "s4406.dist_value",
@@ -991,7 +998,7 @@ void proto_register_s4406(void) {
         "BodyPartSecurityLabel/body-part-sequence-number", HFILL }},
 
 /*--- End of included file: packet-s4406-hfarr.c ---*/
-
+#line 93 "packet-s4406-template.c"
   };
 
   /* List of subtrees */
@@ -999,7 +1006,7 @@ void proto_register_s4406(void) {
     &ett_s4406,
 
 /*--- Included file: packet-s4406-ettarr.c ---*/
-
+#line 1 "packet-s4406-ettarr.c"
     &ett_s4406_DistributionCodes,
     &ett_s4406_SEQUENCE_OF_Sic,
     &ett_s4406_SEQUENCE_OF_DistributionExtensionField,
@@ -1017,7 +1024,7 @@ void proto_register_s4406(void) {
     &ett_s4406_BodyPartSecurityLabel,
 
 /*--- End of included file: packet-s4406-ettarr.c ---*/
-
+#line 99 "packet-s4406-template.c"
   };
 
   /* Register protocol */
@@ -1034,7 +1041,7 @@ void proto_register_s4406(void) {
 void proto_reg_handoff_s4406(void) {
 
 /*--- Included file: packet-s4406-dis-tab.c ---*/
-
+#line 1 "packet-s4406-dis-tab.c"
   register_ber_oid_dissector("1.3.26.0.4406.0.2.0", dissect_PrimaryPrecedence_PDU, proto_s4406, "primary-precedence");
   register_ber_oid_dissector("1.3.26.0.4406.0.2.1", dissect_CopyPrecedence_PDU, proto_s4406, "copy-precedence");
   register_ber_oid_dissector("1.3.26.0.4406.0.2.2", dissect_MessageType_PDU, proto_s4406, "message-type");
@@ -1055,7 +1062,7 @@ void proto_reg_handoff_s4406(void) {
 
 
 /*--- End of included file: packet-s4406-dis-tab.c ---*/
-
+#line 114 "packet-s4406-template.c"
 
   register_ber_oid_dissector("1.3.26.0.4406.0.4.1", dissect_s4406, proto_s4406, "Military Message");
 }
diff --git a/epan/dissectors/packet-s4406.h b/epan/dissectors/packet-s4406.h
index 14caf7ee91..3d480b55a8 100644
--- a/epan/dissectors/packet-s4406.h
+++ b/epan/dissectors/packet-s4406.h
@@ -1,10 +1,11 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-s4406.h                                                           */
+/* ./packet-s4406.h                                                           */
 /* ../../tools/asn2eth.py -X -b -e -p s4406 -c s4406.cnf -s packet-s4406-template s4406.asn */
 
 /* Input file: packet-s4406-template.h */
 
+#line 1 "packet-s4406-template.h"
 /* packet-s4406.h
  * Routines for X.411 (X.400 Message Transfer) packet dissection
  * Graeme Lunt 2005
diff --git a/epan/dissectors/packet-smrse.c b/epan/dissectors/packet-smrse.c
index 14e931bef4..13074bcc2b 100644
--- a/epan/dissectors/packet-smrse.c
+++ b/epan/dissectors/packet-smrse.c
@@ -5,6 +5,7 @@
 
 /* Input file: packet-smrse-template.c */
 
+#line 1 "packet-smrse-template.c"
 /* packet-smrse.c
  * Routines for SMRSE Short Message Relay Service packet dissection
  *   Ronnie Sahlberg 2004
@@ -58,7 +59,7 @@ static int hf_smrse_length = -1;
 static int hf_smrse_Octet_Format = -1;
 
 /*--- Included file: packet-smrse-hf.c ---*/
-
+#line 1 "packet-smrse-hf.c"
 static int hf_smrse_sc_address = -1;              /* SMS_Address */
 static int hf_smrse_password = -1;                /* Password */
 static int hf_smrse_address_type = -1;            /* T_address_type */
@@ -87,13 +88,13 @@ static int hf_smrse_sm_diag_info = -1;            /* RP_UD */
 static int hf_smrse_ms_address = -1;              /* SMS_Address */
 
 /*--- End of included file: packet-smrse-hf.c ---*/
-
+#line 53 "packet-smrse-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_smrse = -1;
 
 /*--- Included file: packet-smrse-ett.c ---*/
-
+#line 1 "packet-smrse-ett.c"
 static gint ett_smrse_SMR_Bind = -1;
 static gint ett_smrse_SMS_Address = -1;
 static gint ett_smrse_T_address_value = -1;
@@ -107,12 +108,12 @@ static gint ett_smrse_RPError = -1;
 static gint ett_smrse_RPAlertSC = -1;
 
 /*--- End of included file: packet-smrse-ett.c ---*/
-
+#line 57 "packet-smrse-template.c"
 
 
 
 /*--- Included file: packet-smrse-fn.c ---*/
-
+#line 1 "packet-smrse-fn.c"
 /*--- Fields for imported types ---*/
 
 
@@ -175,6 +176,7 @@ dissect_smrse_SemiOctetString(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs
 
 static int
 dissect_smrse_T_octet_format(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 19 "smrse.cnf"
 	char *strp,tmpstr[21];
 	guint32 i, start_offset;
 	gint8 class;
@@ -204,6 +206,7 @@ dissect_smrse_T_octet_format(gboolean implicit_tag _U_, tvbuff_t *tvb, int offse
 	return offset;
 
 
+
   return offset;
 }
 static int dissect_octet_format(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -571,7 +574,7 @@ dissect_smrse_RPAlertSC(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pa
 
 
 /*--- End of included file: packet-smrse-fn.c ---*/
-
+#line 60 "packet-smrse-template.c"
 
 static const value_string tag_vals[] = {
 	{  1,	"AliveTest" },
@@ -678,7 +681,7 @@ void proto_register_smrse(void) {
 
 
 /*--- Included file: packet-smrse-hfarr.c ---*/
-
+#line 1 "packet-smrse-hfarr.c"
     { &hf_smrse_sc_address,
       { "sc-address", "smrse.sc_address",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -785,7 +788,7 @@ void proto_register_smrse(void) {
         "RPAlertSC/ms-address", HFILL }},
 
 /*--- End of included file: packet-smrse-hfarr.c ---*/
-
+#line 165 "packet-smrse-template.c"
   };
 
   /* List of subtrees */
@@ -793,7 +796,7 @@ void proto_register_smrse(void) {
     &ett_smrse,
 
 /*--- Included file: packet-smrse-ettarr.c ---*/
-
+#line 1 "packet-smrse-ettarr.c"
     &ett_smrse_SMR_Bind,
     &ett_smrse_SMS_Address,
     &ett_smrse_T_address_value,
@@ -807,7 +810,7 @@ void proto_register_smrse(void) {
     &ett_smrse_RPAlertSC,
 
 /*--- End of included file: packet-smrse-ettarr.c ---*/
-
+#line 171 "packet-smrse-template.c"
   };
 
   /* Register protocol */
diff --git a/epan/dissectors/packet-smrse.h b/epan/dissectors/packet-smrse.h
index 5f269ddd43..e22355a7cd 100644
--- a/epan/dissectors/packet-smrse.h
+++ b/epan/dissectors/packet-smrse.h
@@ -5,6 +5,7 @@
 
 /* Input file: packet-smrse-template.h */
 
+#line 1 "packet-smrse-template.h"
 /* packet-smrse.h
  * Routines for SMRSE Short Message Relay Service packet dissection
  *   Ronnie Sahlberg 2004
diff --git a/epan/dissectors/packet-spnego.c b/epan/dissectors/packet-spnego.c
index 0e7961bee4..7cf1433553 100644
--- a/epan/dissectors/packet-spnego.c
+++ b/epan/dissectors/packet-spnego.c
@@ -1,10 +1,11 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-spnego.c                                                          */
+/* ./packet-spnego.c                                                          */
 /* ../../tools/asn2eth.py -X -b -e -p spnego -c spnego.cnf -s packet-spnego-template spnego.asn */
 
 /* Input file: packet-spnego-template.c */
 
+#line 1 "packet-spnego-template.c"
 /* packet-spnego.c
  * Routines for the simple and protected GSS-API negotiation mechanism
  * as described in RFC 2478.
@@ -79,7 +80,7 @@ static int hf_spnego_krb5_confounder = -1;
 
 
 /*--- Included file: packet-spnego-hf.c ---*/
-
+#line 1 "packet-spnego-hf.c"
 static int hf_spnego_negTokenInit = -1;           /* NegTokenInit */
 static int hf_spnego_negTokenTarg = -1;           /* NegTokenTarg */
 static int hf_spnego_MechTypeList_item = -1;      /* MechType */
@@ -104,7 +105,7 @@ static int hf_spnego_ContextFlags_confFlag = -1;
 static int hf_spnego_ContextFlags_integFlag = -1;
 
 /*--- End of included file: packet-spnego-hf.c ---*/
-
+#line 74 "packet-spnego-template.c"
 
 /* Global variables */
 static const char *MechType_oid;
@@ -119,7 +120,7 @@ static gint ett_spnego_krb5 = -1;
 
 
 /*--- Included file: packet-spnego-ett.c ---*/
-
+#line 1 "packet-spnego-ett.c"
 static gint ett_spnego_NegotiationToken = -1;
 static gint ett_spnego_MechTypeList = -1;
 static gint ett_spnego_PrincipalSeq = -1;
@@ -129,7 +130,7 @@ static gint ett_spnego_NegTokenTarg = -1;
 static gint ett_spnego_InitialContextToken = -1;
 
 /*--- End of included file: packet-spnego-ett.c ---*/
-
+#line 87 "packet-spnego-template.c"
 
 static dissector_handle_t data_handle;
 
@@ -144,7 +145,7 @@ static int dissect_spnego_PrincipalSeq(gboolean implicit_tag, tvbuff_t *tvb,
 
 
 /*--- Included file: packet-spnego-fn.c ---*/
-
+#line 1 "packet-spnego-fn.c"
 /*--- Fields for imported types ---*/
 
 
@@ -152,6 +153,7 @@ static int dissect_spnego_PrincipalSeq(gboolean implicit_tag, tvbuff_t *tvb,
 
 static int
 dissect_spnego_MechType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 23 "spnego.cnf"
 
   gssapi_oid_value *value;
 
@@ -178,6 +180,7 @@ dissect_spnego_MechType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pa
   }
 
 
+
   return offset;
 }
 static int dissect_MechTypeList_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -194,9 +197,11 @@ static const ber_sequence_t MechTypeList_sequence_of[1] = {
 
 static int
 dissect_spnego_MechTypeList(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 91 "spnego.cnf"
 
   saw_mechanism = FALSE;
 
+
   offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
                                       MechTypeList_sequence_of, hf_index, ett_spnego_MechTypeList);
 
@@ -234,6 +239,7 @@ static int dissect_reqFlags(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
 
 static int
 dissect_spnego_T_mechToken(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 99 "spnego.cnf"
 
   tvbuff_t *mechToken_tvb = NULL;
 
@@ -250,6 +256,7 @@ dissect_spnego_T_mechToken(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset,
 
 
 
+
   return offset;
 }
 static int dissect_mechToken(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -260,6 +267,7 @@ static int dissect_mechToken(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
 
 static int
 dissect_spnego_T_NegTokenInit_mechListMIC(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 113 "spnego.cnf"
 
   gint8 class;
   gboolean pc;
@@ -298,6 +306,7 @@ dissect_spnego_T_NegTokenInit_mechListMIC(gboolean implicit_tag _U_, tvbuff_t *t
   }
 
 
+
   return offset;
 }
 static int dissect_negTokenInit_mechListMIC(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -348,6 +357,7 @@ static int dissect_negResult(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
 
 static int
 dissect_spnego_T_supportedMech(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 151 "spnego.cnf"
 
   conversation_t *conversation;
 
@@ -373,6 +383,7 @@ dissect_spnego_T_supportedMech(gboolean implicit_tag _U_, tvbuff_t *tvb, int off
 
 
 
+
   return offset;
 }
 static int dissect_supportedMech(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -383,6 +394,7 @@ static int dissect_supportedMech(packet_info *pinfo, proto_tree *tree, tvbuff_t
 
 static int
 dissect_spnego_T_responseToken(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 179 "spnego.cnf"
 
   tvbuff_t *responseToken_tvb;
 
@@ -405,6 +417,7 @@ dissect_spnego_T_responseToken(gboolean implicit_tag _U_, tvbuff_t *tvb, int off
 
 
 
+
   return offset;
 }
 static int dissect_responseToken(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -415,6 +428,7 @@ static int dissect_responseToken(packet_info *pinfo, proto_tree *tree, tvbuff_t
 
 static int
 dissect_spnego_T_mechListMIC(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 203 "spnego.cnf"
 
   tvbuff_t *mechListMIC_tvb;
 
@@ -433,6 +447,7 @@ dissect_spnego_T_mechListMIC(gboolean implicit_tag _U_, tvbuff_t *tvb, int offse
 
 
 
+
   return offset;
 }
 static int dissect_mechListMIC(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -513,6 +528,7 @@ dissect_spnego_PrincipalSeq(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset
 
 static int
 dissect_spnego_InnerContextToken(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 48 "spnego.cnf"
 
   gssapi_oid_value *next_level_value;
   proto_item *item;
@@ -556,6 +572,7 @@ dissect_spnego_InnerContextToken(gboolean implicit_tag _U_, tvbuff_t *tvb, int o
     offset = tvb_length(tvb);
 
 
+
   return offset;
 }
 static int dissect_innerContextToken(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -579,7 +596,7 @@ dissect_spnego_InitialContextToken(gboolean implicit_tag _U_, tvbuff_t *tvb, int
 
 
 /*--- End of included file: packet-spnego-fn.c ---*/
-
+#line 100 "packet-spnego-template.c"
 /*
  * This is the SPNEGO KRB5 dissector. It is not true KRB5, but some ASN.1
  * wrapped blob with an OID, USHORT token ID, and a Ticket, that is also 
@@ -1486,7 +1503,7 @@ void proto_register_spnego(void) {
 
 
 /*--- Included file: packet-spnego-hfarr.c ---*/
-
+#line 1 "packet-spnego-hfarr.c"
     { &hf_spnego_negTokenInit,
       { "negTokenInit", "spnego.negTokenInit",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -1497,7 +1514,7 @@ void proto_register_spnego(void) {
         "NegotiationToken/negTokenTarg", HFILL }},
     { &hf_spnego_MechTypeList_item,
       { "Item", "spnego.MechTypeList_item",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "MechTypeList/_item", HFILL }},
     { &hf_spnego_principal,
       { "principal", "spnego.principal",
@@ -1525,7 +1542,7 @@ void proto_register_spnego(void) {
         "NegTokenTarg/negResult", HFILL }},
     { &hf_spnego_supportedMech,
       { "supportedMech", "spnego.supportedMech",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "NegTokenTarg/supportedMech", HFILL }},
     { &hf_spnego_responseToken,
       { "responseToken", "spnego.responseToken",
@@ -1537,7 +1554,7 @@ void proto_register_spnego(void) {
         "NegTokenTarg/mechListMIC", HFILL }},
     { &hf_spnego_thisMech,
       { "thisMech", "spnego.thisMech",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "InitialContextToken/thisMech", HFILL }},
     { &hf_spnego_innerContextToken,
       { "innerContextToken", "spnego.innerContextToken",
@@ -1573,7 +1590,7 @@ void proto_register_spnego(void) {
         "", HFILL }},
 
 /*--- End of included file: packet-spnego-hfarr.c ---*/
-
+#line 1005 "packet-spnego-template.c"
 	};
 
 	/* List of subtrees */
@@ -1584,7 +1601,7 @@ void proto_register_spnego(void) {
 
 
 /*--- Included file: packet-spnego-ettarr.c ---*/
-
+#line 1 "packet-spnego-ettarr.c"
     &ett_spnego_NegotiationToken,
     &ett_spnego_MechTypeList,
     &ett_spnego_PrincipalSeq,
@@ -1594,7 +1611,7 @@ void proto_register_spnego(void) {
     &ett_spnego_InitialContextToken,
 
 /*--- End of included file: packet-spnego-ettarr.c ---*/
-
+#line 1014 "packet-spnego-template.c"
 	};
 
 	/* Register protocol */
diff --git a/epan/dissectors/packet-spnego.h b/epan/dissectors/packet-spnego.h
index a3a4284e80..d03cf6a951 100644
--- a/epan/dissectors/packet-spnego.h
+++ b/epan/dissectors/packet-spnego.h
@@ -5,6 +5,7 @@
 
 /* Input file: packet-spnego-template.h */
 
+#line 1 "packet-spnego-template.h"
 /* packet-spnego.h
  * Routines for spnego packet dissection
  *
diff --git a/epan/dissectors/packet-tcap.c b/epan/dissectors/packet-tcap.c
index 76b532fa9d..661311551c 100644
--- a/epan/dissectors/packet-tcap.c
+++ b/epan/dissectors/packet-tcap.c
@@ -5,6 +5,7 @@
 
 /* Input file: packet-tcap-template.c */
 
+#line 1 "packet-tcap-template.c"
 /* packet-tcap-template.c
  * Routines for  TCAP
  * Copyright 2004 - 2005, Tim Endean <endeant@hotmail.com>
@@ -57,7 +58,7 @@ static int hf_tcap_data = -1;
 static int hf_tcap_tid = -1;
 
 /*--- Included file: packet-tcap-hf.c ---*/
-
+#line 1 "packet-tcap-hf.c"
 static int hf_tcap_dialogueRequest = -1;          /* AARQ_apdu */
 static int hf_tcap_dialogueResponse = -1;         /* AARE_apdu */
 static int hf_tcap_dialogueAbort = -1;            /* ABRT_apdu */
@@ -183,7 +184,7 @@ static int hf_tcap_T_protocol_versionre_version1 = -1;
 static int hf_tcap_T_protocol_version3_version1 = -1;
 
 /*--- End of included file: packet-tcap-hf.c ---*/
-
+#line 52 "packet-tcap-template.c"
 static guint tcap_itu_ssn = 106;
 
 static guint global_tcap_itu_ssn = 1;
@@ -198,7 +199,7 @@ static gint ett_dtid = -1;
 
 
 /*--- Included file: packet-tcap-ett.c ---*/
-
+#line 1 "packet-tcap-ett.c"
 static gint ett_tcap_DialoguePDU = -1;
 static gint ett_tcap_ExternalPDU = -1;
 static gint ett_tcap_UserInformation = -1;
@@ -251,7 +252,7 @@ static gint ett_tcap_OperationCode = -1;
 static gint ett_tcap_ErrorCode = -1;
 
 /*--- End of included file: packet-tcap-ett.c ---*/
-
+#line 65 "packet-tcap-template.c"
 
 #define MAX_SSN 254
 static range_t *global_ssn_range;
@@ -272,7 +273,7 @@ static int dissect_tcap_UserInformation(gboolean implicit_tag _U_, tvbuff_t *tvb
 
 
 /*--- Included file: packet-tcap-fn.c ---*/
-
+#line 1 "packet-tcap-fn.c"
 /*--- Fields for imported types ---*/
 
 
@@ -298,11 +299,13 @@ static int dissect_protocol_versionrq_impl(packet_info *pinfo, proto_tree *tree,
 
 static int
 dissect_tcap_Applicationcontext(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 128 "tcap.cnf"
   offset = dissect_ber_object_identifier_str(implicit_tag, pinfo, tree, tvb, offset, hf_index, &cur_oid);
 
 	pinfo->private_data = cur_oid;
 
 
+
   return offset;
 }
 static int dissect_application_context_name(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -313,6 +316,7 @@ static int dissect_application_context_name(packet_info *pinfo, proto_tree *tree
 
 static int
 dissect_tcap_User_information(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 77 "tcap.cnf"
 tvbuff_t	*next_tvb;
 guint8 class;
 	gboolean pc;
@@ -331,6 +335,7 @@ dissect_tcap_UserInformation(TRUE, next_tvb, 0, pinfo, tree, -1);
  
 return offset+len;
 
+
   return offset;
 }
 static int dissect_user_information_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -565,6 +570,7 @@ static int dissect_objectConfidentialityId_impl(packet_info *pinfo, proto_tree *
 
 static int
 dissect_tcap_Dialog1(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 43 "tcap.cnf"
 guint8 class;
 	gboolean pc;
 	guint32 tag;
@@ -579,6 +585,7 @@ offset = get_ber_length(tree, tvb, offset, &len, &ind_field);
 return offset+len;
 
 
+
   return offset;
 }
 static int dissect_dialog_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -604,11 +611,13 @@ dissect_tcap_ExternalPDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, p
 
 static int
 dissect_tcap_UserInfoOID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 132 "tcap.cnf"
   offset = dissect_ber_object_identifier_str(implicit_tag, pinfo, tree, tvb, offset, hf_index, &tcapext_oid);
 
 	pinfo->private_data = tcapext_oid;
 
 
+
   return offset;
 }
 static int dissect_useroid(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -619,6 +628,7 @@ static int dissect_useroid(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
 
 static int
 dissect_tcap_ExternUserInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 136 "tcap.cnf"
 tvbuff_t	*next_tvb;
 guint8 class;
 	gboolean pc;
@@ -646,6 +656,7 @@ dissect_tcap_param(pinfo,tree,next_tvb,0);
 
 
 
+
   return offset;
 }
 static int dissect_externuserinfo_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -801,6 +812,7 @@ dissect_tcap_UniDialoguePDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset
 
 static int
 dissect_tcap_DialogueOC(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 21 "tcap.cnf"
 tvbuff_t	*next_tvb;
 guint8 class;
 	gboolean pc;
@@ -823,6 +835,7 @@ offset = get_ber_length(tree, tvb, offset, &len, &ind_field);
 return offset+len;
 
 
+
   return offset;
 }
 
@@ -914,6 +927,7 @@ static int dissect_opCode(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
 
 static int
 dissect_tcap_Parameter(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 57 "tcap.cnf"
 tvbuff_t	*next_tvb;
 guint8 class;
 	gboolean pc;
@@ -934,6 +948,7 @@ if (!next_tvb)
   return offset;
 
 
+
   return offset;
 }
 static int dissect_parameter(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -1251,6 +1266,7 @@ static const ber_choice_t Component_choice[] = {
 
 static int
 dissect_tcap_Component(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 95 "tcap.cnf"
 tvbuff_t	*next_tvb;
 guint8 class;
 	gboolean pc;
@@ -1284,6 +1300,7 @@ else
 return offset+len;
 
 
+
   return offset;
 }
 static int dissect_ComponentPortion_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -1328,6 +1345,7 @@ static int dissect_unidirectional_impl(packet_info *pinfo, proto_tree *tree, tvb
 
 static int
 dissect_tcap_OrigTransactionID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 184 "tcap.cnf"
 tvbuff_t *parameter_tvb;
 guint8 len, i;
 proto_item *tid_item;
@@ -1350,6 +1368,7 @@ if (parameter_tvb){
 
 
 
+
   return offset;
 }
 static int dissect_otid(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -1366,11 +1385,13 @@ static const ber_sequence_t Begin_sequence[] = {
 
 static int
 dissect_tcap_Begin(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 225 "tcap.cnf"
 if (check_col(pinfo->cinfo, COL_INFO))
 		col_append_fstr(pinfo->cinfo, COL_INFO, " Begin ");
   offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
                                 Begin_sequence, hf_index, ett_tcap_Begin);
 
+
   return offset;
 }
 static int dissect_begin_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -1381,6 +1402,7 @@ static int dissect_begin_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
 
 static int
 dissect_tcap_DestTransactionID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 206 "tcap.cnf"
 tvbuff_t *parameter_tvb;
 guint8 len , i;
 proto_item *tid_item;
@@ -1400,6 +1422,7 @@ if (parameter_tvb){
 	   }
 }
 
+
   return offset;
 }
 static int dissect_dtid(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -1416,11 +1439,13 @@ static const ber_sequence_t End_sequence[] = {
 
 static int
 dissect_tcap_End(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 230 "tcap.cnf"
 if (check_col(pinfo->cinfo, COL_INFO))
 		col_append_fstr(pinfo->cinfo, COL_INFO, " End ");
 offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
                                 End_sequence, hf_index, ett_tcap_End);
 
+
   return offset;
 }
 static int dissect_end_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -1438,11 +1463,13 @@ static const ber_sequence_t Continue_sequence[] = {
 
 static int
 dissect_tcap_Continue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 235 "tcap.cnf"
 if (check_col(pinfo->cinfo, COL_INFO))
 		col_append_fstr(pinfo->cinfo, COL_INFO, " Continue ");
 offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
                                 Continue_sequence, hf_index, ett_tcap_Continue);
 
+
   return offset;
 }
 static int dissect_continue_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -1505,11 +1532,13 @@ static const ber_sequence_t Abort_sequence[] = {
 
 static int
 dissect_tcap_Abort(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 240 "tcap.cnf"
 if (check_col(pinfo->cinfo, COL_INFO))
 		col_append_fstr(pinfo->cinfo, COL_INFO, " Abort ");
  offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
                                 Abort_sequence, hf_index, ett_tcap_Abort); 
 
+
   return offset;
 }
 static int dissect_abort_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -1722,6 +1751,7 @@ static int dissect_operationCode(packet_info *pinfo, proto_tree *tree, tvbuff_t
 
 static int
 dissect_tcap_ANSIParameters(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 163 "tcap.cnf"
 /* we are doing the ParamSet here so need to look at the tags*/
 	guint32 len;
 len = tvb_length_remaining(tvb, offset);
@@ -1733,6 +1763,7 @@ offset = dissect_ber_octet_string(TRUE, pinfo, tree, tvb, 0, hf_index,
 
 
 
+
   return offset;
 }
 static int dissect_ansiparams(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -1986,6 +2017,7 @@ static const ber_choice_t ComponentPDU_choice[] = {
 
 static int
 dissect_tcap_ComponentPDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 174 "tcap.cnf"
 tvbuff_t *next_tvb;
 
 next_tvb = tvb_new_subset(tvb, offset, tvb_length_remaining(tvb, offset), tvb_length_remaining(tvb, offset));		
@@ -1996,6 +2028,7 @@ offset = dissect_ber_choice(pinfo, tree, tvb, offset,
                               ComponentPDU_choice, hf_index, ett_tcap_ComponentPDU,NULL);
 	
 
+
   return offset;
 }
 static int dissect_ComponentSequence_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -2047,6 +2080,7 @@ static const ber_sequence_t TransactionPDU_sequence[] = {
 
 static int
 dissect_tcap_TransactionPDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 250 "tcap.cnf"
 if ((hf_index == hf_tcap_ansiqueryWithPerm)&&(check_col(pinfo->cinfo, COL_INFO)))
 				col_append_fstr(pinfo->cinfo, COL_INFO, " QueryWithPerm");		
 				
@@ -2066,6 +2100,7 @@ if ((hf_index == hf_tcap_ansiconversationWithoutPerm)&&(check_col(pinfo->cinfo,
                 TransactionPDU_sequence, hf_index, ett_tcap_TransactionPDU);  
           
 
+
   return offset;
 }
 static int dissect_ansiqueryWithPerm_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -2146,11 +2181,13 @@ static const ber_sequence_t AbortPDU_sequence[] = {
 
 static int
 dissect_tcap_AbortPDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 245 "tcap.cnf"
 if (check_col(pinfo->cinfo, COL_INFO))
 		col_append_fstr(pinfo->cinfo, COL_INFO, " Abort ");
    offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
                                 AbortPDU_sequence, hf_index, ett_tcap_AbortPDU);
 
+
   return offset;
 }
 static int dissect_ansiabort_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -2223,7 +2260,7 @@ dissect_tcap_ERROR(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_
 
 
 /*--- End of included file: packet-tcap-fn.c ---*/
-
+#line 84 "packet-tcap-template.c"
 
 
 
@@ -2300,7 +2337,7 @@ proto_register_tcap(void)
 	},
 
 /*--- Included file: packet-tcap-hfarr.c ---*/
-
+#line 1 "packet-tcap-hfarr.c"
     { &hf_tcap_dialogueRequest,
       { "dialogueRequest", "tcap.dialogueRequest",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -2315,7 +2352,7 @@ proto_register_tcap(void)
         "DialoguePDU/dialogueAbort", HFILL }},
     { &hf_tcap_oid,
       { "oid", "tcap.oid",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "ExternalPDU/oid", HFILL }},
     { &hf_tcap_dialog,
       { "dialog", "tcap.dialog",
@@ -2323,7 +2360,7 @@ proto_register_tcap(void)
         "ExternalPDU/dialog", HFILL }},
     { &hf_tcap_useroid,
       { "useroid", "tcap.useroid",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "UserInformation/useroid", HFILL }},
     { &hf_tcap_externuserinfo,
       { "externuserinfo", "tcap.externuserinfo",
@@ -2335,7 +2372,7 @@ proto_register_tcap(void)
         "AARQ-apdu/protocol-versionrq", HFILL }},
     { &hf_tcap_application_context_name,
       { "application-context-name", "tcap.application_context_name",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "", HFILL }},
     { &hf_tcap_user_information,
       { "user-information", "tcap.user_information",
@@ -2543,7 +2580,7 @@ proto_register_tcap(void)
         "", HFILL }},
     { &hf_tcap_globalValue,
       { "globalValue", "tcap.globalValue",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "", HFILL }},
     { &hf_tcap_identifier,
       { "identifier", "tcap.identifier",
@@ -2583,7 +2620,7 @@ proto_register_tcap(void)
         "DialoguePortionANSI/applicationContext/integerApplicationId", HFILL }},
     { &hf_tcap_objectApplicationId,
       { "objectApplicationId", "tcap.objectApplicationId",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "DialoguePortionANSI/applicationContext/objectApplicationId", HFILL }},
     { &hf_tcap_securityContext,
       { "securityContext", "tcap.securityContext",
@@ -2595,7 +2632,7 @@ proto_register_tcap(void)
         "DialoguePortionANSI/securityContext/integerSecurityId", HFILL }},
     { &hf_tcap_objectSecurityId,
       { "objectSecurityId", "tcap.objectSecurityId",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "DialoguePortionANSI/securityContext/objectSecurityId", HFILL }},
     { &hf_tcap_confidentiality,
       { "confidentiality", "tcap.confidentiality",
@@ -2611,7 +2648,7 @@ proto_register_tcap(void)
         "Confidentiality/confidentialityId/integerConfidentialityId", HFILL }},
     { &hf_tcap_objectConfidentialityId,
       { "objectConfidentialityId", "tcap.objectConfidentialityId",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "Confidentiality/confidentialityId/objectConfidentialityId", HFILL }},
     { &hf_tcap_ComponentSequence_item,
       { "Item", "tcap.ComponentSequence_item",
@@ -2791,7 +2828,7 @@ proto_register_tcap(void)
         "", HFILL }},
 
 /*--- End of included file: packet-tcap-hfarr.c ---*/
-
+#line 159 "packet-tcap-template.c"
     };
 
 /* Setup protocol subtree array */
@@ -2802,7 +2839,7 @@ proto_register_tcap(void)
 	&ett_dtid,
 
 /*--- Included file: packet-tcap-ettarr.c ---*/
-
+#line 1 "packet-tcap-ettarr.c"
     &ett_tcap_DialoguePDU,
     &ett_tcap_ExternalPDU,
     &ett_tcap_UserInformation,
@@ -2855,7 +2892,7 @@ proto_register_tcap(void)
     &ett_tcap_ErrorCode,
 
 /*--- End of included file: packet-tcap-ettarr.c ---*/
-
+#line 168 "packet-tcap-template.c"
     };
 
     /*static enum_val_t tcap_options[] = {
diff --git a/epan/dissectors/packet-tcap.h b/epan/dissectors/packet-tcap.h
index fb328fcabc..7b3f85926a 100644
--- a/epan/dissectors/packet-tcap.h
+++ b/epan/dissectors/packet-tcap.h
@@ -5,6 +5,7 @@
 
 /* Input file: packet-tcap-template.h */
 
+#line 1 "packet-tcap-template.h"
 /* packet-tcap.h
  *
  * $Id$
diff --git a/epan/dissectors/packet-wlancertextn.c b/epan/dissectors/packet-wlancertextn.c
index 9d4ee8deff..832de81388 100644
--- a/epan/dissectors/packet-wlancertextn.c
+++ b/epan/dissectors/packet-wlancertextn.c
@@ -5,6 +5,7 @@
 
 /* Input file: packet-wlancertextn-template.c */
 
+#line 1 "packet-wlancertextn-template.c"
 /* packet-wlancertextn.c
  * Routines for Wireless Certificate Extension (RFC3770)
  *  Ronnie Sahlberg 2005
@@ -55,25 +56,25 @@
 int proto_wlancertextn = -1;
 
 /*--- Included file: packet-wlancertextn-hf.c ---*/
-
+#line 1 "packet-wlancertextn-hf.c"
 static int hf_wlancertextn_SSIDList_PDU = -1;     /* SSIDList */
 static int hf_wlancertextn_SSIDList_item = -1;    /* SSID */
 
 /*--- End of included file: packet-wlancertextn-hf.c ---*/
-
+#line 50 "packet-wlancertextn-template.c"
 
 /* Initialize the subtree pointers */
 
 /*--- Included file: packet-wlancertextn-ett.c ---*/
-
+#line 1 "packet-wlancertextn-ett.c"
 static gint ett_wlancertextn_SSIDList = -1;
 
 /*--- End of included file: packet-wlancertextn-ett.c ---*/
-
+#line 53 "packet-wlancertextn-template.c"
 
 
 /*--- Included file: packet-wlancertextn-fn.c ---*/
-
+#line 1 "packet-wlancertextn-fn.c"
 /*--- Fields for imported types ---*/
 
 
@@ -111,7 +112,7 @@ static void dissect_SSIDList_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
 
 
 /*--- End of included file: packet-wlancertextn-fn.c ---*/
-
+#line 55 "packet-wlancertextn-template.c"
 
 
 /*--- proto_register_wlancertextn ----------------------------------------------*/
@@ -121,7 +122,7 @@ void proto_register_wlancertextn(void) {
   static hf_register_info hf[] = {
 
 /*--- Included file: packet-wlancertextn-hfarr.c ---*/
-
+#line 1 "packet-wlancertextn-hfarr.c"
     { &hf_wlancertextn_SSIDList_PDU,
       { "SSIDList", "wlancertextn.SSIDList",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -132,18 +133,18 @@ void proto_register_wlancertextn(void) {
         "SSIDList/_item", HFILL }},
 
 /*--- End of included file: packet-wlancertextn-hfarr.c ---*/
-
+#line 63 "packet-wlancertextn-template.c"
   };
 
   /* List of subtrees */
   static gint *ett[] = {
 
 /*--- Included file: packet-wlancertextn-ettarr.c ---*/
-
+#line 1 "packet-wlancertextn-ettarr.c"
     &ett_wlancertextn_SSIDList,
 
 /*--- End of included file: packet-wlancertextn-ettarr.c ---*/
-
+#line 68 "packet-wlancertextn-template.c"
   };
 
   /* Register protocol */
@@ -160,13 +161,13 @@ void proto_register_wlancertextn(void) {
 void proto_reg_handoff_wlancertextn(void) {
 
 /*--- Included file: packet-wlancertextn-dis-tab.c ---*/
-
+#line 1 "packet-wlancertextn-dis-tab.c"
   register_ber_oid_dissector("1.3.6.1.5.5.7.1.13", dissect_SSIDList_PDU, proto_wlancertextn, "id-pe-wlanSSID");
   register_ber_oid_dissector("1.3.6.1.5.5.7.10.6", dissect_SSIDList_PDU, proto_wlancertextn, "id-aca-wlanSSID");
 
 
 /*--- End of included file: packet-wlancertextn-dis-tab.c ---*/
-
+#line 83 "packet-wlancertextn-template.c"
   register_ber_oid_name("1.3.6.1.5.5.7.3.13","id-kp-eapOverPPP");
   register_ber_oid_name("1.3.6.1.5.5.7.3.14","id-kp-eapOverLAN");
 }
diff --git a/epan/dissectors/packet-wlancertextn.h b/epan/dissectors/packet-wlancertextn.h
index 30dfde8d6d..1e07cc4dd4 100644
--- a/epan/dissectors/packet-wlancertextn.h
+++ b/epan/dissectors/packet-wlancertextn.h
@@ -5,6 +5,7 @@
 
 /* Input file: packet-wlancertextn-template.h */
 
+#line 1 "packet-wlancertextn-template.h"
 /* packet-wlancertextn.h
  * Routines for Wireless Certificate Extensions (RFC3770) packet dissection
  *  Ronnie Sahlberg 2005
diff --git a/epan/dissectors/packet-x509if.c b/epan/dissectors/packet-x509if.c
index 5106abbac1..a3376457cb 100644
--- a/epan/dissectors/packet-x509if.c
+++ b/epan/dissectors/packet-x509if.c
@@ -5,6 +5,7 @@
 
 /* Input file: packet-x509if-template.c */
 
+#line 1 "packet-x509if-template.c"
 /* packet-x509if.c
  * Routines for X.509 Information Framework packet dissection
  *  Ronnie Sahlberg 2004
@@ -57,7 +58,7 @@ static int hf_x509if_object_identifier_id = -1;
 static int hf_x509if_any_string = -1;
 
 /*--- Included file: packet-x509if-hf.c ---*/
-
+#line 1 "packet-x509if-hf.c"
 static int hf_x509if_Name_PDU = -1;               /* Name */
 static int hf_x509if_DistinguishedName_PDU = -1;  /* DistinguishedName */
 static int hf_x509if_type = -1;                   /* AttributeId */
@@ -202,12 +203,12 @@ static int hf_x509if_AllowedSubset_oneLevel = -1;
 static int hf_x509if_AllowedSubset_wholeSubtree = -1;
 
 /*--- End of included file: packet-x509if-hf.c ---*/
-
+#line 52 "packet-x509if-template.c"
 
 /* Initialize the subtree pointers */
 
 /*--- Included file: packet-x509if-ett.c ---*/
-
+#line 1 "packet-x509if-ett.c"
 static gint ett_x509if_Attribute = -1;
 static gint ett_x509if_SET_OF_AttributeValue = -1;
 static gint ett_x509if_T_valuesWithContext = -1;
@@ -279,7 +280,7 @@ static gint ett_x509if_Mapping = -1;
 static gint ett_x509if_MRSubstitution = -1;
 
 /*--- End of included file: packet-x509if-ett.c ---*/
-
+#line 55 "packet-x509if-template.c"
 
 static const char *object_identifier_id;
 static proto_tree *top_of_dn = NULL;
@@ -297,7 +298,7 @@ static char *last_rdn = NULL;
 
 
 /*--- Included file: packet-x509if-fn.c ---*/
-
+#line 1 "packet-x509if-fn.c"
 /*--- Cyclic dependencies ---*/
 
 /* Refinement -> Refinement/and -> Refinement */
@@ -365,6 +366,7 @@ static int dissect_description(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
 
 static int
 dissect_x509if_AttributeId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 102 "x509if.cnf"
   const char *name;
 
     offset = dissect_ber_object_identifier_str(implicit_tag, pinfo, tree, tvb, offset, hf_x509if_object_identifier_id, &object_identifier_id);
@@ -385,6 +387,7 @@ dissect_x509if_AttributeId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset,
   }
 
 
+
   return offset;
 }
 static int dissect_type(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -413,6 +416,7 @@ static int dissect_restrictionType(packet_info *pinfo, proto_tree *tree, tvbuff_
 
 int
 dissect_x509if_AttributeValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 121 "x509if.cnf"
   int old_offset = offset;
   tvbuff_t	*out_tvb;
   char *value = NULL;
@@ -436,6 +440,7 @@ dissect_x509if_AttributeValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs
   }
 
 
+
   return offset;
 }
 static int dissect_values_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -464,9 +469,11 @@ static int dissect_selectedValues_item(packet_info *pinfo, proto_tree *tree, tvb
 
 static int
 dissect_x509if_ValuesWithContextValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 153 "x509if.cnf"
   offset=call_ber_oid_callback("unknown", tvb, offset, pinfo, tree);
 
 
+
   return offset;
 }
 static int dissect_value(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -647,9 +654,11 @@ static int dissect_ca_contextType(packet_info *pinfo, proto_tree *tree, tvbuff_t
 
 static int
 dissect_x509if_ContextValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 96 "x509if.cnf"
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree);
 
 
+
   return offset;
 }
 static int dissect_ca_contextValues_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -836,6 +845,7 @@ dissect_x509if_AttributeTypeAndDistinguishedValue(gboolean implicit_tag _U_, tvb
 
 static int
 dissect_x509if_RelativeDistinguishedName_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 181 "x509if.cnf"
 
   if(!rdn_one_value) {
     top_of_rdn = tree;
@@ -852,6 +862,7 @@ dissect_x509if_RelativeDistinguishedName_item(gboolean implicit_tag _U_, tvbuff_
   rdn_one_value = TRUE;
 
 
+
   return offset;
 }
 static int dissect_RelativeDistinguishedName_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -865,6 +876,7 @@ static const ber_sequence_t RelativeDistinguishedName_set_of[1] = {
 
 int
 dissect_x509if_RelativeDistinguishedName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 156 "x509if.cnf"
   char *temp_dn;
 
   rdn_one_value = FALSE;
@@ -892,6 +904,7 @@ dissect_x509if_RelativeDistinguishedName(gboolean implicit_tag _U_, tvbuff_t *tv
   last_rdn = NULL; /* it will get freed when the next packet is dissected */
 
 
+
   return offset;
 }
 
@@ -899,6 +912,7 @@ dissect_x509if_RelativeDistinguishedName(gboolean implicit_tag _U_, tvbuff_t *tv
 
 static int
 dissect_x509if_RDNSequence_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 208 "x509if.cnf"
 
   if(!dn_one_rdn)  {
     /* this is the first element - record the top */
@@ -911,6 +925,7 @@ dissect_x509if_RDNSequence_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int of
   dn_one_rdn = TRUE;
 
 
+
   return offset;
 }
 static int dissect_RDNSequence_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -924,6 +939,7 @@ static const ber_sequence_t RDNSequence_sequence_of[1] = {
 
 int
 dissect_x509if_RDNSequence(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 196 "x509if.cnf"
 
   dn_one_rdn = FALSE; /* reset */
   last_dn = ep_alloc(MAX_RDN_STR_LEN); *last_dn = '\0';
@@ -938,6 +954,7 @@ dissect_x509if_RDNSequence(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset,
 
 
 
+
   return offset;
 }
 static int dissect_rdnSequence(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -1435,9 +1452,11 @@ static int dissect_level(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, in
 
 static int
 dissect_x509if_SelectedValues(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 144 "x509if.cnf"
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree);
 
 
+
   return offset;
 }
 static int dissect_ra_selectedValues_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -1476,9 +1495,11 @@ static int dissect_entryType(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
 
 static int
 dissect_x509if_DefaultValueValues(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 150 "x509if.cnf"
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree);
 
 
+
   return offset;
 }
 static int dissect_ra_values_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -2163,7 +2184,7 @@ static void dissect_DistinguishedName_PDU(tvbuff_t *tvb, packet_info *pinfo, pro
 
 
 /*--- End of included file: packet-x509if-fn.c ---*/
-
+#line 71 "packet-x509if-template.c"
 
 const char * x509if_get_last_dn(void)
 {
@@ -2184,7 +2205,7 @@ void proto_register_x509if(void) {
 			 
 
 /*--- Included file: packet-x509if-hfarr.c ---*/
-
+#line 1 "packet-x509if-hfarr.c"
     { &hf_x509if_Name_PDU,
       { "Name", "x509if.Name",
         FT_UINT32, BASE_DEC, VALS(x509if_Name_vals), 0,
@@ -2195,7 +2216,7 @@ void proto_register_x509if(void) {
         "DistinguishedName", HFILL }},
     { &hf_x509if_type,
       { "type", "x509if.type",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "", HFILL }},
     { &hf_x509if_values,
       { "values", "x509if.values",
@@ -2227,7 +2248,7 @@ void proto_register_x509if(void) {
         "", HFILL }},
     { &hf_x509if_contextType,
       { "contextType", "x509if.contextType",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "", HFILL }},
     { &hf_x509if_contextValues,
       { "contextValues", "x509if.contextValues",
@@ -2263,7 +2284,7 @@ void proto_register_x509if(void) {
         "AttributeValueAssertion/assertedContexts/selectedContexts/_item", HFILL }},
     { &hf_x509if_ca_contextType,
       { "contextType", "x509if.contextType",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "ContextAssertion/contextType", HFILL }},
     { &hf_x509if_ca_contextValues,
       { "contextValues", "x509if.contextValues",
@@ -2355,7 +2376,7 @@ void proto_register_x509if(void) {
         "ChopSpecification/specificExclusions/_item", HFILL }},
     { &hf_x509if_item,
       { "item", "x509if.item",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "Refinement/item", HFILL }},
     { &hf_x509if_refinement_and,
       { "and", "x509if.and",
@@ -2383,7 +2404,7 @@ void proto_register_x509if(void) {
         "DITStructureRule/ruleIdentifier", HFILL }},
     { &hf_x509if_nameForm,
       { "nameForm", "x509if.nameForm",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "DITStructureRule/nameForm", HFILL }},
     { &hf_x509if_superiorStructureRules,
       { "superiorStructureRules", "x509if.superiorStructureRules",
@@ -2395,7 +2416,7 @@ void proto_register_x509if(void) {
         "DITStructureRule/superiorStructureRules/_item", HFILL }},
     { &hf_x509if_structuralObjectClass,
       { "structuralObjectClass", "x509if.structuralObjectClass",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "DITContentRule/structuralObjectClass", HFILL }},
     { &hf_x509if_auxiliaries,
       { "auxiliaries", "x509if.auxiliaries",
@@ -2403,7 +2424,7 @@ void proto_register_x509if(void) {
         "DITContentRule/auxiliaries", HFILL }},
     { &hf_x509if_auxiliaries_item,
       { "Item", "x509if.auxiliaries_item",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "DITContentRule/auxiliaries/_item", HFILL }},
     { &hf_x509if_mandatory,
       { "mandatory", "x509if.mandatory",
@@ -2411,7 +2432,7 @@ void proto_register_x509if(void) {
         "DITContentRule/mandatory", HFILL }},
     { &hf_x509if_mandatory_item,
       { "Item", "x509if.mandatory_item",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "DITContentRule/mandatory/_item", HFILL }},
     { &hf_x509if_optional,
       { "optional", "x509if.optional",
@@ -2419,7 +2440,7 @@ void proto_register_x509if(void) {
         "DITContentRule/optional", HFILL }},
     { &hf_x509if_optional_item,
       { "Item", "x509if.optional_item",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "DITContentRule/optional/_item", HFILL }},
     { &hf_x509if_precluded,
       { "precluded", "x509if.precluded",
@@ -2427,11 +2448,11 @@ void proto_register_x509if(void) {
         "DITContentRule/precluded", HFILL }},
     { &hf_x509if_precluded_item,
       { "Item", "x509if.precluded_item",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "DITContentRule/precluded/_item", HFILL }},
     { &hf_x509if_attributeType,
       { "attributeType", "x509if.attributeType",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "", HFILL }},
     { &hf_x509if_mandatoryContexts,
       { "mandatoryContexts", "x509if.mandatoryContexts",
@@ -2439,7 +2460,7 @@ void proto_register_x509if(void) {
         "DITContextUse/mandatoryContexts", HFILL }},
     { &hf_x509if_mandatoryContexts_item,
       { "Item", "x509if.mandatoryContexts_item",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "DITContextUse/mandatoryContexts/_item", HFILL }},
     { &hf_x509if_optionalContexts,
       { "optionalContexts", "x509if.optionalContexts",
@@ -2447,7 +2468,7 @@ void proto_register_x509if(void) {
         "DITContextUse/optionalContexts", HFILL }},
     { &hf_x509if_optionalContexts_item,
       { "Item", "x509if.optionalContexts_item",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "DITContextUse/optionalContexts/_item", HFILL }},
     { &hf_x509if_id,
       { "id", "x509if.id",
@@ -2455,11 +2476,11 @@ void proto_register_x509if(void) {
         "", HFILL }},
     { &hf_x509if_dmdId,
       { "dmdId", "x509if.dmdId",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "", HFILL }},
     { &hf_x509if_serviceType,
       { "serviceType", "x509if.serviceType",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "", HFILL }},
     { &hf_x509if_userClass,
       { "userClass", "x509if.userClass",
@@ -2507,7 +2528,7 @@ void proto_register_x509if(void) {
         "", HFILL }},
     { &hf_x509if_additionalControl_item,
       { "Item", "x509if.additionalControl_item",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "", HFILL }},
     { &hf_x509if_allowedSubset,
       { "allowedSubset", "x509if.allowedSubset",
@@ -2559,7 +2580,7 @@ void proto_register_x509if(void) {
         "RequestAttribute/defaultValues/_item", HFILL }},
     { &hf_x509if_entryType,
       { "entryType", "x509if.entryType",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "RequestAttribute/defaultValues/_item/entryType", HFILL }},
     { &hf_x509if_ra_values,
       { "values", "x509if.values",
@@ -2599,7 +2620,7 @@ void proto_register_x509if(void) {
         "ContextProfile/contextValue/_item", HFILL }},
     { &hf_x509if_context,
       { "context", "x509if.context",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "ContextCombination/context", HFILL }},
     { &hf_x509if_contextcombination_and,
       { "and", "x509if.and",
@@ -2623,7 +2644,7 @@ void proto_register_x509if(void) {
         "ContextCombination/not", HFILL }},
     { &hf_x509if_restrictionType,
       { "restrictionType", "x509if.restrictionType",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "MatchingUse/restrictionType", HFILL }},
     { &hf_x509if_restrictionValue,
       { "restrictionValue", "x509if.restrictionValue",
@@ -2631,7 +2652,7 @@ void proto_register_x509if(void) {
         "MatchingUse/restrictionValue", HFILL }},
     { &hf_x509if_attribute,
       { "attribute", "x509if.attribute",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "", HFILL }},
     { &hf_x509if_and,
       { "and", "x509if.and",
@@ -2723,7 +2744,7 @@ void proto_register_x509if(void) {
         "MRMapping/substitution/_item", HFILL }},
     { &hf_x509if_mappingFunction,
       { "mappingFunction", "x509if.mappingFunction",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "Mapping/mappingFunction", HFILL }},
     { &hf_x509if_level,
       { "level", "x509if.level",
@@ -2731,11 +2752,11 @@ void proto_register_x509if(void) {
         "Mapping/level", HFILL }},
     { &hf_x509if_oldMatchingRule,
       { "oldMatchingRule", "x509if.oldMatchingRule",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "MRSubstitution/oldMatchingRule", HFILL }},
     { &hf_x509if_newMatchingRule,
       { "newMatchingRule", "x509if.newMatchingRule",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "MRSubstitution/newMatchingRule", HFILL }},
     { &hf_x509if_AllowedSubset_baseObject,
       { "baseObject", "x509if.baseObject",
@@ -2751,14 +2772,14 @@ void proto_register_x509if(void) {
         "", HFILL }},
 
 /*--- End of included file: packet-x509if-hfarr.c ---*/
-
+#line 90 "packet-x509if-template.c"
   };
 
   /* List of subtrees */
   static gint *ett[] = {
 
 /*--- Included file: packet-x509if-ettarr.c ---*/
-
+#line 1 "packet-x509if-ettarr.c"
     &ett_x509if_Attribute,
     &ett_x509if_SET_OF_AttributeValue,
     &ett_x509if_T_valuesWithContext,
@@ -2830,7 +2851,7 @@ void proto_register_x509if(void) {
     &ett_x509if_MRSubstitution,
 
 /*--- End of included file: packet-x509if-ettarr.c ---*/
-
+#line 95 "packet-x509if-template.c"
   };
 
   /* Register protocol */
diff --git a/epan/dissectors/packet-x509if.h b/epan/dissectors/packet-x509if.h
index d8cd113eea..ca42efb57f 100644
--- a/epan/dissectors/packet-x509if.h
+++ b/epan/dissectors/packet-x509if.h
@@ -5,6 +5,7 @@
 
 /* Input file: packet-x509if-template.h */
 
+#line 1 "packet-x509if-template.h"
 /* packet-x509if.h
  * Routines for X.509 Information Framework packet dissection
  *  Ronnie Sahlberg 2004
@@ -35,7 +36,7 @@
 
 
 /*--- Included file: packet-x509if-exp.h ---*/
-
+#line 1 "packet-x509if-exp.h"
 extern const value_string x509if_Name_vals[];
 extern const value_string x509if_Refinement_vals[];
 extern const value_string x509if_AttributeUsage_vals[];
@@ -85,7 +86,7 @@ int dissect_x509if_Mapping(gboolean implicit_tag, tvbuff_t *tvb, int offset, pac
 int dissect_x509if_MRSubstitution(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
 
 /*--- End of included file: packet-x509if-exp.h ---*/
-
+#line 30 "packet-x509if-template.h"
 
 extern const char * x509if_get_last_dn(void);
 
diff --git a/epan/dissectors/packet-x509sat.c b/epan/dissectors/packet-x509sat.c
index 133792b761..807b4e2543 100644
--- a/epan/dissectors/packet-x509sat.c
+++ b/epan/dissectors/packet-x509sat.c
@@ -1,10 +1,11 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-x509sat.c                                                         */
+/* ./packet-x509sat.c                                                         */
 /* ../../tools/asn2eth.py -X -b -e -p x509sat -c x509sat.cnf -s packet-x509sat-template SelectedAttributeTypes.asn */
 
 /* Input file: packet-x509sat-template.c */
 
+#line 1 "packet-x509sat-template.c"
 /* packet-x509sat.c
  * Routines for X.509 Selected Attribute Types packet dissection
  *  Ronnie Sahlberg 2004
@@ -53,7 +54,7 @@
 int proto_x509sat = -1;
 
 /*--- Included file: packet-x509sat-hf.c ---*/
-
+#line 1 "packet-x509sat-hf.c"
 static int hf_x509sat_DirectoryString_PDU = -1;   /* DirectoryString */
 static int hf_x509sat_UniqueIdentifier_PDU = -1;  /* UniqueIdentifier */
 static int hf_x509sat_CountryName_PDU = -1;       /* CountryName */
@@ -196,12 +197,12 @@ static int hf_x509sat_T_bitNamedDays_friday = -1;
 static int hf_x509sat_T_bitNamedDays_saturday = -1;
 
 /*--- End of included file: packet-x509sat-hf.c ---*/
-
+#line 48 "packet-x509sat-template.c"
 
 /* Initialize the subtree pointers */
 
 /*--- Included file: packet-x509sat-ett.c ---*/
-
+#line 1 "packet-x509sat-ett.c"
 static gint ett_x509sat_Guide = -1;
 static gint ett_x509sat_Criteria = -1;
 static gint ett_x509sat_SET_OF_Criteria = -1;
@@ -250,11 +251,11 @@ static gint ett_x509sat_T_between = -1;
 static gint ett_x509sat_LocaleContextSyntax = -1;
 
 /*--- End of included file: packet-x509sat-ett.c ---*/
-
+#line 51 "packet-x509sat-template.c"
 
 
 /*--- Included file: packet-x509sat-fn.c ---*/
-
+#line 1 "packet-x509sat-fn.c"
 /*--- Cyclic dependencies ---*/
 
 /* Criteria -> Criteria/and -> Criteria */
@@ -309,9 +310,11 @@ static int dissect_ZonalSelect_item(packet_info *pinfo, proto_tree *tree, tvbuff
 
 int
 dissect_x509sat_DirectoryString(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+#line 115 "x509sat.cnf"
 	offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
 
+
   return offset;
 }
 static int dissect_PostalAddress_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@@ -1646,7 +1649,7 @@ static void dissect_DayTime_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t
 
 
 /*--- End of included file: packet-x509sat-fn.c ---*/
-
+#line 53 "packet-x509sat-template.c"
 
 
 /*--- proto_register_x509sat ----------------------------------------------*/
@@ -1656,7 +1659,7 @@ void proto_register_x509sat(void) {
   static hf_register_info hf[] = {
 
 /*--- Included file: packet-x509sat-hfarr.c ---*/
-
+#line 1 "packet-x509sat-hfarr.c"
     { &hf_x509sat_DirectoryString_PDU,
       { "DirectoryString", "x509sat.DirectoryString",
         FT_STRING, BASE_NONE, NULL, 0,
@@ -1735,7 +1738,7 @@ void proto_register_x509sat(void) {
         "DayTime", HFILL }},
     { &hf_x509sat_objectClass,
       { "objectClass", "x509sat.objectClass",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "", HFILL }},
     { &hf_x509sat_criteria,
       { "criteria", "x509sat.criteria",
@@ -1767,23 +1770,23 @@ void proto_register_x509sat(void) {
         "Criteria/not", HFILL }},
     { &hf_x509sat_equality,
       { "equality", "x509sat.equality",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "CriteriaItem/equality", HFILL }},
     { &hf_x509sat_substrings,
       { "substrings", "x509sat.substrings",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "CriteriaItem/substrings", HFILL }},
     { &hf_x509sat_greaterOrEqual,
       { "greaterOrEqual", "x509sat.greaterOrEqual",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "CriteriaItem/greaterOrEqual", HFILL }},
     { &hf_x509sat_lessOrEqual,
       { "lessOrEqual", "x509sat.lessOrEqual",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "CriteriaItem/lessOrEqual", HFILL }},
     { &hf_x509sat_approximateMatch,
       { "approximateMatch", "x509sat.approximateMatch",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "CriteriaItem/approximateMatch", HFILL }},
     { &hf_x509sat_subset,
       { "subset", "x509sat.subset",
@@ -1843,7 +1846,7 @@ void proto_register_x509sat(void) {
         "ProtocolInformation/profiles", HFILL }},
     { &hf_x509sat_profiles_item,
       { "Item", "x509sat.profiles_item",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "ProtocolInformation/profiles/_item", HFILL }},
     { &hf_x509sat_dn,
       { "dn", "x509sat.dn",
@@ -1855,7 +1858,7 @@ void proto_register_x509sat(void) {
         "NameAndOptionalUID/uid", HFILL }},
     { &hf_x509sat_matchingRuleUsed,
       { "matchingRuleUsed", "x509sat.matchingRuleUsed",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "MultipleMatchingLocalities/matchingRuleUsed", HFILL }},
     { &hf_x509sat_attributeList,
       { "attributeList", "x509sat.attributeList",
@@ -1907,7 +1910,7 @@ void proto_register_x509sat(void) {
         "OctetSubstringAssertion/_item/final", HFILL }},
     { &hf_x509sat_ZonalSelect_item,
       { "Item", "x509sat.ZonalSelect_item",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "ZonalSelect/_item", HFILL }},
     { &hf_x509sat_time,
       { "time", "x509sat.time",
@@ -2083,7 +2086,7 @@ void proto_register_x509sat(void) {
         "TimeAssertion/between/entirely", HFILL }},
     { &hf_x509sat_localeID1,
       { "localeID1", "x509sat.localeID1",
-        FT_STRING, BASE_NONE, NULL, 0,
+        FT_OID, BASE_NONE, NULL, 0,
         "LocaleContextSyntax/localeID1", HFILL }},
     { &hf_x509sat_localeID2,
       { "localeID2", "x509sat.localeID2",
@@ -2215,14 +2218,14 @@ void proto_register_x509sat(void) {
         "", HFILL }},
 
 /*--- End of included file: packet-x509sat-hfarr.c ---*/
-
+#line 61 "packet-x509sat-template.c"
   };
 
   /* List of subtrees */
   static gint *ett[] = {
 
 /*--- Included file: packet-x509sat-ettarr.c ---*/
-
+#line 1 "packet-x509sat-ettarr.c"
     &ett_x509sat_Guide,
     &ett_x509sat_Criteria,
     &ett_x509sat_SET_OF_Criteria,
@@ -2271,7 +2274,7 @@ void proto_register_x509sat(void) {
     &ett_x509sat_LocaleContextSyntax,
 
 /*--- End of included file: packet-x509sat-ettarr.c ---*/
-
+#line 66 "packet-x509sat-template.c"
   };
 
   /* Register protocol */
@@ -2288,7 +2291,7 @@ void proto_register_x509sat(void) {
 void proto_reg_handoff_x509sat(void) {
 
 /*--- Included file: packet-x509sat-dis-tab.c ---*/
-
+#line 1 "packet-x509sat-dis-tab.c"
   register_ber_oid_dissector("2.5.4.6", dissect_CountryName_PDU, proto_x509sat, "id-at-countryName");
   register_ber_oid_dissector("2.5.4.2", dissect_DirectoryString_PDU, proto_x509sat, "id-at-knowledgeInformation");
   register_ber_oid_dissector("2.5.4.10", dissect_DirectoryString_PDU, proto_x509sat, "id-at-organizationName");
@@ -2326,7 +2329,7 @@ void proto_reg_handoff_x509sat(void) {
 
 
 /*--- End of included file: packet-x509sat-dis-tab.c ---*/
-
+#line 81 "packet-x509sat-template.c"
 }
 
 
diff --git a/epan/dissectors/packet-x509sat.h b/epan/dissectors/packet-x509sat.h
index 461ae474c2..8fcae6c92a 100644
--- a/epan/dissectors/packet-x509sat.h
+++ b/epan/dissectors/packet-x509sat.h
@@ -1,10 +1,11 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-x509sat.h                                                         */
+/* ./packet-x509sat.h                                                         */
 /* ../../tools/asn2eth.py -X -b -e -p x509sat -c x509sat.cnf -s packet-x509sat-template SelectedAttributeTypes.asn */
 
 /* Input file: packet-x509sat-template.h */
 
+#line 1 "packet-x509sat-template.h"
 /* packet-x509sat.h
  * Routines for X.509 Selected Attribute Types packet dissection
  *   Ronnie Sahlberg 2004
@@ -35,7 +36,7 @@
 
 
 /*--- Included file: packet-x509sat-exp.h ---*/
-
+#line 1 "packet-x509sat-exp.h"
 extern const value_string x509sat_Criteria_vals[];
 extern const value_string x509sat_ZonalResult_vals[];
 extern const value_string x509sat_XDayOf_vals[];
@@ -74,7 +75,7 @@ int dissect_x509sat_TimeAssertion(gboolean implicit_tag, tvbuff_t *tvb, int offs
 int dissect_x509sat_LocaleContextSyntax(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
 
 /*--- End of included file: packet-x509sat-exp.h ---*/
-
+#line 30 "packet-x509sat-template.h"
 
 #endif  /* PACKET_X509SAT_H */