From f3bdca7d1bf8d8668d81ce4dcc1ee7be1fc99e48 Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Tue, 24 May 2016 18:02:34 +0200 Subject: [PATCH] (trafficshaper) remove unused burst, in freebsd 10.2 it doesn't crash anymore, but doesn't appear to be very useful either. closes https://github.com/opnsense/core/issues/226 --- .../OPNsense/TrafficShaper/forms/dialogPipe.xml | 11 ----------- .../models/OPNsense/TrafficShaper/TrafficShaper.xml | 4 ---- .../service/templates/OPNsense/IPFW/ipfw.conf | 2 +- 3 files changed, 1 insertion(+), 16 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 f50bcbdd7..caf9cdb23 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/forms/dialogPipe.xml +++ b/src/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/forms/dialogPipe.xml @@ -16,17 +16,6 @@ dropdown - pipe.queue diff --git a/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml b/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml index 81a28cfd3..00f865c1e 100644 --- a/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml +++ b/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml @@ -32,10 +32,6 @@ Bandwidth metric should be one of bit,Kbit,Mbit - - N - The burst value is an integer and represent a number of bytes. - N 2 diff --git a/src/opnsense/service/templates/OPNsense/IPFW/ipfw.conf b/src/opnsense/service/templates/OPNsense/IPFW/ipfw.conf index 47bd4039a..e42f4a9f1 100644 --- a/src/opnsense/service/templates/OPNsense/IPFW/ipfw.conf +++ b/src/opnsense/service/templates/OPNsense/IPFW/ipfw.conf @@ -36,7 +36,7 @@ flush #====================================================================================== {% if helpers.exists('OPNsense.TrafficShaper.pipes.pipe') %} {% for pipe in helpers.toList('OPNsense.TrafficShaper.pipes.pipe') %} -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.queue %} queue {{ pipe.queue }}{% if pipe.queueMetric != 'slots' %}{{pipe.queueMetric}}{% endif %}{% endif %}{% if pipe.mask != 'none' %} mask {{ pipe.mask }} 0xffffffff {% endif %} type {%