From a5c9214ec6b46d6a936303dcdce44ccf2ad83f8c Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 13 Jul 2010 14:26:58 -0700 Subject: Require queue limit to be greater than zero Since queue limit of zero causes all packets to be dropped; require user to configure a reasonable value Bug 5842 --- templates/traffic-policy/drop-tail/node.tag/queue-limit/node.def | 3 ++- templates/traffic-policy/fair-queue/node.tag/queue-limit/node.def | 2 +- .../traffic-policy/network-emulator/node.tag/queue-limit/node.def | 1 + .../random-detect/node.tag/precedence/node.tag/queue-limit/node.def | 1 + .../round-robin/node.tag/class/node.tag/queue-limit/node.def | 1 + .../traffic-policy/round-robin/node.tag/default/queue-limit/node.def | 1 + .../traffic-policy/shaper/node.tag/class/node.tag/queue-limit/node.def | 1 + templates/traffic-policy/shaper/node.tag/default/queue-limit/node.def | 1 + 8 files changed, 9 insertions(+), 2 deletions(-) (limited to 'templates') diff --git a/templates/traffic-policy/drop-tail/node.tag/queue-limit/node.def b/templates/traffic-policy/drop-tail/node.tag/queue-limit/node.def index fe3b4dd..55c584b 100644 --- a/templates/traffic-policy/drop-tail/node.tag/queue-limit/node.def +++ b/templates/traffic-policy/drop-tail/node.tag/queue-limit/node.def @@ -1,2 +1,3 @@ type: u32 -help: Set maximum queue size (packets) [REQUIRED] +help: Set maximum queue size (packets) +syntax:expression: $VAR(@) > 0 ; "queue limit must be greater than zero" diff --git a/templates/traffic-policy/fair-queue/node.tag/queue-limit/node.def b/templates/traffic-policy/fair-queue/node.tag/queue-limit/node.def index 471bd5b..92c4349 100644 --- a/templates/traffic-policy/fair-queue/node.tag/queue-limit/node.def +++ b/templates/traffic-policy/fair-queue/node.tag/queue-limit/node.def @@ -1,3 +1,3 @@ type: u32 -syntax:expression: $VAR(@) > 1 ; "Queue limit must greater than 1" help: Set maximum queue size (packets) +syntax:expression: $VAR(@) > 1 ; "Queue limit must greater than 1" diff --git a/templates/traffic-policy/network-emulator/node.tag/queue-limit/node.def b/templates/traffic-policy/network-emulator/node.tag/queue-limit/node.def index 49c47b4..d86b23d 100644 --- a/templates/traffic-policy/network-emulator/node.tag/queue-limit/node.def +++ b/templates/traffic-policy/network-emulator/node.tag/queue-limit/node.def @@ -1,2 +1,3 @@ type: u32 help: Set maximum queue size (packets) +syntax:expression: $VAR(@) > 0; "Queue limit must be greater than zero" diff --git a/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/queue-limit/node.def b/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/queue-limit/node.def index 49c47b4..bac5c2a 100644 --- a/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/queue-limit/node.def +++ b/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/queue-limit/node.def @@ -1,2 +1,3 @@ type: u32 help: Set maximum queue size (packets) +syntax:expression: $VAR(@) > 0 ; "Queue limit must greater than zero" diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/queue-limit/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/queue-limit/node.def index 49c47b4..bac5c2a 100644 --- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/queue-limit/node.def +++ b/templates/traffic-policy/round-robin/node.tag/class/node.tag/queue-limit/node.def @@ -1,2 +1,3 @@ type: u32 help: Set maximum queue size (packets) +syntax:expression: $VAR(@) > 0 ; "Queue limit must greater than zero" diff --git a/templates/traffic-policy/round-robin/node.tag/default/queue-limit/node.def b/templates/traffic-policy/round-robin/node.tag/default/queue-limit/node.def index 49c47b4..bac5c2a 100644 --- a/templates/traffic-policy/round-robin/node.tag/default/queue-limit/node.def +++ b/templates/traffic-policy/round-robin/node.tag/default/queue-limit/node.def @@ -1,2 +1,3 @@ type: u32 help: Set maximum queue size (packets) +syntax:expression: $VAR(@) > 0 ; "Queue limit must greater than zero" diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/queue-limit/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/queue-limit/node.def index 49c47b4..d86b23d 100644 --- a/templates/traffic-policy/shaper/node.tag/class/node.tag/queue-limit/node.def +++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/queue-limit/node.def @@ -1,2 +1,3 @@ type: u32 help: Set maximum queue size (packets) +syntax:expression: $VAR(@) > 0; "Queue limit must be greater than zero" diff --git a/templates/traffic-policy/shaper/node.tag/default/queue-limit/node.def b/templates/traffic-policy/shaper/node.tag/default/queue-limit/node.def index 49c47b4..14b710d 100644 --- a/templates/traffic-policy/shaper/node.tag/default/queue-limit/node.def +++ b/templates/traffic-policy/shaper/node.tag/default/queue-limit/node.def @@ -1,2 +1,3 @@ type: u32 help: Set maximum queue size (packets) +syntax:expression: $VAR(@) > 0; "Queue limit must be greater than zero" -- cgit v1.2.3