diff options
| author | Guy Harris <guy@alum.mit.edu> | 2003-03-05 07:17:50 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2003-03-05 07:17:50 +0000 |
| commit | 05c41a279fb9e2df3ded86aece0470c1b1aad887 (patch) | |
| tree | e20f09b7846e741997fb1b8469d5321879f09516 /packet-atalk.c | |
| parent | 72a00f19ca8b8d7f15a01a74916677afa42c8dfa (diff) | |
Use the reported length, not the captured length, as the fragment length
when doing reassembly.
In some additional places, use "tvb_bytes_exist()" to check whether we
have enough data to do reassembly, rather than checking to see if the
frame is short (it might be short but we might still have enough data to
do reassembly).
In DCE RPC, use the fragment length from the header as the number of
bytes of fragment data.
There's no need to check "pinfo->fragmented" before doing reassembly in
the DCERPC-over-SMB-pipes code - either we have all the data or we
don't.
In SNA and WTP reassembly, add a check to make sure we have all the data
to be reassembled.
svn path=/trunk/; revision=7282
Diffstat (limited to 'packet-atalk.c')
| -rw-r--r-- | packet-atalk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packet-atalk.c b/packet-atalk.c index bac23e857a..5a56dc24aa 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.86 2003/01/23 09:39:32 guy Exp $ + * $Id: packet-atalk.c,v 1.87 2003/03/05 07:17:49 guy Exp $ * * Simon Wilkinson <sxw@dcs.ed.ac.uk> * @@ -848,7 +848,7 @@ dissect_atp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { hdr = ATP_HDRSIZE -1; if (frag_number != 0) hdr += 4; /* asp header */ - len = tvb_length_remaining(tvb, hdr); + len = tvb_reported_length_remaining(tvb, hdr); fd_head = fragment_add_seq_check(tvb, hdr, pinfo, tid, atp_fragment_table, atp_reassembled_table, |