On Solaris, for 64-bit builds, use the 64-bit pcap-config.

[tcpdump] / print-enc.c

diff --git a/print-enc.c b/print-enc.c
index e6c27870a9160be47bc26a52e737fea4f67c0527..9f541c3ccc569b85d7331da319f493bc8ae89bf7 100644 (file)
--- a/print-enc.c
+++ b/print-enc.c
@@ -29,6 +29,7 @@
 
 #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("%s%s", nam, (wh) == (xf) ? "): " : ","); \
+               ND_PRINT("%s%s", name, (wh) == (xf) ? "): " : ","); \
                (wh) &= ~(xf); \
        }
 
@@ -94,7 +95,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,11 +104,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_trunc(ndo);
-               goto out;
-       }
+       ndo->ndo_protocol = "enc";
+       ND_TCHECK_LEN(p, ENC_HDRLEN);
+       ndo->ndo_ll_hdr_len += ENC_HDRLEN;
 
        hdr = (const struct enchdr *)p;
        /*
@@ -158,7 +157,4 @@ enc_if_print(netdissect_options *ndo,
                ip6_print(ndo, p, length);
                break;
        }
-
-out:
-       return (ENC_HDRLEN);
 }