diff options
| author | Guy Harris <guy@alum.mit.edu> | 2003-08-28 04:19:29 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2003-08-28 04:19:29 +0000 |
| commit | a2246980423a0f99fdfd45fccf229eb5fc3263b3 (patch) | |
| tree | 7de7a1b7c6732a147c2d02b7f228baf1b5131637 /packet-ip.c | |
| parent | f3d64a2c3834a26a87ec266a4397f43b21b62a70 (diff) | |
Make "process_reassembled_data()" do the check for fragmentation not
being complete and for fragmentation being trivial (i.e., the packet in
question is both the first and last fragment). Have its callers *not*
do that check - this lets "process_reassembled_data()" put in the
"Reassembled in" item for fragments other than the last fragment.
Add a "Reassembled in" field to TDS.
svn path=/trunk/; revision=8295
Diffstat (limited to 'packet-ip.c')
| -rw-r--r-- | packet-ip.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/packet-ip.c b/packet-ip.c index 2a625868c9..93d04aa161 100644 --- a/packet-ip.c +++ b/packet-ip.c @@ -1,7 +1,7 @@ /* packet-ip.c * Routines for IP and miscellaneous IP protocol packet disassembly * - * $Id: packet-ip.c,v 1.196 2003/08/26 19:41:09 guy Exp $ + * $Id: packet-ip.c,v 1.197 2003/08/28 04:19:28 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -1029,13 +1029,8 @@ dissect_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pinfo->iplen - pinfo->iphdrlen, iph->ip_off & IP_MF); - if (ipfd_head != NULL) { - next_tvb = process_reassembled_data(tvb, pinfo, "Reassembled IPv4", - ipfd_head, &ip_frag_items, &update_col_info, ip_tree); - } else { - /* We don't have the complete reassembled payload. */ - next_tvb = NULL; - } + next_tvb = process_reassembled_data(tvb, offset, pinfo, "Reassembled IPv4", + ipfd_head, &ip_frag_items, &update_col_info, ip_tree); } else { /* If this is the first fragment, dissect its contents, otherwise just show it as a fragment. |