diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:33 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:33 +0000 |
| commit | 9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9 (patch) | |
| tree | 2784370cda9bbf2da9114d70f05399c0b229d28c /epan/dissectors/packet-ieee8023.c | |
| parent | Adding debian version 4.2.6-1. (diff) | |
| download | wireshark-9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9.tar.xz wireshark-9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9.zip | |
Merging upstream version 4.4.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'epan/dissectors/packet-ieee8023.c')
| -rw-r--r-- | epan/dissectors/packet-ieee8023.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-ieee8023.c b/epan/dissectors/packet-ieee8023.c index 626df268..c1683cfd 100644 --- a/epan/dissectors/packet-ieee8023.c +++ b/epan/dissectors/packet-ieee8023.c @@ -31,7 +31,7 @@ static dissector_handle_t llc_handle; static dissector_handle_t ccsds_handle; void -dissect_802_3(volatile int length, gboolean is_802_2, tvbuff_t *tvb, +dissect_802_3(volatile int length, bool is_802_2, tvbuff_t *tvb, int offset_after_length, packet_info *pinfo, proto_tree *tree, proto_tree *fh_tree, int length_id, int trailer_id, expert_field* ei_len, int fcs_len) @@ -40,7 +40,7 @@ dissect_802_3(volatile int length, gboolean is_802_2, tvbuff_t *tvb, tvbuff_t *volatile next_tvb = NULL; tvbuff_t *trailer_tvb = NULL; const char *saved_proto; - gint captured_length, reported_length; + int captured_length, reported_length; length_it = proto_tree_add_uint(fh_tree, length_id, tvb, offset_after_length - 2, 2, length); @@ -110,7 +110,7 @@ dissect_802_3(volatile int length, gboolean is_802_2, tvbuff_t *tvb, is what we want, as it'll report that the packet was cut short. */ trailer_tvb = tvb_new_subset_remaining(tvb, offset_after_length + length); - add_ethernet_trailer(pinfo, tree, fh_tree, trailer_id, tvb, trailer_tvb, fcs_len); + add_ethernet_trailer(pinfo, tree, fh_tree, trailer_id, tvb, trailer_tvb, fcs_len, offset_after_length); } void |