Revision 0b664809
Added by Ermal LUÇI about 14 years ago
| etc/inc/shaper.inc | ||
|---|---|---|
| 231 | 231 |
var $queues = array(); |
| 232 | 232 |
var $qenabled = false; |
| 233 | 233 |
var $link; |
| 234 |
var $default_present; /* if we have a default queue set */ |
|
| 234 |
var $default_present = false; /* if we have a default queue set */
|
|
| 235 | 235 |
var $available_bw; /* in b/s */ |
| 236 | 236 |
|
| 237 | 237 |
/* Accesor functions */ |
| ... | ... | |
| 241 | 241 |
function SetAvailableBandwidth($bw) {
|
| 242 | 242 |
$this->available_bw = $bw; |
| 243 | 243 |
} |
| 244 |
function SetDefaultQueuePresent($value) {
|
|
| 244 |
function SetDefaultQueuePresent($value = false) {
|
|
| 245 | 245 |
$this->default_present = $value; |
| 246 | 246 |
} |
| 247 | 247 |
function GetDefaultQueuePresent() {
|
| 248 |
return trim($this->default_present);
|
|
| 248 |
return $this->default_present;
|
|
| 249 | 249 |
} |
| 250 | 250 |
function SetLink($link) {
|
| 251 | 251 |
$this->link = $link; |
| ... | ... | |
| 828 | 828 |
} |
| 829 | 829 |
function SetDefault($value = false) {
|
| 830 | 830 |
$this->qdefault = $value; |
| 831 |
altq_set_default_queue($this->GetInterface(), "true");
|
|
| 831 |
altq_set_default_queue($this->GetInterface(), $value);
|
|
| 832 | 832 |
} |
| 833 | 833 |
function GetRed() {
|
| 834 | 834 |
return $this->qred; |
| ... | ... | |
| 924 | 924 |
function delete_queue() {
|
| 925 | 925 |
unref_on_altq_queue_list($this->GetQname()); |
| 926 | 926 |
if ($this->GetDefault()) |
| 927 |
altq_set_default_queue($this->GetInterface(), "false");
|
|
| 927 |
altq_set_default_queue($this->GetInterface(), false);
|
|
| 928 | 928 |
cleanup_queue_from_rules($this->GetQname()); |
| 929 | 929 |
unset_object_by_reference($this->GetLink()); |
| 930 | 930 |
} |
| ... | ... | |
| 1141 | 1141 |
$form .= "<td width=\"78%\" class=\"vtable\">"; |
| 1142 | 1142 |
if (empty($this->subqueues)) {
|
| 1143 | 1143 |
$tmpvalue = $this->GetDefault(); |
| 1144 |
if (!empty($tmpvalue)) {
|
|
| 1145 |
$form .= "<input type=\"checkbox\" id=\"default\" CHECKED name=\"default\" value=\"default\""; |
|
| 1146 |
$form .= "> Default queue<br>"; |
|
| 1147 |
} else {
|
|
| 1148 |
$form .= "<input type=\"checkbox\" id=\"default\" name=\"default\" value=\"default\""; |
|
| 1149 |
$form .= "> Default queue<br>"; |
|
| 1144 |
if (altq_get_default_queue($this->GetInterface()) == false || !empty($tmpvalue)) {
|
|
| 1145 |
if (!empty($tmpvalue)) {
|
|
| 1146 |
$form .= "<input type=\"checkbox\" id=\"default\" CHECKED name=\"default\" value=\"default\""; |
|
| 1147 |
$form .= "> " . gettext("Default queue") . "<br>";
|
|
| 1148 |
} else {
|
|
| 1149 |
$form .= "<input type=\"checkbox\" id=\"default\" name=\"default\" value=\"default\""; |
|
| 1150 |
$form .= "> " . gettext("Default queue") . "<br>";
|
|
| 1151 |
} |
|
| 1150 | 1152 |
} |
| 1151 | 1153 |
} |
| 1152 | 1154 |
$form .= "<input type=\"checkbox\" id=\"red\" name=\"red\" value=\"red\" "; |
| ... | ... | |
| 1494 | 1496 |
unref_on_altq_queue_list($this->GetQname()); |
| 1495 | 1497 |
$tmpvalue = $this->GetDefault(); |
| 1496 | 1498 |
if (!empty($tmpvalue)) |
| 1497 |
altq_set_default_queue($this->GetInterface(), "false");
|
|
| 1499 |
altq_set_default_queue($this->GetInterface(), false);
|
|
| 1498 | 1500 |
cleanup_queue_from_rules($this->GetQname()); |
| 1499 | 1501 |
$parent =& $this->GetParent(); |
| 1500 | 1502 |
foreach ($this->subqueues as $q) {
|
| ... | ... | |
| 2168 | 2170 |
function delete_queue() {
|
| 2169 | 2171 |
unref_on_altq_queue_list($this->GetQname()); |
| 2170 | 2172 |
if ($this->GetDefault()) |
| 2171 |
altq_set_default_queue($this->GetInterface(), "false");
|
|
| 2173 |
altq_set_default_queue($this->GetInterface(), false);
|
|
| 2172 | 2174 |
cleanup_queue_from_rules($this->GetQname()); |
| 2173 | 2175 |
foreach ($this->subqueues as $q) {
|
| 2174 | 2176 |
$this->SetAvailableBandwidth($this->GetAvailableBandwidth() + $q->GetAvailableBandwidth()); |
| ... | ... | |
| 2448 | 2450 |
function delete_queue() {
|
| 2449 | 2451 |
unref_on_altq_queue_list($this->GetQname()); |
| 2450 | 2452 |
if ($this->GetDefault()) |
| 2451 |
altq_set_default_queue($this->GetInterface(), "false");
|
|
| 2453 |
altq_set_default_queue($this->GetInterface(), false);
|
|
| 2452 | 2454 |
cleanup_queue_from_rules($this->GetQname()); |
| 2453 | 2455 |
unset_object_by_reference($this->GetLink()); |
| 2454 | 2456 |
} |
| ... | ... | |
| 3822 | 3824 |
global $altq_list_queues; |
| 3823 | 3825 |
|
| 3824 | 3826 |
$altq_tmp =& $altq_list_queues[$interface]; |
| 3825 |
if ($altq_tmp) {
|
|
| 3826 |
if ($value) {
|
|
| 3827 |
$altq_tmp->SetDefaultQueuePresent("true");
|
|
| 3828 |
} |
|
| 3829 |
else {
|
|
| 3830 |
$altq_tmp->SetDefaultQueuePresent("false");
|
|
| 3831 |
} |
|
| 3832 |
} |
|
| 3827 |
if ($altq_tmp) |
|
| 3828 |
$altq_tmp->SetDefaultQueuePresent($value); |
|
| 3833 | 3829 |
} |
| 3834 | 3830 |
|
| 3835 | 3831 |
function altq_get_default_queue($interface) {
|
| 3836 | 3832 |
global $altq_list_queues; |
| 3837 | 3833 |
|
| 3838 | 3834 |
$altq_tmp = $altq_list_queues[$interface]; |
| 3839 |
if ($altq_tmp)
|
|
| 3835 |
if ($altq_tmp) |
|
| 3840 | 3836 |
return $altq_tmp->GetDefaultQueuePresent(); |
| 3837 |
else |
|
| 3838 |
return false; |
|
| 3841 | 3839 |
} |
| 3842 | 3840 |
|
| 3843 | 3841 |
function altq_check_default_queues() {
|
Also available in: Unified diff
Ticket #1193. Do not show default queue checkbox when another queue has it selected.