diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2002-06-11 01:58:01 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2002-06-11 01:58:01 +0000 |
| commit | e273e728b51194b7f79a3611cc50ca0ac5ce08d7 (patch) | |
| tree | 3839ca911f319d1dd5e4745be5478826ac2298ac /sys | |
| parent | a301008037443233d7cb25cfd4d4bb16dc52977d (diff) | |
rework pfctl statistics display
move FCNT_NAMES from pfvar.h to pfctl_parser.h, only used by pfctl
some input by nick@
ok frantzen@, dhartmei@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/net/pf_ioctl.c | 3 | ||||
| -rw-r--r-- | sys/net/pfvar.h | 9 |
2 files changed, 4 insertions, 8 deletions
diff --git a/sys/net/pf_ioctl.c b/sys/net/pf_ioctl.c index b2b4723ea6b..68fc6cac57f 100644 --- a/sys/net/pf_ioctl.c +++ b/sys/net/pf_ioctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_ioctl.c,v 1.4 2002/06/10 18:52:44 dhartmei Exp $ */ +/* $OpenBSD: pf_ioctl.c,v 1.5 2002/06/11 01:58:00 henning Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -1324,6 +1324,7 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p) error = EINVAL; else status_ifp = ifp; + strlcpy(pf_status.ifname, ifp->if_xname, IFNAMSIZ); break; } diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 39abee4967c..0cac8668da4 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pfvar.h,v 1.82 2002/06/09 20:20:58 dhartmei Exp $ */ +/* $OpenBSD: pfvar.h,v 1.83 2002/06/11 01:58:00 henning Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -432,12 +432,6 @@ struct pf_pdesc { #define FCNT_STATE_REMOVALS 2 #define FCNT_MAX 3 -#define FCNT_NAMES { \ - "state searches", \ - "state inserts", \ - "state removals", \ - NULL \ -} #define ACTION_SET(a, x) \ do { \ @@ -462,6 +456,7 @@ struct pf_status { u_int32_t states; u_int32_t since; u_int32_t debug; + char ifname[IFNAMSIZ]; }; #define PFFRAG_FRENT_HIWAT 5000 /* Number of fragment entries */ |