From nobody@FreeBSD.org  Sat Feb  4 20:28:11 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5943A1065670
	for <freebsd-gnats-submit@FreeBSD.org>; Sat,  4 Feb 2012 20:28:11 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 43FF18FC0C
	for <freebsd-gnats-submit@FreeBSD.org>; Sat,  4 Feb 2012 20:28:11 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q14KSASh051367
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 4 Feb 2012 20:28:10 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id q14KSAx3051347;
	Sat, 4 Feb 2012 20:28:10 GMT
	(envelope-from nobody)
Message-Id: <201202042028.q14KSAx3051347@red.freebsd.org>
Date: Sat, 4 Feb 2012 20:28:10 GMT
From: Alexander Sheiko <adsh@univ.kiev.ua>
To: freebsd-gnats-submit@FreeBSD.org
Subject: incorrect ipfw sched parameters in manual
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         164772
>Category:       docs
>Synopsis:       incorrect ipfw sched parameters in manual
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    issyl0
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          doc-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Feb 04 20:30:10 UTC 2012
>Closed-Date:    Sun Jul 22 11:27:08 UTC 2012
>Last-Modified:  Sun Jul 22 11:30:07 UTC 2012
>Originator:     Alexander Sheiko
>Release:        9.0
>Organization:
Kiev National University
>Environment:
FreeBSD gw.univ.kiev.ua 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan 31 19:38:52 EET 2012     adsh@gw.univ.kiev.ua:/usr/obj/usr/src/sys/GW  i386
>Description:
IPFW(8)                 FreeBSD System Manager's Manual                IPFW(8)

     type {fifo | wf2qp | rr | qfq}
             specifies the scheduling algorithm to use.

Attempt to set scheduler parameters:

ipfw sched 1 config type fifo
ipfw: setsockopt(IP_DUMMYNET_CONFIGURE): Invalid argument
ipfw sched 1 config type wf2qp
ipfw: setsockopt(IP_DUMMYNET_CONFIGURE): Invalid argument
ipfw sched 1 config type rr
ipfw: setsockopt(IP_DUMMYNET_CONFIGURE): Invalid argument
ipfw sched 1 config type qfq
ipfw: setsockopt(IP_DUMMYNET_CONFIGURE): Invalid argument

But

ipfw sched 1 config type FIFO
ipfw sched 1 config type WF2Q+
ipfw sched 1 config type RR
ipfw sched 1 config type QFQ

work fine.
>How-To-Repeat:

