pfctl: print counters in decimal
795d78a467
pfctl: Don't use PRIu64 mistakenly changed these to be
printed as hexadecimal numbers.
Reported by: Florian Smeets
MFC after: 4 days
Sponsored by: Rubicon Communications, LLC ("Netgate")
This commit is contained in:
parent
88a3af4da1
commit
846a6e8f9a
@ -575,9 +575,9 @@ print_status(struct pfctl_status *s, struct pfctl_syncookies *cookies, int opts)
|
|||||||
(unsigned long long)s->pcounters[1][1][PF_DROP]);
|
(unsigned long long)s->pcounters[1][1][PF_DROP]);
|
||||||
}
|
}
|
||||||
printf("%-27s %14s %16s\n", "State Table", "Total", "Rate");
|
printf("%-27s %14s %16s\n", "State Table", "Total", "Rate");
|
||||||
printf(" %-25s %14jx %14s\n", "current entries", s->states, "");
|
printf(" %-25s %14ju %14s\n", "current entries", s->states, "");
|
||||||
TAILQ_FOREACH(c, &s->fcounters, entry) {
|
TAILQ_FOREACH(c, &s->fcounters, entry) {
|
||||||
printf(" %-25s %14jx ", c->name, c->counter);
|
printf(" %-25s %14ju ", c->name, c->counter);
|
||||||
if (runtime > 0)
|
if (runtime > 0)
|
||||||
printf("%14.1f/s\n",
|
printf("%14.1f/s\n",
|
||||||
(double)c->counter / (double)runtime);
|
(double)c->counter / (double)runtime);
|
||||||
@ -586,10 +586,10 @@ print_status(struct pfctl_status *s, struct pfctl_syncookies *cookies, int opts)
|
|||||||
}
|
}
|
||||||
if (opts & PF_OPT_VERBOSE) {
|
if (opts & PF_OPT_VERBOSE) {
|
||||||
printf("Source Tracking Table\n");
|
printf("Source Tracking Table\n");
|
||||||
printf(" %-25s %14jx %14s\n", "current entries",
|
printf(" %-25s %14ju %14s\n", "current entries",
|
||||||
s->src_nodes, "");
|
s->src_nodes, "");
|
||||||
TAILQ_FOREACH(c, &s->scounters, entry) {
|
TAILQ_FOREACH(c, &s->scounters, entry) {
|
||||||
printf(" %-25s %14jx ", c->name, c->counter);
|
printf(" %-25s %14ju ", c->name, c->counter);
|
||||||
if (runtime > 0)
|
if (runtime > 0)
|
||||||
printf("%14.1f/s\n",
|
printf("%14.1f/s\n",
|
||||||
(double)c->counter / (double)runtime);
|
(double)c->counter / (double)runtime);
|
||||||
@ -599,7 +599,7 @@ print_status(struct pfctl_status *s, struct pfctl_syncookies *cookies, int opts)
|
|||||||
}
|
}
|
||||||
printf("Counters\n");
|
printf("Counters\n");
|
||||||
TAILQ_FOREACH(c, &s->counters, entry) {
|
TAILQ_FOREACH(c, &s->counters, entry) {
|
||||||
printf(" %-25s %14jx ", c->name, c->counter);
|
printf(" %-25s %14ju ", c->name, c->counter);
|
||||||
if (runtime > 0)
|
if (runtime > 0)
|
||||||
printf("%14.1f/s\n",
|
printf("%14.1f/s\n",
|
||||||
(double)c->counter / (double)runtime);
|
(double)c->counter / (double)runtime);
|
||||||
@ -609,7 +609,7 @@ print_status(struct pfctl_status *s, struct pfctl_syncookies *cookies, int opts)
|
|||||||
if (opts & PF_OPT_VERBOSE) {
|
if (opts & PF_OPT_VERBOSE) {
|
||||||
printf("Limit Counters\n");
|
printf("Limit Counters\n");
|
||||||
TAILQ_FOREACH(c, &s->lcounters, entry) {
|
TAILQ_FOREACH(c, &s->lcounters, entry) {
|
||||||
printf(" %-25s %14jx ", c->name, c->counter);
|
printf(" %-25s %14ju ", c->name, c->counter);
|
||||||
if (runtime > 0)
|
if (runtime > 0)
|
||||||
printf("%14.1f/s\n",
|
printf("%14.1f/s\n",
|
||||||
(double)c->counter / (double)runtime);
|
(double)c->counter / (double)runtime);
|
||||||
|
Loading…
Reference in New Issue
Block a user