diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2003-01-09 18:34:30 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2003-01-09 18:34:30 +0000 |
| commit | 7c834a600006fbb3cdcfb9ade2271b1f65b928d4 (patch) | |
| tree | be1a2b02b3bb08179952ee6009b08f3ccd1cde10 /sbin | |
| parent | 712bc9000d147cba1ce6c4b3215fc3bd4cc4f674 (diff) | |
use a verbose flag in pfctl_show_altq instead of carrying around opts from
pfctl.c, and get rid of the #include "pfctl_parser.h"
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/pfctl/pfctl.c | 6 | ||||
| -rw-r--r-- | sbin/pfctl/pfctl_qstats.c | 7 |
2 files changed, 6 insertions, 7 deletions
diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index ded52ec4e3d..eac96cb1408 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfctl.c,v 1.127 2003/01/09 17:33:19 henning Exp $ */ +/* $OpenBSD: pfctl.c,v 1.128 2003/01/09 18:34:29 henning Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -1436,7 +1436,7 @@ main(int argc, char *argv[]) pfctl_show_nat(dev, opts); break; case 'q': - pfctl_show_altq(dev, opts); + pfctl_show_altq(dev, opts & PF_OPT_VERBOSE); break; case 's': pfctl_show_states(dev, 0, opts); @@ -1453,7 +1453,7 @@ main(int argc, char *argv[]) case 'a': pfctl_show_rules(dev, opts, 0); pfctl_show_nat(dev, opts); - pfctl_show_altq(dev, opts); + pfctl_show_altq(dev, opts & PF_OPT_VERBOSE); pfctl_show_states(dev, 0, opts); pfctl_show_status(dev); pfctl_show_rules(dev, opts, 1); diff --git a/sbin/pfctl/pfctl_qstats.c b/sbin/pfctl/pfctl_qstats.c index 9693140f32a..9c63bfc4eaf 100644 --- a/sbin/pfctl/pfctl_qstats.c +++ b/sbin/pfctl/pfctl_qstats.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfctl_qstats.c,v 1.3 2003/01/09 18:27:41 henning Exp $ */ +/* $OpenBSD: pfctl_qstats.c,v 1.4 2003/01/09 18:34:29 henning Exp $ */ /* * Copyright (c) 2003 Henning Brauer @@ -50,7 +50,6 @@ #include <altq/altq_priq.h> #include <altq/altq_hfsc.h> -#include "pfctl_parser.h" #include "pfctl.h" union class_stats { @@ -82,7 +81,7 @@ void pfctl_print_altq_nodestat(int, const struct pf_altq_node *); int -pfctl_show_altq(int dev, int opts) +pfctl_show_altq(int dev, int verbose) { struct pf_altq_node *root = NULL, *node; @@ -90,7 +89,7 @@ pfctl_show_altq(int dev, int opts) return (-1); for (node = root; node != NULL; node = node->next) - pfctl_print_altq_node(dev, node, 0, opts & PF_OPT_VERBOSE); + pfctl_print_altq_node(dev, node, 0, verbose); pfctl_free_altq_node(root); return (0); } |