 @@ -1,14 +1,14 @@
-/*	$NetBSD: altq_cbq.c,v 1.26 2009/11/22 18:40:26 mbalmer Exp $	*/
+/*	$NetBSD: altq_cbq.c,v 1.26.18.1 2017/08/19 05:37:06 snj Exp $	*/
 /*	$KAME: altq_cbq.c,v 1.21 2005/04/13 03:44:24 suz Exp $	*/
 /*
  * Copyright (c) Sun Microsystems, Inc. 1993-1998 All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
+ *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -22,27 +22,27 @@
+ *
  * 4. The name of the Sun Microsystems, Inc nor may not be used to endorse or
  *      promote products derived from this software without specific prior
  *      written permission.
+ *
  * SUN MICROSYSTEMS DOES NOT CLAIM MERCHANTABILITY OF THIS SOFTWARE OR THE
  * SUITABILITY OF THIS SOFTWARE FOR ANY PARTICULAR PURPOSE.  The software is
  * provided "as is" without express or implied warranty of any kind.
+ *
  * These notices must be retained in any copies of any part of this software.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_cbq.c,v 1.26 2009/11/22 18:40:26 mbalmer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_cbq.c,v 1.26.18.1 2017/08/19 05:37:06 snj Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_altq.h"
 #include "opt_inet.h"
 #include "pf.h"
 #endif
 #ifdef ALTQ_CBQ	/* cbq is enabled by ALTQ_CBQ option in opt_altq.h */
 #include <sys/param.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 @@ -462,26 +462,27 @@ cbq_getqstats(struct pf_altq *a, void *u
 	struct rm_class	*cl;
 	class_stats_t	 stats;
 	int		 error = 0;
 	if ((cbqp = altq_lookup(a->ifname, ALTQT_CBQ)) == NULL)
 		return (EBADF);
 	if ((cl = clh_to_clp(cbqp, a->qid)) == NULL)
 		return (EINVAL);
 	if (*nbytes < sizeof(stats))
 		return (EINVAL);
 	memset(&stats, 0, sizeof(stats));
 	get_class_stats(&stats, cl);
 	if ((error = copyout((void *)&stats, ubuf, sizeof(stats))) != 0)
 		return (error);
 	*nbytes = sizeof(stats);
 	return (0);
+}
 #endif /* NPF > 0 */
 /*
  * int
  * cbq_enqueue(struct ifaltq *ifq, struct mbuf *m, struct altq_pktattr *pattr)
  *		- Queue data packets.
 @@ -866,26 +867,27 @@ cbq_getstats(struct cbq_getstats *gsp)
 	nclasses = gsp->nclasses;
 	usp = gsp->stats;
 	if ((cbqp = altq_lookup(ifacename, ALTQT_CBQ)) == NULL)
 		return (EBADF);
 	if (nclasses <= 0)
 		return (EINVAL);
 	for (n = 0, i = 0; n < nclasses && i < CBQ_MAX_CLASSES; n++, i++) {
 		while ((cl = cbqp->cbq_class_tbl[i]) == NULL)
 			if (++i >= CBQ_MAX_CLASSES)
 				goto out;
 		memset(&stats, 0, sizeof(stats));
 		get_class_stats(&stats, cl);
 		stats.handle = cl->stats_.handle;
 		if ((error = copyout((void *)&stats, (void *)usp++,
 		    sizeof(stats))) != 0)
 			return (error);
+	}
  out:
 	gsp->nclasses = n;
 	return (error);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: altq_hfsc.c,v 1.24 2008/06/18 09:06:27 yamt Exp $	*/
