]> The Tcpdump Group git mirrors - tcpdump/blobdiff - print-pflog.c
projects / tcpdump / blobdiff
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix the pointer tests in the non-ndoified TTEST2() macro as well.
[tcpdump] / print-pflog.c
diff --git a/print-pflog.c b/print-pflog.c
index f122a5a33c72371261790deb68a1a6d782fb752f..ac325f4b0e63674b56fd7882f7f049e1d0c1073e 100644 (file)
--- a/print-pflog.c
+++ b/print-pflog.c
@@ -1,5 +1,3 @@
-/*     $OpenBSD: print-pflog.c,v 1.9 2001/09/18 14:52:53 jakob Exp $   */
-
 /*
  * Copyright (c) 1990, 1991, 1993, 1994, 1995, 1996
  *     The Regents of the University of California.  All rights reserved.
 /*
  * Copyright (c) 1990, 1991, 1993, 1994, 1995, 1996
  *     The Regents of the University of California.  All rights reserved.
@@ -22,135 +20,169 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-pflog.c,v 1.5 2002-12-18 08:53:22 guy Exp $ (LBL)";
+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
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
+#ifndef HAVE_NET_PFVAR_H
+#error "No pf headers available"
+#endif
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <net/if.h>
+#include <net/pfvar.h>
+#include <net/if_pflog.h>
+
 #include <tcpdump-stdinc.h>
 
 #include <stdio.h>
 #include <pcap.h>
 
 #include <tcpdump-stdinc.h>
 
 #include <stdio.h>
 #include <pcap.h>
 
+#include "extract.h"
 #include "interface.h"
 #include "addrtoname.h"
 
 #include "interface.h"
 #include "addrtoname.h"
 
-/* The header in OpenBSD pflog files. */
-
-struct pfloghdr {
-       u_int32_t af;
-       char    ifname[16];
-       int16_t rnr;
-       u_int16_t reason;
-       u_int16_t action;
-       u_int16_t dir;
-};
-#define PFLOG_HDRLEN    sizeof(struct pfloghdr)
-
-/* Actions */
-#define PF_PASS  0
-#define PF_DROP  1
-#define PF_SCRUB 2
-
-/* Directions */
-#define PF_IN  0
-#define PF_OUT 1
-
 static struct tok pf_reasons[] = {
 static struct tok pf_reasons[] = {
-       { 0,    "match" },
-       { 1,    "bad-offset" },
-       { 2,    "fragment" },
-       { 3,    "short" },
-       { 4,    "normalize" },
-       { 5,    "memory" },
+       { 0,    "0(match)" },
+       { 1,    "1(bad-offset)" },
+       { 2,    "2(fragment)" },
+       { 3,    "3(short)" },
+       { 4,    "4(normalize)" },
+       { 5,    "5(memory)" },
+       { 6,    "6(bad-timestamp)" },
+       { 7,    "7(congestion)" },
+       { 8,    "8(ip-option)" },
+       { 9,    "9(proto-cksum)" },
+       { 10,   "10(state-mismatch)" },
+       { 11,   "11(state-insert)" },
+       { 12,   "12(state-limit)" },
+       { 13,   "13(src-limit)" },
+       { 14,   "14(synproxy)" },
        { 0,    NULL }
 };
 
 static struct tok pf_actions[] = {
        { 0,    NULL }
 };
 
 static struct tok pf_actions[] = {
-       { PF_PASS,      "pass" },
-       { PF_DROP,      "drop" },
-       { PF_SCRUB,     "scrub" },
-       { 0,            NULL }
+       { PF_PASS,              "pass" },
+       { PF_DROP,              "block" },
+       { PF_SCRUB,             "scrub" },
+       { PF_NAT,               "nat" },
+       { PF_NONAT,             "nat" },
+       { PF_BINAT,             "binat" },
+       { PF_NOBINAT,           "binat" },
+       { PF_RDR,               "rdr" },
+       { PF_NORDR,             "rdr" },
+       { PF_SYNPROXY_DROP,     "synproxy-drop" },
+       { 0,                    NULL }
 };
 
 static struct tok pf_directions[] = {
 };
 
 static struct tok pf_directions[] = {
+       { PF_INOUT,     "in/out" },
        { PF_IN,        "in" },
        { PF_OUT,       "out" },
        { 0,            NULL }
 };
 
        { PF_IN,        "in" },
        { PF_OUT,       "out" },
        { 0,            NULL }
 };
 
