Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Since the -D option doesn't do anything useful at all, remove it.

Browse Source
This commit is contained in:
peter 2006-11-26 11:38:07 +00:00
parent 964c039645
commit 91c703ae73
4 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usr.sbin/altq/altqd/altqd.8
View File

@ -1,4 +1,4 @@
.\" $NetBSD: altqd.8,v 1.9 2005/06/17 12:02:00 peter Exp $
.\" $NetBSD: altqd.8,v 1.10 2006/11/26 11:38:07 peter Exp $
.\" $KAME: altqd.8,v 1.9 2002/01/23 06:56:27 itojun Exp $
.\"
.\" Copyright (C) 2000
@ -25,7 +25,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
.Dd September 28, 1999
.Dd November 26, 2006
.Dt ALTQD 8
.Os
.Sh NAME
@ -33,7 +33,7 @@
.Nd ALTQ daemon
.Sh SYNOPSIS
.Nm altqd
.Op Fl Ddv
.Op Fl dv
.Op Fl f Ar conf_file
.Sh DESCRIPTION
.Nm
@ -50,10 +50,6 @@ and the signal SIGHUP will restart
.Pp
The following options are available:
.Bl -tag -width Fl
.It Fl D
Dummy mode.
.Nm
does not issue altq system calls.
.It Fl d
Debug mode.
.Nm

10
usr.sbin/altq/altqd/altqd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: altqd.c,v 1.8 2005/06/17 12:02:00 peter Exp $ */
/* $NetBSD: altqd.c,v 1.9 2006/11/26 11:38:07 peter Exp $ */
/* $KAME: altqd.c,v 1.10 2002/02/20 10:42:26 kjc Exp $ */
/*
* Copyright (c) 2001 Theo de Raadt
@ -85,7 +85,7 @@ static void sig_handler(int);
static void
usage(void)
{
fprintf(stderr, "usage: %s [-Ddv] [-f config]\n", getprogname());
fprintf(stderr, "usage: %s [-dv] [-f config]\n", getprogname());
exit(1);
}
@ -124,15 +124,11 @@ main(int argc, char **argv)
for (i = 0; i < MAX_CLIENT; i++)
client[i] = NULL;
while ((c = getopt(argc, argv, "f:vDdl:")) != -1) {
while ((c = getopt(argc, argv, "f:vdl:")) != -1) {
switch (c) {
case 'f':
altqconfigfile = optarg;
break;
case 'D': /* -D => dummy mode */
Debug_mode = 1;
printf("Debug mode set.\n");
break;
case 'v':
l_debug = LOG_DEBUG;
m_debug |= DEBUG_ALTQ;

3
usr.sbin/altq/libaltq/altq_qop.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: altq_qop.h,v 1.3 2002/03/05 04:11:53 itojun Exp $ */
/* $NetBSD: altq_qop.h,v 1.4 2006/11/26 11:38:07 peter Exp $ */
/* $KAME: altq_qop.h,v 1.5 2002/02/12 10:14:01 kjc Exp $ */
/*
* Copyright (C) 1999-2000
@ -222,7 +222,6 @@ extern const char *qop_errlist[]; /* error string list */
extern struct qdisc_ops nop_qdisc;
extern char *cur_ifname(void);
extern struct qdisc_parser qdisc_parser[];
extern int Debug_mode;
#ifndef RSVPD
/* rename LOG() to log_write() */

5
usr.sbin/altq/libaltq/qop.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: qop.c,v 1.7 2006/09/29 18:40:57 christos Exp $ */
/* $NetBSD: qop.c,v 1.8 2006/11/26 11:38:07 peter Exp $ */
/* $KAME: qop.c,v 1.11 2001/10/26 04:57:59 kjc Exp $ */
/*
* Copyright (C) 1999-2000
@ -82,7 +82,6 @@ struct tbrinfo {
LIST_HEAD(qop_iflist, ifinfo) qop_iflist = LIST_HEAD_INITIALIZER(&iflist);
/* a list of configured token bucket regulators */
LIST_HEAD(tbr_list, tbrinfo) tbr_list = LIST_HEAD_INITIALIZER(&tbr_list);
int Debug_mode = 0; /* nosched (dummy mode) */
/*
* internal functions
@ -348,7 +347,7 @@ qop_add_if(struct ifinfo **rp, const char *ifname, u_int bandwidth,
ifname += 1;
ifinfo->ifindex = get_ifindex(ifname);
ifinfo->ifmtu = get_ifmtu(ifname);
if (qdisc_ops == NULL || Debug_mode)
if (qdisc_ops == NULL)
ifinfo->qdisc = &nop_qdisc; /* replace syscalls by nops */
else
ifinfo->qdisc = qdisc_ops;