svn commit: r343289 - stable/12/sys/netpfil/pf

Kristof Provost kp at FreeBSD.org
Tue Jan 22 01:07:19 UTC 2019


Author: kp
Date: Tue Jan 22 01:07:18 2019
New Revision: 343289
URL: https://svnweb.freebsd.org/changeset/base/343289

Log:
  MFC r343041
  
  pf: silence a runtime warning
  
  Sometimes, for negated tables, pf can log 'pfr_update_stats: assertion failed'.
  This warning does not clarify anything for users, so silence it, just as
  OpenBSD has.
  
  PR:		234874

Modified:
  stable/12/sys/netpfil/pf/pf_table.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/netpfil/pf/pf_table.c
==============================================================================
--- stable/12/sys/netpfil/pf/pf_table.c	Tue Jan 22 00:56:44 2019	(r343288)
+++ stable/12/sys/netpfil/pf/pf_table.c	Tue Jan 22 01:07:18 2019	(r343289)
@@ -51,6 +51,8 @@ __FBSDID("$FreeBSD$");
 #include <net/vnet.h>
 #include <net/pfvar.h>
 
+#define DPFPRINTF(n, x) if (V_pf_status.debug >= (n)) printf x
+
 #define	ACCEPT_FLAGS(flags, oklist)		\
 	do {					\
 		if ((flags & ~(oklist)) &	\
@@ -1992,7 +1994,8 @@ pfr_update_stats(struct pfr_ktable *kt, struct pf_addr
 	}
 	if ((ke == NULL || ke->pfrke_not) != notrule) {
 		if (op_pass != PFR_OP_PASS)
-			printf("pfr_update_stats: assertion failed.\n");
+			DPFPRINTF(PF_DEBUG_URGENT,
+			    ("pfr_update_stats: assertion failed.\n"));
 		op_pass = PFR_OP_XPASS;
 	}
 	kt->pfrkt_packets[dir_out][op_pass]++;


More information about the svn-src-all mailing list