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-nbipx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'packet-nbipx.c') diff --git a/packet-nbipx.c b/packet-nbipx.c index 5aba9ada36..0170c021d4 100644 --- a/packet-nbipx.c +++ b/packet-nbipx.c @@ -2,7 +2,7 @@ * Routines for NetBIOS over IPX packet disassembly * Gilbert Ramirez * - * $Id: packet-nbipx.c,v 1.31 2000/12/06 04:19:44 guy Exp $ + * $Id: packet-nbipx.c,v 1.32 2000/12/29 04:16:57 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -122,6 +122,8 @@ dissect_nbipx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (check_col(pinfo->fd, COL_PROTOCOL)) col_set_str(pinfo->fd, COL_PROTOCOL, "NBIPX"); + if (check_col(pinfo->fd, COL_INFO)) + col_clear(pinfo->fd, COL_INFO); /* * As said above, we look at the length of the packet to decide -- cgit v1.2.3