Minor updates to ISL dissector:

- Bring URLs at top of file up to date.
- Replace redundant true false string (bpdu_tfs) with built-in one (tfs_yes_no)
- Change VLAN ID representations from hex to decimal 
- Change description (but not filter name) for BPDU indicator to indicate that,
  per Cisco documentation, it is set when it is not only a BPDU frame but also
  set for CDP and VTP frames.
- Add "(Color)" to VLAN ID field descriptions for nostalgic reasons :)



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

1 files changed, 9 insertions, 18 deletions

diff --git a/epan/dissectors/packet-isl.c b/epan/dissectors/packet-isl.c
index 745a6b746d..a965e5b9f8 100644
--- a/epan/dissectors/packet-isl.c
+++ b/epan/dissectors/packet-isl.c
@@ -37,15 +37,11 @@
 /*
  * See
  *
- *	http://www.cisco.com/warp/public/473/741_4.html
+ *  http://www.cisco.com/en/US/tech/tk389/tk689/technologies_tech_note09186a0080094665.shtml
  *
  * and
  *
- *	http://www.cisco.com/univercd/cc/td/doc/product/lan/trsrb/frames.htm
- *
- * and
- *
- *	http://www.cisco.com/en/US/tech/tk389/tk390/technologies_tech_note09186a0080094665.shtml
+ *  http://www.cisco.com/univercd/cc/td/doc/product/lan/trsrb/frames.htm
  *
  * for information on ISL.
  */
@@ -134,11 +130,6 @@ static const value_string ether_user_vals[] = {
 	{0,   NULL}
 };
 
-static const true_false_string bpdu_tfs = {
-	"Yes",
-	"No"
-};
-
 static const true_false_string explorer_tfs = {
 	"Explorer frame",
 	"Data frame"
@@ -241,7 +232,7 @@ dissect_isl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int fcs_len)
     proto_tree_add_item(fh_tree, hf_isl_hsa, payload_tvb, 3, 3, FALSE);
   }
   if (check_col(pinfo->cinfo, COL_INFO))
-    col_add_fstr(pinfo->cinfo, COL_INFO, "VLAN ID: 0x%04X",
+    col_add_fstr(pinfo->cinfo, COL_INFO, "VLAN ID: %u",
 		 tvb_get_ntohs(tvb, 20) >> 1);
   if (tree) {
     proto_tree_add_item(fh_tree, hf_isl_vlan_id, payload_tvb, 6, 2, FALSE);
@@ -354,11 +345,11 @@ proto_register_isl(void)
 	{ "HSA",		"isl.hsa", FT_UINT24, BASE_HEX, NULL, 0x0,
 		"High bits of source address", HFILL }},
 	{ &hf_isl_vlan_id,
-	{ "VLAN ID",		"isl.vlan_id", FT_UINT16, BASE_HEX, NULL,
-		0xFFFE, "Virtual LAN ID", HFILL }},
+	{ "VLAN ID",		"isl.vlan_id", FT_UINT16, BASE_DEC, NULL,
+		0xFFFE, "Virtual LAN ID (Color)", HFILL }},
 	{ &hf_isl_bpdu,
-	{ "BPDU",		"isl.bpdu", FT_BOOLEAN, 16,
-		TFS(&bpdu_tfs), 0x0001, "BPDU indicator", HFILL }},
+	{ "BPDU/CDP/VTP",		"isl.bpdu", FT_BOOLEAN, 16,
+		TFS(&tfs_yes_no), 0x0001, "BPDU/CDP/VTP indicator", HFILL }},
 	{ &hf_isl_index,
 	{ "Index",		"isl.index", FT_UINT16, BASE_DEC, NULL, 0x0,
 		"Port index of packet source", HFILL }},
@@ -366,8 +357,8 @@ proto_register_isl(void)
 	{ "CRC",		"isl.crc", FT_UINT32, BASE_HEX, NULL, 0x0,
 		"CRC field of encapsulated frame", HFILL }},
 	{ &hf_isl_src_vlan_id,
-	{ "Source VLAN ID",	"isl.src_vlan_id", FT_UINT16, BASE_HEX, NULL,
-		0xFFFE, "Source Virtual LAN ID", HFILL }},
+	{ "Source VLAN ID",	"isl.src_vlan_id", FT_UINT16, BASE_DEC, NULL,
+		0xFFFE, "Source Virtual LAN ID (Color)", HFILL }},
 	{ &hf_isl_explorer,
 	{ "Explorer",		"isl.explorer", FT_BOOLEAN, 16,
 		TFS(&explorer_tfs), 0x0001, NULL, HFILL }},