diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:26 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:26 +0000 |
| commit | c4e8a3222648fcf22ca207f1815ebbf7cd144eeb (patch) | |
| tree | 93d5c6aa93d9987680dd1adad5685e2ad698f223 /epan/dissectors/packet-fefd.c | |
| parent | Adding upstream version 4.2.6. (diff) | |
| download | wireshark-c4e8a3222648fcf22ca207f1815ebbf7cd144eeb.tar.xz wireshark-c4e8a3222648fcf22ca207f1815ebbf7cd144eeb.zip | |
Adding upstream version 4.4.0.upstream/4.4.0upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'epan/dissectors/packet-fefd.c')
| -rw-r--r-- | epan/dissectors/packet-fefd.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/epan/dissectors/packet-fefd.c b/epan/dissectors/packet-fefd.c index d77c146e..087f33ef 100644 --- a/epan/dissectors/packet-fefd.c +++ b/epan/dissectors/packet-fefd.c @@ -24,22 +24,22 @@ static dissector_handle_t fefd_handle; #define TLV_TYPE 0 #define TLV_LENGTH 2 -static int proto_fefd = -1; -static int hf_fefd_version = -1; -static int hf_fefd_opcode = -1; -static int hf_fefd_flags = -1; -static int hf_fefd_flags_rt = -1; -static int hf_fefd_flags_rsy = -1; -static int hf_fefd_checksum = -1; -static int hf_fefd_tlvtype = -1; -static int hf_fefd_tlvlength = -1; -static int hf_fefd_device_id = -1; -static int hf_fefd_sent_through_interface = -1; -static int hf_fefd_data = -1; - -static gint ett_fefd = -1; -static gint ett_fefd_flags = -1; -static gint ett_fefd_tlv = -1; +static int proto_fefd; +static int hf_fefd_version; +static int hf_fefd_opcode; +static int hf_fefd_flags; +static int hf_fefd_flags_rt; +static int hf_fefd_flags_rsy; +static int hf_fefd_checksum; +static int hf_fefd_tlvtype; +static int hf_fefd_tlvlength; +static int hf_fefd_device_id; +static int hf_fefd_sent_through_interface; +static int hf_fefd_data; + +static int ett_fefd; +static int ett_fefd_flags; +static int ett_fefd_tlv; #define TYPE_DEVICE_ID 0x0001 #define TYPE_PORT_ID 0x0002 @@ -80,8 +80,8 @@ dissect_fefd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ proto_item *ti; proto_tree *fefd_tree = NULL; int offset = 0; - guint16 type; - guint16 length; + uint16_t type; + uint16_t length; proto_tree *tlv_tree; int real_length; static int * const flags[] = { @@ -152,7 +152,7 @@ dissect_fefd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ case TYPE_PORT_ID: real_length = length; - if (tvb_get_guint8(tvb, offset + real_length) != 0x00) { + if (tvb_get_uint8(tvb, offset + real_length) != 0x00) { /* The length in the TLV doesn't appear to be the length of the TLV, as the byte just past it isn't the first byte of a 2-byte big-endian @@ -257,7 +257,7 @@ proto_register_fefd(void) NULL, HFILL }}, }; - static gint *ett[] = { + static int *ett[] = { &ett_fefd, &ett_fefd_flags, &ett_fefd_tlv |