From 69e4cb6a933b66943de7e7bd3614779bc5c235bb Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Wed, 6 Oct 2004 10:14:56 +0000 Subject: [PATCH] We now do reassembly. Use "tvb_reported_length_remaining()", not "tvb_length_remaining()", to find out how much encapsulated data there is, so we properly handle short frames (reporting how much was really there, not how much was captured). svn path=/trunk/; revision=12219 --- epan/dissectors/packet-icep.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/epan/dissectors/packet-icep.c b/epan/dissectors/packet-icep.c index 020d4fa63a..c1df711477 100644 --- a/epan/dissectors/packet-icep.c +++ b/epan/dissectors/packet-icep.c @@ -27,10 +27,9 @@ /* TODO: 1) Dissect encoded data (do sth like idl2eth for CORBA). - 2) Reassembling PDUs spanning across multiple TCP segments. - 3) Add conversations. - 4) Register a dissector as one that can be selected by a UDP/TCP port number. - 5) Put in Preferences/Protocols/ICEP Option menu: + 2) Add conversations. + 3) Register a dissector as one that can be selected by a UDP/TCP port number. + 4) Put in Preferences/Protocols/ICEP Option menu: - ICEP_MAX_ICE_STRING_LEN - ICEP_MAX_BATCH_REQUESTS - ICEP_MAX_ICE_CONTEXT_PAIRS @@ -607,7 +606,7 @@ static void dissect_ice_params(proto_tree *tree, tvbuff_t *tvb, return; /* check if I got all encapsulated data */ - tvb_data_remained = tvb_length_remaining(tvb, offset); + tvb_data_remained = tvb_reported_length_remaining(tvb, offset); if ( tvb_data_remained < ( size - ICEP_MIN_PARAMS_SIZE ) ) {