diff options
| -rw-r--r-- | packet-m3ua.c | 24 | ||||
| -rw-r--r-- | packet-mtp3.c | 24 | ||||
| -rw-r--r-- | packet-mtp3mg.c | 24 | ||||
| -rw-r--r-- | packet-sccp.c | 24 | ||||
| -rwxr-xr-x | packet-sccpmg.c | 25 |
5 files changed, 61 insertions, 60 deletions
diff --git a/packet-m3ua.c b/packet-m3ua.c index 100477d208..109a75b29c 100644 --- a/packet-m3ua.c +++ b/packet-m3ua.c @@ -7,7 +7,7 @@ * * Copyright 2000, 2001, 2002, 2003 Michael Tuexen <tuexen [AT] fh-muenster.de> * - * $Id: packet-m3ua.c,v 1.34 2003/09/04 19:06:19 guy Exp $ + * $Id: packet-m3ua.c,v 1.35 2003/09/05 20:11:44 tuexen Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -1633,17 +1633,17 @@ dissect_m3ua(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree) /* make entry in the Protocol column on summary display */ if (check_col(pinfo->cinfo, COL_PROTOCOL)) - switch(version) { - case M3UA_V5: - col_set_str(pinfo->cinfo, COL_PROTOCOL, "M3UA (ID 05)"); - break; - case M3UA_V6: - col_set_str(pinfo->cinfo, COL_PROTOCOL, "M3UA (ID 06)"); - break; - case M3UA_RFC: - col_set_str(pinfo->cinfo, COL_PROTOCOL, "M3UA (RFC 3332)"); - break; - }; + switch(version) { + case M3UA_V5: + col_set_str(pinfo->cinfo, COL_PROTOCOL, "M3UA (ID 05)"); + break; + case M3UA_V6: + col_set_str(pinfo->cinfo, COL_PROTOCOL, "M3UA (ID 06)"); + break; + case M3UA_RFC: + col_set_str(pinfo->cinfo, COL_PROTOCOL, "M3UA (RFC 3332)"); + 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-mtp3.c b/packet-mtp3.c index 47446b40b8..e26312dbe2 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.18 2003/09/04 14:30:17 tuexen Exp $ + * $Id: packet-mtp3.c,v 1.19 2003/09/05 20:11:44 tuexen Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -333,17 +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 */ - 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 (check_col(pinfo->cinfo, COL_INFO))
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 e12514d916..4a60b42955 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.8 2003/09/04 14:30:18 tuexen Exp $ + * $Id: packet-mtp3mg.c,v 1.9 2003/09/05 20:11:44 tuexen Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -848,17 +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 */ - 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 (check_col(pinfo->cinfo, COL_INFO))
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 a3d78c7def..a1249ebdb0 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.12 2003/09/04 14:30:18 tuexen Exp $ + * $Id: packet-sccp.c,v 1.13 2003/09/05 20:11:45 tuexen Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -1891,17 +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 */ - 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; - }; + if (check_col(pinfo->cinfo, COL_INFO))
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 d29febeaa9..b3c68586a9 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.6 2003/09/04 14:30:18 tuexen Exp $ + * $Id: packet-sccpmg.c,v 1.7 2003/09/05 20:11:45 tuexen Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -285,17 +285,18 @@ 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 */ - 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; - }; + if (check_col(pinfo->cinfo, COL_INFO)) + 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. */ |