Use more the EXTRACT_U_1() macro (40/n)

[tcpdump] / print-pflog.c

diff --git a/print-pflog.c b/print-pflog.c
index d08ceddbf31717d17283dec1310d4527c5045734..d53fea81685c0d590d4e76250fda9cf44437a4b5 100644 (file)
--- a/print-pflog.c
+++ b/print-pflog.c
@@ -19,6 +19,8 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

+/* \summary: OpenBSD packet filter log file printer */
+

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif


@@ -32,7 +34,7 @@
 #include <net/pfvar.h>
 #include <net/if_pflog.h>
 
 #include <net/pfvar.h>
 #include <net/if_pflog.h>
 

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

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


@@ -88,8 +90,8 @@ pflog_print(netdissect_options *ndo, const struct pfloghdr *hdr)
 {
        uint32_t rulenr, subrulenr;
 
 {
        uint32_t rulenr, subrulenr;
 

-       rulenr = EXTRACT_32BITS(&hdr->rulenr);
-       subrulenr = EXTRACT_32BITS(&hdr->subrulenr);
+       rulenr = EXTRACT_BE_U_4(&hdr->rulenr);
+       subrulenr = EXTRACT_BE_U_4(&hdr->subrulenr);

        if (subrulenr == (uint32_t)-1)
                ND_PRINT((ndo, "rule %u/", rulenr));
        else
        if (subrulenr == (uint32_t)-1)
                ND_PRINT((ndo, "rule %u/", rulenr));
        else


@@ -119,7 +121,7 @@ pflog_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
        }
 
 #define MIN_PFLOG_HDRLEN       45
        }
 
 #define MIN_PFLOG_HDRLEN       45

-       hdr = (struct pfloghdr *)p;
+       hdr = (const struct pfloghdr *)p;

        if (hdr->length < MIN_PFLOG_HDRLEN) {
                ND_PRINT((ndo, "[pflog: invalid header length!]"));
                return (hdr->length);   /* XXX: not really */
        if (hdr->length < MIN_PFLOG_HDRLEN) {
                ND_PRINT((ndo, "[pflog: invalid header length!]"));
                return (hdr->length);   /* XXX: not really */


@@ -132,7 +134,6 @@ pflog_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
        }
 
        /* print what we know */
        }
 
        /* print what we know */

-       hdr = (struct pfloghdr *)p;

        ND_TCHECK(*hdr);
        if (ndo->ndo_eflag)
                pflog_print(ndo, hdr);
        ND_TCHECK(*hdr);
        if (ndo->ndo_eflag)
                pflog_print(ndo, hdr);