diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-01-22 00:20:29 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-01-22 00:20:29 +0000 |
| commit | 79e1fdb9e56339d8d7e8d9df090dc0386cf4131e (patch) | |
| tree | 35171754ad82def133bb42df8e8c630cd917c7e3 /packet-v120.c | |
| parent | d9718a693d2ee60f6e9b018313efb4905b5a2509 (diff) | |
Remove more "CHECK_DISPLAY_AS_DATA()" calls and "pinfo->current_proto ="
statements.
Move the setting of the Protocol column in the Appletalk ARP and IPX
dissectors before anything is fetched from the packet, and also clear
the Info column at that point in those and some other dissectors, so
that if an exception is thrown, the columns don't reflect the previous
protocol.
Fix the registration of the IPX RIP dissector to use the right protocol
ID.
svn path=/trunk/; revision=2928
Diffstat (limited to 'packet-v120.c')
| -rw-r--r-- | packet-v120.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/packet-v120.c b/packet-v120.c index a4fe672f5c..353ef40b72 100644 --- a/packet-v120.c +++ b/packet-v120.c @@ -2,7 +2,7 @@ * Routines for v120 frame disassembly * Bert Driehuis <driehuis@playbeing.org> * - * $Id: packet-v120.c,v 1.17 2001/01/09 06:31:44 guy Exp $ + * $Id: packet-v120.c,v 1.18 2001/01/22 00:20:29 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -65,12 +65,10 @@ dissect_v120(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 control; tvbuff_t *next_tvb; - CHECK_DISPLAY_AS_DATA(proto_v120, tvb, pinfo, tree); - - pinfo->current_proto = "V.120"; - if (check_col(pinfo->fd, COL_PROTOCOL)) col_set_str(pinfo->fd, COL_PROTOCOL, "V.120"); + if (check_col(pinfo->fd, COL_INFO)) + col_clear(pinfo->fd, COL_INFO); byte0 = tvb_get_guint8(tvb, 0); |