Use nd_ types, add EXTRACT_ calls.

[tcpdump] / print-ppi.c

diff --git a/print-ppi.c b/print-ppi.c
index cb8f3b95100b9e16c4bad3e834fbbb5dc0bf05a9..9cd5fc1eab96e8f62e632ea15ad8bef3bbd092a9 100644 (file)
--- a/print-ppi.c
+++ b/print-ppi.c
@@ -30,18 +30,20 @@ ppi_header_print(netdissect_options *ndo, const u_char *bp, u_int length)
        const ppi_header_t *hdr;
        uint16_t len;
        uint32_t dlt;
+       const char *dltname;
 
        hdr = (const ppi_header_t *)bp;
 
-       len = EXTRACT_LE_16BITS(&hdr->ppi_len);
-       dlt = EXTRACT_LE_32BITS(&hdr->ppi_dlt);
+       len = EXTRACT_LE_U_2(&hdr->ppi_len);
+       dlt = EXTRACT_LE_U_4(&hdr->ppi_dlt);
+       dltname = pcap_datalink_val_to_name(dlt);
 
        if (!ndo->ndo_qflag) {
                ND_PRINT((ndo, "V.%d DLT %s (%d) len %d", hdr->ppi_ver,
-                         pcap_datalink_val_to_name(dlt), dlt,
+                         (dltname != NULL ? dltname : "UNKNOWN"), dlt,
                           len));
         } else {
-               ND_PRINT((ndo, "%s", pcap_datalink_val_to_name(dlt)));
+               ND_PRINT((ndo, "%s", (dltname != NULL ? dltname : "UNKNOWN")));
         }
 
        ND_PRINT((ndo, ", length %u: ", length));
@@ -66,7 +68,7 @@ ppi_print(netdissect_options *ndo,
        }
 
        hdr = (const ppi_header_t *)p;
-       len = EXTRACT_LE_16BITS(&hdr->ppi_len);
+       len = EXTRACT_LE_U_2(&hdr->ppi_len);
        if (caplen < len) {
                /*
                 * If we don't have the entire PPI header, don't
@@ -79,7 +81,7 @@ ppi_print(netdissect_options *ndo,
                ND_PRINT((ndo, "[|ppi]"));
                return (len);
        }
-       dlt = EXTRACT_LE_32BITS(&hdr->ppi_dlt);
+       dlt = EXTRACT_LE_U_4(&hdr->ppi_dlt);
 
        if (ndo->ndo_eflag)
                ppi_header_print(ndo, p, length);