Include <epan/oid_resolv.h> to declare get_oid_str_name().

svn path=/trunk/; revision=18627

5 files changed, 40 insertions, 35 deletions

diff --git a/epan/dissectors/packet-cdt.c b/epan/dissectors/packet-cdt.c
index 4cab993609..0bdc0bd4a9 100644
--- a/epan/dissectors/packet-cdt.c
+++ b/epan/dissectors/packet-cdt.c
@@ -1,6 +1,6 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
-/* .\packet-cdt.c                                                             */
+/* ./packet-cdt.c                                                             */
 /* ../../tools/asn2wrs.py -b -e -p cdt -c cdt.cnf -s packet-cdt-template cdt.asn */
 
 /* Input file: packet-cdt-template.c */
@@ -40,6 +40,7 @@
 #endif
 
 #include <epan/packet.h>
+#include <epan/oid_resolv.h>
 
 #include "packet-ber.h"
 #include "packet-x411.h"
@@ -67,7 +68,7 @@ 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"
+#line 50 "packet-cdt-template.c"
 
 /* Initialize the subtree pointers */
 
@@ -79,7 +80,7 @@ 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"
+#line 53 "packet-cdt-template.c"
 
 
 /*--- Included file: packet-cdt-fn.c ---*/
@@ -323,7 +324,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"
+#line 55 "packet-cdt-template.c"
 
 
 /*--- proto_register_cdt -------------------------------------------*/
@@ -396,7 +397,7 @@ void proto_register_cdt (void) {
         "CompressedContentInfo/compressedContent", HFILL }},
 
 /*--- End of included file: packet-cdt-hfarr.c ---*/
-#line 86 "packet-cdt-template.c"
+#line 87 "packet-cdt-template.c"
   };
 
   /* List of subtrees */
@@ -410,7 +411,7 @@ void proto_register_cdt (void) {
     &ett_cdt_T_contentType,
 
 /*--- End of included file: packet-cdt-ettarr.c ---*/
-#line 91 "packet-cdt-template.c"
+#line 92 "packet-cdt-template.c"
   };
 
   /* Register protocol */
@@ -432,5 +433,5 @@ void proto_reg_handoff_cdt (void) {
 
 
 /*--- End of included file: packet-cdt-dis-tab.c ---*/
-#line 106 "packet-cdt-template.c"
+#line 107 "packet-cdt-template.c"
 }
diff --git a/epan/dissectors/packet-cms.c b/epan/dissectors/packet-cms.c
index 98093da61e..2a587c7eda 100644
--- a/epan/dissectors/packet-cms.c
+++ b/epan/dissectors/packet-cms.c
@@ -1,6 +1,6 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
-/* .\packet-cms.c                                                             */
+/* ./packet-cms.c                                                             */
 /* ../../tools/asn2wrs.py -b -e -p cms -c cms.cnf -s packet-cms-template CryptographicMessageSyntax.asn */
 
 /* Input file: packet-cms-template.c */
@@ -38,6 +38,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
+#include <epan/oid_resolv.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -147,7 +148,7 @@ static int hf_cms_signature = -1;                 /* Signature */
 static int hf_cms_attributes = -1;                /* UnauthAttributes */
 
 /*--- End of included file: packet-cms-hf.c ---*/
-#line 53 "packet-cms-template.c"
+#line 54 "packet-cms-template.c"
 
 /* Initialize the subtree pointers */
 
@@ -196,7 +197,7 @@ static gint ett_cms_ExtendedCertificate = -1;
 static gint ett_cms_ExtendedCertificateInfo = -1;
 
 /*--- End of included file: packet-cms-ett.c ---*/
-#line 56 "packet-cms-template.c"
+#line 57 "packet-cms-template.c"
 
 static int dissect_cms_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) ; /* XXX kill a compiler warning until asn2wrs stops generating these silly wrappers */
 
@@ -1590,7 +1591,7 @@ static void dissect_Countersignature_PDU(tvbuff_t *tvb, packet_info *pinfo, prot
 
 
 /*--- End of included file: packet-cms-fn.c ---*/
-#line 133 "packet-cms-template.c"
+#line 134 "packet-cms-template.c"
 
 /*--- proto_register_cms ----------------------------------------------*/
 void proto_register_cms(void) {
@@ -1946,7 +1947,7 @@ void proto_register_cms(void) {
         "ExtendedCertificateInfo/attributes", HFILL }},
 
 /*--- End of included file: packet-cms-hfarr.c ---*/
-#line 144 "packet-cms-template.c"
+#line 145 "packet-cms-template.c"
   };
 
   /* List of subtrees */
