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/p7 | |
| 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/p7')
| -rw-r--r-- | epan/dissectors/asn1/p7/p7.cnf | 16 | ||||
| -rw-r--r-- | epan/dissectors/asn1/p7/packet-p7-template.c | 15 |
2 files changed, 16 insertions, 15 deletions
diff --git a/epan/dissectors/asn1/p7/p7.cnf b/epan/dissectors/asn1/p7/p7.cnf index 2fe5f0ba..164e361d 100644 --- a/epan/dissectors/asn1/p7/p7.cnf +++ b/epan/dissectors/asn1/p7/p7.cnf @@ -170,12 +170,12 @@ MessageGroupErrorParameter/problem ABBREV=messageGroupErrorParameter.gr ServiceErrorParameter/problem ABBREV=serviceErrorParameter.problem ModifyErrorParameter/problem ABBREV=modifyErrorParameter.problem -# This table creates the value_sting to name P7 operation codes and errors +# This table creates the value_string to name P7 operation codes and errors # in file packet-p7-table.c which is included in the template file # #.TABLE_HDR /* P7 ABSTRACT-OPERATIONS */ -const value_string p7_opr_code_string_vals[] = { +static const value_string p7_opr_code_string_vals[] = { #.TABLE_BODY OPERATION { %(&operationCode)s, "%(_ident)s" }, #.TABLE_FTR @@ -407,16 +407,16 @@ RTSE-apdus B "2.6.0.2.10""id-as-ms-rtse" col_append_fstr(actx->pinfo->cinfo, COL_INFO, " (count=%%d)", count); #.FN_BODY MSMessageSubmissionArgument - p1_initialize_content_globals (actx, tree, TRUE); + p1_initialize_content_globals (actx, tree, true); %(DEFAULT_BODY)s - p1_initialize_content_globals (actx, NULL, FALSE); + p1_initialize_content_globals (actx, NULL, false); #.FN_BODY EntryInformation - p1_initialize_content_globals (actx, NULL, FALSE); + p1_initialize_content_globals (actx, NULL, false); %(DEFAULT_BODY)s - p1_initialize_content_globals (actx, NULL, FALSE); + p1_initialize_content_globals (actx, NULL, false); #.FN_BODY EntryModification - p1_initialize_content_globals (actx, NULL, FALSE); + p1_initialize_content_globals (actx, NULL, false); %(DEFAULT_BODY)s - p1_initialize_content_globals (actx, NULL, FALSE); + p1_initialize_content_globals (actx, NULL, false); diff --git a/epan/dissectors/asn1/p7/packet-p7-template.c b/epan/dissectors/asn1/p7/packet-p7-template.c index 621aa9b0..ce690e46 100644 --- a/epan/dissectors/asn1/p7/packet-p7-template.c +++ b/epan/dissectors/asn1/p7/packet-p7-template.c @@ -16,6 +16,7 @@ #include <epan/oids.h> #include <epan/asn1.h> #include <epan/proto_data.h> +#include <wsutil/array.h> #include "packet-ber.h" #include "packet-acse.h" @@ -33,17 +34,17 @@ void proto_register_p7(void); void proto_reg_handoff_p7(void); -static int seqno = 0; +static int seqno; /* Initialize the protocol and registered fields */ -static int proto_p7 = -1; +static int proto_p7; #include "packet-p7-val.h" #include "packet-p7-hf.c" /* Initialize the subtree pointers */ -static gint ett_p7 = -1; +static int ett_p7; #include "packet-p7-ett.c" #include "packet-p7-table.c" /* operation and error codes */ @@ -74,7 +75,7 @@ void proto_register_p7(void) { }; /* List of subtrees */ - static gint *ett[] = { + static int *ett[] = { &ett_p7, #include "packet-p7-ettarr.c" }; @@ -112,7 +113,7 @@ void proto_reg_handoff_p7(void) { /* ABSTRACT SYNTAXES */ /* Register P7 with ROS (with no use of RTSE) */ - register_ros_protocol_info("2.6.0.2.9", &p7_ros_info, 0, "id-as-ms", FALSE); - register_ros_protocol_info("2.6.0.2.5", &p7_ros_info, 0, "id-as-mrse", FALSE); - register_ros_protocol_info("2.6.0.2.1", &p7_ros_info, 0, "id-as-msse", FALSE); + register_ros_protocol_info("2.6.0.2.9", &p7_ros_info, 0, "id-as-ms", false); + register_ros_protocol_info("2.6.0.2.5", &p7_ros_info, 0, "id-as-mrse", false); + register_ros_protocol_info("2.6.0.2.1", &p7_ros_info, 0, "id-as-msse", false); } |