Clean up comments.

[tcpdump] / print-enc.c

diff --git a/print-enc.c b/print-enc.c
index d8f0a9e62426db26c4b4a02fc6c1a7c3617ac85f..e6c27870a9160be47bc26a52e737fea4f67c0527 100644 (file)
--- a/print-enc.c
+++ b/print-enc.c
@@ -24,10 +24,10 @@
 /* \summary: OpenBSD IPsec encapsulation BPF layer printer */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #include "netdissect.h"
 #include "extract.h"
@@ -75,14 +75,14 @@
 #define M_AUTH         0x0800  /* packet was authenticated (AH) */
 
 struct enchdr {
-       uint32_t af;
-       uint32_t spi;
-       uint32_t flags;
+       nd_uint32_t af;
+       nd_uint32_t spi;
+       nd_uint32_t flags;
 };
 
 #define ENC_PRINT_TYPE(wh, xf, nam) \
        if ((wh) & (xf)) { \
-               ND_PRINT((ndo, "%s%s", nam, (wh) == (xf) ? "): " : ",")); \
+               ND_PRINT("%s%s", nam, (wh) == (xf) ? "): " : ","); \
                (wh) &= ~(xf); \
        }
 
@@ -103,8 +103,9 @@ enc_if_print(netdissect_options *ndo,
        u_int af, flags;
        const struct enchdr *hdr;
 
+       ndo->ndo_protocol = "enc_if";
        if (caplen < ENC_HDRLEN) {
-               ND_PRINT((ndo, "[|enc]"));
+               nd_print_trunc(ndo);
                goto out;
        }
 
@@ -127,21 +128,21 @@ enc_if_print(netdissect_options *ndo,
         * The SPI field is always in network byte order, i.e. big-
         * endian.
         */
-       UNALIGNED_MEMCPY(&af, &hdr->af, sizeof af);
-       UNALIGNED_MEMCPY(&flags, &hdr->flags, sizeof flags);
+       UNALIGNED_MEMCPY(&af, &hdr->af, sizeof (af));
+       UNALIGNED_MEMCPY(&flags, &hdr->flags, sizeof (flags));
        if ((af & 0xFFFF0000) != 0) {
                af = SWAPLONG(af);
-               flags = SWAPLONG(hdr->flags);
+               flags = SWAPLONG(flags);
        }
 
        if (flags == 0)
-               ND_PRINT((ndo, "(unprotected): "));
+               ND_PRINT("(unprotected): ");
        else
-               ND_PRINT((ndo, "("));
+               ND_PRINT("(");
        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_BE_U_4(&hdr->spi)));
+       ND_PRINT("SPI 0x%08x: ", GET_BE_U_4(hdr->spi));
 
        length -= ENC_HDRLEN;
        caplen -= ENC_HDRLEN;
@@ -161,11 +162,3 @@ enc_if_print(netdissect_options *ndo,
 out:
        return (ENC_HDRLEN);
 }
-
-
-/*
- * Local Variables:
- * c-style: whitesmith
- * c-basic-offset: 8
- * End:
- */