aboutsummaryrefslogtreecommitdiffstats
path: root/asn1
diff options
context:
space:
mode:
Diffstat (limited to 'asn1')
-rw-r--r--asn1/inap/inap.cnf4
-rw-r--r--asn1/ldap/ldap.cnf29
-rw-r--r--asn1/mms/mms.cnf3
-rw-r--r--asn1/mpeg-audio/packet-mpeg-audio-template.c13
4 files changed, 16 insertions, 33 deletions
diff --git a/asn1/inap/inap.cnf b/asn1/inap/inap.cnf
index 1d84b6eaba..333d7d5e3b 100644
--- a/asn1/inap/inap.cnf
+++ b/asn1/inap/inap.cnf
@@ -165,19 +165,15 @@ static const inap_err_t inap_err_tab[] = {
%(DEFAULT_BODY)s
if (inap_opcode_type == INAP_OPCODE_RETURN_ERROR){
errorCode = opcode;
- if (check_col(actx->pinfo->cinfo, COL_INFO)){
col_append_str(actx->pinfo->cinfo, COL_INFO,
val_to_str(errorCode, inap_err_code_string_vals, "Unknown INAP error (%%u)"));
col_append_str(actx->pinfo->cinfo, COL_INFO, " ");
col_set_fence(actx->pinfo->cinfo, COL_INFO);
- }
}else{
- if (check_col(actx->pinfo->cinfo, COL_INFO)){
col_append_str(actx->pinfo->cinfo, COL_INFO,
val_to_str(opcode, inap_opr_code_strings, "Unknown INAP (%%u)"));
col_append_str(actx->pinfo->cinfo, COL_INFO, " ");
col_set_fence(actx->pinfo->cinfo, COL_INFO);
- }
}
#.FN_HDR Invoke
diff --git a/asn1/ldap/ldap.cnf b/asn1/ldap/ldap.cnf
index ff7a59e444..2c1ae2f89c 100644
--- a/asn1/ldap/ldap.cnf
+++ b/asn1/ldap/ldap.cnf
@@ -72,9 +72,7 @@ PasswordPolicyResponseValue B "1.3.6.1.4.1.42.2.27.8.5.1" "passwordPolicy"
if((hf_index == hf_ldap_requestName) || (hf_index == hf_ldap_responseName)) {
ldap_do_protocolop(actx->pinfo);
-
- if(check_col(actx->pinfo->cinfo, COL_INFO))
- col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%s ", name);
+ col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%s ", name);
}
}
@@ -139,8 +137,7 @@ PasswordPolicyResponseValue B "1.3.6.1.4.1.42.2.27.8.5.1" "passwordPolicy"
case LDAP_RES_SEARCH_RESULT:
- if (check_col(actx->pinfo->cinfo, COL_INFO))
- col_append_fstr(actx->pinfo->cinfo, COL_INFO, " [%d result%s]",
+ col_append_fstr(actx->pinfo->cinfo, COL_INFO, " [%d result%s]",
ldap_info->num_results, ldap_info->num_results == 1 ? "" : "s");
proto_item_append_text(tree, " [%d result%s]",
@@ -342,8 +339,7 @@ ldap_conv_info_t *ldap_info;
if(!ldapstring || !*ldapstring)
ldapstring = "<ROOT>";
- if(check_col(actx->pinfo->cinfo, COL_INFO))
- col_append_fstr(actx->pinfo->cinfo, COL_INFO, "\"%%s\" ", ldapstring);
+ col_append_fstr(actx->pinfo->cinfo, COL_INFO, "\"%%s\" ", ldapstring);
if(ldm_tree)
proto_item_append_text(ldm_tree, " \"%%s\"", ldapstring);
@@ -355,8 +351,7 @@ ldap_conv_info_t *ldap_info;
}
} else if ((hf_index == hf_ldap_errorMessage) && ldapstring && *ldapstring) { /* only show message if not success */
- if(check_col(actx->pinfo->cinfo, COL_INFO))
- col_append_fstr(actx->pinfo->cinfo, COL_INFO, "(%%s) ", ldapstring);
+ col_append_fstr(actx->pinfo->cinfo, COL_INFO, "(%%s) ", ldapstring);
if(ldm_tree)
proto_item_append_text(ldm_tree, " (%%s)", ldapstring);
@@ -370,10 +365,9 @@ ldap_conv_info_t *ldap_info;
if(!ldapstring || !*ldapstring)
ldapstring = "<ROOT>";
- if(check_col(actx->pinfo->cinfo, COL_INFO))
- col_append_fstr(actx->pinfo->cinfo, COL_INFO, "\"%%s\" ", ldapstring);
+ col_append_fstr(actx->pinfo->cinfo, COL_INFO, "\"%%s\" ", ldapstring);
- if(ldm_tree)
+ if(ldm_tree)
proto_item_append_text(ldm_tree, " \"%%s\"", ldapstring);
} else if (hf_index == hf_ldap_attributeDesc){
/* remember the attribute description */
@@ -425,8 +419,7 @@ ldap_conv_info_t *ldap_info;
valstr = val_to_str(scope, ldap_T_scope_vals, "Unknown scope(%%u)");
- if (check_col(actx->pinfo->cinfo, COL_INFO))
- col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%%s ", valstr);
+ col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%%s ", valstr);
if(ldm_tree)
proto_item_append_text(ldm_tree, " %%s", valstr);
@@ -441,8 +434,7 @@ ldap_conv_info_t *ldap_info;
valstr = val_to_str(result, ldap_T_resultCode_vals, "Unknown result(%%u)");
- if (check_col(actx->pinfo->cinfo, COL_INFO))
- col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%%s ", valstr);
+ col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%%s ", valstr);
if(ldm_tree)
proto_item_append_text(ldm_tree, " %%s", valstr);
@@ -458,8 +450,7 @@ ldap_conv_info_t *ldap_info;
valstr = val_to_str(result, ldap_BindResponse_resultCode_vals, "Unknown result(%%u)");
- if (check_col(actx->pinfo->cinfo, COL_INFO))
- col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%%s ", valstr);
+ col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%%s ", valstr);
if(ldm_tree)
proto_item_append_text(ldm_tree, " %%s", valstr);
@@ -513,7 +504,7 @@ ldap_conv_info_t *ldap_info;
valstr = val_to_str(auth, ldap_AuthenticationChoice_vals, "Unknown auth(%%u)");
/* If auth is NTLM (10 or 11) don't add to column as the NTLM dissection will do this */
- if (check_col(actx->pinfo->cinfo, COL_INFO) && (auth != 10) && (auth != 11))
+ if ((auth != 10) && (auth != 11))
col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%%s ", valstr);
if(ldm_tree)
diff --git a/asn1/mms/mms.cnf b/asn1/mms/mms.cnf
index 31bdc47d1b..a3f91321b9 100644
--- a/asn1/mms/mms.cnf
+++ b/asn1/mms/mms.cnf
@@ -40,8 +40,7 @@ TimeOfDay TYPE = FT_STRING DISPLAY = BASE_NONE
%(DEFAULT_BODY)s
if( (branch_taken!=-1) && mms_MMSpdu_vals[branch_taken].strptr ){
- if(check_col(actx->pinfo->cinfo, COL_INFO))
- col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%%s ", mms_MMSpdu_vals[branch_taken].strptr);
+ col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%%s ", mms_MMSpdu_vals[branch_taken].strptr);
}
diff --git a/asn1/mpeg-audio/packet-mpeg-audio-template.c b/asn1/mpeg-audio/packet-mpeg-audio-template.c
index 80838fab1f..9253473e4d 100644
--- a/asn1/mpeg-audio/packet-mpeg-audio-template.c
+++ b/asn1/mpeg-audio/packet-mpeg-audio-template.c
@@ -57,6 +57,7 @@ dissect_mpeg_audio_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
int data_size = 0;
asn1_ctx_t asn1_ctx;
int offset = 0;
+ static const char *version_names[] = { "1", "2", "2.5" };
if (!tvb_bytes_exist(tvb, 0, 4))
return FALSE; /* not enough data for an MPEG audio frame */
@@ -69,14 +70,10 @@ dissect_mpeg_audio_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
return FALSE;
if (!MPA_LAYER_VALID(&mpa))
return FALSE;
-
- if (check_col(pinfo->cinfo, COL_PROTOCOL)) {
- static const char *version_names[] = { "1", "2", "2.5" };
- col_add_fstr(pinfo->cinfo, COL_PROTOCOL,
- "MPEG-%s", version_names[mpa_version(&mpa)]);
- }
- if (check_col(pinfo->cinfo, COL_INFO))
- col_add_fstr(pinfo->cinfo, COL_INFO,
+
+ col_add_fstr(pinfo->cinfo, COL_PROTOCOL,
+ "MPEG-%s", version_names[mpa_version(&mpa)]);
+ col_add_fstr(pinfo->cinfo, COL_INFO,
"Audio Layer %d", mpa_layer(&mpa) + 1);
if (MPA_BITRATE_VALID(&mpa) && MPA_FREQUENCY_VALID(&mpa)) {
data_size = (int)(MPA_DATA_BYTES(&mpa) - sizeof mpa);
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-26 07:40:22 +0000