Makefile.in: don't remove configure and config.h.in in make distclean.

[tcpdump] / print-enc.c

diff --git a/print-enc.c b/print-enc.c
index db965efb2e0b9c0369739899893ab7ed9f108f8c..928b02c8870e0eb83534b2d71db45b987edbbc4c 100644 (file)
--- a/print-enc.c
+++ b/print-enc.c
@@ -24,11 +24,12 @@
 /* \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"
 
+#define ND_LONGJMP_FROM_TCHECK
 #include "netdissect.h"
 #include "extract.h"
 #include "af.h"
@@ -80,9 +81,9 @@ struct enchdr {
        nd_uint32_t flags;
 };
 
-#define ENC_PRINT_TYPE(wh, xf, nam) \
+#define ENC_PRINT_TYPE(wh, xf, name) \
        if ((wh) & (xf)) { \
-               ND_PRINT((ndo, "%s%s", nam, (wh) == (xf) ? "): " : ",")); \
+               ND_PRINT("%s%s", name, (wh) == (xf) ? "): " : ","); \
                (wh) &= ~(xf); \
        }
 
@@ -94,19 +95,17 @@ 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)
 {
        u_int length = h->len;
-       u_int caplen = h->caplen;
        u_int af, flags;
        const struct enchdr *hdr;
 
-       if (caplen < ENC_HDRLEN) {
-               ND_PRINT((ndo, "[|enc]"));
-               goto out;
-       }
+       ndo->ndo_protocol = "enc";
+       ND_TCHECK_LEN(p, ENC_HDRLEN);
+       ndo->ndo_ll_hdr_len += ENC_HDRLEN;
 
        hdr = (const struct enchdr *)p;
        /*
@@ -135,16 +134,15 @@ 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;
        p += ENC_HDRLEN;
 
        switch (af) {
@@ -157,15 +155,4 @@ enc_if_print(netdissect_options *ndo,
                ip6_print(ndo, p, length);
                break;
        }
-
-out:
-       return (ENC_HDRLEN);
 }
-
-
-/*
- * Local Variables:
- * c-style: whitesmith
- * c-basic-offset: 8
- * End:
- */