@@ -1997,7 +1998,7 @@ void proto_register_cms(void) {
     &ett_cms_ExtendedCertificateInfo,
 
 /*--- End of included file: packet-cms-ettarr.c ---*/
-#line 149 "packet-cms-template.c"
+#line 150 "packet-cms-template.c"
   };
 
   /* Register protocol */
@@ -2029,6 +2030,6 @@ void proto_reg_handoff_cms(void) {
 
 
 /*--- End of included file: packet-cms-dis-tab.c ---*/
-#line 164 "packet-cms-template.c"
+#line 165 "packet-cms-template.c"
 }
 
diff --git a/epan/dissectors/packet-x420.c b/epan/dissectors/packet-x420.c
index 150ed0fef2..3eacf857ca 100644
--- a/epan/dissectors/packet-x420.c
+++ b/epan/dissectors/packet-x420.c
@@ -1,6 +1,6 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
-/* .\packet-x420.c                                                            */
+/* ./packet-x420.c                                                            */
 /* ../../tools/asn2wrs.py -b -e -p x420 -c x420.cnf -s packet-x420-template x420.asn */
 
 /* Input file: packet-x420-template.c */
@@ -38,6 +38,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
+#include <epan/oid_resolv.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -295,7 +296,7 @@ static int hf_x420_NotificationRequests_an_supported = -1;
 static int hf_x420_NotificationRequests_suppress_an = -1;
 
 /*--- End of included file: packet-x420-hf.c ---*/
-#line 86 "packet-x420-template.c"
+#line 87 "packet-x420-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_x420 = -1;
@@ -375,7 +376,7 @@ static gint ett_x420_ForwardedContentParameters = -1;
 static gint ett_x420_SubmissionProof = -1;
 
 /*--- End of included file: packet-x420-ett.c ---*/
-#line 90 "packet-x420-template.c"
+#line 91 "packet-x420-template.c"
 
 
 /*--- Included file: packet-x420-fn.c ---*/
@@ -2910,7 +2911,7 @@ static void dissect_ForwardedContentParameters_PDU(tvbuff_t *tvb, packet_info *p
 
 
 /*--- End of included file: packet-x420-fn.c ---*/
-#line 92 "packet-x420-template.c"
+#line 93 "packet-x420-template.c"
 
 /*
 * Dissect X420 PDUs inside a PPDU.
@@ -3743,7 +3744,7 @@ void proto_register_x420(void) {
         "", HFILL }},
 
 /*--- End of included file: packet-x420-hfarr.c ---*/
-#line 124 "packet-x420-template.c"
+#line 125 "packet-x420-template.c"
   };
 
   /* List of subtrees */
@@ -3825,7 +3826,7 @@ void proto_register_x420(void) {
     &ett_x420_SubmissionProof,
 
 /*--- End of included file: packet-x420-ettarr.c ---*/
-#line 130 "packet-x420-template.c"
+#line 131 "packet-x420-template.c"
   };
 
   /* Register protocol */
