diff options
| author | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-05-16 04:44:14 +0000 |
|---|---|---|
| committer | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-05-16 04:44:14 +0000 |
| commit | 0a2817cebacb5352ff348434db2571e218a21bdb (patch) | |
| tree | 50401d28646b843ea7fdfac3e1487613b2bdc9af /packet-llc.c | |
| parent | 9d92bf4eeb0ee6dfe7add0e88632eacac205feb3 (diff) | |
| download | wireshark-0a2817cebacb5352ff348434db2571e218a21bdb.tar.gz wireshark-0a2817cebacb5352ff348434db2571e218a21bdb.tar.bz2 wireshark-0a2817cebacb5352ff348434db2571e218a21bdb.zip | |
Have tvbuff's keep track of cap_len and pkt_len ('length' and 'reported_length'
in tvbuff terminology). This is implemented for TVBUFF_REAL and TVBUFF_SUBSET
so far; support for TVBUFF_COMPOSITE is coming soon.
Throw either ReportedBoundsError or BoundsError.
A ReportedBoundsError is reported as "Malformed Frame" since the protocol
stated that a certain number of bytes should be available but they weren't.
A BoundsError is reported as a "Short Frame" since the snaplen was too short.
Register proto_short (BoundsError) and proto_malformed (ReportedBounds)
so searches can be made on "short" and "malformed".
svn path=/trunk/; revision=1965
Diffstat (limited to 'packet-llc.c')
| -rw-r--r-- | packet-llc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packet-llc.c b/packet-llc.c index a9bac08fd0..daf391eb4c 100644 --- a/packet-llc.c +++ b/packet-llc.c @@ -2,7 +2,7 @@ * Routines for IEEE 802.2 LLC layer * Gilbert Ramirez <gram@xiexie.org> * - * $Id: packet-llc.c,v 1.59 2000/05/12 05:06:26 gram Exp $ + * $Id: packet-llc.c,v 1.60 2000/05/16 04:44:12 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -342,7 +342,7 @@ dissect_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) oui); } - next_tvb = tvb_new_subset(tvb, 8, -1); + next_tvb = tvb_new_subset(tvb, 8, -1, -1); tvb_compat(next_tvb, &pd, &offset); switch (oui) { @@ -432,7 +432,7 @@ dissect_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ); } - next_tvb = tvb_new_subset(tvb, llc_header_len, -1); + next_tvb = tvb_new_subset(tvb, llc_header_len, -1, -1); if (XDLC_IS_INFORMATION(control)) { tvb_compat(tvb, &pd, &offset); /* non-SNAP */ |