aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Tüxen <tuexen@fh-muenster.de>2003-09-04 14:30:18 +0000
committerMichael Tüxen <tuexen@fh-muenster.de>2003-09-04 14:30:18 +0000
commit16d75dc6fe8d214ae3760e8020c24142c5d4d254 (patch)
tree9160de5f6fe3402d7eef8f0cf43788547bd23f9a
parent11274846f9ee69781379b4e286f995e39d04dacf (diff)
Indicate the Standard (ITU, ANSI, Chin. ITU) in the protocol column.
svn path=/trunk/; revision=8370
-rw-r--r--packet-mtp3.c15
-rw-r--r--packet-mtp3mg.c15
-rw-r--r--packet-sccp.c15
-rwxr-xr-xpacket-sccpmg.c15
4 files changed, 48 insertions, 12 deletions
diff --git a/packet-mtp3.c b/packet-mtp3.c
index 0e458b3ad8..47446b40b8 100644
--- 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.17 2003/07/09 10:41:07 tuexen Exp $
+ * $Id: packet-mtp3.c,v 1.18 2003/09/04 14:30:17 tuexen Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -333,8 +333,17 @@ dissect_mtp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree *mtp3_tree = NULL;
/* Make entries in Protocol column and Info column on summary display */
- if (check_col(pinfo->cinfo, COL_PROTOCOL))
- col_set_str(pinfo->cinfo, COL_PROTOCOL, "MTP3");
+ 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 */
diff --git a/packet-mtp3mg.c b/packet-mtp3mg.c
index acdb68de63..e12514d916 100644
--- a/packet-mtp3mg.c
+++ b/packet-mtp3mg.c
@@ -10,7 +10,7 @@
*
* Copyright 2003, Jeff Morriss <jeff.morriss[AT]ulticom.com>
*
- * $Id: packet-mtp3mg.c,v 1.7 2003/05/01 21:42:56 guy Exp $
+ * $Id: packet-mtp3mg.c,v 1.8 2003/09/04 14:30:18 tuexen Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -848,8 +848,17 @@ dissect_mtp3mg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree *mtp3mg_tree = NULL;
/* Make entries in Protocol column and Info column on summary display */
- if (check_col(pinfo->cinfo, COL_PROTOCOL))
- col_set_str(pinfo->cinfo, COL_PROTOCOL, "MTP3MG");
+ switch(mtp3_standard) {
+ case ITU_STANDARD:
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "MTP3MG (Int. ITU)");
+ break;
+ case ANSI_STANDARD:
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "MTP3MG (ANSI)");
+ break;
+ case CHINESE_ITU_STANDARD:
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "MTP3MG (Chin. ITU)");
+ break;
+ };
if (tree) {
/* create display subtree for the protocol */
diff --git a/packet-sccp.c b/packet-sccp.c
index 9aad9e1759..a3d78c7def 100644
--- a/packet-sccp.c
+++ b/packet-sccp.c
@@ -8,7 +8,7 @@
*
* Copyright 2002, Jeff Morriss <jeff.morriss[AT]ulticom.com>
*
- * $Id: packet-sccp.c,v 1.11 2003/06/26 06:28:47 guy Exp $
+ * $Id: packet-sccp.c,v 1.12 2003/09/04 14:30:18 tuexen Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -1891,8 +1891,17 @@ dissect_sccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree *sccp_tree = NULL;
/* Make entry in the Protocol column on summary display */
- if (check_col(pinfo->cinfo, COL_PROTOCOL))
- col_set_str(pinfo->cinfo, COL_PROTOCOL, "SCCP");
+ switch(mtp3_standard) {
+ case ITU_STANDARD:
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "SCCP (Int. ITU)");
+ break;
+ case ANSI_STANDARD:
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "SCCP (ANSI)");
+ break;
+ case CHINESE_ITU_STANDARD:
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "SCCP (Chin. ITU)");
+ break;
+ };
/* In the interest of speed, if "tree" is NULL, don't do any work not
necessary to generate protocol tree items. */
diff --git a/packet-sccpmg.c b/packet-sccpmg.c
index cc2200bfe8..d29febeaa9 100755
--- a/packet-sccpmg.c
+++ b/packet-sccpmg.c
@@ -8,7 +8,7 @@
*
* Copyright 2002, Jeff Morriss <jeff.morriss[AT]ulticom.com>
*
- * $Id: packet-sccpmg.c,v 1.5 2003/04/22 13:47:38 tuexen Exp $
+ * $Id: packet-sccpmg.c,v 1.6 2003/09/04 14:30:18 tuexen Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -285,8 +285,17 @@ dissect_sccpmg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree *sccpmg_tree = NULL;
/* Make entry in the Protocol column on summary display */
- if (check_col(pinfo->cinfo, COL_PROTOCOL))
- col_set_str(pinfo->cinfo, COL_PROTOCOL, "SCCPMG");
+ switch(mtp3_standard) {
+ case ITU_STANDARD:
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "SCCPMG (Int. ITU)");
+ break;
+ case ANSI_STANDARD:
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "SCCPMG (ANSI)");
+ break;
+ case CHINESE_ITU_STANDARD:
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "SCCPMG (Chin. ITU)");
+ break;
+ };
/* In the interest of speed, if "tree" is NULL, don't do any work not
necessary to generate protocol tree items. */