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/p7/packet-p7-template.c | |
| 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/p7/packet-p7-template.c')
| -rw-r--r-- | epan/dissectors/asn1/p7/packet-p7-template.c | 15 |
1 files changed, 8 insertions, 7 deletions
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); } |