NDOize AH, BEEP and DTP decoders

[tcpdump] / print-pflog.c

diff --git a/print-pflog.c b/print-pflog.c
index d1a461561ee204dc617a965272e2e97077c55570..f5f8d424d208d2abcce3f19f8c5fc1138cad8d9f 100644 (file)
--- a/print-pflog.c
+++ b/print-pflog.c
@@ -19,11 +19,6 @@
  * 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
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -42,10 +37,12 @@ static const char rcsid[] _U_ =
 #include <stdio.h>
 #include <pcap.h>
 
+#include "extract.h"
 #include "interface.h"
-#include "addrtoname.h"
 
-static struct tok pf_reasons[] = {
+static const char tstr[] = "[|pflog]";
+
+static const struct tok pf_reasons[] = {
        { 0,    "0(match)" },
        { 1,    "1(bad-offset)" },
        { 2,    "2(fragment)" },
@@ -64,7 +61,7 @@ static struct tok pf_reasons[] = {
        { 0,    NULL }
 };
 
-static struct tok pf_actions[] = {
+static const struct tok pf_actions[] = {
        { PF_PASS,              "pass" },
        { PF_DROP,              "block" },
        { PF_SCRUB,             "scrub" },
@@ -78,7 +75,7 @@ static struct tok pf_actions[] = {
        { 0,                    NULL }
 };
 
-static struct tok pf_directions[] = {
+static const struct tok pf_directions[] = {
        { PF_INOUT,     "in/out" },
        { PF_IN,        "in" },
        { PF_OUT,       "out" },
@@ -119,7 +116,7 @@ pflog_if_print(const struct pcap_pkthdr *h, register const u_char *p)
 
        /* check length */
        if (caplen < sizeof(u_int8_t)) {
-               printf("[|pflog]");
+               printf("%s", tstr);
                return (caplen);
        }
 
@@ -132,7 +129,7 @@ pflog_if_print(const struct pcap_pkthdr *h, register const u_char *p)
        hdrlen = BPF_WORDALIGN(hdr->length);
 
        if (caplen < hdrlen) {
-               printf("[|pflog]");
+               printf("%s", tstr);
                return (hdrlen);        /* XXX: true? */
        }
 
@@ -141,7 +138,7 @@ pflog_if_print(const struct pcap_pkthdr *h, register const u_char *p)
        TCHECK(*hdr);
        if (eflag)
                pflog_print(hdr);
-       
+
        /* skip to the real packet */
        af = hdr->af;
        length -= hdrlen;
@@ -161,7 +158,7 @@ pflog_if_print(const struct pcap_pkthdr *h, register const u_char *p)
 #if OPENBSD_AF_INET6 != AF_INET6
                case OPENBSD_AF_INET6:          /* XXX: read pcap files */
 #endif
-                       ip6_print(p, length);
+                       ip6_print(gndo, p, length);
                        break;
 #endif
 
@@ -172,10 +169,10 @@ pflog_if_print(const struct pcap_pkthdr *h, register const u_char *p)
                if (!suppress_default_print)
                        default_print(p, caplen);
        }
-       
+
        return (hdrlen);
 trunc:
-       printf("[|pflog]");
+       printf("%s", tstr);
        return (hdrlen);
 }