Autosar SOME/IP protocol support

[tcpdump] / print-ppi.c

diff --git a/print-ppi.c b/print-ppi.c
index 398ed689134818492879f73d2e97797ff12d81fd..fe85fa51e699136d760f8bf131686ee0ec9c6606 100644 (file)
--- a/print-ppi.c
+++ b/print-ppi.c
@@ -35,12 +35,12 @@ ppi_header_print(netdissect_options *ndo, const u_char *bp, u_int length)
 
        hdr = (const ppi_header_t *)bp;
 
-       len = EXTRACT_LE_U_2(hdr->ppi_len);
-       dlt = EXTRACT_LE_U_4(hdr->ppi_dlt);
+       len = GET_LE_U_2(hdr->ppi_len);
+       dlt = GET_LE_U_4(hdr->ppi_dlt);
        dltname = pcap_datalink_val_to_name(dlt);
 
        if (!ndo->ndo_qflag) {
-               ND_PRINT("V.%u DLT %s (%u) len %u", EXTRACT_U_1(hdr->ppi_ver),
+               ND_PRINT("V.%u DLT %s (%u) len %u", GET_U_1(hdr->ppi_ver),
                          (dltname != NULL ? dltname : "UNKNOWN"), dlt,
                           len);
         } else {
@@ -54,7 +54,7 @@ static u_int
 ppi_print(netdissect_options *ndo,
          const struct pcap_pkthdr *h, const u_char *p)
 {
-       if_printer printer;
+       if_printer_t printer;
        const ppi_header_t *hdr;
        u_int caplen = h->caplen;
        u_int length = h->len;
@@ -71,7 +71,7 @@ ppi_print(netdissect_options *ndo,
 
        hdr = (const ppi_header_t *)p;
        ND_TCHECK_2(hdr->ppi_len);
-       len = EXTRACT_LE_U_2(hdr->ppi_len);
+       len = GET_LE_U_2(hdr->ppi_len);
        if (caplen < len) {
                /*
                 * If we don't have the entire PPI header, don't
@@ -85,7 +85,7 @@ ppi_print(netdissect_options *ndo,
                return (len);
        }
        ND_TCHECK_4(hdr->ppi_dlt);
-       dlt = EXTRACT_LE_U_4(hdr->ppi_dlt);
+       dlt = GET_LE_U_4(hdr->ppi_dlt);
 
        if (ndo->ndo_eflag)
                ppi_header_print(ndo, p, length);
@@ -94,11 +94,16 @@ ppi_print(netdissect_options *ndo,
        caplen -= len;
        p += len;
 
-       if ((printer = lookup_printer(dlt)) != NULL) {
+       printer = lookup_printer(ndo, dlt);
+       if (printer.printer != NULL) {
                nhdr = *h;
                nhdr.caplen = caplen;
                nhdr.len = length;
-               hdrlen = printer(ndo, &nhdr, p);
+               if (ndo->ndo_void_printer == TRUE) {
+                       printer.void_printer(ndo, &nhdr, p);
+                       hdrlen = ndo->ndo_ll_header_length;
+               } else
+                       hdrlen = printer.uint_printer(ndo, &nhdr, p);
        } else {
                if (!ndo->ndo_eflag)
                        ppi_header_print(ndo, (const u_char *)hdr, length + len);