From 6db1e35bb3a4e2d80126b2e4e614b321e8f251ec Mon Sep 17 00:00:00 2001 From: Ronnie Sahlberg Date: Mon, 13 Sep 2004 08:33:03 +0000 Subject: [PATCH] use autogenerated _PDU callbacks svn path=/trunk/; revision=11987 --- epan/dissectors/packet-ns_cert_exts.c | 200 ++++++++++---------------- 1 file changed, 77 insertions(+), 123 deletions(-) diff --git a/epan/dissectors/packet-ns_cert_exts.c b/epan/dissectors/packet-ns_cert_exts.c index 6099248b82..eea509b522 100644 --- a/epan/dissectors/packet-ns_cert_exts.c +++ b/epan/dissectors/packet-ns_cert_exts.c @@ -1,10 +1,9 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ -/* packet-ns_cert_exts.c */ -/* ../../tools/asn2eth.py -X -b -e -p ns_cert_exts -c ns_cert_exts.cnf -s packet-ns_cert_exts-template NETSCAPE-CERT-EXTS.asn */ +/* ./packet-ns_cert_exts.c */ +/* ../../tools/asn2eth.py -X -b -p ns_cert_exts -c ns_cert_exts.cnf -s packet-ns_cert_exts-template NETSCAPE-CERT-EXTS.asn */ /* Input file: packet-ns_cert_exts-template.c */ -/* Include files: packet-ns_cert_exts-hf.c, packet-ns_cert_exts-ett.c, packet-ns_cert_exts-fn.c, packet-ns_cert_exts-hfarr.c, packet-ns_cert_exts-ettarr.c, packet-ns_cert_exts-val.h */ /* packet-ns_cert_exts.c * Routines for NetScape Certificate Extensions packet dissection @@ -49,22 +48,17 @@ /* 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; /*--- Included file: packet-ns_cert_exts-hf.c ---*/ -/* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Ethereal dissector compiler */ -/* packet-ns_cert_exts-hf.c */ -/* ../../tools/asn2eth.py -X -b -e -p ns_cert_exts -c ns_cert_exts.cnf -s packet-ns_cert_exts-template NETSCAPE-CERT-EXTS.asn */ - +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 */ +static int hf_ns_cert_exts_CaPolicyUrl_PDU = -1; /* CaPolicyUrl */ +static int hf_ns_cert_exts_Comment_PDU = -1; /* Comment */ +static int hf_ns_cert_exts_SslServerName_PDU = -1; /* SslServerName */ +static int hf_ns_cert_exts_CertRenewalUrl_PDU = -1; /* CertRenewalUrl */ +static int hf_ns_cert_exts_CertType_PDU = -1; /* CertType */ /* named bits */ static int hf_ns_cert_exts_CertType_client = -1; static int hf_ns_cert_exts_CertType_server = -1; @@ -77,11 +71,6 @@ static int hf_ns_cert_exts_CertType_ca = -1; /*--- Included file: packet-ns_cert_exts-ett.c ---*/ -/* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Ethereal dissector compiler */ -/* packet-ns_cert_exts-ett.c */ -/* ../../tools/asn2eth.py -X -b -e -p ns_cert_exts -c ns_cert_exts.cnf -s packet-ns_cert_exts-template NETSCAPE-CERT-EXTS.asn */ - static gint ett_ns_cert_exts_CertType = -1; /*--- End of included file: packet-ns_cert_exts-ett.c ---*/ @@ -90,11 +79,6 @@ static gint ett_ns_cert_exts_CertType = -1; /*--- Included file: packet-ns_cert_exts-fn.c ---*/ -/* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Ethereal dissector compiler */ -/* packet-ns_cert_exts-fn.c */ -/* ../../tools/asn2eth.py -X -b -e -p ns_cert_exts -c ns_cert_exts.cnf -s packet-ns_cert_exts-template NETSCAPE-CERT-EXTS.asn */ - /*--- Fields for imported types ---*/ @@ -184,103 +168,78 @@ dissect_ns_cert_exts_CertType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs return offset; } +/*--- PDUs ---*/ + +static void dissect_BaseUrl_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { + dissect_ns_cert_exts_BaseUrl(FALSE, tvb, 0, pinfo, tree, hf_ns_cert_exts_BaseUrl_PDU); +} +static void dissect_RevocationUrl_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { + dissect_ns_cert_exts_RevocationUrl(FALSE, tvb, 0, pinfo, tree, hf_ns_cert_exts_RevocationUrl_PDU); +} +static void dissect_CaRevocationUrl_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { + dissect_ns_cert_exts_CaRevocationUrl(FALSE, tvb, 0, pinfo, tree, hf_ns_cert_exts_CaRevocationUrl_PDU); +} +static void dissect_CaPolicyUrl_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { + dissect_ns_cert_exts_CaPolicyUrl(FALSE, tvb, 0, pinfo, tree, hf_ns_cert_exts_CaPolicyUrl_PDU); +} +static void dissect_Comment_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { + dissect_ns_cert_exts_Comment(FALSE, tvb, 0, pinfo, tree, hf_ns_cert_exts_Comment_PDU); +} +static void dissect_SslServerName_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { + dissect_ns_cert_exts_SslServerName(FALSE, tvb, 0, pinfo, tree, hf_ns_cert_exts_SslServerName_PDU); +} +static void dissect_CertRenewalUrl_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { + dissect_ns_cert_exts_CertRenewalUrl(FALSE, tvb, 0, pinfo, tree, hf_ns_cert_exts_CertRenewalUrl_PDU); +} +static void dissect_CertType_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { + dissect_ns_cert_exts_CertType(FALSE, tvb, 0, pinfo, tree, hf_ns_cert_exts_CertType_PDU); +} + /*--- End of included file: 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 }}, /*--- Included file: packet-ns_cert_exts-hfarr.c ---*/ -/* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Ethereal dissector compiler */ -/* packet-ns_cert_exts-hfarr.c */ -/* ../../tools/asn2eth.py -X -b -e -p ns_cert_exts -c ns_cert_exts.cnf -s packet-ns_cert_exts-template NETSCAPE-CERT-EXTS.asn */ - + { &hf_ns_cert_exts_BaseUrl_PDU, + { "BaseUrl", "ns_cert_exts.BaseUrl", + FT_STRING, BASE_NONE, NULL, 0, + "BaseUrl", HFILL }}, + { &hf_ns_cert_exts_RevocationUrl_PDU, + { "RevocationUrl", "ns_cert_exts.RevocationUrl", + FT_STRING, BASE_NONE, NULL, 0, + "RevocationUrl", HFILL }}, + { &hf_ns_cert_exts_CaRevocationUrl_PDU, + { "CaRevocationUrl", "ns_cert_exts.CaRevocationUrl", + FT_STRING, BASE_NONE, NULL, 0, + "CaRevocationUrl", HFILL }}, + { &hf_ns_cert_exts_CaPolicyUrl_PDU, + { "CaPolicyUrl", "ns_cert_exts.CaPolicyUrl", + FT_STRING, BASE_NONE, NULL, 0, + "CaPolicyUrl", HFILL }}, + { &hf_ns_cert_exts_Comment_PDU, + { "Comment", "ns_cert_exts.Comment", + FT_STRING, BASE_NONE, NULL, 0, + "Comment", HFILL }}, + { &hf_ns_cert_exts_SslServerName_PDU, + { "SslServerName", "ns_cert_exts.SslServerName", + FT_STRING, BASE_NONE, NULL, 0, + "SslServerName", HFILL }}, + { &hf_ns_cert_exts_CertRenewalUrl_PDU, + { "CertRenewalUrl", "ns_cert_exts.CertRenewalUrl", + FT_STRING, BASE_NONE, NULL, 0, + "CertRenewalUrl", HFILL }}, + { &hf_ns_cert_exts_CertType_PDU, + { "CertType", "ns_cert_exts.CertType", + FT_BYTES, BASE_HEX, NULL, 0, + "CertType", HFILL }}, { &hf_ns_cert_exts_CertType_client, { "client", "ns_cert_exts.client", FT_BOOLEAN, 8, NULL, 0x80, @@ -303,11 +262,6 @@ void proto_register_ns_cert_exts(void) { /*--- Included file: packet-ns_cert_exts-ettarr.c ---*/ -/* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Ethereal dissector compiler */ -/* packet-ns_cert_exts-ettarr.c */ -/* ../../tools/asn2eth.py -X -b -e -p ns_cert_exts -c ns_cert_exts.cnf -s packet-ns_cert_exts-template NETSCAPE-CERT-EXTS.asn */ - &ett_ns_cert_exts_CertType, /*--- End of included file: packet-ns_cert_exts-ettarr.c ---*/ @@ -326,13 +280,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"); }