diff options
| author | Jean Cyr <jcyr@dillobits.com> | 2013-09-02 20:10:36 -0400 |
|---|---|---|
| committer | Jean Cyr <jcyr@dillobits.com> | 2013-09-02 20:10:36 -0400 |
| commit | 9880a11d3ffdb4ec803f0ee7650493beca12315f (patch) | |
| tree | 0bf2294a60e00ac33317b069bb0b78a3bb3de8db /etc/inc/shaper.inc | |
| parent | 7a6851dff7763fc85d03648ca30039fcd53ac620 (diff) | |
| download | pfsense-9880a11d3ffdb4ec803f0ee7650493beca12315f.zip pfsense-9880a11d3ffdb4ec803f0ee7650493beca12315f.tar.gz | |
Dummynet does not require burst size specification
Dummynet traffic shaper does not require burst size specification and
assumes 0 if not specified. Allow user to leave burst field blank, if
not blank the must be numeric
Diffstat (limited to 'etc/inc/shaper.inc')
| -rw-r--r-- | etc/inc/shaper.inc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/etc/inc/shaper.inc b/etc/inc/shaper.inc index 078652b..4aa967c 100644 --- a/etc/inc/shaper.inc +++ b/etc/inc/shaper.inc @@ -3047,7 +3047,7 @@ class dnpipe_class extends dummynet_class { if (!empty($data["bandwidth{$i}"])) { if (!is_numeric($data["bandwidth{$i}"])) $input_errors[] = sprintf(gettext("Bandwidth for schedule %s must be an integer."), $data["bwsched{$i}"]); - else if (!is_numeric($data["burst{$i}"])) + else if (($data["burst{$i}"] != "") && (!is_numeric($data["burst{$i}"]))) $input_errors[] = sprintf(gettext("Burst for schedule %s must be an integer."), $data["bwsched{$i}"]); else $entries++; @@ -3165,7 +3165,7 @@ class dnpipe_class extends dummynet_class { if ($bw['bwsched'] == $schedule['name']) { if (filter_get_time_based_rule_status($schedule)) { $pfq_rule .= " bw ".trim($bw['bw']).$bw['bwscale']; - if (is_numeric($bw['burst']) && ($bw['burst'] >= 0)) + if (is_numeric($bw['burst']) && ($bw['burst'] > 0)) $pfq_rule .= " burst ".trim($bw['burst']).$bw['bwscale']; $found = true; break; @@ -3174,13 +3174,12 @@ class dnpipe_class extends dummynet_class { } } else { $pfq_rule .= " bw 0"; - $pfq_rule .= " burst 0"; $found = true; break; } } else { $pfq_rule .= " bw ".trim($bw['bw']).$bw['bwscale']; - if (is_numeric($bw['burst']) && ($bw['burst'] >= 0)) + if (is_numeric($bw['burst']) && ($bw['burst'] > 0)) $pfq_rule .= " burst ".trim($bw['burst']).$bw['bwscale']; $found = true; break; |
