KekenoBSD/src
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

libpfctl: fix tstats address count

Browse Source 
Reported by:	Marcos Mendoza <mmendoza@netgate.com>
See also:	https://redmine.pfsense.org/issues/16588
Sponsored by:	Rubicon Communications, LLC ("Netgate")
This commit is contained in:
Kristof Provost
2025-12-17 14:59:34 +01:00
parent a862e4b5a2
commit ad7f49f98b
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/libpfctl/libpfctl.c
+2 -1
View File
@@ -3611,7 +3611,8 @@ static struct snl_attr_parser ap_tstats[] = {
{ .type = PF_TS_MATCH, .off = _OUT(pfrts_match), .cb = snl_attr_get_uint64 }, { .type = PF_TS_MATCH, .off = _OUT(pfrts_match), .cb = snl_attr_get_uint64 },
{. type = PF_TS_NOMATCH, .off = _OUT(pfrts_nomatch), .cb = snl_attr_get_uint64 }, {. type = PF_TS_NOMATCH, .off = _OUT(pfrts_nomatch), .cb = snl_attr_get_uint64 },
{ .type = PF_TS_TZERO, .off = _OUT(pfrts_tzero), .cb = snl_attr_get_uint64 }, { .type = PF_TS_TZERO, .off = _OUT(pfrts_tzero), .cb = snl_attr_get_uint64 },
{ .type = PF_TS_REFCNT, .off = _OUT(pfrts_cnt), . arg = (void *)PFR_REFCNT_MAX, .cb = snl_attr_get_uint64_into_int_array }, { .type = PF_TS_CNT, .off = _OUT(pfrts_cnt), .cb = snl_attr_get_uint64 },
{ .type = PF_TS_REFCNT, .off = _OUT(pfrts_refcnt), . arg = (void *)PFR_REFCNT_MAX, .cb = snl_attr_get_uint64_into_int_array },
}; };
#undef _OUT #undef _OUT
SNL_DECLARE_PARSER(tstats_parser, struct genlmsghdr, snl_f_p_empty, ap_tstats); SNL_DECLARE_PARSER(tstats_parser, struct genlmsghdr, snl_f_p_empty, ap_tstats);
tests/sys/netpfil/pf/table.sh
+4
View File
@@ -194,6 +194,10 @@ zero_one_body()
jexec alcatraz pfctl -t foo -T show -vv jexec alcatraz pfctl -t foo -T show -vv
atf_check -s exit:0 -e ignore \
-o match:'Addresses: 2' \
jexec alcatraz pfctl -vvsTables
atf_check -s exit:0 -e ignore \ atf_check -s exit:0 -e ignore \
-o match:'In/Block:.*'"$TABLE_STATS_ZERO_REGEXP" \ -o match:'In/Block:.*'"$TABLE_STATS_ZERO_REGEXP" \
-o match:'In/Pass:.*'"$TABLE_STATS_NONZERO_REGEXP" \ -o match:'In/Pass:.*'"$TABLE_STATS_NONZERO_REGEXP" \