diff options
Diffstat (limited to 'freebsd/contrib/tcpdump/print-ppi.c')
-rw-r--r-- | freebsd/contrib/tcpdump/print-ppi.c | 105 |
1 files changed, 68 insertions, 37 deletions
diff --git a/freebsd/contrib/tcpdump/print-ppi.c b/freebsd/contrib/tcpdump/print-ppi.c index b78d8730..04e9ddfe 100644 --- a/freebsd/contrib/tcpdump/print-ppi.c +++ b/freebsd/contrib/tcpdump/print-ppi.c @@ -1,84 +1,114 @@ #include <machine/rtems-bsd-user-space.h> - +#ifdef __rtems__ +#include <machine/rtems-bsd-program.h> +#include "rtems-bsd-tcpdump-namespace.h" +#endif /* __rtems__ */ /* * Oracle */ + +/* \summary: Oracle DLT_PPI printer */ + #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include <tcpdump-stdinc.h> - -#include <stdio.h> -#include <pcap.h> +#include <netdissect-stdinc.h> #include "netdissect.h" -#include "interface.h" #include "extract.h" -#include "ppi.h" + +typedef struct ppi_header { + uint8_t ppi_ver; + uint8_t ppi_flags; + uint16_t ppi_len; + uint32_t ppi_dlt; +} ppi_header_t; + +#define PPI_HDRLEN 8 #ifdef DLT_PPI static inline void -ppi_header_print(struct netdissect_options *ndo, const u_char *bp, u_int length) +ppi_header_print(netdissect_options *ndo, const u_char *bp, u_int length) { const ppi_header_t *hdr; - u_int32_t dlt; - u_int16_t len; + uint16_t len; + uint32_t dlt; + const char *dltname; hdr = (const ppi_header_t *)bp; - len = EXTRACT_16BITS(&hdr->ppi_len); - dlt = EXTRACT_32BITS(&hdr->ppi_dlt); + len = EXTRACT_LE_16BITS(&hdr->ppi_len); + dlt = EXTRACT_LE_32BITS(&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, + ND_PRINT((ndo, "V.%d DLT %s (%d) len %d", hdr->ppi_ver, + (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)); } -static void -ppi_print(struct netdissect_options *ndo, +static u_int +ppi_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p) { - if_ndo_printer ndo_printer; - if_printer printer; - ppi_header_t *hdr; + if_printer printer; + const ppi_header_t *hdr; u_int caplen = h->caplen; u_int length = h->len; - u_int32_t dlt; + uint16_t len; + uint32_t dlt; + uint32_t hdrlen; + struct pcap_pkthdr nhdr; if (caplen < sizeof(ppi_header_t)) { ND_PRINT((ndo, "[|ppi]")); - return; + return (caplen); } - hdr = (ppi_header_t *)p; - dlt = EXTRACT_32BITS(&hdr->ppi_dlt); + + hdr = (const ppi_header_t *)p; + len = EXTRACT_LE_16BITS(&hdr->ppi_len); + if (caplen < len) { + /* + * If we don't have the entire PPI header, don't + * bother. + */ + ND_PRINT((ndo, "[|ppi]")); + return (caplen); + } + if (len < sizeof(ppi_header_t)) { + ND_PRINT((ndo, "[|ppi]")); + return (len); + } + dlt = EXTRACT_LE_32BITS(&hdr->ppi_dlt); if (ndo->ndo_eflag) ppi_header_print(ndo, p, length); - length -= sizeof(ppi_header_t); - caplen -= sizeof(ppi_header_t); - p += sizeof(ppi_header_t); + length -= len; + caplen -= len; + p += len; if ((printer = lookup_printer(dlt)) != NULL) { - printer(h, p); - } else if ((ndo_printer = lookup_ndo_printer(dlt)) != NULL) { - ndo_printer(ndo, h, p); + nhdr = *h; + nhdr.caplen = caplen; + nhdr.len = length; + hdrlen = printer(ndo, &nhdr, p); } else { if (!ndo->ndo_eflag) - ppi_header_print(ndo, (u_char *)hdr, - length + sizeof(ppi_header_t)); + ppi_header_print(ndo, (const u_char *)hdr, length + len); if (!ndo->ndo_suppress_default_print) - ndo->ndo_default_print(ndo, p, caplen); + ND_DEFAULTPRINT(p, caplen); + hdrlen = 0; } + return (len + hdrlen); } /* @@ -88,12 +118,10 @@ ppi_print(struct netdissect_options *ndo, * is the number of bytes actually captured. */ u_int -ppi_if_print(struct netdissect_options *ndo, +ppi_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p) { - ppi_print(ndo, h, p); - - return (sizeof(ppi_header_t)); + return (ppi_print(ndo, h, p)); } /* @@ -104,3 +132,6 @@ ppi_if_print(struct netdissect_options *ndo, */ #endif /* DLT_PPI */ +#ifdef __rtems__ +#include "rtems-bsd-tcpdump-print-ppi-data.h" +#endif /* __rtems__ */ |