diff options
| author | Guy Harris <guy@alum.mit.edu> | 2003-08-26 06:18:18 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2003-08-26 06:18:18 +0000 |
| commit | b73e8138a8456cdc0e3b40fb6d0ac25a47eb6602 (patch) | |
| tree | 19dbd5781994835a4360c76337d44eb96bb9d12f /packet-eth.c | |
| parent | cdd8b24d5c8d9e2cd685a2491d14d3fce7c13fc0 (diff) | |
| download | wireshark-b73e8138a8456cdc0e3b40fb6d0ac25a47eb6602.tar.gz wireshark-b73e8138a8456cdc0e3b40fb6d0ac25a47eb6602.tar.bz2 wireshark-b73e8138a8456cdc0e3b40fb6d0ac25a47eb6602.zip | |
Make the CRC-32 routines take a tvbuff and a length as arguments.
Rename "crc32()" so as not to collide with the one in zlib; rename
"crc32_802()" to match.
svn path=/trunk/; revision=8268
Diffstat (limited to 'packet-eth.c')
| -rw-r--r-- | packet-eth.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/packet-eth.c b/packet-eth.c index 75e469a911..4728f2b568 100644 --- a/packet-eth.c +++ b/packet-eth.c @@ -1,7 +1,7 @@ /* packet-eth.c * Routines for ethernet packet disassembly * - * $Id: packet-eth.c,v 1.85 2003/08/26 05:52:44 guy Exp $ + * $Id: packet-eth.c,v 1.86 2003/08/26 06:18:17 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -342,8 +342,7 @@ add_ethernet_trailer(proto_tree *fh_tree, int trailer_id, tvbuff_t *tvb, } if (has_fcs) { guint32 sent_fcs = tvb_get_ntohl(trailer_tvb, trailer_length); - guint32 fcs = crc32_802(tvb_get_ptr(tvb, 0, tvb_length(tvb) - 4), - tvb_length(tvb) - 4); + guint32 fcs = crc32_tvb_802(tvb, tvb_length(tvb) - 4); if (fcs == sent_fcs) { proto_tree_add_text(fh_tree, trailer_tvb, trailer_length, 4, "Frane check sequence: 0x%08x (correct)", |