path: root/epan/dissectors/packet-cdp.c
diff options
authorGuy Harris <guy@alum.mit.edu>2014-08-08 18:09:00 -0700
committerGuy Harris <guy@alum.mit.edu>2014-08-09 01:09:34 +0000
commitebff85fdbbe9667f469e18686ad945f634be2682 (patch)
tree325c6cf517f4644339d26bd7f0e57ff2c4097e7b /epan/dissectors/packet-cdp.c
parentfe74e319c0d27fb516577ce521719fba973e8113 (diff)
Clean up Internet checksum handling.
Add macros to set entries of a vec_t, one for use when you have a pointer to private data, and one for use when you have data in a tvbuff. The latter wraps the use of tvb_get_ptr(), so that you're not directly calling it in a dissector. Move ip_checksum() to epan/in_cksum.c, and add an ip_checksum_tvb() that wraps the use of tvb_get_ptr(). In the CARP dissector, give the length variable an unsigned type - there's no benefit to it being signed, and that requires some casts to be thrown around. In the DCCP dissector, check only against the coverage length to see if we have enough data, combine the "should we check the checksum?" check with the "*can* we check the checksum?" check in a single if, and throw a dissector assertion if the source network address type isn't IPv4 or IPv6. Get rid of inclues of <epan/in_cksum.h> in dissectors that don't use any of the Internet checksum routines. In the HIP dissector, make sure we have the data to calculate the checksum before doing so. Change-Id: I2f9674775dbb54c533d33082632809f7d32ec8ae Reviewed-on: https://code.wireshark.org/review/3517 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-cdp.c')
1 files changed, 2 insertions, 4 deletions
diff --git a/epan/dissectors/packet-cdp.c b/epan/dissectors/packet-cdp.c
index 87e5d6563e..2a2a515cf6 100644
--- a/epan/dissectors/packet-cdp.c
+++ b/epan/dissectors/packet-cdp.c
@@ -282,12 +282,10 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* Setup checksum routine data buffer */
- cksum_vec[0].ptr = padded_buffer;
- cksum_vec[0].len = data_length+1;
+ SET_CKSUM_VEC_PTR(cksum_vec[0], padded_buffer, data_length+1);
} else {
/* Setup checksum routine data buffer */
- cksum_vec[0].ptr = tvb_get_ptr(tvb, 0, data_length);
- cksum_vec[0].len = data_length;
+ SET_CKSUM_VEC_TVB(cksum_vec[0], tvb, 0, data_length);
computed_checksum = in_cksum(cksum_vec, 1);