Revision be40ce0b
Added by Chris Buechler about 12 years ago
| etc/inc/shaper.inc | ||
|---|---|---|
| 331 | 331 |
if ($data['qlimit'] && (!is_numeric($data['qlimit']))) |
| 332 | 332 |
$input_errors[] = gettext("Qlimit must be an integer.");
|
| 333 | 333 |
if ($data['qlimit'] < 0) |
| 334 |
$input_errors[] = gettext("Qlimit must be an positive.");
|
|
| 334 |
$input_errors[] = gettext("Qlimit must be positive.");
|
|
| 335 | 335 |
if ($data['tbrconfig'] && (!is_numeric($data['tbrconfig']))) |
| 336 | 336 |
$input_errors[] = gettext("Tbrsize must be an integer.");
|
| 337 | 337 |
if ($data['tbrconfig'] < 0) |
| 338 |
$input_errors[] = gettext("Tbrsize must be an positive.");
|
|
| 338 |
$input_errors[] = gettext("Tbrsize must be positive.");
|
|
| 339 | 339 |
} |
| 340 | 340 |
|
| 341 | 341 |
/* Implement this to shorten some code on the frontend page */ |
| ... | ... | |
| 1002 | 1002 |
$reqdfieldsn[] = gettext("Name");
|
| 1003 | 1003 |
shaper_do_input_validation($data, $reqdfields, $reqdfieldsn, $input_errors); |
| 1004 | 1004 |
|
| 1005 |
if ($data['bandwidth'] && (!is_numeric($data['bandwidth'])))
|
|
| 1005 |
if ($data['bandwidth'] && (!is_numeric($data['bandwidth'])))
|
|
| 1006 | 1006 |
$input_errors[] = "Bandwidth must be an integer."; |
| 1007 |
if ($data['bandwidth'] < 0)
|
|
| 1007 |
if ($data['bandwidth'] < 0)
|
|
| 1008 | 1008 |
$input_errors[] = "Bandwidth cannot be negative."; |
| 1009 |
if ($data['qlimit'] && (!is_numeric($data['qlimit']))) |
|
| 1010 |
$input_errors[] = "Qlimit must be an integer."; |
|
| 1011 |
if ($data['qlimit'] < 0) |
|
| 1012 |
$input_errors[] = "Qlimit must be an positive."; |
|
| 1013 | 1009 |
if ($data['priority'] && (!is_numeric($data['priority']) |
| 1014 | 1010 |
|| ($data['priority'] < 1) || ($data['priority'] > 15))) {
|
| 1015 | 1011 |
$input_errors[] = gettext("The priority must be an integer between 1 and 15.");
|
| ... | ... | |
| 1196 | 1192 |
$form .= "<td width=\"78%\" class=\"vtable\"> <input name=\"qlimit\" type=\"text\" id=\"qlimit\" size=\"8\" value=\""; |
| 1197 | 1193 |
$form .= htmlspecialchars($this->GetQlimit()); |
| 1198 | 1194 |
$form .= "\" />"; |
| 1199 |
$form .= "<br/> <span class=\"vexpl\">" . gettext("Queue limit in packets per second.");
|
|
| 1195 |
$form .= "<br/> <span class=\"vexpl\">" . gettext("Queue limit in packets.");
|
|
| 1200 | 1196 |
$form .= "</span></td></tr>"; |
| 1201 | 1197 |
$form .= "<tr>"; |
| 1202 | 1198 |
$form .= "<td width=\"22%\" valign=\"middle\" class=\"vncell\">" . gettext("Scheduler options") . "</td>";
|
| ... | ... | |
| 1648 | 1644 |
$input_errors[] = ("upperlimit m1 cannot be smaller than m2");
|
| 1649 | 1645 |
|
| 1650 | 1646 |
if (get_interface_bandwidth($this) < (0.8 * (floatval($bw_1) + floatval($bw_2)))) |
| 1651 |
$input_errors[] = ("upperlimit specification excedd 80% of allowable allocation.");
|
|
| 1647 |
$input_errors[] = ("upperlimit specification exceeds 80% of allowable allocation.");
|
|
| 1652 | 1648 |
} |
| 1653 | 1649 |
*/ |
| 1654 | 1650 |
if ($data['linkshare1'] <> "" && $data['linkshare2'] == "") |
| ... | ... | |
| 1674 | 1670 |
$input_errors[] = ("linkshare m1 cannot be smaller than m2");
|
| 1675 | 1671 |
|
| 1676 | 1672 |
if (get_interface_bandwidth($this) < (0.8 * (floatval($bw_1) + floatval($bw_2)))) |
| 1677 |
$input_errors[] = ("linkshare specification excedd 80% of allowable allocation.");
|
|
| 1673 |
$input_errors[] = ("linkshare specification exceeds 80% of allowable allocation.");
|
|
| 1678 | 1674 |
} |
| 1679 | 1675 |
*/ |
| 1680 | 1676 |
|
| ... | ... | |
| 1693 | 1689 |
$input_errors[] = ("realtime m1 cannot be smaller than m2");
|
| 1694 | 1690 |
|
| 1695 | 1691 |
if (get_interface_bandwidth($this) < (0.8 * (floatval($bw_1) + floatval($bw_2)))) |
| 1696 |
$input_errors[] = ("realtime specification excedd 80% of allowable allocation.");
|
|
| 1692 |
$input_errors[] = ("realtime specification exceeds 80% of allowable allocation.");
|
|
| 1697 | 1693 |
} |
| 1698 | 1694 |
*/ |
| 1699 | 1695 |
} |
| ... | ... | |
| 4111 | 4107 |
$path = "{$g['tmp_path']}/" . $filename;
|
| 4112 | 4108 |
|
| 4113 | 4109 |
unset($l7pid); |
| 4114 |
/* Only reread the configuration rather than restart to avoid loosing information. */
|
|
| 4110 |
/* Only reread the configuration rather than restart to avoid losing information. */ |
|
| 4115 | 4111 |
exec("/bin/pgrep -f 'ipfw-classifyd .* -p ". $l7rules->GetRPort() . "'", $l7pid);
|
| 4116 | 4112 |
if (count($l7pid) > 0) {
|
| 4117 | 4113 |
log_error(sprintf(gettext("Sending HUP signal to %s"), $l7pid[0]));
|
| ... | ... | |
| 4295 | 4291 |
foreach ($conf['queue'] as $key1 => $q) {
|
| 4296 | 4292 |
array_push($path, $key1); |
| 4297 | 4293 |
/* |
| 4298 |
* XXX: we compeletely ignore errors here but anyway we must have
|
|
| 4294 |
* XXX: we completely ignore errors here but anyway we must have |
|
| 4299 | 4295 |
* checked them before so no harm should be come from this. |
| 4300 | 4296 |
*/ |
| 4301 | 4297 |
$root->add_queue($root->GetInterface(), $q, &$path, $input_errors); |
| ... | ... | |
| 4334 | 4330 |
foreach ($conf['queue'] as $key1 => $q) {
|
| 4335 | 4331 |
array_push($path, $key1); |
| 4336 | 4332 |
/* |
| 4337 |
* XXX: we compeletely ignore errors here but anyway we must have
|
|
| 4333 |
* XXX: we completely ignore errors here but anyway we must have |
|
| 4338 | 4334 |
* checked them before so no harm should be come from this. |
| 4339 | 4335 |
*/ |
| 4340 | 4336 |
$root->add_queue($root->GetQname(), $q, &$path, $input_errors); |
Also available in: Unified diff
Merge pull request #796 from phil-davis/master
Traffic Shaper GUI text typos