-#define OPENBSD_AF_INET                2
-#define OPENBSD_AF_INET6       24
+/* For reading capture files on other systems */
+#define        OPENBSD_AF_INET         2
+#define        OPENBSD_AF_INET6        24
 
 static void
 pflog_print(const struct pfloghdr *hdr)
 {
 
 static void
 pflog_print(const struct pfloghdr *hdr)
 {
-       printf("rule %d/%s: %s %s on %s: ",
-           (short)ntohs(hdr->rnr),
-           tok2str(pf_reasons, "unkn(%u)", ntohs(hdr->reason)),
-           tok2str(pf_actions, "unkn(%u)", ntohs(hdr->action)),
-           tok2str(pf_directions, "unkn(%u)", ntohs(hdr->dir)),
+       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);
 }
 
            hdr->ifname);
 }
 
-void
-pflog_if_print(u_char *user _U_, const struct pcap_pkthdr *h,
-     register const u_char *p)
+u_int
+pflog_if_print(const struct pcap_pkthdr *h, register const u_char *p)
 {
        u_int length = h->len;
 {
        u_int length = h->len;
+       u_int hdrlen;
        u_int caplen = h->caplen;
        const struct pfloghdr *hdr;
        u_int8_t af;
 
        u_int caplen = h->caplen;
        const struct pfloghdr *hdr;
        u_int8_t af;
 
-       ts_print(&h->ts);
-
-       if (caplen < PFLOG_HDRLEN) {
+       /* check length */
+       if (caplen < sizeof(u_int8_t)) {
                printf("[|pflog]");
                printf("[|pflog]");
-               goto out;
+               return (caplen);
        }
 
        }
 
-       /*
-        * Some printers want to check that they're not walking off the
-        * end of the packet.
-        * Rather than pass it all the way down, we set this global.
-        */
-       snapend = p + caplen;
+#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 */
+       }
+       hdrlen = BPF_WORDALIGN(hdr->length);
 
 
-       hdr = (const struct pfloghdr *)p;
+       if (caplen < hdrlen) {
+               printf("[|pflog]");
+               return (hdrlen);        /* XXX: true? */
+       }
+
+       /* print what we know */
+       hdr = (struct pfloghdr *)p;
+       TCHECK(*hdr);
        if (eflag)
                pflog_print(hdr);
        if (eflag)
                pflog_print(hdr);
-       af = ntohl(hdr->af);
-       length -= PFLOG_HDRLEN;
-       caplen -= PFLOG_HDRLEN;
-       p += PFLOG_HDRLEN;
+       
+       /* skip to the real packet */
+       af = hdr->af;
+       length -= hdrlen;
+       caplen -= hdrlen;
+       p += hdrlen;
        switch (af) {
 
        switch (af) {
 
-       case OPENBSD_AF_INET:
-               ip_print(p, length);
-               break;
+               case AF_INET:
+#if OPENBSD_AF_INET != AF_INET
+               case OPENBSD_AF_INET:           /* XXX: read pcap files */
+#endif
+                       ip_print(gndo, p, length);
+                       break;
 
 #ifdef INET6
 
 #ifdef INET6
-       case OPENBSD_AF_INET6:
-               ip6_print(p, length);
-               break;
+               case AF_INET6:
+#if OPENBSD_AF_INET6 != AF_INET6
+               case OPENBSD_AF_INET6:          /* XXX: read pcap files */
+#endif
+                       ip6_print(gndo, p, length);
+                       break;
 #endif
 
        default:
                /* address family not handled, print raw packet */
                if (!eflag)
                        pflog_print(hdr);
 #endif
 
        default:
                /* address family not handled, print raw packet */
                if (!eflag)
                        pflog_print(hdr);
-               if (!xflag && !qflag)
+               if (!suppress_default_print)
                        default_print(p, caplen);
        }
                        default_print(p, caplen);
        }
-
-       if (xflag)
-               default_print(p, caplen);
-out:
-       putchar('\n');
-       --infodelay;
-       if (infoprint)
-               info(0);
+       
+       return (hdrlen);
+trunc:
+       printf("[|pflog]");
+       return (hdrlen);
 }
 }
+
+/*
+ * Local Variables:
+ * c-style: whitesmith
+ * c-basic-offset: 8
+ * End:
+ */
[mirror] the TCPdump network dissector