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-hyperscsi.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-hyperscsi.c')
| -rw-r--r-- | epan/dissectors/packet-hyperscsi.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/epan/dissectors/packet-hyperscsi.c b/epan/dissectors/packet-hyperscsi.c index be340eb4..f3a30323 100644 --- a/epan/dissectors/packet-hyperscsi.c +++ b/epan/dissectors/packet-hyperscsi.c @@ -18,16 +18,16 @@ void proto_reg_handoff_hyperscsi(void); static int proto_hyperscsi; -static int hf_hs_cmd = -1; -static int hf_hs_ver = -1; -static int hf_hs_res = -1; -static int hf_hs_tagno = -1; -static int hf_hs_lastfrag = -1; -static int hf_hs_fragno = -1; +static int hf_hs_cmd; +static int hf_hs_ver; +static int hf_hs_res; +static int hf_hs_tagno; +static int hf_hs_lastfrag; +static int hf_hs_fragno; -static gint ett_hyperscsi = -1; -static gint ett_hs_hdr = -1; -static gint ett_hs_pdu = -1; +static int ett_hyperscsi; +static int ett_hs_hdr; +static int ett_hs_pdu; static dissector_handle_t hs_handle; @@ -68,15 +68,15 @@ static const value_string hscsi_opcodes[] = { static int dissect_hyperscsi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - guint hs_hdr1, hs_hdr2, hs_hdr3; - guint8 hs_res; - guint16 hs_tagno; - guint16 hs_fragno; - gint offset = 0; + unsigned hs_hdr1, hs_hdr2, hs_hdr3; + uint8_t hs_res; + uint16_t hs_tagno; + uint16_t hs_fragno; + int offset = 0; proto_tree *hs_hdr_tree, *hs_pdu_tree; proto_tree *hs_tree; proto_item *ti; - guint8 hs_cmd, hs_ver; + uint8_t hs_cmd, hs_ver; col_set_str(pinfo->cinfo, COL_PROTOCOL, "HyperSCSI"); col_clear(pinfo->cinfo, COL_INFO); @@ -84,11 +84,11 @@ dissect_hyperscsi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat ti = proto_tree_add_item(tree, proto_hyperscsi, tvb, offset, -1, ENC_NA); hs_tree = proto_item_add_subtree(ti, ett_hyperscsi); - hs_hdr1 = tvb_get_guint8(tvb, offset); + hs_hdr1 = tvb_get_uint8(tvb, offset); offset++; - hs_hdr2 = tvb_get_guint8(tvb, offset); + hs_hdr2 = tvb_get_uint8(tvb, offset); offset++; - hs_hdr3 = tvb_get_guint8(tvb, offset); + hs_hdr3 = tvb_get_uint8(tvb, offset); offset++; hs_res = hs_hdr1 >> 4; @@ -117,9 +117,9 @@ dissect_hyperscsi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat * Now, add the PDU */ - hs_ver = tvb_get_guint8(tvb, offset++); + hs_ver = tvb_get_uint8(tvb, offset++); - hs_cmd = tvb_get_guint8(tvb, offset); + hs_cmd = tvb_get_uint8(tvb, offset); hs_cmd &= OPCODE_MASK; @@ -166,7 +166,7 @@ proto_register_hyperscsi(void) NULL, HFILL}}, }; - static gint *ett[] = { + static int *ett[] = { &ett_hyperscsi, &ett_hs_hdr, &ett_hs_pdu, |