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-bpdu.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-bpdu.c')
| -rw-r--r-- | packet-bpdu.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/packet-bpdu.c b/packet-bpdu.c index 20f9c9e0ab..6a0aaa9185 100644 --- a/packet-bpdu.c +++ b/packet-bpdu.c @@ -1,7 +1,7 @@ /* packet-bpdu.c * Routines for BPDU (Spanning Tree Protocol) disassembly * - * $Id: packet-bpdu.c,v 1.20 2001/01/14 08:25:14 guy Exp $ + * $Id: packet-bpdu.c,v 1.21 2001/01/22 00:20:29 guy Exp $ * * Copyright 1999 Christophe Tronche <ch.tronche@computer.org> * @@ -101,8 +101,6 @@ dissect_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_tree *bpdu_tree; proto_item *ti; - CHECK_DISPLAY_AS_DATA(proto_bpdu, tvb, pinfo, tree); - /* GARP application frames require special interpretation of the destination address field; otherwise, they will be mistaken as BPDU frames. @@ -148,8 +146,6 @@ dissect_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { return; } - pinfo->current_proto = "STP"; - bpdu_type = tvb_get_guint8(tvb, BPDU_TYPE); flags = tvb_get_guint8(tvb, BPDU_FLAGS); root_identifier_bridge_priority = tvb_get_ntohs(tvb, BPDU_ROOT_IDENTIFIER); |