use autogenerated _PDU functions

svn path=/trunk/; revision=11988

2 files changed, 18 insertions, 95 deletions

diff --git a/asn1/ns-cert-exts/ns_cert_exts.cnf b/asn1/ns-cert-exts/ns_cert_exts.cnf
index a3b4c0d605..8c35f27c16 100644
--- a/asn1/ns-cert-exts/ns_cert_exts.cnf
+++ b/asn1/ns-cert-exts/ns_cert_exts.cnf
@@ -7,6 +7,16 @@
 

 #.EXPORTS

 

+#.PDU

+BaseUrl

+CaPolicyUrl

+CaRevocationUrl

+CertRenewalUrl

+CertType

+Comment

+RevocationUrl

+SslServerName

+

 #.NO_EMIT

 

 #.TYPE_RENAME

diff --git a/asn1/ns-cert-exts/packet-ns_cert_exts-template.c b/asn1/ns-cert-exts/packet-ns_cert_exts-template.c
index df3eb8bf40..6ab6c4e082 100644
--- a/asn1/ns-cert-exts/packet-ns_cert_exts-template.c
+++ b/asn1/ns-cert-exts/packet-ns_cert_exts-template.c
@@ -41,14 +41,6 @@
 
 /* Initialize the protocol and registered fields */
 int proto_ns_cert_exts = -1;
-static int hf_ns_cert_exts_comment = -1;
-static int hf_ns_cert_exts_ssl_server_name = -1;
-static int hf_ns_cert_exts_ca_policy_url = -1;
-static int hf_ns_cert_exts_cert_renewal_url = -1;
-static int hf_ns_cert_exts_ca_revocation_url = -1;
-static int hf_ns_cert_exts_revocation_url = -1;
-static int hf_ns_cert_exts_base_url = -1;
-static int hf_ns_cert_exts_cert_type = -1;
 #include "packet-ns_cert_exts-hf.c"
 
 /* Initialize the subtree pointers */
@@ -57,90 +49,11 @@ static int hf_ns_cert_exts_cert_type = -1;
 #include "packet-ns_cert_exts-fn.c"
 
 
