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/packet-ns-rpc.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/packet-ns-rpc.c')
| -rw-r--r-- | epan/dissectors/packet-ns-rpc.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/epan/dissectors/packet-ns-rpc.c b/epan/dissectors/packet-ns-rpc.c index 5475e71d..b6a39d43 100644 --- a/epan/dissectors/packet-ns-rpc.c +++ b/epan/dissectors/packet-ns-rpc.c @@ -16,14 +16,14 @@ void proto_register_ns_rpc(void); void proto_reg_handoff_ns_rpc(void); -static int proto_ns_rpc = -1; -static gint ett_nsrpc = -1; +static int proto_ns_rpc; +static int ett_nsrpc; -static int hf_nsrpc_dlen = -1; -static int hf_nsrpc_cmd = -1; -static int hf_nsrpc_errcode = -1; +static int hf_nsrpc_dlen; +static int hf_nsrpc_cmd; +static int hf_nsrpc_errcode; -static int hf_ns_remoteIOCTL = -1; +static int hf_ns_remoteIOCTL; static const value_string ns_rpc_cmd_vals[] = { @@ -1115,8 +1115,8 @@ static value_string_ext ns_rpc_rioctl_vals_ext = VALUE_STRING_EXT_INIT(ns_rpc_ri static int dissect_ns_rpc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - guint16 rpc_errcode; - guint32 datalen, rpc_cmd, remote_ioctl; + uint16_t rpc_errcode; + uint32_t datalen, rpc_cmd, remote_ioctl; int offset = 0; proto_item *ti; proto_tree *ns_rpc_tree; @@ -1161,17 +1161,17 @@ dissect_ns_rpc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _ return tvb_captured_length(tvb); } -static gboolean +static bool dissect_ns_rpc_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) { - static const guint8 ns_rpc_sig[2] = { 0xA5, 0xA5 }; + static const uint8_t ns_rpc_sig[2] = { 0xA5, 0xA5 }; /* Check the signature */ if (tvb_memeql(tvb, 4, ns_rpc_sig, sizeof ns_rpc_sig) != 0) - return FALSE; + return false; dissect_ns_rpc(tvb, pinfo, tree, data); - return TRUE; + return true; } void @@ -1195,7 +1195,7 @@ proto_register_ns_rpc(void) NULL, HFILL }}, }; - static gint *ett[] = { + static int *ett[] = { &ett_nsrpc, }; |