Commit 6fbd2dcc authored by Ad Schellevis's avatar Ad Schellevis

(traffic shaper) add advanced option schedule type for pipe, makes current...

(traffic shaper) add advanced option schedule type for pipe, makes current default (wf2q+) explicit. related to https://github.com/opnsense/core/issues/505
parent d25e1259
...@@ -43,6 +43,13 @@ ...@@ -43,6 +43,13 @@
<li> choose source to provide all connected clients up to a maximum of this pipe configured bandwidth </li> <li> choose source to provide all connected clients up to a maximum of this pipe configured bandwidth </li>
]]></help> ]]></help>
</field> </field>
<field>
<id>pipe.scheduler</id>
<label>Scheduler type</label>
<type>dropdown</type>
<advanced>true</advanced>
<help>Specify the scheduling algorithm to use</help>
</field>
<field> <field>
<id>pipe.description</id> <id>pipe.description</id>
<label>description</label> <label>description</label>
......
...@@ -51,6 +51,16 @@ ...@@ -51,6 +51,16 @@
<dst-ip>destination</dst-ip> <dst-ip>destination</dst-ip>
</OptionValues> </OptionValues>
</mask> </mask>
<scheduler type="OptionField">
<Required>N</Required>
<default></default>
<BlankDesc>Weighted Fair Queueing</BlankDesc>
<OptionValues>
<fifo>FIFO</fifo>
<rr>Deficit Round Robin</rr>
<qfq>QFQ</qfq>
</OptionValues>
</scheduler>
<origin type="TextField"> <origin type="TextField">
<Required>N</Required> <Required>N</Required>
<mask>/^([a-z,A-Z,1-9]){0,30}$/</mask> <mask>/^([a-z,A-Z,1-9]){0,30}$/</mask>
......
...@@ -39,7 +39,8 @@ flush ...@@ -39,7 +39,8 @@ flush
pipe {{ pipe.number }} config bw {{ pipe.bandwidth }}{{ pipe.bandwidthMetric }}/s{% if pipe.burst %} burst {{ pipe.burst }}{% endif %}{% pipe {{ pipe.number }} config bw {{ pipe.bandwidth }}{{ pipe.bandwidthMetric }}/s{% if pipe.burst %} burst {{ pipe.burst }}{% endif %}{%
if pipe.queue %} queue {{ pipe.queue }}{% if pipe.queue %} queue {{ pipe.queue }}{%
if pipe.queueMetric != 'slots' %}{{pipe.queueMetric}}{% endif %}{% endif if pipe.queueMetric != 'slots' %}{{pipe.queueMetric}}{% endif %}{% endif
%}{% if pipe.mask != 'none' %} mask {{ pipe.mask }} 0xffffffff {% endif %} %}{% if pipe.mask != 'none' %} mask {{ pipe.mask }} 0xffffffff {% endif %} type {%
if pipe.scheduler|default('') != '' %}{{pipe.scheduler}}{% else %}wf2q+{% endif %}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment