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-udld.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-udld.c')
| -rw-r--r-- | epan/dissectors/packet-udld.c | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/epan/dissectors/packet-udld.c b/epan/dissectors/packet-udld.c index b9e2de99..123af64e 100644 --- a/epan/dissectors/packet-udld.c +++ b/epan/dissectors/packet-udld.c @@ -31,25 +31,25 @@ void proto_reg_handoff_udld(void); static dissector_handle_t udld_handle; -static int proto_udld = -1; -static int hf_udld_version = -1; -static int hf_udld_opcode = -1; -static int hf_udld_flags = -1; -static int hf_udld_flags_rt = -1; -static int hf_udld_flags_rsy = -1; -static int hf_udld_checksum = -1; -static int hf_udld_tlvtype = -1; -static int hf_udld_tlvlength = -1; -static int hf_udld_device_id = -1; -static int hf_udld_sent_through_interface = -1; -static int hf_udld_data = -1; - - -static expert_field ei_udld_tlvlength = EI_INIT; - -static gint ett_udld = -1; -static gint ett_udld_flags = -1; -static gint ett_udld_tlv = -1; +static int proto_udld; +static int hf_udld_version; +static int hf_udld_opcode; +static int hf_udld_flags; +static int hf_udld_flags_rt; +static int hf_udld_flags_rsy; +static int hf_udld_checksum; +static int hf_udld_tlvtype; +static int hf_udld_tlvlength; +static int hf_udld_device_id; +static int hf_udld_sent_through_interface; +static int hf_udld_data; + + +static expert_field ei_udld_tlvlength; + +static int ett_udld; +static int ett_udld_flags; +static int ett_udld_tlv; #define TYPE_DEVICE_ID 0x0001 #define TYPE_PORT_ID 0x0002 @@ -90,8 +90,8 @@ dissect_udld(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ proto_item *ti; proto_tree *udld_tree = NULL; int offset = 0; - guint16 type; - guint16 length; + uint16_t type; + uint16_t length; proto_tree *tlv_tree; int real_length; @@ -161,7 +161,7 @@ dissect_udld(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 @@ -266,7 +266,7 @@ proto_register_udld(void) NULL, HFILL }}, }; - static gint *ett[] = { + static int *ett[] = { &ett_udld, &ett_udld_flags, &ett_udld_tlv |