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 679c2dbd5fe51867a2372d0fd92df15445708937..eb1b1766db004b1eee92cac81a4655eea924fd42 100644 (file)
--- a/print-pflog.c
+++ b/print-pflog.c
@@ -94,14 +94,18 @@ pflog_print(netdissect_options *ndo, const struct pfloghdr *hdr)
        subrulenr = GET_BE_U_4(&hdr->subrulenr);
        if (subrulenr == (uint32_t)-1)
                ND_PRINT("rule %u/", rulenr);
-       else
-               ND_PRINT("rule %u.%s.%u/", rulenr, hdr->ruleset, subrulenr);
+       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 %s: ",
+       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)),
-           hdr->ifname);
+           tok2str(pf_directions, "unkn(%u)", GET_U_1(&hdr->dir)));
+       nd_printjnp(ndo, (const u_char*)hdr->ifname, IFNAMSIZ);
+       ND_PRINT(": ");
 }
 
 void
@@ -180,5 +184,4 @@ pflog_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
 trunc:
        nd_print_trunc(ndo);
        ndo->ndo_ll_hdr_len += hdrlen;
-       return;
 }