diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-01-22 03:33:45 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-01-22 03:33:45 +0000 |
| commit | 9f2c88966a252520a4bafaa5fee36cf39c1eb85a (patch) | |
| tree | d6278fa82b47a9aa4ce9153dbf718e6cfc6b8fdc /packet-vtp.c | |
| parent | 79e1fdb9e56339d8d7e8d9df090dc0386cf4131e (diff) | |
Remove more "CHECK_DISPLAY_AS_DATA()" calls and "pinfo->current_proto ="
statements.
Move the setting of the Protocol column in various 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.
Make the IP dissector static, as it's called only via dissector tables
or dissector handles. Also make the "dissect the TOS field as the
DiffServ DS field" flag static, as it's not referred to outside of
"packet-ip.c".
In the NCP dissector, refer to the port type through "pinfo" rather than
through the global "pi", as it's a tvbuffified dissector.
svn path=/trunk/; revision=2929
Diffstat (limited to 'packet-vtp.c')
| -rw-r--r-- | packet-vtp.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/packet-vtp.c b/packet-vtp.c index 9402cb5b9b..78cc6670f6 100644 --- a/packet-vtp.c +++ b/packet-vtp.c @@ -1,7 +1,7 @@ /* packet-vtp.c * Routines for the disassembly of Cisco's Virtual Trunking Protocol * - * $Id: packet-vtp.c,v 1.10 2001/01/09 06:31:44 guy Exp $ + * $Id: packet-vtp.c,v 1.11 2001/01/22 03:33:45 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -102,10 +102,6 @@ dissect_vtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 *upd_timestamp; int vlan_info_len; - CHECK_DISPLAY_AS_DATA(proto_vtp, tvb, pinfo, tree); - - pinfo->current_proto = "VTP"; - if (check_col(pinfo->fd, COL_PROTOCOL)) col_set_str(pinfo->fd, COL_PROTOCOL, "VTP"); if (check_col(pinfo->fd, COL_INFO)) |