diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:33 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:33 +0000 |
| commit | 9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9 (patch) | |
| tree | 2784370cda9bbf2da9114d70f05399c0b229d28c /epan/dissectors/asn1/h282 | |
| parent | Adding debian version 4.2.6-1. (diff) | |
| download | wireshark-9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9.tar.xz wireshark-9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9.zip | |
Merging upstream version 4.4.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'epan/dissectors/asn1/h282')
| -rw-r--r-- | epan/dissectors/asn1/h282/h282.cnf | 12 | ||||
| -rw-r--r-- | epan/dissectors/asn1/h282/packet-h282-template.c | 7 |
2 files changed, 10 insertions, 9 deletions
diff --git a/epan/dissectors/asn1/h282/h282.cnf b/epan/dissectors/asn1/h282/h282.cnf index 10aeae36..6cfb716a 100644 --- a/epan/dissectors/asn1/h282/h282.cnf +++ b/epan/dissectors/asn1/h282/h282.cnf @@ -25,8 +25,8 @@ CameraFilterCapability/filterTextLabel/_item/filterTextLabel ABBREV=filterTextLa #.FN_PARS RequestPDU VAL_PTR = &msg_type #.FN_HDR - gint32 msg_type = -1; - const gchar *p = NULL; + int32_t msg_type = -1; + const char *p = NULL; #.FN_FTR p = try_val_to_str(msg_type, VALS(h282_RequestPDU_vals)); if (p) @@ -36,8 +36,8 @@ CameraFilterCapability/filterTextLabel/_item/filterTextLabel ABBREV=filterTextLa #.FN_PARS ResponsePDU VAL_PTR = &msg_type #.FN_HDR - gint32 msg_type = -1; - const gchar *p = NULL; + int32_t msg_type = -1; + const char *p = NULL; #.FN_FTR p = try_val_to_str(msg_type, VALS(h282_ResponsePDU_vals)); if (p) @@ -47,8 +47,8 @@ CameraFilterCapability/filterTextLabel/_item/filterTextLabel ABBREV=filterTextLa #.FN_PARS IndicationPDU VAL_PTR = &msg_type #.FN_HDR - gint32 msg_type = -1; - const gchar *p = NULL; + int32_t msg_type = -1; + const char *p = NULL; #.FN_FTR p = try_val_to_str(msg_type, VALS(h282_IndicationPDU_vals)); if (p) diff --git a/epan/dissectors/asn1/h282/packet-h282-template.c b/epan/dissectors/asn1/h282/packet-h282-template.c index d371529f..6b701a61 100644 --- a/epan/dissectors/asn1/h282/packet-h282-template.c +++ b/epan/dissectors/asn1/h282/packet-h282-template.c @@ -14,6 +14,7 @@ #include <epan/packet.h> #include <epan/oids.h> #include <epan/asn1.h> +#include <wsutil/array.h> #include "packet-per.h" @@ -25,11 +26,11 @@ void proto_register_h282(void); void proto_reg_handoff_h282(void); /* Initialize the protocol and registered fields */ -static int proto_h282 = -1; +static int proto_h282; #include "packet-h282-hf.c" /* Initialize the subtree pointers */ -static int ett_h282 = -1; +static int ett_h282; #include "packet-h282-ett.c" /* Dissectors */ @@ -61,7 +62,7 @@ void proto_register_h282(void) { }; /* List of subtrees */ - static gint *ett[] = { + static int *ett[] = { &ett_h282, #include "packet-h282-ettarr.c" }; |