diff options
author | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-08-09 06:26:46 +0000 |
---|---|---|
committer | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-08-09 06:26:46 +0000 |
commit | d9503878072210dc1b03da41b9c5ecaea8cb22f7 (patch) | |
tree | 13a89a4bf6146b1bbe2afde85c3544eee651ca78 /epan/dissectors/packet-tacacs.c | |
parent | 761b3cce77c05a4c2073749490bd0d1aed1d6e5f (diff) |
Don't guard col_set_str (COL_PROTOCOL) with col_check
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29340 f5534014-38df-0310-8fa8-9805f1628bb7
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)) { |