Add printing support for vsockmon devices.

[tcpdump] / print-pktap.c

diff --git a/print-pktap.c b/print-pktap.c
index 825851da05b9253d6505b51f633591a1286965e6..af3b3973aa7296b648ea2825c1875a2b766d95ca 100644 (file)
--- a/print-pktap.c
+++ b/print-pktap.c
@@ -76,8 +76,8 @@ pktap_header_print(netdissect_options *ndo, const u_char *bp, u_int length)
 
        hdr = (const pktap_header_t *)bp;
 
-       dlt = EXTRACT_LE_U_4(hdr->pkt_dlt);
-       hdrlen = EXTRACT_LE_U_4(hdr->pkt_len);
+       dlt = GET_LE_U_4(hdr->pkt_dlt);
+       hdrlen = GET_LE_U_4(hdr->pkt_len);
        dltname = pcap_datalink_val_to_name(dlt);
        if (!ndo->ndo_qflag) {
                ND_PRINT("DLT %s (%u) len %u",
@@ -107,13 +107,13 @@ pktap_if_print(netdissect_options *ndo,
        struct pcap_pkthdr nhdr;
 
        ndo->ndo_protocol = "pktap_if";
-       if (caplen < sizeof(pktap_header_t) || length < sizeof(pktap_header_t)) {
-               ND_PRINT("[|pktap]");
+       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);
-       hdrlen = EXTRACT_LE_U_4(hdr->pkt_len);
+       dlt = GET_LE_U_4(hdr->pkt_dlt);
+       hdrlen = GET_LE_U_4(hdr->pkt_len);
        if (hdrlen < sizeof(pktap_header_t)) {
                /*
                 * Claimed header length < structure length.
@@ -122,11 +122,11 @@ pktap_if_print(netdissect_options *ndo,
                 * is the length supplied so that the header can
                 * be expanded in the future)?
                 */
-               ND_PRINT("[|pktap]");
+               nd_print_trunc(ndo);
                return (caplen);
        }
-       if (caplen < hdrlen || length < hdrlen) {
-               ND_PRINT("[|pktap]");
+       if (caplen < hdrlen) {
+               nd_print_trunc(ndo);
                return (caplen);
        }
 
@@ -137,7 +137,7 @@ pktap_if_print(netdissect_options *ndo,
        caplen -= hdrlen;
        p += hdrlen;
 
-       rectype = EXTRACT_LE_U_4(hdr->pkt_rectype);
+       rectype = GET_LE_U_4(hdr->pkt_rectype);
        switch (rectype) {
 
        case PKT_REC_NONE: