From b0d2fde832dcef9fb1018ce66eed7533c32be43a Mon Sep 17 00:00:00 2001
From: Carl Byington <carl@five-ten-sg.com>
Date: Sat, 8 Nov 2014 16:04:56 -0800
Subject: add fair queue codel queueing (#446)

Signed-off-by: kouak <kouak@kouak.org>
---
 templates/traffic-policy/fq-codel/node.def                        | 8 ++++++++
 templates/traffic-policy/fq-codel/node.tag/description/node.def   | 2 ++
 templates/traffic-policy/fq-codel/node.tag/flows/node.def         | 2 ++
 templates/traffic-policy/fq-codel/node.tag/interval/node.def      | 2 ++
 templates/traffic-policy/fq-codel/node.tag/quantum/node.def       | 2 ++
 templates/traffic-policy/fq-codel/node.tag/queue-limit/node.def   | 5 +++++
 templates/traffic-policy/fq-codel/node.tag/target/node.def        | 3 +++
 .../priority-queue/node.tag/class/node.tag/queue-type/node.def    | 3 ++-
 .../priority-queue/node.tag/default/queue-type/node.def           | 3 ++-
 .../round-robin/node.tag/class/node.tag/queue-type/node.def       | 3 ++-
 .../round-robin/node.tag/default/queue-type/node.def              | 3 ++-
 .../node.tag/class/node.tag/match/node.tag/ip/small/node.def      | 1 +
 .../node.tag/class/node.tag/match/node.tag/ipv6/small/node.def    | 1 +
 .../shaper/node.tag/class/node.tag/queue-type/node.def            | 3 ++-
 .../traffic-policy/shaper/node.tag/default/queue-type/node.def    | 3 ++-
 15 files changed, 38 insertions(+), 6 deletions(-)
 create mode 100644 templates/traffic-policy/fq-codel/node.def
 create mode 100644 templates/traffic-policy/fq-codel/node.tag/description/node.def
 create mode 100644 templates/traffic-policy/fq-codel/node.tag/flows/node.def
 create mode 100644 templates/traffic-policy/fq-codel/node.tag/interval/node.def
 create mode 100644 templates/traffic-policy/fq-codel/node.tag/quantum/node.def
 create mode 100644 templates/traffic-policy/fq-codel/node.tag/queue-limit/node.def
 create mode 100644 templates/traffic-policy/fq-codel/node.tag/target/node.def
 create mode 100644 templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/small/node.def
 create mode 100644 templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/small/node.def

(limited to 'templates')

diff --git a/templates/traffic-policy/fq-codel/node.def b/templates/traffic-policy/fq-codel/node.def
new file mode 100644
index 0000000..0d42087
--- /dev/null
+++ b/templates/traffic-policy/fq-codel/node.def
@@ -0,0 +1,8 @@
+tag:
+type: txt
+help: Fair queuing controlled delay policy name
+syntax:expression: pattern $VAR(@) "^[[:alnum:]][-_[:alnum:]]*$"
+                   ; "only alpha-numeric policy name allowed"
+create: /opt/vyatta/sbin/vyatta-qos.pl --create-policy $VAR(.) $VAR(@)
+delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-policy $VAR(@)
+end: /opt/vyatta/sbin/vyatta-qos.pl --apply-policy $VAR(@)
diff --git a/templates/traffic-policy/fq-codel/node.tag/description/node.def b/templates/traffic-policy/fq-codel/node.tag/description/node.def
new file mode 100644
index 0000000..1da9e34
--- /dev/null
+++ b/templates/traffic-policy/fq-codel/node.tag/description/node.def
@@ -0,0 +1,2 @@
+type: txt
+help: Description for this queuing policy
diff --git a/templates/traffic-policy/fq-codel/node.tag/flows/node.def b/templates/traffic-policy/fq-codel/node.tag/flows/node.def
new file mode 100644
index 0000000..3d0e485
--- /dev/null
+++ b/templates/traffic-policy/fq-codel/node.tag/flows/node.def
@@ -0,0 +1,2 @@
+type: u32
+help: Number of flows (default 1024)
diff --git a/templates/traffic-policy/fq-codel/node.tag/interval/node.def b/templates/traffic-policy/fq-codel/node.tag/interval/node.def
new file mode 100644
index 0000000..857bd62
--- /dev/null
+++ b/templates/traffic-policy/fq-codel/node.tag/interval/node.def
@@ -0,0 +1,2 @@
+type: u32
+help: Interval (milliseconds) used to measure the delay (default 100)
diff --git a/templates/traffic-policy/fq-codel/node.tag/quantum/node.def b/templates/traffic-policy/fq-codel/node.tag/quantum/node.def
new file mode 100644
index 0000000..49edde3
--- /dev/null
+++ b/templates/traffic-policy/fq-codel/node.tag/quantum/node.def
@@ -0,0 +1,2 @@
+type: u32
+help: Number of bytes used as 'deficit' (default 1514)
diff --git a/templates/traffic-policy/fq-codel/node.tag/queue-limit/node.def b/templates/traffic-policy/fq-codel/node.tag/queue-limit/node.def
new file mode 100644
index 0000000..f47b18b
--- /dev/null
+++ b/templates/traffic-policy/fq-codel/node.tag/queue-limit/node.def
@@ -0,0 +1,5 @@
+type: u32
+help: Maximum queue size (packets)
+syntax:expression: $VAR(@) > 1 && $VAR(@) < 11000;\
+    "Queue limit must greater than 1 and less than 11000"
+val_help: u32:1-11000; Queue size in packets (default 10240)
diff --git a/templates/traffic-policy/fq-codel/node.tag/target/node.def b/templates/traffic-policy/fq-codel/node.tag/target/node.def
new file mode 100644
index 0000000..d678f11
--- /dev/null
+++ b/templates/traffic-policy/fq-codel/node.tag/target/node.def
@@ -0,0 +1,3 @@
+type: u32
+help: Acceptable minimum queue delay (milliseconds)
+
diff --git a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/queue-type/node.def b/templates/traffic-policy/priority-queue/node.tag/class/node.tag/queue-type/node.def
index 53f09ad..f7cb32d 100644
--- a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/queue-type/node.def
+++ b/templates/traffic-policy/priority-queue/node.tag/class/node.tag/queue-type/node.def
@@ -1,9 +1,10 @@
 type: txt
 default: "drop-tail"
-syntax:expression: $VAR(@) in "fair-queue", "priority", "drop-tail", "random-detect";\
+syntax:expression: $VAR(@) in "fq-codel", "fair-queue", "priority", "drop-tail", "random-detect";\
                    "Unknown queue-type"
 help: Queue type for this class
 
+val_help: fq-codel; Fair Queue Codel
 val_help: fair-queue; Stochastic Fair Queue (SFQ)
 val_help: drop-tail; First-In-First-Out (FIFO)
 val_help: priority; Priority queueing based on DSCP
diff --git a/templates/traffic-policy/priority-queue/node.tag/default/queue-type/node.def b/templates/traffic-policy/priority-queue/node.tag/default/queue-type/node.def
index 2f06d8c..1ea0c89 100644
--- a/templates/traffic-policy/priority-queue/node.tag/default/queue-type/node.def
+++ b/templates/traffic-policy/priority-queue/node.tag/default/queue-type/node.def
@@ -1,8 +1,9 @@
 type: txt
 default: "drop-tail"
-syntax:expression: $VAR(@) in "fair-queue", "priority", "drop-tail", "random-detect";\
+syntax:expression: $VAR(@) in "fq-codel", "fair-queue", "priority", "drop-tail", "random-detect";\
                    "Unknown queue-type"
 help: Queue type for default traffic
+val_help: fq-codel; Fair Queue Codel
 val_help: fair-queue; Stochastic Fair Queue (SFQ)
 val_help: drop-tail; First-In-First-Out (FIFO)
 val_help: random-detect; Random Early Detection (RED)
diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/queue-type/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/queue-type/node.def
index 5768fdd..36bfffb 100644
--- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/queue-type/node.def
+++ b/templates/traffic-policy/round-robin/node.tag/class/node.tag/queue-type/node.def
@@ -1,8 +1,9 @@
 type: txt
 default: "drop-tail"
-syntax:expression: $VAR(@) in "fair-queue", "priority", "drop-tail"; \
+syntax:expression: $VAR(@) in "fq-codel", "fair-queue", "priority", "drop-tail"; \
                    "Unknown queue-type"
 help: Queue type for this class
+val_help: fq-codel; Fair Queue Codel
 val_help: fair-queue; Stochastic Fair Queue (SFQ)
 val_help: drop-tail; First-In-First-Out (FIFO)
 val_help: priority; Priority queueing based on DSCP
diff --git a/templates/traffic-policy/round-robin/node.tag/default/queue-type/node.def b/templates/traffic-policy/round-robin/node.tag/default/queue-type/node.def
index ec3d4a2..f895d94 100644
--- a/templates/traffic-policy/round-robin/node.tag/default/queue-type/node.def
+++ b/templates/traffic-policy/round-robin/node.tag/default/queue-type/node.def
@@ -1,8 +1,9 @@
 type: txt
 default: "fair-queue"
-syntax:expression: $VAR(@) in "fair-queue", "priority", "drop-tail";\
+syntax:expression: $VAR(@) in "fq-codel", "fair-queue", "priority", "drop-tail";\
                    "Unknown queue-type"
 help: Queue type for this class
+val_help: fq-codel; Fair Queue Codel
 val_help: fair-queue; Stochastic Fair Queue (SFQ)
 val_help: drop-tail; First-In-First-Out (FIFO)
 val_help: priority; Priority queueing based on DSCP
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/small/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/small/node.def
new file mode 100644
index 0000000..4321d9d
--- /dev/null
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/small/node.def
@@ -0,0 +1 @@
+help: Match on small ip packets
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/small/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/small/node.def
new file mode 100644
index 0000000..8afbb67
--- /dev/null
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/small/node.def
@@ -0,0 +1 @@
+help: Match on small ipv6 packets
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/queue-type/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/queue-type/node.def
index 6b44648..ce84eff 100644
--- a/templates/traffic-policy/shaper/node.tag/class/node.tag/queue-type/node.def
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/queue-type/node.def
@@ -1,9 +1,10 @@
 type: txt
 default: "fair-queue"
-syntax:expression: $VAR(@) in "fair-queue", "priority", "drop-tail", "random-detect";\
+syntax:expression: $VAR(@) in "fq-codel", "fair-queue", "priority", "drop-tail", "random-detect";\
                    "Unknown queue-type"
 help: Queue type for this class
 
+val_help: fq-codel; Fair Queue Codel
 val_help: fair-queue; Stochastic Fair Queue (SFQ)
 val_help: drop-tail; First-In-First-Out (FIFO)
 val_help: priority; Priority queueing based on DSCP
diff --git a/templates/traffic-policy/shaper/node.tag/default/queue-type/node.def b/templates/traffic-policy/shaper/node.tag/default/queue-type/node.def
index caf6818..f5e2c0a 100644
--- a/templates/traffic-policy/shaper/node.tag/default/queue-type/node.def
+++ b/templates/traffic-policy/shaper/node.tag/default/queue-type/node.def
@@ -1,8 +1,9 @@
 type: txt
 default: "fair-queue"
-syntax:expression: $VAR(@) in "fair-queue", "priority", "drop-tail", "random-detect";\
+syntax:expression: $VAR(@) in "fq-codel", "fair-queue", "priority", "drop-tail", "random-detect";\
                    "Unknown queue-type"
 help: Queue type for default traffic
+val_help: fq-codel; Fair Queue Codel
 val_help: fair-queue; Stochastic Fair Queue (SFQ)
 val_help: drop-tail; First-In-First-Out (FIFO)
 val_help: priority; Priority queueing based on DSCP
-- 
cgit v1.2.3


From 1a9399fe3e2dc25fadff10dd8c72485337dedb51 Mon Sep 17 00:00:00 2001
From: Carl Byington <carl@five-ten-sg.com>
Date: Thu, 18 Dec 2014 09:07:32 -0800
Subject: add fq-codel parameters (#446)

Signed-off-by: kouak <kouak@kouak.org>
---
 lib/Vyatta/Qos/FairQueueCodel.pm                            |  4 ++--
 lib/Vyatta/Qos/ShaperClass.pm                               | 13 ++++++++++++-
 .../traffic-policy/fq-codel/node.tag/codel-quantum/node.def |  2 ++
 templates/traffic-policy/fq-codel/node.tag/flows/node.def   |  2 +-
 .../traffic-policy/fq-codel/node.tag/interval/node.def      |  2 +-
 templates/traffic-policy/fq-codel/node.tag/quantum/node.def |  2 --
 templates/traffic-policy/fq-codel/node.tag/target/node.def  |  2 +-
 .../node.tag/class/node.tag/codel-quantum/node.def          |  2 ++
 .../priority-queue/node.tag/class/node.tag/flows/node.def   |  2 ++
 .../node.tag/class/node.tag/interval/node.def               |  2 ++
 .../priority-queue/node.tag/class/node.tag/target/node.def  |  3 +++
 .../priority-queue/node.tag/default/codel-quantum/node.def  |  2 ++
 .../priority-queue/node.tag/default/flows/node.def          |  2 ++
 .../priority-queue/node.tag/default/interval/node.def       |  2 ++
 .../priority-queue/node.tag/default/target/node.def         |  3 +++
 .../node.tag/class/node.tag/codel-quantum/node.def          |  2 ++
 .../round-robin/node.tag/class/node.tag/flows/node.def      |  2 ++
 .../round-robin/node.tag/class/node.tag/interval/node.def   |  2 ++
 .../round-robin/node.tag/class/node.tag/target/node.def     |  3 +++
 .../round-robin/node.tag/default/codel-quantum/node.def     |  2 ++
 .../round-robin/node.tag/default/flows/node.def             |  2 ++
 .../round-robin/node.tag/default/interval/node.def          |  2 ++
 .../round-robin/node.tag/default/target/node.def            |  3 +++
 .../shaper/node.tag/class/node.tag/codel-quantum/node.def   |  2 ++
 .../shaper/node.tag/class/node.tag/flows/node.def           |  2 ++
 .../shaper/node.tag/class/node.tag/interval/node.def        |  2 ++
 .../shaper/node.tag/class/node.tag/target/node.def          |  3 +++
 .../shaper/node.tag/default/codel-quantum/node.def          |  2 ++
 .../traffic-policy/shaper/node.tag/default/flows/node.def   |  2 ++
 .../shaper/node.tag/default/interval/node.def               |  2 ++
 .../traffic-policy/shaper/node.tag/default/target/node.def  |  3 +++
 31 files changed, 73 insertions(+), 8 deletions(-)
 create mode 100644 templates/traffic-policy/fq-codel/node.tag/codel-quantum/node.def
 delete mode 100644 templates/traffic-policy/fq-codel/node.tag/quantum/node.def
 create mode 100644 templates/traffic-policy/priority-queue/node.tag/class/node.tag/codel-quantum/node.def
 create mode 100644 templates/traffic-policy/priority-queue/node.tag/class/node.tag/flows/node.def
 create mode 100644 templates/traffic-policy/priority-queue/node.tag/class/node.tag/interval/node.def
 create mode 100644 templates/traffic-policy/priority-queue/node.tag/class/node.tag/target/node.def
 create mode 100644 templates/traffic-policy/priority-queue/node.tag/default/codel-quantum/node.def
 create mode 100644 templates/traffic-policy/priority-queue/node.tag/default/flows/node.def
 create mode 100644 templates/traffic-policy/priority-queue/node.tag/default/interval/node.def
 create mode 100644 templates/traffic-policy/priority-queue/node.tag/default/target/node.def
 create mode 100644 templates/traffic-policy/round-robin/node.tag/class/node.tag/codel-quantum/node.def
 create mode 100644 templates/traffic-policy/round-robin/node.tag/class/node.tag/flows/node.def
 create mode 100644 templates/traffic-policy/round-robin/node.tag/class/node.tag/interval/node.def
 create mode 100644 templates/traffic-policy/round-robin/node.tag/class/node.tag/target/node.def
 create mode 100644 templates/traffic-policy/round-robin/node.tag/default/codel-quantum/node.def
 create mode 100644 templates/traffic-policy/round-robin/node.tag/default/flows/node.def
 create mode 100644 templates/traffic-policy/round-robin/node.tag/default/interval/node.def
 create mode 100644 templates/traffic-policy/round-robin/node.tag/default/target/node.def
 create mode 100644 templates/traffic-policy/shaper/node.tag/class/node.tag/codel-quantum/node.def
 create mode 100644 templates/traffic-policy/shaper/node.tag/class/node.tag/flows/node.def
 create mode 100644 templates/traffic-policy/shaper/node.tag/class/node.tag/interval/node.def
 create mode 100644 templates/traffic-policy/shaper/node.tag/class/node.tag/target/node.def
 create mode 100644 templates/traffic-policy/shaper/node.tag/default/codel-quantum/node.def
 create mode 100644 templates/traffic-policy/shaper/node.tag/default/flows/node.def
 create mode 100644 templates/traffic-policy/shaper/node.tag/default/interval/node.def
 create mode 100644 templates/traffic-policy/shaper/node.tag/default/target/node.def

(limited to 'templates')

diff --git a/lib/Vyatta/Qos/FairQueueCodel.pm b/lib/Vyatta/Qos/FairQueueCodel.pm
index 980cbeb..79c1f79 100644
--- a/lib/Vyatta/Qos/FairQueueCodel.pm
+++ b/lib/Vyatta/Qos/FairQueueCodel.pm
@@ -43,7 +43,7 @@ sub new {
     $self->{_flows}    = $config->returnValue('flows');
     $self->{_target}   = $config->returnValue('target');
     $self->{_interval} = $config->returnValue('interval');
-    $self->{_quantum}  = $config->returnValue('quantum');
+    $self->{_cquantum} = $config->returnValue('codel-quantum');
     return bless $self, $class;
 }
 
@@ -55,7 +55,7 @@ sub commands {
     print " flows    $self->{_flows}"    if ( $self->{_flows} );
     print " target   $self->{_target}"   if ( $self->{_target} );
     print " interval $self->{_interval}" if ( $self->{_interval} );
-    print " quantum  $self->{_quantum}"  if ( $self->{_quantum} );
+    print " quantum  $self->{_cquantum}" if ( $self->{_cquantum} );
     print " noecn\n";
 }
 
diff --git a/lib/Vyatta/Qos/ShaperClass.pm b/lib/Vyatta/Qos/ShaperClass.pm
index a7d9b22..b4689b4 100644
--- a/lib/Vyatta/Qos/ShaperClass.pm
+++ b/lib/Vyatta/Qos/ShaperClass.pm
@@ -52,6 +52,13 @@ sub new {
         $self->{_avgpkt}   = $config->returnValue("packet-length");
         $self->{_latency}  = $config->returnValue("latency");
         $self->{_quantum}  = $config->returnValue("quantum");
+        $self->{_flows}    = $config->returnValue('flows');
+        $self->{_target}   = $config->returnValue('target');
+        $self->{_interval} = $config->returnValue('interval');
+        $self->{_cquantum} = $config->returnValue('codel-quantum');
+
+        if ( $self->{_target} )    { $self->{_target} *= 1000; }
+        if ( $self->{_interval} )  { $self->{_interval} *= 1000; }
 
         $self->{dsmark} = getDsfield( $config->returnValue("set-dscp") );
         my @matches = _getMatch("$level match");
@@ -126,7 +133,11 @@ sub codelQdisc {
     my ( $self, $dev, $rate ) = @_;
 
     print "fq_codel";
-    print " limit $self->{_limit}" if ( $self->{_limit} );
+    print " limit $self->{_limit}"       if ( $self->{_limit} );
+    print " flows    $self->{_flows}"    if ( $self->{_flows} );
+    print " target   $self->{_target}"   if ( $self->{_target} );
+    print " interval $self->{_interval}" if ( $self->{_interval} );
+    print " quantum  $self->{_cquantum}" if ( $self->{_cquantum} );
     print " noecn\n";
 }
 
diff --git a/templates/traffic-policy/fq-codel/node.tag/codel-quantum/node.def b/templates/traffic-policy/fq-codel/node.tag/codel-quantum/node.def
new file mode 100644
index 0000000..cb1efe3
--- /dev/null
+++ b/templates/traffic-policy/fq-codel/node.tag/codel-quantum/node.def
@@ -0,0 +1,2 @@
+type: u32
+help: fq-codel - Number of bytes used as 'deficit' (default 1514)
diff --git a/templates/traffic-policy/fq-codel/node.tag/flows/node.def b/templates/traffic-policy/fq-codel/node.tag/flows/node.def
index 3d0e485..aff7f29 100644
--- a/templates/traffic-policy/fq-codel/node.tag/flows/node.def
+++ b/templates/traffic-policy/fq-codel/node.tag/flows/node.def
@@ -1,2 +1,2 @@
 type: u32
-help: Number of flows (default 1024)
+help: fq-codel - Number of flows (default 1024)
diff --git a/templates/traffic-policy/fq-codel/node.tag/interval/node.def b/templates/traffic-policy/fq-codel/node.tag/interval/node.def
index 857bd62..a7d28b1 100644
--- a/templates/traffic-policy/fq-codel/node.tag/interval/node.def
+++ b/templates/traffic-policy/fq-codel/node.tag/interval/node.def
@@ -1,2 +1,2 @@
 type: u32
-help: Interval (milliseconds) used to measure the delay (default 100)
+help: fq-codel - Interval (milliseconds) used to measure the delay (default 100)
diff --git a/templates/traffic-policy/fq-codel/node.tag/quantum/node.def b/templates/traffic-policy/fq-codel/node.tag/quantum/node.def
deleted file mode 100644
index 49edde3..0000000
--- a/templates/traffic-policy/fq-codel/node.tag/quantum/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: u32
-help: Number of bytes used as 'deficit' (default 1514)
diff --git a/templates/traffic-policy/fq-codel/node.tag/target/node.def b/templates/traffic-policy/fq-codel/node.tag/target/node.def
index d678f11..d9b4196 100644
--- a/templates/traffic-policy/fq-codel/node.tag/target/node.def
+++ b/templates/traffic-policy/fq-codel/node.tag/target/node.def
@@ -1,3 +1,3 @@
 type: u32
-help: Acceptable minimum queue delay (milliseconds)
+help: fq-codel - Acceptable minimum queue delay (milliseconds)
 
diff --git a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/codel-quantum/node.def b/templates/traffic-policy/priority-queue/node.tag/class/node.tag/codel-quantum/node.def
new file mode 100644
index 0000000..cb1efe3
--- /dev/null
+++ b/templates/traffic-policy/priority-queue/node.tag/class/node.tag/codel-quantum/node.def
@@ -0,0 +1,2 @@
+type: u32
+help: fq-codel - Number of bytes used as 'deficit' (default 1514)
diff --git a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/flows/node.def b/templates/traffic-policy/priority-queue/node.tag/class/node.tag/flows/node.def
new file mode 100644
index 0000000..aff7f29
--- /dev/null
+++ b/templates/traffic-policy/priority-queue/node.tag/class/node.tag/flows/node.def
@@ -0,0 +1,2 @@
+type: u32
+help: fq-codel - Number of flows (default 1024)
diff --git a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/interval/node.def b/templates/traffic-policy/priority-queue/node.tag/class/node.tag/interval/node.def
new file mode 100644
index 0000000..a7d28b1
--- /dev/null
+++ b/templates/traffic-policy/priority-queue/node.tag/class/node.tag/interval/node.def
@@ -0,0 +1,2 @@
+type: u32
+help: fq-codel - Interval (milliseconds) used to measure the delay (default 100)
diff --git a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/target/node.def b/templates/traffic-policy/priority-queue/node.tag/class/node.tag/target/node.def
new file mode 100644
index 0000000..d9b4196
--- /dev/null
+++ b/templates/traffic-policy/priority-queue/node.tag/class/node.tag/target/node.def
@@ -0,0 +1,3 @@
+type: u32
+help: fq-codel - Acceptable minimum queue delay (milliseconds)
+
diff --git a/templates/traffic-policy/priority-queue/node.tag/default/codel-quantum/node.def b/templates/traffic-policy/priority-queue/node.tag/default/codel-quantum/node.def
new file mode 100644
index 0000000..cb1efe3
--- /dev/null
+++ b/templates/traffic-policy/priority-queue/node.tag/default/codel-quantum/node.def
@@ -0,0 +1,2 @@
+type: u32
+help: fq-codel - Number of bytes used as 'deficit' (default 1514)
diff --git a/templates/traffic-policy/priority-queue/node.tag/default/flows/node.def b/templates/traffic-policy/priority-queue/node.tag/default/flows/node.def
new file mode 100644
index 0000000..aff7f29
--- /dev/null
+++ b/templates/traffic-policy/priority-queue/node.tag/default/flows/node.def
@@ -0,0 +1,2 @@
+type: u32
+help: fq-codel - Number of flows (default 1024)
diff --git a/templates/traffic-policy/priority-queue/node.tag/default/interval/node.def b/templates/traffic-policy/priority-queue/node.tag/default/interval/node.def
new file mode 100644
index 0000000..a7d28b1
--- /dev/null
+++ b/templates/traffic-policy/priority-queue/node.tag/default/interval/node.def
@@ -0,0 +1,2 @@
+type: u32
+help: fq-codel - Interval (milliseconds) used to measure the delay (default 100)
diff --git a/templates/traffic-policy/priority-queue/node.tag/default/target/node.def b/templates/traffic-policy/priority-queue/node.tag/default/target/node.def
new file mode 100644
index 0000000..d9b4196
--- /dev/null
+++ b/templates/traffic-policy/priority-queue/node.tag/default/target/node.def
@@ -0,0 +1,3 @@
+type: u32
+help: fq-codel - Acceptable minimum queue delay (milliseconds)
+
diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/codel-quantum/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/codel-quantum/node.def
new file mode 100644
index 0000000..cb1efe3
--- /dev/null
+++ b/templates/traffic-policy/round-robin/node.tag/class/node.tag/codel-quantum/node.def
@@ -0,0 +1,2 @@
+type: u32
+help: fq-codel - Number of bytes used as 'deficit' (default 1514)
diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/flows/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/flows/node.def
new file mode 100644
index 0000000..aff7f29
--- /dev/null
+++ b/templates/traffic-policy/round-robin/node.tag/class/node.tag/flows/node.def
@@ -0,0 +1,2 @@
+type: u32
+help: fq-codel - Number of flows (default 1024)
diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/interval/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/interval/node.def
new file mode 100644
index 0000000..a7d28b1
--- /dev/null
+++ b/templates/traffic-policy/round-robin/node.tag/class/node.tag/interval/node.def
@@ -0,0 +1,2 @@
+type: u32
+help: fq-codel - Interval (milliseconds) used to measure the delay (default 100)
diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/target/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/target/node.def
new file mode 100644
index 0000000..d9b4196
--- /dev/null
+++ b/templates/traffic-policy/round-robin/node.tag/class/node.tag/target/node.def
@@ -0,0 +1,3 @@
+type: u32
+help: fq-codel - Acceptable minimum queue delay (milliseconds)
+
diff --git a/templates/traffic-policy/round-robin/node.tag/default/codel-quantum/node.def b/templates/traffic-policy/round-robin/node.tag/default/codel-quantum/node.def
new file mode 100644
index 0000000..cb1efe3
--- /dev/null
+++ b/templates/traffic-policy/round-robin/node.tag/default/codel-quantum/node.def
@@ -0,0 +1,2 @@
+type: u32
+help: fq-codel - Number of bytes used as 'deficit' (default 1514)
diff --git a/templates/traffic-policy/round-robin/node.tag/default/flows/node.def b/templates/traffic-policy/round-robin/node.tag/default/flows/node.def
new file mode 100644
index 0000000..aff7f29
--- /dev/null
+++ b/templates/traffic-policy/round-robin/node.tag/default/flows/node.def
@@ -0,0 +1,2 @@
+type: u32
+help: fq-codel - Number of flows (default 1024)
diff --git a/templates/traffic-policy/round-robin/node.tag/default/interval/node.def b/templates/traffic-policy/round-robin/node.tag/default/interval/node.def
new file mode 100644
index 0000000..a7d28b1
--- /dev/null
+++ b/templates/traffic-policy/round-robin/node.tag/default/interval/node.def
@@ -0,0 +1,2 @@
+type: u32
+help: fq-codel - Interval (milliseconds) used to measure the delay (default 100)
diff --git a/templates/traffic-policy/round-robin/node.tag/default/target/node.def b/templates/traffic-policy/round-robin/node.tag/default/target/node.def
new file mode 100644
index 0000000..d9b4196
--- /dev/null
+++ b/templates/traffic-policy/round-robin/node.tag/default/target/node.def
@@ -0,0 +1,3 @@
+type: u32
+help: fq-codel - Acceptable minimum queue delay (milliseconds)
+
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/codel-quantum/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/codel-quantum/node.def
new file mode 100644
index 0000000..cb1efe3
--- /dev/null
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/codel-quantum/node.def
@@ -0,0 +1,2 @@
+type: u32
+help: fq-codel - Number of bytes used as 'deficit' (default 1514)
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/flows/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/flows/node.def
new file mode 100644
index 0000000..aff7f29
--- /dev/null
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/flows/node.def
@@ -0,0 +1,2 @@
+type: u32
+help: fq-codel - Number of flows (default 1024)
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/interval/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/interval/node.def
new file mode 100644
index 0000000..a7d28b1
--- /dev/null
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/interval/node.def
@@ -0,0 +1,2 @@
+type: u32
+help: fq-codel - Interval (milliseconds) used to measure the delay (default 100)
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/target/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/target/node.def
new file mode 100644
index 0000000..d9b4196
--- /dev/null
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/target/node.def
@@ -0,0 +1,3 @@
+type: u32
+help: fq-codel - Acceptable minimum queue delay (milliseconds)
+
diff --git a/templates/traffic-policy/shaper/node.tag/default/codel-quantum/node.def b/templates/traffic-policy/shaper/node.tag/default/codel-quantum/node.def
new file mode 100644
index 0000000..cb1efe3
--- /dev/null
+++ b/templates/traffic-policy/shaper/node.tag/default/codel-quantum/node.def
@@ -0,0 +1,2 @@
+type: u32
+help: fq-codel - Number of bytes used as 'deficit' (default 1514)
diff --git a/templates/traffic-policy/shaper/node.tag/default/flows/node.def b/templates/traffic-policy/shaper/node.tag/default/flows/node.def
new file mode 100644
index 0000000..aff7f29
--- /dev/null
+++ b/templates/traffic-policy/shaper/node.tag/default/flows/node.def
@@ -0,0 +1,2 @@
+type: u32
+help: fq-codel - Number of flows (default 1024)
diff --git a/templates/traffic-policy/shaper/node.tag/default/interval/node.def b/templates/traffic-policy/shaper/node.tag/default/interval/node.def
new file mode 100644
index 0000000..a7d28b1
--- /dev/null
+++ b/templates/traffic-policy/shaper/node.tag/default/interval/node.def
@@ -0,0 +1,2 @@
+type: u32
+help: fq-codel - Interval (milliseconds) used to measure the delay (default 100)
diff --git a/templates/traffic-policy/shaper/node.tag/default/target/node.def b/templates/traffic-policy/shaper/node.tag/default/target/node.def
new file mode 100644
index 0000000..d9b4196
--- /dev/null
+++ b/templates/traffic-policy/shaper/node.tag/default/target/node.def
@@ -0,0 +1,3 @@
+type: u32
+help: fq-codel - Acceptable minimum queue delay (milliseconds)
+
-- 
cgit v1.2.3


From 439206f1b4e4d9fb0feecaa43c6c9dc99c794e25 Mon Sep 17 00:00:00 2001
From: kouak <kouak@kouak.org>
Date: Thu, 26 Mar 2015 00:52:42 +0100
Subject: Remove small packets matching from fq-codel import (already fixed in
 #513) (#446)

---
 lib/Vyatta/Qos/Match.pm                            | 113 +++------------------
 .../node.tag/match/node.tag/ip/small/node.def      |   1 -
 .../node.tag/match/node.tag/ipv6/small/node.def    |   1 -
 3 files changed, 16 insertions(+), 99 deletions(-)
 delete mode 100644 templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/small/node.def
 delete mode 100644 templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/small/node.def

(limited to 'templates')

diff --git a/lib/Vyatta/Qos/Match.pm b/lib/Vyatta/Qos/Match.pm
index 2b22c30..c8078b6 100644
--- a/lib/Vyatta/Qos/Match.pm
+++ b/lib/Vyatta/Qos/Match.pm
@@ -26,7 +26,7 @@ sub getPort {
 
     if ( $str =~ /^([0-9]+)|(0x[0-9a-fA-F]+)$/ ) {
         die "$str is not a valid port number\n"
-            if ( $str <= 0 || $str > 65535 );
+          if ( $str <= 0 || $str > 65535 );
         return $str;
     }
 
@@ -47,8 +47,8 @@ sub new {
 
     # special case for match all
     unless ($config) {
-        $self->{'ether'} = { protocol => 'all' };
-        return $self;
+	$self->{'ether'} = { protocol => 'all' };
+	return $self;
     }
 
     foreach my $af (qw(ip ipv6 ether)) {
@@ -88,7 +88,7 @@ sub new {
             }
         }
 
-        # if the hash is empty then we didn't generate a match rule
+        # if the hash is empty then we didn't generate a match rule 
         # this usually means user left an uncompleted match in the config
         my @keys = keys(%fields);
         if ($#keys < 0) {
@@ -120,82 +120,6 @@ sub new {
     return $self;
 }
 
-sub small_ip_filter {
-    my ( $dev, $parent, $prio, $classid ) = @_;
-    my $protoip = "ip";
-    my $synack  = 2;    # hash table id, arbitrary number
-    $parent  = sprintf("%x", $parent);
-    $classid = sprintf("%x", $classid);
-    print "filter add dev $dev parent $parent: prior $prio protocol $protoip u32\n";
-    # make a linked hash table
-    print "filter add dev $dev parent $parent: prior $prio protocol $protoip handle $synack: u32 divisor 1\n";
-    # tcp syn bit
-    print "filter add dev $dev parent $parent: prior $prio protocol $protoip u32 ht $synack:";
-    print "    match u8 0x02 0x02 at 13";
-    print "    flowid $parent:$classid\n";
-    # tcp ack bit
-    print "filter add dev $dev parent $parent: prior $prio protocol $protoip u32 ht $synack:";
-    print "    match u8 0x10 0x10 at 13";
-    print "    flowid $parent:$classid\n";
-    # ipv4/icmp
-    print "filter add dev $dev parent $parent: prior $prio protocol $protoip u32";
-    print "    match ip protocol 1 0xff";
-    print "    flowid $parent:$classid\n";
-    # ipv4/tcp, total len<256, tos=0x10 == minimum delay
-    print "filter add dev $dev parent $parent: prior $prio protocol $protoip u32";
-    print "    match ip protocol 6 0xff";
-    print "    match u16 0x0000 0xff00 at 2";
-    print "    match ip tos 0x10 0xff";
-    print "    flowid $parent:$classid\n";
-    # ipv4/tcp, total len<128, not fragmented
-    print "filter add dev $dev parent $parent: prior $prio protocol $protoip u32";
-    print "    match ip protocol 6 0xff";
-    print "    match u16 0x0000 0xff80 at 2";
-    print "    match ip nofrag";
-    print "    offset at 0 mask 0x0f00 shift 6 eat";
-    print "    link $synack:\n";
-}
-
-sub small_ip6_filter {
-    my ( $dev, $parent, $prio, $classid ) = @_;
-    my $protoip6 = "ipv6";
-    my $synack6  = 3;    # hash table id, arbitrary number
-    $parent  = sprintf("%x", $parent);
-    $classid = sprintf("%x", $classid);
-    # setup base filter
-    print "filter add dev $dev parent $parent: prior $prio protocol $protoip6 u32\n";
-    # make a linked hash table
-    print "filter add dev $dev parent $parent: prior $prio protocol $protoip6 handle $synack6: u32 divisor 1\n";
-    # tcp syn bit
-    print "filter add dev $dev parent $parent: prior $prio protocol $protoip6 u32 ht $synack6: ";
-    print "    match u8 0x02 0x02 at 13";
-    print "    flowid $parent:$classid\n";
-    # tcp ack bit
-    print "filter add dev $dev parent $parent: prior $prio protocol $protoip6 u32 ht $synack6:";
-    print "    match u8 0x10 0x10 at 13";
-    print "    flowid $parent:$classid\n";
-    # ipv6/icmpv6
-    print "filter add dev $dev parent $parent: prior $prio protocol $protoip6 u32";
-    print "    match ip6 protocol 58 0xff";
-    print "    flowid $parent:$classid\n";
-    # ipv6/tcp, payload len<128, priority=0x10 == minimum delay
-    print "filter add dev $dev parent $parent: prior $prio protocol $protoip6 u32";
-    print "    match ip6 protocol 6 0xff";
-    print "    match u16 0x0000 0xff80 at 4";
-    print "    match ip6 priority 0x10 0xff";
-    print "    flowid $parent:$classid\n";
-    # ipv6/tcp, payload len<64, not fragmented since the next header is a tcp header
-    # this does not handle packets with other ipv6 extension headers that might be
-    # present between the ipv6 header and the tcp header
-    print "filter add dev $dev parent $parent: prior $prio protocol $protoip6 u32";
-    print "    match ip6 protocol 6 0xff";
-    print "    match u16 0x0000 0xffc0 at 4";
-    print "    offset plus 40 eat";
-    print "    link $synack6:\n";
-}
-
-
-
 sub filter {
     my ( $self, $dev, $parent, $classid, $prio, $dsmark, $police ) = @_;
 
@@ -210,9 +134,9 @@ sub filter {
             next unless $ip && $$ip{dsfield};
 
             printf "filter add dev %s parent %x: protocol %s prio %d",
-                $dev, $parent, $ipver, $prio;
+	      $dev, $parent, $ipver, $prio;
             printf " handle %s tcindex classid %x:%x\n",
-                $$ip{dsfield}, $parent, $classid;
+              $$ip{dsfield}, $parent, $classid;
 
             $prio += 1;
         }
@@ -224,18 +148,12 @@ sub filter {
         my $p = $self->{$proto};
         next unless $p;
 
-        if (defined($$p{small})) {
-            small_ip_filter($dev, $parent, $prio, $classid)  if ($proto eq 'ip');
-            small_ip6_filter($dev, $parent, $prio, $classid) if ($proto eq 'ipv6');
-            next;
-        }
-
         printf "filter add dev %s parent %x: prio %d", $dev, $parent, $prio;
         if ( $proto eq 'ether' ) {
             my $type = $$p{protocol};
             $type = 'all' unless $type;
 
-	    print " protocol $type u32";
+	        print " protocol $type u32";
             if ( defined( $$p{src} ) || defined( $$p{dst} ) ) {
                 print " match ether src $$p{src}" if $$p{src};
                 print " match ether dst $$p{dst}" if $$p{dst};
@@ -293,8 +211,8 @@ sub filter {
             }
         }
 
-        print  " match mark $fwmark 0xff" if $fwmark;
-        print  " $police"                 if $police;
+        print " match mark $fwmark 0xff" if $fwmark;
+        print " $police"                 if $police;
         printf " flowid %x:%x\n", $parent, $classid;
         return;
     }
@@ -303,17 +221,18 @@ sub filter {
     my $vif   = $self->{_vif};
     if ( defined($vif) || defined($indev) ) {
         printf "filter add dev %s parent %x: prio %d", $dev, $parent, $prio;
-        print  " protocol all basic";
-        print  " match meta\(rt_iif eq $indev\)"        if $indev;
-        print  " match meta\(vlan mask 0xfff eq $vif\)" if $vif;
-        print  " match meta\(fwmark eq $fwmark\)"       if $fwmark;
-        print  " $police" if $police;
+        print " protocol all basic";
+        print " match meta\(rt_iif eq $indev\)"        if $indev;
+        print " match meta\(vlan mask 0xfff eq $vif\)" if $vif;
+        print " match meta\(fwmark eq $fwmark\)"       if $fwmark;
+
+        print " $police" if $police;
         printf " flowid %x:%x\n", $parent, $classid;
     }
     elsif ($fwmark) {
         printf "filter add dev %s parent %x: prio %d", $dev, $parent, $prio;
         printf " protocol all handle %d fw", $fwmark;
-        print  " $police" if $police;
+        print " $police" if $police;
         printf " flowid %x:%x\n", $parent, $classid;
     }
 }
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/small/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/small/node.def
deleted file mode 100644
index 4321d9d..0000000
--- a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/small/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Match on small ip packets
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/small/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/small/node.def
deleted file mode 100644
index 8afbb67..0000000
--- a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/small/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Match on small ipv6 packets
-- 
cgit v1.2.3