On Solaris, for 64-bit builds, use the 64-bit pcap-config.

[tcpdump] / print-pflog.c

diff --git a/print-pflog.c b/print-pflog.c
index 0cacabfc6e44df1286b81ac7f8ef7116eab3326c..eb1b1766db004b1eee92cac81a4655eea924fd42 100644 (file)
--- a/print-pflog.c
+++ b/print-pflog.c
@@ -19,13 +19,10 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-pflog.c,v 1.16 2007-09-12 19:36:18 guy Exp $ (LBL)";
-#endif
+/* \summary: OpenBSD packet filter log file printer */

 
 #ifdef HAVE_CONFIG_H
 
 #ifdef HAVE_CONFIG_H

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

 #endif
 
 #ifndef HAVE_NET_PFVAR_H
 #endif
 
 #ifndef HAVE_NET_PFVAR_H


@@ -37,16 +34,13 @@ static const char rcsid[] _U_ =
 #include <net/pfvar.h>
 #include <net/if_pflog.h>
 
 #include <net/pfvar.h>
 #include <net/if_pflog.h>
 

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

 
 

+#include "netdissect.h"

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

-#include "interface.h"
-#include "addrtoname.h"

 
 

-static struct tok pf_reasons[] = {
+
+static const struct tok pf_reasons[] = {

        { 0,    "0(match)" },
        { 1,    "1(bad-offset)" },
        { 2,    "2(fragment)" },
        { 0,    "0(match)" },
        { 1,    "1(bad-offset)" },
        { 2,    "2(fragment)" },


@@ -65,7 +59,7 @@ static struct tok pf_reasons[] = {
        { 0,    NULL }
 };
 
        { 0,    NULL }
 };
 

-static struct tok pf_actions[] = {
+static const struct tok pf_actions[] = {

        { PF_PASS,              "pass" },
        { PF_DROP,              "block" },
        { PF_SCRUB,             "scrub" },
        { PF_PASS,              "pass" },
        { PF_DROP,              "block" },
        { PF_SCRUB,             "scrub" },


@@ -79,7 +73,7 @@ static struct tok pf_actions[] = {
        { 0,                    NULL }
 };
 
        { 0,                    NULL }
 };
 

-static struct tok pf_directions[] = {
+static const struct tok pf_directions[] = {

        { PF_INOUT,     "in/out" },
        { PF_IN,        "in" },
        { PF_OUT,       "out" },
        { PF_INOUT,     "in/out" },
        { PF_IN,        "in" },
        { PF_OUT,       "out" },


@@ -91,60 +85,69 @@ static struct tok pf_directions[] = {
 #define        OPENBSD_AF_INET6        24
 
 static void
 #define        OPENBSD_AF_INET6        24
 
 static void

-pflog_print(const struct pfloghdr *hdr)
+pflog_print(netdissect_options *ndo, const struct pfloghdr *hdr)

 {
 {

-       u_int32_t rulenr, subrulenr;
-
-       rulenr = EXTRACT_32BITS(&hdr->rulenr);
-       subrulenr = EXTRACT_32BITS(&hdr->subrulenr);
-       if (subrulenr == (u_int32_t)-1)
-               printf("rule %u/", rulenr);
-       else
-               printf("rule %u.%s.%u/", rulenr, hdr->ruleset, subrulenr);
-
-       printf("%s: %s %s on %s: ",
-           tok2str(pf_reasons, "unkn(%u)", hdr->reason),
-           tok2str(pf_actions, "unkn(%u)", hdr->action),
-           tok2str(pf_directions, "unkn(%u)", hdr->dir),
-           hdr->ifname);
+       uint32_t rulenr, subrulenr;
+
+       ndo->ndo_protocol = "pflog";
+       rulenr = GET_BE_U_4(&hdr->rulenr);
+       subrulenr = GET_BE_U_4(&hdr->subrulenr);
+       if (subrulenr == (uint32_t)-1)
+               ND_PRINT("rule %u/", rulenr);
+       else {
+               ND_PRINT("rule %u.", rulenr);
+               nd_printjnp(ndo, (const u_char*)hdr->ruleset, PFLOG_RULESET_NAME_SIZE);
+               ND_PRINT(".%u/", subrulenr);
+       }
+
+       ND_PRINT("%s: %s %s on ",
+           tok2str(pf_reasons, "unkn(%u)", GET_U_1(&hdr->reason)),
+           tok2str(pf_actions, "unkn(%u)", GET_U_1(&hdr->action)),
+           tok2str(pf_directions, "unkn(%u)", GET_U_1(&hdr->dir)));
+       nd_printjnp(ndo, (const u_char*)hdr->ifname, IFNAMSIZ);
+       ND_PRINT(": ");

 }
 
 }
 

-u_int
-pflog_if_print(const struct pcap_pkthdr *h, register const u_char *p)
+void
+pflog_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
+               const u_char *p)

 {
        u_int length = h->len;
        u_int hdrlen;
        u_int caplen = h->caplen;
        const struct pfloghdr *hdr;
 {
        u_int length = h->len;
        u_int hdrlen;
        u_int caplen = h->caplen;
        const struct pfloghdr *hdr;

-       u_int8_t af;
+       uint8_t af;

 
 

+       ndo->ndo_protocol = "pflog";

        /* check length */
        /* check length */

-       if (caplen < sizeof(u_int8_t)) {
-               printf("[|pflog]");
-               return (caplen);
+       if (caplen < sizeof(uint8_t)) {
+               nd_print_trunc(ndo);
+               ndo->ndo_ll_hdr_len += h->caplen;
+               return;

        }
 
 #define MIN_PFLOG_HDRLEN       45
        }
 
 #define MIN_PFLOG_HDRLEN       45

-       hdr = (struct pfloghdr *)p;
-       if (hdr->length < MIN_PFLOG_HDRLEN) {
-               printf("[pflog: invalid header length!]");
-               return (hdr->length);   /* XXX: not really */
+       hdr = (const struct pfloghdr *)p;
+       if (GET_U_1(&hdr->length) < MIN_PFLOG_HDRLEN) {
+               ND_PRINT("[pflog: invalid header length!]");
+               ndo->ndo_ll_hdr_len += GET_U_1(&hdr->length);   /* XXX: not really */
+               return;

        }
        hdrlen = BPF_WORDALIGN(hdr->length);
 
        if (caplen < hdrlen) {
        }
        hdrlen = BPF_WORDALIGN(hdr->length);
 
        if (caplen < hdrlen) {

-               printf("[|pflog]");
-               return (hdrlen);        /* XXX: true? */
+               nd_print_trunc(ndo);
+               ndo->ndo_ll_hdr_len += hdrlen;  /* XXX: true? */
+               return;

        }
 
        /* print what we know */
        }
 
        /* print what we know */

-       hdr = (struct pfloghdr *)p;
-       TCHECK(*hdr);
-       if (eflag)
-               pflog_print(hdr);
-       
+       ND_TCHECK_SIZE(hdr);
+       if (ndo->ndo_eflag)
+               pflog_print(ndo, hdr);
+

        /* skip to the real packet */
        /* skip to the real packet */

-       af = hdr->af;
+       af = GET_U_1(&hdr->af);

        length -= hdrlen;
        caplen -= hdrlen;
        p += hdrlen;
        length -= hdrlen;
        caplen -= hdrlen;
        p += hdrlen;


@@ -154,35 +157,31 @@ pflog_if_print(const struct pcap_pkthdr *h, register const u_char *p)
 #if OPENBSD_AF_INET != AF_INET
                case OPENBSD_AF_INET:           /* XXX: read pcap files */
 #endif
 #if OPENBSD_AF_INET != AF_INET
                case OPENBSD_AF_INET:           /* XXX: read pcap files */
 #endif

-                       ip_print(gndo, p, length);
+                       ip_print(ndo, p, length);

                        break;
 
                        break;
 

-#ifdef INET6
+#if defined(AF_INET6) || defined(OPENBSD_AF_INET6)
+#ifdef AF_INET6

                case AF_INET6:
                case AF_INET6:

-#if OPENBSD_AF_INET6 != AF_INET6
+#endif /* AF_INET6 */
+#if !defined(AF_INET6) || OPENBSD_AF_INET6 != AF_INET6

                case OPENBSD_AF_INET6:          /* XXX: read pcap files */
                case OPENBSD_AF_INET6:          /* XXX: read pcap files */

-#endif
-                       ip6_print(p, length);
+#endif /* !defined(AF_INET6) || OPENBSD_AF_INET6 != AF_INET6 */
+                       ip6_print(ndo, p, length);

                        break;
                        break;

-#endif
+#endif /* defined(AF_INET6) || defined(OPENBSD_AF_INET6) */

 
        default:
                /* address family not handled, print raw packet */
 
        default:
                /* address family not handled, print raw packet */

-               if (!eflag)
-                       pflog_print(hdr);
-               if (!suppress_default_print)
-                       default_print(p, caplen);
+               if (!ndo->ndo_eflag)
+                       pflog_print(ndo, hdr);
+               if (!ndo->ndo_suppress_default_print)
+                       ND_DEFAULTPRINT(p, caplen);

        }
        }

-       
-       return (hdrlen);
+
+       ndo->ndo_ll_hdr_len += hdrlen;
+       return;

 trunc:
 trunc:

-       printf("[|pflog]");
-       return (hdrlen);
+       nd_print_trunc(ndo);
+       ndo->ndo_ll_hdr_len += hdrlen;

 }
 }

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