diff options
| author | Michael Mann <mmann78@netscape.net> | 2016-07-10 23:47:28 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-07-21 12:35:22 +0000 |
| commit | ad6fc87d64de30cdcdca18168a117d2ec24591da (patch) | |
| tree | b5df109654ae6806db7544933f8bf1a848a02ae7 /epan/dissectors/packet-mrdisc.c | |
| parent | 1e19f55f0c44b850bc6304be28d5b272a3553204 (diff) | |
Add proto_tree_add_checksum.
This is an attempt to standardize display/handling of checksum fields for all dissectors.
The main target is for dissectors that do validation, but dissectors that just report the
checksum were also included just to make them easier to find in the future.
Bug: 10620
Bug: 12058
Ping-Bug: 8859
Change-Id: Ia8abd86e42eaf8ed50de6b173409e914b17993bf
Reviewed-on: https://code.wireshark.org/review/16380
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-mrdisc.c')
| -rw-r--r-- | epan/dissectors/packet-mrdisc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-mrdisc.c b/epan/dissectors/packet-mrdisc.c index 25637fc8cf..45fa7f4349 100644 --- a/epan/dissectors/packet-mrdisc.c +++ b/epan/dissectors/packet-mrdisc.c @@ -46,7 +46,7 @@ void proto_reg_handoff_mrdisc(void); static int proto_mrdisc = -1; static int hf_checksum = -1; -static int hf_checksum_bad = -1; +static int hf_checksum_status = -1; static int hf_type = -1; static int hf_advint = -1; static int hf_numopts = -1; @@ -91,7 +91,7 @@ dissect_mrdisc_mra(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, i offset += 1; /* checksum */ - igmp_checksum(parent_tree, tvb, hf_checksum, hf_checksum_bad, pinfo, 0); + igmp_checksum(parent_tree, tvb, hf_checksum, hf_checksum_status, pinfo, 0); offset += 2; /* skip unused bytes */ @@ -160,7 +160,7 @@ dissect_mrdisc_mrst(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, offset += 1; /* checksum */ - igmp_checksum(parent_tree, tvb, hf_checksum, hf_checksum_bad, pinfo, 0); + igmp_checksum(parent_tree, tvb, hf_checksum, hf_checksum_status, pinfo, 0); offset += 2; return offset; @@ -222,9 +222,9 @@ proto_register_mrdisc(void) { "Checksum", "mrdisc.checksum", FT_UINT16, BASE_HEX, NULL, 0, "MRDISC Checksum", HFILL }}, - { &hf_checksum_bad, - { "Bad Checksum", "mrdisc.checksum_bad", FT_BOOLEAN, BASE_NONE, - NULL, 0x0, "Bad MRDISC Checksum", HFILL }}, + { &hf_checksum_status, + { "Checksum Status", "mrdisc.checksum.status", FT_UINT8, BASE_NONE, + VALS(proto_checksum_vals), 0x0, NULL, HFILL }}, { &hf_advint, { "Advertising Interval", "mrdisc.adv_int", FT_UINT8, BASE_DEC, |