remove redundant ND_TCHECK, let GET_ routines handle checks

[tcpdump] / print-enc.c

diff --git a/print-enc.c b/print-enc.c
index 502e32331b22403f4b2994de67d0a763eda39f0e..607331906c9bc762c4d4c8f0fa70216a21156c84 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); \
        }
 
@@ -94,7 +94,7 @@ struct enchdr {
 #define        SWAPLONG(y) \
 ((((y)&0xff)<<24) | (((y)&0xff00)<<8) | (((y)&0xff0000)>>8) | (((y)>>24)&0xff))
 
-u_int
+void
 enc_if_print(netdissect_options *ndo,
              const struct pcap_pkthdr *h, const u_char *p)
 {
@@ -103,10 +103,13 @@ enc_if_print(netdissect_options *ndo,
        u_int af, flags;
        const struct enchdr *hdr;
 
+       ndo->ndo_protocol = "enc";
        if (caplen < ENC_HDRLEN) {
-               ND_PRINT((ndo, "[|enc]"));
-               goto out;
+               ndo->ndo_ll_hdr_len += caplen;
+               nd_print_trunc(ndo);
+               return;
        }
+       ndo->ndo_ll_hdr_len += ENC_HDRLEN;
 
        hdr = (const struct enchdr *)p;
        /*
@@ -135,13 +138,13 @@ enc_if_print(netdissect_options *ndo,
        }
 
        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;
@@ -158,14 +161,5 @@ enc_if_print(netdissect_options *ndo,
                break;
        }
 
-out:
-       return (ENC_HDRLEN);
+       return;
 }
-
-
-/*
- * Local Variables:
- * c-style: whitesmith
- * c-basic-offset: 8
- * End:
- */