+/*	$NetBSD: altq_hfsc.c,v 1.24.36.1 2017/08/19 05:37:06 snj Exp $	*/
 /*	$KAME: altq_hfsc.c,v 1.26 2005/04/13 03:44:24 suz Exp $	*/
 /*
  * Copyright (c) 1997-1999 Carnegie Mellon University. All Rights Reserved.
+ *
  * Permission to use, copy, modify, and distribute this software and
  * its documentation is hereby granted (including for commercial or
  * for-profit use), provided that both the copyright notice and this
  * permission notice appear in all copies of the software, derivative
  * works, or modified versions, and any portions thereof.
+ *
  * THIS SOFTWARE IS EXPERIMENTAL AND IS KNOWN TO HAVE BUGS, SOME OF
  * WHICH MAY HAVE SERIOUS CONSEQUENCES.  CARNEGIE MELLON PROVIDES THIS
 @@ -33,27 +33,27 @@
 /*
  * H-FSC is described in Proceedings of SIGCOMM'97,
  * "A Hierarchical Fair Service Curve Algorithm for Link-Sharing,
  * Real-Time and Priority Service"
  * by Ion Stoica, Hui Zhang, and T. S. Eugene Ng.
+ *
  * Oleg Cherevko <olwi@aq.ml.com.ua> added the upperlimit for link-sharing.
  * when a class has an upperlimit, the fit-time is computed from the
  * upperlimit service curve.  the link-sharing scheduler does not schedule
  * a class whose fit-time exceeds the current time.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_hfsc.c,v 1.24 2008/06/18 09:06:27 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_hfsc.c,v 1.24.36.1 2017/08/19 05:37:06 snj Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_altq.h"
 #include "opt_inet.h"
 #include "pf.h"
 #endif
 #ifdef ALTQ_HFSC  /* hfsc is enabled by ALTQ_HFSC option in opt_altq.h */
 #include <sys/param.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 @@ -303,26 +303,27 @@ hfsc_getqstats(struct pf_altq *a, void *
 	struct hfsc_class *cl;
 	struct hfsc_classstats stats;
 	int error = 0;
 	if ((hif = altq_lookup(a->ifname, ALTQT_HFSC)) == NULL)
 		return (EBADF);
 	if ((cl = clh_to_clp(hif, a->qid)) == NULL)
 		return (EINVAL);
 	if (*nbytes < sizeof(stats))
 		return (EINVAL);
 	memset(&stats, 0, sizeof(stats));
 	get_class_stats(&stats, cl);
 	if ((error = copyout((void *)&stats, ubuf, sizeof(stats))) != 0)
 		return (error);
 	*nbytes = sizeof(stats);
 	return (0);
+}
 #endif /* NPF > 0 */
 /*
  * bring the interface back to the initial state by discarding
  * all the filters and classes except the root class.
  */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: altq_jobs.c,v 1.6.14.1 2014/11/03 15:08:44 msaitoh Exp $	*/
+/*	$NetBSD: altq_jobs.c,v 1.6.14.2 2017/08/19 05:37:06 snj Exp $	*/
 /*	$KAME: altq_jobs.c,v 1.11 2005/04/13 03:44:25 suz Exp $	*/
 /*
  * Copyright (c) 2001, the Rector and Board of Visitors of the
  * University of Virginia.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms,
  * with or without modification, are permitted provided
  * that the following conditions are met:
+ *
  * Redistributions of source code must retain the above
  * copyright notice, this list of conditions and the following
  * disclaimer.
 @@ -49,27 +49,27 @@
  * Contributed by the Multimedia Networks Group at the University
  * of Virginia.
+ *
  * Papers and additional info can be found at
  * http://qosbox.cs.virginia.edu
+ *
  */
 /*
  * JoBS queue
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_jobs.c,v 1.6.14.1 2014/11/03 15:08:44 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_jobs.c,v 1.6.14.2 2017/08/19 05:37:06 snj Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_altq.h"
 #include "opt_inet.h"
 #endif
 #ifdef ALTQ_JOBS  /* jobs is enabled by ALTQ_JOBS option in opt_altq.h */
 #include <sys/param.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
 @@ -2101,30 +2101,29 @@ jobscmd_class_stats(struct jobs_class_st
 	struct jobs_class *cl;
 	struct class_stats stats, *usp;
 	int pri, error;
 	if ((jif = altq_lookup(ap->iface.jobs_ifname, ALTQT_JOBS)) == NULL)
 		return (EBADF);
 	ap->maxpri = jif->jif_maxpri;
 	/* then, read the next N classes */
 	usp = ap->stats;
 	for (pri = 0; pri <= jif->jif_maxpri; pri++) {
 		cl = jif->jif_classes[pri];
 		(void)memset(&stats, 0, sizeof(stats));
 		if (cl != NULL)
 			get_class_stats(&stats, cl);
 		else
 			(void)memset(&stats, 0, sizeof(stats));
 		if ((error = copyout((void *)&stats, (void *)usp++,
 				     sizeof(stats))) != 0)
 			return (error);
+	}
 	return (0);
+}
 static void
 get_class_stats(struct class_stats *sp, struct jobs_class *cl)
