diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2001-09-30 23:14:43 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2001-09-30 23:14:43 +0000 |
| commit | fff72213162942657b6d56708f82de53cd037ac3 (patch) | |
| tree | 4d941f8e93763aa024f7bd2213eb53d955c23776 /packet-tcp.h | |
| parent | ff4e91b5cc08b714d9affe91df815ddbf3b44ab1 (diff) | |
The length of an NBSS message can be bigger than 64K, so make the
variable that holds it an "int" rather than a "guint16".
Further strengthen the heuristics the NBSS dissector uses to distinguish
NBSS messages from continuations of NBSS messages.
If an frame contains an NBSS continuation, put the protocol tree item
for the continuation data under an NBSS protocol tree item.
Have the TCP dissector supply information to subdissectors via a "struct
tcpinfo" pointed to by "pinfo->private"; move the urgent pointer value
from a global variable into that structure, and add a Boolean flag that
indicates whether the data it's handing to a subdissector is reassembled
data or not.
Make the NBSS dissector check for continuations only in non-reassembled
data.
Fix the computation, in the TCP dissector, of the offset into the tvbuff
handed to the subdissector of the first byte of stuff that needs further
reassembly, and fix the computation of the sequence number corresponding
to that byte.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3984 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-tcp.h')
| -rw-r--r-- | packet-tcp.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/packet-tcp.h b/packet-tcp.h index 6cdba3dfe8..552a575a95 100644 --- a/packet-tcp.h +++ b/packet-tcp.h @@ -1,11 +1,10 @@ /* packet-tcp.h * - * $Id: packet-tcp.h,v 1.6 2000/11/18 10:38:25 guy Exp $ + * $Id: packet-tcp.h,v 1.7 2001/09/30 23:14:43 guy Exp $ * * Ethereal - Network traffic analyzer - * By Gerald Combs <gerald@zing.org> + * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -25,8 +24,14 @@ #ifndef __PACKET_TCP_H__ #define __PACKET_TCP_H__ -/* Urgent pointer value for the current packet. */ -extern guint16 tcp_urgent_pointer; +/* + * Private data passed from the TCP dissector to subdissectors. + */ +struct tcpinfo { + gboolean is_reassembled; /* This is reassembled data. */ + guint16 urgent_pointer; /* Urgent pointer value for the current packet. */ +}; + extern void decode_tcp_ports(tvbuff_t *, int, packet_info *, proto_tree *, int, int); |