(traffic shaper) add advanced option schedule type for pipe, makes current default (wf2q+) explicit. related to https://github.com/opnsense/core/issues/505

This commit is contained in:
Ad Schellevis 2016-04-25 14:52:57 +02:00
parent d25e1259d6
commit 6fbd2dcc88
3 changed files with 19 additions and 1 deletions

View File

@ -43,6 +43,13 @@
<li> choose source to provide all connected clients up to a maximum of this pipe configured bandwidth </li>
]]></help>
</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>
<id>pipe.description</id>
<label>description</label>

View File

@ -51,6 +51,16 @@
<dst-ip>destination</dst-ip>
</OptionValues>
</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">
<Required>N</Required>
<mask>/^([a-z,A-Z,1-9]){0,30}$/</mask>

View File

@ -39,7 +39,8 @@ flush
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.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 %}
{% endif %}