diff options
| author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-09 07:01:26 +0000 |
|---|---|---|
| committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-09 07:01:26 +0000 |
| commit | 4b6090e5766e315090c2f3d15cb3368d98168be9 (patch) | |
| tree | d037fcc527744affba9a5d599723b9be8f4f6d2c /epan | |
| parent | 24ca3c44c9e72bb95ed5f3bb9608600555de368e (diff) | |
Don't guard col_set_str (COL_INFO) with col_check
svn path=/trunk/; revision=29342
Diffstat (limited to 'epan')
77 files changed, 181 insertions, 384 deletions
diff --git a/epan/dissectors/packet-aim.c b/epan/dissectors/packet-aim.c index a51e9787a9..4446de7a51 100644 --- a/epan/dissectors/packet-aim.c +++ b/epan/dissectors/packet-aim.c @@ -527,8 +527,7 @@ static void dissect_aim_pdu(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, "AIM"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "AOL Instant Messenger"); + col_set_str(pinfo->cinfo, COL_INFO, "AOL Instant Messenger"); /* get relevant header information */ offset += 1; /* XXX - put the identifier into the tree? */ @@ -710,8 +709,7 @@ void aim_init_family(int proto, int ett, guint16 family, const aim_subtype *subt static void dissect_aim_newconn(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *tree) { - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "New Connection"); + col_set_str(pinfo->cinfo, COL_INFO, "New Connection"); if (tvb_length_remaining(tvb, offset) > 0) { proto_tree_add_item(tree, hf_aim_version, tvb, offset, 4, FALSE); diff --git a/epan/dissectors/packet-arcnet.c b/epan/dissectors/packet-arcnet.c index 5bdb2dd34c..2b84feb8b3 100644 --- a/epan/dissectors/packet-arcnet.c +++ b/epan/dissectors/packet-arcnet.c @@ -144,8 +144,7 @@ dissect_arcnet_common (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, col_set_str (pinfo->cinfo, COL_PROTOCOL, "ARCNET"); - if (check_col (pinfo->cinfo, COL_INFO)) - col_set_str (pinfo->cinfo, COL_INFO, "ARCNET"); + col_set_str(pinfo->cinfo, COL_INFO, "ARCNET"); src = tvb_get_guint8 (tvb, 0); dst = tvb_get_guint8 (tvb, 1); diff --git a/epan/dissectors/packet-ascend.c b/epan/dissectors/packet-ascend.c index 4c66770516..a55167c867 100644 --- a/epan/dissectors/packet-ascend.c +++ b/epan/dissectors/packet-ascend.c @@ -62,8 +62,7 @@ dissect_ascend(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(check_col(pinfo->cinfo, COL_RES_DL_DST)) col_set_str(pinfo->cinfo, COL_RES_DL_DST, "N/A" ); col_set_str(pinfo->cinfo, COL_PROTOCOL, "N/A"); - if(check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Lucent/Ascend packet trace" ); + col_set_str(pinfo->cinfo, COL_INFO, "Lucent/Ascend packet trace"); /* If this is a transmitted or received PPP frame, set the PPP direction. */ switch (pseudo_header->ascend.type) { diff --git a/epan/dissectors/packet-atm.c b/epan/dissectors/packet-atm.c index 74d2eca7dc..661a20acce 100644 --- a/epan/dissectors/packet-atm.c +++ b/epan/dissectors/packet-atm.c @@ -487,8 +487,7 @@ dissect_le_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 opcode; guint16 flags; - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "LE Control"); + col_set_str(pinfo->cinfo, COL_INFO, "LE Control"); if (tree) { ti = proto_tree_add_protocol_format(tree, proto_atm_lane, tvb, offset, 108, "ATM LANE"); @@ -672,8 +671,7 @@ dissect_lane(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case TRAF_ST_LANE_802_3: case TRAF_ST_LANE_802_3_MC: - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "LE Client - Ethernet/802.3"); + col_set_str(pinfo->cinfo, COL_INFO, "LE Client - Ethernet/802.3"); dissect_le_client(tvb, tree); /* Dissect as Ethernet */ @@ -683,8 +681,7 @@ dissect_lane(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case TRAF_ST_LANE_802_5: case TRAF_ST_LANE_802_5_MC: - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "LE Client - 802.5"); + col_set_str(pinfo->cinfo, COL_INFO, "LE Client - 802.5"); dissect_le_client(tvb, tree); /* Dissect as Token-Ring */ @@ -694,8 +691,7 @@ dissect_lane(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) default: /* Dump it as raw data. */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Unknown LANE traffic type"); + col_set_str(pinfo->cinfo, COL_INFO, "Unknown LANE traffic type"); next_tvb = tvb_new_subset(tvb, 0, -1, -1); call_dissector(data_handle,next_tvb, pinfo, tree); break; diff --git a/epan/dissectors/packet-bacnet.c b/epan/dissectors/packet-bacnet.c index e013187a60..c0f6c1a56a 100644 --- a/epan/dissectors/packet-bacnet.c +++ b/epan/dissectors/packet-bacnet.c @@ -192,8 +192,7 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "BACnet-NPDU"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Building Automation and Control Network NPDU"); + col_set_str(pinfo->cinfo, COL_INFO, "Building Automation and Control Network NPDU"); offset = 0; bacnet_version = tvb_get_guint8(tvb, offset); diff --git a/epan/dissectors/packet-bvlc.c b/epan/dissectors/packet-bvlc.c index eae519e50d..62b5d7e464 100644 --- a/epan/dissectors/packet-bvlc.c +++ b/epan/dissectors/packet-bvlc.c @@ -141,8 +141,7 @@ dissect_bvlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "BVLC"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "BACnet Virtual Link Control"); + col_set_str(pinfo->cinfo, COL_INFO, "BACnet Virtual Link Control"); bvlc_function = tvb_get_guint8(tvb, offset+1); packet_length = tvb_get_ntohs(tvb, offset+2); diff --git a/epan/dissectors/packet-ccsds.c b/epan/dissectors/packet-ccsds.c index e112dd1639..642dd1d564 100644 --- a/epan/dissectors/packet-ccsds.c +++ b/epan/dissectors/packet-ccsds.c @@ -342,8 +342,7 @@ dissect_ccsds(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) const char* time_string; col_set_str(pinfo->cinfo, COL_PROTOCOL, "CCSDS"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "CCSDS Packet"); + col_set_str(pinfo->cinfo, COL_INFO, "CCSDS Packet"); if (tree) { ccsds_packet = proto_tree_add_item(tree, proto_ccsds, tvb, 0, -1, FALSE); diff --git a/epan/dissectors/packet-cgmp.c b/epan/dissectors/packet-cgmp.c index 894cb4015e..f902add981 100644 --- a/epan/dissectors/packet-cgmp.c +++ b/epan/dissectors/packet-cgmp.c @@ -62,8 +62,7 @@ dissect_cgmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 count; col_set_str(pinfo->cinfo, COL_PROTOCOL, "CGMP"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Cisco Group Management Protocol"); + col_set_str(pinfo->cinfo, COL_INFO, "Cisco Group Management Protocol"); if (tree) { ti = proto_tree_add_item(tree, proto_cgmp, tvb, offset, -1, diff --git a/epan/dissectors/packet-clip.c b/epan/dissectors/packet-clip.c index 0f3db6a012..b338a1d250 100644 --- a/epan/dissectors/packet-clip.c +++ b/epan/dissectors/packet-clip.c @@ -59,8 +59,7 @@ dissect_clip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(check_col(pinfo->cinfo, COL_RES_DL_DST)) col_set_str(pinfo->cinfo, COL_RES_DL_DST, "N/A" ); col_set_str(pinfo->cinfo, COL_PROTOCOL, "CLIP"); - if(check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Classical IP frame" ); + col_set_str(pinfo->cinfo, COL_INFO, "Classical IP frame"); /* populate a tree in the second pane with the status of the link layer (ie none) diff --git a/epan/dissectors/packet-clnp.c b/epan/dissectors/packet-clnp.c index 1f4560c971..a8f17dc59f 100644 --- a/epan/dissectors/packet-clnp.c +++ b/epan/dissectors/packet-clnp.c @@ -223,8 +223,7 @@ static void dissect_clnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) cnf_proto_id = tvb_get_guint8(tvb, P_CLNP_PROTO_ID); if (cnf_proto_id == NLPID_NULL) { - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Inactive subset"); + col_set_str(pinfo->cinfo, COL_INFO, "Inactive subset"); if (tree) { ti = proto_tree_add_item(tree, proto_clnp, tvb, P_CLNP_PROTO_ID, 1, FALSE); clnp_tree = proto_item_add_subtree(ti, ett_clnp); diff --git a/epan/dissectors/packet-cosine.c b/epan/dissectors/packet-cosine.c index c0f6cf3808..259a660fce 100644 --- a/epan/dissectors/packet-cosine.c +++ b/epan/dissectors/packet-cosine.c @@ -67,8 +67,7 @@ dissect_cosine(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(check_col(pinfo->cinfo, COL_RES_DL_DST)) col_set_str(pinfo->cinfo, COL_RES_DL_DST, "N/A" ); col_set_str(pinfo->cinfo, COL_PROTOCOL, "N/A"); - if(check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "CoSine IPNOS L2 debug output" ); + col_set_str(pinfo->cinfo, COL_INFO, "CoSine IPNOS L2 debug output"); /* populate a tree in the second pane with the status of the link layer (ie none) */ diff --git a/epan/dissectors/packet-dccp.c b/epan/dissectors/packet-dccp.c index 9b6b2f71a0..b4c67b0a3b 100644 --- a/epan/dissectors/packet-dccp.c +++ b/epan/dissectors/packet-dccp.c @@ -585,8 +585,7 @@ static void dissect_dccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) hidden_item = proto_tree_add_boolean(dccp_tree, hf_dccp_malformed, tvb, offset, 0, TRUE); PROTO_ITEM_SET_HIDDEN(hidden_item); } - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Packet too short"); + col_set_str(pinfo->cinfo, COL_INFO, "Packet too short"); THROW(ReportedBoundsError); } diff --git a/epan/dissectors/packet-ddtp.c b/epan/dissectors/packet-ddtp.c index 9cdb569d18..64a3c6f312 100644 --- a/epan/dissectors/packet-ddtp.c +++ b/epan/dissectors/packet-ddtp.c @@ -123,12 +123,10 @@ dissect_ddtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(ddtp_tree, hf_ddtp_msgtype, tvb, 12, 4, FALSE); switch (tvb_get_ntohl(tvb, 12)) { case DDTP_MESSAGE_ERROR : - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str (pinfo->cinfo, COL_INFO, "Message Error"); + col_set_str(pinfo->cinfo, COL_INFO, "Message Error"); break; case DDTP_UPDATE_QUERY : - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str (pinfo->cinfo, COL_INFO, "Update Query"); + col_set_str(pinfo->cinfo, COL_INFO, "Update Query"); if (tree) { proto_tree_add_item(ddtp_tree, hf_ddtp_opcode, tvb, 16, 4, FALSE); @@ -137,40 +135,35 @@ dissect_ddtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } break; case DDTP_UPDATE_REPLY : - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str (pinfo->cinfo, COL_INFO, "Update Reply"); + col_set_str(pinfo->cinfo, COL_INFO, "Update Reply"); if (tree) { proto_tree_add_item(ddtp_tree, hf_ddtp_status, tvb, 16, 4, FALSE); } break; case DDTP_ALIVE_QUERY : - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str (pinfo->cinfo, COL_INFO, "Alive Query"); + col_set_str(pinfo->cinfo, COL_INFO, "Alive Query"); if (tree) { proto_tree_add_text(ddtp_tree, tvb, 16, 4, "Dummy : %u", tvb_get_ntohl(tvb, 16)); } break; case DDTP_ALIVE_REPLY : - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str (pinfo->cinfo, COL_INFO, "Alive Reply"); + col_set_str(pinfo->cinfo, COL_INFO, "Alive Reply"); if (tree) { proto_tree_add_text(ddtp_tree, tvb, 16, 4, "Dummy : %u", tvb_get_ntohl(tvb, 16)); } break; default : - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str (pinfo->cinfo, COL_INFO, "Unknown type"); + col_set_str(pinfo->cinfo, COL_INFO, "Unknown type"); if (tree) { proto_tree_add_text(ddtp_tree, tvb, 12, 4, "Unknown type : %u", tvb_get_ntohl(tvb, 12)); } } } else { - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str (pinfo->cinfo, COL_INFO, "Encrypted payload"); + col_set_str(pinfo->cinfo, COL_INFO, "Encrypted payload"); } return tvb_length(tvb); } diff --git a/epan/dissectors/packet-dect.c b/epan/dissectors/packet-dect.c index 03063509b1..9488785e5c 100644 --- a/epan/dissectors/packet-dect.c +++ b/epan/dissectors/packet-dect.c @@ -1408,13 +1408,11 @@ dissect_decttype(gboolean dect_packet_type, struct dect_afield *pkt_afield, if((tailtype==0)||(tailtype==1)) /* Ct */ { - if(check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "[Ct]"); + col_set_str(pinfo->cinfo, COL_INFO, "[Ct]"); } else if((tailtype==2)||(tailtype==3)) /* Nt, Nt connectionless bearer */ { - if(check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "[Nt]"); + col_set_str(pinfo->cinfo, COL_INFO, "[Nt]"); if(check_col(pinfo->cinfo, COL_INFO /*Type2*/)) col_append_fstr(pinfo->cinfo, COL_INFO /*Type2*/, "RFPI: %s", tvb_bytes_to_str(tvb, offset, 5)); @@ -1423,8 +1421,7 @@ dissect_decttype(gboolean dect_packet_type, struct dect_afield *pkt_afield, } else if(tailtype==4) /* Qt */ { - if(check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "[Qt]"); + col_set_str(pinfo->cinfo, COL_INFO, "[Qt]"); proto_tree_add_item(ATail, hf_dect_A_Tail_Qt_Qh, tvb, offset, 1, FALSE); @@ -1629,8 +1626,7 @@ dissect_decttype(gboolean dect_packet_type, struct dect_afield *pkt_afield, } else if((tailtype==6)||((tailtype==7)&&(dect_packet_type==DECT_PACKET_PP))) /* Mt */ { - if(check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "[Mt]"); + col_set_str(pinfo->cinfo, COL_INFO, "[Mt]"); proto_tree_add_uint(ATail, hf_dect_A_Tail_Mt_Mh, tvb, offset, 1, tail_0); @@ -1721,8 +1717,7 @@ dissect_decttype(gboolean dect_packet_type, struct dect_afield *pkt_afield, } else if((tailtype==7)&&(dect_packet_type==DECT_PACKET_FP)) /* Pt */ { - if(check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "[Pt]"); + col_set_str(pinfo->cinfo, COL_INFO, "[Pt]"); proto_tree_add_item(ATail, hf_dect_A_Tail_Pt_ExtFlag, tvb, offset, 1, FALSE); proto_tree_add_item(ATail, hf_dect_A_Tail_Pt_SDU, tvb, offset, 1, FALSE); diff --git a/epan/dissectors/packet-dlm3.c b/epan/dissectors/packet-dlm3.c index 262558892f..f3c8ae98ec 100644 --- a/epan/dissectors/packet-dlm3.c +++ b/epan/dissectors/packet-dlm3.c @@ -781,9 +781,7 @@ dissect_dlm3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, - "DLM3"); + col_set_str(pinfo->cinfo, COL_INFO, "DLM3"); if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, diff --git a/epan/dissectors/packet-dtp.c b/epan/dissectors/packet-dtp.c index d77e40485c..da83cf692d 100644 --- a/epan/dissectors/packet-dtp.c +++ b/epan/dissectors/packet-dtp.c @@ -79,8 +79,7 @@ dissect_dtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int offset = 0; col_set_str(pinfo->cinfo, COL_PROTOCOL, "DTP"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Dynamic Trunking Protocol"); + col_set_str(pinfo->cinfo, COL_INFO, "Dynamic Trunking Protocol"); if (tree) { ti = proto_tree_add_item(tree, proto_dtp, tvb, offset, -1, FALSE); diff --git a/epan/dissectors/packet-dtpt.c b/epan/dissectors/packet-dtpt.c index 72276b5fd6..96526b17c2 100644 --- a/epan/dissectors/packet-dtpt.c +++ b/epan/dissectors/packet-dtpt.c @@ -460,8 +460,7 @@ dissect_dtpt_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (queryset_size != 60) return 0; col_set_str(pinfo->cinfo, COL_PROTOCOL, "DTPT"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "QuerySet"); + col_set_str(pinfo->cinfo, COL_INFO, "QuerySet"); if (tree) { dtpt_item = proto_tree_add_item(tree, proto_dtpt, diff --git a/epan/dissectors/packet-edonkey.c b/epan/dissectors/packet-edonkey.c index 628583c3cf..f99eeaec11 100644 --- a/epan/dissectors/packet-edonkey.c +++ b/epan/dissectors/packet-edonkey.c @@ -3010,8 +3010,7 @@ static void dissect_edonkey_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tre protocol_name = match_strval(protocol, edonkey_protocols); if (protocol_name == NULL) { /* Not a recognized eDonkey protocol - probably a continuation */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "eDonkey Continuation"); + col_set_str(pinfo->cinfo, COL_INFO, "eDonkey Continuation"); if (edonkey_tree) { bytes = tvb_length_remaining(tvb, offset); proto_tree_add_text(edonkey_tree, tvb, 0, -1, "Continuation data (%d bytes)", bytes); @@ -3120,8 +3119,7 @@ static void dissect_edonkey_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t col_set_str(pinfo->cinfo, COL_PROTOCOL, "eDonkey"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "eDonkey UDP Message"); + col_set_str(pinfo->cinfo, COL_INFO, "eDonkey UDP Message"); if (tree) { ti = proto_tree_add_item(tree, proto_edonkey, tvb, 0, -1, FALSE); diff --git a/epan/dissectors/packet-ehs.c b/epan/dissectors/packet-ehs.c index 84faf29210..6ec6a07171 100644 --- a/epan/dissectors/packet-ehs.c +++ b/epan/dissectors/packet-ehs.c @@ -1064,8 +1064,7 @@ dissect_ehs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int year, jday, hour, minute, second, tenths; col_set_str(pinfo->cinfo, COL_PROTOCOL, "EHS"); - if ( check_col(pinfo->cinfo, COL_INFO) ) - col_set_str ( pinfo->cinfo, COL_INFO, "EHS" ); + col_set_str(pinfo->cinfo, COL_INFO, "EHS"); if ( tree ) { diff --git a/epan/dissectors/packet-exec.c b/epan/dissectors/packet-exec.c index 28eac01384..ca56c6c903 100644 --- a/epan/dissectors/packet-exec.c +++ b/epan/dissectors/packet-exec.c @@ -356,8 +356,7 @@ dissect_exec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* We haven't seen all of the fields yet */ if(hash_info->state < WAIT_FOR_DATA){ - if(check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Session Establishment"); + col_set_str(pinfo->cinfo, COL_INFO, "Session Establishment"); } } diff --git a/epan/dissectors/packet-fc.c b/epan/dissectors/packet-fc.c index 8ed44ef079..ec1d23cef7 100644 --- a/epan/dissectors/packet-fc.c +++ b/epan/dissectors/packet-fc.c @@ -291,8 +291,7 @@ dissect_fc_ba_acc (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, "BLS"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "BA_ACC"); + col_set_str(pinfo->cinfo, COL_INFO, "BA_ACC"); if (tree) { ti = proto_tree_add_text (tree, tvb, 0, tvb_length (tvb), "Basic Link Svc"); @@ -322,8 +321,7 @@ dissect_fc_ba_rjt (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, "BLS"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "BA_RJT"); + col_set_str(pinfo->cinfo, COL_INFO, "BA_RJT"); if (tree) { ti = proto_tree_add_text (tree, tvb, 0, tvb_length (tvb), "Basic Link Svc"); diff --git a/epan/dissectors/packet-fcip.c b/epan/dissectors/packet-fcip.c index 9049ff85be..8a22388913 100644 --- a/epan/dissectors/packet-fcip.c +++ b/epan/dissectors/packet-fcip.c @@ -501,8 +501,7 @@ dissect_fcip (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } } else { - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Special Frame"); + col_set_str(pinfo->cinfo, COL_INFO, "Special Frame"); if (FCIP_IS_CH (pflags)) { if (check_col(pinfo->cinfo, COL_INFO)) col_append_str(pinfo->cinfo, COL_INFO, "(Changed)"); diff --git a/epan/dissectors/packet-fip.c b/epan/dissectors/packet-fip.c index 2871869622..d17561fdf8 100644 --- a/epan/dissectors/packet-fip.c +++ b/epan/dissectors/packet-fip.c @@ -267,8 +267,7 @@ dissect_fip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "FIP"); if (!tvb_bytes_exist(tvb, 0, FIP_HEADER_LEN)) { - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "[packet too short]"); + col_set_str(pinfo->cinfo, COL_INFO, "[packet too short]"); if (tree) proto_tree_add_protocol_format(tree, proto_fip, tvb, 0, -1, "FIP [packet too short]"); diff --git a/epan/dissectors/packet-gmrp.c b/epan/dissectors/packet-gmrp.c index 35b24f96b6..45d09bf4b4 100644 --- a/epan/dissectors/packet-gmrp.c +++ b/epan/dissectors/packet-gmrp.c @@ -122,8 +122,7 @@ dissect_gmrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "GMRP"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "GMRP"); + col_set_str(pinfo->cinfo, COL_INFO, "GMRP"); if (tree) { diff --git a/epan/dissectors/packet-gvrp.c b/epan/dissectors/packet-gvrp.c index c89818afb0..cc744a7960 100644 --- a/epan/dissectors/packet-gvrp.c +++ b/epan/dissectors/packet-gvrp.c @@ -106,8 +106,7 @@ dissect_gvrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "GVRP"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "GVRP"); + col_set_str(pinfo->cinfo, COL_INFO, "GVRP"); if (tree) { diff --git a/epan/dissectors/packet-h1.c b/epan/dissectors/packet-h1.c index e60bb380cd..f1e75c77e2 100644 --- a/epan/dissectors/packet-h1.c +++ b/epan/dissectors/packet-h1.c @@ -123,8 +123,7 @@ static gboolean dissect_h1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } col_set_str (pinfo->cinfo, COL_PROTOCOL, "H1"); - if (check_col (pinfo->cinfo, COL_INFO)) - col_set_str (pinfo->cinfo, COL_INFO, "S5: "); + col_set_str(pinfo->cinfo, COL_INFO, "S5: "); if (tree) { ti = proto_tree_add_item (tree, proto_h1, tvb, offset, 16, FALSE); diff --git a/epan/dissectors/packet-h223.c b/epan/dissectors/packet-h223.c index 1bb24256f5..1e85f1e45f 100644 --- a/epan/dissectors/packet-h223.c +++ b/epan/dissectors/packet-h223.c @@ -1312,8 +1312,7 @@ static void dissect_h223 (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree } if(offset == 0) { - if(check_col (pinfo->cinfo, COL_INFO)) - col_set_str (pinfo->cinfo, COL_INFO, "(No complete PDUs)"); + col_set_str(pinfo->cinfo, COL_INFO, "(No complete PDUs)"); } return; } diff --git a/epan/dissectors/packet-icq.c b/epan/dissectors/packet-icq.c index 6804bc5a3d..f45cf05346 100644 --- a/epan/dissectors/packet-icq.c +++ b/epan/dissectors/packet-icq.c @@ -1720,8 +1720,7 @@ static void dissect_icqv5(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint32 unknown; col_set_str(pinfo->cinfo, COL_PROTOCOL, "ICQv5 (UDP)"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "ICQv5 packet"); + col_set_str(pinfo->cinfo, COL_INFO, "ICQv5 packet"); unknown = tvb_get_letohl(tvb, ICQ5_UNKNOWN); diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 95c6595810..7bfb0caad5 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -7389,8 +7389,7 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo, if (next_tvb == NULL) { /* Just show this as an incomplete fragment. */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Fragmented IEEE 802.11 frame"); + col_set_str(pinfo->cinfo, COL_INFO, "Fragmented IEEE 802.11 frame"); next_tvb = tvb_new_subset (tvb, hdr_len, len, reported_len); call_dissector(data_handle, next_tvb, pinfo, tree); pinfo->fragmented = save_fragmented; diff --git a/epan/dissectors/packet-ipsec-udp.c b/epan/dissectors/packet-ipsec-udp.c index 319b91d4d9..b180c61cfa 100644 --- a/epan/dissectors/packet-ipsec-udp.c +++ b/epan/dissectors/packet-ipsec-udp.c @@ -60,16 +60,14 @@ dissect_udpencap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* First byte of 0 iindicates NAT-keepalive */ if (tvb_get_guint8(tvb, 0) == 0xff) { - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "NAT-keepalive"); + col_set_str(pinfo->cinfo, COL_INFO, "NAT-keepalive"); if (tree) proto_tree_add_text(udpencap_tree, tvb, 0, 1, "NAT-keepalive packet"); } else { /* SPI of zero indicates IKE traffic, otherwise it's ESP */ tvb_memcpy(tvb, (guint8 *)&spi, 0, sizeof(spi)); if (spi == 0) { - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "ISAKMP"); + col_set_str(pinfo->cinfo, COL_INFO, "ISAKMP"); if (tree) { proto_tree_add_text(udpencap_tree, tvb, 0, sizeof(spi), "Non-ESP Marker"); @@ -78,8 +76,7 @@ dissect_udpencap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) next_tvb = tvb_new_subset(tvb, sizeof(spi), -1, -1); call_dissector(isakmp_handle, next_tvb, pinfo, tree); } else { - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "ESP"); + col_set_str(pinfo->cinfo, COL_INFO, "ESP"); if (tree) proto_item_set_len(ti, 0); call_dissector(esp_handle, tvb, pinfo, tree); diff --git a/epan/dissectors/packet-ipx.c b/epan/dissectors/packet-ipx.c index 265190b499..8c649d9f05 100644 --- a/epan/dissectors/packet-ipx.c +++ b/epan/dissectors/packet-ipx.c @@ -596,8 +596,7 @@ dissect_spx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) spx_info spx_info; col_set_str(pinfo->cinfo, COL_PROTOCOL, "SPX"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "SPX"); + col_set_str(pinfo->cinfo, COL_INFO, "SPX"); if (tree) { ti = proto_tree_add_item(tree, proto_spx, tvb, 0, SPX_HEADER_LEN, FALSE); diff --git a/epan/dissectors/packet-lapb.c b/epan/dissectors/packet-lapb.c index e2a4387bed..05de29a474 100644 --- a/epan/dissectors/packet-lapb.c +++ b/epan/dissectors/packet-lapb.c @@ -104,8 +104,7 @@ dissect_lapb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (byte0 != 0x01 && byte0 != 0x03 && byte0 != 0x07 && byte0 != 0x0f) /* invalid LAPB frame */ { - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Invalid LAPB frame"); + col_set_str(pinfo->cinfo, COL_INFO, "Invalid LAPB frame"); if (tree) ti = proto_tree_add_protocol_format(tree, proto_lapb, tvb, 0, -1, "Invalid LAPB frame"); diff --git a/epan/dissectors/packet-lldp.c b/epan/dissectors/packet-lldp.c index 07f6121460..127319a11c 100644 --- a/epan/dissectors/packet-lldp.c +++ b/epan/dissectors/packet-lldp.c @@ -2482,8 +2482,7 @@ dissect_lldp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) rtnValue = dissect_lldp_chassis_id(tvb, pinfo, lldp_tree, offset); if (rtnValue < 0) { - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Invalid Chassis ID TLV"); + col_set_str(pinfo->cinfo, COL_INFO, "Invalid Chassis ID TLV"); return; } @@ -2494,8 +2493,7 @@ dissect_lldp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) rtnValue = dissect_lldp_port_id(tvb, pinfo, lldp_tree, offset); if (rtnValue < 0) { - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Invalid Port ID TLV"); + col_set_str(pinfo->cinfo, COL_INFO, "Invalid Port ID TLV"); return; } @@ -2506,8 +2504,7 @@ dissect_lldp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) rtnValue = dissect_lldp_time_to_live(tvb, pinfo, lldp_tree, offset); if (rtnValue < 0) { - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Invalid Time-to-Live TLV"); + col_set_str(pinfo->cinfo, COL_INFO, "Invalid Time-to-Live TLV"); return; } @@ -2525,20 +2522,17 @@ dissect_lldp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case CHASSIS_ID_TLV_TYPE: rtnValue = dissect_lldp_chassis_id(tvb, pinfo, lldp_tree, offset); rtnValue = -1; /* Duplicate chassis id tlv */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Duplicate Chassis ID TLV"); + col_set_str(pinfo->cinfo, COL_INFO, "Duplicate Chassis ID TLV"); break; case PORT_ID_TLV_TYPE: rtnValue = dissect_lldp_port_id(tvb, pinfo, lldp_tree, offset); rtnValue = -1; /* Duplicate port id tlv */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Duplicate Port ID TLV"); + col_set_str(pinfo->cinfo, COL_INFO, "Duplicate Port ID TLV"); break; case TIME_TO_LIVE_TLV_TYPE: rtnValue = dissect_lldp_time_to_live(tvb, pinfo, lldp_tree, offset); rtnValue = -1; /* Duplicate time-to-live tlv */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Duplicate Time-To-Live TLV"); + col_set_str(pinfo->cinfo, COL_INFO, "Duplicate Time-To-Live TLV"); break; case END_OF_LLDPDU_TLV_TYPE: rtnValue = dissect_lldp_end_of_lldpdu(tvb, pinfo, lldp_tree, offset); diff --git a/epan/dissectors/packet-lsc.c b/epan/dissectors/packet-lsc.c index 78497696d9..311880e5b0 100644 --- a/epan/dissectors/packet-lsc.c +++ b/epan/dissectors/packet-lsc.c @@ -157,8 +157,7 @@ dissect_lsc_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Too little data? */ if (tvb->length < LSC_MIN_LEN) { - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "[Too short]"); + col_set_str(pinfo->cinfo, COL_INFO, "[Too short]"); return; } diff --git a/epan/dissectors/packet-megaco.c b/epan/dissectors/packet-megaco.c index 9abd120cfa..85b75e4df3 100644 --- a/epan/dissectors/packet-megaco.c +++ b/epan/dissectors/packet-megaco.c @@ -527,7 +527,6 @@ dissect_megaco_text(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) switch ( token_index ){ /* errorDescriptor */ case ERRORTOKEN: - if (check_col(pinfo->cinfo, COL_INFO) ) col_set_str(pinfo->cinfo, COL_INFO, "Error "); tvb_current_offset = tvb_find_guint8(tvb, tvb_offset+1, tvb_len, '}'); diff --git a/epan/dissectors/packet-mip6.c b/epan/dissectors/packet-mip6.c index 4ca78fe2d3..6ade4f5df8 100644 --- a/epan/dissectors/packet-mip6.c +++ b/epan/dissectors/packet-mip6.c @@ -134,8 +134,7 @@ dissect_mip6_brr(tvbuff_t *tvb, proto_tree *mip6_tree, packet_info *pinfo) proto_tree *data_tree = NULL; proto_item *ti; - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Binding Refresh Request"); + col_set_str(pinfo->cinfo, COL_INFO, "Binding Refresh Request"); if (mip6_tree) { ti = proto_tree_add_text(mip6_tree, tvb, MIP6_DATA_OFF, @@ -152,8 +151,7 @@ dissect_mip6_hoti(tvbuff_t *tvb, proto_tree *mip6_tree, packet_info *pinfo) proto_tree *data_tree = NULL; proto_item *ti; - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Home Test Init"); + col_set_str(pinfo->cinfo, COL_INFO, "Home Test Init"); if (mip6_tree) { ti = proto_tree_add_text(mip6_tree, tvb, MIP6_DATA_OFF, @@ -173,8 +171,7 @@ dissect_mip6_coti(tvbuff_t *tvb, proto_tree *mip6_tree, packet_info *pinfo) proto_tree *data_tree = NULL; proto_item *ti; - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Care-of Test Init"); + col_set_str(pinfo->cinfo, COL_INFO, "Care-of Test Init"); if (mip6_tree) { ti = proto_tree_add_text(mip6_tree, tvb, MIP6_DATA_OFF, @@ -194,8 +191,7 @@ dissect_mip6_hot(tvbuff_t *tvb, proto_tree *mip6_tree, packet_info *pinfo) proto_tree *data_tree = NULL; proto_item *ti; - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Home Test"); + col_set_str(pinfo->cinfo, COL_INFO, "Home Test"); if (mip6_tree) { ti = proto_tree_add_text(mip6_tree, tvb, MIP6_DATA_OFF, @@ -219,8 +215,7 @@ dissect_mip6_cot(tvbuff_t *tvb, proto_tree *mip6_tree, packet_info *pinfo) proto_tree *data_tree = NULL; proto_item *ti; - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Care-of Test"); + col_set_str(pinfo->cinfo, COL_INFO, "Care-of Test"); if (mip6_tree) { ti = proto_tree_add_text(mip6_tree, tvb, MIP6_DATA_OFF, @@ -245,8 +240,7 @@ dissect_mip6_bu(tvbuff_t *tvb, proto_tree *mip6_tree, packet_info *pinfo) proto_item *ti; int lifetime; - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Binding Update"); + col_set_str(pinfo->cinfo, COL_INFO, "Binding Update"); if (mip6_tree) { ti = proto_tree_add_text(mip6_tree, tvb, MIP6_DATA_OFF, @@ -292,8 +286,7 @@ dissect_mip6_ba(tvbuff_t *tvb, proto_tree *mip6_tree, packet_info *pinfo) proto_item *ti; int lifetime; - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Binding Acknowledgement"); + col_set_str(pinfo->cinfo, COL_INFO, "Binding Acknowledgement"); if (mip6_tree) { ti = proto_tree_add_text(mip6_tree, tvb, MIP6_DATA_OFF, @@ -332,8 +325,7 @@ dissect_mip6_be(tvbuff_t *tvb, proto_tree *mip6_tree, packet_info *pinfo) proto_tree *data_tree = NULL; proto_item *ti; - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Binding Error"); + col_set_str(pinfo->cinfo, COL_INFO, "Binding Error"); if (mip6_tree) { ti = proto_tree_add_text(mip6_tree, tvb, MIP6_DATA_OFF, @@ -355,8 +347,7 @@ dissect_mip6_unknown(tvbuff_t *tvb, proto_tree *mip6_tree, packet_info *pinfo) proto_tree *data_tree = NULL; proto_item *ti; - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Unknown MH Type"); + col_set_str(pinfo->cinfo, COL_INFO, "Unknown MH Type"); if (mip6_tree) { ti = proto_tree_add_text(mip6_tree, tvb, MIP6_DATA_OFF, @@ -374,8 +365,7 @@ dissect_fmip6_fbu(tvbuff_t *tvb, proto_tree *mip6_tree, packet_info *pinfo) proto_item *ti; int lifetime; - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Fast Binding Update"); + col_set_str(pinfo->cinfo, COL_INFO, "Fast Binding Update"); if (mip6_tree) { ti = proto_tree_add_text(mip6_tree, tvb, MIP6_DATA_OFF, @@ -412,8 +402,7 @@ dissect_fmip6_fback(tvbuff_t *tvb, proto_tree *mip6_tree, packet_info *pinfo) proto_item *ti; int lifetime; - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Fast Binding Acknowledgement"); + col_set_str(pinfo->cinfo, COL_INFO, "Fast Binding Acknowledgement"); if (mip6_tree) { ti = proto_tree_add_text(mip6_tree, tvb, MIP6_DATA_OFF, @@ -443,8 +432,7 @@ dissect_fmip6_fna(tvbuff_t *tvb, proto_tree *mip6_tree, packet_info *pinfo) proto_tree *data_tree = NULL; proto_item *ti; - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Fast Neighbor Advertisement"); + col_set_str(pinfo->cinfo, COL_INFO, "Fast Neighbor Advertisement"); if (mip6_tree) { ti = proto_tree_add_text(mip6_tree, tvb, MIP6_DATA_OFF, @@ -961,9 +949,7 @@ dissect_mip6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, - "Fast Neighbor Advertisement[Fast Binding Update]"); + col_set_str(pinfo->cinfo, COL_INFO, "Fast Neighbor Advertisement[Fast Binding Update]"); } } diff --git a/epan/dissectors/packet-mpls-echo.c b/epan/dissectors/packet-mpls-echo.c index 698bd1304e..3514f88afc 100644 --- a/epan/dissectors/packet-mpls-echo.c +++ b/epan/dissectors/packet-mpls-echo.c @@ -996,8 +996,7 @@ dissect_mpls_echo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* The minimum fixed part of the packet is 16 Bytes or 32 Bytes depending on Msg Type */ if( ((!MSGTYPE_MPLS_ECHO(msgtype)) && (rem < 16)) || ((MSGTYPE_MPLS_ECHO(msgtype)) && (rem < 32)) ) { - if( check_col(pinfo->cinfo, COL_INFO) ) - col_set_str(pinfo->cinfo, COL_INFO, "Malformed Message"); + col_set_str(pinfo->cinfo, COL_INFO, "Malformed Message"); if(tree) { ti = proto_tree_add_item(tree, proto_mpls_echo, tvb, 0, -1, FALSE); mpls_echo_tree = proto_item_add_subtree(ti, ett_mpls_echo); diff --git a/epan/dissectors/packet-mtp2.c b/epan/dissectors/packet-mtp2.c index 520dab2402..25891a551f 100644 --- a/epan/dissectors/packet-mtp2.c +++ b/epan/dissectors/packet-mtp2.c @@ -212,8 +212,7 @@ mtp2_decode_crc16(tvbuff_t *tvb, proto_tree *fh_tree, packet_info *pinfo) static void dissect_mtp2_fisu(packet_info *pinfo) { - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "FISU "); + col_set_str(pinfo->cinfo, COL_INFO, "FISU "); } static const value_string status_field_vals[] = { @@ -279,8 +278,7 @@ dissect_mtp2_msu(tvbuff_t *su_tvb, packet_info *pinfo, proto_item *mtp2_item, pr gint sif_sio_length; tvbuff_t *sif_sio_tvb; - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "MSU "); + col_set_str(pinfo->cinfo, COL_INFO, "MSU "); if (use_extended_sequence_numbers) { sif_sio_length = tvb_length(su_tvb) - EXTENDED_HEADER_LENGTH; diff --git a/epan/dissectors/packet-mtp3.c b/epan/dissectors/packet-mtp3.c index 5dcb233e7f..7056de0fdd 100644 --- a/epan/dissectors/packet-mtp3.c +++ b/epan/dissectors/packet-mtp3.c @@ -626,8 +626,7 @@ dissect_mtp3_payload(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) DISSECTOR_ASSERT_NOT_REACHED(); } - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "DATA "); + col_set_str(pinfo->cinfo, COL_INFO, "DATA "); if (!dissector_try_port(mtp3_sio_dissector_table, service_indicator, payload_tvb, pinfo, tree)) call_dissector(data_handle, payload_tvb, pinfo, tree); diff --git a/epan/dissectors/packet-mtp3mg.c b/epan/dissectors/packet-mtp3mg.c index 1e2a63da43..5f63e48b83 100644 --- a/epan/dissectors/packet-mtp3mg.c +++ b/epan/dissectors/packet-mtp3mg.c @@ -1108,8 +1108,7 @@ dissect_mtp3mg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; default: - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Unknown "); + col_set_str(pinfo->cinfo, COL_INFO, "Unknown "); dissect_mtp3mg_unknown_message(tvb, mtp3mg_tree); } /* switch */ @@ -1202,8 +1201,7 @@ dissect_mtp3mg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; default: - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Unknown "); + col_set_str(pinfo->cinfo, COL_INFO, "Unknown "); dissect_mtp3mg_unknown_message(tvb, mtp3mg_tree); } /* switch */ diff --git a/epan/dissectors/packet-nbns.c b/epan/dissectors/packet-nbns.c index 38976fe564..3154690371 100644 --- a/epan/dissectors/packet-nbns.c +++ b/epan/dissectors/packet-nbns.c @@ -1811,8 +1811,7 @@ continuation: /* * It looks like a continuation. */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "NBSS Continuation Message"); + col_set_str(pinfo->cinfo, COL_INFO, "NBSS Continuation Message"); if (tree) { ti = proto_tree_add_item(tree, proto_nbss, tvb, 0, -1, FALSE); diff --git a/epan/dissectors/packet-ndps.c b/epan/dissectors/packet-ndps.c index fab525bf84..15097571e3 100644 --- a/epan/dissectors/packet-ndps.c +++ b/epan/dissectors/packet-ndps.c @@ -4180,8 +4180,7 @@ dissect_ndps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree) ndps_packet_type = tvb_get_ntohl(tvb, 8); if (ndps_packet_type != 0 && ndps_packet_type != 1) { /* Packet Type */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "(Continuation Data)"); + col_set_str(pinfo->cinfo, COL_INFO, "(Continuation Data)"); proto_tree_add_text(ndps_tree, tvb, 0, tvb_length(tvb), "Data - (%d Bytes)", tvb_length(tvb)); return; } @@ -4201,8 +4200,7 @@ dissect_ndps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree) foffset += 4; if(ndps_packet_type == 0x00000001) /* Reply packet */ { - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "R NDPS "); + col_set_str(pinfo->cinfo, COL_INFO, "R NDPS "); proto_tree_add_item(ndps_tree, hf_ndps_rpc_accept, tvb, foffset, 4, FALSE); if (tvb_get_ntohl(tvb, foffset)==0) { foffset += 4; @@ -4219,8 +4217,7 @@ dissect_ndps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree) } else { - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "C NDPS "); + col_set_str(pinfo->cinfo, COL_INFO, "C NDPS "); ndps_rpc_version = tvb_get_ntohl(tvb, foffset); proto_tree_add_item(ndps_tree, hf_ndps_rpc_version, tvb, foffset, 4, FALSE); foffset += 4; @@ -6735,8 +6732,7 @@ ndps_error(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int foffset proto_item *expert_item; ndps_problem_type = tvb_get_ntohl(tvb, foffset); - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "R NDPS - Error"); + col_set_str(pinfo->cinfo, COL_INFO, "R NDPS - Error"); expert_item = proto_tree_add_uint(ndps_tree, hf_ndps_problem_type, tvb, foffset, 4, ndps_problem_type); expert_add_info_format(pinfo, expert_item, PI_RESPONSE_CODE, PI_ERROR, "Fault: %s", val_to_str(ndps_problem_type, error_type_enum, "Unknown NDPS Error (0x%08x)")); foffset += 4; diff --git a/epan/dissectors/packet-newmail.c b/epan/dissectors/packet-newmail.c index b2119b5171..c5b4bc09e1 100644 --- a/epan/dissectors/packet-newmail.c +++ b/epan/dissectors/packet-newmail.c @@ -66,8 +66,7 @@ dissect_newmail(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, "NEWMAIL"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Microsoft Exchange new mail notification"); + col_set_str(pinfo->cinfo, COL_INFO, "Microsoft Exchange new mail notification"); if (tree) { ti = proto_tree_add_item(tree, proto_newmail, tvb, 0, -1, FALSE); diff --git a/epan/dissectors/packet-null.c b/epan/dissectors/packet-null.c index 38d426aef8..768dab851e 100644 --- a/epan/dissectors/packet-null.c +++ b/epan/dissectors/packet-null.c @@ -372,8 +372,7 @@ dissect_null(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(check_col(pinfo->cinfo, COL_RES_DL_DST)) col_set_str(pinfo->cinfo, COL_RES_DL_DST, "N/A" ); col_set_str(pinfo->cinfo, COL_PROTOCOL, "N/A"); - if(check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Null/Loopback" ); + col_set_str(pinfo->cinfo, COL_INFO, "Null/Loopback"); /* * Treat it as a normal DLT_NULL header. diff --git a/epan/dissectors/packet-ppi.c b/epan/dissectors/packet-ppi.c index ce61e622b5..393158ea17 100644 --- a/epan/dissectors/packet-ppi.c +++ b/epan/dissectors/packet-ppi.c @@ -941,8 +941,7 @@ dissect_ppi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } else { next_tvb = tvb_new_subset(tvb, offset, -1, -1); col_set_str(pinfo->cinfo, COL_PROTOCOL, "IEEE 802.11n"); - if(check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Unreassembled A-MPDU data"); + col_set_str(pinfo->cinfo, COL_INFO, "Unreassembled A-MPDU data"); call_dissector(data_handle, next_tvb, pinfo, tree); } return; diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c index 991d3574fa..d779a93d9a 100644 --- a/epan/dissectors/packet-ppp.c +++ b/epan/dissectors/packet-ppp.c @@ -2913,8 +2913,7 @@ dissect_bcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) flags = tvb_get_guint8(tvb, offset); if (flags & BCP_IS_BCONTROL) { - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Bridge control"); + col_set_str(pinfo->cinfo, COL_INFO, "Bridge control"); } if (tree) { flags_item = proto_tree_add_uint(bcp_tree, hf_bcp_flags, tvb, offset, 1, flags); @@ -3089,8 +3088,7 @@ dissect_comp_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "PPP Comp"); - if(check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Compressed data"); + col_set_str(pinfo->cinfo, COL_INFO, "Compressed data"); if (tree) { ti = proto_tree_add_item(tree, proto_comp_data, tvb, 0, -1, FALSE); @@ -3127,8 +3125,7 @@ dissect_pppmux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo,COL_PROTOCOL, "PPP PPPMux"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "PPP Multiplexing"); + col_set_str(pinfo->cinfo, COL_INFO, "PPP Multiplexing"); length_remaining = tvb_reported_length(tvb); @@ -3263,8 +3260,7 @@ dissect_iphc_crtp_fh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo,COL_PROTOCOL, "CRTP"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Full Header"); + col_set_str(pinfo->cinfo, COL_INFO, "Full Header"); /* only dissect IPv4 and UDP */ ip_version = tvb_get_guint8(tvb, 0) >> 4; @@ -3361,8 +3357,7 @@ dissect_iphc_crtp_cudp16(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo,COL_PROTOCOL, "CRTP"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Compressed UDP 16"); + col_set_str(pinfo->cinfo, COL_INFO, "Compressed UDP 16"); length = tvb_reported_length(tvb); @@ -3397,8 +3392,7 @@ dissect_iphc_crtp_cudp8(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo,COL_PROTOCOL, "CRTP"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Compressed UDP 8"); + col_set_str(pinfo->cinfo, COL_INFO, "Compressed UDP 8"); length = tvb_reported_length(tvb); @@ -3434,8 +3428,7 @@ dissect_iphc_crtp_cs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo,COL_PROTOCOL, "CRTP"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Context State"); + col_set_str(pinfo->cinfo, COL_INFO, "Context State"); if (tree) { @@ -3523,8 +3516,7 @@ dissect_mp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "PPP MP"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "PPP Multilink"); + col_set_str(pinfo->cinfo, COL_INFO, "PPP Multilink"); if (tree) { ti = proto_tree_add_item(tree, proto_mp, tvb, 0, mp_short_seqno ? 2 : 4, FALSE); diff --git a/epan/dissectors/packet-prp.c b/epan/dissectors/packet-prp.c index 2993088693..88f68a4048 100644 --- a/epan/dissectors/packet-prp.c +++ b/epan/dissectors/packet-prp.c @@ -136,8 +136,7 @@ dissect_prp_supervision_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre col_set_str(pinfo->cinfo, COL_PROTOCOL, "PRP"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Supervision Frame"); + col_set_str(pinfo->cinfo, COL_INFO, "Supervision Frame"); if (!tree) return; diff --git a/epan/dissectors/packet-ptp.c b/epan/dissectors/packet-ptp.c index 93c8daa047..f78bb64c58 100644 --- a/epan/dissectors/packet-ptp.c +++ b/epan/dissectors/packet-ptp.c @@ -1502,23 +1502,19 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Create and set the string for "Info" column */ switch(ptp_control){ case PTP_SYNC_MESSAGE:{ - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Sync Message"); + col_set_str(pinfo->cinfo, COL_INFO, "Sync Message"); break; } case PTP_DELAY_REQ_MESSAGE:{ - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Delay_Request Message"); + col_set_str(pinfo->cinfo, COL_INFO, "Delay_Request Message"); break; } case PTP_FOLLOWUP_MESSAGE:{ - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Follow_Up Message"); + col_set_str(pinfo->cinfo, COL_INFO, "Follow_Up Message"); break; } case PTP_DELAY_RESP_MESSAGE:{ - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Delay_Response Message"); + col_set_str(pinfo->cinfo, COL_INFO, "Delay_Response Message"); break; } case PTP_MANAGEMENT_MESSAGE:{ @@ -1531,8 +1527,7 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; } default:{ - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Unknown Message"); + col_set_str(pinfo->cinfo, COL_INFO, "Unknown Message"); break; } } diff --git a/epan/dissectors/packet-pvfs2.c b/epan/dissectors/packet-pvfs2.c index 0733b2ff43..b99943349a 100644 --- a/epan/dissectors/packet-pvfs2.c +++ b/epan/dissectors/packet-pvfs2.c @@ -3187,8 +3187,7 @@ dissect_pvfs_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, if (val && (val->flow_frame_num == pinfo->fd->num)) { /* This frame is marked as being flow data */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "PVFS flow data"); + col_set_str(pinfo->cinfo, COL_INFO, "PVFS flow data"); proto_tree_add_text(pvfs_tree, tvb, offset, -1, "<data>"); @@ -3225,8 +3224,7 @@ dissect_pvfs_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, * responses */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "PVFS2 DATA (request)"); + col_set_str(pinfo->cinfo, COL_INFO, "PVFS2 DATA (request)"); } else #endif diff --git a/epan/dissectors/packet-raw.c b/epan/dissectors/packet-raw.c index b705c5658b..0da4a2f124 100644 --- a/epan/dissectors/packet-raw.c +++ b/epan/dissectors/packet-raw.c @@ -112,8 +112,7 @@ dissect_raw(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(check_col(pinfo->cinfo, COL_RES_DL_DST)) col_set_str(pinfo->cinfo, COL_RES_DL_DST, "N/A" ); col_set_str(pinfo->cinfo, COL_PROTOCOL, "N/A"); - if(check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Raw packet data" ); + col_set_str(pinfo->cinfo, COL_INFO, "Raw packet data"); /* populate a tree in the second pane with the status of the link layer (ie none) */ diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c index 051e1a444a..f725a50c5f 100644 --- a/epan/dissectors/packet-rpc.c +++ b/epan/dissectors/packet-rpc.c @@ -1627,8 +1627,7 @@ dissect_rpc_continuation(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *rpc_tree; col_set_str(pinfo->cinfo, COL_PROTOCOL, "RPC"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Continuation"); + col_set_str(pinfo->cinfo, COL_INFO, "Continuation"); if (tree) { rpc_item = proto_tree_add_item(tree, proto_rpc, tvb, 0, -1, diff --git a/epan/dissectors/packet-s4406.c b/epan/dissectors/packet-s4406.c index d85645371d..c948837ace 100644 --- a/epan/dissectors/packet-s4406.c +++ b/epan/dissectors/packet-s4406.c @@ -894,8 +894,7 @@ dissect_s4406(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) } col_set_str(pinfo->cinfo, COL_PROTOCOL, "S4406"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Military"); + col_set_str(pinfo->cinfo, COL_INFO, "Military"); dissect_s4406_InformationObject(TRUE, tvb, offset, &asn1_ctx , tree, -1); } diff --git a/epan/dissectors/packet-sigcomp.c b/epan/dissectors/packet-sigcomp.c index c205e6a1f1..121174f240 100644 --- a/epan/dissectors/packet-sigcomp.c +++ b/epan/dissectors/packet-sigcomp.c @@ -660,8 +660,7 @@ dissect_sigcomp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *sigcomp_tr /* * Message format 1 */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Msg format 1"); + col_set_str(pinfo->cinfo, COL_INFO, "Msg format 1"); if ( tbit == 1 ) { /* @@ -803,8 +802,7 @@ dissect_sigcomp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *sigcomp_tr /* * Message format 2 */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Msg format 2"); + col_set_str(pinfo->cinfo, COL_INFO, "Msg format 2"); if ( tbit == 1 ) { /* * Returned feedback item exists diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c index f3527b1725..110363f3b9 100644 --- a/epan/dissectors/packet-sip.c +++ b/epan/dissectors/packet-sip.c @@ -1904,8 +1904,7 @@ dissect_sip_common(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr case OTHER_LINE: default: /* Squelch compiler complaints */ descr = "Continuation"; - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Continuation"); + col_set_str(pinfo->cinfo, COL_INFO, "Continuation"); break; } diff --git a/epan/dissectors/packet-slowprotocols.c b/epan/dissectors/packet-slowprotocols.c index 35d991ef3c..11c7e52776 100644 --- a/epan/dissectors/packet-slowprotocols.c +++ b/epan/dissectors/packet-slowprotocols.c @@ -1121,8 +1121,7 @@ dissect_lacp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "LACP"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Link Aggregation Control Protocol"); + col_set_str(pinfo->cinfo, COL_INFO, "Link Aggregation Control Protocol"); if (tree) { @@ -1468,8 +1467,7 @@ dissect_marker_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "MARKER"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Marker Protocol"); + col_set_str(pinfo->cinfo, COL_INFO, "Marker Protocol"); if (tree) { @@ -1869,32 +1867,25 @@ dissect_oampdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) switch (oampdu_code) { case OAMPDU_INFORMATION: - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "OAMPDU: Information"); + col_set_str(pinfo->cinfo, COL_INFO, "OAMPDU: Information"); break; case OAMPDU_EVENT_NOTIFICATION: - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "OAMPDU: Event Notification"); + col_set_str(pinfo->cinfo, COL_INFO, "OAMPDU: Event Notification"); break; case OAMPDU_VAR_REQUEST: - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "OAMPDU: Variable Request"); + col_set_str(pinfo->cinfo, COL_INFO, "OAMPDU: Variable Request"); break; case OAMPDU_VAR_RESPONSE: - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "OAMPDU: Variable Response"); + col_set_str(pinfo->cinfo, COL_INFO, "OAMPDU: Variable Response"); break; case OAMPDU_LOOPBACK_CTRL: - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "OAMPDU: Loopback Control"); + col_set_str(pinfo->cinfo, COL_INFO, "OAMPDU: Loopback Control"); break; case OAMPDU_VENDOR_SPECIFIC: - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "OAMPDU: Organization Specific"); + col_set_str(pinfo->cinfo, COL_INFO, "OAMPDU: Organization Specific"); break; default: - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "OAMPDU reserved"); + col_set_str(pinfo->cinfo, COL_INFO, "OAMPDU reserved"); break; } diff --git a/epan/dissectors/packet-slsk.c b/epan/dissectors/packet-slsk.c index a8dec97844..de73279ab5 100644 --- a/epan/dissectors/packet-slsk.c +++ b/epan/dissectors/packet-slsk.c @@ -333,8 +333,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree /* This field shows up as the "Info" column in the display */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "SoulSeek Message"); + col_set_str(pinfo->cinfo, COL_INFO, "SoulSeek Message"); if (check_col(pinfo->cinfo, COL_INFO)) { col_append_fstr(pinfo->cinfo, COL_INFO, ": %s", message_type); diff --git a/epan/dissectors/packet-sna.c b/epan/dissectors/packet-sna.c index d28b116740..e568771d38 100644 --- a/epan/dissectors/packet-sna.c +++ b/epan/dissectors/packet-sna.c @@ -897,13 +897,9 @@ dissect_optional_0e(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb_new_subset(tvb, 4, -1, -1), pinfo, tree); } if (bits & 0x40) { - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, - "HPR Idle Message"); + col_set_str(pinfo->cinfo, COL_INFO, "HPR Idle Message"); } else { - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, - "HPR Status Message"); + col_set_str(pinfo->cinfo, COL_INFO, "HPR Status Message"); } } @@ -1215,8 +1211,7 @@ dissect_nlp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, nhdr_0 = tvb_get_guint8(tvb, index); nhdr_1 = tvb_get_guint8(tvb, index+1); - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "HPR NLP Packet"); + col_set_str(pinfo->cinfo, COL_INFO, "HPR NLP Packet"); if (tree) { /* Don't bother setting length. We'll set it later after we @@ -1370,8 +1365,7 @@ dissect_nlp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, index += (thdr_len << 2); if (((thdr_8 & 0x20) == 0) && thdr_dlf) { - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "HPR Fragment"); + col_set_str(pinfo->cinfo, COL_INFO, "HPR Fragment"); if (tvb_offset_exists(tvb, index)) { call_dissector(data_handle, tvb_new_subset(tvb, index, -1, -1), pinfo, @@ -1388,9 +1382,7 @@ dissect_nlp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, else { if (tvb_get_ntohs(tvb, index+2) == 0x12ce) { /* Route Setup */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, - "HPR Route Setup"); + col_set_str(pinfo->cinfo, COL_INFO, "HPR Route Setup"); dissect_gds(tvb_new_subset(tvb, index, -1, -1), pinfo, tree, parent_tree); } else diff --git a/epan/dissectors/packet-snaeth.c b/epan/dissectors/packet-snaeth.c index f4c82db5bc..bd9b3b278c 100644 --- a/epan/dissectors/packet-snaeth.c +++ b/epan/dissectors/packet-snaeth.c @@ -52,8 +52,7 @@ dissect_snaeth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvbuff_t *next_tvb; col_set_str(pinfo->cinfo, COL_PROTOCOL, "SNAETH"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "SNA over Ethernet"); + col_set_str(pinfo->cinfo, COL_INFO, "SNA over Ethernet"); /* length */ len = tvb_get_ntohs(tvb, 0); diff --git a/epan/dissectors/packet-spp.c b/epan/dissectors/packet-spp.c index 6c46886603..10605bb487 100644 --- a/epan/dissectors/packet-spp.c +++ b/epan/dissectors/packet-spp.c @@ -128,8 +128,7 @@ dissect_spp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 low_socket, high_socket; col_set_str(pinfo->cinfo, COL_PROTOCOL, "SPP"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "SPP"); + col_set_str(pinfo->cinfo, COL_INFO, "SPP"); if (tree) { ti = proto_tree_add_item(tree, proto_spp, tvb, 0, SPP_HEADER_LEN, FALSE); diff --git a/epan/dissectors/packet-symantec.c b/epan/dissectors/packet-symantec.c index 1ef7d5e93f..b36e0e03e7 100644 --- a/epan/dissectors/packet-symantec.c +++ b/epan/dissectors/packet-symantec.c @@ -81,8 +81,7 @@ dissect_symantec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "Symantec"); if (etypev3 == 0) { /* SEF and SGS v2 processing */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Symantec Enterprise Firewall"); + col_set_str(pinfo->cinfo, COL_INFO, "Symantec Enterprise Firewall"); if (tree) { ti = proto_tree_add_protocol_format(tree, proto_symantec, tvb, 0, 44, "Symantec firewall"); @@ -100,8 +99,7 @@ dissect_symantec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (etypev2 == 0) { /* SGS v3 processing */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Symantec SGS v3"); + col_set_str(pinfo->cinfo, COL_INFO, "Symantec SGS v3"); if (tree) { ti = proto_tree_add_protocol_format(tree, proto_symantec, tvb, 0, 56, "Symantec SGSv3"); diff --git a/epan/dissectors/packet-telnet.c b/epan/dissectors/packet-telnet.c index fd607e5d05..6a6ec9b783 100644 --- a/epan/dissectors/packet-telnet.c +++ b/epan/dissectors/packet-telnet.c @@ -1847,8 +1847,7 @@ dissect_telnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "TELNET"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Telnet Data ..."); + col_set_str(pinfo->cinfo, COL_INFO, "Telnet Data ..."); is_tn3270 = find_tn3270_conversation(pinfo); diff --git a/epan/dissectors/packet-tn3270.c b/epan/dissectors/packet-tn3270.c index 2bb37ab483..ea3466d496 100644 --- a/epan/dissectors/packet-tn3270.c +++ b/epan/dissectors/packet-tn3270.c @@ -3827,12 +3827,10 @@ dissect_tn3270(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) while (tvb_offset_exists(tvb, offset)) { tn3270_cmd = tvb_get_guint8(tvb, offset); if (pinfo->srcport == tn3270_info->outbound_port) { - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "TN3270 Data from Mainframe"); + col_set_str(pinfo->cinfo, COL_INFO, "TN3270 Data from Mainframe"); offset += dissect_outbound_stream(tn3270_tree, tvb, offset); }else{ - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "TN3270 Data to Mainframe"); + col_set_str(pinfo->cinfo, COL_INFO, "TN3270 Data to Mainframe"); offset += dissect_inbound_stream(tn3270_tree, tvb, offset); } } diff --git a/epan/dissectors/packet-tpkt.c b/epan/dissectors/packet-tpkt.c index 5d0f9eb848..3f513cfabb 100644 --- a/epan/dissectors/packet-tpkt.c +++ b/epan/dissectors/packet-tpkt.c @@ -246,8 +246,7 @@ dissect_asciitpkt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, * do reassembly. */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "TPKT"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Continuation"); + col_set_str(pinfo->cinfo, COL_INFO, "Continuation"); if (tree) { ti = proto_tree_add_item(tree, proto_tpkt, tvb, offset, -1, FALSE); @@ -399,8 +398,7 @@ dissect_tpkt_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, * do reassembly. */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "TPKT"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Continuation"); + col_set_str(pinfo->cinfo, COL_INFO, "Continuation"); if (tree) { ti = proto_tree_add_item(tree, proto_tpkt, tvb, offset, -1, FALSE); diff --git a/epan/dissectors/packet-tte.c b/epan/dissectors/packet-tte.c index 51313d0e5e..4063cfe2d0 100644 --- a/epan/dissectors/packet-tte.c +++ b/epan/dissectors/packet-tte.c @@ -95,8 +95,7 @@ dissect_tte(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, "TTE "); - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Bogus TTEthernet Frame"); + col_set_str(pinfo->cinfo, COL_INFO, "Bogus TTEthernet Frame"); if (tree) { diff --git a/epan/dissectors/packet-turbocell.c b/epan/dissectors/packet-turbocell.c index a977f85a4b..430d040e65 100644 --- a/epan/dissectors/packet-turbocell.c +++ b/epan/dissectors/packet-turbocell.c @@ -132,20 +132,16 @@ static void dissect_turbocell(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre packet_type = tvb_get_guint8(tvb, 0); if (!(packet_type & 0x0F)){ - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Turbocell Packet (Beacon)"); + col_set_str(pinfo->cinfo, COL_INFO, "Turbocell Packet (Beacon)"); col_set_str(pinfo->cinfo, COL_PROTOCOL, "Turbocell"); } else if ( packet_type == TURBOCELL_TYPE_MANAGEMENT ) { - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Turbocell Packet (Management)"); + col_set_str(pinfo->cinfo, COL_INFO, "Turbocell Packet (Management)"); col_set_str(pinfo->cinfo, COL_PROTOCOL, "Turbocell"); } else if ( packet_type == TURBOCELL_TYPE_DATA ) { - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Turbocell Packet (Data)"); + col_set_str(pinfo->cinfo, COL_INFO, "Turbocell Packet (Data)"); col_set_str(pinfo->cinfo, COL_PROTOCOL, "Turbocell"); } else { - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Turbocell Packet (Unknown)"); + col_set_str(pinfo->cinfo, COL_INFO, "Turbocell Packet (Unknown)"); col_set_str(pinfo->cinfo, COL_PROTOCOL, "Turbocell"); } diff --git a/epan/dissectors/packet-tuxedo.c b/epan/dissectors/packet-tuxedo.c index 75589c735b..eeb675dc53 100644 --- a/epan/dissectors/packet-tuxedo.c +++ b/epan/dissectors/packet-tuxedo.c @@ -134,7 +134,7 @@ dissect_tuxedo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) else { /* This packet is a continuation */ - if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "Continuation"); + col_set_str(pinfo->cinfo, COL_INFO, "Continuation"); if (tree) { ti = proto_tree_add_item(tree, proto_tuxedo, tvb, 0, -1, FALSE); diff --git a/epan/dissectors/packet-v120.c b/epan/dissectors/packet-v120.c index 38d457ae9b..197eccf97c 100644 --- a/epan/dissectors/packet-v120.c +++ b/epan/dissectors/packet-v120.c @@ -113,8 +113,7 @@ dissect_v120(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if ( ((byte0 & 0x01) != 0x00) && ((byte1 & 0x01) != 0x01) ) { - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Invalid V.120 frame"); + col_set_str(pinfo->cinfo, COL_INFO, "Invalid V.120 frame"); if (tree) ti = proto_tree_add_protocol_format(tree, proto_v120, tvb, 0, -1, "Invalid V.120 frame"); diff --git a/epan/dissectors/packet-vcdu.c b/epan/dissectors/packet-vcdu.c index 915b5a131c..8931a312e1 100644 --- a/epan/dissectors/packet-vcdu.c +++ b/epan/dissectors/packet-vcdu.c @@ -297,8 +297,7 @@ dissect_vcdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } col_set_str(pinfo->cinfo, COL_PROTOCOL, "VCDU"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Virtual Channel Data Unit"); + col_set_str(pinfo->cinfo, COL_INFO, "Virtual Channel Data Unit"); if (tree) { /* build the smex header tree */ diff --git a/epan/dissectors/packet-vj.c b/epan/dissectors/packet-vj.c index 6e670fb08a..9583741c33 100644 --- a/epan/dissectors/packet-vj.c +++ b/epan/dissectors/packet-vj.c @@ -248,8 +248,7 @@ dissect_vjuc(tvbuff_t *tvb, packet_info *pinfo, proto_tree * tree) * as we don't know which connection this is. Mark them all as * non-decompressable. */ - if(check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "VJ uncompressed TCP (not enough data available)"); + col_set_str(pinfo->cinfo, COL_INFO, "VJ uncompressed TCP (not enough data available)"); if(tree != NULL) call_dissector(data_handle, tvb, pinfo, tree); if(comp != NULL) { @@ -290,8 +289,7 @@ dissect_vjuc(tvbuff_t *tvb, packet_info *pinfo, proto_tree * tree) /* Make sure we have the full IP header */ if(isize < ihl) { - if(check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "VJ uncompressed TCP (not enough data available)"); + col_set_str(pinfo->cinfo, COL_INFO, "VJ uncompressed TCP (not enough data available)"); if(tree != NULL) call_dissector(data_handle, tvb, pinfo, tree); if(cs != NULL) @@ -299,8 +297,7 @@ dissect_vjuc(tvbuff_t *tvb, packet_info *pinfo, proto_tree * tree) return; } - if(check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "VJ uncompressed TCP"); + col_set_str(pinfo->cinfo, COL_INFO, "VJ uncompressed TCP"); /* * Copy packet data to a buffer, and replace the connection index with @@ -322,8 +319,7 @@ dissect_vjuc(tvbuff_t *tvb, packet_info *pinfo, proto_tree * tree) /* Do we have the TCP header length in the tvbuff? */ if(!tvb_bytes_exist(tvb, ihl + TCP_FIELD_HDR_LEN, 1)) { /* We don't, so we can't provide enough data for decompression */ - if(check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "VJ uncompressed TCP (not enough data available)"); + col_set_str(pinfo->cinfo, COL_INFO, "VJ uncompressed TCP (not enough data available)"); if(cs != NULL) cs->flags |= SLF_TOSS; cs = NULL; /* disable state updates */ @@ -344,8 +340,7 @@ dissect_vjuc(tvbuff_t *tvb, packet_info *pinfo, proto_tree * tree) } else { /* Make sure we have the full TCP header */ if(isize < thl) { - if(check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "VJ uncompressed TCP (not enough data available)"); + col_set_str(pinfo->cinfo, COL_INFO, "VJ uncompressed TCP (not enough data available)"); if(cs != NULL) cs->flags |= SLF_TOSS; cs = NULL; /* disable state updates */ @@ -489,13 +484,11 @@ vjc_tvb_setup(tvbuff_t *src_tvb, /* Get decompressed header stored in fd protocol area */ hdr_buf = p_get_proto_data(pinfo->fd, proto_vj); if(hdr_buf == NULL) { - if(check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "VJ compressed TCP (previous data bad or missing)"); + col_set_str(pinfo->cinfo, COL_INFO, "VJ compressed TCP (previous data bad or missing)"); return VJ_ERROR; } - if(check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "VJ compressed TCP"); + col_set_str(pinfo->cinfo, COL_INFO, "VJ compressed TCP"); /* Get the data offset in the tvbuff */ offset = hdr_buf->offset; @@ -548,8 +541,7 @@ vjc_process(tvbuff_t *src_tvb, packet_info *pinfo, proto_tree *tree, * determine which connection this is; mark all connections as * non-decompressible. */ - if(check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "VJ compressed TCP (not enough data available)"); + col_set_str(pinfo->cinfo, COL_INFO, "VJ compressed TCP (not enough data available)"); if(tree != NULL) call_dissector(data_handle, src_tvb, pinfo, tree); if(comp != NULL) { @@ -700,8 +692,7 @@ vjc_process(tvbuff_t *src_tvb, packet_info *pinfo, proto_tree *tree, * This shouldn't happen, as we *were* able to fetch stuff right before * offset. */ - if(check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "VJ compressed TCP (not enough data available)"); + col_set_str(pinfo->cinfo, COL_INFO, "VJ compressed TCP (not enough data available)"); if(cs != NULL) cs->flags |= SLF_TOSS; return VJ_ERROR; @@ -714,8 +705,7 @@ vjc_process(tvbuff_t *src_tvb, packet_info *pinfo, proto_tree *tree, /* Nothing more to do if we don't have any compression state */ if(comp == NULL) { /* Direction of the traffic unknown - can't decompress */ - if(check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "VJ compressed TCP (direction unknown)"); + col_set_str(pinfo->cinfo, COL_INFO, "VJ compressed TCP (direction unknown)"); return VJ_ERROR; } diff --git a/epan/dissectors/packet-vnc.c b/epan/dissectors/packet-vnc.c index 512262af74..18b0d8ecff 100644 --- a/epan/dissectors/packet-vnc.c +++ b/epan/dissectors/packet-vnc.c @@ -734,9 +734,7 @@ vnc_startup_messages(tvbuff_t *tvb, packet_info *pinfo, gint offset, break; case SECURITY : - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, - "Security types supported"); + col_set_str(pinfo->cinfo, COL_INFO, "Security types supported"); /* We're checking against the client protocol version because * the client is the final decider on which version to use @@ -805,9 +803,7 @@ vnc_startup_messages(tvbuff_t *tvb, packet_info *pinfo, gint offset, break; case TIGHT_TUNNELING_CAPABILITIES : - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, - "TightVNC tunneling capabilities supported"); + col_set_str(pinfo->cinfo, COL_INFO, "TightVNC tunneling capabilities supported"); proto_tree_add_item(tree, hf_vnc_tight_num_tunnel_types, tvb, offset, 4, FALSE); num_tunnel_types = tvb_get_ntohl(tvb, offset); @@ -840,9 +836,7 @@ vnc_startup_messages(tvbuff_t *tvb, packet_info *pinfo, gint offset, break; case TIGHT_AUTH_CAPABILITIES: - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, - "TightVNC authentication capabilities supported"); + col_set_str(pinfo->cinfo, COL_INFO, "TightVNC authentication capabilities supported"); proto_tree_add_item(tree, hf_vnc_tight_num_auth_types, tvb, offset, 4, FALSE); num_auth_types = tvb_get_ntohl(tvb, offset); @@ -872,9 +866,7 @@ vnc_startup_messages(tvbuff_t *tvb, packet_info *pinfo, gint offset, break; case TIGHT_AUTH_TYPE_AND_VENDOR_CODE : - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, - "Authentication type / vendor code"); + col_set_str(pinfo->cinfo, COL_INFO, "Authentication type / vendor code"); proto_tree_add_item(tree, hf_vnc_server_security_type, tvb, offset, 4, FALSE); @@ -893,9 +885,7 @@ vnc_startup_messages(tvbuff_t *tvb, packet_info *pinfo, gint offset, break; case TIGHT_UNKNOWN_PACKET3 : - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, - "Unknown packet (TightVNC)"); + col_set_str(pinfo->cinfo, COL_INFO, "Unknown packet (TightVNC)"); proto_tree_add_text(tree, tvb, offset, -1, "Unknown packet (TightVNC)"); @@ -906,9 +896,7 @@ vnc_startup_messages(tvbuff_t *tvb, packet_info *pinfo, gint offset, break; case VNC_AUTHENTICATION_CHALLENGE : - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, - "Authentication challenge from server"); + col_set_str(pinfo->cinfo, COL_INFO, "Authentication challenge from server"); proto_tree_add_item(tree, hf_vnc_auth_challenge, tvb, offset, 16, FALSE); @@ -918,9 +906,7 @@ vnc_startup_messages(tvbuff_t *tvb, packet_info *pinfo, gint offset, break; case VNC_AUTHENTICATION_RESPONSE : - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, - "Authentication response from client"); + col_set_str(pinfo->cinfo, COL_INFO, "Authentication response from client"); proto_tree_add_item(tree, hf_vnc_auth_response, tvb, offset, 16, FALSE); @@ -929,9 +915,7 @@ vnc_startup_messages(tvbuff_t *tvb, packet_info *pinfo, gint offset, break; case SECURITY_RESULT : - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, - "Authentication result"); + col_set_str(pinfo->cinfo, COL_INFO, "Authentication result"); proto_tree_add_item(tree, hf_vnc_auth_result, tvb, offset, 4, FALSE); @@ -965,9 +949,7 @@ vnc_startup_messages(tvbuff_t *tvb, packet_info *pinfo, gint offset, break; case CLIENT_INIT : - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, - "Share desktop flag"); + col_set_str(pinfo->cinfo, COL_INFO, "Share desktop flag"); proto_tree_add_item(tree, hf_vnc_share_desktop_flag, tvb, offset, 1, FALSE); @@ -977,9 +959,7 @@ vnc_startup_messages(tvbuff_t *tvb, packet_info *pinfo, gint offset, break; case SERVER_INIT : - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, - "Server framebuffer parameters"); + col_set_str(pinfo->cinfo, COL_INFO, "Server framebuffer parameters"); proto_tree_add_item(tree, hf_vnc_width, tvb, offset, 2, FALSE); @@ -1055,9 +1035,7 @@ vnc_startup_messages(tvbuff_t *tvb, packet_info *pinfo, gint offset, break; case TIGHT_INTERACTION_CAPS : - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, - "TightVNC Interaction Capabilities"); + col_set_str(pinfo->cinfo, COL_INFO, "TightVNC Interaction Capabilities"); proto_tree_add_item(tree, hf_vnc_num_server_message_types, tvb, offset, 2, FALSE); @@ -1082,9 +1060,7 @@ vnc_startup_messages(tvbuff_t *tvb, packet_info *pinfo, gint offset, break; case TIGHT_INTERACTION_CAPS_LIST: - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, - "TightVNC Interaction Capabilities list"); + col_set_str(pinfo->cinfo, COL_INFO, "TightVNC Interaction Capabilities list"); offset = process_tight_capabilities(tree, hf_vnc_tight_server_message_type, @@ -1239,8 +1215,7 @@ static void vnc_client_set_pixel_format(tvbuff_t *tvb, packet_info *pinfo, gint *offset, proto_tree *tree) { - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Client set pixel format"); + col_set_str(pinfo->cinfo, COL_INFO, "Client set pixel format"); proto_tree_add_item(tree, hf_vnc_padding, tvb, *offset, 3, FALSE); @@ -1306,8 +1281,7 @@ vnc_client_set_encodings(tvbuff_t *tvb, packet_info *pinfo, gint *offset, per_packet_info = p_get_proto_data(pinfo->fd, proto_vnc); - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Client set encodings"); + col_set_str(pinfo->cinfo, COL_INFO, "Client set encodings"); proto_tree_add_item(tree, hf_vnc_padding, tvb, *offset, 1, FALSE); @@ -1359,9 +1333,7 @@ static void vnc_client_framebuffer_update_request(tvbuff_t *tvb, packet_info *pinfo, gint *offset, proto_tree *tree) { - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, - "Client framebuffer update request"); + col_set_str(pinfo->cinfo, COL_INFO, "Client framebuffer update request"); proto_tree_add_item(tree, hf_vnc_update_req_incremental, tvb, *offset, 1, FALSE); @@ -1389,8 +1361,7 @@ static void vnc_client_key_event(tvbuff_t *tvb, packet_info *pinfo, gint *offset, proto_tree *tree) { - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Client key event"); + col_set_str(pinfo->cinfo, COL_INFO, "Client key event"); proto_tree_add_item(tree, hf_vnc_key_down, tvb, *offset, 1, FALSE); *offset += 1; @@ -1407,8 +1378,7 @@ static void vnc_client_pointer_event(tvbuff_t *tvb, packet_info *pinfo, gint *offset, proto_tree *tree) { - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Client pointer event"); + col_set_str(pinfo->cinfo, COL_INFO, "Client pointer event"); proto_tree_add_item(tree, hf_vnc_button_1_pos, tvb, *offset, 1, FALSE); proto_tree_add_item(tree, hf_vnc_button_2_pos, tvb, *offset, 1, FALSE); @@ -1434,8 +1404,7 @@ vnc_client_cut_text(tvbuff_t *tvb, packet_info *pinfo, gint *offset, { guint32 text_len; - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Client cut text"); + col_set_str(pinfo->cinfo, COL_INFO, "Client cut text"); proto_tree_add_item(tree, hf_vnc_padding, tvb, *offset, 3, FALSE); *offset += 3; /* Skip over 3 bytes of padding */ @@ -1463,9 +1432,7 @@ vnc_server_framebuffer_update(tvbuff_t *tvb, packet_info *pinfo, gint *offset, proto_item *ti, *ti_x, *ti_y, *ti_width, *ti_height; proto_tree *vnc_rect_tree, *vnc_encoding_type_tree; - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, - "Server framebuffer update"); + col_set_str(pinfo->cinfo, COL_INFO, "Server framebuffer update"); proto_tree_add_item(tree, hf_vnc_padding, tvb, *offset, 1, FALSE); *offset += 1; @@ -2182,9 +2149,7 @@ vnc_server_set_colormap_entries(tvbuff_t *tvb, packet_info *pinfo, gint *offset, proto_item *ti; proto_tree *vnc_colormap_num_groups, *vnc_colormap_color_group; - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, - "Server set colormap entries"); + col_set_str(pinfo->cinfo, COL_INFO, "Server set colormap entries"); number_of_colors = tvb_get_ntohs(tvb, 4); @@ -2243,8 +2208,7 @@ static void vnc_server_ring_bell(tvbuff_t *tvb _U_, packet_info *pinfo, gint *offset _U_, proto_tree *tree _U_) { - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Server ring bell on client"); + col_set_str(pinfo->cinfo, COL_INFO, "Server ring bell on client"); /* This message type has no payload... */ } @@ -2255,9 +2219,7 @@ vnc_server_cut_text(tvbuff_t *tvb, packet_info *pinfo, gint *offset, { guint32 text_len; - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, - "Server cut text"); + col_set_str(pinfo->cinfo, COL_INFO, "Server cut text"); text_len = tvb_get_ntohl(tvb, *offset); proto_tree_add_item(tree, diff --git a/epan/dissectors/packet-vtp.c b/epan/dissectors/packet-vtp.c index f024583a94..3d585e32b2 100644 --- a/epan/dissectors/packet-vtp.c +++ b/epan/dissectors/packet-vtp.c @@ -98,8 +98,7 @@ dissect_vtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int vlan_info_len; col_set_str(pinfo->cinfo, COL_PROTOCOL, "VTP"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Virtual Trunking Protocol"); + col_set_str(pinfo->cinfo, COL_INFO, "Virtual Trunking Protocol"); if (tree) { ti = proto_tree_add_item(tree, proto_vtp, tvb, offset, -1, diff --git a/epan/dissectors/packet-wsmp.c b/epan/dissectors/packet-wsmp.c index f0b4f576da..d9b281ee68 100644 --- a/epan/dissectors/packet-wsmp.c +++ b/epan/dissectors/packet-wsmp.c @@ -69,8 +69,7 @@ dissect_wsmp(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, "WSMP"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "WAVE Short Message Protocol IEEE P1609.3"); + col_set_str(pinfo->cinfo, COL_INFO, "WAVE Short Message Protocol IEEE P1609.3"); if (tree) { diff --git a/epan/dissectors/packet-x11.c b/epan/dissectors/packet-x11.c index 8fe9599c72..c558a47a3f 100644 --- a/epan/dissectors/packet-x11.c +++ b/epan/dissectors/packet-x11.c @@ -4300,16 +4300,13 @@ static void dissect_x11_requests(tvbuff_t *tvb, packet_info *pinfo, * Set the column appropriately. */ if (is_initial_creq) { - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, - "Initial connection request"); + col_set_str(pinfo->cinfo, COL_INFO, "Initial connection request"); } else { if (sep == NULL) { /* * We haven't set the column yet; set it. */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Requests"); + col_set_str(pinfo->cinfo, COL_INFO, "Requests"); /* * Initialize the separator. diff --git a/epan/dissectors/packet-x25.c b/epan/dissectors/packet-x25.c index 62a3e3b303..b44e4158ed 100644 --- a/epan/dissectors/packet-x25.c +++ b/epan/dissectors/packet-x25.c @@ -1688,8 +1688,7 @@ dissect_x25_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, x25_pkt_len = get_x25_pkt_len(tvb); if (x25_pkt_len < 3) /* packet too short */ { - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Invalid/short X.25 packet"); + col_set_str(pinfo->cinfo, COL_INFO, "Invalid/short X.25 packet"); if (tree) proto_tree_add_protocol_format(tree, proto_x25, tvb, 0, -1, "Invalid/short X.25 packet"); @@ -2228,16 +2227,14 @@ dissect_x25_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, localoffset = x25_pkt_len; break; case X25_RESTART_CONFIRMATION: - if(check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Restart conf."); + col_set_str(pinfo->cinfo, COL_INFO, "Restart conf."); if (x25_tree) proto_tree_add_uint(x25_tree, hf_x25_type, tvb, 2, 1, X25_RESTART_CONFIRMATION); localoffset = x25_pkt_len; break; case X25_REGISTRATION_REQUEST: - if(check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Registration req."); + col_set_str(pinfo->cinfo, COL_INFO, "Registration req."); if (x25_tree) proto_tree_add_uint(x25_tree, hf_x25_type, tvb, 2, 1, X25_REGISTRATION_REQUEST); @@ -2258,8 +2255,7 @@ dissect_x25_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, localoffset = tvb_reported_length(tvb); break; case X25_REGISTRATION_CONFIRMATION: - if(check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Registration conf."); + col_set_str(pinfo->cinfo, COL_INFO, "Registration conf."); if (x25_tree) { proto_tree_add_uint(x25_tree, hf_x25_type, tvb, 2, 1, X25_REGISTRATION_CONFIRMATION); diff --git a/epan/dissectors/packet-x29.c b/epan/dissectors/packet-x29.c index fdcbf72876..ae577611c5 100644 --- a/epan/dissectors/packet-x29.c +++ b/epan/dissectors/packet-x29.c @@ -217,8 +217,7 @@ dissect_x29(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* * Q bit not set - this is data. */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Data ..."); + col_set_str(pinfo->cinfo, COL_INFO, "Data ..."); if (tree) { while (tvb_offset_exists(tvb, offset)) { diff --git a/epan/dissectors/packet-x411.c b/epan/dissectors/packet-x411.c index ab7cd8ad57..616996aa6d 100644 --- a/epan/dissectors/packet-x411.c +++ b/epan/dissectors/packet-x411.c @@ -8372,8 +8372,7 @@ dissect_x411_mts_apdu (tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tre } col_set_str(pinfo->cinfo, COL_PROTOCOL, "P1"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Transfer"); + col_set_str(pinfo->cinfo, COL_INFO, "Transfer"); dissect_x411_MTS_APDU (FALSE, tvb, 0, &asn1_ctx, tree, hf_x411_MTS_APDU_PDU); } diff --git a/epan/dissectors/packet-x420.c b/epan/dissectors/packet-x420.c index 23c23a6e1d..0d576acdcb 100644 --- a/epan/dissectors/packet-x420.c +++ b/epan/dissectors/packet-x420.c @@ -4299,8 +4299,7 @@ dissect_x420(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) } col_set_str(pinfo->cinfo, COL_PROTOCOL, "P22"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "InterPersonal"); + col_set_str(pinfo->cinfo, COL_INFO, "InterPersonal"); dissect_x420_InformationObject(TRUE, tvb, offset, &asn1_ctx , tree, -1); } |