X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/96c60029b3f935eff892d1f49b52f305423e4671..1bcd37991fa57d9e966a6f96e7cbff59b16c28bd:/print-ppi.c?ds=inline diff --git a/print-ppi.c b/print-ppi.c index 17fd9833..774edfba 100644 --- a/print-ppi.c +++ b/print-ppi.c @@ -67,7 +67,7 @@ void ppi_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p) { - if_printer_t printer; + if_printer printer; const ppi_header_t *hdr; u_int caplen = h->caplen; u_int length = h->len; @@ -111,16 +111,13 @@ ppi_if_print(netdissect_options *ndo, caplen -= len; p += len; - printer = lookup_printer(ndo, dlt); - if (printer.printer != NULL) { + printer = lookup_printer(dlt); + if (printer != NULL) { nhdr = *h; nhdr.caplen = caplen; nhdr.len = length; - if (ndo->ndo_void_printer == TRUE) { - printer.void_printer(ndo, &nhdr, p); - hdrlen = ndo->ndo_ll_hdr_len; - } else - hdrlen = printer.uint_printer(ndo, &nhdr, p); + printer(ndo, &nhdr, p); + hdrlen = ndo->ndo_ll_hdr_len; } else { if (!ndo->ndo_eflag) ppi_header_print(ndo, (const u_char *)hdr, length + len); @@ -130,6 +127,5 @@ ppi_if_print(netdissect_options *ndo, hdrlen = 0; } ndo->ndo_ll_hdr_len += len + hdrlen; - return; } #endif /* DLT_PPI */