diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:53 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:53 +0000 |
| commit | a86c5f7cae7ec9a3398300555a0b644689d946a1 (patch) | |
| tree | 39fe4b107c71174fd1e8a8ceb9a4d2aa14116248 /epan/dissectors/asn1/pkixtsp | |
| parent | Releasing progress-linux version 4.2.6-1~progress7.99u1. (diff) | |
| download | wireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.tar.xz wireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.zip | |
Merging upstream version 4.4.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'epan/dissectors/asn1/pkixtsp')
| -rw-r--r-- | epan/dissectors/asn1/pkixtsp/packet-pkixtsp-template.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/epan/dissectors/asn1/pkixtsp/packet-pkixtsp-template.c b/epan/dissectors/asn1/pkixtsp/packet-pkixtsp-template.c index 319e91d9..707085b0 100644 --- a/epan/dissectors/asn1/pkixtsp/packet-pkixtsp-template.c +++ b/epan/dissectors/asn1/pkixtsp/packet-pkixtsp-template.c @@ -14,6 +14,7 @@ #include <epan/packet.h> #include <epan/asn1.h> +#include <wsutil/array.h> #include "packet-ber.h" #include "packet-pkixtsp.h" #include "packet-pkix1explicit.h" @@ -31,11 +32,11 @@ static dissector_handle_t timestamp_reply_handle; static dissector_handle_t timestamp_query_handle; /* Initialize the protocol and registered fields */ -static int proto_pkixtsp = -1; +static int proto_pkixtsp; #include "packet-pkixtsp-hf.c" /* Initialize the subtree pointers */ -static gint ett_pkixtsp = -1; +static int ett_pkixtsp; #include "packet-pkixtsp-ett.c" @@ -48,7 +49,7 @@ dissect_timestamp_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr proto_item *item=NULL; proto_tree *tree=NULL; asn1_ctx_t asn1_ctx; - asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); + asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, true, pinfo); col_set_str(pinfo->cinfo, COL_PROTOCOL, "PKIXTSP"); @@ -60,7 +61,7 @@ dissect_timestamp_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr tree = proto_item_add_subtree(item, ett_pkixtsp); } - return dissect_pkixtsp_TimeStampResp(FALSE, tvb, 0, &asn1_ctx, tree, -1); + return dissect_pkixtsp_TimeStampResp(false, tvb, 0, &asn1_ctx, tree, -1); } static int @@ -69,7 +70,7 @@ dissect_timestamp_query(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr proto_item *item=NULL; proto_tree *tree=NULL; asn1_ctx_t asn1_ctx; - asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); + asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, true, pinfo); col_set_str(pinfo->cinfo, COL_PROTOCOL, "PKIXTSP"); @@ -81,7 +82,7 @@ dissect_timestamp_query(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr tree = proto_item_add_subtree(item, ett_pkixtsp); } - return dissect_pkixtsp_TimeStampReq(FALSE, tvb, 0, &asn1_ctx, tree, -1); + return dissect_pkixtsp_TimeStampReq(false, tvb, 0, &asn1_ctx, tree, -1); } @@ -94,7 +95,7 @@ void proto_register_pkixtsp(void) { }; /* List of subtrees */ - static gint *ett[] = { + static int *ett[] = { &ett_pkixtsp, #include "packet-pkixtsp-ettarr.c" }; |