Fix spaces

[tcpdump] / print-ppi.c

diff --git a/print-ppi.c b/print-ppi.c
index 720142dffd6406bab3c3f5521e9b9a7f990058b3..398ed689134818492879f73d2e97797ff12d81fd 100644 (file)
--- a/print-ppi.c
+++ b/print-ppi.c
@@ -1,87 +1,115 @@
 /*
  * Oracle
  */
 /*
  * Oracle
  */

-#define NETDISSECT_REWORKED
+
+/* \summary: Oracle DLT_PPI printer */
+

 #ifdef HAVE_CONFIG_H
 #ifdef HAVE_CONFIG_H

-#include "config.h"
+#include <config.h>

 #endif
 
 #endif
 

-#include <tcpdump-stdinc.h>
+#include "netdissect-stdinc.h"

 
 

-#include "interface.h"
+#include "netdissect.h"

 #include "extract.h"
 
 #include "extract.h"
 

+

 typedef struct ppi_header {
 typedef struct ppi_header {

-       uint8_t         ppi_ver;
-       uint8_t         ppi_flags;
-       uint16_t        ppi_len;
-       uint32_t        ppi_dlt;
+       nd_uint8_t      ppi_ver;
+       nd_uint8_t      ppi_flags;
+       nd_uint16_t     ppi_len;
+       nd_uint32_t     ppi_dlt;

 } ppi_header_t;
 
 #define        PPI_HDRLEN      8
 
 #ifdef DLT_PPI
 
 } 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)
+static void
+ppi_header_print(netdissect_options *ndo, const u_char *bp, u_int length)

 {
        const ppi_header_t *hdr;
 {
        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;
 
 
        hdr = (const ppi_header_t *)bp;
 

-       len = EXTRACT_16BITS(&hdr->ppi_len);
-       dlt = EXTRACT_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) {
 
        if (!ndo->ndo_qflag) {

-               ND_PRINT((ndo,", V.%d DLT %s (%d) len %d", hdr->ppi_ver,
-                         pcap_datalink_val_to_name(dlt), dlt,
-                          len));
+               ND_PRINT("V.%u DLT %s (%u) len %u", EXTRACT_U_1(hdr->ppi_ver),
+                         (dltname != NULL ? dltname : "UNKNOWN"), dlt,
+                          len);

         } else {
         } else {

-               ND_PRINT((ndo,", %s", pcap_datalink_val_to_name(dlt)));
+               ND_PRINT("%s", (dltname != NULL ? dltname : "UNKNOWN"));

         }
 
         }
 

-       ND_PRINT((ndo, ", length %u: ", length));
+       ND_PRINT(", length %u: ", length);

 }
 
 }
 

-static void
-ppi_print(struct netdissect_options *ndo,
-               const struct pcap_pkthdr *h, const u_char *p)
+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_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;

 
 

+       ndo->ndo_protocol = "ppi";

        if (caplen < sizeof(ppi_header_t)) {
        if (caplen < sizeof(ppi_header_t)) {

-               ND_PRINT((ndo, "[|ppi]"));
-               return;
+               nd_print_trunc(ndo);
+               return (caplen);
+       }
+
+       hdr = (const ppi_header_t *)p;
+       ND_TCHECK_2(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
+                * bother.
+                */
+               nd_print_trunc(ndo);
+               return (caplen);
+       }
+       if (len < sizeof(ppi_header_t)) {
+               nd_print_trunc(ndo);
+               return (len);

        }
        }

-       hdr = (ppi_header_t *)p;
-       dlt = EXTRACT_32BITS(&hdr->ppi_dlt);
+       ND_TCHECK_4(hdr->ppi_dlt);
+       dlt = EXTRACT_LE_U_4(hdr->ppi_dlt);

 
        if (ndo->ndo_eflag)
                ppi_header_print(ndo, p, length);
 
 
        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) {
 
        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)
        } 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)
 
                if (!ndo->ndo_suppress_default_print)

-                       ndo->ndo_default_print(ndo, p, caplen);
+                       ND_DEFAULTPRINT(p, caplen);
+               hdrlen = 0;

        }
        }

+       return (len + hdrlen);
+trunc:
+       return (caplen);

 }
 
 /*
 }
 
 /*


@@ -91,19 +119,10 @@ ppi_print(struct netdissect_options *ndo,
  * is the number of bytes actually captured.
  */
 u_int
  * is the number of bytes actually captured.
  */
 u_int

-ppi_if_print(struct netdissect_options *ndo,
-               const struct pcap_pkthdr *h, const u_char *p)
+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));
+       ndo->ndo_protocol = "ppi_if";
+       return (ppi_print(ndo, h, p));

 }
 }

-
-/*
- * Local Variables:
- * c-style: whitesmith
- * c-basic-offset: 8
- * End:
- */
-

 #endif /* DLT_PPI */
 #endif /* DLT_PPI */