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-atm.c | |
| parent | 9d92bf4eeb0ee6dfe7add0e88632eacac205feb3 (diff) | |
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-atm.c')
| -rw-r--r-- | packet-atm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packet-atm.c b/packet-atm.c index 658b0e3112..52faabfa6b 100644 --- a/packet-atm.c +++ b/packet-atm.c @@ -1,7 +1,7 @@ /* packet-atm.c * Routines for ATM packet disassembly * - * $Id: packet-atm.c,v 1.16 2000/05/15 06:22:05 gram Exp $ + * $Id: packet-atm.c,v 1.17 2000/05/16 04:44:10 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -375,7 +375,7 @@ dissect_lane(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) { tvbuff_t *next_tvb; - next_tvb = tvb_new_subset(pi.compat_top_tvb, offset, -1); + next_tvb = tvb_new_subset(pi.compat_top_tvb, offset, -1, -1); if (check_col(fd, COL_PROTOCOL)) col_add_str(fd, COL_PROTOCOL, "ATM LANE"); @@ -717,7 +717,7 @@ dissect_atm(const u_char *pd, frame_data *fd, proto_tree *tree) /* Dissect as WTAP_ENCAP_ATM_RFC1483 */ /* The ATM iptrace capture that we have hows LLC at this point, * so that's what I'm calling */ - next_tvb = tvb_new_subset(pi.compat_top_tvb, offset, -1); + next_tvb = tvb_new_subset(pi.compat_top_tvb, offset, -1, -1); dissect_llc(next_tvb, &pi, tree); break; |