@@ -3892,7 +3893,7 @@ void proto_reg_handoff_x420(void) {
 
 
 /*--- End of included file: packet-x420-dis-tab.c ---*/
-#line 146 "packet-x420-template.c"
+#line 147 "packet-x420-template.c"
 
   register_ber_oid_dissector("2.6.1.10.0", dissect_x420, proto_x420, "InterPersonal Message (1984)");
   register_ber_oid_dissector("2.6.1.10.1", dissect_x420, proto_x420, "InterPersonal Message (1988)");
diff --git a/epan/dissectors/packet-x509af.c b/epan/dissectors/packet-x509af.c
index bdce26e3ad..e1d4c65343 100644
--- a/epan/dissectors/packet-x509af.c
+++ b/epan/dissectors/packet-x509af.c
@@ -1,6 +1,6 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
-/* .\packet-x509af.c                                                          */
+/* ./packet-x509af.c                                                          */
 /* ../../tools/asn2wrs.py -b -e -p x509af -c x509af.cnf -s packet-x509af-template AuthenticationFramework.asn */
 
 /* Input file: packet-x509af-template.c */
@@ -38,6 +38,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
+#include <epan/oid_resolv.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -136,7 +137,7 @@ static int hf_x509af_q = -1;                      /* INTEGER */
 static int hf_x509af_g = -1;                      /* INTEGER */
 
 /*--- End of included file: packet-x509af-hf.c ---*/
-#line 53 "packet-x509af-template.c"
+#line 54 "packet-x509af-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_pkix_crl = -1;
@@ -177,7 +178,7 @@ static gint ett_x509af_SET_OF_AttributeType = -1;
 static gint ett_x509af_DSS_Params = -1;
 
 /*--- End of included file: packet-x509af-ett.c ---*/
-#line 57 "packet-x509af-template.c"
+#line 58 "packet-x509af-template.c"
 
 static const char *algorithm_id;
 static const char *extension_id;
@@ -1093,7 +1094,7 @@ static void dissect_DSS_Params_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree
 
 
 /*--- End of included file: packet-x509af-fn.c ---*/
-#line 62 "packet-x509af-template.c"
+#line 63 "packet-x509af-template.c"
 
 const char *x509af_get_last_algorithm_id(void) {
   return algorithm_id;
@@ -1438,7 +1439,7 @@ void proto_register_x509af(void) {
         "DSS-Params/g", HFILL }},
 
 /*--- End of included file: packet-x509af-hfarr.c ---*/
-#line 106 "packet-x509af-template.c"
+#line 107 "packet-x509af-template.c"
   };
 
   /* List of subtrees */
@@ -1481,7 +1482,7 @@ void proto_register_x509af(void) {
     &ett_x509af_DSS_Params,
 
 /*--- End of included file: packet-x509af-ettarr.c ---*/
-#line 112 "packet-x509af-template.c"
+#line 113 "packet-x509af-template.c"
   };
 
   /* Register protocol */
@@ -1515,7 +1516,7 @@ void proto_reg_handoff_x509af(void) {
 
 
 /*--- End of included file: packet-x509af-dis-tab.c ---*/
-#line 132 "packet-x509af-template.c"
+#line 133 "packet-x509af-template.c"
 
 	/*XXX these should really go to a better place but since that
 	  I have not that ITU standard, ill put it here for the time
diff --git a/epan/dissectors/packet-x509if.c b/epan/dissectors/packet-x509if.c
index 74a3e34579..34072efbec 100644
--- a/epan/dissectors/packet-x509if.c
+++ b/epan/dissectors/packet-x509if.c
@@ -1,6 +1,6 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
-/* .\packet-x509if.c                                                          */
+/* ./packet-x509if.c                                                          */
 /* ../../tools/asn2wrs.py -b -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn */
 
 /* Input file: packet-x509if-template.c */
@@ -38,6 +38,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
+#include <epan/oid_resolv.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -203,7 +204,7 @@ 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"
+#line 53 "packet-x509if-template.c"
 
 /* Initialize the subtree pointers */
 
@@ -280,7 +281,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"
+#line 56 "packet-x509if-template.c"
 
 static const char *object_identifier_id;
 static proto_tree *top_of_dn = NULL;
@@ -2242,7 +2243,7 @@ static void dissect_DistinguishedName_PDU(tvbuff_t *tvb, packet_info *pinfo, pro
 
 
 /*--- End of included file: packet-x509if-fn.c ---*/
-#line 77 "packet-x509if-template.c"
+#line 78 "packet-x509if-template.c"
 
 const char * x509if_get_last_dn(void)
 {
@@ -2856,7 +2857,7 @@ void proto_register_x509if(void) {
         "", HFILL }},
 
 /*--- End of included file: packet-x509if-hfarr.c ---*/
-#line 122 "packet-x509if-template.c"
+#line 123 "packet-x509if-template.c"
   };
 
   /* List of subtrees */
@@ -2935,7 +2936,7 @@ void proto_register_x509if(void) {
     &ett_x509if_MRSubstitution,
 
 /*--- End of included file: packet-x509if-ettarr.c ---*/
-#line 127 "packet-x509if-template.c"
+#line 128 "packet-x509if-template.c"
   };
 
   /* Register protocol */
@@ -2988,6 +2989,6 @@ void proto_reg_handoff_x509if(void) {
 
 
 /*--- End of included file: packet-x509if-dis-tab.c ---*/
-#line 146 "packet-x509if-template.c"
+#line 147 "packet-x509if-template.c"
 }