More nd_ification of structures.

[tcpdump] / print-enc.c

diff --git a/print-enc.c b/print-enc.c
index 89daae1bb4a3610d3930d015d8f0b95e4829e567..4a43a491b681832877939a989d2afd9cbef71f56 100644 (file)
--- a/print-enc.c
+++ b/print-enc.c
@@ -21,14 +21,15 @@
  * 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 $ */
@@ -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: