More UNALIGNED_MEM{CPY,CMP} on IP addresses.

[tcpdump] / print-enc.c

diff --git a/print-enc.c b/print-enc.c
index 605ca33d255677a509f71f8e9b68fb53b16ace3a..e187de714529c815049c2d98812994767f3c7102 100644 (file)
--- a/print-enc.c
+++ b/print-enc.c
@@ -21,11 +21,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-enc.c,v 1.4 2005-04-06 21:32:39 mcr Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -35,9 +30,55 @@ static const char rcsid[] _U_ =
 #include <pcap.h>
 
 #include "interface.h"
+#include "extract.h"
 #include "addrtoname.h"
 
-#include "enc.h"
+/* From $OpenBSD: if_enc.h,v 1.8 2001/06/25 05:14:00 angelos Exp $ */
+/*
+ * The authors of this code are John Ioannidis ([email protected]),
+ * Angelos D. Keromytis ([email protected]) and 
+ * Niels Provos ([email protected]).
+ *
+ * This code was written by John Ioannidis for BSD/OS in Athens, Greece, 
+ * in November 1995.
+ *
+ * Ported to OpenBSD and NetBSD, with additional transforms, in December 1996,
+ * by Angelos D. Keromytis.
+ *
+ * Additional transforms and features in 1997 and 1998 by Angelos D. Keromytis
+ * and Niels Provos.
+ *
+ * Copyright (C) 1995, 1996, 1997, 1998 by John Ioannidis, Angelos D. Keromytis
+ * and Niels Provos.
+ * Copyright (c) 2001, Angelos D. Keromytis.
+ *
+ * Permission to use, copy, and modify this software with or without fee
+ * is hereby granted, provided that this entire notice is included in
+ * all copies of any software which is or includes a copy or
+ * modification of this software. 
+ * You may use this code under the GNU public license if you so wish. Please
+ * contribute changes back to the authors under this freer than GPL license
+ * so that we may further the use of strong encryption without limitations to
+ * all.
+ *
+ * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTY. IN PARTICULAR, NONE OF THE AUTHORS MAKES ANY
+ * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE
+ * MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
+ * PURPOSE.
+ */
+
+#define ENC_HDRLEN     12
+
+/* From $OpenBSD: mbuf.h,v 1.56 2002/01/25 15:50:23 art Exp $  */
+#define M_CONF         0x0400  /* packet was encrypted (ESP-transport) */
+#define M_AUTH         0x0800  /* packet was authenticated (AH) */
+
+struct enchdr {
+       u_int32_t af;
+       u_int32_t spi;
+       u_int32_t flags;
+};
 
 #define ENC_PRINT_TYPE(wh, xf, nam) \
        if ((wh) & (xf)) { \
@@ -67,11 +108,22 @@ enc_if_print(const struct pcap_pkthdr *h, register const u_char *p)
        ENC_PRINT_TYPE(flags, M_AUTH, "authentic");
        ENC_PRINT_TYPE(flags, M_CONF, "confidential");
        /* ENC_PRINT_TYPE(flags, M_TUNNEL, "tunnel"); */
-       printf("SPI 0x%08x: ", (u_int32_t)ntohl(hdr->spi));
+       printf("SPI 0x%08x: ", EXTRACT_32BITS(&hdr->spi));
 
        length -= ENC_HDRLEN;
-       /* XXX - use the address family */
-       ip_print(gndo, p + ENC_HDRLEN, length);
+       caplen -= ENC_HDRLEN;
+       p += ENC_HDRLEN;
+
+       switch (hdr->af) {
+       case AF_INET:
+               ip_print(gndo, p, length);
+               break;
+#ifdef INET6
+       case AF_INET6:
+               ip6_print(gndo, p, length);
+               break;
+#endif /*INET6*/
+       }
 
 out:
        return (ENC_HDRLEN);