Set the Protocol column, and clear the Info column, before we start

fetching anything from the packet, so that if an exception is thrown
those columns don't show something from the previous protocol.

Don't fetch the protocol identifier or protocol version identifier
before you use them.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3000 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 11 insertions, 8 deletions

diff --git a/packet-bpdu.c b/packet-bpdu.c
index 6a0aaa9185..bffedca2b8 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.21 2001/01/22 00:20:29 guy Exp $
+ * $Id: packet-bpdu.c,v 1.22 2001/02/08 03:59:12 guy Exp $
  *
  * Copyright 1999 Christophe Tronche <ch.tronche@computer.org>
  * 
@@ -146,6 +146,13 @@ dissect_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
 	    return;
       }
 
+      if (check_col(pinfo->fd, COL_PROTOCOL)) {
+	    col_set_str(pinfo->fd, COL_PROTOCOL, "STP"); /* Spanning Tree Protocol */
+      }
+      if (check_col(pinfo->fd, COL_INFO)) {
+	    col_clear(pinfo->fd, COL_INFO);
+      }
+
       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);
@@ -154,10 +161,6 @@ dissect_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
       root_path_cost = tvb_get_ntohl(tvb, BPDU_ROOT_PATH_COST);
       port_identifier = tvb_get_ntohs(tvb, BPDU_PORT_IDENTIFIER);
 
-      if (check_col(pinfo->fd, COL_PROTOCOL)) {
-	    col_set_str(pinfo->fd, COL_PROTOCOL, "STP"); /* Spanning Tree Protocol */
-      }
-
       if (check_col(pinfo->fd, COL_INFO)) {
 	    if (bpdu_type == 0)
 		  col_add_fstr(pinfo->fd, COL_INFO, "Conf. %sRoot = %d/%s  Cost = %d  Port = 0x%04x", 
@@ -169,12 +172,11 @@ dissect_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
       }
 
       if (tree) {
-	    protocol_identifier = tvb_get_ntohs(tvb, BPDU_IDENTIFIER);
-	    protocol_version_identifier = tvb_get_guint8(tvb, BPDU_VERSION_IDENTIFIER);
-
 	    ti = proto_tree_add_protocol_format(tree, proto_bpdu, tvb, 0, 35,
 			    	"Spanning Tree Protocol");
 	    bpdu_tree = proto_item_add_subtree(ti, ett_bpdu);
+
+	    protocol_identifier = tvb_get_ntohs(tvb, BPDU_IDENTIFIER);
 	    proto_tree_add_uint_format(bpdu_tree, hf_bpdu_proto_id, tvb,
 				       BPDU_IDENTIFIER, 2, 
 				       protocol_identifier,
@@ -183,6 +185,7 @@ dissect_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
 				       protocol_identifier == 0 ? 
 				       "Spanning Tree" : "Unknown Protocol");
 
+	    protocol_version_identifier = tvb_get_guint8(tvb, BPDU_VERSION_IDENTIFIER);
 	    proto_tree_add_uint(bpdu_tree, hf_bpdu_version_id, tvb, 
 				BPDU_VERSION_IDENTIFIER, 1, 
 				protocol_version_identifier);