Shorten a status text description.

[tcpdump] / print-ppi.c

diff --git a/print-ppi.c b/print-ppi.c
index 5d30806abbba84872b0f4d905d441cb29db9f5cc..2cff56c8144b3f0929a7f94d92a537d01610e965 100644 (file)
--- a/print-ppi.c
+++ b/print-ppi.c
@@ -1,16 +1,13 @@
 /*
  * Oracle
  */
 /*
  * Oracle
  */

+#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 

-#include <stdio.h>
-#include <pcap.h>
-
-#include "netdissect.h"

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


@@ -26,16 +23,16 @@ typedef struct ppi_header {
 #ifdef DLT_PPI
 
 static inline void
 #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;
 {
        const ppi_header_t *hdr;

-       u_int32_t dlt;
-       u_int16_t len;
+       uint32_t dlt;
+       uint16_t len;

 
        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_16BITS(&hdr->ppi_len);
+       dlt = EXTRACT_LE_32BITS(&hdr->ppi_dlt);

 
        if (!ndo->ndo_qflag) {
                ND_PRINT((ndo,", V.%d DLT %s (%d) len %d", hdr->ppi_ver,
 
        if (!ndo->ndo_qflag) {
                ND_PRINT((ndo,", V.%d DLT %s (%d) len %d", hdr->ppi_ver,


@@ -49,7 +46,7 @@ ppi_header_print(struct netdissect_options *ndo, const u_char *bp, u_int length)
 }
 
 static void
 }
 
 static void

-ppi_print(struct netdissect_options *ndo,
+ppi_print(netdissect_options *ndo,

                const struct pcap_pkthdr *h, const u_char *p)
 {
        if_ndo_printer ndo_printer;
                const struct pcap_pkthdr *h, const u_char *p)
 {
        if_ndo_printer ndo_printer;


@@ -57,14 +54,14 @@ ppi_print(struct netdissect_options *ndo,
        ppi_header_t *hdr;
        u_int caplen = h->caplen;
        u_int length = h->len;
        ppi_header_t *hdr;
        u_int caplen = h->caplen;
        u_int length = h->len;

-       u_int32_t dlt;
+       uint32_t dlt;

 
        if (caplen < sizeof(ppi_header_t)) {
                ND_PRINT((ndo, "[|ppi]"));
                return;
        }
        hdr = (ppi_header_t *)p;
 
        if (caplen < sizeof(ppi_header_t)) {
                ND_PRINT((ndo, "[|ppi]"));
                return;
        }
        hdr = (ppi_header_t *)p;

-       dlt = EXTRACT_32BITS(&hdr->ppi_dlt);
+       dlt = EXTRACT_LE_32BITS(&hdr->ppi_dlt);

 
        if (ndo->ndo_eflag)
                ppi_header_print(ndo, p, length);
 
        if (ndo->ndo_eflag)
                ppi_header_print(ndo, p, length);


@@ -83,7 +80,7 @@ ppi_print(struct netdissect_options *ndo,
                                        length + sizeof(ppi_header_t));
 
                if (!ndo->ndo_suppress_default_print)
                                        length + sizeof(ppi_header_t));
 
                if (!ndo->ndo_suppress_default_print)

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

        }
 }
 
        }
 }
 


@@ -94,7 +91,7 @@ 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,
+ppi_if_print(netdissect_options *ndo,

                const struct pcap_pkthdr *h, const u_char *p)
 {
        ppi_print(ndo, h, p);
                const struct pcap_pkthdr *h, const u_char *p)
 {
        ppi_print(ndo, h, p);