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>

1 files changed, 14 insertions, 14 deletions

diff --git a/epan/dissectors/packet-c1222.c b/epan/dissectors/packet-c1222.c
index b83fcd7541..a1873c07e3 100644
--- a/epan/dissectors/packet-c1222.c
+++ b/epan/dissectors/packet-c1222.c
@@ -161,6 +161,7 @@ static int hf_c1222_write_size = -1;
 static int hf_c1222_write_data = -1;
 static int hf_c1222_procedure_num = -1;
 static int hf_c1222_write_chksum = -1;
+static int hf_c1222_write_chksum_status = -1;
 static int hf_c1222_wait_secs = -1;
 static int hf_c1222_neg_pkt_size = -1;
 static int hf_c1222_neg_nbr_pkts = -1;
@@ -224,7 +225,7 @@ static gint ett_c1222_Calling_authentication_value_c1222_U = -1;
 static gint ett_c1222_Calling_authentication_value_c1221_U = -1;
 
 /*--- End of included file: packet-c1222-ett.c ---*/
-#line 177 "./asn1/c1222/packet-c1222-template.c"
+#line 178 "./asn1/c1222/packet-c1222-template.c"
 
 static expert_field ei_c1222_command_truncated = EI_INIT;
 static expert_field ei_c1222_bad_checksum = EI_INIT;
@@ -431,7 +432,6 @@ parse_c1222_detailed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int cm
   gchar *auth_req = NULL;
   guint16 table = 0;
   guint16 tblsize = 0;
-  guint8 chksum = 0;
   guint16 calcsum = 0;
   guint8 wait_seconds = 0;
   int numrates = 0;
@@ -443,7 +443,6 @@ parse_c1222_detailed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int cm
   guint8 inter_char;
   guint8 resp_to;
   guint8 nbr_retries;
-  proto_item *item = NULL;
 
   /* special case to simplify handling of Negotiate service */
   if ((cmd & 0xF0) == C1222_CMD_NEGOTIATE) {
@@ -560,16 +559,14 @@ parse_c1222_detailed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int cm
           proto_tree_add_item(tree, hf_c1222_write_data, tvb, *offset, tblsize, ENC_NA);
           *offset += tblsize;
           *length -= tblsize;
-          chksum = tvb_get_guint8(tvb, *offset);
-          item = proto_tree_add_uint(tree, hf_c1222_write_chksum, tvb, *offset, 1, chksum);
           if (table == 7) {/* is it a procedure call? */
             calcsum = c1222_cksum(tvb, (*offset)-tblsize-2, tblsize+2);
           } else {
             calcsum = c1222_cksum(tvb, (*offset)-tblsize, tblsize);
           }
-          if (chksum != calcsum) {
-            expert_add_info_format(pinfo, item, &ei_c1222_bad_checksum, "Bad checksum [should be 0x%02x]", calcsum);
-          }
+          proto_tree_add_checksum(tree, tvb, *offset, hf_c1222_write_chksum, hf_c1222_write_chksum_status,
+                                  &ei_c1222_bad_checksum, pinfo, calcsum, ENC_NA, PROTO_CHECKSUM_VERIFY);
+
           if (table == 7) {/* is it a procedure call? */
             proto_item_set_text(tree, "C12.22 EPSEM: %s (%s-%d, %s-%d)",
                     val_to_str(cmd,commandnames,"Unknown (0x%02x)"),
@@ -606,12 +603,9 @@ parse_c1222_detailed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int cm
           proto_tree_add_item(tree, hf_c1222_write_data, tvb, *offset, tblsize, ENC_NA);
           *offset += tblsize;
           *length -= tblsize;
-          chksum = tvb_get_guint8(tvb, *offset);
-          item = proto_tree_add_uint(tree, hf_c1222_write_chksum, tvb, *offset, 1, chksum);
           calcsum = c1222_cksum(tvb, (*offset)-tblsize, tblsize);
-          if (chksum != calcsum) {
-            expert_add_info_format(pinfo, item, &ei_c1222_bad_checksum, "Bad checksum [should be 0x%02x]", calcsum);
-          }
+          proto_tree_add_checksum(tree, tvb, *offset, hf_c1222_write_chksum, hf_c1222_write_chksum_status,
+                                  &ei_c1222_bad_checksum, pinfo, calcsum, ENC_NA, PROTO_CHECKSUM_VERIFY);
           proto_item_set_text(tree, "C12.22 EPSEM: %s (%s-%d)",
                   val_to_str(cmd,commandnames,"Unknown (0x%02x)"),
                   val_to_str((table >> 8) & 0xF8, tableflags,"Unknown (0x%04x)"), table & 0x7FF);
@@ -1566,7 +1560,7 @@ static int dissect_MESSAGE_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_
 
 
 /*--- End of included file: packet-c1222-fn.c ---*/
-#line 1048 "./asn1/c1222/packet-c1222-template.c"
+#line 1042 "./asn1/c1222/packet-c1222-template.c"
 
 /**
  * Dissects a a full (reassembled) C12.22 message.
@@ -1781,6 +1775,12 @@ void proto_register_c1222(void) {
     NULL, 0x0,
     NULL, HFILL }
    },
+   { &hf_c1222_write_chksum_status,
+    { "C12.22 Table Data Checksum Status", "c1222.write.chksum.status",
+    FT_UINT8, BASE_NONE,
+    VALS(proto_checksum_vals), 0x0,
+    NULL, HFILL }
+   },
    { &hf_c1222_procedure_num,
     { "C12.22 Procedure Number", "c1222.procedure.num",
     FT_UINT16, BASE_DEC,