> Most noticeable in the gui is that the subtree for fragments has been
> changed slightly.
> A few other small fixes.
Here's a patch to bring it up to the current CVS version (1.130), fix
some comments (the checksum being computed by the "ip_checksum()" call
is the checksum of the header, not the entire packet) and fix a typo in
a blurb for a field.
*** /tmp/packet-ip.c Tue Apr 17 16:48:41 2001
--- packet-ip.c Tue Apr 17 17:51:34 2001
***************
*** 1,7 ****
/* packet-ip.c
* Routines for IP and miscellaneous IP protocol packet disassembly
*
! * $Id: packet-ip.c,v 1.129 2001/03/28 21:33:31 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@xxxxxxxx>
--- 1,7 ----
/* packet-ip.c
* Routines for IP and miscellaneous IP protocol packet disassembly
*
! * $Id: packet-ip.c,v 1.130 2001/04/17 06:29:12 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@xxxxxxxx>
***************
*** 45,50 ****
--- 45,51 ----
#include "packet.h"
#include "resolv.h"
+ #include "ipproto.h"
#include "prefs.h"
#include "etypes.h"
#include "greproto.h"
***************
*** 1190,1196 ****
}
/*
! * Compute the checksum of the IP packet
*/
ipsum = ip_checksum(tvb_get_ptr(tvb, offset, hlen), hlen);
--- 1191,1197 ----
}
/*
! * Compute the checksum of the IP header.
*/
ipsum = ip_checksum(tvb_get_ptr(tvb, offset, hlen), hlen);
***************
*** 1287,1293 ****
if (ip_defragment && (iph.ip_off & (IP_MF|IP_OFFSET))) {
/* We're reassembling, and this is part of a fragmented datagram.
Add the fragment to the hash table if the checksum is ok
! and the frame isnt truncated. */
if ((ipsum==0) || (tvb_reported_length(tvb)!=tvb_length(tvb))) {
ipfd_head = ip_fragment_add(tvb, offset, pinfo, iph.ip_id, iph.ip_off);
} else {
--- 1288,1294 ----
if (ip_defragment && (iph.ip_off & (IP_MF|IP_OFFSET))) {
/* We're reassembling, and this is part of a fragmented datagram.
Add the fragment to the hash table if the checksum is ok
! and the frame isn't truncated. */
if ((ipsum==0) || (tvb_reported_length(tvb)!=tvb_length(tvb))) {
ipfd_head = ip_fragment_add(tvb, offset, pinfo, iph.ip_id, iph.ip_off);
} else {
***************
*** 1941,1947 ****
{ &hf_ip_fragment_overlap_conflict,
{ "Conflicting data in fragment overlap", "ip.fragment.overlap.conflict", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
! "Overlaping fragments contained conflicting data" }},
{ &hf_ip_fragment_multiple_tails,
{ "Multiple tail fragments found", "ip.fragment.multipletails", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
--- 1942,1948 ----
{ &hf_ip_fragment_overlap_conflict,
{ "Conflicting data in fragment overlap", "ip.fragment.overlap.conflict", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
! "Overlapping fragments contained conflicting data" }},
{ &hf_ip_fragment_multiple_tails,
{ "Multiple tail fragments found", "ip.fragment.multipletails", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
