Differential D60174

libpfctl: zero the counters before summing per-chunk results
ClosedPublic
Actions

Authored by rcm on Wed, Sep 30, 2:38 PM.

Tags

None

Referenced Files

	F174168554: D60174.diff
	Thu, Oct 1, 2:38 AM

	F174165338: D60174.id188274.diff
	Thu, Oct 1, 1:57 AM

	F174154473: D60174.diff
	Wed, Sep 30, 11:47 PM

	F174153704: D60174.id188202.diff
	Wed, Sep 30, 11:38 PM

	F174152138: D60174.diff
	Wed, Sep 30, 11:20 PM

	F174150146: D60174.diff
	Wed, Sep 30, 11:02 PM

	F174145993: D60174.id188202.diff
	Wed, Sep 30, 10:13 PM

	F174145530: D60174.diff
	Wed, Sep 30, 10:08 PM

View All 9 Files

Subscribers

vegeta_tuxpowered.net

Details

Reviewers

Commits

rG55a69b9be886: libpfctl: zero the counters before summing per-chunk results

Summary

The chunked table address functions (set, add, del, clr_astats) add
each chunk's result to the caller's counter without initialising it.
pfctl reuses nadd for the number of tables created, so a replace that
also creates the table is off by one:

pfctl -t foo -T replace 192.0.2.1

reports "2 addresses added".

Zero the counters first, as pfctl_test_addrs() already does. Remove
the workaround for the add case from pfctl (da64f6e047b5), which is
no longer needed.

Add a regression test.

Fixes: 08ed87a4a276 ("pf: convert DIOCRSETADDRS to netlink")
MFC after: 1 week
Sponsored by: Rubicon Communications, LLC ("Netgate")

Test Plan

Regression test included

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Skipped

Unit

Tests Skipped

Event Timeline

rcm created this revision.Wed, Sep 30, 2:38 PM

Herald added subscribers: vegeta_tuxpowered.net, glebius, melifaro and 2 others. · View Herald TranscriptWed, Sep 30, 2:38 PM

rcm requested review of this revision.Wed, Sep 30, 2:38 PM

kp accepted this revision.Wed, Sep 30, 8:28 PM

This revision is now accepted and ready to land.Wed, Sep 30, 8:28 PM

Closed by commit rG55a69b9be886: libpfctl: zero the counters before summing per-chunk results (authored by rcm). · Explain WhyWed, Sep 30, 11:31 PM

This revision was automatically updated to reflect the committed changes.

rcm added a commit: rG55a69b9be886: libpfctl: zero the counters before summing per-chunk results.

Revision Contents
Changeset List

Path

Size

lib/

libpfctl/

16 lines

sbin/

pfctl/

3 lines

tests/

sys/

netpfil/

pf/

38 lines

Diff 188202

lib/libpfctl/libpfctl.c

Loading...

sbin/pfctl/pfctl_radix.c

Loading...

tests/sys/netpfil/pf/table.sh

Loading...