Page MenuHomeFreeBSD
Files F153949693

D29645.diff
No OneTemporary
Actions

D29645.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
@@ -81,9 +81,9 @@
uid_t cuid;
pid_t cpid;
- counter_u64_t states_cur;
- counter_u64_t states_tot;
- counter_u64_t src_nodes;
+ uint64_t states_cur;
+ uint64_t states_tot;
+ uint64_t src_nodes;
u_int16_t return_icmp;
u_int16_t return_icmp6;
@@ -129,10 +129,6 @@
struct pf_addr addr;
u_int16_t port;
} divert;
-
- uint64_t u_states_cur;
- uint64_t u_states_tot;
- uint64_t u_src_nodes;
};
TAILQ_HEAD(pfctl_rulequeue, pfctl_rule);
diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c
--- a/lib/libpfctl/libpfctl.c
+++ b/lib/libpfctl/libpfctl.c
@@ -367,9 +367,9 @@
pf_nvdivert_to_divert(nvlist_get_nvlist(nvl, "divert"), rule);
- rule->u_states_cur = nvlist_get_number(nvl, "states_cur");
- rule->u_states_tot = nvlist_get_number(nvl, "states_tot");
- rule->u_src_nodes = nvlist_get_number(nvl, "src_nodes");
+ rule->states_cur = nvlist_get_number(nvl, "states_cur");
+ rule->states_tot = nvlist_get_number(nvl, "states_tot");
+ rule->src_nodes = nvlist_get_number(nvl, "src_nodes");
}
int
diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c
--- a/sbin/pfctl/pfctl.c
+++ b/sbin/pfctl/pfctl.c
@@ -891,12 +891,12 @@
(unsigned long long)(rule->packets[0] +
rule->packets[1]),
(unsigned long long)(rule->bytes[0] +
- rule->bytes[1]), (uintmax_t)rule->u_states_cur);
+ rule->bytes[1]), (uintmax_t)rule->states_cur);
if (!(opts & PF_OPT_DEBUG))
printf(" [ Inserted: uid %u pid %u "
"State Creations: %-6ju]\n",
(unsigned)rule->cuid, (unsigned)rule->cpid,
- (uintmax_t)rule->u_states_tot);
+ (uintmax_t)rule->states_tot);
}
}
@@ -1012,7 +1012,7 @@
(unsigned long long)rule.bytes[0],
(unsigned long long)rule.packets[1],
(unsigned long long)rule.bytes[1],
- (uintmax_t)rule.u_states_tot);
+ (uintmax_t)rule.states_tot);
}
break;
case PFCTL_SHOW_RULES:

File Metadata

Mime Type
text/plain
Expires
Sun, Apr 26, 1:06 AM (9 m, 37 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32151784
Default Alt Text
D29645.diff (2 KB)

Event Timeline