diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2000-11-18 10:38:33 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2000-11-18 10:38:33 +0000 |
| commit | f4fc5ac736a773f41e683e59d4431b1fbfa43c9d (patch) | |
| tree | 5e117f446c6e233d14b642596d67c985e685f328 /epan/packet.h | |
| parent | 92c209a221b63e9fd8b07684cec124efc0e01597 (diff) | |
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@2658 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/packet.h')
| -rw-r--r-- | epan/packet.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/packet.h b/epan/packet.h index e73245a79c..59fe569b95 100644 --- a/epan/packet.h +++ b/epan/packet.h @@ -1,7 +1,7 @@ /* packet.h * Definitions for packet disassembly structures and routines * - * $Id: packet.h,v 1.6 2000/11/16 07:35:42 guy Exp $ + * $Id: packet.h,v 1.7 2000/11/18 10:38:33 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -333,7 +333,7 @@ void dissect_data(tvbuff_t *tvb, int, packet_info *pinfo, proto_tree *tree); /* These functions are in ethertype.c */ void capture_ethertype(guint16 etype, int offset, const u_char *pd, packet_counts *ld); -void ethertype(guint16 etype, tvbuff_t*, int offset_after_ethertype, +guint ethertype(guint16 etype, tvbuff_t*, int offset_after_ethertype, packet_info *pinfo, proto_tree *tree, proto_tree *fh_tree, int item_id); extern const value_string etype_vals[]; |