+{
 	u_int64_t now;
 	now = read_machclk();

 @@ -1,14 +1,14 @@
-/*	$NetBSD: altq_priq.c,v 1.21 2009/03/14 15:35:58 dsl Exp $	*/
+/*	$NetBSD: altq_priq.c,v 1.21.18.1 2017/08/19 05:37:06 snj Exp $	*/
 /*	$KAME: altq_priq.c,v 1.13 2005/04/13 03:44:25 suz Exp $	*/
 /*
  * Copyright (C) 2000-2003
  *	Sony Computer Science Laboratories Inc.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -21,27 +21,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 /*
  * priority queue
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_priq.c,v 1.21 2009/03/14 15:35:58 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_priq.c,v 1.21.18.1 2017/08/19 05:37:06 snj Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_altq.h"
 #include "opt_inet.h"
 #include "pf.h"
 #endif
 #ifdef ALTQ_PRIQ  /* priq is enabled by ALTQ_PRIQ option in opt_altq.h */
 #include <sys/param.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 @@ -209,26 +209,27 @@ priq_getqstats(struct pf_altq *a, void *
 	struct priq_class *cl;
 	struct priq_classstats stats;
 	int error = 0;
 	if ((pif = altq_lookup(a->ifname, ALTQT_PRIQ)) == NULL)
 		return (EBADF);
 	if ((cl = clh_to_clp(pif, a->qid)) == NULL)
 		return (EINVAL);
 	if (*nbytes < sizeof(stats))
 		return (EINVAL);
 	memset(&stats, 0, sizeof(stats));
 	get_class_stats(&stats, cl);
 	if ((error = copyout((void *)&stats, ubuf, sizeof(stats))) != 0)
 		return (error);
 	*nbytes = sizeof(stats);
 	return (0);
+}
 #endif /* NPF > 0 */
 /*
  * bring the interface back to the initial state by discarding
  * all the filters and classes.
  */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: altq_wfq.c,v 1.19 2008/09/11 17:58:59 joerg Exp $	*/
+/*	$NetBSD: altq_wfq.c,v 1.19.34.1 2017/08/19 05:37:06 snj Exp $	*/
 /*	$KAME: altq_wfq.c,v 1.14 2005/04/13 03:44:25 suz Exp $	*/
 /*
  * Copyright (C) 1997-2002
  *	Sony Computer Science Laboratories Inc.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -22,27 +22,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 /*
  *  March 27, 1997.  Written by Hiroshi Kyusojin of Keio University
  *  (kyu@mt.cs.keio.ac.jp).
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_wfq.c,v 1.19 2008/09/11 17:58:59 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_wfq.c,v 1.19.34.1 2017/08/19 05:37:06 snj Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_altq.h"
 #include "opt_inet.h"
 #endif
 #ifdef ALTQ_WFQ
 #include <sys/param.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/uio.h>
 #include <sys/socket.h>
 @@ -508,53 +508,54 @@ wfq_getqid(struct wfq_getqid *gqidp)
 		return (EBADF);
 	gqidp->qid = (*wfqp->hash_func)(&gqidp->flow, wfqp->nums);
 	return 0;
+}
 static int
 wfq_setweight(struct wfq_setweight *swp)
+{
 	wfq_state_t	*wfqp;
 	wfq *queue;
 	int old;
-	if (swp->weight < 0) {
+	if (swp->weight < 0)
 		printf("set weight in natural number\n");
 		return (EINVAL);
 	if ((wfqp = altq_lookup(swp->iface.wfq_ifacename, ALTQT_WFQ)) == NULL)
 		return (EBADF);
 	if (swp->qid < 0 || swp->qid >= wfqp->nums)
 		return (EINVAL);
 	queue = &wfqp->queue[swp->qid];
 	old = queue->weight;
 	queue->weight = swp->weight;
 	swp->weight = old;
 	return 0;
+}
 static int
 wfq_getstats(struct wfq_getstats *gsp)
+{
 	wfq_state_t	*wfqp;
 	wfq *queue;
 	queue_stats *stats;
 	if ((wfqp = altq_lookup(gsp->iface.wfq_ifacename, ALTQT_WFQ)) == NULL)
 		return (EBADF);
-	if (gsp->qid >= wfqp->nums)
+	if (gsp->qid < 0 || gsp->qid >= wfqp->nums)
 		return (EINVAL);
 	queue = &wfqp->queue[gsp->qid];
 	stats = &gsp->stats;
 	stats->bytes		= queue->bytes;
 	stats->weight		= queue->weight;
 	stats->xmit_cnt		= queue->xmit_cnt;
 	stats->drop_cnt		= queue->drop_cnt;
 	return 0;
+}