Add program_name field in the netdissect_options structure

[tcpdump] / print-esp.c

diff --git a/print-esp.c b/print-esp.c
index 241030204b293743acc50e8c53f68451202ebb67..fe494a39e81ff6384acc71ea082b2343b90590f0 100644 (file)
--- a/print-esp.c
+++ b/print-esp.c
@@ -25,10 +25,9 @@
 #include "config.h"
 #endif
 
-#include <string.h>
-
 #include <tcpdump-stdinc.h>
 
+#include <string.h>
 #include <stdlib.h>
 
 /* Any code in this file that depends on HAVE_LIBCRYPTO depends on
@@ -43,17 +42,16 @@
 #endif
 #endif
 
-#include <stdio.h>
-
 #include "ip.h"
 #ifdef INET6
 #include "ip6.h"
 #endif
 
 #include "netdissect.h"
-#include "addrtoname.h"
 #include "extract.h"
 
+#include "ascii_strcasecmp.h"
+
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
@@ -88,8 +86,8 @@
  */
 
 struct newesp {
-       u_int32_t       esp_spi;        /* ESP */
-       u_int32_t       esp_seq;        /* Sequence number */
+       uint32_t        esp_spi;        /* ESP */
+       uint32_t        esp_seq;        /* Sequence number */
        /*variable size*/               /* (IV and) Payload data */
        /*variable size*/               /* padding */
        /*8bit*/                        /* pad size */
@@ -109,7 +107,7 @@ struct sa_list {
        struct sa_list  *next;
        u_int           daddr_version;
        union inaddr_u  daddr;
-       u_int32_t       spi;          /* if == 0, then IKEv2 */
+       uint32_t        spi;          /* if == 0, then IKEv2 */
        int             initiator;
        u_char          spii[8];      /* for IKEv2 */
        u_char          spir[8];
@@ -129,10 +127,10 @@ USES_APPLE_DEPRECATED_API
 int esp_print_decrypt_buffer_by_ikev2(netdissect_options *ndo,
                                      int initiator,
                                      u_char spii[8], u_char spir[8],
-                                     u_char *buf, u_char *end)
+                                     const u_char *buf, const u_char *end)
 {
        struct sa_list *sa;
-       u_char *iv;
+       const u_char *iv;
        int len;
        EVP_CIPHER_CTX ctx;
 
@@ -335,8 +333,8 @@ espprint_decode_authalgo(netdissect_options *ndo,
        }
        *colon = '\0';
 
-       if(strcasecmp(colon,"sha1") == 0 ||
-          strcasecmp(colon,"md5") == 0) {
+       if(ascii_strcasecmp(colon,"sha1") == 0 ||
+          ascii_strcasecmp(colon,"md5") == 0) {
                sa->authlen = 12;
        }
        return 1;
@@ -430,11 +428,11 @@ static void esp_print_decode_onesecret(netdissect_options *ndo, char *line,
        } else
                decode = line;
 
-       if (spikey && strcasecmp(spikey, "file") == 0) {
+       if (spikey && ascii_strcasecmp(spikey, "file") == 0) {
                /* open file and read it */
                FILE *secretfile;
                char  fileline[1024];
-               int   lineno=0;
+               int   subfile_lineno=0;
                char  *nl;
                char *filename = line;
 
@@ -445,7 +443,7 @@ static void esp_print_decode_onesecret(netdissect_options *ndo, char *line,
                }
 
                while (fgets(fileline, sizeof(fileline)-1, secretfile) != NULL) {
-                       lineno++;
+                       subfile_lineno++;
                        /* remove newline from the line */
                        nl = strchr(fileline, '\n');
                        if (nl)
@@ -453,14 +451,14 @@ static void esp_print_decode_onesecret(netdissect_options *ndo, char *line,
                        if (fileline[0] == '#') continue;
                        if (fileline[0] == '\0') continue;
 
-                       esp_print_decode_onesecret(ndo, fileline, filename, lineno);
+                       esp_print_decode_onesecret(ndo, fileline, filename, subfile_lineno);
                }
                fclose(secretfile);
 
                return;
        }
 
-       if (spikey && strcasecmp(spikey, "ikev2") == 0) {
+       if (spikey && ascii_strcasecmp(spikey, "ikev2") == 0) {
                esp_print_decode_ikeline(ndo, line, file, lineno);
                return;
        }
@@ -468,7 +466,7 @@ static void esp_print_decode_onesecret(netdissect_options *ndo, char *line,
        if (spikey) {
 
                char *spistr, *foo;
-               u_int32_t spino;
+               uint32_t spino;
 
                spistr = strsep(&spikey, "@");
 
@@ -567,21 +565,21 @@ esp_print(netdissect_options *ndo,
        register const struct newesp *esp;
        register const u_char *ep;
 #ifdef HAVE_LIBCRYPTO
-       struct ip *ip;
+       const struct ip *ip;
        struct sa_list *sa = NULL;
 #ifdef INET6
-       struct ip6_hdr *ip6 = NULL;
+       const struct ip6_hdr *ip6 = NULL;
 #endif
        int advance;
        int len;
        u_char *secret;
        int ivlen = 0;
-       u_char *ivoff;
-       u_char *p;
+       const u_char *ivoff;
+       const u_char *p;
        EVP_CIPHER_CTX ctx;
 #endif
 
-       esp = (struct newesp *)bp;
+       esp = (const struct newesp *)bp;
 
 #ifdef HAVE_LIBCRYPTO
        secret = NULL;
@@ -596,13 +594,13 @@ esp_print(netdissect_options *ndo,
        /* 'ep' points to the end of available data. */
        ep = ndo->ndo_snapend;
 
-       if ((u_char *)(esp + 1) >= ep) {
-               fputs("[|ESP]", stdout);
+       if ((const u_char *)(esp + 1) >= ep) {
+               ND_PRINT((ndo, "[|ESP]"));
                goto fail;
        }
-       (*ndo->ndo_printf)(ndo, "ESP(spi=0x%08x", EXTRACT_32BITS(&esp->esp_spi));
-       (*ndo->ndo_printf)(ndo, ",seq=0x%x)", EXTRACT_32BITS(&esp->esp_seq));
-        (*ndo->ndo_printf)(ndo, ", length %u", length);
+       ND_PRINT((ndo, "ESP(spi=0x%08x", EXTRACT_32BITS(&esp->esp_spi)));
+       ND_PRINT((ndo, ",seq=0x%x)", EXTRACT_32BITS(&esp->esp_seq)));
+       ND_PRINT((ndo, ", length %u", length));
 
 #ifndef HAVE_LIBCRYPTO
        goto fail;
@@ -618,11 +616,11 @@ esp_print(netdissect_options *ndo,
        if (ndo->ndo_sa_list_head == NULL)
                goto fail;
 
-       ip = (struct ip *)bp2;
+       ip = (const struct ip *)bp2;
        switch (IP_V(ip)) {
 #ifdef INET6
        case 6:
-               ip6 = (struct ip6_hdr *)bp2;
+               ip6 = (const struct ip6_hdr *)bp2;
                /* we do not attempt to decrypt jumbograms */
                if (!EXTRACT_16BITS(&ip6->ip6_plen))
                        goto fail;
@@ -633,7 +631,7 @@ esp_print(netdissect_options *ndo,
                for (sa = ndo->ndo_sa_list_head; sa != NULL; sa = sa->next) {
                        if (sa->spi == EXTRACT_32BITS(&esp->esp_spi) &&
                            sa->daddr_version == 6 &&
-                           unaligned_memcmp(&sa->daddr.in6, &ip6->ip6_dst,
+                           UNALIGNED_MEMCMP(&sa->daddr.in6, &ip6->ip6_dst,
                                   sizeof(struct in6_addr)) == 0) {
                                break;
                        }
@@ -650,7 +648,7 @@ esp_print(netdissect_options *ndo,
                for (sa = ndo->ndo_sa_list_head; sa != NULL; sa = sa->next) {
                        if (sa->spi == EXTRACT_32BITS(&esp->esp_spi) &&
                            sa->daddr_version == 4 &&
-                           unaligned_memcmp(&sa->daddr.in4, &ip->ip_dst,
+                           UNALIGNED_MEMCMP(&sa->daddr.in4, &ip->ip_dst,
                                   sizeof(struct in_addr)) == 0) {
                                break;
                        }
@@ -678,7 +676,7 @@ esp_print(netdissect_options *ndo,
                ep = bp2 + len;
        }
 
-       ivoff = (u_char *)(esp + 1) + 0;
+       ivoff = (const u_char *)(esp + 1) + 0;
        ivlen = sa->ivlen;
        secret = sa->secret;
        ep = ep - sa->authlen;
@@ -692,7 +690,7 @@ esp_print(netdissect_options *ndo,
                EVP_CipherInit(&ctx, NULL, NULL, p, 0);
                EVP_Cipher(&ctx, p + ivlen, p + ivlen, ep - (p + ivlen));
                EVP_CIPHER_CTX_cleanup(&ctx);
-               advance = ivoff - (u_char *)esp + ivlen;
+               advance = ivoff - (const u_char *)esp + ivlen;
        } else
                advance = sizeof(struct newesp);
 
@@ -706,7 +704,7 @@ esp_print(netdissect_options *ndo,
        if (nhdr)
                *nhdr = *(ep - 1);
 
-       (ndo->ndo_printf)(ndo, ": ");
+       ND_PRINT((ndo, ": "));
        return advance;
 #endif