diff options
| author |   henning <henning@openbsd.org> | 2009-11-23 21:30:14 +0000 |
|---|---|---|
| committer | henning <henning@openbsd.org> | 2009-11-23 21:30:14 +0000 |
| commit | f1b84ad243f72037b40028f9aefdefcc4bbaf6fa (patch) | |
| tree | 6ec8798d104afe62c70d3fbba56d422e9183c836 | |
| parent | since "nat/rdr pass" are history natpass can go (diff) | |
| download | wireguard-openbsd-f1b84ad243f72037b40028f9aefdefcc4bbaf6fa.tar.xz wireguard-openbsd-f1b84ad243f72037b40028f9aefdefcc4bbaf6fa.zip | |
no more natpass
| -rw-r--r-- | usr.bin/systat/mbufs.c | 22 | ||||
| -rw-r--r-- | usr.bin/systat/pftop.c | 5 |
2 files changed, 14 insertions, 13 deletions
diff --git a/usr.bin/systat/mbufs.c b/usr.bin/systat/mbufs.c index 3a48563d107..66c959790a0 100644 --- a/usr.bin/systat/mbufs.c +++ b/usr.bin/systat/mbufs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mbufs.c,v 1.24 2009/04/20 20:30:41 chl Exp $ */ +/* $OpenBSD: mbufs.c,v 1.25 2009/11/23 21:30:14 henning Exp $ */ /* * Copyright (c) 2008 Can Erkin Acar <canacar@openbsd.org> * @@ -59,6 +59,7 @@ field_def fields_mbuf[] = { {"IFACE", 8, 16, 1, FLD_ALIGN_LEFT, -1, 0, 0, 0}, {"RXDELAY", 5, 8, 1, FLD_ALIGN_RIGHT, -1, 0, 0, 0}, {"TXDELAY", 5, 8, 1, FLD_ALIGN_RIGHT, -1, 0, 0, 0}, + {"CURTX", 3, 5, 1, FLD_ALIGN_RIGHT, -1, 0, 0, 0}, {"LIVELOCKS", 5, 10, 1, FLD_ALIGN_RIGHT, -1, 0, 0, 0}, {"SIZE", 3, 5, 1, FLD_ALIGN_RIGHT, -1, 0, 0, 0}, {"ALIVE", 3, 5, 1, FLD_ALIGN_RIGHT, -1, 0, 0, 0}, @@ -73,12 +74,13 @@ field_def fields_mbuf[] = { #define FLD_MB_IFACE FIELD_ADDR(0) #define FLD_MB_RXDELAY FIELD_ADDR(1) #define FLD_MB_TXDELAY FIELD_ADDR(2) -#define FLD_MB_LLOCKS FIELD_ADDR(3) -#define FLD_MB_MSIZE FIELD_ADDR(4) -#define FLD_MB_MALIVE FIELD_ADDR(5) -#define FLD_MB_MLWM FIELD_ADDR(6) -#define FLD_MB_MHWM FIELD_ADDR(7) -#define FLD_MB_MCWM FIELD_ADDR(8) +#define FLD_MB_CURTX FIELD_ADDR(3) +#define FLD_MB_LLOCKS FIELD_ADDR(4) +#define FLD_MB_MSIZE FIELD_ADDR(5) +#define FLD_MB_MALIVE FIELD_ADDR(6) +#define FLD_MB_MLWM FIELD_ADDR(7) +#define FLD_MB_MHWM FIELD_ADDR(8) +#define FLD_MB_MCWM FIELD_ADDR(9) /* Define views */ @@ -87,8 +89,8 @@ field_def *view_mbuf[] = { #if NOTYET FLD_MB_RXDELAY, FLD_MB_TXDELAY, #endif - FLD_MB_LLOCKS, FLD_MB_MSIZE, FLD_MB_MALIVE, FLD_MB_MLWM, FLD_MB_MHWM, - FLD_MB_MCWM, NULL + FLD_MB_CURTX, FLD_MB_LLOCKS, FLD_MB_MSIZE, FLD_MB_MALIVE, FLD_MB_MLWM, + FLD_MB_MHWM, FLD_MB_MCWM, NULL }; /* Define view managers */ @@ -344,6 +346,8 @@ showmbuf(struct if_info *ifi, int p, int showif) print_fld_size(FLD_MB_MALIVE, mbpool.pr_nget - mbpool.pr_nput); print_fld_size(FLD_MB_MHWM, mbpool.pr_hiwat); } + if (showif && p != -1) + print_fld_uint(FLD_MB_CURTX, ifi->data.ifi_maxtx); #if NOTYET print_fld_uint(FLD_MB_RXDELAY, ifi->data.ifi_rxdelay); diff --git a/usr.bin/systat/pftop.c b/usr.bin/systat/pftop.c index 3781322298c..8b2b3f938b2 100644 --- a/usr.bin/systat/pftop.c +++ b/usr.bin/systat/pftop.c @@ -1,4 +1,4 @@ -/* $Id: pftop.c,v 1.13 2009/07/14 17:58:14 jsg Exp $ */ +/* $Id: pftop.c,v 1.14 2009/11/23 21:30:14 henning Exp $ */ /* * Copyright (c) 2001, 2007 Can Erkin Acar * Copyright (c) 2001 Daniel Hartmeier @@ -1336,9 +1336,6 @@ print_rule(struct pf_rule *pr) tb_start(); - if (pr->natpass) - tbprintf("pass "); - if (pr->action == PF_DROP) { if (pr->rule_flag & PFRULE_RETURNRST) tbprintf("return-rst "); |