diff options
| author | Guy Harris <guy@alum.mit.edu> | 2003-04-20 11:36:16 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2003-04-20 11:36:16 +0000 |
| commit | d359286841fb9221400bcc64bf8bbcc88e3127fd (patch) | |
| tree | 7ed0620519b78e1ad0b8f6a83d488e1dd856bb3f /packet-tcp.c | |
| parent | 4af58d8967aecdaea73d618ea7d6310183e6ffd2 (diff) | |
| download | wireshark-d359286841fb9221400bcc64bf8bbcc88e3127fd.tar.gz wireshark-d359286841fb9221400bcc64bf8bbcc88e3127fd.tar.bz2 wireshark-d359286841fb9221400bcc64bf8bbcc88e3127fd.zip | |
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
Diffstat (limited to 'packet-tcp.c')
| -rw-r--r-- | packet-tcp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packet-tcp.c b/packet-tcp.c index f19796a608..fdf445d9e8 100644 --- a/packet-tcp.c +++ b/packet-tcp.c @@ -1,7 +1,7 @@ /* packet-tcp.c * Routines for TCP packet disassembly * - * $Id: packet-tcp.c,v 1.189 2003/03/27 19:55:59 guy Exp $ + * $Id: packet-tcp.c,v 1.190 2003/04/20 11:36:16 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -144,6 +144,7 @@ static const fragment_items tcp_segment_items = { &hf_tcp_segment_multiple_tails, &hf_tcp_segment_too_long_fragment, &hf_tcp_segment_error, + NULL, "Segments" }; |