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-socks.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-socks.c')
-rw-r--r-- | epan/dissectors/packet-socks.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/epan/dissectors/packet-socks.c b/epan/dissectors/packet-socks.c index 3cfa75f83b..af4b06bf95 100644 --- a/epan/dissectors/packet-socks.c +++ b/epan/dissectors/packet-socks.c @@ -391,8 +391,7 @@ socks_udp_dissector(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { hash_info = conversation_get_proto_data(conversation, proto_socks); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Socks"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Socks"); if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Version: 5, UDP Associated packet"); @@ -1084,8 +1083,7 @@ dissect_socks(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { /* display summary window information */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Socks"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Socks"); if (check_col(pinfo->cinfo, COL_INFO)){ if (( hash_info->version == 4) || ( hash_info->version == 5)){ |