>Fix:


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-doc->issyl0 
Responsible-Changed-By: issyl0 
Responsible-Changed-When: Sat Jun 30 18:03:03 UTC 2012 
Responsible-Changed-Why:  
I'll deal with this one. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=164772 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: docs/164772: commit references a PR
Date: Tue,  3 Jul 2012 08:43:04 +0000 (UTC)

 Author: issyl0 (doc committer)
 Date: Tue Jul  3 08:42:48 2012
 New Revision: 238063
 URL: http://svn.freebsd.org/changeset/base/238063
 
 Log:
   - Make ipfw's sched rules case insensitive, for user-friendliness.
   - Add a note to the ipfw(8) man page about the rules no longer being
   case sensitive.
   - Fix some typos in the man page.
   
   PR:		docs/164772
   Reviewed by:	bz
   Approved by:	gabor (doc mentor, src committer)
   MFC after:	2 weeks
 
 Modified:
   head/sbin/ipfw/ipfw.8
   head/sys/netinet/ipfw/ip_dummynet.c
 
 Modified: head/sbin/ipfw/ipfw.8
 ==============================================================================
 --- head/sbin/ipfw/ipfw.8	Tue Jul  3 08:40:20 2012	(r238062)
 +++ head/sbin/ipfw/ipfw.8	Tue Jul  3 08:42:48 2012	(r238063)
 @@ -1,7 +1,7 @@
  .\"
  .\" $FreeBSD$
  .\"
 -.Dd June 10, 2012
 +.Dd July 3, 2012
  .Dt IPFW 8
  .Os
  .Sh NAME
 @@ -2218,19 +2218,20 @@ Specifies the weight to be used for flow
  The weight must be in the range 1..100, and defaults to 1.
  .El
  .Pp
 -The following parameters can be configured for a scheduler:
 +The following case-insensitive parameters can be configured for a
 +scheduler:
  .Pp
  .Bl -tag -width indent -compact
 -.It Cm type Ar {fifo | wf2qp | rr | qfq}
 +.It Cm type Ar {fifo | wf2q+ | rr | qfq}
  specifies the scheduling algorithm to use.
  .Bl -tag -width indent -compact
 -.It cm fifo
 +.It Cm fifo
  is just a FIFO scheduler (which means that all packets
  are stored in the same queue as they arrive to the scheduler).
  FIFO has O(1) per-packet time complexity, with very low
  constants (estimate 60-80ns on a 2GHz desktop machine)
  but gives no service guarantees.
 -.It Cm wf2qp
 +.It Cm wf2q+
  implements the WF2Q+ algorithm, which is a Weighted Fair Queueing
  algorithm which permits flows to share bandwidth according to
  their weights. Note that weights are not priorities; even a flow
 
 Modified: head/sys/netinet/ipfw/ip_dummynet.c
 ==============================================================================
 --- head/sys/netinet/ipfw/ip_dummynet.c	Tue Jul  3 08:40:20 2012	(r238062)
 +++ head/sys/netinet/ipfw/ip_dummynet.c	Tue Jul  3 08:42:48 2012	(r238063)
 @@ -97,7 +97,7 @@ find_sched_type(int type, char *name)
  	struct dn_alg *d;
  
  	SLIST_FOREACH(d, &dn_cfg.schedlist, next) {
 -		if (d->type == type || (name && !strcmp(d->name, name)))
 +		if (d->type == type || (name && !strcasecmp(d->name, name)))
  			return d;
  	}
  	return NULL; /* not found */
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->patched 
State-Changed-By: issyl0 
State-Changed-When: Mon Jul 9 21:18:33 UTC 2012 
State-Changed-Why:  
A fix was committed to HEAD in r238063.  Now awaiting merge. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=164772 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: docs/164772: commit references a PR
Date: Sun, 22 Jul 2012 11:00:28 +0000 (UTC)

 Author: issyl0 (doc committer)
 Date: Sun Jul 22 11:00:02 2012
 New Revision: 238683
 URL: http://svn.freebsd.org/changeset/base/238683
 
 Log:
   MFC r238063:
    - Make ipfw's sched rules case insensitive, for user-friendliness.
    - Add a note to the ipfw(8) man page about the rules no longer being
    case sensitive.
    - Fix some typos in the man page.
   
   PR:		docs/164772
   Reviewed by:	bz
   Approved by:	gavin
   Approved by:	re (kib)
 
 Modified:
   stable/9/sbin/ipfw/ipfw.8
   stable/9/sys/netinet/ipfw/ip_dummynet.c
 
 Modified: stable/9/sbin/ipfw/ipfw.8
 ==============================================================================
 --- stable/9/sbin/ipfw/ipfw.8	Sun Jul 22 10:21:42 2012	(r238682)
 +++ stable/9/sbin/ipfw/ipfw.8	Sun Jul 22 11:00:02 2012	(r238683)
 @@ -1,7 +1,7 @@
  .\"
  .\" $FreeBSD$
  .\"
 -.Dd March 9, 2012
 +.Dd July 3, 2012
  .Dt IPFW 8
  .Os
  .Sh NAME
 @@ -2225,19 +2225,20 @@ Specifies the weight to be used for flow
  The weight must be in the range 1..100, and defaults to 1.
  .El
  .Pp
 -The following parameters can be configured for a scheduler:
 +The following case-insensitive parameters can be configured for a
 +scheduler:
  .Pp
  .Bl -tag -width indent -compact
 -.It Cm type Ar {fifo | wf2qp | rr | qfq}
 +.It Cm type Ar {fifo | wf2q+ | rr | qfq}
  specifies the scheduling algorithm to use.
  .Bl -tag -width indent -compact
 -.It cm fifo
 +.It Cm fifo
  is just a FIFO scheduler (which means that all packets
  are stored in the same queue as they arrive to the scheduler).
  FIFO has O(1) per-packet time complexity, with very low
  constants (estimate 60-80ns on a 2GHz desktop machine)
  but gives no service guarantees.
 -.It Cm wf2qp
 +.It Cm wf2q+
  implements the WF2Q+ algorithm, which is a Weighted Fair Queueing
  algorithm which permits flows to share bandwidth according to
  their weights. Note that weights are not priorities; even a flow
 
 Modified: stable/9/sys/netinet/ipfw/ip_dummynet.c
 ==============================================================================
 --- stable/9/sys/netinet/ipfw/ip_dummynet.c	Sun Jul 22 10:21:42 2012	(r238682)
 +++ stable/9/sys/netinet/ipfw/ip_dummynet.c	Sun Jul 22 11:00:02 2012	(r238683)
 @@ -97,7 +97,7 @@ find_sched_type(int type, char *name)
  	struct dn_alg *d;
  
  	SLIST_FOREACH(d, &dn_cfg.schedlist, next) {
 -		if (d->type == type || (name && !strcmp(d->name, name)))
 +		if (d->type == type || (name && !strcasecmp(d->name, name)))
  			return d;
  	}
  	return NULL; /* not found */
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: patched->closed 
State-Changed-By: issyl0 
State-Changed-When: Sun Jul 22 11:27:06 UTC 2012 
State-Changed-Why:  
Fixes have been merged to older releases now.  Thanks again for 
reporting the problem. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=164772 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: docs/164772: commit references a PR
Date: Sun, 22 Jul 2012 11:22:20 +0000 (UTC)

 Author: issyl0 (doc committer)
 Date: Sun Jul 22 11:22:04 2012
 New Revision: 238685
 URL: http://svn.freebsd.org/changeset/base/238685
 
 Log:
   MFC r238063:
    - Make ipfw's sched rules case insensitive, for user-friendliness.
    - Add a note to the ipfw(8) man page about the rules no longer being
    case sensitive.
    - Fix some typos in the man page.
   
   PR:		docs/164772
   Reviewed by:	bz
   Approved by:	gavin
 
 Modified:
   stable/8/sbin/ipfw/ipfw.8
   stable/8/sys/netinet/ipfw/ip_dummynet.c
 Directory Properties:
   stable/8/sbin/ipfw/   (props changed)
   stable/8/sys/   (props changed)
 
 Modified: stable/8/sbin/ipfw/ipfw.8
 ==============================================================================
 --- stable/8/sbin/ipfw/ipfw.8	Sun Jul 22 11:07:59 2012	(r238684)
 +++ stable/8/sbin/ipfw/ipfw.8	Sun Jul 22 11:22:04 2012	(r238685)
 @@ -1,7 +1,7 @@
  .\"
  .\" $FreeBSD$
  .\"
 -.Dd March 9, 2012
 +.Dd July 3, 2012
  .Dt IPFW 8
  .Os
  .Sh NAME
 @@ -2209,19 +2209,20 @@ Specifies the weight to be used for flow
  The weight must be in the range 1..100, and defaults to 1.
  .El
  .Pp
 -The following parameters can be configured for a scheduler:
 +The following case-insensitive parameters can be configured for a
 +scheduler:
  .Pp
  .Bl -tag -width indent -compact
 -.It Cm type Ar {fifo | wf2qp | rr | qfq}
 +.It Cm type Ar {fifo | wf2q+ | rr | qfq}
  specifies the scheduling algorithm to use.
  .Bl -tag -width indent -compact
 -.It cm fifo
 +.It Cm fifo
  is just a FIFO scheduler (which means that all packets
  are stored in the same queue as they arrive to the scheduler).
  FIFO has O(1) per-packet time complexity, with very low
  constants (estimate 60-80ns on a 2GHz desktop machine)
  but gives no service guarantees.
 -.It Cm wf2qp
 +.It Cm wf2q+
  implements the WF2Q+ algorithm, which is a Weighted Fair Queueing
  algorithm which permits flows to share bandwidth according to
  their weights. Note that weights are not priorities; even a flow
 
 Modified: stable/8/sys/netinet/ipfw/ip_dummynet.c
 ==============================================================================
 --- stable/8/sys/netinet/ipfw/ip_dummynet.c	Sun Jul 22 11:07:59 2012	(r238684)
 +++ stable/8/sys/netinet/ipfw/ip_dummynet.c	Sun Jul 22 11:22:04 2012	(r238685)
 @@ -97,7 +97,7 @@ find_sched_type(int type, char *name)
  	struct dn_alg *d;
  
  	SLIST_FOREACH(d, &dn_cfg.schedlist, next) {
 -		if (d->type == type || (name && !strcmp(d->name, name)))
 +		if (d->type == type || (name && !strcasecmp(d->name, name)))
  			return d;
  	}
  	return NULL; /* not found */
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
>Unformatted:
