More UNALIGNED_MEM{CPY,CMP} on IP addresses.

[tcpdump] / print-esp.c

diff --git a/print-esp.c b/print-esp.c
index d1ed4334639f4e8ec5b7fb08e2593a9cb94dd0dd..7e6f9302c6d81639624195e09c57de01fbe850e7 100644 (file)
--- a/print-esp.c
+++ b/print-esp.c
@@ -54,36 +54,6 @@
 #include "addrtoname.h"
 #include "extract.h"
 
-#ifndef HAVE_SOCKADDR_STORAGE
-#ifdef INET6
-struct sockaddr_storage {
-       union {
-               struct sockaddr_in sin;
-               struct sockaddr_in6 sin6;
-       } un;
-};
-#else
-#define sockaddr_storage sockaddr
-#endif
-#endif /* HAVE_SOCKADDR_STORAGE */
-
-#ifdef HAVE_LIBCRYPTO
-struct sa_list {
-       struct sa_list  *next;
-       struct sockaddr_storage daddr;
-       u_int32_t       spi;          /* if == 0, then IKEv2 */
-       int             initiator;
-       u_char          spii[8];      /* for IKEv2 */
-       u_char          spir[8];
-       const EVP_CIPHER *evp;
-       int             ivlen;
-       int             authlen;
-       u_char          authsecret[256];
-       int             authsecret_len;
-       u_char          secret[256];  /* is that big enough for all secrets? */
-       int             secretlen;
-};
-
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
@@ -128,6 +98,30 @@ struct newesp {
        /*variable size, 32bit bound*/  /* Authentication data */
 };
 
+#ifdef HAVE_LIBCRYPTO
+union inaddr_u {
+       struct in_addr in4;
+#ifdef INET6
+       struct in6_addr in6;
+#endif
+};
+struct sa_list {
+       struct sa_list  *next;
+       u_int           daddr_version;
+       union inaddr_u  daddr;
+       u_int32_t       spi;          /* if == 0, then IKEv2 */
+       int             initiator;
+       u_char          spii[8];      /* for IKEv2 */
+       u_char          spir[8];
+       const EVP_CIPHER *evp;
+       int             ivlen;
+       int             authlen;
+       u_char          authsecret[256];
+       int             authsecret_len;
+       u_char          secret[256];  /* is that big enough for all secrets? */
+       int             secretlen;
+};
+
 /*
  * this will adjust ndo_packetp and ndo_snapend to new buffer!
  */
@@ -429,6 +423,7 @@ static void esp_print_decode_onesecret(netdissect_options *ndo, char *line,
        if (line == NULL) {
                decode = spikey;
                spikey = NULL;
+               /* sa1.daddr.version = 0; */
                /* memset(&sa1.daddr, 0, sizeof(sa1.daddr)); */
                /* sa1.spi = 0; */
                sa_def    = 1;
@@ -474,10 +469,6 @@ static void esp_print_decode_onesecret(netdissect_options *ndo, char *line,
 
                char *spistr, *foo;
                u_int32_t spino;
-               struct sockaddr_in *sin;
-#ifdef INET6
-               struct sockaddr_in6 *sin6;
-#endif
 
                spistr = strsep(&spikey, "@");
 
@@ -489,21 +480,13 @@ static void esp_print_decode_onesecret(netdissect_options *ndo, char *line,
 
                sa1.spi = spino;
 
-               sin = (struct sockaddr_in *)&sa1.daddr;
 #ifdef INET6
-               sin6 = (struct sockaddr_in6 *)&sa1.daddr;
-               if (inet_pton(AF_INET6, spikey, &sin6->sin6_addr) == 1) {
-#ifdef HAVE_SOCKADDR_SA_LEN
-                       sin6->sin6_len = sizeof(struct sockaddr_in6);
-#endif
-                       sin6->sin6_family = AF_INET6;
+               if (inet_pton(AF_INET6, spikey, &sa1.daddr.in6) == 1) {
+                       sa1.daddr_version = 6;
                } else
 #endif
-                       if (inet_pton(AF_INET, spikey, &sin->sin_addr) == 1) {
-#ifdef HAVE_SOCKADDR_SA_LEN
-                               sin->sin_len = sizeof(struct sockaddr_in);
-#endif
-                               sin->sin_family = AF_INET;
+                       if (inet_pton(AF_INET, spikey, &sa1.daddr.in4) == 1) {
+                               sa1.daddr_version = 4;
                        } else {
                                (*ndo->ndo_warning)(ndo, "print_esp: can not decode IP# %s\n", spikey);
                                return;
@@ -648,10 +631,9 @@ esp_print(netdissect_options *ndo,
 
                /* see if we can find the SA, and if so, decode it */
                for (sa = ndo->ndo_sa_list_head; sa != NULL; sa = sa->next) {
-                       struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)&sa->daddr;
                        if (sa->spi == EXTRACT_32BITS(&esp->esp_spi) &&
-                           sin6->sin6_family == AF_INET6 &&
-                           memcmp(&sin6->sin6_addr, &ip6->ip6_dst,
+                           sa->daddr_version == 6 &&
+                           UNALIGNED_MEMCMP(&sa->daddr.in6, &ip6->ip6_dst,
                                   sizeof(struct in6_addr)) == 0) {
                                break;
                        }
@@ -666,10 +648,10 @@ esp_print(netdissect_options *ndo,
 
                /* see if we can find the SA, and if so, decode it */
                for (sa = ndo->ndo_sa_list_head; sa != NULL; sa = sa->next) {
-                       struct sockaddr_in *sin = (struct sockaddr_in *)&sa->daddr;
                        if (sa->spi == EXTRACT_32BITS(&esp->esp_spi) &&
-                           sin->sin_family == AF_INET &&
-                           sin->sin_addr.s_addr == ip->ip_dst.s_addr) {
+                           sa->daddr_version == 4 &&
+                           UNALIGNED_MEMCMP(&sa->daddr.in4, &ip->ip_dst,
+                                  sizeof(struct in_addr)) == 0) {
                                break;
                        }
                }