diff options
Diffstat (limited to 'epan/dissectors/packet-ipsec.c')
| -rw-r--r-- | epan/dissectors/packet-ipsec.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/epan/dissectors/packet-ipsec.c b/epan/dissectors/packet-ipsec.c index 8454c7898e..37fc7393b4 100644 --- a/epan/dissectors/packet-ipsec.c +++ b/epan/dissectors/packet-ipsec.c @@ -889,10 +889,8 @@ dissect_ah_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tvb_memcpy(tvb, (guint8 *)&ah, 0, sizeof(ah)); advance = (int)sizeof(ah) + ((ah.ah_len - 1) << 2); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_add_fstr(pinfo->cinfo, COL_INFO, "AH (SPI=0x%08x)", + col_add_fstr(pinfo->cinfo, COL_INFO, "AH (SPI=0x%08x)", (guint32)g_ntohl(ah.ah_spi)); - } if (tree) { /* !!! specify length */ @@ -1089,10 +1087,8 @@ dissect_esp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb_memcpy(tvb, (guint8 *)&esp, 0, sizeof(esp)); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_add_fstr(pinfo->cinfo, COL_INFO, "ESP (SPI=0x%08x)", - (guint32)g_ntohl(esp.esp_spi)); - } + col_add_fstr(pinfo->cinfo, COL_INFO, "ESP (SPI=0x%08x)", + (guint32)g_ntohl(esp.esp_spi)); /* @@ -1966,13 +1962,11 @@ dissect_ipcomp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb_memcpy(tvb, (guint8 *)&ipcomp, 0, sizeof(ipcomp)); - if (check_col(pinfo->cinfo, COL_INFO)) { - p = try_val_to_str(g_ntohs(ipcomp.comp_cpi), cpi2val); - if (p == NULL) { - col_add_fstr(pinfo->cinfo, COL_INFO, "IPComp (CPI=0x%04x)", - g_ntohs(ipcomp.comp_cpi)); - } else - col_add_fstr(pinfo->cinfo, COL_INFO, "IPComp (CPI=%s)", p); + p = try_val_to_str(g_ntohs(ipcomp.comp_cpi), cpi2val); + if (p == NULL) { + col_add_fstr(pinfo->cinfo, COL_INFO, "IPComp (CPI=0x%04x)", g_ntohs(ipcomp.comp_cpi)); + } else { + col_add_fstr(pinfo->cinfo, COL_INFO, "IPComp (CPI=%s)", p); } /* |