CVS commit: src/usr.sbin/altq/altqd
Module Name:src Committed By: sevan Date: Tue Apr 9 19:10:21 UTC 2019 Modified Files: src/usr.sbin/altq/altqd: altq.conf.5 Log Message: bump date To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/usr.sbin/altq/altqd/altq.conf.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/altq/altqd/altq.conf.5 diff -u src/usr.sbin/altq/altqd/altq.conf.5:1.17 src/usr.sbin/altq/altqd/altq.conf.5:1.18 --- src/usr.sbin/altq/altqd/altq.conf.5:1.17 Tue Apr 9 18:22:33 2019 +++ src/usr.sbin/altq/altqd/altq.conf.5 Tue Apr 9 19:10:21 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: altq.conf.5,v 1.17 2019/04/09 18:22:33 sevan Exp $ +.\" $NetBSD: altq.conf.5,v 1.18 2019/04/09 19:10:21 sevan Exp $ .\" $KAME: altq.conf.5,v 1.15 2002/11/17 02:51:49 kjc 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 10, 2008 +.Dd April 9, 2019 .Dt ALTQ.CONF 5 .Os .\"
CVS commit: src/usr.sbin/altq/altqd
Module Name:src Committed By: sevan Date: Tue Apr 9 18:22:33 UTC 2019 Modified Files: src/usr.sbin/altq/altqd: altq.conf.5 Log Message: Drop Pp before Bl To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/altq/altqd/altq.conf.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/altq/altqd/altq.conf.5 diff -u src/usr.sbin/altq/altqd/altq.conf.5:1.16 src/usr.sbin/altq/altqd/altq.conf.5:1.17 --- src/usr.sbin/altq/altqd/altq.conf.5:1.16 Mon Jul 3 21:35:29 2017 +++ src/usr.sbin/altq/altqd/altq.conf.5 Tue Apr 9 18:22:33 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: altq.conf.5,v 1.16 2017/07/03 21:35:29 wiz Exp $ +.\" $NetBSD: altq.conf.5,v 1.17 2019/04/09 18:22:33 sevan Exp $ .\" $KAME: altq.conf.5,v 1.15 2002/11/17 02:51:49 kjc Exp $ .\" .\" Copyright (C) 2000 @@ -282,7 +282,6 @@ excess bandwidth is available. .Op Ar sched_type .Op Cm efficient .El -.Pp .Bl -tag -width 8n -offset indent .It Ar if_name specifies the name of a network interface (e.g., fxp0). @@ -312,7 +311,6 @@ By adding the keyword .Cm efficient to the interface specification line, enables this mode. .El -.Pp .Bl -tag -width class -offset indent .It Cm class .Ar sched_type @@ -465,7 +463,6 @@ link-sharing to set the upper limit allo .Op Cm tbrsize Ar bytes .Op Ar sched_type .El -.Pp .Bl -tag -width 8n -offset indent .It Ar if_name specifies the name of a network interface (e.g., fxp0). @@ -478,7 +475,6 @@ must be .Cm hfsc for HFSC. .El -.Pp .Bl -tag -width class -offset indent .It Cm class .Ar sched_type @@ -611,7 +607,6 @@ Up to 16 priorities can be used with PRI .Op Cm tbrsize Ar bytes .Op Ar sched_type .El -.Pp .Bl -tag -width 8n -offset indent .It Ar if_name specifies the name of a network interface (e.g., fxp0). @@ -624,7 +619,6 @@ must be .Cm priq for PRIQ. .El -.Pp .Bl -tag -width class -offset indent .It Cm class .Ar sched_type @@ -638,7 +632,6 @@ for PRIQ. .Op Cm ecn .Op Cm cleardscp .El -.Pp .Bl -tag -width 8n -offset indent .It Ar sched_type must be @@ -696,7 +689,6 @@ queue. .Op Cm qsize Ar bytes .Op Cm hash Ar policy .El -.Pp .Bl -tag -width 8n -offset indent .It Cm if_name specifies the name of a network interface (e.g., fxp0). @@ -741,7 +733,6 @@ own queueing disciplines. .Op Ar sched_type .Op Cm qlimit Ar count .El -.Pp .Bl -tag -width 8n -offset indent .It Ar if_name specifies the name of a network interface (e.g., fxp0). @@ -795,7 +786,6 @@ For example, 10 means the maximum drop p .Op Cm ecn .Op Cm flowvalve .El -.Pp .Bl -tag -width 8n -offset indent .It Ar if_name specifies the name of a network interface (e.g., fxp0). @@ -886,7 +876,6 @@ precedence. .Op Cm hi_invpmax Ar n .Op Cm ecn .El -.Pp .Bl -tag -width 8n -offset indent .It Ar if_name specifies the name of a network interface (e.g., fxp0). @@ -941,7 +930,6 @@ enables ECN. .Op Cm holdtime Ar usec .Op Cm ecn .El -.Pp .Bl -tag -width 8n -offset indent .It Ar if_name specifies the name of a network interface (e.g., fxp0). @@ -994,7 +982,6 @@ command has the following syntax. .Ar cdnr_name .Aq action .El -.Pp .Bl -tag -width 10n -offset indent .It Ar if_name Interface name. @@ -1015,7 +1002,6 @@ The following actions are defined. allows the packet to go through without any modification to the packet. .El .El -.Pp .Bl -tag -width drop -offset indent .It Cm drop .Bl -inset -offset indent @@ -1024,7 +1010,6 @@ rejects the packet. The packet is immediately discarded. .El .El -.Pp .Bl -tag -width mark -offset indent .It Cm mark .Ar value @@ -1034,13 +1019,11 @@ sets the specified value to the ds field Then, the packet is allowed to go through. .El .El -.Pp .Bl -tag -width tbmeter -offset indent .It Cm tbmeter .Ar rate depth .Aq in_action .Aq out_action -.Pp .Bl -inset -offset indent .It Cm tbmeter is a token bucket meter configured with rate and depth parameters. @@ -1051,7 +1034,6 @@ the packet size), tbmeter takes in_actio Otherwise, tbmeter takes out_action. .El .El -.Pp .Bl -tag -width trtcm -offset indent .It Cm trtcm .Ar cmtd_rate cmtd_depth peak_rate peak_depth @@ -1075,7 +1057,6 @@ a yellow packet can be yellow or red but Default is color-blind. .El .El -.Pp .Bl -tag -width tswtcm -offset indent .It Cm tswtcm .Ar cmtd_rate peak_rate avg_interval @@ -1117,7 +1098,6 @@ relaxed. .Op Cm tbrsize Ar bytes .Op Ar sched_type .El -.Pp .Bl -tag -width 8n -offset indent .It Ar if_name specifies the name of a network interface (e.g., fxp0). @@ -1137,7 +1117,6 @@ must be .Cm jobs for JoBS. .El -.Pp .Bl -tag -width class -offset indent .It Cm class .Ar sched_type @@ -1152,7 +1131,6 @@ for JoBS. .Op Cm rdc Ar prop .Op Cm rlc Ar prop .El -.Pp .Bl -tag -width 8n -offset indent .It Ar sched_type must be
CVS commit: src/usr.sbin/altq/altqd
Module Name:src Committed By: jakllsch Date: Sun Sep 8 19:12:18 UTC 2013 Modified Files: src/usr.sbin/altq/altqd: altq.conf.5 Log Message: use IPv6 Documentation Prefix (2001:db8::/32) instead of unallocated d000:a::/32 prefix To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/altq/altqd/altq.conf.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/altq/altqd/altq.conf.5 diff -u src/usr.sbin/altq/altqd/altq.conf.5:1.14 src/usr.sbin/altq/altqd/altq.conf.5:1.15 --- src/usr.sbin/altq/altqd/altq.conf.5:1.14 Mon Apr 25 22:45:31 2011 +++ src/usr.sbin/altq/altqd/altq.conf.5 Sun Sep 8 19:12:18 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: altq.conf.5,v 1.14 2011/04/25 22:45:31 wiz Exp $ +.\ $NetBSD: altq.conf.5,v 1.15 2013/09/08 19:12:18 jakllsch Exp $ .\ $KAME: altq.conf.5,v 1.15 2002/11/17 02:51:49 kjc Exp $ .\ .\ Copyright (C) 2000 @@ -1240,7 +1240,7 @@ class cbq vx0 csl_class tcp_class pbandw # # sample filter6 command # -filter6 vx0 csl_class ::0 0 d000:a:0:123::/64 80 6 +filter6 vx0 csl_class ::0 0 2001:db8:0:123::/64 80 6 .Ed .Ss HFSC Example .Bd -literal
CVS commit: src/usr.sbin/altq/altqd
Module Name:src
Committed By: joerg
Date: Thu Aug 25 16:22:44 UTC 2011
Modified Files:
src/usr.sbin/altq/altqd: Makefile
Log Message:
Use of non-literal format string.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/altq/altqd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/altq/altqd/Makefile
diff -u src/usr.sbin/altq/altqd/Makefile:1.7 src/usr.sbin/altq/altqd/Makefile:1.8
--- src/usr.sbin/altq/altqd/Makefile:1.7 Tue Aug 16 12:39:29 2011
+++ src/usr.sbin/altq/altqd/Makefile Thu Aug 25 16:22:43 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2011/08/16 12:39:29 christos Exp $
+# $NetBSD: Makefile,v 1.8 2011/08/25 16:22:43 joerg Exp $
.include bsd.own.mk
@@ -16,4 +16,6 @@
DPADD+= ${LIBUTIL} ${LIBM}
LDADD+= -lutil -lm
+COPTS.libaltq2.c+= -Wno-format-nonliteral
+
.include bsd.prog.mk
CVS commit: src/usr.sbin/altq/altqd
Module Name:src
Committed By: christos
Date: Tue Aug 16 12:39:30 UTC 2011
Modified Files:
src/usr.sbin/altq/altqd: Makefile altqd.c
Log Message:
remove gcc-4.5 hack and check fileno instead.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/altq/altqd/Makefile
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/altq/altqd/altqd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/altq/altqd/Makefile
diff -u src/usr.sbin/altq/altqd/Makefile:1.6 src/usr.sbin/altq/altqd/Makefile:1.7
--- src/usr.sbin/altq/altqd/Makefile:1.6 Tue Aug 9 09:04:28 2011
+++ src/usr.sbin/altq/altqd/Makefile Tue Aug 16 08:39:29 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2011/08/09 13:04:28 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2011/08/16 12:39:29 christos Exp $
.include bsd.own.mk
@@ -17,8 +17,3 @@
LDADD+= -lutil -lm
.include bsd.prog.mk
-
-# XXX
-.if ${HAVE_GCC} == 45
-COPTS.altqd.c+= ${${ACTIVE_CC} == gcc:?-Wno-array-bounds:}
-.endif
Index: src/usr.sbin/altq/altqd/altqd.c
diff -u src/usr.sbin/altq/altqd/altqd.c:1.9 src/usr.sbin/altq/altqd/altqd.c:1.10
--- src/usr.sbin/altq/altqd/altqd.c:1.9 Sun Nov 26 06:38:07 2006
+++ src/usr.sbin/altq/altqd/altqd.c Tue Aug 16 08:39:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: altqd.c,v 1.9 2006/11/26 11:38:07 peter Exp $ */
+/* $NetBSD: altqd.c,v 1.10 2011/08/16 12:39:29 christos Exp $ */
/* $KAME: altqd.c,v 1.10 2002/02/20 10:42:26 kjc Exp $ */
/*
* Copyright (c) 2001 Theo de Raadt
@@ -114,7 +114,7 @@
int
main(int argc, char **argv)
{
- int i, c, maxfd, rval, qpsock;
+ int i, c, maxfd, rval, qpsock, fd;
fd_set fds, rfds;
FILE *fp, *client[MAX_CLIENT];
@@ -216,8 +216,15 @@
FD_ZERO(fds);
maxfd = 0;
if (fp != NULL) {
- FD_SET(fileno(fp), fds);
- maxfd = MAX(maxfd, fileno(fp) + 1);
+ fd = fileno(fp);
+ if (fd == -1)
+ LOG(LOG_ERR, 0, bad file descriptor, QUIP_PATH);
+ } else
+ fd = -1;
+
+ if (fd != -1) {
+ FD_SET(fd, fds);
+ maxfd = MAX(maxfd, fd + 1);
}
if (qpsock = 0) {
FD_SET(qpsock, fds);
@@ -252,7 +259,7 @@
* if there is command input, read the input line,
* parse it, and execute.
*/
- if (fp FD_ISSET(fileno(fp), rfds)) {
+ if (fp FD_ISSET(fd, rfds)) {
rval = do_command(fp);
if (rval == 0) {
/* quit command or eof on input */
@@ -284,18 +291,18 @@
* check input from a client via unix domain socket
*/
for (i = 0; i MAX_CLIENT; i++) {
-int fd;
+int fd1;
if (client[i] == NULL)
continue;
-fd = fileno(client[i]);
-if (FD_ISSET(fd, rfds)) {
+fd1 = fileno(client[i]);
+if (FD_ISSET(fd1, rfds)) {
if (quip_input(client[i]) != 0 ||
fflush(client[i]) != 0) {
/* connection closed */
fclose(client[i]);
client[i] = NULL;
- FD_CLR(fd, fds);
+ FD_CLR(fd1, fds);
}
}
}
CVS commit: src/usr.sbin/altq/altqd
Module Name:src Committed By: wiz Date: Mon Apr 25 22:45:31 UTC 2011 Modified Files: src/usr.sbin/altq/altqd: altq.conf.5 Log Message: Typo, and markup consistency. From YOMURA Masanori. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/altq/altqd/altq.conf.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/altq/altqd/altq.conf.5 diff -u src/usr.sbin/altq/altqd/altq.conf.5:1.13 src/usr.sbin/altq/altqd/altq.conf.5:1.14 --- src/usr.sbin/altq/altqd/altq.conf.5:1.13 Sun Mar 15 12:30:09 2009 +++ src/usr.sbin/altq/altqd/altq.conf.5 Mon Apr 25 22:45:31 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: altq.conf.5,v 1.13 2009/03/15 12:30:09 joerg Exp $ +.\ $NetBSD: altq.conf.5,v 1.14 2011/04/25 22:45:31 wiz Exp $ .\ $KAME: altq.conf.5,v 1.15 2002/11/17 02:51:49 kjc Exp $ .\ .\ Copyright (C) 2000 @@ -178,10 +178,10 @@ Default is 0. .El .Pp -.Ar filter_value +.Ar filter_values should be in the following format: .Bl -tag -width filter -offset indent -.It filter_values : +.It Ar filter_values : .Ad dst_addr Op Cm netmask Ar mask .Ar dport .Ad src_addr Op Cm netmask Ar mask
