From 5bcb17c724b7c1958a0f36d2a421fa7e6da9345e Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Fri, 29 Dec 2000 04:16:57 +0000 Subject: If we get an exception when dissecting a packet, append "[Short Frame]" or "[Malformed Frame]" to the Info column. Make some dissectors set the Protocol column and clear the Info column before fetching anything from the tvbuff they were handed, so that if the frame is short or malformed, it'll be marked as being the right top-level protocol, and the Info column won't have cruft left over from the previous protocol. svn path=/trunk/; revision=2800 --- packet-ncp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'packet-ncp.c') diff --git a/packet-ncp.c b/packet-ncp.c index bafd1852fd..ccd19618b8 100644 --- a/packet-ncp.c +++ b/packet-ncp.c @@ -3,7 +3,7 @@ * Gilbert Ramirez * Modified to allow NCP over TCP/IP decodes by James Coe * - * $Id: packet-ncp.c,v 1.41 2000/11/19 08:54:00 guy Exp $ + * $Id: packet-ncp.c,v 1.42 2000/12/29 04:16:57 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -264,6 +264,8 @@ dissect_ncp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pinfo->current_proto = "NCP"; if (check_col(pinfo->fd, COL_PROTOCOL)) col_set_str(pinfo->fd, COL_PROTOCOL, "NCP"); + if (check_col(pinfo->fd, COL_INFO)) + col_clear(pinfo->fd, COL_INFO); if ( pi.ptype == PT_TCP || pi.ptype == PT_UDP ) { ncpiph.signature = tvb_get_ntohl(tvb, 0); -- cgit v1.2.3