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/cmip/packet-cmip-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/cmip/packet-cmip-template.c')
| -rw-r--r-- | epan/dissectors/asn1/cmip/packet-cmip-template.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/epan/dissectors/asn1/cmip/packet-cmip-template.c b/epan/dissectors/asn1/cmip/packet-cmip-template.c index 53caeb03..cbc52d13 100644 --- a/epan/dissectors/asn1/cmip/packet-cmip-template.c +++ b/epan/dissectors/asn1/cmip/packet-cmip-template.c @@ -16,7 +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" #include "packet-x509if.h" @@ -34,23 +34,23 @@ void proto_reg_handoff_cmip(void); #include "packet-pres.h" /* Initialize the protocol and registered fields */ -static int proto_cmip = -1; -static int hf_cmip_actionType_OID = -1; -static int hf_cmip_eventType_OID = -1; -static int hf_cmip_attributeId_OID = -1; -static int hf_cmip_errorId_OID = -1; +static int proto_cmip; +static int hf_cmip_actionType_OID; +static int hf_cmip_eventType_OID; +static int hf_cmip_attributeId_OID; +static int hf_cmip_errorId_OID; #include "packet-cmip-hf.c" /* Initialize the subtree pointers */ -static gint ett_cmip = -1; +static int ett_cmip; #include "packet-cmip-ett.c" -static expert_field ei_wrong_spdu_type = EI_INIT; +static expert_field ei_wrong_spdu_type; -static guint32 opcode; +static uint32_t opcode; -static dissector_handle_t cmip_handle = NULL; +static dissector_handle_t cmip_handle; /* Dissector table */ static dissector_table_t attribute_id_dissector_table; @@ -79,7 +79,7 @@ dissect_cmip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d proto_item *item; proto_tree *tree; asn1_ctx_t asn1_ctx; - asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); + asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, true, pinfo); /* Reject the packet if data is NULL */ if (data == NULL) @@ -105,13 +105,13 @@ dissect_cmip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d case SES_DISCONNECT: case SES_FINISH: case SES_REFUSE: - dissect_cmip_CMIPUserInfo(FALSE,tvb,0,&asn1_ctx,tree,-1); + dissect_cmip_CMIPUserInfo(false,tvb,0,&asn1_ctx,tree,-1); break; case SES_ABORT: - dissect_cmip_CMIPAbortInfo(FALSE,tvb,0,&asn1_ctx,tree,-1); + dissect_cmip_CMIPAbortInfo(false,tvb,0,&asn1_ctx,tree,-1); break; case SES_DATA_TRANSFER: - dissect_cmip_ROS(FALSE,tvb,0,&asn1_ctx,tree,-1); + dissect_cmip_ROS(false,tvb,0,&asn1_ctx,tree,-1); break; default: ; @@ -146,7 +146,7 @@ void proto_register_cmip(void) { }; /* List of subtrees */ - static gint *ett[] = { + static int *ett[] = { &ett_cmip, #include "packet-cmip-ettarr.c" }; |