git: 618400a6ed6e - stable/12 - pfctl: print counters in decimal

[Kristof Provost]

The branch stable/12 has been updated by kp:

URL: https://cgit.FreeBSD.org/src/commit/?id=618400a6ed6eb2f5eb04651cb2509d3ca3adae80

commit 618400a6ed6eb2f5eb04651cb2509d3ca3adae80
Author:     Kristof Provost <kp at FreeBSD.org>
AuthorDate: 2021-09-04 14:07:59 +0000
Commit:     Kristof Provost <kp at FreeBSD.org>
CommitDate: 2021-09-08 07:32:56 +0000

    pfctl: print counters in decimal
    
    795d78a46713 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")
    
    (cherry picked from commit 846a6e8f9ab25df4e06d28c05fb66060d803c9ba)
---
 sbin/pfctl/pfctl_parser.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sbin/pfctl/pfctl_parser.c b/sbin/pfctl/pfctl_parser.c
index 536314d14ba1..24931f023431 100644
--- a/sbin/pfctl/pfctl_parser.c
+++ b/sbin/pfctl/pfctl_parser.c
@@ -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]);
 	}
 	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) {
-		printf("  %-25s %14jx ", c->name, c->counter);
+		printf("  %-25s %14ju ", c->name, c->counter);
 		if (runtime > 0)
 			printf("%14.1f/s\n",
 			    (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) {
 		printf("Source Tracking Table\n");
-		printf("  %-25s %14jx %14s\n", "current entries",
+		printf("  %-25s %14ju %14s\n", "current entries",
 		    s->src_nodes, "");
 		TAILQ_FOREACH(c, &s->scounters, entry) {
-			printf("  %-25s %14jx ", c->name, c->counter);
+			printf("  %-25s %14ju ", c->name, c->counter);
 			if (runtime > 0)
 				printf("%14.1f/s\n",
 				    (double)c->counter / (double)runtime);
@@ -599,7 +599,7 @@ print_status(struct pfctl_status *s, struct pfctl_syncookies *cookies, int opts)
 	}
 	printf("Counters\n");
 	TAILQ_FOREACH(c, &s->counters, entry) {
-		printf("  %-25s %14jx ", c->name, c->counter);
+		printf("  %-25s %14ju ", c->name, c->counter);
 		if (runtime > 0)
 			printf("%14.1f/s\n",
 			    (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) {
 		printf("Limit Counters\n");
 		TAILQ_FOREACH(c, &s->lcounters, entry) {
-			printf("  %-25s %14jx ", c->name, c->counter);
+			printf("  %-25s %14ju ", c->name, c->counter);
 			if (runtime > 0)
 				printf("%14.1f/s\n",
 				    (double)c->counter / (double)runtime);