From Olivier Biot: have a separate subtree ett_ value for concatenated

[obnox/wireshark/wip.git] / packet-mtp3.c

diff --git a/packet-mtp3.c b/packet-mtp3.c
index 47446b40b8e976db90d48ce4dcce8107ee8702ee..1c1c0e4501e87192a98c0a335f797facc0568244 100644 (file)
--- a/packet-mtp3.c
+++ b/packet-mtp3.c
@@ -9,7 +9,7 @@
  * Copyright 2001, Michael Tuexen <tuexen [AT] fh-muenster.de>
  * Updated for ANSI and Chinese ITU support by Jeff Morriss <jeff.morriss[AT]ulticom.com>
  *
- * $Id: packet-mtp3.c,v 1.18 2003/09/04 14:30:17 tuexen Exp $
+ * $Id: packet-mtp3.c,v 1.22 2003/09/06 00:03:23 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -332,18 +332,19 @@ dissect_mtp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   proto_item *mtp3_item = NULL;
   proto_tree *mtp3_tree = NULL;
 
-  /* Make entries in Protocol column and Info column on summary display */
-  switch(mtp3_standard) {
-    case ITU_STANDARD:
-      col_set_str(pinfo->cinfo, COL_PROTOCOL, "MTP3 (Int. ITU)");
-      break;
-    case ANSI_STANDARD:
-      col_set_str(pinfo->cinfo, COL_PROTOCOL, "MTP3 (ANSI)");
-      break;
-    case CHINESE_ITU_STANDARD:
-      col_set_str(pinfo->cinfo, COL_PROTOCOL, "MTP3 (Chin. ITU)");
-      break;
-  };      
+  /* Make entries in Protocol column on summary display */
+  if (check_col(pinfo->cinfo, COL_PROTOCOL))
+    switch(mtp3_standard) {
+      case ITU_STANDARD:
+        col_set_str(pinfo->cinfo, COL_PROTOCOL, "MTP3 (Int. ITU)");
+        break;
+      case ANSI_STANDARD:
+        col_set_str(pinfo->cinfo, COL_PROTOCOL, "MTP3 (ANSI)");
+        break;
+      case CHINESE_ITU_STANDARD:
+        col_set_str(pinfo->cinfo, COL_PROTOCOL, "MTP3 (Chin. ITU)");
+        break;
+    };      
 
   if (tree) {
     /* create display subtree for the protocol */