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-smb-pipe.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packet-smb-pipe.c') diff --git a/packet-smb-pipe.c b/packet-smb-pipe.c index fec3aff5a9..7bdcb6ea67 100644 --- a/packet-smb-pipe.c +++ b/packet-smb-pipe.c @@ -8,7 +8,7 @@ XXX Fixme : shouldnt show [malformed frame] for long packets * significant rewrite to tvbuffify the dissector, Ronnie Sahlberg and * Guy Harris 2001 * - * $Id: packet-smb-pipe.c,v 1.93 2003/04/15 09:23:42 guy Exp $ + * $Id: packet-smb-pipe.c,v 1.94 2003/04/20 11:36:15 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -87,6 +87,7 @@ static const fragment_items smb_pipe_frag_items = { &hf_pipe_fragment_multiple_tails, &hf_pipe_fragment_too_long_fragment, &hf_pipe_fragment_error, + NULL, "fragments" }; -- cgit v1.2.3