osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

From Lo�c Minier: allow packets with no payload to participate in 

reassembly, as the last packet of a fragmented WTP message can have a
payload length of 0.

svn path=/trunk/; revision=8147
This commit is contained in:
Guy Harris 2003-08-07 18:28:33 +00:00
parent 9a555293e9
commit 3a9d1edd45
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packet-wtp.c
View File

@ -2,7 +2,7 @@
*
* Routines to dissect WTP component of WAP traffic.
*
* $Id: packet-wtp.c,v 1.51 2003/07/29 22:10:18 guy Exp $
* $Id: packet-wtp.c,v 1.52 2003/08/07 18:28:33 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -595,9 +595,13 @@ dissect_wtp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
/*
* Any remaining data ought to be WSP data (if not WTP ACK, NACK
* or ABORT pdu), so hand off (defragmented) to the WSP dissector
* or ABORT pdu), so hand off (defragmented) to the WSP dissector.
* Note that the last packet of a fragmented WTP message needn't
* contain any data, so we allow payloadless packets to be
* reassembled. (XXX - does the reassembly code handle this
* for packets other than the last packet?)
*/
if ((tvb_reported_length_remaining(tvb, offCur + cbHeader + vHeader) > 0) &&
if ((tvb_reported_length_remaining(tvb, offCur + cbHeader + vHeader) >= 0) &&
! ((pdut==ACK) || (pdut==NEGATIVE_ACK) || (pdut==ABORT)))
{
int dataOffset = offCur + cbHeader + vHeader;