Page MenuHomeFreeBSD
Files F174154473

D60174.diff
No OneTemporary
Actions

D60174.diff
View Options

diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c
--- a/lib/libpfctl/libpfctl.c
+++ b/lib/libpfctl/libpfctl.c
@@ -2517,6 +2517,9 @@
int partial_added;
int chunk_size;
+ if (nadd)
+ *nadd = 0;
+
do {
chunk_size = MIN(size - off, 256);
ret = _pfctl_table_add_addrs_h(h, tbl, &addr[off], chunk_size, &partial_added, flags);
@@ -2609,6 +2612,9 @@
int partial_deleted;
int chunk_size;
+ if (ndel)
+ *ndel = 0;
+
do {
chunk_size = MIN(size - off, 256);
ret = _pfctl_table_del_addrs_h(h, tbl, &addr[off], chunk_size,
@@ -2694,6 +2700,13 @@
int partial_add, partial_del, partial_change;
int chunk_size;
+ if (nadd)
+ *nadd = 0;
+ if (ndel)
+ *ndel = 0;
+ if (nchange)
+ *nchange = 0;
+
do {
flags &= ~(PFR_FLAG_START | PFR_FLAG_DONE);
if (off == 0)
@@ -3984,6 +3997,9 @@
int partial_zeroed;
int chunk_size;
+ if (nzero)
+ *nzero = 0;
+
do {
chunk_size = MIN(size - off, 256);
ret = _pfctl_clr_astats(h, tbl, &addrs[off], chunk_size,
diff --git a/sbin/pfctl/pfctl_radix.c b/sbin/pfctl/pfctl_radix.c
--- a/sbin/pfctl/pfctl_radix.c
+++ b/sbin/pfctl/pfctl_radix.c
@@ -136,9 +136,6 @@
{
int ret;
- if (*nadd)
- *nadd = 0;
-
ret = pfctl_table_add_addrs_h(pfh, tbl, addr, size, nadd, flags);
if (ret) {
errno = ret;
diff --git a/tests/sys/netpfil/pf/table.sh b/tests/sys/netpfil/pf/table.sh
--- a/tests/sys/netpfil/pf/table.sh
+++ b/tests/sys/netpfil/pf/table.sh
@@ -878,6 +878,43 @@
pft_cleanup
}
+atf_test_case "replace_create" "cleanup"
+replace_create_head()
+{
+ atf_set descr 'Test the counts of a replace that creates the table'
+ atf_set require.user root
+}
+
+replace_create_body()
+{
+ pft_init
+ pwd=$(pwd)
+
+ vnet_mkjail alcatraz
+ jexec alcatraz pfctl -e
+
+ # libpfctl used to add the number of addresses to whatever the
+ # caller's counter held, which here is the number of tables created.
+ atf_check -s exit:0 -e "match:^1 table created\.$" \
+ -e "match:^1 addresses added\.$" \
+ jexec alcatraz pfctl -t foo -T replace 192.0.2.1
+
+ # More than one chunk of addresses.
+ for i in `seq 1 2`; do
+ for j in `seq 1 150`; do
+ echo "1.${i}.${j}.1" >> ${pwd}/bar.lst
+ done
+ done
+ atf_check -s exit:0 -e "match:^1 table created\.$" \
+ -e "match:^300 addresses added\.$" \
+ jexec alcatraz pfctl -t bar -T replace -f ${pwd}/bar.lst
+}
+
+replace_create_cleanup()
+{
+ pft_cleanup
+}
+
atf_test_case "load" "cleanup"
load_head()
{
@@ -1002,6 +1039,7 @@
atf_add_test_case "in_anchor"
atf_add_test_case "replace"
atf_add_test_case "replace_verbose"
+ atf_add_test_case "replace_create"
atf_add_test_case "load"
atf_add_test_case "test"
atf_add_test_case "show_no_counters"

File Metadata

Mime Type
text/plain
Expires
Thu, Oct 1, 11:47 PM (8 h, 8 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
40044232
Default Alt Text
D60174.diff (2 KB)

Event Timeline