More UNALIGNED_MEM{CPY,CMP} on IP addresses.

[tcpdump] / print-ppi.c

diff --git a/print-ppi.c b/print-ppi.c
index b3b71f27435d3ce90158426a2c98a4d8bd2ce9eb..5d30806abbba84872b0f4d905d441cb29db9f5cc 100644 (file)
--- a/print-ppi.c
+++ b/print-ppi.c
@@ -13,7 +13,15 @@
 #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
 
@@ -21,10 +29,11 @@ static inline void
 ppi_header_print(struct netdissect_options *ndo, const u_char *bp, u_int length)
 {
        const ppi_header_t *hdr;
-       hdr = (const ppi_header_t *)bp;
        u_int32_t dlt;
        u_int16_t len;
 
+       hdr = (const ppi_header_t *)bp;
+
        len = EXTRACT_16BITS(&hdr->ppi_len);
        dlt = EXTRACT_32BITS(&hdr->ppi_dlt);