diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2003-08-28 04:19:29 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2003-08-28 04:19:29 +0000 |
| commit | 1af64453110f9d95a4c9e22e3fb097befba66463 (patch) | |
| tree | 7de7a1b7c6732a147c2d02b7f228baf1b5131637 /packet-clnp.c | |
| parent | 38e32750cdf3f105792aa2956e1899d19dda9058 (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.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@8295 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-clnp.c')
| -rw-r--r-- | packet-clnp.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/packet-clnp.c b/packet-clnp.c index b0d3fda625..37738f1950 100644 --- a/packet-clnp.c +++ b/packet-clnp.c @@ -1,7 +1,7 @@ /* packet-clnp.c * Routines for ISO/OSI network and transport protocol packet disassembly * - * $Id: packet-clnp.c,v 1.76 2003/05/28 22:58:46 guy Exp $ + * $Id: packet-clnp.c,v 1.77 2003/08/28 04:19:28 guy Exp $ * Laurent Deniel <laurent.deniel@free.fr> * Ralf Schneider <Ralf.Schneider@t-online.de> * @@ -1981,13 +1981,8 @@ static void dissect_clnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) segment_length - cnf_hdr_len, cnf_type & CNF_MORE_SEGS); - if (fd_head != NULL) { - next_tvb = process_reassembled_data(tvb, pinfo, "Reassembled CLNP", - fd_head, &clnp_frag_items, &update_col_info, clnp_tree); - } else { - /* We don't have the complete reassembled payload. */ - next_tvb = NULL; - } + next_tvb = process_reassembled_data(tvb, offset, pinfo, "Reassembled CLNP", + fd_head, &clnp_frag_items, &update_col_info, clnp_tree); } else { /* If this is the first segment, dissect its contents, otherwise just show it as a segment. |