lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-15 00:54:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add delay option to pipe in Traffic Shaper (#2297)

Browse Source
This commit is contained in:
Michael 2018-03-26 18:31:14 +02:00 committed by Ad Schellevis
parent 90e8e5fe20
commit c2d4ead250
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/forms/dialogPipe.xml
View File

@ -88,6 +88,13 @@
<advanced>true</advanced>
<help>The number of flow queues that are created and managed, leave empty for defaults</help>
</field>
<field>
<id>pipe.delay</id>
<label>Delay</label>
<type>text</type>
<advanced>true</advanced>
<help>Add delay in ms to this pipe.</help>
</field>
<field>
<id>pipe.description</id>
<label>description</label>

6
src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml
View File

@ -97,6 +97,12 @@
<mask>/^([a-z,A-Z,1-9]){0,30}$/</mask>
<ValidationMessage>Origin should be regular text of max 30 characters</ValidationMessage>
</origin>
<delay type="IntegerField">
<Required>N</Required>
<MinimumValue>1</MinimumValue>
<MaximumValue>3000</MaximumValue>
<ValidationMessage>Please choose a value between 1 and 3000</ValidationMessage>
</delay>
<description type="TextField">
<Required>Y</Required>
<mask>/^([\t\n\v\f\r 0-9a-zA-Z.\-,_\x{00A0}-\x{FFFF}]){1,255}$/u</mask>

1
src/opnsense/service/templates/OPNsense/IPFW/ipfw.conf
View File

@ -41,6 +41,7 @@ pipe {{ pipe.number }} config bw {{ pipe.bandwidth }}{{ pipe.bandwidthMetric }}/
if pipe.queueMetric != 'slots' %}{{pipe.queueMetric}}{% endif %}{% endif
%}{% if pipe.mask != 'none' %} mask {{ pipe.mask }} 0xffffffff {% endif %} type {%
if pipe.scheduler|default('') != '' %} {{pipe.scheduler}} {% else %} wf2q+ {% endif %}{%
if pipe.delay|default('') != '' %} delay {{pipe.delay}} {% endif %}{%
if pipe.codel_enable|default('0') == '1' and pipe.scheduler != 'fq_codel' %} codel {% endif %}{%
if pipe.codel_enable|default('0') == '1' or pipe.scheduler == 'fq_codel' %}{%
if pipe.codel_target|default('') != ''%} target {{pipe.codel_target}} {% endif %}{%