Author: markj
Date: Wed Dec 9 00:56:14 2020
New Revision: 368470
URL: https://svnweb.freebsd.org/changeset/base/368470
Log:
MFC r368276:
pf: Fix table entry counter toggling
PR: 251414
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 Wed Dec 9 00:28:27 2020
(r368469)
+++ stable/12/sys/netpfil/pf/pf_table.c Wed Dec 9 00:56:14 2020
(r368470)
@@ -1642,6 +1642,7 @@ pfr_ina_commit(struct pfr_table *trs, u_int32_t ticket
static void
pfr_commit_ktable(struct pfr_ktable *kt, long tzero)
{
+ counter_u64_t *pkc, *qkc;
struct pfr_ktable *shadow = kt->pfrkt_shadow;
int nflags;
@@ -1663,14 +1664,17 @@ pfr_commit_ktable(struct pfr_ktable *kt, long tzero)
SLIST_INIT(&delq);
SLIST_INIT(&garbageq);
pfr_clean_node_mask(shadow, &addrq);
- for (p = SLIST_FIRST(&addrq); p != NULL; p = next) {
- next = SLIST_NEXT(p, pfrke_workq); /* XXX */
+ SLIST_FOREACH_SAFE(p, &addrq, pfrke_workq, next) {
pfr_copyout_addr(&ad, p);
q = pfr_lookup_addr(kt, &ad, 1);
if (q != NULL) {
if (q->pfrke_not != p->pfrke_not)
SLIST_INSERT_HEAD(&changeq, q,
pfrke_workq);
+ pkc = &p->pfrke_counters.pfrkc_counters;
+ qkc = &q->pfrke_counters.pfrkc_counters;
+ if ((*pkc == NULL) != (*qkc == NULL))
+ SWAP(counter_u64_t, *pkc, *qkc);
q->pfrke_mark = 1;
SLIST_INSERT_HEAD(&garbageq, p, pfrke_workq);
} else {
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
