diff options
| author | Ryan Thomas McBride <mcbride@cvs.openbsd.org> | 2005-11-04 08:24:16 +0000 |
|---|---|---|
| committer | Ryan Thomas McBride <mcbride@cvs.openbsd.org> | 2005-11-04 08:24:16 +0000 |
| commit | 5e41b39a3485941001cdb7a8ee3a81d20df276a0 (patch) | |
| tree | baced972cdcecf1063ebb47902c6c9e8c1b18445 /sbin | |
| parent | 086343e525726acfced4e03c5abe185e9af29eb6 (diff) | |
crank pf_state and pf_src_node byte and packet counters to u_in64_t, since
we're breaking pfsync compatibility this cycle anyways.
Requested by djm@, ok henning@, 'wheee!' deraadt@
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/pfctl/pf_print_state.c | 4 | ||||
| -rw-r--r-- | sbin/pfctl/pfctl_parser.c | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/sbin/pfctl/pf_print_state.c b/sbin/pfctl/pf_print_state.c index 21670992eec..ec7bfa7060a 100644 --- a/sbin/pfctl/pf_print_state.c +++ b/sbin/pfctl/pf_print_state.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_print_state.c,v 1.41 2005/05/24 22:14:22 pascoe Exp $ */ +/* $OpenBSD: pf_print_state.c,v 1.42 2005/11/04 08:24:15 mcbride Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -274,7 +274,7 @@ print_state(struct pf_state *s, int opts) min = s->expire % 60; s->expire /= 60; printf(", expires in %.2u:%.2u:%.2u", s->expire, min, sec); - printf(", %u:%u pkts, %u:%u bytes", + printf(", %llu:%llu pkts, %llu:%llu bytes", s->packets[0], s->packets[1], s->bytes[0], s->bytes[1]); if (s->anchor.nr != -1) printf(", anchor %u", s->anchor.nr); diff --git a/sbin/pfctl/pfctl_parser.c b/sbin/pfctl/pfctl_parser.c index 429647ba396..5f0069ab721 100644 --- a/sbin/pfctl/pfctl_parser.c +++ b/sbin/pfctl/pfctl_parser.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfctl_parser.c,v 1.221 2005/10/18 08:59:30 henning Exp $ */ +/* $OpenBSD: pfctl_parser.c,v 1.222 2005/11/04 08:24:15 mcbride Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -638,7 +638,8 @@ print_src_node(struct pf_src_node *sn, int opts) printf(", expires in %.2u:%.2u:%.2u", sn->expire, min, sec); } - printf(", %u pkts, %u bytes", sn->packets[0] + sn->packets[1], + printf(", %llu pkts, %llu bytes", + sn->packets[0] + sn->packets[1], sn->bytes[0] + sn->bytes[1]); switch (sn->ruletype) { case PF_NAT: |