osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Check COL_PROTOCOL, not COL_INFO, before updating COL_PROTOCOL. 

Fix up white space.

svn path=/trunk/; revision=8398
This commit is contained in:
Guy Harris 2003-09-06 00:04:45 +00:00
parent e46ea95fb9
commit 52391a1c35
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packet-sccp.c
View File

@ -8,7 +8,7 @@
*
* Copyright 2002, Jeff Morriss <jeff.morriss[AT]ulticom.com>
*
* $Id: packet-sccp.c,v 1.13 2003/09/05 20:11:45 tuexen Exp $
* $Id: packet-sccp.c,v 1.14 2003/09/06 00:04:45 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -1891,7 +1891,8 @@ 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_INFO)) switch(mtp3_standard) {
if (check_col(pinfo->cinfo, COL_PROTOCOL))
switch(mtp3_standard) {
case ITU_STANDARD:
col_set_str(pinfo->cinfo, COL_PROTOCOL, "SCCP (Int. ITU)");
break;

26
packet-sccpmg.c
View File

@ -8,7 +8,7 @@
*
* Copyright 2002, Jeff Morriss <jeff.morriss[AT]ulticom.com>
*
* $Id: packet-sccpmg.c,v 1.7 2003/09/05 20:11:45 tuexen Exp $
* $Id: packet-sccpmg.c,v 1.8 2003/09/06 00:04:21 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -285,18 +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 */
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;
};
if (check_col(pinfo->cinfo, COL_PROTOCOL))
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. */