-static void
-dissect_ns_cert_exts_cert_type_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
-{
-	dissect_ns_cert_exts_CertType(FALSE, tvb, 0, pinfo, tree, hf_ns_cert_exts_cert_type);
-}
-
-static void
-dissect_ns_cert_exts_base_url_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
-{
-	dissect_ns_cert_exts_BaseUrl(FALSE, tvb, 0, pinfo, tree, hf_ns_cert_exts_base_url);
-}
-
-static void
-dissect_ns_cert_exts_revocation_url_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
-{
-	dissect_ns_cert_exts_RevocationUrl(FALSE, tvb, 0, pinfo, tree, hf_ns_cert_exts_revocation_url);
-}
-
-static void
-dissect_ns_cert_exts_ca_revocation_url_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
-{
-	dissect_ns_cert_exts_CaRevocationUrl(FALSE, tvb, 0, pinfo, tree, hf_ns_cert_exts_ca_revocation_url);
-}
-
-static void
-dissect_ns_cert_exts_cert_renewal_url_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
-{
-	dissect_ns_cert_exts_CertRenewalUrl(FALSE, tvb, 0, pinfo, tree, hf_ns_cert_exts_cert_renewal_url);
-}
-
-static void
-dissect_ns_cert_exts_ca_policy_url_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
-{
-	dissect_ns_cert_exts_CaPolicyUrl(FALSE, tvb, 0, pinfo, tree, hf_ns_cert_exts_ca_policy_url);
-}
-
-static void
-dissect_ns_cert_exts_ssl_server_name_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
-{
-	dissect_ns_cert_exts_SslServerName(FALSE, tvb, 0, pinfo, tree, hf_ns_cert_exts_ssl_server_name);
-}
-
-static void
-dissect_ns_cert_exts_comment_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
-{
-	dissect_ns_cert_exts_Comment(FALSE, tvb, 0, pinfo, tree, hf_ns_cert_exts_comment);
-}
 /*--- proto_register_ns_cert_exts -------------------------------------------*/
 void proto_register_ns_cert_exts(void) {
 
   /* List of fields */
   static hf_register_info hf[] = {
-	  { &hf_ns_cert_exts_cert_type,
-		  { "Cert Type", "ns_cert_exts.cert-type",
-		    FT_BYTES, BASE_HEX, NULL, 0,
-		    "Cert Type", HFILL }},
-	  { &hf_ns_cert_exts_base_url,
-		  { "Base URL", "ns_cert_exts.base-url",
-		    FT_STRING, BASE_NONE, NULL, 0,
-		    "Base URL", HFILL }},
-	  { &hf_ns_cert_exts_revocation_url,
-		  { "Revocation URL", "ns_cert_exts.revocation-url",
-		    FT_STRING, BASE_NONE, NULL, 0,
-		    "Revocation URL", HFILL }},
-	  { &hf_ns_cert_exts_ca_revocation_url,
-		  { "CA Revocation URL", "ns_cert_exts.ca-revocation-url",
-		    FT_STRING, BASE_NONE, NULL, 0,
-		    "CA Revocation URL", HFILL }},
-	  { &hf_ns_cert_exts_cert_renewal_url,
-		  { "Cert Renewal URL", "ns_cert_exts.cert-renewal-url",
-		    FT_STRING, BASE_NONE, NULL, 0,
-		    "Cert Renewal URL", HFILL }},
-	  { &hf_ns_cert_exts_ca_policy_url,
-		  { "CA Policy URL", "ns_cert_exts.ca-policy-url",
-		    FT_STRING, BASE_NONE, NULL, 0,
-		    "CA Policy URL", HFILL }},
-	  { &hf_ns_cert_exts_ssl_server_name,
-		  { "SSL Server name", "ns_cert_exts.ssl-server-name",
-		    FT_STRING, BASE_NONE, NULL, 0,
-		    "SSL server Name", HFILL }},
-	  { &hf_ns_cert_exts_comment,
-		  { "Comment", "ns_cert_exts.comment",
-		    FT_STRING, BASE_NONE, NULL, 0,
-		    "Comment", HFILL }},
 #include "packet-ns_cert_exts-hfarr.c"
   };
 
@@ -161,13 +74,13 @@ void proto_register_ns_cert_exts(void) {
 
 /*--- proto_reg_handoff_ns_cert_exts ---------------------------------------*/
 void proto_reg_handoff_ns_cert_exts(void) {
-	register_ber_oid_dissector("2.16.840.1.113730.1.1", dissect_ns_cert_exts_cert_type_callback, proto_ns_cert_exts, "ns-cert-exts.cert_type");
-	register_ber_oid_dissector("2.16.840.1.113730.1.2", dissect_ns_cert_exts_base_url_callback, proto_ns_cert_exts, "ns-cert-exts.base_url");
-	register_ber_oid_dissector("2.16.840.1.113730.1.3", dissect_ns_cert_exts_revocation_url_callback, proto_ns_cert_exts, "ns-cert-exts.revocation-url");
-	register_ber_oid_dissector("2.16.840.1.113730.1.4", dissect_ns_cert_exts_ca_revocation_url_callback, proto_ns_cert_exts, "ns-cert-exts.ca-revocation-url");
-	register_ber_oid_dissector("2.16.840.1.113730.1.7", dissect_ns_cert_exts_cert_renewal_url_callback, proto_ns_cert_exts, "ns-cert-exts.cert-renewal-url");
-	register_ber_oid_dissector("2.16.840.1.113730.1.8", dissect_ns_cert_exts_ca_policy_url_callback, proto_ns_cert_exts, "ns-cert-exts.ca-policy-url");
-	register_ber_oid_dissector("2.16.840.1.113730.1.12", dissect_ns_cert_exts_ssl_server_name_callback, proto_ns_cert_exts, "ns-cert-exts.ssl-server-name");
-	register_ber_oid_dissector("2.16.840.1.113730.1.13", dissect_ns_cert_exts_comment_callback, proto_ns_cert_exts, "ns-cert-exts.comment");
+	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");
+	register_ber_oid_dissector("2.16.840.1.113730.1.4", dissect_CaRevocationUrl_PDU, proto_ns_cert_exts, "ns-cert-exts.ca-revocation-url");
+	register_ber_oid_dissector("2.16.840.1.113730.1.7", dissect_CertRenewalUrl_PDU, proto_ns_cert_exts, "ns-cert-exts.cert-renewal-url");
+	register_ber_oid_dissector("2.16.840.1.113730.1.8", dissect_CaPolicyUrl_PDU, proto_ns_cert_exts, "ns-cert-exts.ca-policy-url");
+	register_ber_oid_dissector("2.16.840.1.113730.1.12", dissect_SslServerName_PDU, proto_ns_cert_exts, "ns-cert-exts.ssl-server-name");
+	register_ber_oid_dissector("2.16.840.1.113730.1.13", dissect_Comment_PDU, proto_ns_cert_exts, "ns-cert-exts.comment");
 }