From Steve Karg:

Added src and dst to BACnet MS/TP WTAP dissector.  Added BACnet MS/TP summary
with src, dst, and frame type to tree.  Removed src and dst in column info text
since this was duplicated.  Changed field names for src, dst, hdr, and len to
be more consistent with other protocols.

svn path=/trunk/; revision=25323

3 files changed, 68 insertions, 13 deletions

diff --git a/epan/dissectors/packet-cimetrics.c b/epan/dissectors/packet-cimetrics.c
index a2bc56b048..50878f6d5f 100644
--- a/epan/dissectors/packet-cimetrics.c
+++ b/epan/dissectors/packet-cimetrics.c
@@ -32,6 +32,9 @@
 #include <epan/oui.h>
 #include "packet-mstp.h"
 
+/* Probably should be a preference, but here for now */
+#define BACNET_MSTP_SUMMARY_IN_TREE
+
 /* the U+4 device does MS/TP, uLAN, Modbus */
 static const value_string cimetrics_pid_vals[] = {
 	{ 0x0001,	"U+4 MS/TP" },
@@ -54,10 +57,25 @@ dissect_cimetrics_mstp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
 	proto_item *ti;
 	proto_tree *subtree;
-
 	gint offset = 0;
+#ifdef BACNET_MSTP_SUMMARY_IN_TREE
+	guint8 mstp_frame_type = 0;
+	guint8 mstp_frame_source = 0;
+	guint8 mstp_frame_destination = 0;
+#endif
 
+#ifdef BACNET_MSTP_SUMMARY_IN_TREE
+	mstp_frame_type = tvb_get_guint8(tvb, offset+3);
+	mstp_frame_destination = tvb_get_guint8(tvb, offset+4);
+	mstp_frame_source = tvb_get_guint8(tvb, offset+5);
+	ti = proto_tree_add_protocol_format(tree,
+		proto_cimetrics_mstp, tvb, offset, 9,
+		"BACnet MS/TP, Src (%u), Dst (%u), %s",
+		mstp_frame_source, mstp_frame_destination,
+		mstp_frame_type_text(mstp_frame_type));
+#else
 	ti = proto_tree_add_item(tree, proto_cimetrics_mstp, tvb, offset, 9, FALSE);
+#endif
 	subtree = proto_item_add_subtree(ti, ett_cimetrics_mstp);
 	proto_tree_add_item(subtree, hf_cimetrics_mstp_timer, tvb,
 			offset++, 2, TRUE);
diff --git a/epan/dissectors/packet-mstp.c b/epan/dissectors/packet-mstp.c
index 5d2df276e7..0c19d4ecbf 100644
--- a/epan/dissectors/packet-mstp.c
+++ b/epan/dissectors/packet-mstp.c
@@ -39,6 +39,9 @@
 #include "packet-llc.h"
 #include "packet-mstp.h"
 
+/* Probably should be a preference, but here for now */
+#define BACNET_MSTP_SUMMARY_IN_TREE
+
 /* MS/TP Frame Type */
 /* Frame Types 8 through 127 are reserved by ASHRAE. */
 #define MSTP_TOKEN 0
@@ -123,6 +126,14 @@ static guint16 CRC_Calc_Data(
 }
 #endif
 
+/* Common frame type text */
+const gchar *mstp_frame_type_text(guint32 val)
+{
+	return val_to_str(val,
+		bacnet_mstp_frame_type_name,
+		"Unknown Frame Type (%u)");
+}
+
 /* dissects a BACnet MS/TP frame */
 /* preamble 0x55 0xFF is not included in Cimetrics U+4 output */
 void
@@ -153,13 +164,10 @@ dissect_mstp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 	mstp_frame_source = tvb_get_guint8(tvb, offset+2);
 	mstp_frame_pdu_len = tvb_get_ntohs(tvb, offset+3);
 	if (check_col(pinfo->cinfo, COL_INFO)) {
-		col_append_fstr(pinfo->cinfo, COL_INFO, " [%02x>%02x] %s",
-			mstp_frame_source,
-			mstp_frame_destination,
-			val_to_str(mstp_frame_type,
-				bacnet_mstp_frame_type_name,
-				"Unknown Frame Type"));
+		col_append_fstr(pinfo->cinfo, COL_INFO, " %s",
+			mstp_frame_type_text(mstp_frame_type));
 	}
+	/* Add the items to the tree */
 	proto_tree_add_item(subtree, hf_mstp_frame_type, tvb,
 			offset, 1, TRUE);
 	proto_tree_add_item(subtree, hf_mstp_frame_destination, tvb,
@@ -241,10 +249,31 @@ dissect_mstp_wtap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
 	proto_item *ti;
 	proto_tree *subtree;
-	
 	gint offset = 0;
+#ifdef BACNET_MSTP_SUMMARY_IN_TREE
+	guint8 mstp_frame_type = 0;
+	guint8 mstp_frame_source = 0;
+	guint8 mstp_frame_destination = 0;
+#endif
+
+	/* set the MS/TP MAC address in the source/destination */
+	/* Use AT_ARCNET since it is similar to BACnet MS/TP */
+	SET_ADDRESS(&pinfo->dl_dst,	AT_ARCNET, 1, tvb_get_ptr(tvb, offset+3, 1));
+	SET_ADDRESS(&pinfo->dst,	AT_ARCNET, 1, tvb_get_ptr(tvb, offset+3, 1));
+	SET_ADDRESS(&pinfo->dl_src,	AT_ARCNET, 1, tvb_get_ptr(tvb, offset+4, 1));
+	SET_ADDRESS(&pinfo->src,	AT_ARCNET, 1, tvb_get_ptr(tvb, offset+4, 1));
 	
+#ifdef BACNET_MSTP_SUMMARY_IN_TREE
+	mstp_frame_type = tvb_get_guint8(tvb, offset+2);
+	mstp_frame_destination = tvb_get_guint8(tvb, offset+3);
+	mstp_frame_source = tvb_get_guint8(tvb, offset+4);
+	ti = proto_tree_add_protocol_format(tree, proto_mstp, tvb, offset, 8,
+		"BACnet MS/TP, Src (%u), Dst (%u), %s",
+		mstp_frame_source, mstp_frame_destination,
+		mstp_frame_type_text(mstp_frame_type));
+#else
 	ti = proto_tree_add_item(tree, proto_mstp, tvb, offset, 8, FALSE);
+#endif
 	subtree = proto_item_add_subtree(ti, ett_bacnet_mstp);
 	proto_tree_add_item(subtree, hf_mstp_preamble_55, tvb,
 			offset, 1, TRUE);
@@ -273,22 +302,22 @@ proto_register_mstp(void)
 			"MS/TP Frame Type", HFILL }
 		},
 		{ &hf_mstp_frame_destination,
-			{ "Destination Address", "mstp.destination",
+			{ "Destination Address", "mstp.dst",
 			FT_UINT8, BASE_DEC, NULL, 0,
 			"Destination MS/TP MAC Address", HFILL }
 		},
 		{ &hf_mstp_frame_source,
-			{ "Source Address", "mstp.source",
+			{ "Source Address", "mstp.src",
 			FT_UINT8, BASE_DEC, NULL, 0,
 			"Source MS/TP MAC Address", HFILL }
 		},
 		{ &hf_mstp_frame_pdu_len,
-			{ "Length", "mstp.length",
+			{ "Length", "mstp.len",
 			FT_UINT16, BASE_DEC, NULL, 0,
-			"MS/TP Frame Data Length", HFILL }
+			"MS/TP Data Length", HFILL }
 		},
 		{ &hf_mstp_frame_crc8,
-			{ "Header CRC",  "mstp.header_crc",
+			{ "Header CRC",  "mstp.hdr_crc",
 			FT_UINT8, BASE_HEX, NULL, 0,
 			"MS/TP Header CRC", HFILL }
 		},
diff --git a/epan/dissectors/packet-mstp.h b/epan/dissectors/packet-mstp.h
index 9bca4059cf..8a98aa3f1a 100644
--- a/epan/dissectors/packet-mstp.h
+++ b/epan/dissectors/packet-mstp.h
@@ -46,6 +46,14 @@
 #endif
 
 /**
+ * Returns a value string for the BACnet MS/TP Frame Type.
+ * @param val
+ * @return constant C String with MS/TP Frame Type
+ */
+const gchar *
+mstp_frame_type_text(guint32 val);
+
+/**
  * Dissects the BACnet MS/TP packet after the preamble,
  * starting with the MS/TP Frame type octet.  Passes
  * the PDU, if there is one, to the BACnet dissector.