diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-01-08 07:17:55 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-01-08 07:17:55 +0000 |
| commit | 86a251065d768c8e88a6f5c62dc0e53d93cabb8e (patch) | |
| tree | 4b28e7419457af85fe159b5c2289e1d764abc267 /packet-frame.c | |
| parent | 8fa2aef40e6f6015e7e65308bef2f0dbc6fc9f89 (diff) | |
| download | wireshark-86a251065d768c8e88a6f5c62dc0e53d93cabb8e.tar.gz wireshark-86a251065d768c8e88a6f5c62dc0e53d93cabb8e.tar.bz2 wireshark-86a251065d768c8e88a6f5c62dc0e53d93cabb8e.zip | |
If a ReportedBoundsError exception occurs, report it as a "malformed
packet" rather than a "malformed frame" - the packet in question might
be part of a link-layer frame or might span more than one link-layer
frame.
svn path=/trunk/; revision=4497
Diffstat (limited to 'packet-frame.c')
| -rw-r--r-- | packet-frame.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/packet-frame.c b/packet-frame.c index 2f2b35bc5b..951844a2a2 100644 --- a/packet-frame.c +++ b/packet-frame.c @@ -2,7 +2,7 @@ * * Top-most dissector. Decides dissector based on Wiretap Encapsulation Type. * - * $Id: packet-frame.c,v 1.16 2001/12/24 17:06:53 gerald Exp $ + * $Id: packet-frame.c,v 1.17 2002/01/08 07:17:55 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -158,9 +158,9 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } CATCH(ReportedBoundsError) { if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "[Malformed Frame]"); + col_append_str(pinfo->cinfo, COL_INFO, "[Malformed Packet]"); proto_tree_add_protocol_format(tree, proto_malformed, tvb, 0, 0, - "[Malformed Frame: %s]", pinfo->current_proto ); + "[Malformed Packet: %s]", pinfo->current_proto ); } ENDTRY; } @@ -222,10 +222,10 @@ proto_register_frame(void) proto_set_cant_disable(proto_frame); proto_short = proto_register_protocol("Short Frame", "Short frame", "short"); - proto_malformed = proto_register_protocol("Malformed Frame", - "Malformed frame", "malformed"); + proto_malformed = proto_register_protocol("Malformed Packet", + "Malformed packet", "malformed"); - /* "Short Frame" and "Malformed Frame" aren't really protocols, + /* "Short Frame" and "Malformed Packet" aren't really protocols, they're error indications; disabling them makes no sense. */ proto_set_cant_disable(proto_short); proto_set_cant_disable(proto_malformed); |