From cc1d2e97ddf67b7db4290f13538a144ed448158c Mon Sep 17 00:00:00 2001
From: guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Date: Tue, 2 Sep 2003 21:37:44 +0000
Subject: From Andreas Sikkema: improved Info column output for multiple H.225
 messages and faststart ( I think, lost track, kind of).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@8342 f5534014-38df-0310-8fa8-9805f1628bb7
---
 packet-h225.c | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

(limited to 'packet-h225.c')

diff --git a/packet-h225.c b/packet-h225.c
index 0b26e4eb19..617826b45e 100644
--- a/packet-h225.c
+++ b/packet-h225.c
@@ -4,7 +4,7 @@
  *
  * Maintained by Andreas Sikkema (andreas.sikkema@philips.com)
  *
- * $Id: packet-h225.c,v 1.11 2003/08/31 00:32:19 guy Exp $
+ * $Id: packet-h225.c,v 1.12 2003/09/02 21:37:44 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -771,6 +771,8 @@ static dissector_handle_t h245dg_handle=NULL;
 static guint32  ipv4_address;
 static guint32  ipv4_port;
 
+static gboolean contains_faststart = FALSE;
+
 static const true_false_string tfs_unsolicited_bit = {
 	"unsolicited bit is SET",
 	"unsolicited bit is NOT set"
@@ -4783,9 +4785,7 @@ dissect_h225_fastStart_item(tvbuff_t *tvb, int offset, packet_info *pinfo, proto
 	offset=dissect_per_length_determinant(tvb, offset, pinfo, tree, hf_h225_fastStart_item_length, &length);
 	offset=dissect_h245_OpenLogicalChannel(tvb, offset, pinfo, tree);
 
- 	if (check_col(pinfo->cinfo, COL_INFO)) {
- 		col_append_str(pinfo->cinfo, COL_INFO, "OpenLogicalChannel " );
- 	}
+	contains_faststart = TRUE;
 
 	return offset;
 }
@@ -6792,6 +6792,7 @@ static per_sequence_t SetupUUIE_sequence[] = {
 static int 
 dissect_h225_SetupUUIE(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
+	contains_faststart = FALSE;
 	offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_SetupUUIE, ett_h225_SetupUUIE, SetupUUIE_sequence);
 	return offset;
 }
@@ -6903,13 +6904,25 @@ dissect_h225_h323_message_body(tvbuff_t *tvb, int offset, packet_info *pinfo, pr
 {
 	guint32 value;
 	
+	contains_faststart = FALSE;
+
 	offset=dissect_per_choice(tvb, offset, pinfo, tree, hf_h225_h323_message_body, ett_h225_h323_message_body, h323_message_body_choice, "h323_message_body", &(value));
-	
+
 	if (check_col(pinfo->cinfo, COL_INFO)){
-		col_prepend_fstr(pinfo->cinfo, COL_INFO, "CS: %s ",
+		col_append_fstr(pinfo->cinfo, COL_INFO, "CS: %s ",
 			val_to_str(value, h323_message_body_vals, "<unknown>"));
+        }
+
+	if (contains_faststart == TRUE )
+	{
+		if (check_col(pinfo->cinfo, COL_INFO))
+		{
+			col_append_str(pinfo->cinfo, COL_INFO, "OpenLogicalChannel " );
+		}
 	}
-	
+
+	col_set_fence(pinfo->cinfo,COL_INFO);
+
 	return offset;
 }
 
@@ -8147,9 +8160,6 @@ dissect_h225_RasMessage(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	if (check_col(pinfo->cinfo, COL_PROTOCOL)){
 		col_set_str(pinfo->cinfo, COL_PROTOCOL, "H.225.0");
 	}
-	if (check_col(pinfo->cinfo, COL_INFO)){
-		col_clear(pinfo->cinfo, COL_INFO);
-	}
 
 	it=proto_tree_add_protocol_format(tree, proto_h225, tvb, 0, tvb_length(tvb), "H.225.0 RAS");
 	tr=proto_item_add_subtree(it, ett_h225);
-- 
cgit v1.2.3