diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-06-14 12:44:50 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-06-14 12:44:50 +0000 |
| commit | 2dbf6c59a2f5d99d3dc8ea3d2ffa409ef2eb611a (patch) | |
| tree | c021a26288d3d501a3dbb8de190cdc6a8e40ffa1 /asn1/p1 | |
| parent | 875040ec1e304110b2a7f1a6e9ead855d3be2e6f (diff) | |
Remove check_col() from ASN.1 dissectors
svn path=/trunk/; revision=49927
Diffstat (limited to 'asn1/p1')
| -rw-r--r-- | asn1/p1/p1.cnf | 16 | ||||
| -rw-r--r-- | asn1/p1/packet-p1-template.c | 3 |
2 files changed, 7 insertions, 12 deletions
diff --git a/asn1/p1/p1.cnf b/asn1/p1/p1.cnf index 1c9a6160f7..1c6b44a91e 100644 --- a/asn1/p1/p1.cnf +++ b/asn1/p1/p1.cnf @@ -689,7 +689,7 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token" } else { - if (check_col(actx->pinfo->cinfo, COL_INFO) && mtaname) { + if (mtaname) { col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", tvb_format_text(mtaname, 0, tvb_length(mtaname))); } @@ -1093,7 +1093,7 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token" if(*oraddress) { proto_item_append_text(address_item, " (%%s/", oraddress); - if(doing_subjectid && check_col(actx->pinfo->cinfo, COL_INFO)) { + if(doing_subjectid) { col_append_fstr(actx->pinfo->cinfo, COL_INFO, " (%%s/", oraddress); } } @@ -1111,7 +1111,7 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token" if(doing_address) proto_item_append_text(address_item, " $ %%s)", tvb_format_text(id, 0, tvb_length(id))); - if(doing_subjectid && check_col(actx->pinfo->cinfo, COL_INFO)) + if(doing_subjectid) col_append_fstr(actx->pinfo->cinfo, COL_INFO, " $ %%s)", tvb_format_text(id, 0, tvb_length(id))); } @@ -1206,7 +1206,7 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token" #.FN_BODY MTABindError int error = -1; %(DEFAULT_BODY)s - if((error != -1) && check_col(actx->pinfo->cinfo, COL_INFO)) + if((error != -1)) col_append_fstr(actx->pinfo->cinfo, COL_INFO, " (%%s)", val_to_str(error, p1_MTABindError_vals, "error(%%d)")); #.FN_PARS TokenTypeIdentifier @@ -1226,9 +1226,7 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token" %(DEFAULT_BODY)s if( (credentials!=-1) && p1_Credentials_vals[credentials].strptr ){ - if (check_col(actx->pinfo->cinfo, COL_INFO)) { - col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", p1_Credentials_vals[credentials].strptr); - } + col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", p1_Credentials_vals[credentials].strptr); } #.FN_PARS TokenDataType @@ -1274,7 +1272,7 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token" %(DEFAULT_BODY)s if( (apdu!=-1) && p1_MTS_APDU_vals[apdu].strptr ){ - if(check_col(actx->pinfo->cinfo, COL_INFO) && (apdu != 0)) { /* we don't show "message" - sub-dissectors have better idea */ + if(apdu != 0) { /* we don't show "message" - sub-dissectors have better idea */ col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", p1_MTS_APDU_vals[apdu].strptr); } } @@ -1288,9 +1286,7 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token" %(DEFAULT_BODY)s if( (report!=-1) && p1_ReportType_vals[report].strptr ){ - if(check_col(actx->pinfo->cinfo, COL_INFO)) { col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", p1_ReportType_vals[report].strptr); - } } #.FN_BODY MessageSubmissionArgument diff --git a/asn1/p1/packet-p1-template.c b/asn1/p1/packet-p1-template.c index bee6d586ca..cb6cb2a8c8 100644 --- a/asn1/p1/packet-p1-template.c +++ b/asn1/p1/packet-p1-template.c @@ -218,8 +218,7 @@ dissect_p1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) return; } - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, p1_op_name); + col_set_str(pinfo->cinfo, COL_INFO, p1_op_name); while (tvb_reported_length_remaining(tvb, offset) > 0){ old_offset=offset; |