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-clnp.c | |
| parent | b5f0786318ecdf66e5eb4683d850595e7364a0d4 (diff) | |
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-clnp.c')
| -rw-r--r-- | packet-clnp.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/packet-clnp.c b/packet-clnp.c index 9f33624477..1d5ccd8c05 100644 --- a/packet-clnp.c +++ b/packet-clnp.c @@ -1,7 +1,7 @@ /* packet-clnp.c * Routines for ISO/OSI network and transport protocol packet disassembly * - * $Id: packet-clnp.c,v 1.54 2002/04/30 23:56:58 guy Exp $ + * $Id: packet-clnp.c,v 1.55 2002/05/30 01:56:54 guy Exp $ * Laurent Deniel <deniel@worldnet.fr> * Ralf Schneider <Ralf.Schneider@t-online.de> * @@ -716,7 +716,7 @@ static int osi_decode_DR(tvbuff_t *tvb, int offset, offset += li + 1; /* User data */ - 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); offset += tvb_length_remaining(tvb, offset); /* we dissected all of the containing PDU */ @@ -1087,7 +1087,7 @@ static int osi_decode_CC(tvbuff_t *tvb, int offset, offset += li; /* User data */ - 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); offset += tvb_length_remaining(tvb, offset); /* we dissected all of the containing PDU */ @@ -1480,7 +1480,8 @@ static gboolean dissect_ositp_internal(tvbuff_t *tvb, packet_info *pinfo, if (check_col(pinfo->cinfo, COL_INFO)) col_append_str(pinfo->cinfo, COL_INFO, "Length indicator is zero"); if (!first_tpdu) - 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); return found_ositp; } @@ -1533,7 +1534,8 @@ static gboolean dissect_ositp_internal(tvbuff_t *tvb, packet_info *pinfo, if (new_offset == -1) { /* incorrect TPDU */ if (!first_tpdu) - 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); break; } @@ -1949,7 +1951,8 @@ static void dissect_clnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* As we haven't reassembled anything, we haven't changed "pi", so we don't have to restore it. */ - 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; } |