diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2011-09-27 12:05:32 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2011-09-27 12:05:32 +0000 |
| commit | 0f2e6c6cc564536c6b7252bdf10d0a6af740afe6 (patch) | |
| tree | ebe659ee68bac8dfe3b2a17f5f0aef8b491af7cc /asn1/tcap | |
| parent | 00e46951ad2d2a4e4f6f703f4e2150478f7df53d (diff) | |
Get rid of check_col, while at it set ENC.
svn path=/trunk/; revision=39164
Diffstat (limited to 'asn1/tcap')
| -rw-r--r-- | asn1/tcap/packet-tcap-template.c | 2 | ||||
| -rw-r--r-- | asn1/tcap/tcap.cnf | 16 |
2 files changed, 7 insertions, 11 deletions
diff --git a/asn1/tcap/packet-tcap-template.c b/asn1/tcap/packet-tcap-template.c index 673cf092f5..5034d15d1a 100644 --- a/asn1/tcap/packet-tcap-template.c +++ b/asn1/tcap/packet-tcap-template.c @@ -204,7 +204,7 @@ dissect_tcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) /* create display subtree for the protocol */ if(parent_tree){ - item = proto_tree_add_item(parent_tree, proto_tcap, tvb, 0, -1, FALSE); + item = proto_tree_add_item(parent_tree, proto_tcap, tvb, 0, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_tcap); tcap_stat_tree=tree; } diff --git a/asn1/tcap/tcap.cnf b/asn1/tcap/tcap.cnf index d0d39c28e0..74b9f06ccd 100644 --- a/asn1/tcap/tcap.cnf +++ b/asn1/tcap/tcap.cnf @@ -141,7 +141,7 @@ if (parameter_tvb){ break; } - if ((len)&&(check_col(actx->pinfo->cinfo, COL_INFO))){ + if (len){ col_append_str(actx->pinfo->cinfo, COL_INFO, "otid("); for(i=0;i<len;i++) col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%%02x",tvb_get_guint8(parameter_tvb,i)); @@ -180,7 +180,7 @@ if (parameter_tvb){ break; } - if ((len)&&(check_col(actx->pinfo->cinfo, COL_INFO))){ + if (len){ col_append_str(actx->pinfo->cinfo, COL_INFO, "dtid("); for(i=0;i<len;i++) col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%%02x",tvb_get_guint8(parameter_tvb,i)); @@ -197,30 +197,26 @@ gp_tcapsrt_info->ope=TC_BEGIN; * If there's something there that should not be overwritten, whoever * put that info there should call col_set_fence() to protect it. */ -if (check_col(actx->pinfo->cinfo, COL_INFO)) - col_set_str(actx->pinfo->cinfo, COL_INFO, "Begin "); + col_set_str(actx->pinfo->cinfo, COL_INFO, "Begin "); #.END #.FN_HDR End gp_tcapsrt_info->ope=TC_END; -if (check_col(actx->pinfo->cinfo, COL_INFO)) - col_set_str(actx->pinfo->cinfo, COL_INFO, "End "); + col_set_str(actx->pinfo->cinfo, COL_INFO, "End "); #.END #.FN_HDR Continue gp_tcapsrt_info->ope=TC_CONT; -if (check_col(actx->pinfo->cinfo, COL_INFO)) - col_set_str(actx->pinfo->cinfo, COL_INFO, "Continue "); + col_set_str(actx->pinfo->cinfo, COL_INFO, "Continue "); #.END #.FN_HDR Abort gp_tcapsrt_info->ope=TC_ABORT; -if (check_col(actx->pinfo->cinfo, COL_INFO)) - col_set_str(actx->pinfo->cinfo, COL_INFO, "Abort "); + col_set_str(actx->pinfo->cinfo, COL_INFO, "Abort "); #.END |