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/cdt | |
| 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/cdt')
| -rw-r--r-- | epan/dissectors/asn1/cdt/cdt.cnf | 4 | ||||
| -rw-r--r-- | epan/dissectors/asn1/cdt/packet-cdt-template.c | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/epan/dissectors/asn1/cdt/cdt.cnf b/epan/dissectors/asn1/cdt/cdt.cnf index 4369bd69..e288bbdc 100644 --- a/epan/dissectors/asn1/cdt/cdt.cnf +++ b/epan/dissectors/asn1/cdt/cdt.cnf @@ -16,7 +16,7 @@ CompressedData B "1.3.26.0.4406.0.4.2" "cdt" VAL_PTR = &value #.FN_BODY AlgorithmID-ShortForm - guint32 value; + uint32_t value; %(DEFAULT_BODY)s proto_item_append_text (cdt_item, ", %%s", @@ -76,7 +76,7 @@ CompressedData B "1.3.26.0.4406.0.4.2" "cdt" return offset; } - next_tvb = tvb_child_uncompress (tvb, compr_tvb, 0, tvb_reported_length (compr_tvb)); + next_tvb = tvb_child_uncompress_zlib(tvb, compr_tvb, 0, tvb_reported_length (compr_tvb)); if (next_tvb == NULL) { proto_tree_add_expert(top_tree, actx->pinfo, &ei_cdt_unable_uncompress_content, diff --git a/epan/dissectors/asn1/cdt/packet-cdt-template.c b/epan/dissectors/asn1/cdt/packet-cdt-template.c index 8cf27bbd..4ae9c331 100644 --- a/epan/dissectors/asn1/cdt/packet-cdt-template.c +++ b/epan/dissectors/asn1/cdt/packet-cdt-template.c @@ -19,7 +19,7 @@ #include <epan/oids.h> #include <epan/expert.h> #include <epan/asn1.h> - +#include <wsutil/array.h> #include "packet-ber.h" #include "packet-p1.h" @@ -38,20 +38,20 @@ void proto_register_cdt(void); void proto_reg_handoff_cdt(void); -static proto_tree *top_tree = NULL; -static proto_item *cdt_item = NULL; +static proto_tree *top_tree; +static proto_item *cdt_item; -static guint32 content_type = 0; +static uint32_t content_type; /* Initialize the protocol and registered fields */ -static int proto_cdt = -1; +static int proto_cdt; #include "packet-cdt-hf.c" /* Initialize the subtree pointers */ #include "packet-cdt-ett.c" -static expert_field ei_cdt_unable_compress_content = EI_INIT; -static expert_field ei_cdt_unable_uncompress_content = EI_INIT; +static expert_field ei_cdt_unable_compress_content; +static expert_field ei_cdt_unable_uncompress_content; #include "packet-cdt-fn.c" @@ -89,7 +89,7 @@ void proto_register_cdt (void) { }; /* List of subtrees */ - static gint *ett[] = { + static int *ett[] = { #include "packet-cdt-ettarr.c" }; |