diff options
| author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-09 06:26:46 +0000 |
|---|---|---|
| committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-09 06:26:46 +0000 |
| commit | e971354a546be5efc284c72e49689a2e337bc198 (patch) | |
| tree | 13a89a4bf6146b1bbe2afde85c3544eee651ca78 /epan/dissectors/packet-tacacs.c | |
| parent | fc067ab9104d12f3683c8f112250b8523260b77f (diff) | |
Don't guard col_set_str (COL_PROTOCOL) with col_check
svn path=/trunk/; revision=29340
Diffstat (limited to 'epan/dissectors/packet-tacacs.c')
| -rw-r--r-- | epan/dissectors/packet-tacacs.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/epan/dissectors/packet-tacacs.c b/epan/dissectors/packet-tacacs.c index 7db446a5e1..d2356e6842 100644 --- a/epan/dissectors/packet-tacacs.c +++ b/epan/dissectors/packet-tacacs.c @@ -155,15 +155,13 @@ dissect_tacacs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *ti; guint8 txt_buff[255+1],version,type,userlen,passlen; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "TACACS"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "TACACS"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); version = tvb_get_guint8(tvb,0); if (version != 0) { - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "XTACACS"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "XTACACS"); } type = tvb_get_guint8(tvb,1); @@ -940,8 +938,7 @@ dissect_tacplus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } else { key=find_key( &pinfo->src, &pinfo->dst ); } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "TACACS+"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "TACACS+"); if (check_col(pinfo->cinfo, COL_INFO)) { |