From d359286841fb9221400bcc64bf8bbcc88e3127fd Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Sun, 20 Apr 2003 11:36:16 +0000 Subject: Add a pointer to an hf_ value for a "reassembled_in" field (which can be null) to the "fragment_items" structure, and don't pass that value into "process_reassembled_data()", just have it use the value in the "fragment_items" structure passed to it. Make "process_reassembled_data()" capable of handling reassembly done by "fragment_add_seq_check()", and use it in the ATP and 802.11 dissectors; give them "reassembled_in" fields. Make "process_reassembled_data()" handle only the case of a completed reassembly (fd_head != NULL) so that we can use it in those dissectors without gunking the code up too much. svn path=/trunk/; revision=7513 --- packet-wtp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packet-wtp.c') diff --git a/packet-wtp.c b/packet-wtp.c index 92de3b7355..a4c713c3fa 100644 --- a/packet-wtp.c +++ b/packet-wtp.c @@ -2,7 +2,7 @@ * * Routines to dissect WTP component of WAP traffic. * - * $Id: packet-wtp.c,v 1.44 2003/04/09 18:15:53 guy Exp $ + * $Id: packet-wtp.c,v 1.45 2003/04/20 11:36:16 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -213,6 +213,7 @@ static const fragment_items wtp_frag_items = { &hf_wtp_fragment_multiple_tails, &hf_wtp_fragment_too_long_fragment, &hf_wtp_fragment_error, + NULL, "fragments" }; -- cgit v1.2.3