From c00b2f8bc96581b43f83dde7257dbd5183302712 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 25 Sep 2018 10:19:08 +0200 Subject: [PATCH 01/12] Update TrafficShaper.xml --- .../OPNsense/TrafficShaper/TrafficShaper.xml | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml b/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml index d631b79aa..e279028e5 100644 --- a/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml +++ b/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml @@ -63,6 +63,7 @@ Deficit Round Robin QFQ FlowQueue-CoDel + FlowQueue-PIE @@ -83,6 +84,10 @@ 0 Y + + 0 + Y + N 1 @@ -98,6 +103,21 @@ 1 65535 + + N + 1 + 65535 + + + N + 1 + 65535 + + + N + 1 + 65535 + N /^([a-z,A-Z,1-9]){0,30}$/ @@ -179,6 +199,10 @@ 0 Y + + 0 + Y + Y /^([\t\n\v\f\r 0-9a-zA-Z.\-,_\x{00A0}-\x{FFFF}]){1,255}$/u From 4ee3738cdb3c2a960cfe4f642959dec9e3c4804a Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 25 Sep 2018 10:21:02 +0200 Subject: [PATCH 02/12] Update dialogPipe.xml --- .../controllers/OPNsense/TrafficShaper/forms/dialogPipe.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/forms/dialogPipe.xml b/src/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/forms/dialogPipe.xml index 3b68bfc33..85572092d 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/forms/dialogPipe.xml +++ b/src/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/forms/dialogPipe.xml @@ -95,6 +95,12 @@ true The number of flow queues that are created and managed, leave empty for defaults + + pipe.pie_enable + + checkbox + Enable PIE active queue management + pipe.delay From ae4973fb2e43e7dfeb118db4850375f00f3f7c08 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 25 Sep 2018 10:27:12 +0200 Subject: [PATCH 03/12] Update dialogPipe.xml --- .../TrafficShaper/forms/dialogPipe.xml | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/forms/dialogPipe.xml b/src/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/forms/dialogPipe.xml index 85572092d..ee721fc78 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/forms/dialogPipe.xml +++ b/src/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/forms/dialogPipe.xml @@ -95,6 +95,27 @@ true The number of flow queues that are created and managed, leave empty for defaults + + pipe.fqpie_quantum + + text + true + The default quantum (credit) of the FQ-PIE in unit of byte. The value must be in the range 1..9000. + + + pipe.fqpie_limit + + text + true + The default hard size limit (in unit of packet) of all queues managed by an instance of the FQ-PIE scheduler. The value must be in the range 1..20480. + + + pipe.fqpie_flows + + text + true + Defines the default total number of flow queues (sub-queues) that FQ-PIE creates and manages. The value must be in the range 1..65536. + pipe.pie_enable From 5e0cb74b4b213eb52e8d3c1e048a9058fa510692 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 25 Sep 2018 10:27:51 +0200 Subject: [PATCH 04/12] Update dialogQueue.xml --- .../OPNsense/TrafficShaper/forms/dialogQueue.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/forms/dialogQueue.xml b/src/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/forms/dialogQueue.xml index f35b668c2..d33343861 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/forms/dialogQueue.xml +++ b/src/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/forms/dialogQueue.xml @@ -60,6 +60,12 @@ checkbox true Explicit Congestion Notification + + + queue.pie_enable + + checkbox + Enable PIE active queue management queue.description From 2a26272f120135eeebccabe9d51da82060b096c0 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 25 Sep 2018 10:44:38 +0200 Subject: [PATCH 05/12] Update ipfw.conf --- src/opnsense/service/templates/OPNsense/IPFW/ipfw.conf | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/opnsense/service/templates/OPNsense/IPFW/ipfw.conf b/src/opnsense/service/templates/OPNsense/IPFW/ipfw.conf index a7cbb4a00..6b634fda3 100644 --- a/src/opnsense/service/templates/OPNsense/IPFW/ipfw.conf +++ b/src/opnsense/service/templates/OPNsense/IPFW/ipfw.conf @@ -53,6 +53,14 @@ pipe {{ pipe.number }} config bw {{ pipe.bandwidth }}{{ pipe.bandwidthMetric }}/ if pipe.fqcodel_limit|default('') != '' %} limit {{pipe.fqcodel_limit}} {% endif %} {% if pipe.fqcodel_flows|default('') != '' %} flows {{pipe.fqcodel_flows}} {% endif %} {% endif %} +{% endif %}{% + if pipe.pie_enable|default('0') == '1' and pipe.scheduler != 'fq_pie' %} pie {% endif %}{% + if pipe.pie_enable|default('0') == '1' or pipe.scheduler == 'fq_pie' %}{% + if pipe.scheduler == 'fq_pie' %} {% + if pipe.fqpie_quantum|default('') != '' %} quantum {{pipe.fqpie_quantum}} {% endif %} {% + if pipe.fqpie_limit|default('') != '' %} limit {{pipe.fqpie_limit}} {% endif %} {% + if pipe.fqpie_flows|default('') != '' %} flows {{pipe.fqpie_flows}} {% endif %} +{% endif %} {% endif %} {% endfor %} @@ -70,6 +78,8 @@ if queue.codel_enable|default('0') == '1' %} codel {% if queue.codel_target|default('') != ''%} target {{queue.codel_target}} {% endif %}{% if queue.codel_interval|default('') != ''%} interval {{queue.codel_interval}} {% endif %}{% if queue.codel_ecn_enable|default('0') == '1'%} ecn {% else %} noecn {% endif %} +{% endif %} {% +if queue.pie_enable|default('0') == '1' %} pie {% endif %} {% endif %} From d7e17e060c5a76184d2f2cb2f61c884b32a7707a Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 25 Sep 2018 10:55:35 +0200 Subject: [PATCH 06/12] Update dialogPipe.xml --- .../TrafficShaper/forms/dialogPipe.xml | 21 ------------------- 1 file changed, 21 deletions(-) diff --git a/src/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/forms/dialogPipe.xml b/src/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/forms/dialogPipe.xml index ee721fc78..85572092d 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/forms/dialogPipe.xml +++ b/src/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/forms/dialogPipe.xml @@ -95,27 +95,6 @@ true The number of flow queues that are created and managed, leave empty for defaults - - pipe.fqpie_quantum - - text - true - The default quantum (credit) of the FQ-PIE in unit of byte. The value must be in the range 1..9000. - - - pipe.fqpie_limit - - text - true - The default hard size limit (in unit of packet) of all queues managed by an instance of the FQ-PIE scheduler. The value must be in the range 1..20480. - - - pipe.fqpie_flows - - text - true - Defines the default total number of flow queues (sub-queues) that FQ-PIE creates and manages. The value must be in the range 1..65536. - pipe.pie_enable From 8697919555d56bbb33f85c876cb0287e079c9b57 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 25 Sep 2018 10:56:49 +0200 Subject: [PATCH 07/12] Update TrafficShaper.xml --- .../OPNsense/TrafficShaper/TrafficShaper.xml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml b/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml index e279028e5..8c6c74a15 100644 --- a/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml +++ b/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml @@ -103,21 +103,6 @@ 1 65535 - - N - 1 - 65535 - - - N - 1 - 65535 - - - N - 1 - 65535 - N /^([a-z,A-Z,1-9]){0,30}$/ From b410530382ea8601b8ef0f33b3dd5950b07a5dc7 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 25 Sep 2018 10:58:54 +0200 Subject: [PATCH 08/12] Update ipfw.conf --- src/opnsense/service/templates/OPNsense/IPFW/ipfw.conf | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/opnsense/service/templates/OPNsense/IPFW/ipfw.conf b/src/opnsense/service/templates/OPNsense/IPFW/ipfw.conf index 6b634fda3..2fa9855fa 100644 --- a/src/opnsense/service/templates/OPNsense/IPFW/ipfw.conf +++ b/src/opnsense/service/templates/OPNsense/IPFW/ipfw.conf @@ -54,14 +54,7 @@ pipe {{ pipe.number }} config bw {{ pipe.bandwidth }}{{ pipe.bandwidthMetric }}/ if pipe.fqcodel_flows|default('') != '' %} flows {{pipe.fqcodel_flows}} {% endif %} {% endif %} {% endif %}{% - if pipe.pie_enable|default('0') == '1' and pipe.scheduler != 'fq_pie' %} pie {% endif %}{% - if pipe.pie_enable|default('0') == '1' or pipe.scheduler == 'fq_pie' %}{% - if pipe.scheduler == 'fq_pie' %} {% - if pipe.fqpie_quantum|default('') != '' %} quantum {{pipe.fqpie_quantum}} {% endif %} {% - if pipe.fqpie_limit|default('') != '' %} limit {{pipe.fqpie_limit}} {% endif %} {% - if pipe.fqpie_flows|default('') != '' %} flows {{pipe.fqpie_flows}} {% endif %} -{% endif %} -{% endif %} + if pipe.pie_enable|default('0') == '1' and pipe.scheduler != 'fq_pie' %} pie {% endif %} {% endfor %} {% endif %} From 869941a5cbdca07d1b2735d2419c0fff03ad2eeb Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 5 Oct 2018 18:53:15 +0200 Subject: [PATCH 09/12] Update TrafficShaper.xml --- .../OPNsense/TrafficShaper/TrafficShaper.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml b/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml index 8c6c74a15..8f127c763 100644 --- a/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml +++ b/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml @@ -69,6 +69,15 @@ 0 Y + + + Only one option could be selected + SingleSelectConstraint + + pie_enable + + + N @@ -87,6 +96,11 @@ 0 Y + + + codel_enable.check001 + + N From 81e5aaae78a9d3959c84e1ab656b2213aa259737 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 5 Oct 2018 19:03:41 +0200 Subject: [PATCH 10/12] Update TrafficShaper.xml --- .../OPNsense/TrafficShaper/TrafficShaper.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml b/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml index 8f127c763..3e78e012a 100644 --- a/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml +++ b/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml @@ -183,6 +183,15 @@ 0 Y + + + Only one option could be selected + SingleSelectConstraint + + pie_enable + + + N @@ -201,6 +210,11 @@ 0 Y + + + codel_enable.check001 + + Y From 927b68b232c9ecc5213eeec159f6021e315f1273 Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 6 Oct 2018 14:17:38 +0200 Subject: [PATCH 11/12] Update ipfw.conf --- src/opnsense/service/templates/OPNsense/IPFW/ipfw.conf | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/opnsense/service/templates/OPNsense/IPFW/ipfw.conf b/src/opnsense/service/templates/OPNsense/IPFW/ipfw.conf index 2fa9855fa..8432a3c3e 100644 --- a/src/opnsense/service/templates/OPNsense/IPFW/ipfw.conf +++ b/src/opnsense/service/templates/OPNsense/IPFW/ipfw.conf @@ -52,9 +52,8 @@ pipe {{ pipe.number }} config bw {{ pipe.bandwidth }}{{ pipe.bandwidthMetric }}/ if pipe.fqcodel_quantum|default('') != '' %} quantum {{pipe.fqcodel_quantum}} {% endif %} {% if pipe.fqcodel_limit|default('') != '' %} limit {{pipe.fqcodel_limit}} {% endif %} {% if pipe.fqcodel_flows|default('') != '' %} flows {{pipe.fqcodel_flows}} {% endif %} -{% endif %} {% endif %}{% - if pipe.pie_enable|default('0') == '1' and pipe.scheduler != 'fq_pie' %} pie {% endif %} + elif pipe.pie_enable|default('0') == '1' and pipe.scheduler != 'fq_pie' %} pie {% endif %} {% endfor %} {% endif %} @@ -70,9 +69,8 @@ queue {{ queue.number }} config pipe {{ helpers.getUUID(queue.pipe).number if queue.codel_enable|default('0') == '1' %} codel {% if queue.codel_target|default('') != ''%} target {{queue.codel_target}} {% endif %}{% if queue.codel_interval|default('') != ''%} interval {{queue.codel_interval}} {% endif %}{% - if queue.codel_ecn_enable|default('0') == '1'%} ecn {% else %} noecn {% endif %} -{% endif %} {% -if queue.pie_enable|default('0') == '1' %} pie + if queue.codel_ecn_enable|default('0') == '1'%} ecn {% else %} noecn {% endif %}{% +elif queue.pie_enable|default('0') == '1' %} pie {% endif %} {% endif %} From d1bbe29c6ab8edcc6eb5964f501c80c8a47f078d Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 11 Oct 2018 08:19:32 +0200 Subject: [PATCH 12/12] fix contraint msg and indents --- .../OPNsense/TrafficShaper/TrafficShaper.xml | 148 +++++++++--------- 1 file changed, 74 insertions(+), 74 deletions(-) diff --git a/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml b/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml index 3e78e012a..7f4ee6790 100644 --- a/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml +++ b/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml @@ -55,67 +55,67 @@ bucket size should be between 1...65535 - N - - Weighted Fair Queueing - - FIFO - Deficit Round Robin - QFQ - FlowQueue-CoDel - FlowQueue-PIE - + N + + Weighted Fair Queueing + + FIFO + Deficit Round Robin + QFQ + FlowQueue-CoDel + FlowQueue-PIE + - 0 - Y - - - Only one option could be selected - SingleSelectConstraint - - pie_enable - - - + 0 + Y + + + Only one option could be selected + SingleSelectConstraint + + pie_enable + + + - N - 1 - 10000 + N + 1 + 10000 - N - 1 - 10000 + N + 1 + 10000 - 0 - Y + 0 + Y - 0 - Y - - - codel_enable.check001 - - + 0 + Y + + + codel_enable.check001 + + - N - 1 - 65535 + N + 1 + 65535 - N - 1 - 65535 + N + 1 + 65535 - N - 1 - 65535 + N + 1 + 65535 N @@ -181,40 +181,40 @@ bucket size should be between 1...65535 - 0 - Y + 0 + Y - - Only one option could be selected - SingleSelectConstraint - - pie_enable - - - + + CoDel and PIE can not be combined. + SingleSelectConstraint + + pie_enable + + + - N - 1 - 10000 + N + 1 + 10000 - N - 1 - 10000 + N + 1 + 10000 - 0 - Y + 0 + Y - 0 - Y - - - codel_enable.check001 - - + 0 + Y + + + codel_enable.check001 + + Y @@ -230,10 +230,10 @@ - - 1 - Y - + + 1 + Y + 1 1000000