diff options
author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-09 07:36:13 +0000 |
---|---|---|
committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-09 07:36:13 +0000 |
commit | 0a5b014cecf14ec1bea5c87b0ffb5c2f7fa366a1 (patch) | |
tree | 794b4645cb56dead798fc6435eb6b0f741fe19c0 /epan/dissectors/packet-ipsec.c | |
parent | 5d5a5442d678c9a2f6a66522cc00013d3476cda6 (diff) |
Don't guard col_clear with col_check
svn path=/trunk/; revision=29344
Diffstat (limited to 'epan/dissectors/packet-ipsec.c')
-rw-r--r-- | epan/dissectors/packet-ipsec.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/epan/dissectors/packet-ipsec.c b/epan/dissectors/packet-ipsec.c index 08b5d5edb3..081a05830e 100644 --- a/epan/dissectors/packet-ipsec.c +++ b/epan/dissectors/packet-ipsec.c @@ -1405,8 +1405,7 @@ dissect_ah_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int advance; col_set_str(pinfo->cinfo, COL_PROTOCOL, "AH"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_clear(pinfo->cinfo, COL_INFO); + col_clear(pinfo->cinfo, COL_INFO); tvb_memcpy(tvb, (guint8 *)&ah, 0, sizeof(ah)); advance = sizeof(ah) + ((ah.ah_len - 1) << 2); @@ -1590,8 +1589,7 @@ dissect_esp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) #endif col_set_str(pinfo->cinfo, COL_PROTOCOL, "ESP"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_clear(pinfo->cinfo, COL_INFO); + col_clear(pinfo->cinfo, COL_INFO); tvb_memcpy(tvb, (guint8 *)&esp, 0, sizeof(esp)); @@ -2612,8 +2610,7 @@ dissect_ipcomp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * the next protocol in the stack */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPComp"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_clear(pinfo->cinfo, COL_INFO); + col_clear(pinfo->cinfo, COL_INFO); tvb_memcpy(tvb, (guint8 *)&ipcomp, 0, sizeof(ipcomp)); |