svn commit: r238685 - in stable/8: sbin/ipfw sys/netinet/ipfw

[Isabell Long]

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 */