diff options
author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2003-04-20 11:36:16 +0000 |
---|---|---|
committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2003-04-20 11:36:16 +0000 |
commit | 3dc83743f8e722646d013eb096722c2b7c8e1d82 (patch) | |
tree | 7ed0620519b78e1ad0b8f6a83d488e1dd856bb3f /packet-x25.c | |
parent | b9a21a4b067840d9bf254061f712f15611e6f5b5 (diff) |
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.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@7513 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-x25.c')
-rw-r--r-- | packet-x25.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packet-x25.c b/packet-x25.c index 25e15f3ebb..a10dba162d 100644 --- a/packet-x25.c +++ b/packet-x25.c @@ -2,7 +2,7 @@ * Routines for X.25 packet disassembly * Olivier Abad <oabad@noos.fr> * - * $Id: packet-x25.c,v 1.83 2003/03/05 05:20:38 guy Exp $ + * $Id: packet-x25.c,v 1.84 2003/04/20 11:36:16 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -203,6 +203,7 @@ static const fragment_items x25_frag_items = { &hf_x25_segment_multiple_tails, &hf_x25_segment_too_long_segment, &hf_x25_segment_error, + NULL, "segments" }; |