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-atalk.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-atalk.c')
| -rw-r--r-- | packet-atalk.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/packet-atalk.c b/packet-atalk.c index 67bbc07b13..f4267d2e22 100644 --- a/packet-atalk.c +++ b/packet-atalk.c @@ -2,7 +2,7 @@ * Routines for AppleTalk packet disassembly: LLAP, DDP, NBP, ATP, ASP, * RTMP. * - * $Id: packet-atalk.c,v 1.88 2003/04/20 11:36:11 guy Exp $ + * $Id: packet-atalk.c,v 1.89 2003/08/28 04:19:28 guy Exp $ * * Simon Wilkinson <sxw@dcs.ed.ac.uk> * @@ -857,17 +857,9 @@ dissect_atp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { frag_number, len, more_fragment); - if (fd_head != NULL) { - if (fd_head->next != NULL) { - new_tvb = process_reassembled_data(tvb, pinfo, "Reassembled ATP", - fd_head, &atp_frag_items, NULL, atp_tree); - } - else - new_tvb = tvb_new_subset(tvb, ATP_HDRSIZE -1, -1, -1); - } - else { - new_tvb = NULL; - } + new_tvb = process_reassembled_data(tvb, ATP_HDRSIZE -1, pinfo, + "Reassembled ATP", fd_head, &atp_frag_items, + NULL, atp_tree); } else { /* full packet */ |