diff options
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/giop/packet-coseventcomm.c | 4 | ||||
| -rw-r--r-- | plugins/giop/packet-cosnaming.c | 4 | ||||
| -rw-r--r-- | plugins/gryphon/packet-gryphon.c | 16 | ||||
| -rw-r--r-- | plugins/mgcp/packet-mgcp.c | 22 |
4 files changed, 23 insertions, 23 deletions
diff --git a/plugins/giop/packet-coseventcomm.c b/plugins/giop/packet-coseventcomm.c index da88c46bbc..c983cd40df 100644 --- a/plugins/giop/packet-coseventcomm.c +++ b/plugins/giop/packet-coseventcomm.c @@ -650,8 +650,8 @@ static gboolean dissect_coseventcomm(tvbuff_t *tvb, packet_info *pinfo, proto_tr pinfo->current_proto = "COSEVENTCOMM"; - if (check_col(pinfo->fd, COL_PROTOCOL)) - col_add_str(pinfo->fd, COL_PROTOCOL, "COSEVENTCOMM"); + if (check_col(pinfo->cinfo, COL_PROTOCOL)) + col_add_str(pinfo->cinfo, COL_PROTOCOL, "COSEVENTCOMM"); if (ptree) { ti = proto_tree_add_item(ptree, proto_coseventcomm, tvb, *offset, tvb_length(tvb) - *offset, FALSE); diff --git a/plugins/giop/packet-cosnaming.c b/plugins/giop/packet-cosnaming.c index cc76a50c63..b4326ecbab 100644 --- a/plugins/giop/packet-cosnaming.c +++ b/plugins/giop/packet-cosnaming.c @@ -1685,8 +1685,8 @@ static gboolean dissect_cosnaming(tvbuff_t *tvb, packet_info *pinfo, proto_tree pinfo->current_proto = "COSNAMING"; - if (check_col(pinfo->fd, COL_PROTOCOL)) - col_add_str(pinfo->fd, COL_PROTOCOL, "COSNAMING"); + if (check_col(pinfo->cinfo, COL_PROTOCOL)) + col_add_str(pinfo->cinfo, COL_PROTOCOL, "COSNAMING"); if (ptree) { ti = proto_tree_add_item(ptree, proto_cosnaming, tvb, *offset, tvb_length(tvb) - *offset, FALSE); diff --git a/plugins/gryphon/packet-gryphon.c b/plugins/gryphon/packet-gryphon.c index 48eee98004..fdc451179c 100644 --- a/plugins/gryphon/packet-gryphon.c +++ b/plugins/gryphon/packet-gryphon.c @@ -3,7 +3,7 @@ * By Steve Limkemann <stevelim@dgtech.com> * Copyright 1998 Steve Limkemann * - * $Id: packet-gryphon.c,v 1.25 2001/12/03 04:00:24 guy Exp $ + * $Id: packet-gryphon.c,v 1.26 2001/12/10 00:26:20 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -157,24 +157,24 @@ dissect_gryphon(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *gryphon_tree; guint8 frmtyp; - if (check_col(pinfo->fd, COL_PROTOCOL)) - col_set_str(pinfo->fd, COL_PROTOCOL, "Gryphon"); - if (check_col(pinfo->fd, COL_INFO)) - col_clear(pinfo->fd, COL_INFO); + if (check_col(pinfo->cinfo, COL_PROTOCOL)) + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Gryphon"); + if (check_col(pinfo->cinfo, COL_INFO)) + col_clear(pinfo->cinfo, COL_INFO); ti = proto_tree_add_item(tree, proto_gryphon, tvb, 0, tvb_length(tvb), FALSE); gryphon_tree = proto_item_add_subtree(ti, ett_gryphon); - if (check_col(pinfo->fd, COL_INFO)) { + if (check_col(pinfo->cinfo, COL_INFO)) { /* * Indicate what kind of message the first message is. */ frmtyp = tvb_get_guint8(tvb, 6) & ~RESPONSE_FLAGS; if (frmtyp >= SIZEOF (frame_type)) - col_set_str(pinfo->fd, COL_INFO, "- Invalid -"); + col_set_str(pinfo->cinfo, COL_INFO, "- Invalid -"); else - col_set_str(pinfo->fd, COL_INFO, frame_type[frmtyp]); + col_set_str(pinfo->cinfo, COL_INFO, frame_type[frmtyp]); } if (tree) { diff --git a/plugins/mgcp/packet-mgcp.c b/plugins/mgcp/packet-mgcp.c index 21b14036e5..bec38eb26c 100644 --- a/plugins/mgcp/packet-mgcp.c +++ b/plugins/mgcp/packet-mgcp.c @@ -2,7 +2,7 @@ * Routines for mgcp packet disassembly * RFC 2705 * - * $Id: packet-mgcp.c,v 1.28 2001/12/03 04:00:26 guy Exp $ + * $Id: packet-mgcp.c,v 1.29 2001/12/10 00:26:21 guy Exp $ * * Copyright (c) 2000 by Ed Warnicke <hagbard@physics.rutgers.edu> * @@ -217,10 +217,10 @@ dissect_mgcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * Set the columns now, so that they'll be set correctly if we throw * an exception. We can set them later as well.... */ - if (check_col(pinfo->fd, COL_PROTOCOL)) - col_add_str(pinfo->fd, COL_PROTOCOL, "MGCP"); - if (check_col(pinfo->fd, COL_INFO)) - col_clear(pinfo->fd, COL_INFO); + if (check_col(pinfo->cinfo, COL_PROTOCOL)) + col_add_str(pinfo->cinfo, COL_PROTOCOL, "MGCP"); + if (check_col(pinfo->cinfo, COL_INFO)) + col_clear(pinfo->cinfo, COL_INFO); /* * Check to see whether we're really dealing with MGCP by looking @@ -266,24 +266,24 @@ dissect_mgcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * in order to prevent the column info changing to reflect the SDP. */ tvb_sectionbegin = 0; - if (check_col(pinfo->fd, COL_PROTOCOL)){ + if (check_col(pinfo->cinfo, COL_PROTOCOL)){ if( global_mgcp_message_count == TRUE ){ if(num_messages > 1){ - col_add_fstr(pinfo->fd, COL_PROTOCOL, "MGCP (%i messages)",num_messages); + col_add_fstr(pinfo->cinfo, COL_PROTOCOL, "MGCP (%i messages)",num_messages); } else { - col_add_fstr(pinfo->fd, COL_PROTOCOL, "MGCP (%i message)",num_messages); + col_add_fstr(pinfo->cinfo, COL_PROTOCOL, "MGCP (%i message)",num_messages); } } else { - col_add_str(pinfo->fd, COL_PROTOCOL, "MGCP"); + col_add_str(pinfo->cinfo, COL_PROTOCOL, "MGCP"); } } - if (check_col(pinfo->fd, COL_INFO) ){ + if (check_col(pinfo->cinfo, COL_INFO) ){ sectionlen = tvb_find_line_end(tvb, tvb_sectionbegin,-1, &tvb_sectionend); - col_add_fstr(pinfo->fd,COL_INFO, "%s", + col_add_fstr(pinfo->cinfo, COL_INFO, "%s", tvb_format_text(tvb,tvb_sectionbegin,sectionlen)); } } |