X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/e319ff0ab28bb4a57768468d516ec01b5082783f..a8abce5c5e2dce2ba6dbccd5d3829da104b80f9c:/print-ppi.c diff --git a/print-ppi.c b/print-ppi.c index 1c4469fa..398ed689 100644 --- a/print-ppi.c +++ b/print-ppi.c @@ -5,15 +5,14 @@ /* \summary: Oracle DLT_PPI printer */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif -#include +#include "netdissect-stdinc.h" #include "netdissect.h" #include "extract.h" -static const char tstr[] = "[|ppi]"; typedef struct ppi_header { nd_uint8_t ppi_ver; @@ -26,7 +25,7 @@ typedef struct ppi_header { #ifdef DLT_PPI -static inline void +static void ppi_header_print(netdissect_options *ndo, const u_char *bp, u_int length) { const ppi_header_t *hdr; @@ -64,8 +63,9 @@ ppi_print(netdissect_options *ndo, uint32_t hdrlen; struct pcap_pkthdr nhdr; + ndo->ndo_protocol = "ppi"; if (caplen < sizeof(ppi_header_t)) { - ND_PRINT(" %s", tstr); + nd_print_trunc(ndo); return (caplen); } @@ -77,11 +77,11 @@ ppi_print(netdissect_options *ndo, * If we don't have the entire PPI header, don't * bother. */ - ND_PRINT(" %s", tstr); + nd_print_trunc(ndo); return (caplen); } if (len < sizeof(ppi_header_t)) { - ND_PRINT(" %s", tstr); + nd_print_trunc(ndo); return (len); } ND_TCHECK_4(hdr->ppi_dlt); @@ -122,14 +122,7 @@ u_int ppi_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p) { + ndo->ndo_protocol = "ppi_if"; return (ppi_print(ndo, h, p)); } - -/* - * Local Variables: - * c-style: whitesmith - * c-basic-offset: 8 - * End: - */ - #endif /* DLT_PPI */