Compile with '-Wsign-compare' in devel mode if supported

[tcpdump] / print-pflog.c

diff --git a/print-pflog.c b/print-pflog.c
index 1f552e14bde68a297d398984445bc14e5a7a305b..7cd96b2eca023588b3b89b588e3fc046c2c6c568 100644 (file)
--- a/print-pflog.c
+++ b/print-pflog.c
@@ -22,7 +22,7 @@
 /* \summary: OpenBSD packet filter log file printer */
 
 #ifdef HAVE_CONFIG_H
 /* \summary: OpenBSD packet filter log file printer */
 
 #ifdef HAVE_CONFIG_H

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

 #endif
 
 #ifndef HAVE_NET_PFVAR_H
 #endif
 
 #ifndef HAVE_NET_PFVAR_H


@@ -34,12 +34,11 @@
 #include <net/pfvar.h>
 #include <net/if_pflog.h>
 
 #include <net/pfvar.h>
 #include <net/if_pflog.h>
 

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

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

-static const char tstr[] = "[|pflog]";

 
 static const struct tok pf_reasons[] = {
        { 0,    "0(match)" },
 
 static const struct tok pf_reasons[] = {
        { 0,    "0(match)" },


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

+       ndo->ndo_protocol = "pflog";

        rulenr = EXTRACT_BE_U_4(&hdr->rulenr);
        subrulenr = EXTRACT_BE_U_4(&hdr->subrulenr);
        if (subrulenr == (uint32_t)-1)
        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));
+               ND_PRINT("rule %u/", rulenr);

        else
        else

-               ND_PRINT((ndo, "rule %u.%s.%u/", rulenr, hdr->ruleset, subrulenr));
+               ND_PRINT("rule %u.%s.%u/", rulenr, hdr->ruleset, subrulenr);

 
 

-       ND_PRINT((ndo, "%s: %s %s on %s: ",
+       ND_PRINT("%s: %s %s on %s: ",

            tok2str(pf_reasons, "unkn(%u)", EXTRACT_U_1(&hdr->reason)),
            tok2str(pf_actions, "unkn(%u)", EXTRACT_U_1(&hdr->action)),
            tok2str(pf_directions, "unkn(%u)", EXTRACT_U_1(&hdr->dir)),
            tok2str(pf_reasons, "unkn(%u)", EXTRACT_U_1(&hdr->reason)),
            tok2str(pf_actions, "unkn(%u)", EXTRACT_U_1(&hdr->action)),
            tok2str(pf_directions, "unkn(%u)", EXTRACT_U_1(&hdr->dir)),

-           hdr->ifname));
+           hdr->ifname);

 }
 
 u_int
 }
 
 u_int


@@ -114,27 +114,28 @@ pflog_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
        const struct pfloghdr *hdr;
        uint8_t af;
 
        const struct pfloghdr *hdr;
        uint8_t af;
 

+       ndo->ndo_protocol = "pflog_if";

        /* check length */
        if (caplen < sizeof(uint8_t)) {
        /* check length */
        if (caplen < sizeof(uint8_t)) {

-               ND_PRINT((ndo, "%s", tstr));
+               nd_print_trunc(ndo);

                return (caplen);
        }
 
 #define MIN_PFLOG_HDRLEN       45
        hdr = (const struct pfloghdr *)p;
        if (hdr->length < MIN_PFLOG_HDRLEN) {
                return (caplen);
        }
 
 #define MIN_PFLOG_HDRLEN       45
        hdr = (const struct pfloghdr *)p;
        if (hdr->length < MIN_PFLOG_HDRLEN) {

-               ND_PRINT((ndo, "[pflog: invalid header length!]"));
+               ND_PRINT("[pflog: invalid header length!]");

                return (hdr->length);   /* XXX: not really */
        }
        hdrlen = BPF_WORDALIGN(hdr->length);
 
        if (caplen < hdrlen) {
                return (hdr->length);   /* XXX: not really */
        }
        hdrlen = BPF_WORDALIGN(hdr->length);
 
        if (caplen < hdrlen) {

-               ND_PRINT((ndo, "%s", tstr));
+               nd_print_trunc(ndo);

                return (hdrlen);        /* XXX: true? */
        }
 
        /* print what we know */
                return (hdrlen);        /* XXX: true? */
        }
 
        /* print what we know */

-       ND_TCHECK(*hdr);
+       ND_TCHECK_SIZE(hdr);

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


@@ -173,13 +174,6 @@ pflog_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
 
        return (hdrlen);
 trunc:
 
        return (hdrlen);
 trunc:

-       ND_PRINT((ndo, "%s", tstr));
+       nd_print_trunc(ndo);

        return (hdrlen);
 }
        return (hdrlen);
 }

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