svn commit: r238063 - in head: sbin/ipfw sys/netinet/ipfw
Isabell Long
issyl0 at FreeBSD.org
Tue Jul 3 08:42:49 UTC 2012
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 */
More information about the svn-src-head
mailing list