For proto_tree_add_item(..., proto_xxx, ...)use ENC_NA as the encoding arg.

[obnox/wireshark/wip.git] / epan / dissectors / packet-pkixtsp.c

diff --git a/epan/dissectors/packet-pkixtsp.c b/epan/dissectors/packet-pkixtsp.c
index 38895db2b901630fae27c098fcf0addc2656a87b..7bef3a117e7e3932d5c7ee7cce9aba25543d927c 100644 (file)
--- a/epan/dissectors/packet-pkixtsp.c
+++ b/epan/dissectors/packet-pkixtsp.c
@@ -1,11 +1,11 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
 /* packet-pkixtsp.c                                                           */
-/* ../../tools/asn2wrs.py -b -p pkixtsp -c ./pkixtsp.cnf -s ./packet-pkixtsp-template -D . PKIXTSP.asn */
+/* ../../tools/asn2wrs.py -b -p pkixtsp -c ./pkixtsp.cnf -s ./packet-pkixtsp-template -D . -O ../../epan/dissectors PKIXTSP.asn */
 
 /* Input file: packet-pkixtsp-template.c */
 
-#line 1 "packet-pkixtsp-template.c"
+#line 1 "../../asn1/pkixtsp/packet-pkixtsp-template.c"
 /* packet-pkixtsp.c
  * Routines for RFC2634 Extended Security Services packet dissection
  *   Ronnie Sahlberg 2004
@@ -53,7 +53,7 @@
 static int proto_pkixtsp = -1;
 
 /*--- Included file: packet-pkixtsp-hf.c ---*/
-#line 1 "packet-pkixtsp-hf.c"
+#line 1 "../../asn1/pkixtsp/packet-pkixtsp-hf.c"
 static int hf_pkixtsp_TSTInfo_PDU = -1;           /* TSTInfo */
 static int hf_pkixtsp_version = -1;               /* T_version */
 static int hf_pkixtsp_messageImprint = -1;        /* MessageImprint */
@@ -88,13 +88,13 @@ static int hf_pkixtsp_PKIFailureInfo_addInfoNotAvailable = -1;
 static int hf_pkixtsp_PKIFailureInfo_systemFailure = -1;
 
 /*--- End of included file: packet-pkixtsp-hf.c ---*/
-#line 47 "packet-pkixtsp-template.c"
+#line 47 "../../asn1/pkixtsp/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"
+#line 1 "../../asn1/pkixtsp/packet-pkixtsp-ett.c"
 static gint ett_pkixtsp_TimeStampReq = -1;
 static gint ett_pkixtsp_MessageImprint = -1;
 static gint ett_pkixtsp_TimeStampResp = -1;
@@ -104,12 +104,12 @@ static gint ett_pkixtsp_TSTInfo = -1;
 static gint ett_pkixtsp_Accuracy = -1;
 
 /*--- End of included file: packet-pkixtsp-ett.c ---*/
-#line 51 "packet-pkixtsp-template.c"
+#line 51 "../../asn1/pkixtsp/packet-pkixtsp-template.c"
 
 
 
 /*--- Included file: packet-pkixtsp-fn.c ---*/
-#line 1 "packet-pkixtsp-fn.c"
+#line 1 "../../asn1/pkixtsp/packet-pkixtsp-fn.c"
 
 static const value_string pkixtsp_T_version_vals[] = {
   {   1, "v1" },
@@ -361,7 +361,7 @@ static void dissect_TSTInfo_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto
 
 
 /*--- End of included file: packet-pkixtsp-fn.c ---*/
-#line 54 "packet-pkixtsp-template.c"
+#line 54 "../../asn1/pkixtsp/packet-pkixtsp-template.c"
 
 
 static int
@@ -378,7 +378,7 @@ dissect_timestamp_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr
 
 
        if(parent_tree){
-               item=proto_tree_add_item(parent_tree, proto_pkixtsp, tvb, 0, -1, FALSE);
+               item=proto_tree_add_item(parent_tree, proto_pkixtsp, tvb, 0, -1, ENC_NA);
                tree = proto_item_add_subtree(item, ett_pkixtsp);
        }
 
@@ -399,7 +399,7 @@ dissect_timestamp_query(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr
 
 
        if(parent_tree){
-               item=proto_tree_add_item(parent_tree, proto_pkixtsp, tvb, 0, -1, FALSE);
+               item=proto_tree_add_item(parent_tree, proto_pkixtsp, tvb, 0, -1, ENC_NA);
                tree = proto_item_add_subtree(item, ett_pkixtsp);
        }
 
@@ -414,99 +414,99 @@ void proto_register_pkixtsp(void) {
   static hf_register_info hf[] = {
 
 /*--- Included file: packet-pkixtsp-hfarr.c ---*/
-#line 1 "packet-pkixtsp-hfarr.c"
+#line 1 "../../asn1/pkixtsp/packet-pkixtsp-hfarr.c"
     { &hf_pkixtsp_TSTInfo_PDU,
       { "TSTInfo", "pkixtsp.TSTInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "pkixtsp.TSTInfo", HFILL }},
+        NULL, HFILL }},
     { &hf_pkixtsp_version,
       { "version", "pkixtsp.version",
         FT_INT32, BASE_DEC, VALS(pkixtsp_T_version_vals), 0,
-        "pkixtsp.T_version", HFILL }},
+        NULL, HFILL }},
     { &hf_pkixtsp_messageImprint,
       { "messageImprint", "pkixtsp.messageImprint",
         FT_NONE, BASE_NONE, NULL, 0,
-        "pkixtsp.MessageImprint", HFILL }},
+        NULL, HFILL }},
     { &hf_pkixtsp_reqPolicy,
       { "reqPolicy", "pkixtsp.reqPolicy",
         FT_OID, BASE_NONE, NULL, 0,
-        "pkixtsp.TSAPolicyId", HFILL }},
+        "TSAPolicyId", HFILL }},
     { &hf_pkixtsp_nonce,
       { "nonce", "pkixtsp.nonce",
         FT_INT32, BASE_DEC, NULL, 0,
-        "pkixtsp.INTEGER", HFILL }},
+        "INTEGER", HFILL }},
     { &hf_pkixtsp_certReq,
       { "certReq", "pkixtsp.certReq",
         FT_BOOLEAN, BASE_NONE, NULL, 0,
-        "pkixtsp.BOOLEAN", HFILL }},
+        "BOOLEAN", HFILL }},
     { &hf_pkixtsp_extensions,
       { "extensions", "pkixtsp.extensions",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "pkix1explicit.Extensions", HFILL }},
+        NULL, HFILL }},
     { &hf_pkixtsp_hashAlgorithm,
       { "hashAlgorithm", "pkixtsp.hashAlgorithm",
         FT_NONE, BASE_NONE, NULL, 0,
-        "pkix1explicit.AlgorithmIdentifier", HFILL }},
+        "AlgorithmIdentifier", HFILL }},
     { &hf_pkixtsp_hashedMessage,
       { "hashedMessage", "pkixtsp.hashedMessage",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "pkixtsp.OCTET_STRING", HFILL }},
+        "OCTET_STRING", HFILL }},
     { &hf_pkixtsp_status,
       { "status", "pkixtsp.status",
         FT_NONE, BASE_NONE, NULL, 0,
-        "pkixtsp.PKIStatusInfo", HFILL }},
+        "PKIStatusInfo", HFILL }},
     { &hf_pkixtsp_timeStampToken,
       { "timeStampToken", "pkixtsp.timeStampToken",
         FT_NONE, BASE_NONE, NULL, 0,
-        "pkixtsp.TimeStampToken", HFILL }},
+        NULL, HFILL }},
     { &hf_pkixtsp_pki_status,
       { "status", "pkixtsp.status",
         FT_INT32, BASE_DEC, VALS(pkixtsp_PKIStatus_vals), 0,
-        "pkixtsp.PKIStatus", HFILL }},
+        "PKIStatus", HFILL }},
     { &hf_pkixtsp_failInfo,
       { "failInfo", "pkixtsp.failInfo",
         FT_BYTES, BASE_NONE, NULL, 0,
-        "pkixtsp.PKIFailureInfo", HFILL }},
+        "PKIFailureInfo", HFILL }},
     { &hf_pkixtsp_tst_version,
       { "version", "pkixtsp.version",
         FT_INT32, BASE_DEC, VALS(pkixtsp_Tst_version_vals), 0,
-        "pkixtsp.Tst_version", HFILL }},
+        "Tst_version", HFILL }},
     { &hf_pkixtsp_policy,
       { "policy", "pkixtsp.policy",
         FT_OID, BASE_NONE, NULL, 0,
-        "pkixtsp.TSAPolicyId", HFILL }},
+        "TSAPolicyId", HFILL }},
     { &hf_pkixtsp_serialNumber,
       { "serialNumber", "pkixtsp.serialNumber",
         FT_INT32, BASE_DEC, NULL, 0,
-        "pkixtsp.INTEGER", HFILL }},
+        "INTEGER", HFILL }},
     { &hf_pkixtsp_genTime,
       { "genTime", "pkixtsp.genTime",
         FT_STRING, BASE_NONE, NULL, 0,
-        "pkixtsp.GeneralizedTime", HFILL }},
+        "GeneralizedTime", HFILL }},
     { &hf_pkixtsp_accuracy,
       { "accuracy", "pkixtsp.accuracy",
         FT_NONE, BASE_NONE, NULL, 0,
-        "pkixtsp.Accuracy", HFILL }},
+        NULL, HFILL }},
     { &hf_pkixtsp_ordering,
       { "ordering", "pkixtsp.ordering",
         FT_BOOLEAN, BASE_NONE, NULL, 0,
-        "pkixtsp.BOOLEAN", HFILL }},
+        "BOOLEAN", HFILL }},
     { &hf_pkixtsp_tsa,
       { "tsa", "pkixtsp.tsa",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "pkix1implicit.GeneralName", HFILL }},
+        "GeneralName", HFILL }},
     { &hf_pkixtsp_seconds,
       { "seconds", "pkixtsp.seconds",
         FT_INT32, BASE_DEC, NULL, 0,
-        "pkixtsp.INTEGER", HFILL }},
+        "INTEGER", HFILL }},
     { &hf_pkixtsp_millis,
       { "millis", "pkixtsp.millis",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "pkixtsp.INTEGER_1_999", HFILL }},
+        "INTEGER_1_999", HFILL }},
     { &hf_pkixtsp_micros,
       { "micros", "pkixtsp.micros",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "pkixtsp.INTEGER_1_999", HFILL }},
+        "INTEGER_1_999", HFILL }},
     { &hf_pkixtsp_PKIFailureInfo_badAlg,
       { "badAlg", "pkixtsp.badAlg",
         FT_BOOLEAN, 8, NULL, 0x80,
@@ -541,7 +541,7 @@ void proto_register_pkixtsp(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-pkixtsp-hfarr.c ---*/
-#line 105 "packet-pkixtsp-template.c"
+#line 105 "../../asn1/pkixtsp/packet-pkixtsp-template.c"
   };
 
   /* List of subtrees */
@@ -549,7 +549,7 @@ void proto_register_pkixtsp(void) {
        &ett_pkixtsp,
 
 /*--- Included file: packet-pkixtsp-ettarr.c ---*/
-#line 1 "packet-pkixtsp-ettarr.c"
+#line 1 "../../asn1/pkixtsp/packet-pkixtsp-ettarr.c"
     &ett_pkixtsp_TimeStampReq,
     &ett_pkixtsp_MessageImprint,
     &ett_pkixtsp_TimeStampResp,
@@ -559,7 +559,7 @@ void proto_register_pkixtsp(void) {
     &ett_pkixtsp_Accuracy,
 
 /*--- End of included file: packet-pkixtsp-ettarr.c ---*/
-#line 111 "packet-pkixtsp-template.c"
+#line 111 "../../asn1/pkixtsp/packet-pkixtsp-template.c"
   };
 
   /* Register protocol */
@@ -585,11 +585,11 @@ void proto_reg_handoff_pkixtsp(void) {
 
 
 /*--- Included file: packet-pkixtsp-dis-tab.c ---*/
-#line 1 "packet-pkixtsp-dis-tab.c"
+#line 1 "../../asn1/pkixtsp/packet-pkixtsp-dis-tab.c"
   register_ber_oid_dissector("1.2.840.113549.1.9.16.1.4", dissect_TSTInfo_PDU, proto_pkixtsp, "id-ct-TSTInfo");
 
 
 /*--- End of included file: packet-pkixtsp-dis-tab.c ---*/
-#line 135 "packet-pkixtsp-template.c"
+#line 135 "../../asn1/pkixtsp/packet-pkixtsp-template.c"
 }