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-ipv6.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-ipv6.c')
| -rw-r--r-- | packet-ipv6.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/packet-ipv6.c b/packet-ipv6.c index 313364e57c..d82d30a383 100644 --- a/packet-ipv6.c +++ b/packet-ipv6.c @@ -1,7 +1,7 @@ /* packet-ipv6.c * Routines for IPv6 packet disassembly * - * $Id: packet-ipv6.c,v 1.99 2003/07/11 09:30:48 guy Exp $ + * $Id: packet-ipv6.c,v 1.100 2003/08/28 04:19:28 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -746,13 +746,8 @@ again: plen, offlg & IP6F_MORE_FRAG); - if (ipfd_head != NULL) { - next_tvb = process_reassembled_data(tvb, pinfo, "Reassembled IPv6", + next_tvb = process_reassembled_data(tvb, offset, pinfo, "Reassembled IPv6", ipfd_head, &ipv6_frag_items, &update_col_info, ipv6_tree); - } else { - /* We don't have the complete reassembled payload. */ - next_tvb = NULL; - } } else { /* If this is the first fragment, dissect its contents, otherwise just show it as a fragment. |