Page MenuHomeFreeBSD
Files F174600885

D29727.id87431.diff
No OneTemporary
Actions

D29727.id87431.diff
View Options

diff --git a/lib/libpfctl/libpfctl.h b/lib/libpfctl/libpfctl.h
--- a/lib/libpfctl/libpfctl.h
+++ b/lib/libpfctl/libpfctl.h
@@ -182,6 +182,9 @@
int pfctl_get_rule(int dev, u_int32_t nr, u_int32_t ticket,
const char *anchor, u_int32_t ruleset, struct pfctl_rule *rule,
char *anchor_call);
+int pfctl_get_clear_rule(int dev, u_int32_t nr, u_int32_t ticket,
+ const char *anchor, u_int32_t ruleset, struct pfctl_rule *rule,
+ char *anchor_call, bool clear);
int pfctl_add_rule(int dev, const struct pfctl_rule *r,
const char *anchor, const char *anchor_call, u_int32_t ticket,
u_int32_t pool_ticket);
diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c
--- a/lib/libpfctl/libpfctl.c
+++ b/lib/libpfctl/libpfctl.c
@@ -507,6 +507,14 @@
int
pfctl_get_rule(int dev, u_int32_t nr, u_int32_t ticket, const char *anchor,
u_int32_t ruleset, struct pfctl_rule *rule, char *anchor_call)
+{
+ return (pfctl_get_clear_rule(dev, nr, ticket, anchor, ruleset, rule,
+ anchor_call, false));
+}
+
+int pfctl_get_clear_rule(int dev, u_int32_t nr, u_int32_t ticket,
+ const char *anchor, u_int32_t ruleset, struct pfctl_rule *rule,
+ char *anchor_call, bool clear)
{
struct pfioc_nv nv;
nvlist_t *nvl;
@@ -522,6 +530,9 @@
nvlist_add_string(nvl, "anchor", anchor);
nvlist_add_number(nvl, "ruleset", ruleset);
+ if (clear)
+ nvlist_add_bool(nvl, "clear_counter", true);
+
nvlpacked = nvlist_pack(nvl, &nv.len);
if (nvlpacked == NULL) {
nvlist_destroy(nvl);
diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c
--- a/sbin/pfctl/pfctl.c
+++ b/sbin/pfctl/pfctl.c
@@ -949,13 +949,11 @@
pfctl_print_title("LABEL COUNTERS:");
}
mnr = pr.nr;
- if (opts & PF_OPT_CLRRULECTRS)
- pr.action = PF_GET_CLR_CNTR;
for (nr = 0; nr < mnr; ++nr) {
pr.nr = nr;
- if (pfctl_get_rule(dev, nr, pr.ticket, path, PF_SCRUB,
- &rule, pr.anchor_call)) {
+ if (pfctl_get_clear_rule(dev, nr, pr.ticket, path, PF_SCRUB,
+ &rule, pr.anchor_call, opts & PF_OPT_CLRRULECTRS)) {
warn("DIOCGETRULENV");
goto error;
}
@@ -987,8 +985,8 @@
mnr = pr.nr;
for (nr = 0; nr < mnr; ++nr) {
pr.nr = nr;
- if (pfctl_get_rule(dev, nr, pr.ticket, path, PF_PASS,
- &rule, pr.anchor_call)) {
+ if (pfctl_get_clear_rule(dev, nr, pr.ticket, path, PF_PASS,
+ &rule, pr.anchor_call, opts & PF_OPT_CLRRULECTRS)) {
warn("DIOCGETRULE");
goto error;
}

File Metadata

Mime Type
text/plain
Expires
Mon, Oct 5, 2:17 PM (14 h, 53 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
40241886
Default Alt Text
D29727.id87431.diff (2 KB)

Event Timeline