osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Don't guard col_clear with col_check 

svn path=/trunk/; revision=29346
This commit is contained in:
Kovarththanan Rajaratnam 2009-08-09 08:14:59 +00:00
parent 6110a96f68
commit ac463d2697
63 changed files with 70 additions and 222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asn1/h225/packet-h225-template.c
View File

@ -165,9 +165,7 @@ dissect_h225_H323UserInformation(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
if (check_col(pinfo->cinfo, COL_PROTOCOL)){
col_set_str(pinfo->cinfo, COL_PROTOCOL, PSNAME);
}
if (check_col(pinfo->cinfo, COL_INFO)){
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
it=proto_tree_add_protocol_format(tree, proto_h225, tvb, 0, tvb_length(tvb), PSNAME" CS");
tr=proto_item_add_subtree(it, ett_h225);

4
asn1/t125/packet-t125-template.c
View File

@ -62,9 +62,7 @@ dissect_t125(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *parent_tree)
gint32 tag;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "T.125");
if (check_col(pinfo->cinfo, COL_INFO)){
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
item = proto_tree_add_item(parent_tree, proto_t125, tvb, 0, tvb_length(tvb), FALSE);
tree = proto_item_add_subtree(item, ett_t125);

8
asn1/t38/packet-t38-template.c
View File

@ -513,9 +513,7 @@ dissect_t38_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
col_set_str(pinfo->cinfo, COL_PROTOCOL, "T.38");
if (check_col(pinfo->cinfo, COL_INFO)){
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
primary_part = TRUE;
@ -560,9 +558,7 @@ dissect_t38_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
guint16 ifp_packet_number=1;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "T.38");
if (check_col(pinfo->cinfo, COL_INFO)){
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
primary_part = TRUE;

4
epan/dissectors/packet-afs.c
View File

@ -1424,9 +1424,7 @@ dissect_afs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
col_set_str(pinfo->cinfo, COL_PROTOCOL, "AFS (RX)");
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
reply = (rxinfo->flags & RX_CLIENT_INITIATED) == 0;
port = ((reply == 0) ? pinfo->destport : pinfo->srcport );

4
epan/dissectors/packet-amqp.c
View File

@ -1093,9 +1093,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
int offset;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "AMQP");
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
if (tree) {

4
epan/dissectors/packet-artnet.c
View File

@ -1367,9 +1367,7 @@ dissect_artnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
col_set_str(pinfo->cinfo, COL_PROTOCOL, "ARTNET");
/* Clear out stuff in the info column */
if(check_col(pinfo->cinfo,COL_INFO)){
col_clear(pinfo->cinfo,COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
if (tree) {
ti = proto_tree_add_item(tree, proto_artnet, tvb, offset, -1, FALSE);

4
epan/dissectors/packet-bpdu.c
View File

@ -313,9 +313,7 @@ dissect_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (check_col(pinfo->cinfo, COL_PROTOCOL)) {
col_set_str(pinfo->cinfo, COL_PROTOCOL, "STP"); /* Spanning Tree Protocol */
}
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
bpdu_type = tvb_get_guint8(tvb, BPDU_TYPE);

4
epan/dissectors/packet-cfm.c
View File

@ -1474,9 +1474,7 @@ static void dissect_cfm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
col_set_str(pinfo->cinfo, COL_PROTOCOL, "CFM");
/* Clear out stuff in the info column */
if (check_col(pinfo->cinfo,COL_INFO)) {
col_clear(pinfo->cinfo,COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
/* provide info column with CFM packet type (opcode)*/
cfm_pdu_type = tvb_get_guint8(tvb, 1);

4
epan/dissectors/packet-ctdb.c
View File

@ -1005,9 +1005,7 @@ dissect_ctdb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
col_set_str(pinfo->cinfo, COL_PROTOCOL, "CTDB");
if(check_col(pinfo->cinfo, COL_INFO)){
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
if(parent_tree){
item=proto_tree_add_item(parent_tree, proto_ctdb, tvb, offset,

4
epan/dissectors/packet-dcp-etsi.c
View File

@ -183,9 +183,7 @@ dissect_dcp_etsi (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
pinfo->current_proto = "DCP (ETSI)";
/* Clear out stuff in the info column */
if (check_col (pinfo->cinfo, COL_INFO)) {
col_clear (pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
if (check_col (pinfo->cinfo, COL_PROTOCOL)) {
col_set_str (pinfo->cinfo, COL_PROTOCOL, "DCP (ETSI)");
/*col_append_fstr (pinfo->cinfo, COL_INFO, " tvb %d", tvb_length(tvb));*/

4
epan/dissectors/packet-dec-bpdu.c
View File

@ -119,9 +119,7 @@ dissect_dec_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
const char *sep;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "DEC_STP");
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
bpdu_type = tvb_get_guint8(tvb, BPDU_TYPE);

8
epan/dissectors/packet-dec-dnart.c
View File

@ -378,13 +378,9 @@ dissect_dec_rt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
char *addr;
offset = 0;
if (check_col(pinfo->cinfo, COL_PROTOCOL)) {
col_clear(pinfo->cinfo, COL_PROTOCOL);
}
col_clear(pinfo->cinfo, COL_PROTOCOL);
col_set_str(pinfo->cinfo, COL_PROTOCOL, "DEC DNA");
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
set_dnet_address(&pinfo->dl_src, &pinfo->net_src);
set_dnet_address(&pinfo->dl_src, &pinfo->src);

5
epan/dissectors/packet-dect.c
View File

@ -1886,10 +1886,7 @@ dissect_dect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
col_set_str(pinfo->cinfo, COL_PROTOCOL, "DECT");
/* Clear out stuff in the info column */
if(check_col(pinfo->cinfo, COL_INFO))
{
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
if(tree)
{
proto_item *ti =NULL;

5
epan/dissectors/packet-dplay.c
View File

@ -1039,10 +1039,7 @@ static void dissect_dplay(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
col_set_str(pinfo->cinfo, COL_PROTOCOL, "DPLAY");
/* Clear out stuff in the info column */
if(check_col(pinfo->cinfo,COL_INFO))
{
col_clear(pinfo->cinfo,COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
if(check_col(pinfo->cinfo,COL_INFO))
{

4
epan/dissectors/packet-dvmrp.c
View File

@ -704,9 +704,7 @@ dissect_dvmrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int of
col_set_str(pinfo->cinfo, COL_PROTOCOL, "DVMRP");
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
if ((tvb_length_remaining(tvb, offset)>=8)

4
epan/dissectors/packet-epl_v1.c
View File

@ -305,9 +305,7 @@ dissect_epl_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
return FALSE;
}
if(check_col(pinfo->cinfo, COL_INFO)){
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
if(check_col(pinfo->cinfo, COL_INFO)){

4
epan/dissectors/packet-fix.c
View File

@ -235,9 +235,7 @@ dissect_fix_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* Make entries in Protocol column and Info column on summary display */
col_set_str(pinfo->cinfo, COL_PROTOCOL, "FIX");
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
/* get at least the fix version: 8=FIX.x.x */
if (fix_marker(tvb, 0) != 0) {

4
epan/dissectors/packet-h225.c
View File

@ -7501,9 +7501,7 @@ dissect_h225_H323UserInformation(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
if (check_col(pinfo->cinfo, COL_PROTOCOL)){
col_set_str(pinfo->cinfo, COL_PROTOCOL, PSNAME);
}
if (check_col(pinfo->cinfo, COL_INFO)){
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
it=proto_tree_add_protocol_format(tree, proto_h225, tvb, 0, tvb_length(tvb), PSNAME" CS");
tr=proto_item_add_subtree(it, ett_h225);

5
epan/dissectors/packet-iax2.c
View File

@ -1013,10 +1013,7 @@ dissect_iax2 (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
{
col_set_str (pinfo->cinfo, COL_PROTOCOL, PROTO_TAG_IAX2);
}
if (check_col (pinfo->cinfo, COL_INFO))
{
col_clear (pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
/* add the 'iax2' tree to the main tree */
if (tree)

4
epan/dissectors/packet-icq.c
View File

@ -1729,9 +1729,7 @@ dissect_icq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
return 0; /* This is not a (recognized) ICQ packet */
col_set_str(pinfo->cinfo, COL_PROTOCOL, "ICQ");
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
version = tvb_get_letohs(tvb, ICQ_VERSION);
switch (version) {

8
epan/dissectors/packet-iec104.c
View File

@ -428,9 +428,7 @@ static void dissect_iec104asdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr
if (!(check_col(pinfo->cinfo, COL_INFO) || tree)) return; /* Be sure that the function is only called twice */
col_set_str(pinfo->cinfo, COL_PROTOCOL, "104asdu");
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
asduh = ep_alloc(sizeof(struct asduheader));
res = ep_strbuf_new_label(NULL);
@ -521,9 +519,7 @@ static void dissect_iec104apci(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr
if (!(check_col(pinfo->cinfo, COL_INFO) || tree)) return; /* Be sure that the function is only called twice */
col_set_str(pinfo->cinfo, COL_PROTOCOL, "104apci");
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
apcih = ep_alloc(sizeof(struct apciheader));

4
epan/dissectors/packet-ieee802a.c
View File

@ -92,9 +92,7 @@ dissect_ieee802a(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
int hf;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "IEEE802a");
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
if (tree) {
ti = proto_tree_add_item(tree, proto_ieee802a, tvb, 0, -1, FALSE);

4
epan/dissectors/packet-igap.c
View File

@ -147,9 +147,7 @@ dissect_igap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int off
tree = proto_item_add_subtree(item, ett_igap);
col_set_str(pinfo->cinfo, COL_PROTOCOL, "IGAP");
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
type = tvb_get_guint8(tvb, offset);
if (check_col(pinfo->cinfo, COL_INFO)) {

4
epan/dissectors/packet-igmp.c
View File

@ -910,9 +910,7 @@ dissect_igmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
col_set_str(pinfo->cinfo, COL_PROTOCOL, "IGMP");
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
type = tvb_get_guint8(tvb, offset);

4
epan/dissectors/packet-ipvs-syncd.c
View File

@ -108,9 +108,7 @@ dissect_ipvs_syncd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPVS");
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
cnt = tvb_get_guint8(tvb, offset);
proto_tree_add_item(tree, hf_conn_count, tvb, offset, 1, FALSE);

4
epan/dissectors/packet-kdp.c
View File

@ -84,9 +84,7 @@ static void dissect_kdp(tvbuff_t *tvb,
int offset;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "KDP");
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
if (tree) {
proto_item *ti;
proto_tree *kdp_tree, *flags_tree;

8
epan/dissectors/packet-llc.c
View File

@ -419,9 +419,7 @@ dissect_basicxid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
guint8 format, types, wsize;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "XID");
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
format = tvb_get_guint8(tvb, 0);
if (tree) {
@ -469,9 +467,7 @@ dissect_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
tvbuff_t *next_tvb;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "LLC");
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
dsap = tvb_get_guint8(tvb, 0);
if (tree) {

4
epan/dissectors/packet-lldp.c
View File

@ -2468,9 +2468,7 @@ dissect_lldp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
col_set_str(pinfo->cinfo, COL_PROTOCOL, "LLDP");
/* Clear the information column on summary display */
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
if (tree)
{

4
epan/dissectors/packet-mrdisc.c
View File

@ -204,9 +204,7 @@ dissect_mrdisc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int o
col_set_str(pinfo->cinfo, COL_PROTOCOL, "MRDISC");
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
type = tvb_get_guint8(tvb, offset);

4
epan/dissectors/packet-msnip.c
View File

@ -234,9 +234,7 @@ dissect_msnip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int of
col_set_str(pinfo->cinfo, COL_PROTOCOL, "MSNIP");
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
type = tvb_get_guint8(tvb, offset);

4
epan/dissectors/packet-nbd.c
View File

@ -193,9 +193,7 @@ dissect_nbd_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
col_set_str(pinfo->cinfo, COL_PROTOCOL, "NBD");
if(check_col(pinfo->cinfo, COL_INFO)){
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
item = proto_tree_add_item(parent_tree, proto_nbd, tvb, 0, -1, FALSE);
tree = proto_item_add_subtree(item, ett_nbd);

4
epan/dissectors/packet-ndmp.c
View File

@ -3232,9 +3232,7 @@ dissect_ndmp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
col_set_writable(pinfo->cinfo, TRUE);
col_set_str(pinfo->cinfo, COL_PROTOCOL, "NDMP");
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
if (tree) {
ndmp_item = proto_tree_add_item(tree, proto_ndmp, tvb, 0, -1, FALSE);
ndmp_tree = proto_item_add_subtree(ndmp_item, ett_ndmp);

4
epan/dissectors/packet-netdump.c
View File

@ -101,9 +101,7 @@ dissect_netdump(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
col_set_str(pinfo->cinfo, COL_PROTOCOL, "Netdump");
/* Clear out stuff in the info column */
if (check_col(pinfo->cinfo,COL_INFO)) {
col_clear(pinfo->cinfo,COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
if (tree) { /* we are being asked for details */
proto_item *ti = NULL;

4
epan/dissectors/packet-nhrp.c
View File

@ -841,9 +841,7 @@ void dissect_nhrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
oui_info_t *oui_info;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "NHRP");
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
memset(&hdr, 0, sizeof(e_nhrp_hdr));

5
epan/dissectors/packet-omapi.c
View File

@ -110,10 +110,7 @@ dissect_omapi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
col_set_str(pinfo->cinfo, COL_PROTOCOL, "OMAPI");
if (check_col(pinfo->cinfo, COL_INFO))
{
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
ti = proto_tree_add_item(tree, proto_omapi, tvb, 0, -1, FALSE);
omapi_tree = proto_item_add_subtree(ti, ett_omapi);

4
epan/dissectors/packet-pagp.c
View File

@ -199,9 +199,7 @@ dissect_pagp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
col_set_str(pinfo->cinfo, COL_PROTOCOL, "PAGP"); /* PAGP Protocol */
}
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
pinfo->current_proto = "PAGP";

10
epan/dissectors/packet-pppoe.c
View File

@ -426,10 +426,7 @@ static void dissect_pppoed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_item *ti;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "PPPoED");
if (check_col(pinfo->cinfo, COL_INFO))
{
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
/* Start Decoding Here. */
pppoe_code = tvb_get_guint8(tvb, 1);
@ -677,10 +674,7 @@ static void dissect_pppoes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
tvbuff_t *next_tvb;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "PPPoES");
if (check_col(pinfo->cinfo,COL_INFO))
{
col_clear(pinfo->cinfo,COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
/* Start Decoding Here. */
pppoe_code = tvb_get_guint8(tvb, 1);

5
epan/dissectors/packet-rdt.c
View File

@ -303,10 +303,7 @@ static void dissect_rdt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* Set/clear columns */
col_set_str(pinfo->cinfo, COL_PROTOCOL, "RDT");
if (check_col(pinfo->cinfo, COL_INFO))
{
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
/* Create RDT protocol tree */
if (tree)

4
epan/dissectors/packet-retix-bpdu.c
View File

@ -66,9 +66,7 @@ dissect_retix_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
const guint8 *bridge_mac_str;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "R-STP");
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
bridge_mac_str = tvb_get_ptr(tvb, 10, 6);
if (check_col(pinfo->cinfo, COL_INFO)){
col_add_fstr(pinfo->cinfo, COL_INFO, "Bridge MAC %s", ether_to_str(bridge_mac_str));

4
epan/dissectors/packet-rgmp.c
View File

@ -78,9 +78,7 @@ dissect_rgmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int off
tree = proto_item_add_subtree(item, ett_rgmp);
col_set_str(pinfo->cinfo, COL_PROTOCOL, "RGMP");
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
type = tvb_get_guint8(tvb, offset);
if (check_col(pinfo->cinfo, COL_INFO)) {

4
epan/dissectors/packet-rmp.c
View File

@ -108,9 +108,7 @@ dissect_rmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
col_set_str(pinfo->cinfo, COL_PROTOCOL, "RMP");
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
type = tvb_get_guint8(tvb, 0);

4
epan/dissectors/packet-rtnet.c
View File

@ -679,9 +679,7 @@ dissect_rtcfg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
col_set_str(pinfo->cinfo, COL_PROTOCOL, "RTcfg");
/* Clear out stuff in the info column */
if(check_col(pinfo->cinfo,COL_INFO)){
col_clear(pinfo->cinfo,COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
if (tree) {
ti = proto_tree_add_item(tree, proto_rtcfg, tvb, offset, -1, FALSE);

4
epan/dissectors/packet-rtps.c
View File

@ -5593,9 +5593,7 @@ static gboolean dissect_rtps(tvbuff_t *tvb,
/* --- Make entries in Protocol column ---*/
col_set_str(pinfo->cinfo, COL_PROTOCOL, "RTPS");
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
if (tree) {

4
epan/dissectors/packet-rtps2.c
View File

@ -8182,9 +8182,7 @@ static gboolean dissect_rtps(tvbuff_t *tvb,
/* --- Make entries in Protocol column ---*/
col_set_str(pinfo->cinfo, COL_PROTOCOL, "RTPS2");
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
/* Check if is NDDSPING */
{

4
epan/dissectors/packet-s5066.c
View File

@ -1301,9 +1301,7 @@ dissect_s5066_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
col_set_str(pinfo->cinfo, COL_PROTOCOL, "S5066");
/* Clear out stuff in the info column, the add PDU type */
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
if (check_col(pinfo->cinfo, COL_INFO)) {
col_add_fstr(pinfo->cinfo, COL_INFO, "PDU type %s", val_to_str(pdu_type, s5066_pdu_type, "Unknown (0x%02x)"));
}

8
epan/dissectors/packet-smb-browse.c
View File

@ -572,9 +572,7 @@ dissect_mailslot_browse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr
guint32 uptime;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "BROWSER");
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
cmd = tvb_get_guint8(tvb, offset);
@ -815,9 +813,7 @@ dissect_mailslot_lanman(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr
guint namelen;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "BROWSER");
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
cmd = tvb_get_guint8(tvb, offset);

4
epan/dissectors/packet-smb-mailslot.c
View File

@ -107,9 +107,7 @@ dissect_mailslot_smb(tvbuff_t *mshdr_tvb, tvbuff_t *setup_tvb,
return TRUE;
}
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
smb_info = pinfo->private_data;
if (smb_info->sip != NULL && smb_info->sip->extra_info_type == SMB_EI_TRI)

4
epan/dissectors/packet-smb.c
View File

@ -16262,9 +16262,7 @@ dissect_smb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
top_tree=parent_tree;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMB");
if (check_col(pinfo->cinfo, COL_INFO)){
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
/* start off using the local variable, we will allocate a new one if we
need to*/

4
epan/dissectors/packet-t125.c
View File

@ -2135,9 +2135,7 @@ dissect_t125(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *parent_tree)
gint32 tag;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "T.125");
if (check_col(pinfo->cinfo, COL_INFO)){
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
item = proto_tree_add_item(parent_tree, proto_t125, tvb, 0, tvb_length(tvb), FALSE);
tree = proto_item_add_subtree(item, ett_t125);

8
epan/dissectors/packet-t38.c
View File

@ -1094,9 +1094,7 @@ dissect_t38_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
col_set_str(pinfo->cinfo, COL_PROTOCOL, "T.38");
if (check_col(pinfo->cinfo, COL_INFO)){
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
primary_part = TRUE;
@ -1141,9 +1139,7 @@ dissect_t38_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
guint16 ifp_packet_number=1;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "T.38");
if (check_col(pinfo->cinfo, COL_INFO)){
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
primary_part = TRUE;

4
epan/dissectors/packet-teamspeak2.c
View File

@ -708,9 +708,7 @@ static void dissect_ts2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
conversation_data = ts2_get_conversation(pinfo);
col_set_str(pinfo->cinfo, COL_PROTOCOL, "TS2");
/* Clear out stuff in the info column */
if (check_col(pinfo->cinfo,COL_INFO)) {
col_clear(pinfo->cinfo,COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
if (check_col(pinfo->cinfo, COL_INFO))
{
if(class==TS2C_ACK)

4
epan/dissectors/packet-wccp.c
View File

@ -211,9 +211,7 @@ dissect_wccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
return 0;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "WCCP");
if(check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
if(check_col(pinfo->cinfo, COL_INFO)) {

4
epan/dissectors/packet-winsrepl.c
View File

@ -642,9 +642,7 @@ dissect_winsrepl_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
enum wrepl_mess_type mess_type;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "WINS-Replication");
if (check_col(pinfo->cinfo, COL_INFO)){
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
if (parent_tree) {
winsrepl_item = proto_tree_add_item(parent_tree, proto_winsrepl, tvb, offset, -1, FALSE);

5
epan/dissectors/packet-wsp.c
View File

@ -5469,10 +5469,7 @@ dissect_wsp_fromwap_cl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/*
* XXX - what about WTLS->WSP?
*/
if (check_col(pinfo->cinfo, COL_INFO))
{
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
dissect_wsp_common(tvb, pinfo, tree, wtp_fromudp_handle, TRUE);
}

4
epan/dissectors/packet-x224.c
View File

@ -180,9 +180,7 @@ dissect_x224(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
x224_conv_info_t *x224_info;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "X.224");
if (check_col(pinfo->cinfo, COL_INFO)){
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
length = tvb_get_guint8(tvb, offset);
if (parent_tree) {

4
epan/dissectors/packet-zbee-nwk.c
View File

@ -368,9 +368,7 @@ dissect_zbee_nwk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* Add ourself to the protocol column, clear the info column, and create the protocol tree. */
col_set_str(pinfo->cinfo, COL_PROTOCOL, "ZigBee");
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
if (tree) {
proto_root = proto_tree_add_protocol_format(tree, proto_zbee_nwk, tvb, offset, tvb_length(tvb), "ZigBee Network Layer");
nwk_tree = proto_item_add_subtree(proto_root, ett_zbee_nwk);

4
epan/dissectors/packet-zbee-zcl.c
View File

@ -558,9 +558,7 @@ static void dissect_zbee_zcl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
}
/* Clear info column */
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
/* Get the FCF */
fcf = tvb_get_guint8(tvb, offset);

5
plugins/ethercat/packet-ethercat-frame.c
View File

@ -84,10 +84,7 @@ static void dissect_ethercat_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree
col_set_str(pinfo->cinfo, COL_PROTOCOL, "ECATF");
if (check_col(pinfo->cinfo, COL_INFO))
{
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
if (tree)
{

5
plugins/m2m/packet-m2m.c
View File

@ -186,10 +186,7 @@ static void dissect_m2m(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
col_set_str(pinfo->cinfo, COL_PROTOCOL, "WiMax");
/* Clear out stuff in the info column */
if (check_col(pinfo->cinfo, COL_INFO))
{
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
{ /* we are being asked for details */

4
plugins/profinet/packet-pn-mrp.c
View File

@ -394,9 +394,7 @@ dissect_PNMRP(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
col_set_str(pinfo->cinfo, COL_PROTOCOL, "PN-MRP");
/* Clear the information column on summary display */
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
if (tree)
{

4
plugins/unistim/packet-unistim.c
View File

@ -1545,9 +1545,7 @@ dissect_unistim(tvbuff_t *tvb,packet_info *pinfo,proto_tree *tree){
size=tvb_length_remaining(tvb, offset);
col_set_str(pinfo->cinfo, COL_PROTOCOL, "UNISTIM");
/* Clear out stuff in the info column */
if (check_col(pinfo->cinfo,COL_INFO)) {
col_clear(pinfo->cinfo,COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
ti = proto_tree_add_item(tree,proto_unistim,tvb,offset,-1,FALSE);
overall_unistim_tree = proto_item_add_subtree(ti,ett_unistim);
ti1=proto_tree_add_text(overall_unistim_tree,tvb,offset,5,"Reliable UDP");

5
plugins/wimax/packet-wmx.c
View File

@ -794,10 +794,7 @@ static void dissect_wimax(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* display the WiMax protocol name */
col_set_str(pinfo->cinfo, COL_PROTOCOL, "WiMax");
/* Clear out stuff in the info column */
if (check_col(pinfo->cinfo, COL_INFO))
{
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
}
gboolean is_down_link(address *src_address)

5
plugins/wimaxasncp/packet-wimaxasncp.c
View File

@ -2004,10 +2004,7 @@ dissect_wimaxasncp(
/* We'll fill in the "Info" column after fetch data, so we clear the
column first in case calls to fetch data from the packet throw an
exception. */
if (check_col(pinfo->cinfo, COL_INFO))
{
col_clear(pinfo->cinfo, COL_INFO);
}
col_clear(pinfo->cinfo, COL_INFO);
/* ========================================================================
* Disesction starts here