Use more the ND_TTEST_1() macro

[tcpdump] / print-enc.c

diff --git a/print-enc.c b/print-enc.c
index 556ff815ecc7715ac6a3b54c945e1f1dc100f663..c3fcf10c7da0d287c590282092b09bfbe82ad464 100644 (file)
--- a/print-enc.c
+++ b/print-enc.c
@@ -21,23 +21,24 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#define NETDISSECT_REWORKED
+/* \summary: OpenBSD IPsec encapsulation BPF layer printer */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.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 
+ * Angelos D. Keromytis ([email protected]) and
  * Niels Provos ([email protected]).
  *
- * This code was written by John Ioannidis for BSD/OS in Athens, Greece, 
+ * 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,
@@ -53,7 +54,7 @@
  * 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. 
+ * 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
@@ -73,9 +74,9 @@
 #define M_AUTH         0x0800  /* packet was authenticated (AH) */
 
 struct enchdr {
-       u_int32_t af;
-       u_int32_t spi;
-       u_int32_t flags;
+       uint32_t af;
+       uint32_t spi;
+       uint32_t flags;
 };
 
 #define ENC_PRINT_TYPE(wh, xf, nam) \
@@ -86,10 +87,10 @@ struct enchdr {
 
 u_int
 enc_if_print(netdissect_options *ndo,
-             const struct pcap_pkthdr *h, register const u_char *p)
+             const struct pcap_pkthdr *h, const u_char *p)
 {
-       register u_int length = h->len;
-       register u_int caplen = h->caplen;
+       u_int length = h->len;
+       u_int caplen = h->caplen;
        int flags;
        const struct enchdr *hdr;
 
@@ -98,7 +99,7 @@ enc_if_print(netdissect_options *ndo,
                goto out;
        }
 
-       hdr = (struct enchdr *)p;
+       hdr = (const struct enchdr *)p;
        flags = hdr->flags;
        if (flags == 0)
                ND_PRINT((ndo, "(unprotected): "));
@@ -107,7 +108,7 @@ enc_if_print(netdissect_options *ndo,
        ENC_PRINT_TYPE(flags, M_AUTH, "authentic");
        ENC_PRINT_TYPE(flags, M_CONF, "confidential");
        /* ENC_PRINT_TYPE(flags, M_TUNNEL, "tunnel"); */
-       ND_PRINT((ndo, "SPI 0x%08x: ", EXTRACT_32BITS(&hdr->spi)));
+       ND_PRINT((ndo, "SPI 0x%08x: ", EXTRACT_BE_U_4(&hdr->spi)));
 
        length -= ENC_HDRLEN;
        caplen -= ENC_HDRLEN;
@@ -117,11 +118,11 @@ enc_if_print(netdissect_options *ndo,
        case AF_INET:
                ip_print(ndo, p, length);
                break;
-#ifdef INET6
+#ifdef AF_INET6
        case AF_INET6:
                ip6_print(ndo, p, length);
                break;
-#endif /*INET6*/
+#endif
        }
 
 out: