Make the WF2Q+ the default scheduler for the dummynet limiters.

The WF2Q+ was the default scheduler in previous versions, it is well tested and support dynamic queues.

Add a note for the FIFO scheduler to make clear that it does not support dynamic queues (by design) and as such, it is working as intended.

Add the scheduler information to Diagnostics -> Limiter Info.

Ticket #8973

(cherry picked from commit 25d029d1e31cc3874db82db352cd560a401558df)

2 files changed, 15 insertions, 8 deletions

diff --git a/src/etc/inc/shaper.inc b/src/etc/inc/shaper.inc
index a23f437..d59989d 100644
--- a/src/etc/inc/shaper.inc
+++ b/src/etc/inc/shaper.inc
@@ -38,10 +38,19 @@ include_once("interfaces.inc");//required for convert_real_interface_to_friendly
 // List of schedulers ('type' command on scheduler/pipe) that dummynet/ipfw is supposed to support
 function getSchedulers() {
 	return array(
+		"wf2q+" => array(
+			"name" => "Worst-case Weighted fair Queueing (default)",
+			"parameter_format" => "type wf2q+",
+			"description" => "Worst-case Weighted fair Queueing (WF2Q+) schedules flows with an associated weight. ".
+					 "WF2Q+ is the default algorithm used by previous versions.",
+			"parameters" => array(),
+			"ecn" => false
+		),
 		"fifo" => array(
 			"name" => "FIFO",
 			"parameter_format" => "type fifo",
-			"description" => "First-in-First-out is a fundamental queueing discipline which ensures packet sequence.",
+			"description" => "First-in-First-out is a fundamental queueing discipline which ensures packet sequence. ".
+					 "Dynamic queues are not supported with the FIFO scheduler (all packets are stored in a single queue).",
 			"parameters" => array(),
 			"ecn" => false
 		),
@@ -59,13 +68,6 @@ function getSchedulers() {
 			"parameters" => array(),
 			"ecn" => false
 		),
-		"wf2q+" => array(
-			"name" => "Worst-case Weighted fair Queueing",
-			"parameter_format" => "type wf2q+",
-			"description" => "Worst-case Weighted fair Queueing (WF2Q+) schedules flows with an associated weight.",
-			"parameters" => array(),
-			"ecn" => false
-		),
 		"prio" => array(
 			"name" => "PRIO",
 			"parameter_format" => "type prio",
diff --git a/src/usr/local/www/diag_limiter_info.php b/src/usr/local/www/diag_limiter_info.php
index b054386..50714ce 100644
--- a/src/usr/local/www/diag_limiter_info.php
+++ b/src/usr/local/www/diag_limiter_info.php
@@ -38,6 +38,11 @@ if ($_REQUEST['getactivity']) {
 	}
 	echo gettext("Limiters:") . "\n";
 	echo $text;
+	$text = `/sbin/ipfw sched show`;
+	if ($text != "") {
+		echo "\n\n" . gettext("Schedulers") . ":\n";
+		echo $text;
+	}
 	$text = `/sbin/ipfw queue show`;
 	if ($text != "") {
 		echo "\n\n" . gettext("Queues") . ":\n";