diff options
| author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-09-24 20:21:23 +0000 |
|---|---|---|
| committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-09-24 20:21:23 +0000 |
| commit | 00810ff19994509f4f8a080286ad43f5156e76c2 (patch) | |
| tree | 687e12b760b8702534057b7348f27994c86b617d | |
| parent | 830dd8e8f05e39238b97857e161821a41ff985df (diff) | |
* Prefer col_append_str instead of col_append_fstr for constant strings
* Remove check_col guards
svn path=/trunk/; revision=30127
60 files changed, 285 insertions, 563 deletions
diff --git a/asn1/dap/dap.cnf b/asn1/dap/dap.cnf index bdeba52e38..da674ac9a0 100644 --- a/asn1/dap/dap.cnf +++ b/asn1/dap/dap.cnf @@ -256,8 +256,7 @@ OPERATION.&ResultType /* its an empty set - i.e anonymous (assuming version is DEFAULTed) */ proto_tree_add_text(tree, tvb, offset, -1,"Anonymous"); - if(check_col(actx->pinfo->cinfo, COL_INFO)) - col_append_str(actx->pinfo->cinfo, COL_INFO, " anonymous"); + col_append_str(actx->pinfo->cinfo, COL_INFO, " anonymous"); } /* do the default thing */ diff --git a/asn1/ldap/ldap.cnf b/asn1/ldap/ldap.cnf index bbabb40398..5e736b79de 100644 --- a/asn1/ldap/ldap.cnf +++ b/asn1/ldap/ldap.cnf @@ -153,8 +153,7 @@ PasswordPolicyResponseValue B "1.3.6.1.4.1.42.2.27.8.5.1" "passwordPolicy" if(ldap_info->start_tls_pending && !ldap_info->start_tls_frame) { /* XXX: some directories do not correctly return the responseName in the extendedResponse so we don't know start_tls has been negotiated */ - if(check_col(actx->pinfo->cinfo, COL_INFO)) - col_append_fstr(actx->pinfo->cinfo, COL_INFO, "[LDAP_START_TLS_OID responseName missing] "); + col_append_str(actx->pinfo->cinfo, COL_INFO, "[LDAP_START_TLS_OID responseName missing] "); ldap_info->start_tls_frame = (actx->pinfo->fd->num) + 1; } diff --git a/asn1/rrlp/rrlp.cnf b/asn1/rrlp/rrlp.cnf index b575f981cf..297dd7e444 100644 --- a/asn1/rrlp/rrlp.cnf +++ b/asn1/rrlp/rrlp.cnf @@ -26,8 +26,7 @@ SLR-Arg-PCS-Extensions proto_tree_add_item(tree, proto_rrlp, tvb, 0, -1, FALSE); - if (check_col(actx->pinfo->cinfo, COL_PROTOCOL)) - col_append_str(actx->pinfo->cinfo, COL_PROTOCOL, "/RRLP"); + col_append_str(actx->pinfo->cinfo, COL_PROTOCOL, "/RRLP"); #.END diff --git a/asn1/t38/t38.cnf b/asn1/t38/t38.cnf index 273e8b5c8c..ef54961705 100644 --- a/asn1/t38/t38.cnf +++ b/asn1/t38/t38.cnf @@ -98,8 +98,7 @@ VAL_PTR=&Data_Field_field_type_value data_fragment_table /* list of message fragments */ ); } else { - if (check_col(actx->pinfo->cinfo, COL_INFO)) - col_append_str(actx->pinfo->cinfo, COL_INFO, " (t4-data Reassembled: No packet lost)"); + col_append_str(actx->pinfo->cinfo, COL_INFO, " (t4-data Reassembled: No packet lost)"); g_snprintf(t38_info->desc_comment, MAX_T38_DESC, "No packet lost"); } diff --git a/asn1/x420/x420.cnf b/asn1/x420/x420.cnf index 906df5d099..75e1911099 100644 --- a/asn1/x420/x420.cnf +++ b/asn1/x420/x420.cnf @@ -218,16 +218,14 @@ IpnSecurityResponse B "2.6.1.18.1" "id-sec-security-common-fields" #.FN_BODY IPM - if(check_col(actx->pinfo->cinfo, COL_INFO)) - col_append_str(actx->pinfo->cinfo, COL_INFO, " Message"); + col_append_str(actx->pinfo->cinfo, COL_INFO, " Message"); %(DEFAULT_BODY)s #.FN_BODY IPN - if(check_col(actx->pinfo->cinfo, COL_INFO)) - col_append_str(actx->pinfo->cinfo, COL_INFO, " Notification"); + col_append_str(actx->pinfo->cinfo, COL_INFO, " Notification"); %(DEFAULT_BODY)s diff --git a/epan/dissectors/packet-ajp13.c b/epan/dissectors/packet-ajp13.c index 3fe64a459d..1c2d559dad 100644 --- a/epan/dissectors/packet-ajp13.c +++ b/epan/dissectors/packet-ajp13.c @@ -500,8 +500,7 @@ display_req_forward(tvbuff_t *tvb, packet_info *pinfo, } pos+=1; if ( cod == 10 ) { - if(check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "CPING" ); + col_append_str(pinfo->cinfo, COL_INFO, "CPING" ); return; } diff --git a/epan/dissectors/packet-bacapp.c b/epan/dissectors/packet-bacapp.c index 10e83bec9e..e3877779db 100644 --- a/epan/dissectors/packet-bacapp.c +++ b/epan/dissectors/packet-bacapp.c @@ -6551,8 +6551,7 @@ dissect_bacapp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) NULL, tree); if (frag_msg) { /* Reassembled */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, " (Message Reassembled)"); } else { /* Not last packet of reassembled Short Message */ if (check_col(pinfo->cinfo, COL_INFO)) diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c index a330e419c7..9c2a46d908 100644 --- a/epan/dissectors/packet-cip.c +++ b/epan/dissectors/packet-cip.c @@ -1577,8 +1577,7 @@ typedef struct mr_mult_req_info { ** We call our selves again to disect embedded packet */ - if(check_col(pinfo->cinfo, COL_INFO)) - col_append_str( pinfo->cinfo, COL_INFO, ", "); + col_append_str( pinfo->cinfo, COL_INFO, ", "); next_tvb = tvb_new_subset(tvb, offset+serv_offset+4, serv_length, serv_length); if ( mr_mult_req_info ) @@ -1706,8 +1705,7 @@ typedef struct mr_mult_req_info { ** We call our selves again to disect embedded packet */ - if(check_col(pinfo->cinfo, COL_INFO)) - col_append_str( pinfo->cinfo, COL_INFO, ", "); + col_append_str( pinfo->cinfo, COL_INFO, ", "); next_tvb = tvb_new_subset(tvb, offset+serv_offset+6, serv_length, serv_length); @@ -2262,8 +2260,7 @@ dissect_cip_cm_data( proto_tree *item_tree, tvbuff_t *tvb, int offset, int item_ ** We call our selves again to disect embedded packet */ - if(check_col(pinfo->cinfo, COL_INFO)) - col_append_str( pinfo->cinfo, COL_INFO, ": "); + col_append_str( pinfo->cinfo, COL_INFO, ": "); next_tvb = tvb_new_subset(tvb, offset+2+req_path_size+4, msg_req_siz, msg_req_siz); preq_info = p_get_proto_data( pinfo->fd, proto_cip ); diff --git a/epan/dissectors/packet-dap.c b/epan/dissectors/packet-dap.c index 284d107291..eebe1e320a 100644 --- a/epan/dissectors/packet-dap.c +++ b/epan/dissectors/packet-dap.c @@ -2049,8 +2049,7 @@ dissect_dap_DirectoryBindArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, /* its an empty set - i.e anonymous (assuming version is DEFAULTed) */ proto_tree_add_text(tree, tvb, offset, -1,"Anonymous"); - if(check_col(actx->pinfo->cinfo, COL_INFO)) - col_append_str(actx->pinfo->cinfo, COL_INFO, " anonymous"); + col_append_str(actx->pinfo->cinfo, COL_INFO, " anonymous"); } /* do the default thing */ diff --git a/epan/dissectors/packet-dcerpc-fileexp.c b/epan/dissectors/packet-dcerpc-fileexp.c index 5ff842ef7e..6fa7d8bc0d 100644 --- a/epan/dissectors/packet-dcerpc-fileexp.c +++ b/epan/dissectors/packet-dcerpc-fileexp.c @@ -393,8 +393,7 @@ dissect_afsFid (tvbuff_t * tvb, int offset, if ((vnode == 1) || (vnode == 2)) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, " InFS "); + col_append_str (pinfo->cinfo, COL_INFO, " InFS "); } else { @@ -503,66 +502,54 @@ dissect_afsConnParams (tvbuff_t * tvb, int offset, hf_afsconnparams_values, &Values[19]); if ((mask & AFS_CONN_PARAM_HOSTLIFE) == AFS_CONN_PARAM_HOSTLIFE) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":HOSTLIFE"); + col_append_str (pinfo->cinfo, COL_INFO, ":HOSTLIFE"); } if ((mask & AFS_CONN_PARAM_HOSTRPC) == AFS_CONN_PARAM_HOSTRPC) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":HOSTRPC"); + col_append_str (pinfo->cinfo, COL_INFO, ":HOSTRPC"); } if ((mask & AFS_CONN_PARAM_DEADSERVER) == AFS_CONN_PARAM_DEADSERVER) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":DEADSERVER"); + col_append_str (pinfo->cinfo, COL_INFO, ":DEADSERVER"); } if ((mask & AFS_CONN_PARAM_EPOCH) == AFS_CONN_PARAM_EPOCH) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":EPOCH"); + col_append_str (pinfo->cinfo, COL_INFO, ":EPOCH"); } if ((mask & AFS_CONN_PARAM_MAXFILE_CLIENT) == AFS_CONN_PARAM_MAXFILE_CLIENT) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":MAXFILE_CLIENT"); + col_append_str (pinfo->cinfo, COL_INFO, ":MAXFILE_CLIENT"); } if ((mask & AFS_CONN_PARAM_MAXFILE_SERVER) == AFS_CONN_PARAM_MAXFILE_SERVER) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":MAXFILE_SERVER"); + col_append_str (pinfo->cinfo, COL_INFO, ":MAXFILE_SERVER"); } if ((mask & AFS_CONN_PARAM_HOST_TYPE_CLIENT) == AFS_CONN_PARAM_HOST_TYPE_CLIENT) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":HOST_TYPE_CLIENT"); + col_append_str (pinfo->cinfo, COL_INFO, ":HOST_TYPE_CLIENT"); } if ((mask & AFS_CONN_PARAM_HOST_TYPE_SERVER) == AFS_CONN_PARAM_HOST_TYPE_SERVER) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":HOST_TYPE_SERVER"); + col_append_str (pinfo->cinfo, COL_INFO, ":HOST_TYPE_SERVER"); } if ((mask & AFS_CONN_PARAM_FT_MASK_CLIENT) == AFS_CONN_PARAM_FT_MASK_CLIENT) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":FT_MASK_CLIENT"); + col_append_str (pinfo->cinfo, COL_INFO, ":FT_MASK_CLIENT"); } if ((mask & AFS_CONN_PARAM_FT_MASK_SERVER) == AFS_CONN_PARAM_FT_MASK_SERVER) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":FT_MASK_SERVER"); + col_append_str (pinfo->cinfo, COL_INFO, ":FT_MASK_SERVER"); } if ((mask & AFS_CONN_PARAM_SUPPORTS_64BITS) == AFS_CONN_PARAM_SUPPORTS_64BITS) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":SUPPORTS_64BITS"); + col_append_str (pinfo->cinfo, COL_INFO, ":SUPPORTS_64BITS"); } if ((mask & AFS_CONN_PARAM_512BYTE_BLOCKS) == AFS_CONN_PARAM_512BYTE_BLOCKS) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":512BYTE_BLOCKS"); + col_append_str (pinfo->cinfo, COL_INFO, ":512BYTE_BLOCKS"); } if (check_col (pinfo->cinfo, COL_INFO)) col_append_fstr (pinfo->cinfo, COL_INFO, @@ -1138,8 +1125,7 @@ dissect_afsstorestatus (tvbuff_t * tvb, int offset, dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_fileexp_storestatus_spare6, &spare6); - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_fstr (pinfo->cinfo, COL_INFO, " Mask="); + col_append_str (pinfo->cinfo, COL_INFO, " Mask="); if ((mask & AFS_SETMODTIME) == AFS_SETMODTIME) { if (check_col (pinfo->cinfo, COL_INFO)) @@ -1175,33 +1161,27 @@ dissect_afsstorestatus (tvbuff_t * tvb, int offset, } if ((mask & AFS_SETLENGTH) == AFS_SETLENGTH) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":SETLENGTH"); + col_append_str (pinfo->cinfo, COL_INFO, ":SETLENGTH"); } if ((mask & AFS_SETTYPEUUID) == AFS_SETTYPEUUID) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":SETTYPEUUID"); + col_append_str (pinfo->cinfo, COL_INFO, ":SETTYPEUUID"); } if ((mask & AFS_SETDEVNUM) == AFS_SETDEVNUM) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":SETDEVNUM"); + col_append_str (pinfo->cinfo, COL_INFO, ":SETDEVNUM"); } if ((mask & AFS_SETMODEXACT) == AFS_SETMODEXACT) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":SETMODEXACT"); + col_append_str (pinfo->cinfo, COL_INFO, ":SETMODEXACT"); } if ((mask & AFS_SETTRUNCLENGTH) == AFS_SETTRUNCLENGTH) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":SETTRUNCLENGTH"); + col_append_str (pinfo->cinfo, COL_INFO, ":SETTRUNCLENGTH"); } if ((mask & AFS_SETCLIENTSPARE) == AFS_SETCLIENTSPARE) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":SETCLIENTSPARE"); + col_append_str (pinfo->cinfo, COL_INFO, ":SETCLIENTSPARE"); } proto_item_set_len (item, offset - old_offset); @@ -1276,98 +1256,79 @@ dissect_afstoken (tvbuff_t * tvb, int offset, endrange, beginrangeext, endrangeext); type = type_low; - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, " Type="); + col_append_str (pinfo->cinfo, COL_INFO, " Type="); if ((type & TKN_LOCK_READ) == TKN_LOCK_READ) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":LOCK_READ"); + col_append_str (pinfo->cinfo, COL_INFO, ":LOCK_READ"); } if ((type & TKN_LOCK_WRITE) == TKN_LOCK_WRITE) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":LOCK_WRITE"); + col_append_str (pinfo->cinfo, COL_INFO, ":LOCK_WRITE"); } if ((type & TKN_DATA_READ) == TKN_DATA_READ) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":DATA_READ"); + col_append_str (pinfo->cinfo, COL_INFO, ":DATA_READ"); } if ((type & TKN_DATA_WRITE) == TKN_DATA_WRITE) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":DATA_WRITE"); + col_append_str (pinfo->cinfo, COL_INFO, ":DATA_WRITE"); } if ((type & TKN_OPEN_READ) == TKN_OPEN_READ) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":OPEN_READ"); + col_append_str (pinfo->cinfo, COL_INFO, ":OPEN_READ"); } if ((type & TKN_OPEN_WRITE) == TKN_OPEN_WRITE) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":OPEN_WRITE"); + col_append_str (pinfo->cinfo, COL_INFO, ":OPEN_WRITE"); } if ((type & TKN_OPEN_SHARED) == TKN_OPEN_SHARED) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":OPEN_SHARED"); + col_append_str (pinfo->cinfo, COL_INFO, ":OPEN_SHARED"); } if ((type & TKN_OPEN_EXCLUSIVE) == TKN_OPEN_EXCLUSIVE) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":OPEN_EXCLUSIVE"); + col_append_str (pinfo->cinfo, COL_INFO, ":OPEN_EXCLUSIVE"); } if ((type & TKN_OPEN_DELETE) == TKN_OPEN_DELETE) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":OPEN_DELETE"); + col_append_str (pinfo->cinfo, COL_INFO, ":OPEN_DELETE"); } if ((type & TKN_OPEN_PRESERVE) == TKN_OPEN_PRESERVE) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":OPEN_PRESERVE"); + col_append_str (pinfo->cinfo, COL_INFO, ":OPEN_PRESERVE"); } if ((type & TKN_STATUS_READ) == TKN_STATUS_READ) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":STATUS_READ"); + col_append_str (pinfo->cinfo, COL_INFO, ":STATUS_READ"); } if ((type & TKN_STATUS_WRITE) == TKN_STATUS_WRITE) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":STATUS_WRITE"); + col_append_str (pinfo->cinfo, COL_INFO, ":STATUS_WRITE"); } if ((type & TKN_OPEN_UNLINK) == TKN_OPEN_UNLINK) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":OPEN_UNLINK"); + col_append_str (pinfo->cinfo, COL_INFO, ":OPEN_UNLINK"); } if ((type & TKN_SPOT_HERE) == TKN_SPOT_HERE) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":SPOT_HERE"); + col_append_str (pinfo->cinfo, COL_INFO, ":SPOT_HERE"); } if ((type & TKN_SPOT_THERE) == TKN_SPOT_THERE) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":SPOT_THERE"); + col_append_str (pinfo->cinfo, COL_INFO, ":SPOT_THERE"); } if ((type & TKN_OPEN_NO_READ) == TKN_OPEN_NO_READ) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":OPEN_NO_READ"); + col_append_str (pinfo->cinfo, COL_INFO, ":OPEN_NO_READ"); } if ((type & TKN_OPEN_NO_WRITE) == TKN_OPEN_NO_WRITE) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":OPEN_NO_WRITE"); + col_append_str (pinfo->cinfo, COL_INFO, ":OPEN_NO_WRITE"); } if ((type & TKN_OPEN_NO_UNLINK) == TKN_OPEN_NO_UNLINK) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":OPEN_NO_UNLINK"); + col_append_str (pinfo->cinfo, COL_INFO, ":OPEN_NO_UNLINK"); } proto_item_set_len (item, offset - old_offset); @@ -1750,104 +1711,84 @@ dissect_afsFlags (tvbuff_t * tvb, int offset, if (flags) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, " Flags="); + col_append_str (pinfo->cinfo, COL_INFO, " Flags="); if ((flags & AFS_FLAG_RETURNTOKEN) == AFS_FLAG_RETURNTOKEN) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":RETURNTOKEN"); + col_append_str (pinfo->cinfo, COL_INFO, ":RETURNTOKEN"); } if ((flags & AFS_FLAG_TOKENJUMPQUEUE) == AFS_FLAG_TOKENJUMPQUEUE) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":TOKENJUMPQUEUE"); + col_append_str (pinfo->cinfo, COL_INFO, ":TOKENJUMPQUEUE"); } if ((flags & AFS_FLAG_SKIPTOKEN) == AFS_FLAG_SKIPTOKEN) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":SKIPTOKEN"); + col_append_str (pinfo->cinfo, COL_INFO, ":SKIPTOKEN"); } if ((flags & AFS_FLAG_NOOPTIMISM) == AFS_FLAG_NOOPTIMISM) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":NOOPTIMISM"); + col_append_str (pinfo->cinfo, COL_INFO, ":NOOPTIMISM"); } if ((flags & AFS_FLAG_TOKENID) == AFS_FLAG_TOKENID) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":TOKENID"); + col_append_str (pinfo->cinfo, COL_INFO, ":TOKENID"); } if ((flags & AFS_FLAG_RETURNBLOCKER) == AFS_FLAG_RETURNBLOCKER) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":RETURNBLOCKER"); + col_append_str (pinfo->cinfo, COL_INFO, ":RETURNBLOCKER"); } if ((flags & AFS_FLAG_ASYNCGRANT) == AFS_FLAG_ASYNCGRANT) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":ASYNCGRANT"); + col_append_str (pinfo->cinfo, COL_INFO, ":ASYNCGRANT"); } if ((flags & AFS_FLAG_NOREVOKE) == AFS_FLAG_NOREVOKE) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":NOREVOKE"); + col_append_str (pinfo->cinfo, COL_INFO, ":NOREVOKE"); } if ((flags & AFS_FLAG_MOVE_REESTABLISH) == AFS_FLAG_MOVE_REESTABLISH) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":MOVE_REESTABLISH"); + col_append_str (pinfo->cinfo, COL_INFO, ":MOVE_REESTABLISH"); } if ((flags & AFS_FLAG_SERVER_REESTABLISH) == AFS_FLAG_SERVER_REESTABLISH) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":SERVER_REESTABLISH"); + col_append_str (pinfo->cinfo, COL_INFO, ":SERVER_REESTABLISH"); } if ((flags & AFS_FLAG_NO_NEW_EPOCH) == AFS_FLAG_NO_NEW_EPOCH) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":NO_NEW_EPOCH"); + col_append_str (pinfo->cinfo, COL_INFO, ":NO_NEW_EPOCH"); } if ((flags & AFS_FLAG_MOVE_SOURCE_OK) == AFS_FLAG_MOVE_SOURCE_OK) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":MOVE_SOURCE_OK"); + col_append_str (pinfo->cinfo, COL_INFO, ":MOVE_SOURCE_OK"); } if ((flags & AFS_FLAG_SYNC) == AFS_FLAG_SYNC) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":SYNC"); + col_append_str (pinfo->cinfo, COL_INFO, ":SYNC"); } if ((flags & AFS_FLAG_ZERO) == AFS_FLAG_ZERO) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":ZERO"); + col_append_str (pinfo->cinfo, COL_INFO, ":ZERO"); } if ((flags & AFS_FLAG_SKIPSTATUS) == AFS_FLAG_SKIPSTATUS) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":SKIPSTATUS"); + col_append_str (pinfo->cinfo, COL_INFO, ":SKIPSTATUS"); } if ((flags & AFS_FLAG_FORCEREVOCATIONS) == AFS_FLAG_FORCEREVOCATIONS) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":FORCEREVOCATIONS"); + col_append_str (pinfo->cinfo, COL_INFO, ":FORCEREVOCATIONS"); } if ((flags & AFS_FLAG_FORCEVOLQUIESCE) == AFS_FLAG_FORCEVOLQUIESCE) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":FORCEVOLQUIESCE"); + col_append_str (pinfo->cinfo, COL_INFO, ":FORCEVOLQUIESCE"); } if ((flags & AFS_FLAG_SEC_SERVICE) == AFS_FLAG_SEC_SERVICE) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":SEC_SERVICE"); + col_append_str (pinfo->cinfo, COL_INFO, ":SEC_SERVICE"); } if ((flags & AFS_FLAG_CONTEXT_NEW_ACL_IF) == AFS_FLAG_CONTEXT_NEW_ACL_IF) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":CONTEXT_NEW_ACL_IF"); + col_append_str (pinfo->cinfo, COL_INFO, ":CONTEXT_NEW_ACL_IF"); } } @@ -2531,8 +2472,7 @@ fileexp_dissect_fetchacl_rqst (tvbuff_t * tvb, int offset, if (acltype) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, + col_append_str (pinfo->cinfo, COL_INFO, " :copy the ACL from specified fid:"); } @@ -3114,7 +3054,7 @@ fileexp_dissect_setcontext_rqst (tvbuff_t * tvb, int offset, offset = dissect_afsFlags (tvb, offset, pinfo, tree, drep); -if (check_col (pinfo->cinfo, COL_INFO)) col_append_str (pinfo->cinfo, COL_INFO, " setObjectID"); +col_append_str (pinfo->cinfo, COL_INFO, " setObjectID"); offset = dissect_ndr_pointer (tvb, offset, pinfo, tree, drep, dissect_afsuuid, NDR_POINTER_REF, "afsUUID:", -1); diff --git a/epan/dissectors/packet-dcerpc-fldb.c b/epan/dissectors/packet-dcerpc-fldb.c index e2a4d2964e..fcdd8d87ce 100644 --- a/epan/dissectors/packet-dcerpc-fldb.c +++ b/epan/dissectors/packet-dcerpc-fldb.c @@ -518,105 +518,85 @@ dissect_afsflags (tvbuff_t * tvb, int offset, hf_fldb_afsflags_flags, &afsflags); if (afsflags) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, " afsFlags="); + col_append_str (pinfo->cinfo, COL_INFO, " afsFlags="); if ((afsflags & AFS_FLAG_RETURNTOKEN) == AFS_FLAG_RETURNTOKEN) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":RETURNTOKEN"); + col_append_str (pinfo->cinfo, COL_INFO, ":RETURNTOKEN"); } if ((afsflags & AFS_FLAG_TOKENJUMPQUEUE) == AFS_FLAG_TOKENJUMPQUEUE) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":TOKENJUMPQUEUE"); + col_append_str (pinfo->cinfo, COL_INFO, ":TOKENJUMPQUEUE"); } if ((afsflags & AFS_FLAG_SKIPTOKEN) == AFS_FLAG_SKIPTOKEN) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":SKIPTOKEN"); + col_append_str (pinfo->cinfo, COL_INFO, ":SKIPTOKEN"); } if ((afsflags & AFS_FLAG_NOOPTIMISM) == AFS_FLAG_NOOPTIMISM) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":NOOPTIMISM"); + col_append_str (pinfo->cinfo, COL_INFO, ":NOOPTIMISM"); } if ((afsflags & AFS_FLAG_TOKENID) == AFS_FLAG_TOKENID) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":TOKENID"); + col_append_str (pinfo->cinfo, COL_INFO, ":TOKENID"); } if ((afsflags & AFS_FLAG_RETURNBLOCKER) == AFS_FLAG_RETURNBLOCKER) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":RETURNBLOCKER"); + col_append_str (pinfo->cinfo, COL_INFO, ":RETURNBLOCKER"); } if ((afsflags & AFS_FLAG_ASYNCGRANT) == AFS_FLAG_ASYNCGRANT) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":ASYNCGRANT"); + col_append_str (pinfo->cinfo, COL_INFO, ":ASYNCGRANT"); } if ((afsflags & AFS_FLAG_NOREVOKE) == AFS_FLAG_NOREVOKE) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":NOREVOKE"); + col_append_str (pinfo->cinfo, COL_INFO, ":NOREVOKE"); } if ((afsflags & AFS_FLAG_MOVE_REESTABLISH) == AFS_FLAG_MOVE_REESTABLISH) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":MOVE_REESTABLISH"); + col_append_str (pinfo->cinfo, COL_INFO, ":MOVE_REESTABLISH"); } if ((afsflags & AFS_FLAG_SERVER_REESTABLISH) == AFS_FLAG_SERVER_REESTABLISH) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":SERVER_REESTABLISH"); + col_append_str (pinfo->cinfo, COL_INFO, ":SERVER_REESTABLISH"); if ((afsflags & AFS_FLAG_NO_NEW_EPOCH) == AFS_FLAG_NO_NEW_EPOCH) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":NO_NEW_EPOCH"); + col_append_str (pinfo->cinfo, COL_INFO, ":NO_NEW_EPOCH"); } if ((afsflags & AFS_FLAG_MOVE_SOURCE_OK) == AFS_FLAG_MOVE_SOURCE_OK) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":MOVE_SOURCE_OK"); + col_append_str (pinfo->cinfo, COL_INFO, ":MOVE_SOURCE_OK"); } if ((afsflags & AFS_FLAG_SYNC) == AFS_FLAG_SYNC) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":SYNC"); + col_append_str (pinfo->cinfo, COL_INFO, ":SYNC"); } if ((afsflags & AFS_FLAG_ZERO) == AFS_FLAG_ZERO) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":ZERO"); + col_append_str (pinfo->cinfo, COL_INFO, ":ZERO"); } if ((afsflags & AFS_FLAG_SKIPSTATUS) == AFS_FLAG_SKIPSTATUS) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":SKIPSTATUS"); + col_append_str (pinfo->cinfo, COL_INFO, ":SKIPSTATUS"); } if ((afsflags & AFS_FLAG_FORCEREVOCATIONS) == AFS_FLAG_FORCEREVOCATIONS) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":FORCEREVOCATIONS"); + col_append_str (pinfo->cinfo, COL_INFO, ":FORCEREVOCATIONS"); } if ((afsflags & AFS_FLAG_FORCEVOLQUIESCE) == AFS_FLAG_FORCEVOLQUIESCE) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":FORCEVOLQUIESCE"); + col_append_str (pinfo->cinfo, COL_INFO, ":FORCEVOLQUIESCE"); } if ((afsflags & AFS_FLAG_SEC_SERVICE) == AFS_FLAG_SEC_SERVICE) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":SEC_SERVICE"); + col_append_str (pinfo->cinfo, COL_INFO, ":SEC_SERVICE"); } if ((afsflags & AFS_FLAG_CONTEXT_NEW_ACL_IF) == AFS_FLAG_CONTEXT_NEW_ACL_IF) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, + col_append_str (pinfo->cinfo, COL_INFO, ":CONTEXT_NEW_ACL_IF"); } @@ -652,47 +632,38 @@ dissect_siteflags (tvbuff_t * tvb, int offset, if (siteflags) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, " SiteFlags"); + col_append_str (pinfo->cinfo, COL_INFO, " SiteFlags"); if ((siteflags & VLSF_NEWREPSITE) == VLSF_NEWREPSITE) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":NEWREPSITE"); + col_append_str (pinfo->cinfo, COL_INFO, ":NEWREPSITE"); } if ((siteflags & VLSF_SPARE1) == VLSF_SPARE1) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":SPARE1"); + col_append_str (pinfo->cinfo, COL_INFO, ":SPARE1"); } if ((siteflags & VLSF_SPARE2) == VLSF_SPARE2) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":SPARE2"); + col_append_str (pinfo->cinfo, COL_INFO, ":SPARE2"); } if ((siteflags & VLSF_SPARE3) == VLSF_SPARE3) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":SPARE3"); + col_append_str (pinfo->cinfo, COL_INFO, ":SPARE3"); } if ((siteflags & VLSF_SAMEASPREV) == VLSF_SAMEASPREV) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":SAMEASPREV"); + col_append_str (pinfo->cinfo, COL_INFO, ":SAMEASPREV"); } if ((siteflags & VLSF_DEFINED) == VLSF_DEFINED) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":DEFINED"); + col_append_str (pinfo->cinfo, COL_INFO, ":DEFINED"); } if ((siteflags & VLSF_PARTIALADDRS) == VLSF_PARTIALADDRS) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":PARTIALADDRS "); + col_append_str (pinfo->cinfo, COL_INFO, ":PARTIALADDRS "); } if ((siteflags & VLSF_ZEROIXHERE) == VLSF_ZEROIXHERE) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":ZEROIXHERE"); + col_append_str (pinfo->cinfo, COL_INFO, ":ZEROIXHERE"); } } diff --git a/epan/dissectors/packet-dcerpc-rs_pgo.c b/epan/dissectors/packet-dcerpc-rs_pgo.c index 3865f454a5..cd28cb5a2b 100644 --- a/epan/dissectors/packet-dcerpc-rs_pgo.c +++ b/epan/dissectors/packet-dcerpc-rs_pgo.c @@ -338,32 +338,26 @@ dissect_sec_rgy_pgo_flags_t (tvbuff_t * tvb, int offset, #define sec_rgy_pgo_flags_none 0 - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, " PgoFlags="); + col_append_str (pinfo->cinfo, COL_INFO, " PgoFlags="); if ((flags & sec_rgy_pgo_is_an_alias) == sec_rgy_pgo_is_an_alias) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":IS_AN_ALIAS"); + col_append_str (pinfo->cinfo, COL_INFO, ":IS_AN_ALIAS"); } if ((flags & sec_rgy_pgo_is_required) == sec_rgy_pgo_is_required) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":IS_REQUIRED"); + col_append_str (pinfo->cinfo, COL_INFO, ":IS_REQUIRED"); } if ((flags & sec_rgy_pgo_projlist_ok) == sec_rgy_pgo_projlist_ok) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":PROJLIST_OK"); + col_append_str (pinfo->cinfo, COL_INFO, ":PROJLIST_OK"); } if ((flags & sec_rgy_acct_admin_client) == sec_rgy_acct_admin_client) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":NONE"); + col_append_str (pinfo->cinfo, COL_INFO, ":NONE"); } if ((flags & sec_rgy_pgo_flags_none) == sec_rgy_pgo_flags_none) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ":NONE"); + col_append_str (pinfo->cinfo, COL_INFO, ":NONE"); } proto_item_set_len (item, offset - old_offset); @@ -710,30 +704,24 @@ dissect_rs_pgo_query_t (tvbuff_t * tvb, int offset, offset = dissect_ndr_uint8 (tvb, offset, pinfo, tree, drep, hf_rs_pgo_query_t, &query_t); - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, " rs_pgo_query_t:"); + col_append_str (pinfo->cinfo, COL_INFO, " rs_pgo_query_t:"); switch (query_t) { case rs_pgo_query_name: - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, "NAME"); + col_append_str (pinfo->cinfo, COL_INFO, "NAME"); break; case rs_pgo_query_id: - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, "ID"); + col_append_str (pinfo->cinfo, COL_INFO, "ID"); break; case rs_pgo_query_unix_num: - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, "UNIX_NUM"); + col_append_str (pinfo->cinfo, COL_INFO, "UNIX_NUM"); break; case rs_pgo_query_next: - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, "NEXT"); + col_append_str (pinfo->cinfo, COL_INFO, "NEXT"); break; case rs_pgo_query_none: - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, "NONE"); + col_append_str (pinfo->cinfo, COL_INFO, "NONE"); break; default: if (check_col (pinfo->cinfo, COL_INFO)) @@ -950,34 +938,28 @@ dissect_rs_pgo_query_key_t (tvbuff_t * tvb, int offset, offset = dissect_ndr_uint16 (tvb, offset, pinfo, tree, drep, hf_rs_pgo_query_key_t, &query_t); - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, " rs_pgo_query_key_t:"); + col_append_str (pinfo->cinfo, COL_INFO, " rs_pgo_query_key_t:"); offset += 4; switch (query_t) { case rs_pgo_query_name: - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, "NAME"); + col_append_str (pinfo->cinfo, COL_INFO, "NAME"); offset = dissect_sec_rgy_name_t (tvb, offset, pinfo, tree, drep); break; case rs_pgo_query_id: - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, "ID"); + col_append_str (pinfo->cinfo, COL_INFO, "ID"); offset = dissect_rs_pgo_id_key_t (tvb, offset, pinfo, tree, drep); break; case rs_pgo_query_unix_num: - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, "UNIX_NUM"); + col_append_str (pinfo->cinfo, COL_INFO, "UNIX_NUM"); offset = dissect_rs_pgo_unix_num_key_t (tvb, offset, pinfo, tree, drep); break; case rs_pgo_query_next: - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, "NEXT"); + col_append_str (pinfo->cinfo, COL_INFO, "NEXT"); offset = dissect_sec_rgy_name_t (tvb, offset, pinfo, tree, drep); break; case rs_pgo_query_none: - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, "NONE"); + col_append_str (pinfo->cinfo, COL_INFO, "NONE"); break; default: diff --git a/epan/dissectors/packet-dcerpc-spoolss.c b/epan/dissectors/packet-dcerpc-spoolss.c index 3eb34fa508..7496c0757c 100644 --- a/epan/dissectors/packet-dcerpc-spoolss.c +++ b/epan/dissectors/packet-dcerpc-spoolss.c @@ -676,8 +676,7 @@ static int dissect_printerdata_data(tvbuff_t *tvb, int offset, break; } case DCERPC_REG_BINARY: - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str( + col_append_str( pinfo->cinfo, COL_INFO, " = <binary data>"); break; diff --git a/epan/dissectors/packet-dtls.c b/epan/dissectors/packet-dtls.c index 4b6b5b5ce3..436da6892f 100644 --- a/epan/dissectors/packet-dtls.c +++ b/epan/dissectors/packet-dtls.c @@ -447,8 +447,7 @@ dissect_dtls(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * continuation data */ offset = tvb_length(tvb); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Continuation Data"); /* Set the protocol column */ @@ -602,8 +601,7 @@ dissect_dtls_record(tvbuff_t *tvb, packet_info *pinfo, /* if we don't have a valid content_type, there's no sense * continuing any further */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "Continuation Data"); + col_append_str(pinfo->cinfo, COL_INFO, "Continuation Data"); /* Set the protocol column */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "DTLS"); @@ -705,8 +703,7 @@ dissect_dtls_record(tvbuff_t *tvb, packet_info *pinfo, switch (content_type) { case SSL_ID_CHG_CIPHER_SPEC: - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "Change Cipher Spec"); + col_append_str(pinfo->cinfo, COL_INFO, "Change Cipher Spec"); dissect_dtls_change_cipher_spec(tvb, dtls_record_tree, offset, conv_version, content_type); break; @@ -758,8 +755,7 @@ dissect_dtls_record(tvbuff_t *tvb, packet_info *pinfo, record_length, content_type, ssl, TRUE); /* show on info colum what we are decoding */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "Application Data"); + col_append_str(pinfo->cinfo, COL_INFO, "Application Data"); if (!dtls_record_tree) break; @@ -805,8 +801,7 @@ dissect_dtls_record(tvbuff_t *tvb, packet_info *pinfo, default: /* shouldn't get here since we check above for valid types */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "Bad DTLS Content Type"); + col_append_str(pinfo->cinfo, COL_INFO, "Bad DTLS Content Type"); break; } offset += record_length; /* skip to end of record */ @@ -883,8 +878,7 @@ dissect_dtls_alert(tvbuff_t *tvb, packet_info *pinfo, } else { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "Encrypted Alert"); + col_append_str(pinfo->cinfo, COL_INFO, "Encrypted Alert"); } if (tree) @@ -992,8 +986,7 @@ dissect_dtls_handshake(tvbuff_t *tvb, packet_info *pinfo, /* on second and later iterations, add comma to info col */ if (!first_iteration) { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, ", "); + col_append_str(pinfo->cinfo, COL_INFO, ", "); } /* diff --git a/epan/dissectors/packet-exec.c b/epan/dissectors/packet-exec.c index ca56c6c903..e0bb95ebcd 100644 --- a/epan/dissectors/packet-exec.c +++ b/epan/dissectors/packet-exec.c @@ -342,15 +342,13 @@ dissect_exec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* offset = 0 since the whole packet is data */ proto_tree_add_text(exec_tree, tvb, 0, -1, "Client -> Server Data"); - if(check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "Client -> Server data"); + col_append_str(pinfo->cinfo, COL_INFO, "Client -> Server data"); } else { /* This packet must be going back to the client */ /* offset = 0 since the whole packet is data */ proto_tree_add_text(exec_tree, tvb, 0, -1, "Server -> Client Data"); - if(check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "Server -> Client Data"); + col_append_str(pinfo->cinfo, COL_INFO, "Server -> Client Data"); } } diff --git a/epan/dissectors/packet-fcip.c b/epan/dissectors/packet-fcip.c index 63eb8130bf..71d17c0531 100644 --- a/epan/dissectors/packet-fcip.c +++ b/epan/dissectors/packet-fcip.c @@ -503,8 +503,7 @@ dissect_fcip (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, else { 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)"); + col_append_str(pinfo->cinfo, COL_INFO, "(Changed)"); } dissect_fcip_sf (tvb, fcip_tree, offset+4); diff --git a/epan/dissectors/packet-gsm_bsslap.c b/epan/dissectors/packet-gsm_bsslap.c index aa3179a2f1..89bc79777c 100644 --- a/epan/dissectors/packet-gsm_bsslap.c +++ b/epan/dissectors/packet-gsm_bsslap.c @@ -807,8 +807,7 @@ dissect_gsm_bsslap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 octet; /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_append_str(pinfo->cinfo, COL_PROTOCOL, "/BSSLAP"); + col_append_str(pinfo->cinfo, COL_PROTOCOL, "/BSSLAP"); if (tree) { octet = tvb_get_guint8(tvb, offset); item = proto_tree_add_item(tree, proto_gsm_bsslap, tvb, 0, -1, FALSE); diff --git a/epan/dissectors/packet-gsm_sms.c b/epan/dissectors/packet-gsm_sms.c index 9950eb1bf1..c617c014b4 100644 --- a/epan/dissectors/packet-gsm_sms.c +++ b/epan/dissectors/packet-gsm_sms.c @@ -2617,8 +2617,7 @@ dis_field_ud(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint32 length, gb if (reassembled) { /* Reassembled */ - if (check_col (g_pinfo->cinfo, COL_INFO)) - col_append_str (g_pinfo->cinfo, COL_INFO, + col_append_str (g_pinfo->cinfo, COL_INFO, " (Short Message Reassembled)"); } else diff --git a/epan/dissectors/packet-gsm_sms_ud.c b/epan/dissectors/packet-gsm_sms_ud.c index f0d1bca320..c3f2f93b84 100644 --- a/epan/dissectors/packet-gsm_sms_ud.c +++ b/epan/dissectors/packet-gsm_sms_ud.c @@ -362,8 +362,7 @@ parse_gsm_sms_ud_message(proto_tree *sm_tree, tvbuff_t *tvb, packet_info *pinfo, "Reassembled Short Message", fd_sm, &sm_frag_items, NULL, sm_tree); if (reassembled) { /* Reassembled */ - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, + col_append_str (pinfo->cinfo, COL_INFO, " (Short Message Reassembled)"); } else { /* Not last packet of reassembled Short Message */ diff --git a/epan/dissectors/packet-h223.c b/epan/dissectors/packet-h223.c index 5210285754..125a71ba6a 100644 --- a/epan/dissectors/packet-h223.c +++ b/epan/dissectors/packet-h223.c @@ -1240,8 +1240,7 @@ static gint dissect_mux_pdu_fragment( tvbuff_t *tvb, guint32 start_offset, packe } CATCH2(BoundsError,ReportedBoundsError) { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "[Malformed Packet]"); proto_tree_add_protocol_format(h223_tree, proto_malformed, tvb, 0, 0, "[Malformed Packet: %s]", pinfo->current_proto); diff --git a/epan/dissectors/packet-h263.c b/epan/dissectors/packet-h263.c index 64bd7cd68c..44cefac36b 100644 --- a/epan/dissectors/packet-h263.c +++ b/epan/dissectors/packet-h263.c @@ -670,8 +670,7 @@ static void dissect_h263_data( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr /* Picture Start Code (PSC) * ( 1000 00x.) */ - if(check_col( pinfo->cinfo, COL_INFO)) - col_append_str( pinfo->cinfo, COL_INFO, "(PSC) "); + col_append_str( pinfo->cinfo, COL_INFO, "(PSC) "); offset = dissect_h263_picture_layer( tvb, pinfo, h263_payload_tree, offset, -1, FALSE); break; case 0xfc: @@ -683,8 +682,7 @@ static void dissect_h263_data( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr /* Group of Block Start Code (GBSC) or * Slice Start Code (SSC) */ - if ( check_col( pinfo->cinfo, COL_INFO) ) - col_append_str( pinfo->cinfo, COL_INFO, "(GBSC) "); + col_append_str( pinfo->cinfo, COL_INFO, "(GBSC) "); offset = dissect_h263_group_of_blocks_layer( tvb, h263_payload_tree, offset,FALSE); break; } diff --git a/epan/dissectors/packet-h263p.c b/epan/dissectors/packet-h263p.c index 1d0ce3dba4..04639ad217 100644 --- a/epan/dissectors/packet-h263p.c +++ b/epan/dissectors/packet-h263p.c @@ -178,8 +178,7 @@ dissect_h263P( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) /* Picture Start Code (PSC) * ( 1000 00x.) */ - if(check_col( pinfo->cinfo, COL_INFO)) - col_append_str( pinfo->cinfo, COL_INFO, "(PSC) "); + col_append_str( pinfo->cinfo, COL_INFO, "(PSC) "); offset = dissect_h263_picture_layer( tvb, pinfo, h263P_data_tree, offset, -1, TRUE); break; case 0xfc: @@ -191,8 +190,7 @@ dissect_h263P( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) /* Group of Block Start Code (GBSC) or * Slice Start Code (SSC) */ - if ( check_col( pinfo->cinfo, COL_INFO) ) - col_append_str( pinfo->cinfo, COL_INFO, "(GBSC) "); + col_append_str( pinfo->cinfo, COL_INFO, "(GBSC) "); dissect_h263_group_of_blocks_layer( tvb, h263P_data_tree, offset,TRUE); break; } diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c index f9b22d2faf..e5401600eb 100644 --- a/epan/dissectors/packet-http.c +++ b/epan/dissectors/packet-http.c @@ -2591,8 +2591,7 @@ dissect_message_http(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) gint offset = 0, next_offset; gint len; - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, " (message/http)"); + col_append_str(pinfo->cinfo, COL_INFO, " (message/http)"); if (tree) { ti = proto_tree_add_item(tree, proto_message_http, tvb, 0, -1, FALSE); diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c index 7569fdf410..320124c2ec 100644 --- a/epan/dissectors/packet-iax2.c +++ b/epan/dissectors/packet-iax2.c @@ -2020,8 +2020,7 @@ static void dissect_payload(tvbuff_t *tvb, guint32 offset, ts = ts; if( offset >= tvb_reported_length (tvb)) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_str (pinfo->cinfo, COL_INFO, ", empty frame" ); + col_append_str (pinfo->cinfo, COL_INFO, ", empty frame" ); return; } diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index f5ee6d6319..4b3e6c06f1 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -6991,8 +6991,7 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo, } if (retransmitted) { - if (check_col (pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, " [retransmitted]"); + col_append_str(pinfo->cinfo, COL_INFO, " [retransmitted]"); if (tree) { proto_item *item; diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c index 5682f8eb91..c92f4749e4 100644 --- a/epan/dissectors/packet-ieee802154.c +++ b/epan/dissectors/packet-ieee802154.c @@ -1008,7 +1008,7 @@ dissect_ieee802154_fcs: /* If the CRC is invalid, make a note of it in the info column. */ if (!fcs_ok) { - if (check_col(pinfo->cinfo, COL_INFO)) col_append_fstr(pinfo->cinfo, COL_INFO, ", Bad FCS"); + col_append_str(pinfo->cinfo, COL_INFO, ", Bad FCS"); if (tree) proto_item_append_text(proto_root, ", Bad FCS"); /* Flag packet as having a bad crc. */ diff --git a/epan/dissectors/packet-image-png.c b/epan/dissectors/packet-image-png.c index f036aa7cc4..14dac220ff 100644 --- a/epan/dissectors/packet-image-png.c +++ b/epan/dissectors/packet-image-png.c @@ -225,8 +225,7 @@ dissect_png(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) proto_item *ti; int offset=0; - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, " (PNG)"); + col_append_str(pinfo->cinfo, COL_INFO, " (PNG)"); if(parent_tree){ ti=proto_tree_add_item(parent_tree, proto_png, tvb, offset, -1, FALSE); diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c index 0db45678ce..ef43d6b038 100644 --- a/epan/dissectors/packet-ipv6.c +++ b/epan/dissectors/packet-ipv6.c @@ -1150,8 +1150,7 @@ static void ipv6_shim6_checkum_additional_info(tvbuff_t * tvb, packet_info * pin PROTO_ITEM_SET_GENERATED(item); if (!is_cksum_correct) { expert_add_info_format(pinfo, item, PI_CHECKSUM, PI_ERROR, "Bad checksum"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, " [Shim6 CHECKSUM INCORRECT]"); + col_append_str(pinfo->cinfo, COL_INFO, " [Shim6 CHECKSUM INCORRECT]"); } } diff --git a/epan/dissectors/packet-isis-lsp.c b/epan/dissectors/packet-isis-lsp.c index 3d994d4bfe..8190cea97b 100644 --- a/epan/dissectors/packet-isis-lsp.c +++ b/epan/dissectors/packet-isis-lsp.c @@ -1738,8 +1738,7 @@ static void isis_lsp_checkum_additional_info(tvbuff_t * tvb, packet_info * pinfo PROTO_ITEM_SET_GENERATED(item); if (!is_cksum_correct) { expert_add_info_format(pinfo, item, PI_CHECKSUM, PI_ERROR, "Bad checksum"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, " [ISIS CHECKSUM INCORRECT]"); + col_append_str(pinfo->cinfo, COL_INFO, " [ISIS CHECKSUM INCORRECT]"); } } diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c index 42516bee43..c8e1fe7d53 100644 --- a/epan/dissectors/packet-isup.c +++ b/epan/dissectors/packet-isup.c @@ -3468,12 +3468,10 @@ dissect_isup_application_transport_parameter(tvbuff_t *parameter_tvb, packet_inf NULL, parameter_tree); if (frag_msg) { /* Reassembled */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, " (Message Reassembled)"); } else { /* Not last packet of reassembled Short Message */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, " (Message fragment )"); } @@ -7200,8 +7198,7 @@ dissect_application_isup(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 message_type; /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_append_str(pinfo->cinfo, COL_PROTOCOL, "/ISUP(ITU)"); + col_append_str(pinfo->cinfo, COL_PROTOCOL, "/ISUP(ITU)"); /* Extract message type field */ message_type = tvb_get_guint8(tvb, 0); diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c index 69d85c0779..93282caa92 100644 --- a/epan/dissectors/packet-ldap.c +++ b/epan/dissectors/packet-ldap.c @@ -2956,8 +2956,7 @@ dissect_ldap_ProtocolOp(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset if(ldap_info->start_tls_pending && !ldap_info->start_tls_frame) { /* XXX: some directories do not correctly return the responseName in the extendedResponse so we don't know start_tls has been negotiated */ - if(check_col(actx->pinfo->cinfo, COL_INFO)) - col_append_fstr(actx->pinfo->cinfo, COL_INFO, "[LDAP_START_TLS_OID responseName missing] "); + col_append_str(actx->pinfo->cinfo, COL_INFO, "[LDAP_START_TLS_OID responseName missing] "); ldap_info->start_tls_frame = (actx->pinfo->fd->num) + 1; } diff --git a/epan/dissectors/packet-ldp.c b/epan/dissectors/packet-ldp.c index 30e01c5cac..83348fec05 100644 --- a/epan/dissectors/packet-ldp.c +++ b/epan/dissectors/packet-ldp.c @@ -2345,8 +2345,7 @@ dissect_msg(tvbuff_t *tvb, guint offset, packet_info *pinfo, proto_tree *tree) rem=tvb_reported_length_remaining(tvb, offset); if( rem < 8 ) {/*chk for minimum header = type + length + msg_id*/ - if( check_col(pinfo->cinfo, COL_INFO) ) - col_append_str(pinfo->cinfo, COL_INFO, "Bad Message"); + col_append_str(pinfo->cinfo, COL_INFO, "Bad Message"); if(tree) proto_tree_add_text(tree, tvb, offset, rem, "Error processing Message: length is %d, should be >= 8", @@ -2371,8 +2370,7 @@ dissect_msg(tvbuff_t *tvb, guint offset, packet_info *pinfo, proto_tree *tree) } if( (length = tvb_get_ntohs(tvb, offset + 2)) < (4+extra) ) {/*not enough data for type*/ - if( check_col(pinfo->cinfo, COL_INFO) ) - col_append_str(pinfo->cinfo, COL_INFO, "Bad Message Length "); + col_append_str(pinfo->cinfo, COL_INFO, "Bad Message Length "); if(tree) proto_tree_add_text(tree, tvb, offset, rem, "Error processing Message Length: length is %d, should be >= %u", diff --git a/epan/dissectors/packet-megaco.c b/epan/dissectors/packet-megaco.c index 85b75e4df3..3472cd15fe 100644 --- a/epan/dissectors/packet-megaco.c +++ b/epan/dissectors/packet-megaco.c @@ -735,22 +735,19 @@ nextcontext: my_proto_tree_add_string(megaco_context_tree, hf_megaco_Context, tvb, tvb_previous_offset, 1, "Choose one"); - if (check_col(pinfo->cinfo, COL_INFO) ) - col_append_str(pinfo->cinfo, COL_INFO, " |=Choose one"); + col_append_str(pinfo->cinfo, COL_INFO, " |=Choose one"); break; case '*': ctx_id = ALL_CONTEXTS; my_proto_tree_add_string(megaco_context_tree, hf_megaco_Context, tvb, tvb_previous_offset, 1, "All"); - if (check_col(pinfo->cinfo, COL_INFO) ) - col_append_str(pinfo->cinfo, COL_INFO, " |=All"); + col_append_str(pinfo->cinfo, COL_INFO, " |=All"); break; case '-': ctx_id = NULL_CONTEXT; proto_tree_add_text(megaco_context_tree, tvb, tvb_previous_offset, tokenlen, "Context: NULL" ); - if (check_col(pinfo->cinfo, COL_INFO) ) - col_append_str(pinfo->cinfo, COL_INFO, " |=NULL"); + col_append_str(pinfo->cinfo, COL_INFO, " |=NULL"); break; default: my_proto_tree_add_string(megaco_context_tree, hf_megaco_Context, tvb, @@ -975,8 +972,7 @@ nextcontext: my_proto_tree_add_string(megaco_tree_command_line, hf_megaco_command, tvb, tvb_command_start_offset, tokenlen, "AuditValue"); - if (check_col(pinfo->cinfo, COL_INFO) ) - col_append_str(pinfo->cinfo, COL_INFO, " AuditValue"); + col_append_str(pinfo->cinfo, COL_INFO, " AuditValue"); break; case 'C': @@ -988,8 +984,7 @@ nextcontext: my_proto_tree_add_string(megaco_tree_command_line, hf_megaco_command, tvb, tvb_command_start_offset, tokenlen, "AuditCapability"); - if (check_col(pinfo->cinfo, COL_INFO) ) - col_append_str(pinfo->cinfo, COL_INFO, " AuditCapability"); + col_append_str(pinfo->cinfo, COL_INFO, " AuditCapability"); break; default: @@ -1002,8 +997,7 @@ nextcontext: my_proto_tree_add_string(megaco_tree_command_line, hf_megaco_command, tvb, tvb_command_start_offset, tokenlen, "Add"); - if (check_col(pinfo->cinfo, COL_INFO) ) - col_append_str(pinfo->cinfo, COL_INFO, " Add"); + col_append_str(pinfo->cinfo, COL_INFO, " Add"); break; } break; @@ -1018,8 +1012,7 @@ nextcontext: my_proto_tree_add_string(megaco_tree_command_line, hf_megaco_command, tvb, tvb_command_start_offset, tokenlen, "Notify"); - if (check_col(pinfo->cinfo, COL_INFO) ) - col_append_str(pinfo->cinfo, COL_INFO, " Notify"); + col_append_str(pinfo->cinfo, COL_INFO, " Notify"); break; case 'M': @@ -1039,8 +1032,7 @@ nextcontext: my_proto_tree_add_string(megaco_tree_command_line, hf_megaco_command, tvb, tvb_command_start_offset, tokenlen, "Modify"); - if (check_col(pinfo->cinfo, COL_INFO) ) - col_append_str(pinfo->cinfo, COL_INFO, " Modify"); + col_append_str(pinfo->cinfo, COL_INFO, " Modify"); break; case 'V': @@ -1052,8 +1044,7 @@ nextcontext: my_proto_tree_add_string(megaco_tree_command_line, hf_megaco_command, tvb, tvb_command_start_offset, tokenlen, "Move"); - if (check_col(pinfo->cinfo, COL_INFO) ) - col_append_str(pinfo->cinfo, COL_INFO, " Move"); + col_append_str(pinfo->cinfo, COL_INFO, " Move"); break; } break; @@ -1121,8 +1112,7 @@ nextcontext: my_proto_tree_add_string(megaco_tree_command_line, hf_megaco_command, tvb, tvb_command_start_offset, tokenlen, "Subtract"); - if (check_col(pinfo->cinfo, COL_INFO) ) - col_append_str(pinfo->cinfo, COL_INFO, " Subtract"); + col_append_str(pinfo->cinfo, COL_INFO, " Subtract"); break; } break; @@ -1271,8 +1261,7 @@ nextcontext: my_proto_tree_add_string(megaco_tree_command_line, hf_megaco_termid, tvb, tvb_offset, tokenlen, "WildCard all"); - if (check_col(pinfo->cinfo, COL_INFO) ) - col_append_str(pinfo->cinfo, COL_INFO, "=*"); + col_append_str(pinfo->cinfo, COL_INFO, "=*"); break; case '$': @@ -1286,8 +1275,7 @@ nextcontext: my_proto_tree_add_string(megaco_tree_command_line, hf_megaco_termid, tvb, tvb_offset, tokenlen, "WildCard any"); - if (check_col(pinfo->cinfo, COL_INFO) ) - col_append_str(pinfo->cinfo, COL_INFO, "=$"); + col_append_str(pinfo->cinfo, COL_INFO, "=$"); break; default: @@ -2096,8 +2084,7 @@ dissect_megaco_signaldescriptor(tvbuff_t *tvb, packet_info *pinfo, proto_tree *m proto_tree_add_text(megaco_tree_command_line, tvb, tvb_signals_start_offset, tokenlen, "%s", "Empty Signal Descriptor"); - if(check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, " (Signal:none)"); /* then say so */ + col_append_str(pinfo->cinfo, COL_INFO, " (Signal:none)"); /* then say so */ return; /* and return */ } diff --git a/epan/dissectors/packet-mikey.c b/epan/dissectors/packet-mikey.c index aea260c99c..70b62797c4 100644 --- a/epan/dissectors/packet-mikey.c +++ b/epan/dissectors/packet-mikey.c @@ -1324,8 +1324,7 @@ dissect_mikey(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item_append_text(ti, ": %s", val_to_str(mikey->type, data_type_vals, "Unknown")); } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_append_str(pinfo->cinfo, COL_PROTOCOL, "/MIKEY"); + col_append_str(pinfo->cinfo, COL_PROTOCOL, "/MIKEY"); if (check_col(pinfo->cinfo, COL_INFO)) col_append_fstr(pinfo->cinfo, COL_INFO, ", Mikey: %s", val_to_str(mikey->type, data_type_vals, "Unknown")); diff --git a/epan/dissectors/packet-mq.c b/epan/dissectors/packet-mq.c index 1419c489c4..0eeda8b46d 100644 --- a/epan/dissectors/packet-mq.c +++ b/epan/dissectors/packet-mq.c @@ -2289,7 +2289,7 @@ dissect_mq_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) else { /* This is a MQ segment continuation (if MQ reassembly is not enabled) */ - if (check_col(pinfo->cinfo, COL_INFO)) col_append_str(pinfo->cinfo, COL_INFO, " [Unreassembled MQ]"); + col_append_str(pinfo->cinfo, COL_INFO, " [Unreassembled MQ]"); call_dissector(data_handle, tvb_new_subset_remaining(tvb, offset), pinfo, tree); } } @@ -2297,7 +2297,7 @@ dissect_mq_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) else { /* This packet is a TCP continuation of a segment (if desegmentation is not enabled) */ - if (check_col(pinfo->cinfo, COL_INFO)) col_append_str(pinfo->cinfo, COL_INFO, " [Undesegmented]"); + col_append_str(pinfo->cinfo, COL_INFO, " [Undesegmented]"); if (tree) { proto_tree_add_item(tree, proto_mq, tvb, offset, -1, FALSE); @@ -2379,7 +2379,7 @@ reassemble_mq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (bFirstSegment) { /* MQ segment is the first of a unreassembled series */ - if (check_col(pinfo->cinfo, COL_INFO)) col_append_str(pinfo->cinfo, COL_INFO, " [Unreassembled MQ]"); + col_append_str(pinfo->cinfo, COL_INFO, " [Unreassembled MQ]"); } return; } diff --git a/epan/dissectors/packet-nas_eps.c b/epan/dissectors/packet-nas_eps.c index 3970a1130a..18fc920f8a 100644 --- a/epan/dissectors/packet-nas_eps.c +++ b/epan/dissectors/packet-nas_eps.c @@ -3896,8 +3896,7 @@ dissect_nas_eps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) len = tvb_length(tvb); /* make entry in the Protocol column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_append_str(pinfo->cinfo, COL_PROTOCOL, "/NAS-EPS"); + col_append_str(pinfo->cinfo, COL_PROTOCOL, "/NAS-EPS"); item = proto_tree_add_item(tree, proto_nas_eps, tvb, 0, -1, FALSE); nas_eps_tree = proto_item_add_subtree(item, ett_nas_eps); diff --git a/epan/dissectors/packet-ndps.c b/epan/dissectors/packet-ndps.c index cd1ae324b9..05d5f2f377 100644 --- a/epan/dissectors/packet-ndps.c +++ b/epan/dissectors/packet-ndps.c @@ -7002,8 +7002,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int if (tvb_length_remaining(tvb, foffset) < 12 && tvb_get_ntohl(tvb, foffset) == 0) /* No error and no return data */ { proto_tree_add_uint(ndps_tree, hf_ndps_error_val, tvb, foffset, 4, error_val); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "- Ok"); + col_append_str(pinfo->cinfo, COL_INFO, "- Ok"); return; } if(ndps_func == 1 || ndps_func == 2) @@ -7015,15 +7014,13 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int } foffset += 4; if (tvb_length_remaining(tvb,foffset) < 4 ) { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "- Error"); + col_append_str(pinfo->cinfo, COL_INFO, "- Error"); return; } proto_tree_add_item(ndps_tree, hf_ndps_rpc_acc_results, tvb, foffset, 4, FALSE); foffset += 4; if (tvb_length_remaining(tvb,foffset) < 4) { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "- Error"); + col_append_str(pinfo->cinfo, COL_INFO, "- Error"); return; } } @@ -7036,12 +7033,10 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int expert_status = tvb_get_ntohl(tvb, foffset); expert_item = proto_tree_add_item(ndps_tree, hf_ndps_return_code, tvb, foffset, 4, FALSE); expert_add_info_format(pinfo, expert_item, PI_RESPONSE_CODE, PI_ERROR, "Fault: %s", val_to_str(expert_status, ndps_error_types, "Unknown NDPS Error (0x%08x)")); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "- Error"); + col_append_str(pinfo->cinfo, COL_INFO, "- Error"); return; } - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "- Ok"); + col_append_str(pinfo->cinfo, COL_INFO, "- Ok"); switch(ndps_prog) { case 0x060976: /* Print */ diff --git a/epan/dissectors/packet-ositp.c b/epan/dissectors/packet-ositp.c index 15c9b424e2..bbd25fc0fd 100644 --- a/epan/dissectors/packet-ositp.c +++ b/epan/dissectors/packet-ositp.c @@ -1561,8 +1561,7 @@ static int ositp_decode_UD(tvbuff_t *tvb, int offset, guint8 li, guint8 tpdu, proto_tree *cltp_tree = NULL; tvbuff_t *next_tvb; - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "UD TPDU"); + col_append_str(pinfo->cinfo, COL_INFO, "UD TPDU"); if (tree) { ti = proto_tree_add_item(tree, proto_cltp, tvb, offset, li + 1, FALSE); @@ -1622,13 +1621,11 @@ static gint dissect_ositp_internal(tvbuff_t *tvb, packet_info *pinfo, while (tvb_offset_exists(tvb, offset)) { if (!first_tpdu) { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, ", "); + col_append_str(pinfo->cinfo, COL_INFO, ", "); expert_add_info_format(pinfo, NULL, PI_SEQUENCE, PI_NOTE, "Multiple TPDUs in one packet"); } if ((li = tvb_get_guint8(tvb, offset + P_LI)) == 0) { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "Length indicator is zero"); + col_append_str(pinfo->cinfo, COL_INFO, "Length indicator is zero"); if (!first_tpdu) call_dissector(data_handle, tvb_new_subset_remaining(tvb, offset), pinfo, tree); diff --git a/epan/dissectors/packet-rrlp.c b/epan/dissectors/packet-rrlp.c index 02182b4694..5790f2684d 100644 --- a/epan/dissectors/packet-rrlp.c +++ b/epan/dissectors/packet-rrlp.c @@ -4558,8 +4558,7 @@ dissect_rrlp_PDU(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_ proto_tree_add_item(tree, proto_rrlp, tvb, 0, -1, FALSE); - if (check_col(actx->pinfo->cinfo, COL_PROTOCOL)) - col_append_str(actx->pinfo->cinfo, COL_PROTOCOL, "/RRLP"); + col_append_str(actx->pinfo->cinfo, COL_PROTOCOL, "/RRLP"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrlp_PDU, PDU_sequence); diff --git a/epan/dissectors/packet-sccp.c b/epan/dissectors/packet-sccp.c index 182b4237ae..bb534d61db 100644 --- a/epan/dissectors/packet-sccp.c +++ b/epan/dissectors/packet-sccp.c @@ -2332,12 +2332,10 @@ dissect_sccp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *sccp_tree, tree); if (frag_msg && frag_msg->next) { /* Reassembled */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "(Message reassembled) "); } else if (more) { /* Not last packet of reassembled message */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "(Message fragment) "); + col_append_str(pinfo->cinfo, COL_INFO, "(Message fragment) "); } pinfo->fragmented = save_fragmented; @@ -2573,11 +2571,9 @@ dissect_sccp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *sccp_tree, NULL, tree); if (frag_msg) { /* Reassembled */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO,"(Message reassembled) "); + col_append_str(pinfo->cinfo, COL_INFO,"(Message reassembled) "); } else { /* Not last packet of reassembled message */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO,"(Message fragment) "); + col_append_str(pinfo->cinfo, COL_INFO,"(Message fragment) "); } pinfo->fragmented = save_fragmented; @@ -2658,12 +2654,10 @@ dissect_sccp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *sccp_tree, NULL, tree); if (frag_msg) { /* Reassembled */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "(Message reassembled) "); } else { /* Not last packet of reassembled message */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "(Message fragment) "); } diff --git a/epan/dissectors/packet-sctp.c b/epan/dissectors/packet-sctp.c index 9bd6f7250a..5b2dbb6478 100644 --- a/epan/dissectors/packet-sctp.c +++ b/epan/dissectors/packet-sctp.c @@ -2197,8 +2197,7 @@ add_fragment(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 tsn, * frame, so it must be a duplicate fragment. maybe a retransmission? * Mark it as duplicate and return NULL */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, " (Duplicate Message Fragment)"); + col_append_str(pinfo->cinfo, COL_INFO, " (Duplicate Message Fragment)"); proto_tree_add_uint(tree, hf_sctp_duplicate, tvb, 0, 0, fragment->frame_num); return NULL; @@ -2370,8 +2369,7 @@ fragment_reassembly(tvbuff_t *tvb, sctp_fragment* fragment, /* this is not the last fragment, * so let the user know the frame where the reassembly is */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, " (Message Fragment) "); + col_append_str(pinfo->cinfo, COL_INFO, " (Message Fragment) "); proto_tree_add_uint(tree, hf_sctp_reassembled_in, tvb, 0, 0, message->reassembled_in->frame_num); return NULL; @@ -2408,8 +2406,7 @@ fragment_reassembly(tvbuff_t *tvb, sctp_fragment* fragment, * just mark as fragment */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, " (Message Fragment) "); + col_append_str(pinfo->cinfo, COL_INFO, " (Message Fragment) "); return NULL; } @@ -2440,8 +2437,7 @@ fragment_reassembly(tvbuff_t *tvb, sctp_fragment* fragment, */ if ((last_frag->tsn + 1)) { /* there are just fragments missing */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, " (Message Fragment) "); + col_append_str(pinfo->cinfo, COL_INFO, " (Message Fragment) "); return NULL; } @@ -2463,8 +2459,7 @@ fragment_reassembly(tvbuff_t *tvb, sctp_fragment* fragment, if (!frag_i || frag_i != end->fragment || frag_i->tsn != (last_frag->tsn + 1)) { /* we need more fragments. just mark as fragment */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, " (Message Fragment) "); + col_append_str(pinfo->cinfo, COL_INFO, " (Message Fragment) "); return NULL; } diff --git a/epan/dissectors/packet-sdp.c b/epan/dissectors/packet-sdp.c index caa91e0edf..397fb75c1b 100644 --- a/epan/dissectors/packet-sdp.c +++ b/epan/dissectors/packet-sdp.c @@ -318,8 +318,7 @@ dissect_sdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * what the protocol inside which the SDP stuff resides * put there. */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_append_str(pinfo->cinfo, COL_PROTOCOL, "/SDP"); + col_append_str(pinfo->cinfo, COL_PROTOCOL, "/SDP"); if (check_col(pinfo->cinfo, COL_INFO)) { /* XXX: Needs description. */ diff --git a/epan/dissectors/packet-sipfrag.c b/epan/dissectors/packet-sipfrag.c index 65b3824668..6f6d0f4f7c 100644 --- a/epan/dissectors/packet-sipfrag.c +++ b/epan/dissectors/packet-sipfrag.c @@ -58,8 +58,7 @@ static void dissect_sipfrag(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) gint lines = 0; /* Append this protocol name rather than replace. */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_append_str(pinfo->cinfo, COL_PROTOCOL, "/sipfrag"); + col_append_str(pinfo->cinfo, COL_PROTOCOL, "/sipfrag"); /* Add mention of this protocol to info column */ col_append_str(pinfo->cinfo, COL_INFO, ", with Sipfrag"); diff --git a/epan/dissectors/packet-socks.c b/epan/dissectors/packet-socks.c index cfbbf53c77..5244fb030c 100644 --- a/epan/dissectors/packet-socks.c +++ b/epan/dissectors/packet-socks.c @@ -695,8 +695,7 @@ state_machine_v4( socks_hash_entry_t *hash_info, tvbuff_t *tvb, if ( hash_info->state == None) { /* new connection */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, " Connect to server request"); + col_append_str(pinfo->cinfo, COL_INFO, " Connect to server request"); hash_info->state = Connecting; /* change state */ @@ -745,8 +744,7 @@ state_machine_v4( socks_hash_entry_t *hash_info, tvbuff_t *tvb, /* waiting for V4 user name */ }else if ( hash_info->state == V4UserNameWait){ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, " Connect Request (User name)"); + col_append_str(pinfo->cinfo, COL_INFO, " Connect Request (User name)"); hash_info->v4_user_name_row = get_packet_ptr; /*XXX may need to check for domain name here */ @@ -761,8 +759,7 @@ state_machine_v4( socks_hash_entry_t *hash_info, tvbuff_t *tvb, } else if ( hash_info->state == Connecting){ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, " Connect Response"); + col_append_str(pinfo->cinfo, COL_INFO, " Connect Response"); /* save packet pointer */ hash_info->cmd_reply_row = get_packet_ptr; @@ -789,8 +786,7 @@ state_machine_v5( socks_hash_entry_t *hash_info, tvbuff_t *tvb, if ( hash_info->state == None) { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, " Connect to server request"); + col_append_str(pinfo->cinfo, COL_INFO, " Connect to server request"); hash_info->state = Connecting; /* change state */ hash_info->connect_row = get_packet_ptr; @@ -803,8 +799,7 @@ state_machine_v5( socks_hash_entry_t *hash_info, tvbuff_t *tvb, guint AuthMethod = tvb_get_guint8(tvb, offset + 1); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, " Connect to server response"); + col_append_str(pinfo->cinfo, COL_INFO, " Connect to server response"); hash_info->auth_method_row = get_packet_ptr; @@ -879,15 +874,13 @@ state_machine_v5( socks_hash_entry_t *hash_info, tvbuff_t *tvb, } else if ( hash_info->state == V5BindReply) { /* V5 Bind Second Reply */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, " Command Response: Bind remote host info"); + col_append_str(pinfo->cinfo, COL_INFO, " Command Response: Bind remote host info"); hash_info->bind_reply_row = get_packet_ptr; hash_info->state = Done; } else if ( hash_info->state == UserNameAuth) { /* Handle V5 User Auth*/ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, " User authentication request"); hash_info->user_name_auth_row = get_packet_ptr; @@ -895,21 +888,18 @@ state_machine_v5( socks_hash_entry_t *hash_info, tvbuff_t *tvb, } else if ( hash_info->state == GssApiAuth) { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, " GSSAPI Authentication request"); hash_info->gssapi_auth_row = get_packet_ptr; hash_info->state = GssApiAuthReply; } else if ( hash_info->state == GssApiAuthReply) { if (tvb_get_guint8(tvb, offset+1) == 0xFF) { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, " GSSAPI Authentication failure"); hash_info->gssapi_auth_failure_row = get_packet_ptr; } else { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, " GSSAPI Authentication reply"); if (tvb_get_ntohs(tvb, offset+2) == 0) hash_info->state = V5Command; @@ -920,8 +910,7 @@ state_machine_v5( socks_hash_entry_t *hash_info, tvbuff_t *tvb, } else if ( hash_info->state == UserNameAuthReply){ /* V5 User Auth reply */ hash_info->auth_version = get_packet_ptr; - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, " User authentication reply"); + col_append_str(pinfo->cinfo, COL_INFO, " User authentication reply"); hash_info->state = V5Command; } } @@ -940,8 +929,7 @@ display_ping_and_tracert(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr /* handle the end command */ if ( pinfo->destport == TCP_PORT_SOCKS){ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, ", Terminate Request"); + col_append_str(pinfo->cinfo, COL_INFO, ", Terminate Request"); if ( tree) proto_tree_add_text(tree, tvb, offset, 1, @@ -950,8 +938,7 @@ display_ping_and_tracert(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr "Traceroute: End command"); } else{ /* display the PING or Traceroute results */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, ", Results"); + col_append_str(pinfo->cinfo, COL_INFO, ", Results"); if ( tree){ proto_tree_add_text(tree, tvb, offset, -1, diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c index 98ab94d556..e719191709 100644 --- a/epan/dissectors/packet-ssl.c +++ b/epan/dissectors/packet-ssl.c @@ -660,8 +660,7 @@ dissect_ssl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * continuation data */ offset = tvb_length(tvb); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Continuation Data"); /* Set the protocol column */ @@ -1254,8 +1253,7 @@ dissect_ssl3_record(tvbuff_t *tvb, packet_info *pinfo, if ((*conv_version==SSL_VER_TLS || *conv_version==SSL_VER_TLSv1DOT1 || *conv_version==SSL_VER_TLSv1DOT2) && (available_bytes >=1 ) && !ssl_is_valid_content_type(tvb_get_guint8(tvb, offset))) { proto_tree_add_text(tree, tvb, offset, available_bytes, "Ignored Unknown Record"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "Ignored Unknown Record"); + col_append_str(pinfo->cinfo, COL_INFO, "Ignored Unknown Record"); if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, ssl_version_short_names[*conv_version]); return offset + available_bytes; @@ -1323,8 +1321,7 @@ dissect_ssl3_record(tvbuff_t *tvb, packet_info *pinfo, /* if we don't have a valid content_type, there's no sense * continuing any further */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "Continuation Data"); + col_append_str(pinfo->cinfo, COL_INFO, "Continuation Data"); /* Set the protocol column */ if (check_col(pinfo->cinfo, COL_PROTOCOL)) @@ -1440,8 +1437,7 @@ dissect_ssl3_record(tvbuff_t *tvb, packet_info *pinfo, switch (content_type) { case SSL_ID_CHG_CIPHER_SPEC: ssl_debug_printf("dissect_ssl3_change_cipher_spec\n"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "Change Cipher Spec"); + col_append_str(pinfo->cinfo, COL_INFO, "Change Cipher Spec"); dissect_ssl3_change_cipher_spec(tvb, ssl_record_tree, offset, conv_version, content_type); if (ssl) ssl_change_cipher(ssl, ssl_packet_from_server(ssl, ssl_associations, pinfo)); @@ -1500,8 +1496,7 @@ dissect_ssl3_record(tvbuff_t *tvb, packet_info *pinfo, } /* show on info colum what we are decoding */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "Application Data"); + col_append_str(pinfo->cinfo, COL_INFO, "Application Data"); /* we need dissector information when the selected packet is shown. * ssl session pointer is NULL at that time, so we can't access @@ -1524,8 +1519,7 @@ dissect_ssl3_record(tvbuff_t *tvb, packet_info *pinfo, default: /* shouldn't get here since we check above for valid types */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "Bad SSLv3 Content Type"); + col_append_str(pinfo->cinfo, COL_INFO, "Bad SSLv3 Content Type"); break; } offset += record_length; /* skip to end of record */ @@ -1601,8 +1595,7 @@ dissect_ssl3_alert(tvbuff_t *tvb, packet_info *pinfo, } else { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "Encrypted Alert"); + col_append_str(pinfo->cinfo, COL_INFO, "Encrypted Alert"); } if (tree) @@ -1705,8 +1698,7 @@ dissect_ssl3_handshake(tvbuff_t *tvb, packet_info *pinfo, /* on second and later iterations, add comma to info col */ if (!first_iteration) { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, ", "); + col_append_str(pinfo->cinfo, COL_INFO, ", "); } /* @@ -2590,8 +2582,7 @@ dissect_ssl2_record(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, PROTO_ITEM_SET_GENERATED(ti); } - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "Encrypted Data"); + col_append_str(pinfo->cinfo, COL_INFO, "Encrypted Data"); return initial_offset + record_length_length + record_length; } else diff --git a/epan/dissectors/packet-t30.c b/epan/dissectors/packet-t30.c index 0abe1a9a06..c610c14cf4 100644 --- a/epan/dissectors/packet-t30.c +++ b/epan/dissectors/packet-t30.c @@ -516,8 +516,7 @@ dissect_t30_numbers(tvbuff_t *tvb, int offset, packet_info *pinfo, int len, prot else { proto_tree_add_text(tree, tvb, offset, tvb_reported_length_remaining(tvb, offset), "[MALFORMED OR SHORT PACKET: number of digits must be 20]"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, " [MALFORMED OR SHORT PACKET: number of digits must be 20]" ); + col_append_str(pinfo->cinfo, COL_INFO, " [MALFORMED OR SHORT PACKET: number of digits must be 20]" ); } } @@ -530,8 +529,7 @@ dissect_t30_facsimile_coded_data(tvbuff_t *tvb, int offset, packet_info *pinfo, if (len < 2) { proto_tree_add_text(tree, tvb, offset, tvb_reported_length_remaining(tvb, offset), "[MALFORMED OR SHORT PACKET: FCD length must be at least 2 bytes]"); expert_add_info_format(pinfo, NULL, PI_MALFORMED, PI_ERROR, "T30 FCD length must be at least 2 bytes"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, " [MALFORMED OR SHORT PACKET]"); + col_append_str(pinfo->cinfo, COL_INFO, " [MALFORMED OR SHORT PACKET]"); return; } @@ -559,8 +557,7 @@ dissect_t30_non_standard_cap(tvbuff_t *tvb, int offset, packet_info *pinfo, int if (len < 2) { proto_tree_add_text(tree, tvb, offset, tvb_reported_length_remaining(tvb, offset), "[MALFORMED OR SHORT PACKET: NSC length must be at least 2 bytes]"); expert_add_info_format(pinfo, NULL, PI_MALFORMED, PI_ERROR, "T30 NSC length must be at least 2 bytes"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, " [MALFORMED OR SHORT PACKET]"); + col_append_str(pinfo->cinfo, COL_INFO, " [MALFORMED OR SHORT PACKET]"); return; } @@ -582,8 +579,7 @@ dissect_t30_partial_page_signal(tvbuff_t *tvb, int offset, packet_info *pinfo, i if (len != 4) { proto_tree_add_text(tree, tvb, offset, tvb_reported_length_remaining(tvb, offset), "[MALFORMED OR SHORT PACKET: PPS length must be 4 bytes]"); expert_add_info_format(pinfo, NULL, PI_MALFORMED, PI_ERROR, "T30 PPS length must be 4 bytes"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, " [MALFORMED OR SHORT PACKET]"); + col_append_str(pinfo->cinfo, COL_INFO, " [MALFORMED OR SHORT PACKET]"); return; } @@ -622,8 +618,7 @@ dissect_t30_dis_dtc(tvbuff_t *tvb, int offset, packet_info *pinfo, int len, prot if (len < 3) { proto_tree_add_text(tree, tvb, offset, tvb_reported_length_remaining(tvb, offset), "[MALFORMED OR SHORT PACKET: DIS length must be at least 4 bytes]"); expert_add_info_format(pinfo, NULL, PI_MALFORMED, PI_ERROR, "T30 DIS length must be at least 4 bytes"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, " [MALFORMED OR SHORT PACKET]"); + col_append_str(pinfo->cinfo, COL_INFO, " [MALFORMED OR SHORT PACKET]"); return; } @@ -878,15 +873,13 @@ dissect_t30_hdlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tvb_reported_length_remaining(tvb, offset) < 3) { proto_tree_add_text(tree, tvb, offset, tvb_reported_length_remaining(tvb, offset), "[MALFORMED OR SHORT PACKET: hdlc T30 length must be at least 4 bytes]"); expert_add_info_format(pinfo, NULL, PI_MALFORMED, PI_ERROR, "T30 length must be at least 4 bytes"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, " (HDLC Reassembled: [MALFORMED OR SHORT PACKET])"); + col_append_str(pinfo->cinfo, COL_INFO, " (HDLC Reassembled: [MALFORMED OR SHORT PACKET])"); return offset; } /* if (tree) { proto_item *item;*/ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, " (HDLC Reassembled:"); + col_append_str(pinfo->cinfo, COL_INFO, " (HDLC Reassembled:"); it=proto_tree_add_protocol_format(tree, proto_t30, tvb, offset, -1, "ITU-T Recommendation T.30"); @@ -946,8 +939,7 @@ dissect_t30_hdlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; } - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, ")"); + col_append_str(pinfo->cinfo, COL_INFO, ")"); /* }*/ diff --git a/epan/dissectors/packet-t38.c b/epan/dissectors/packet-t38.c index 4eafdfacd3..3583901b6d 100644 --- a/epan/dissectors/packet-t38.c +++ b/epan/dissectors/packet-t38.c @@ -613,8 +613,7 @@ dissect_t38_T_field_type(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ data_fragment_table /* list of message fragments */ ); } else { - if (check_col(actx->pinfo->cinfo, COL_INFO)) - col_append_str(actx->pinfo->cinfo, COL_INFO, " (t4-data Reassembled: No packet lost)"); + col_append_str(actx->pinfo->cinfo, COL_INFO, " (t4-data Reassembled: No packet lost)"); g_snprintf(t38_info->desc_comment, MAX_T38_DESC, "No packet lost"); } diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index 6033603826..2976748ad8 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -3353,8 +3353,7 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) PROTO_ITEM_SET_GENERATED(item); expert_add_info_format(pinfo, item, PI_CHECKSUM, PI_WARN, "TCP Checksum 0xffff instead of 0x0000 (see RFC 1624)"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, " [TCP CHECKSUM 0xFFFF]"); + col_append_str(pinfo->cinfo, COL_INFO, " [TCP CHECKSUM 0xFFFF]"); /* Checksum is treated as valid on most systems, so we're willing to desegment it. */ desegment_ok = TRUE; @@ -3402,8 +3401,7 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) PROTO_ITEM_SET_GENERATED(item); expert_add_info_format(pinfo, item, PI_CHECKSUM, PI_ERROR, "Bad checksum"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, " [TCP CHECKSUM INCORRECT]"); + col_append_str(pinfo->cinfo, COL_INFO, " [TCP CHECKSUM INCORRECT]"); /* Checksum is invalid, so we're not willing to desegment it. */ desegment_ok = FALSE; diff --git a/epan/dissectors/packet-tds.c b/epan/dissectors/packet-tds.c index 413570451b..5c6518f0f0 100644 --- a/epan/dissectors/packet-tds.c +++ b/epan/dissectors/packet-tds.c @@ -1647,8 +1647,7 @@ dissect_netlib_buffer(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tds_defragment && (packet_number > 1 || status == STATUS_NOT_LAST_BUFFER)) { if (status == STATUS_NOT_LAST_BUFFER) { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, " (Not last buffer)"); } len = tvb_reported_length_remaining(tvb, offset); diff --git a/epan/dissectors/packet-teamspeak2.c b/epan/dissectors/packet-teamspeak2.c index 74c833f1ab..3e6b9f37ca 100644 --- a/epan/dissectors/packet-teamspeak2.c +++ b/epan/dissectors/packet-teamspeak2.c @@ -433,7 +433,7 @@ static void ts2_standard_dissect(tvbuff_t *tvb, packet_info *pinfo, proto_tree * new_tvb = process_reassembled_data(tvb, 24, pinfo,"Reassembled Message", frag_msg, &msg_frag_items, NULL, ts2_tree); if (frag_msg) { /* Reassembled */ - if (check_col(pinfo->cinfo, COL_INFO)) col_append_str(pinfo->cinfo, COL_INFO, " (Message Reassembled)"); + col_append_str(pinfo->cinfo, COL_INFO, " (Message Reassembled)"); } else { /* Not last packet of reassembled Short Message */ @@ -490,7 +490,7 @@ static void ts2_standard_dissect(tvbuff_t *tvb, packet_info *pinfo, proto_tree * } /* The packet is out of order, update the cinfo and ignore the packet */ if(frag->outoforder) - if (check_col(pinfo->cinfo, COL_INFO)) col_append_str(pinfo->cinfo, COL_INFO, " (Out Of Order, ignored)"); + col_append_str(pinfo->cinfo, COL_INFO, " (Out Of Order, ignored)"); } diff --git a/epan/dissectors/packet-tipc.c b/epan/dissectors/packet-tipc.c index 127d841458..93854a234c 100644 --- a/epan/dissectors/packet-tipc.c +++ b/epan/dissectors/packet-tipc.c @@ -1412,8 +1412,7 @@ dissect_tipc_v2_internal_msg(tvbuff_t *tipc_tvb, proto_tree *tipc_tree, packet_i NULL, tipc_tree); if (frag_msg) { /* Reassembled */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, " (Message Reassembled)"); } else { /* Not last packet of reassembled Short Message */ if (check_col(pinfo->cinfo, COL_INFO)) @@ -1965,8 +1964,7 @@ dissect_tipc_int_prot_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tipc_tr NULL, tipc_tree); if (frag_msg) { /* Reassembled */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, " (Message Reassembled)"); } else { /* Not last packet of reassembled Short Message */ if (check_col(pinfo->cinfo, COL_INFO)) diff --git a/epan/dissectors/packet-vnc.c b/epan/dissectors/packet-vnc.c index 1979275317..99bdcaacaa 100644 --- a/epan/dissectors/packet-vnc.c +++ b/epan/dissectors/packet-vnc.c @@ -1190,8 +1190,7 @@ vnc_server_to_client(tvbuff_t *tvb, packet_info *pinfo, gint *offset, break; default : - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Unknown server message type"); break; } diff --git a/epan/dissectors/packet-wassp.c b/epan/dissectors/packet-wassp.c index 492a288d79..ad685e4f06 100644 --- a/epan/dissectors/packet-wassp.c +++ b/epan/dissectors/packet-wassp.c @@ -760,8 +760,7 @@ dissect_snmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *wassp_tree, PI_MALFORMED, PI_ERROR, "Malformed or short SNMP subpacket"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, " [Malformed or short SNMP subpacket] " ); } ENDTRY; diff --git a/epan/dissectors/packet-x420.c b/epan/dissectors/packet-x420.c index 0d576acdcb..806e3d7537 100644 --- a/epan/dissectors/packet-x420.c +++ b/epan/dissectors/packet-x420.c @@ -1603,8 +1603,7 @@ int dissect_x420_IPM(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 220 "x420.cnf" - if(check_col(actx->pinfo->cinfo, COL_INFO)) - col_append_str(actx->pinfo->cinfo, COL_INFO, " Message"); + col_append_str(actx->pinfo->cinfo, COL_INFO, " Message"); offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, IPM_sequence, hf_index, ett_x420_IPM); @@ -1875,8 +1874,7 @@ int dissect_x420_IPN(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 228 "x420.cnf" - if(check_col(actx->pinfo->cinfo, COL_INFO)) - col_append_str(actx->pinfo->cinfo, COL_INFO, " Notification"); + col_append_str(actx->pinfo->cinfo, COL_INFO, " Notification"); offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset, IPN_set, hf_index, ett_x420_IPN); diff --git a/plugins/ethercat/packet-ams.c b/plugins/ethercat/packet-ams.c index 6ab6b85a10..ca9653ade6 100644 --- a/plugins/ethercat/packet-ams.c +++ b/plugins/ethercat/packet-ams.c @@ -464,8 +464,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { case ADSSRVID_READ: { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "ADS Read Request"); + col_append_str(pinfo->cinfo, COL_INFO, "ADS Read Request"); if( tree ) { @@ -487,8 +486,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case ADSSRVID_WRITE: { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "ADS Write Request"); + col_append_str(pinfo->cinfo, COL_INFO, "ADS Write Request"); if( tree ) { @@ -512,8 +510,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case ADSSRVID_READWRITE: { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "ADS Read Write Request"); + col_append_str(pinfo->cinfo, COL_INFO, "ADS Read Write Request"); if( tree ) { @@ -540,8 +537,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case ADSSRVID_READSTATE: { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "ADS Read State Request"); + col_append_str(pinfo->cinfo, COL_INFO, "ADS Read State Request"); if( tree ) { @@ -556,8 +552,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case ADSSRVID_WRITECTRL: { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "ADS Write Control Request"); + col_append_str(pinfo->cinfo, COL_INFO, "ADS Write Control Request"); if( tree ) { @@ -581,8 +576,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case ADSSRVID_READDEVICEINFO: { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "ADS Read Device Info Request"); + col_append_str(pinfo->cinfo, COL_INFO, "ADS Read Device Info Request"); if( tree ) { @@ -597,8 +591,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case ADSSRVID_ADDDEVICENOTE: { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "ADS Add Device Notification Request"); + col_append_str(pinfo->cinfo, COL_INFO, "ADS Add Device Notification Request"); if( tree ) { @@ -629,8 +622,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case ADSSRVID_DELDEVICENOTE: { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "ADS Delete Device Notification Request"); + col_append_str(pinfo->cinfo, COL_INFO, "ADS Delete Device Notification Request"); if( tree ) { @@ -645,8 +637,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case ADSSRVID_DEVICENOTE: { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "ADS Device Notification Request"); + col_append_str(pinfo->cinfo, COL_INFO, "ADS Device Notification Request"); if( tree ) { @@ -679,8 +670,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { case ADSSRVID_READ: { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "ADS Read Response"); + col_append_str(pinfo->cinfo, COL_INFO, "ADS Read Response"); if( tree ) { @@ -701,8 +691,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case ADSSRVID_WRITE: { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "ADS Write Response"); + col_append_str(pinfo->cinfo, COL_INFO, "ADS Write Response"); if( tree ) { @@ -717,8 +706,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case ADSSRVID_READWRITE: { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "ADS Read Write Response"); + col_append_str(pinfo->cinfo, COL_INFO, "ADS Read Write Response"); if( tree ) { @@ -739,8 +727,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case ADSSRVID_READSTATE: { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "ADS Read State Response"); + col_append_str(pinfo->cinfo, COL_INFO, "ADS Read State Response"); if( tree ) { @@ -761,8 +748,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case ADSSRVID_WRITECTRL: { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "ADS Write Control Response"); + col_append_str(pinfo->cinfo, COL_INFO, "ADS Write Control Response"); if( tree ) { @@ -777,8 +763,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case ADSSRVID_READDEVICEINFO: { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "ADS Read Device Info Response"); + col_append_str(pinfo->cinfo, COL_INFO, "ADS Read Device Info Response"); if( tree ) { @@ -801,8 +786,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case ADSSRVID_ADDDEVICENOTE: { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "ADS Device Notification Response"); + col_append_str(pinfo->cinfo, COL_INFO, "ADS Device Notification Response"); if( tree ) { @@ -820,8 +804,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case ADSSRVID_DELDEVICENOTE: { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "ADS Delete Device Notification Response"); + col_append_str(pinfo->cinfo, COL_INFO, "ADS Delete Device Notification Response"); if( tree ) { diff --git a/plugins/ethercat/packet-ecatmb.c b/plugins/ethercat/packet-ecatmb.c index 57410dec7b..13dc5072eb 100644 --- a/plugins/ethercat/packet-ecatmb.c +++ b/plugins/ethercat/packet-ecatmb.c @@ -601,8 +601,7 @@ static void dissect_ecat_coe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro proto_item_append_text(aparent,":CoE "); } - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "CoE "); + col_append_str(pinfo->cinfo, COL_INFO, "CoE "); if( coe_length >= ETHERCAT_COE_HEADER_LEN ) { @@ -631,8 +630,7 @@ static void dissect_ecat_coe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro if( coe_length < ETHERCAT_COE_HEADER_LEN + ETHERCAT_SDO_HEADER_LEN ) { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "Sdo Req - invalid length"); + col_append_str(pinfo->cinfo, COL_INFO, "Sdo Req - invalid length"); break; } @@ -722,8 +720,7 @@ static void dissect_ecat_coe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro ETHERCAT_SDO_HEADER sdo; if( coe_length < ETHERCAT_COE_HEADER_LEN + ETHERCAT_SDO_HEADER_LEN ) { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "Sdo Res - invalid length"); + col_append_str(pinfo->cinfo, COL_INFO, "Sdo Res - invalid length"); break; } @@ -801,8 +798,7 @@ static void dissect_ecat_coe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro if( coe_length < ETHERCAT_COE_HEADER_LEN + ETHERCAT_SDO_INFO_LISTREQ_LEN ) { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "Sdo Info - invalid length"); + col_append_str(pinfo->cinfo, COL_INFO, "Sdo Info - invalid length"); break; } @@ -919,8 +915,7 @@ static void dissect_ecat_coe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro } else { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "- invalid length"); + col_append_str(pinfo->cinfo, COL_INFO, "- invalid length"); } } @@ -1010,8 +1005,7 @@ static void dissect_ecat_soe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro } else { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "SoE - invalid length"); + col_append_str(pinfo->cinfo, COL_INFO, "SoE - invalid length"); } } @@ -1192,8 +1186,7 @@ static void dissect_ecat_eoe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro } else { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "EoE - invalid length!"); + col_append_str(pinfo->cinfo, COL_INFO, "EoE - invalid length!"); } } @@ -1291,8 +1284,7 @@ static void dissect_ecat_foe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro } else { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "FoE - invalid length"); + col_append_str(pinfo->cinfo, COL_INFO, "FoE - invalid length"); } } @@ -1317,8 +1309,7 @@ static void dissect_ecat_mailbox(tvbuff_t *tvb, packet_info *pinfo, proto_tree * if( mailbox_length >= ETHERCAT_MBOX_HEADER_LEN + hdr.Length ) { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, " Mbx("); + col_append_str(pinfo->cinfo, COL_INFO, " Mbx("); if( tree ) { @@ -1380,8 +1371,7 @@ static void dissect_ecat_mailbox(tvbuff_t *tvb, packet_info *pinfo, proto_tree * anItem = proto_tree_add_item(ecat_mailbox_tree, hf_ecat_mailboxdata, tvb, offset, hdr.Length, TRUE); } - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, ")"); + col_append_str(pinfo->cinfo, COL_INFO, ")"); } } } diff --git a/plugins/profinet/packet-dcerpc-pn-io.c b/plugins/profinet/packet-dcerpc-pn-io.c index 3055a5cb92..00051184a7 100644 --- a/plugins/profinet/packet-dcerpc-pn-io.c +++ b/plugins/profinet/packet-dcerpc-pn-io.c @@ -2225,8 +2225,7 @@ dissect_PNIO_status(tvbuff_t *tvb, int offset, if(u8ErrorCode == 0 && u8ErrorDecode == 0 && u8ErrorCode1 == 0 && u8ErrorCode2 == 0) { proto_item_append_text(sub_item, ": OK"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, ", OK"); + col_append_str(pinfo->cinfo, COL_INFO, ", OK"); } else { proto_item_append_text(sub_item, ": Error: \"%s\", \"%s\", \"%s\", \"%s\"", val_to_str(u8ErrorCode, pn_io_error_code, "(0x%x)"), @@ -2928,8 +2927,7 @@ dissect_Alarm_ack_block(tvbuff_t *tvb, int offset, return offset; } - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, ", Alarm Ack"); + col_append_str(pinfo->cinfo, COL_INFO, ", Alarm Ack"); offset = dissect_Alarm_header(tvb, offset, pinfo, tree, item, drep); @@ -3275,26 +3273,22 @@ dissect_ControlConnect_block(tvbuff_t *tvb, int offset, if(u16Command & 0x0001) { proto_item_append_text(sub_item, ", ParameterEnd"); proto_item_append_text(item, " ParameterEnd"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, ", Command: ParameterEnd"); + col_append_str(pinfo->cinfo, COL_INFO, ", Command: ParameterEnd"); } if(u16Command & 0x0002) { proto_item_append_text(sub_item, ", ApplicationReady"); proto_item_append_text(item, " ApplicationReady"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, ", Command: ApplicationReady"); + col_append_str(pinfo->cinfo, COL_INFO, ", Command: ApplicationReady"); } if(u16Command & 0x0004) { proto_item_append_text(sub_item, ", Release"); proto_item_append_text(item, " Release"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, ", Command: Release"); + col_append_str(pinfo->cinfo, COL_INFO, ", Command: Release"); } if(u16Command & 0x0008) { proto_item_append_text(sub_item, ", Done"); proto_item_append_text(item, ", Done"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, ", Command: Done"); + col_append_str(pinfo->cinfo, COL_INFO, ", Command: Done"); } proto_item_append_text(item, ", Properties:0x%x", u16Properties); @@ -7289,23 +7283,19 @@ dissect_PNIO_RTA(tvbuff_t *tvb, int offset, switch(u8PDUType & 0x0F) { case(1): /* Data-RTA */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, ", Data-RTA"); + col_append_str(pinfo->cinfo, COL_INFO, ", Data-RTA"); offset = dissect_block(tvb, offset, pinfo, rta_tree, drep, &u16Index, &u32RecDataLen, &ar); break; case(2): /* NACK-RTA */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, ", NACK-RTA"); + col_append_str(pinfo->cinfo, COL_INFO, ", NACK-RTA"); /* no additional data */ break; case(3): /* ACK-RTA */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, ", ACK-RTA"); + col_append_str(pinfo->cinfo, COL_INFO, ", ACK-RTA"); /* no additional data */ break; case(4): /* ERR-RTA */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, ", ERR-RTA"); + col_append_str(pinfo->cinfo, COL_INFO, ", ERR-RTA"); offset = dissect_PNIO_status(tvb, offset, pinfo, rta_tree, drep); break; default: diff --git a/plugins/profinet/packet-pn-mrp.c b/plugins/profinet/packet-pn-mrp.c index 2aff5279c4..48d25a2832 100644 --- a/plugins/profinet/packet-pn-mrp.c +++ b/plugins/profinet/packet-pn-mrp.c @@ -126,8 +126,7 @@ dissect_PNMRP_Common(tvbuff_t *tvb, int offset, /* MRP_DomainUUID */ offset = dissect_pn_uuid(tvb, offset, pinfo, tree, hf_pn_mrp_domain_uuid, &uuid); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, "Common"); + col_append_str(pinfo->cinfo, COL_INFO, "Common"); proto_item_append_text(item, "Common"); @@ -156,8 +155,7 @@ dissect_PNMRP_LinkUp(tvbuff_t *tvb, int offset, /* Padding */ offset = dissect_pn_align4(tvb, offset, pinfo, tree); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, "LinkUp"); + col_append_str(pinfo->cinfo, COL_INFO, "LinkUp"); proto_item_append_text(item, "LinkUp"); @@ -186,8 +184,7 @@ dissect_PNMRP_LinkDown(tvbuff_t *tvb, int offset, /* Padding */ offset = dissect_pn_align4(tvb, offset, pinfo, tree); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, "LinkDown"); + col_append_str(pinfo->cinfo, COL_INFO, "LinkDown"); proto_item_append_text(item, "LinkDown"); @@ -228,8 +225,7 @@ dissect_PNMRP_Test(tvbuff_t *tvb, int offset, /* Padding */ offset = dissect_pn_align4(tvb, offset, pinfo, tree); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, "Test"); + col_append_str(pinfo->cinfo, COL_INFO, "Test"); proto_item_append_text(item, "Test"); @@ -258,8 +254,7 @@ dissect_PNMRP_TopologyChange(tvbuff_t *tvb, int offset, /* Padding */ /*offset = dissect_pn_align4(tvb, offset, pinfo, tree);*/ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, "TopologyChange"); + col_append_str(pinfo->cinfo, COL_INFO, "TopologyChange"); proto_item_append_text(item, "TopologyChange"); @@ -290,15 +285,13 @@ dissect_PNMRP_Option(tvbuff_t *tvb, int offset, if(length != 0) { offset = dissect_pn_undecoded(tvb, offset, pinfo, tree, length); } - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, "Option(Siemens)"); + col_append_str(pinfo->cinfo, COL_INFO, "Option(Siemens)"); break; default: proto_item_append_text(item, "Option(Unknown-OUI)"); offset = dissect_pn_undecoded(tvb, offset, pinfo, tree, length); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, "Option"); + col_append_str(pinfo->cinfo, COL_INFO, "Option"); } offset += length; @@ -337,8 +330,7 @@ dissect_PNMRP_PDU(tvbuff_t *tvb, int offset, offset = dissect_pn_uint8(tvb_new, offset, pinfo, tree, hf_pn_mrp_length, &length); if(i != 0) { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, ", "); + col_append_str(pinfo->cinfo, COL_INFO, ", "); proto_item_append_text(item, ", "); } @@ -346,8 +338,7 @@ dissect_PNMRP_PDU(tvbuff_t *tvb, int offset, switch(type) { case(0x00): /* no content */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, "End"); + col_append_str(pinfo->cinfo, COL_INFO, "End"); proto_item_append_text(item, "End"); return offset; break; diff --git a/plugins/profinet/packet-pn-mrrt.c b/plugins/profinet/packet-pn-mrrt.c index 8037b874dc..c5c48fdeda 100644 --- a/plugins/profinet/packet-pn-mrrt.c +++ b/plugins/profinet/packet-pn-mrrt.c @@ -81,8 +81,7 @@ dissect_PNMRRT_Common(tvbuff_t *tvb, int offset, /* MRRT_DomainUUID */ offset = dissect_pn_uuid(tvb, offset, pinfo, tree, hf_pn_mrrt_domain_uuid, &uuid); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, "Common"); + col_append_str(pinfo->cinfo, COL_INFO, "Common"); proto_item_append_text(item, "Common"); @@ -103,8 +102,7 @@ dissect_PNMRRT_Test(tvbuff_t *tvb, int offset, /* Padding */ offset = dissect_pn_align4(tvb, offset, pinfo, tree); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, "Test"); + col_append_str(pinfo->cinfo, COL_INFO, "Test"); proto_item_append_text(item, "Test"); @@ -133,8 +131,7 @@ dissect_PNMRRT_PDU(tvbuff_t *tvb, int offset, if(i != 0) { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, ", "); + col_append_str(pinfo->cinfo, COL_INFO, ", "); proto_item_append_text(item, ", "); } @@ -144,8 +141,7 @@ dissect_PNMRRT_PDU(tvbuff_t *tvb, int offset, switch(type) { case(0x00): /* no content */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, "End"); + col_append_str(pinfo->cinfo, COL_INFO, "End"); proto_item_append_text(item, "End"); return offset; break; diff --git a/plugins/wimax/mac_mgmt_msg_decoder.c b/plugins/wimax/mac_mgmt_msg_decoder.c index 1f8c137ef5..f1dcaebe6e 100644 --- a/plugins/wimax/mac_mgmt_msg_decoder.c +++ b/plugins/wimax/mac_mgmt_msg_decoder.c @@ -218,8 +218,7 @@ void dissect_mac_mgmt_msg_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree } else { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "Unknown message type,"); + col_append_str(pinfo->cinfo, COL_INFO, "Unknown message type,"); /* display MAC payload types */ message_item = proto_tree_add_protocol_format(tree, proto_mac_mgmt_msg_decoder, tvb, offset, tvb_len, "Unknown message type: %u (%u bytes)", message_type, tvb_len); /* add MAC payload subtree */ |