diff options
| author | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2013-06-24 19:27:47 +0000 |
|---|---|---|
| committer | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2013-06-24 19:27:47 +0000 |
| commit | 93002cb9c5efc0a4a7f110145165f4193cb2e2ba (patch) | |
| tree | 6d64348916486d29726ebeb15839360aaf73b820 /epan/dissectors/packet-eth.c | |
| parent | 00b1a9df1a7c7bacc0ccf1645891403ed8005cc6 (diff) | |
A follow-up to r50127 to highlight the correct 4 bytes of the Ethernet FCS for the hf_eth_fcs_good and hf_eth_fcs_bad fields.
svn path=/trunk/; revision=50128
Diffstat (limited to 'epan/dissectors/packet-eth.c')
| -rw-r--r-- | epan/dissectors/packet-eth.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c index b9fcdc48c9..f75d18b292 100644 --- a/epan/dissectors/packet-eth.c +++ b/epan/dissectors/packet-eth.c @@ -621,11 +621,11 @@ add_ethernet_trailer(packet_info *pinfo, proto_tree *tree, proto_tree *fh_tree, padding_length+trailer_length, 4, sent_fcs, "Frame check sequence: 0x%08x [correct]", sent_fcs); checksum_tree = proto_item_add_subtree(item, ett_eth_fcs); - item = proto_tree_add_boolean(checksum_tree, hf_eth_fcs_good, tvb, - trailer_length, 2, TRUE); + item = proto_tree_add_boolean(checksum_tree, hf_eth_fcs_good, trailer_tvb, + padding_length+trailer_length, 4, TRUE); PROTO_ITEM_SET_GENERATED(item); - item = proto_tree_add_boolean(checksum_tree, hf_eth_fcs_bad, tvb, - trailer_length, 2, FALSE); + item = proto_tree_add_boolean(checksum_tree, hf_eth_fcs_bad, trailer_tvb, + padding_length+trailer_length, 4, FALSE); PROTO_ITEM_SET_GENERATED(item); } else { item = proto_tree_add_uint_format(fh_tree, hf_eth_fcs, trailer_tvb, @@ -633,11 +633,11 @@ add_ethernet_trailer(packet_info *pinfo, proto_tree *tree, proto_tree *fh_tree, "Frame check sequence: 0x%08x [incorrect, should be 0x%08x]", sent_fcs, fcs); checksum_tree = proto_item_add_subtree(item, ett_eth_fcs); - item = proto_tree_add_boolean(checksum_tree, hf_eth_fcs_good, tvb, - trailer_length, 2, FALSE); + item = proto_tree_add_boolean(checksum_tree, hf_eth_fcs_good, trailer_tvb, + padding_length+trailer_length, 4, FALSE); PROTO_ITEM_SET_GENERATED(item); - item = proto_tree_add_boolean(checksum_tree, hf_eth_fcs_bad, tvb, - trailer_length, 2, TRUE); + item = proto_tree_add_boolean(checksum_tree, hf_eth_fcs_bad, trailer_tvb, + padding_length+trailer_length, 4, TRUE); PROTO_ITEM_SET_GENERATED(item); expert_add_info(pinfo, item, &ei_eth_fcs_bad); col_append_str(pinfo->cinfo, COL_INFO, " [ETHERNET FRAME CHECK SEQUENCE INCORRECT]"); @@ -647,11 +647,11 @@ add_ethernet_trailer(packet_info *pinfo, proto_tree *tree, proto_tree *fh_tree, padding_length+trailer_length, 4, sent_fcs, "Frame check sequence: 0x%08x [validiation disabled]", sent_fcs); checksum_tree = proto_item_add_subtree(item, ett_eth_fcs); - item = proto_tree_add_boolean(checksum_tree, hf_eth_fcs_good, tvb, - trailer_length, 2, FALSE); + item = proto_tree_add_boolean(checksum_tree, hf_eth_fcs_good, trailer_tvb, + padding_length+trailer_length, 4, FALSE); PROTO_ITEM_SET_GENERATED(item); - item = proto_tree_add_boolean(checksum_tree, hf_eth_fcs_bad, tvb, - trailer_length, 2, FALSE); + item = proto_tree_add_boolean(checksum_tree, hf_eth_fcs_bad, trailer_tvb, + padding_length+trailer_length, 4, FALSE); PROTO_ITEM_SET_GENERATED(item); } trailer_length += 4; |