ICMPv6: Add the IPv6-Only flag

[tcpdump] / print-pktap.c

diff --git a/print-pktap.c b/print-pktap.c
index b349e70663ed7a67fd9e19079187612a5e450137..0e10aeba56abaacf22ca9900e8ac62fe8173207a 100644 (file)
--- a/print-pktap.c
+++ b/print-pktap.c
@@ -22,7 +22,7 @@
 /* \summary: Apple's DLT_PKTAP printer */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include "netdissect-stdinc.h"
@@ -67,7 +67,7 @@ typedef struct pktap_header {
 #define PKT_REC_NONE   0       /* nothing follows the header */
 #define PKT_REC_PACKET 1       /* a packet follows the header */
 
-static inline void
+static void
 pktap_header_print(netdissect_options *ndo, const u_char *bp, u_int length)
 {
        const pktap_header_t *hdr;
@@ -106,9 +106,10 @@ pktap_if_print(netdissect_options *ndo,
        const pktap_header_t *hdr;
        struct pcap_pkthdr nhdr;
 
-       if (caplen < sizeof(pktap_header_t) || length < sizeof(pktap_header_t)) {
-               ND_PRINT("[|pktap]");
-               return (0);
+       ndo->ndo_protocol = "pktap_if";
+       if (caplen < sizeof(pktap_header_t)) {
+               nd_print_trunc(ndo);
+               return (caplen);
        }
        hdr = (const pktap_header_t *)p;
        dlt = EXTRACT_LE_U_4(hdr->pkt_dlt);
@@ -121,12 +122,12 @@ pktap_if_print(netdissect_options *ndo,
                 * is the length supplied so that the header can
                 * be expanded in the future)?
                 */
-               ND_PRINT("[|pktap]");
-               return (0);
+               nd_print_trunc(ndo);
+               return (caplen);
        }
-       if (caplen < hdrlen || length < hdrlen) {
-               ND_PRINT("[|pktap]");
-               return (hdrlen);
+       if (caplen < hdrlen) {
+               nd_print_trunc(ndo);
+               return (caplen);
        }
 
        if (ndo->ndo_eflag)
@@ -162,12 +163,4 @@ pktap_if_print(netdissect_options *ndo,
 
        return (hdrlen);
 }
-
-/*
- * Local Variables:
- * c-style: whitesmith
- * c-basic-offset: 8
- * End:
- */
-
 #endif /* DLT_PKTAP */