Make the reported length of the VJ-uncompressed tvbuff the reported

length of the data in the PPP packet, not the value from the IP header,
just in case there's extra crap at the end.  (That appears to be the
case in at least one pppdump capture filel; that's probably either a bug
in the version of pppdump that produced the capture or in the pppdump
reading code, but, until we fix that, if we can, let's at least get this
right, so that the reported length of the tvbuff won't be less than the
length unless that was the case for the tvbuff handed to us.)

svn path=/trunk/; revision=5868
This commit is contained in:
Guy Harris 2002-07-14 08:57:56 +00:00
parent 2e7f37aee7
commit 4ceeb56841
1 changed files with 2 additions and 2 deletions

View File

@ -1,7 +1,7 @@
/* packet-vj.c
* Routines for Van Jacobson header decompression.
*
* $Id: packet-vj.c,v 1.12 2002/06/04 07:03:47 guy Exp $
* $Id: packet-vj.c,v 1.13 2002/07/14 08:57:56 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -381,7 +381,7 @@ dissect_vjuc(tvbuff_t *tvb, packet_info *pinfo, proto_tree * tree)
* Set up tvbuff containing packet with protocol type.
* Neither header checksum is recalculated.
*/
next_tvb = tvb_new_real_data(buffer, isize, pntohs(&buffer[IP_FIELD_TOT_LEN]));
next_tvb = tvb_new_real_data(buffer, isize, tvb_reported_length(tvb));
tvb_set_child_real_data_tvbuff(tvb, next_tvb);
add_new_data_source(pinfo, next_tvb, "VJ Uncompressed");