diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-05-30 01:56:55 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-05-30 01:56:55 +0000 |
| commit | 4401f1433f8b2db82cf199274f96258662d02aeb (patch) | |
| tree | 2cca921b6de8c3e88c05cc912756ad6380b7643e /packet-ip.c | |
| parent | b5f0786318ecdf66e5eb4683d850595e7364a0d4 (diff) | |
| download | wireshark-4401f1433f8b2db82cf199274f96258662d02aeb.tar.gz wireshark-4401f1433f8b2db82cf199274f96258662d02aeb.tar.bz2 wireshark-4401f1433f8b2db82cf199274f96258662d02aeb.zip | |
Don't pass "tvb_reported_length_remaining(tvb, offset)" as the fourth
argument to "tvb_new_subset()" - just use -1 if the subset tvbuff is to
run to the end of the parent tvbuff.
svn path=/trunk/; revision=5597
Diffstat (limited to 'packet-ip.c')
| -rw-r--r-- | packet-ip.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/packet-ip.c b/packet-ip.c index 681f73f940..105ac5411f 100644 --- a/packet-ip.c +++ b/packet-ip.c @@ -1,7 +1,7 @@ /* packet-ip.c * Routines for IP and miscellaneous IP protocol packet disassembly * - * $Id: packet-ip.c,v 1.165 2002/03/31 21:43:51 guy Exp $ + * $Id: packet-ip.c,v 1.166 2002/05/30 01:56:55 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -1104,7 +1104,8 @@ dissect_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Fragmented IP protocol (proto=%s 0x%02x, off=%u)", ipprotostr(iph.ip_p), iph.ip_p, (iph.ip_off & IP_OFFSET) * 8); - call_dissector(data_handle,tvb_new_subset(tvb, offset,-1,tvb_reported_length_remaining(tvb,offset)), pinfo, tree); + call_dissector(data_handle, tvb_new_subset(tvb, offset, -1, -1), pinfo, + tree); pinfo->fragmented = save_fragmented; return; } @@ -1576,7 +1577,8 @@ dissect_icmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case ICMP_ECHOREPLY: case ICMP_ECHO: - call_dissector(data_handle,tvb_new_subset(tvb, 8,-1,tvb_reported_length_remaining(tvb,8)), pinfo, icmp_tree); + call_dissector(data_handle, tvb_new_subset(tvb, 8, -1, -1), pinfo, + icmp_tree); break; case ICMP_RTRADVERT: @@ -1593,7 +1595,8 @@ dissect_icmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) dissect_mip_extensions(tvb, 8 + i*8, icmp_tree); } } else - call_dissector(data_handle,tvb_new_subset(tvb, 8,-1,tvb_reported_length_remaining(tvb,8)), pinfo, icmp_tree); + call_dissector(data_handle, tvb_new_subset(tvb, 8, -1, -1), pinfo, + icmp_tree); break; case ICMP_TSTAMP: |