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/h450-ros | |
| 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/h450-ros')
| -rw-r--r-- | epan/dissectors/asn1/h450-ros/h450-ros.cnf | 2 | ||||
| -rw-r--r-- | epan/dissectors/asn1/h450-ros/packet-h450-ros-template.c | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/epan/dissectors/asn1/h450-ros/h450-ros.cnf b/epan/dissectors/asn1/h450-ros/h450-ros.cnf index cbb65776..ee06bc92 100644 --- a/epan/dissectors/asn1/h450-ros/h450-ros.cnf +++ b/epan/dissectors/asn1/h450-ros/h450-ros.cnf @@ -65,7 +65,7 @@ ReturnErrorProblem VAL_PTR = &problem_val # body is implemented manually as asn2wrs is not able to handle subtype constraint event passed through parameter #.FN_BODY Invoke/invokeId offset = dissect_per_constrained_integer(%(TVB)s, %(OFFSET)s, %(ACTX)s, %(TREE)s, %(HF_INDEX)s, - 0U, 65535U, %(VAL_PTR)s, TRUE); + 0U, 65535U, %(VAL_PTR)s, true); #.END #.FIELD_ATTR diff --git a/epan/dissectors/asn1/h450-ros/packet-h450-ros-template.c b/epan/dissectors/asn1/h450-ros/packet-h450-ros-template.c index df2a53db..cc6d3c0b 100644 --- a/epan/dissectors/asn1/h450-ros/packet-h450-ros-template.c +++ b/epan/dissectors/asn1/h450-ros/packet-h450-ros-template.c @@ -15,6 +15,7 @@ #include <epan/strutil.h> #include <epan/asn1.h> #include <epan/expert.h> +#include <wsutil/array.h> #include "packet-per.h" #include "packet-h450-ros.h" @@ -27,22 +28,22 @@ void proto_register_h450_ros(void); void proto_reg_handoff_h450_ros(void); /* Initialize the protocol and registered fields */ -static int proto_h450_ros = -1; +static int proto_h450_ros; #include "packet-h450-ros-hf.c" /* Initialize the subtree pointers */ #include "packet-h450-ros-ett.c" -static expert_field ei_ros_undecoded = EI_INIT; +static expert_field ei_ros_undecoded; /* Preferences */ /* Subdissectors */ -static dissector_handle_t data_handle = NULL; +static dissector_handle_t data_handle; /* Global variables */ -static gint32 problem_val; -static gchar problem_str[64]; +static int32_t problem_val; +static char problem_str[64]; static tvbuff_t *arg_next_tvb, *res_next_tvb, *err_next_tvb; static int @@ -74,7 +75,7 @@ void proto_register_h450_ros(void) { }; /* List of subtrees */ - static gint *ett[] = { + static int *ett[] = { #include "packet-h450-ros-ettarr.c" }; |