Revision 6c07db48
Added by Phil Davis about 10 years ago
| etc/inc/shaper.inc | ||
|---|---|---|
| 525 | 525 |
|
| 526 | 526 |
function &find_parentqueue($interface, $qname) {
|
| 527 | 527 |
if ($qname == $interface) {
|
| 528 |
$result = NULL;
|
|
| 528 |
$result = NULL; |
|
| 529 | 529 |
} else if ($this->queues[$qname]) {
|
| 530 | 530 |
$result = $this; |
| 531 | 531 |
} else if ($this->GetScheduler() <> "PRIQ") {
|
| ... | ... | |
| 545 | 545 |
$tree .= "\">" . $shaperIFlist[$this->GetInterface()] . "</a>"; |
| 546 | 546 |
if (is_array($this->queues)) {
|
| 547 | 547 |
$tree .= "<ul>"; |
| 548 |
foreach ($this->queues as $q) {
|
|
| 548 |
foreach ($this->queues as $q) {
|
|
| 549 | 549 |
$tree .= $q->build_tree(); |
| 550 | 550 |
} |
| 551 | 551 |
$tree .= "</ul>"; |
| ... | ... | |
| 707 | 707 |
$form .= "<br /></td><td class=\"vncellreq\">"; |
| 708 | 708 |
$form .= " <input type=\"checkbox\" id=\"enabled\" name=\"enabled\" value=\"on\""; |
| 709 | 709 |
if ($this->GetEnabled() == "on") {
|
| 710 |
$form .= " checked=\"checked\"";
|
|
| 710 |
$form .= " checked=\"checked\""; |
|
| 711 | 711 |
} |
| 712 | 712 |
$form .= " /><span class=\"vexpl\"> " . gettext("Enable/disable discipline and its children") . "</span>";
|
| 713 | 713 |
$form .= "</td></tr>"; |
| ... | ... | |
| 790 | 790 |
$form .= "\" />"; |
| 791 | 791 |
$form .= "<br /> <span class=\"vexpl\">"; |
| 792 | 792 |
$form .= gettext("Adjusts the size, in bytes, of the token bucket regulator. "
|
| 793 |
. "If not specified, heuristics based on the interface "
|
|
| 794 |
. "bandwidth are used to determine the size.");
|
|
| 793 |
. "If not specified, heuristics based on the interface "
|
|
| 794 |
. "bandwidth are used to determine the size.");
|
|
| 795 | 795 |
$form .= "</span></td></tr>"; |
| 796 | 796 |
$form .= "<input type=\"hidden\" id=\"interface\" name=\"interface\""; |
| 797 | 797 |
$form .= " value=\"" . $this->GetInterface() . "\" />"; |
| ... | ... | |
| 1278 | 1278 |
$form .= "<br /></td><td class=\"vncellreq\">"; |
| 1279 | 1279 |
$form .= " <input type=\"checkbox\" id=\"enabled\" name=\"enabled\" value=\"on\""; |
| 1280 | 1280 |
if ($this->GetEnabled() == "on") {
|
| 1281 |
$form .= " checked=\"checked\"";
|
|
| 1281 |
$form .= " checked=\"checked\""; |
|
| 1282 | 1282 |
} |
| 1283 | 1283 |
$form .= " /><span class=\"vexpl\"> " . gettext("Enable/Disable queue and its children") . "</span>";
|
| 1284 | 1284 |
$form .= "</td></tr>"; |
| ... | ... | |
| 1322 | 1322 |
$form .= "<input type=\"checkbox\" id=\"red\" name=\"red\" value=\"red\" "; |
| 1323 | 1323 |
$tmpvalue = $this->GetRed(); |
| 1324 | 1324 |
if (!empty($tmpvalue)) {
|
| 1325 |
$form .= " checked=\"checked\"";
|
|
| 1325 |
$form .= " checked=\"checked\""; |
|
| 1326 | 1326 |
} |
| 1327 | 1327 |
$form .= " /> <a target=\"_new\" href=\"http://www.openbsd.org/faq/pf/queueing.html#red\">" . gettext("Random Early Detection") . "</a><br />";
|
| 1328 | 1328 |
$form .= "<input type=\"checkbox\" id=\"rio\" name=\"rio\" value=\"rio\""; |
| 1329 | 1329 |
$tmpvalue = $this->GetRio(); |
| 1330 | 1330 |
if (!empty($tmpvalue)) {
|
| 1331 |
$form .= " checked=\"checked\"";
|
|
| 1331 |
$form .= " checked=\"checked\""; |
|
| 1332 | 1332 |
} |
| 1333 | 1333 |
$form .= " /> <a target=\"_new\" href=\"http://www.openbsd.org/faq/pf/queueing.html#rio\">" . gettext("Random Early Detection In and Out") . "</a><br />";
|
| 1334 | 1334 |
$form .= "<input type=\"checkbox\" id=\"ecn\" name=\"ecn\" value=\"ecn\""; |
| 1335 | 1335 |
$tmpvalue = $this->GetEcn(); |
| 1336 | 1336 |
if (!empty($tmpvalue)) {
|
| 1337 |
$form .= " checked=\"checked\"";
|
|
| 1337 |
$form .= " checked=\"checked\""; |
|
| 1338 | 1338 |
} |
| 1339 | 1339 |
$form .= " /> <a target=\"_new\" href=\"http://www.openbsd.org/faq/pf/queueing.html#ecn\">" . gettext("Explicit Congestion Notification") . "</a><br />";
|
| 1340 | 1340 |
$form .= "<input type=\"checkbox\" id=\"codel\" name=\"codel\" value=\"codel\""; |
| 1341 | 1341 |
$tmpvalue = $this->GetCodel(); |
| 1342 | 1342 |
if (!empty($tmpvalue)) {
|
| 1343 |
$form .= " checked=\"checked\"";
|
|
| 1343 |
$form .= " checked=\"checked\""; |
|
| 1344 | 1344 |
} |
| 1345 | 1345 |
$form .= " /> <a target=\"_new\" href=\"http://www.bufferbloat.net/projects/codel/wiki\">" . gettext("Codel Active Queue") . "</a><br />";
|
| 1346 | 1346 |
$form .= "<span class=\"vexpl\"><br />" . gettext("Select options for this queue");
|
| ... | ... | |
| 1698 | 1698 |
unref_on_altq_queue_list($this->GetQname()); |
| 1699 | 1699 |
cleanup_queue_from_rules($this->GetQname()); |
| 1700 | 1700 |
$parent =& $this->GetParent(); |
| 1701 |
foreach ($this->subqueues as $q) {
|
|
| 1701 |
foreach ($this->subqueues as $q) {
|
|
| 1702 | 1702 |
$this->SetAvailableBandwidth($this->GetAvailableBandwidth() + $q->GetAvailableBandwidth()); |
| 1703 | 1703 |
$q->delete_queue(); |
| 1704 | 1704 |
} |
| ... | ... | |
| 1772 | 1772 |
*/ |
| 1773 | 1773 |
} |
| 1774 | 1774 |
|
| 1775 |
if ($data['upperlimit1'] <> "" && $data['upperlimit2'] == "") {
|
|
| 1775 |
if ($data['upperlimit1'] <> "" && $data['upperlimit2'] == "") {
|
|
| 1776 | 1776 |
$input_errors[] = gettext("upperlimit service curve defined but missing (d) value");
|
| 1777 | 1777 |
} |
| 1778 |
if ($data['upperlimit2'] <> "" && $data['upperlimit1'] == "") {
|
|
| 1778 |
if ($data['upperlimit2'] <> "" && $data['upperlimit1'] == "") {
|
|
| 1779 | 1779 |
$input_errors[] = gettext("upperlimit service curve defined but missing initial bandwidth (m1) value");
|
| 1780 | 1780 |
} |
| 1781 | 1781 |
if ($data['upperlimit1'] <> "" && !is_valid_shaperbw($data['upperlimit1'])) {
|
| ... | ... | |
| 1801 | 1801 |
} |
| 1802 | 1802 |
} |
| 1803 | 1803 |
*/ |
| 1804 |
if ($data['linkshare1'] <> "" && $data['linkshare2'] == "") {
|
|
| 1804 |
if ($data['linkshare1'] <> "" && $data['linkshare2'] == "") {
|
|
| 1805 | 1805 |
$input_errors[] = gettext("linkshare service curve defined but missing (d) value");
|
| 1806 | 1806 |
} |
| 1807 |
if ($data['linkshare2'] <> "" && $data['linkshare1'] == "") {
|
|
| 1807 |
if ($data['linkshare2'] <> "" && $data['linkshare1'] == "") {
|
|
| 1808 | 1808 |
$input_errors[] = gettext("linkshare service curve defined but missing initial bandwidth (m1) value");
|
| 1809 | 1809 |
} |
| 1810 | 1810 |
if ($data['linkshare1'] <> "" && !is_valid_shaperbw($data['linkshare1'])) {
|
| ... | ... | |
| 1816 | 1816 |
if ($data['linkshare3'] <> "" && !is_valid_shaperbw($data['linkshare3'])) {
|
| 1817 | 1817 |
$input_errors[] = gettext("linkshare m2 value needs to be Kb, Mb, Gb, or %");
|
| 1818 | 1818 |
} |
| 1819 |
if ($data['realtime1'] <> "" && $data['realtime2'] == "") {
|
|
| 1819 |
if ($data['realtime1'] <> "" && $data['realtime2'] == "") {
|
|
| 1820 | 1820 |
$input_errors[] = gettext("realtime service curve defined but missing (d) value");
|
| 1821 | 1821 |
} |
| 1822 |
if ($data['realtime2'] <> "" && $data['realtime1'] == "") {
|
|
| 1822 |
if ($data['realtime2'] <> "" && $data['realtime1'] == "") {
|
|
| 1823 | 1823 |
$input_errors[] = gettext("realtime service curve defined but missing initial bandwidth (m1) value");
|
| 1824 | 1824 |
} |
| 1825 | 1825 |
|
| ... | ... | |
| 1927 | 1927 |
$tree .= " >" . $this->GetQname() . "</a>"; |
| 1928 | 1928 |
if (is_array($this->subqueues)) {
|
| 1929 | 1929 |
$tree .= "<ul>"; |
| 1930 |
foreach ($this->subqueues as $q) {
|
|
| 1930 |
foreach ($this->subqueues as $q) {
|
|
| 1931 | 1931 |
$tree .= $q->build_tree(); |
| 1932 | 1932 |
} |
| 1933 | 1933 |
$tree .= "</ul>"; |
| ... | ... | |
| 1993 | 1993 |
$default = true; |
| 1994 | 1994 |
} |
| 1995 | 1995 |
|
| 1996 |
if ($this->GetRealtime() <> "") {
|
|
| 1996 |
if ($this->GetRealtime() <> "") {
|
|
| 1997 | 1997 |
if ($comma) {
|
| 1998 | 1998 |
$pfq_rule .= " , "; |
| 1999 | 1999 |
} |
| 2000 |
if ($this->GetR_m1() <> "" && $this->GetR_d() <> "" && $this->GetR_m2() <> "") {
|
|
| 2000 |
if ($this->GetR_m1() <> "" && $this->GetR_d() <> "" && $this->GetR_m2() <> "") {
|
|
| 2001 | 2001 |
$pfq_rule .= " realtime (".$this->GetR_m1() . ", " . $this->GetR_d().", ". $this->GetR_m2() .") ";
|
| 2002 |
} else if ($this->GetR_m2() <> "") {
|
|
| 2002 |
} else if ($this->GetR_m2() <> "") {
|
|
| 2003 | 2003 |
$pfq_rule .= " realtime " . $this->GetR_m2(); |
| 2004 | 2004 |
} |
| 2005 | 2005 |
$comma = 1; |
| ... | ... | |
| 2136 | 2136 |
$form .= "<tr><td> </td><td><center>m1</center></td><td><center>d</center></td><td><center><b>m2</b></center></td></tr>"; |
| 2137 | 2137 |
$form .= "<tr><td><input type=\"checkbox\" id=\"upperlimit\" name=\"upperlimit\""; |
| 2138 | 2138 |
if ($this->GetUpperlimit()<> "") {
|
| 2139 |
$form .= " checked=\"checked\" ";
|
|
| 2139 |
$form .= " checked=\"checked\" "; |
|
| 2140 | 2140 |
} |
| 2141 | 2141 |
$form .= "onchange=\"enable_upperlimit()\" /> " . gettext("Upperlimit:") . "</td><td><input size=\"6\" value=\"";
|
| 2142 | 2142 |
$form .= htmlspecialchars($this->GetU_m1()); |
| ... | ... | |
| 2159 | 2159 |
$form .= " /></td><td>" . gettext("The maximum allowed bandwidth for the queue.") . "</td></tr>";
|
| 2160 | 2160 |
$form .= "<tr><td><input type=\"checkbox\" id=\"realtime\" name=\"realtime\""; |
| 2161 | 2161 |
if ($this->GetRealtime() <> "") {
|
| 2162 |
$form .= " checked=\"checked\" ";
|
|
| 2162 |
$form .= " checked=\"checked\" "; |
|
| 2163 | 2163 |
} |
| 2164 | 2164 |
$form .= "onchange=\"enable_realtime()\" /> " . gettext("Real time:") . "</td><td><input size=\"6\" value=\"";
|
| 2165 | 2165 |
$form .= htmlspecialchars($this->GetR_m1()); |
| ... | ... | |
| 2182 | 2182 |
$form .= " /></td><td>" . gettext("The minimum required bandwidth for the queue.") . "</td></tr>";
|
| 2183 | 2183 |
$form .= "<tr><td><input type=\"checkbox\" id=\"linkshare\" name=\"linkshare\""; |
| 2184 | 2184 |
if ($this->GetLinkshare() <> "") {
|
| 2185 |
$form .= " checked=\"checked\" ";
|
|
| 2185 |
$form .= " checked=\"checked\" "; |
|
| 2186 | 2186 |
} |
| 2187 | 2187 |
$form .= "onchange=\"enable_linkshare()\" /> " . gettext("Link share:") . "</td><td><input size=\"6\" value=\"";
|
| 2188 | 2188 |
$form .= htmlspecialchars($this->GetL_m1()); |
| ... | ... | |
| 2205 | 2205 |
$form .= " /></td><td>" . gettext("The bandwidth share of a backlogged queue - this overrides priority.") . "</td></tr>";
|
| 2206 | 2206 |
$form .= "</table><br />"; |
| 2207 | 2207 |
$form .= gettext("The format for service curve specifications is (m1, d, m2). m2 controls "
|
| 2208 |
. "the bandwidth assigned to the queue. m1 and d are optional and can be "
|
|
| 2209 |
. "used to control the initial bandwidth assignment. For the first d milliseconds the queue gets the bandwidth given as m1, afterwards the value "
|
|
| 2210 |
. "given in m2.");
|
|
| 2208 |
. "the bandwidth assigned to the queue. m1 and d are optional and can be "
|
|
| 2209 |
. "used to control the initial bandwidth assignment. For the first d milliseconds the queue gets the bandwidth given as m1, afterwards the value "
|
|
| 2210 |
. "given in m2.");
|
|
| 2211 | 2211 |
$form .= "</td>"; |
| 2212 | 2212 |
$form .= "</tr>"; |
| 2213 | 2213 |
|
| ... | ... | |
| 2543 | 2543 |
$tree .= " >" . $this->GetQname() . "</a>"; |
| 2544 | 2544 |
if (is_array($this->subqueues)) {
|
| 2545 | 2545 |
$tree .= "<ul>"; |
| 2546 |
foreach ($this->subqueues as $q) {
|
|
| 2546 |
foreach ($this->subqueues as $q) {
|
|
| 2547 | 2547 |
$tree .= $q->build_tree(); |
| 2548 | 2548 |
} |
| 2549 | 2549 |
$tree .= "</ul>"; |
| ... | ... | |
| 2677 | 2677 |
$form .= "<tr><td class=\"vncellreq\">" . gettext("Scheduler specific options") . "</td>";
|
| 2678 | 2678 |
$form .= "<td class=\"vtable\"><input type=\"checkbox\" id=\"borrow\" name=\"borrow\""; |
| 2679 | 2679 |
if ($this->GetBorrow() == "on") {
|
| 2680 |
$form .= " checked=\"checked\" ";
|
|
| 2680 |
$form .= " checked=\"checked\" "; |
|
| 2681 | 2681 |
} |
| 2682 | 2682 |
$form .= " /> " . gettext("Borrow from other queues when available") . "<br /></td></tr>";
|
| 2683 | 2683 |
|
| ... | ... | |
| 2989 | 2989 |
$form .= "<input id=\"buckets\" name=\"buckets\" value=\""; |
| 2990 | 2990 |
$tmpvalue = trim($this->GetBuckets()); |
| 2991 | 2991 |
if (!empty($tmpvalue)) {
|
| 2992 |
$form .= $this->GetBuckets();
|
|
| 2992 |
$form .= $this->GetBuckets(); |
|
| 2993 | 2993 |
} |
| 2994 | 2994 |
$form .= "\" /> " . gettext("Number of buckets available.") . "<br /></td></tr>";
|
| 2995 | 2995 |
$form .= "<tr><td class=\"vtable\"><input id=\"hogs\" name=\"hogs\" value=\""; |
| 2996 | 2996 |
$tmpvalue = trim($this->GetHogs()); |
| 2997 | 2997 |
if (!empty($tmpvalue)) {
|
| 2998 |
$form .= $this->GetHogs();
|
|
| 2998 |
$form .= $this->GetHogs(); |
|
| 2999 | 2999 |
} |
| 3000 | 3000 |
$form .= "\" /> " . gettext("Bandwidth limit for hosts to not saturate link.") . "<br /></td></tr>";
|
| 3001 | 3001 |
$form .= "</table></td></tr>"; |
| ... | ... | |
| 3481 | 3481 |
$tree .= $this->GetQname() . "</a>"; |
| 3482 | 3482 |
if (is_array($this->subqueues)) {
|
| 3483 | 3483 |
$tree .= "<ul>"; |
| 3484 |
foreach ($this->subqueues as $q) {
|
|
| 3484 |
foreach ($this->subqueues as $q) {
|
|
| 3485 | 3485 |
$tree .= $q->build_tree(); |
| 3486 | 3486 |
} |
| 3487 | 3487 |
$tree .= "</ul>"; |
| ... | ... | |
| 3655 | 3655 |
$form .= "</td><td class=\"vncellreq\">"; |
| 3656 | 3656 |
$form .= " <input type=\"checkbox\" id=\"enabled\" name=\"enabled\" value=\"on\""; |
| 3657 | 3657 |
if ($this->GetEnabled() == "on") {
|
| 3658 |
$form .= " checked=\"checked\"";
|
|
| 3658 |
$form .= " checked=\"checked\""; |
|
| 3659 | 3659 |
} |
| 3660 | 3660 |
$form .= " /><span class=\"vexpl\"> " . gettext("Enable limiter and its children") . "</span>";
|
| 3661 | 3661 |
$form .= "</td></tr>"; |
| ... | ... | |
| 3740 | 3740 |
$form .= "</select>"; |
| 3741 | 3741 |
$form .= " <br />"; |
| 3742 | 3742 |
$form .= "<span class=\"vexpl\">" . gettext("If 'source' or 'destination' slots is chosen, \n"
|
| 3743 |
. "a dynamic pipe with the bandwidth, delay, packet loss and queue size given above will \n"
|
|
| 3744 |
. "be created for each source/destination IP address encountered, \n"
|
|
| 3745 |
. "respectively. This makes it possible to easily specify bandwidth \n"
|
|
| 3746 |
. "limits per host.") . "</span><br />";
|
|
| 3743 |
. "a dynamic pipe with the bandwidth, delay, packet loss and queue size given above will \n"
|
|
| 3744 |
. "be created for each source/destination IP address encountered, \n"
|
|
| 3745 |
. "respectively. This makes it possible to easily specify bandwidth \n"
|
|
| 3746 |
. "limits per host.") . "</span><br />";
|
|
| 3747 | 3747 |
$form .= "255.255.255.255/ <input type=\"text\" class=\"formfld unknown\" size=\"2\" id=\"maskbits\" name=\"maskbits\" value=\""; |
| 3748 | 3748 |
if ($mask['type'] <> "none") {
|
| 3749 | 3749 |
$form .= $mask['bits']; |
| ... | ... | |
| 3765 | 3765 |
$form .= " />"; |
| 3766 | 3766 |
$form .= " IPV6 mask bits (1-128)<br />"; |
| 3767 | 3767 |
$form .= "<span class=\"vexpl\">" . gettext("If 'source' or 'destination' slots is chosen, \n"
|
| 3768 |
. "leaving the mask bits blank will create one pipe per host. Otherwise specify \n"
|
|
| 3769 |
. "the number of 'one' bits in the subnet mask used to group multiple hosts \n"
|
|
| 3770 |
. "per pipe.") . "</span>";
|
|
| 3768 |
. "leaving the mask bits blank will create one pipe per host. Otherwise specify \n"
|
|
| 3769 |
. "the number of 'one' bits in the subnet mask used to group multiple hosts \n"
|
|
| 3770 |
. "per pipe.") . "</span>";
|
|
| 3771 | 3771 |
$form .= "</td></tr>"; |
| 3772 | 3772 |
$form .= "<tr><td valign=\"middle\" class=\"vncellreq\">" . gettext("Description") . "</td>";
|
| 3773 | 3773 |
$form .= "<td class=\"vncellreq\">"; |
| ... | ... | |
| 3790 | 3790 |
$form .= "<input name=\"delay\" type=\"text\" id=\"delay\" size=\"5\" value=\""; |
| 3791 | 3791 |
$form .= $this->GetDelay() . "\" />"; |
| 3792 | 3792 |
$form .= " ms<br /> <span class=\"vexpl\">" . gettext("Hint: in most cases, you "
|
| 3793 |
. "should specify 0 here (or leave the field empty)") . "</span><br />";
|
|
| 3793 |
. "should specify 0 here (or leave the field empty)") . "</span><br />";
|
|
| 3794 | 3794 |
$form .= "</td></tr>"; |
| 3795 | 3795 |
$form .= "<tr style=\"display:none\" id=\"sprtable1\">"; |
| 3796 | 3796 |
$form .= "<td valign=\"middle\" class=\"vncellreq\">" . gettext("Packet loss rate") . "</td>";
|
| ... | ... | |
| 3798 | 3798 |
$form .= "<input name=\"plr\" type=\"text\" id=\"plr\" size=\"5\" value=\""; |
| 3799 | 3799 |
$form .= $this->GetPlr() . "\" />"; |
| 3800 | 3800 |
$form .= " <br /> <span class=\"vexpl\">" . gettext("Hint: in most cases, you "
|
| 3801 |
. "should specify 0 here (or leave the field empty). "
|
|
| 3802 |
. "A value of 0.001 means one packet in 1000 gets dropped") . "</span>";
|
|
| 3801 |
. "should specify 0 here (or leave the field empty). "
|
|
| 3802 |
. "A value of 0.001 means one packet in 1000 gets dropped") . "</span>";
|
|
| 3803 | 3803 |
$form .= "</td></tr>"; |
| 3804 | 3804 |
$form .= "<tr style=\"display:none\" id=\"sprtable2\">"; |
| 3805 | 3805 |
$form .= "<td valign=\"middle\" class=\"vncellreq\">" . gettext("Queue Size") . "</td>";
|
| ... | ... | |
| 3808 | 3808 |
$form .= $this->GetQlimit() . "\" />"; |
| 3809 | 3809 |
$form .= " slots<br />"; |
| 3810 | 3810 |
$form .= "<span class=\"vexpl\">" . gettext("Hint: in most cases, you "
|
| 3811 |
. "should leave the field empty. All packets in this pipe are placed into a fixed-size queue first, "
|
|
| 3812 |
. "then they are delayed by value specified in the Delay field, and then they "
|
|
| 3813 |
. "are delivered to their destination.") . "</span>";
|
|
| 3811 |
. "should leave the field empty. All packets in this pipe are placed into a fixed-size queue first, "
|
|
| 3812 |
. "then they are delayed by value specified in the Delay field, and then they "
|
|
| 3813 |
. "are delivered to their destination.") . "</span>";
|
|
| 3814 | 3814 |
$form .= "</td></tr>"; |
| 3815 | 3815 |
$form .= "<tr style=\"display:none\" id=\"sprtable5\">"; |
| 3816 | 3816 |
$form .= "<td valign=\"middle\" class=\"vncellreq\">" . gettext("Bucket Size") . "</td>";
|
| ... | ... | |
| 3819 | 3819 |
$form .= $this->GetBuckets() . "\" />"; |
| 3820 | 3820 |
$form .= " slots<br />"; |
| 3821 | 3821 |
$form .= "<span class=\"vexpl\">" . gettext("Hint: in most cases, you "
|
| 3822 |
. "should leave the field empty. It increases the hash size set.");
|
|
| 3822 |
. "should leave the field empty. It increases the hash size set."); |
|
| 3823 | 3823 |
$form .= "</span></td></tr>"; |
| 3824 | 3824 |
|
| 3825 | 3825 |
return $form; |
| ... | ... | |
| 4011 | 4011 |
$form .= "</td><td class=\"vncellreq\">"; |
| 4012 | 4012 |
$form .= " <input type=\"checkbox\" id=\"enabled\" name=\"enabled\" value=\"on\""; |
| 4013 | 4013 |
if ($this->GetEnabled() == "on") {
|
| 4014 |
$form .= " checked=\"checked\"";
|
|
| 4014 |
$form .= " checked=\"checked\""; |
|
| 4015 | 4015 |
} |
| 4016 | 4016 |
$form .= " /><span class=\"vexpl\"> " . gettext("Enable/Disable queue") . "</span>";
|
| 4017 | 4017 |
$form .= "</td></tr>"; |
| ... | ... | |
| 4048 | 4048 |
$form .= "</select>"; |
| 4049 | 4049 |
$form .= " slots<br />"; |
| 4050 | 4050 |
$form .= "<span class=\"vexpl\">" . gettext("If 'source' or 'destination' slots is chosen, \n"
|
| 4051 |
. "a dynamic pipe with the bandwidth, delay, packet loss and queue size given above will \n"
|
|
| 4052 |
. "be created for each source/destination IP address encountered, \n"
|
|
| 4053 |
. "respectively. This makes it possible to easily specify bandwidth \n"
|
|
| 4054 |
. "limits per host.") . "</span><br />";
|
|
| 4051 |
. "a dynamic pipe with the bandwidth, delay, packet loss and queue size given above will \n" |
|
| 4052 |
. "be created for each source/destination IP address encountered, \n" |
|
| 4053 |
. "respectively. This makes it possible to easily specify bandwidth \n" |
|
| 4054 |
. "limits per host.") . "</span><br />"; |
|
| 4055 | 4055 |
$form .= "255.255.255.255/ <input type=\"text\" class=\"formfld unknown\" size=\"2\" id=\"maskbits\" name=\"maskbits\" value=\""; |
| 4056 | 4056 |
if ($mask['type'] <> "none") {
|
| 4057 | 4057 |
$form .= $mask['bits']; |
| ... | ... | |
| 4073 | 4073 |
$form .= " />"; |
| 4074 | 4074 |
$form .= " IPV6 mask bits (1-128)<br />"; |
| 4075 | 4075 |
$form .= "<span class=\"vexpl\">" . gettext("If 'source' or 'destination' slots is chosen, \n"
|
| 4076 |
. "leaving the mask bits blank will create one pipe per host. Otherwise specify \n"
|
|
| 4077 |
. "the number of 'one' bits in the subnet mask used to group multiple hosts \n"
|
|
| 4078 |
. "per queue.") . "</span>";
|
|
| 4076 |
. "leaving the mask bits blank will create one pipe per host. Otherwise specify \n" |
|
| 4077 |
. "the number of 'one' bits in the subnet mask used to group multiple hosts \n" |
|
| 4078 |
. "per queue.") . "</span>"; |
|
| 4079 | 4079 |
$form .= "</td></tr>"; |
| 4080 | 4080 |
$form .= "<tr><td valign=\"middle\" class=\"vncellreq\">" . gettext("Description") . "</td>";
|
| 4081 | 4081 |
$form .= "<td class=\"vncellreq\">"; |
| ... | ... | |
| 4097 | 4097 |
$form .= "<input name=\"weight\" type=\"text\" id=\"weight\" size=\"5\" value=\""; |
| 4098 | 4098 |
$form .= $this->GetWeight() . "\" />"; |
| 4099 | 4099 |
$form .= " <br /> <span class=\"vexpl\">" . gettext("Hint: For queues under the same parent "
|
| 4100 |
. "this specifies the share that a queue gets(values range from 1 to 100, you can leave it blank otherwise)") . "</span>";
|
|
| 4100 |
. "this specifies the share that a queue gets(values range from 1 to 100, you can leave it blank otherwise)") . "</span>"; |
|
| 4101 | 4101 |
$form .= "</td></tr>"; |
| 4102 | 4102 |
$form .= "<tr style=\"display:none\" id=\"sprtable1\">"; |
| 4103 | 4103 |
$form .= "<td valign=\"middle\" class=\"vncellreq\">" . gettext("Packet loss rate") . "</td>";
|
| ... | ... | |
| 4105 | 4105 |
$form .= "<input name=\"plr\" type=\"text\" id=\"plr\" size=\"5\" value=\""; |
| 4106 | 4106 |
$form .= $this->GetPlr() . "\" />"; |
| 4107 | 4107 |
$form .= " <br /> <span class=\"vexpl\">" . gettext("Hint: in most cases, you "
|
| 4108 |
. "should specify 0 here (or leave the field empty). "
|
|
| 4109 |
. "A value of 0.001 means one packet in 1000 gets dropped") . "</span>";
|
|
| 4108 |
. "should specify 0 here (or leave the field empty). " |
|
| 4109 |
. "A value of 0.001 means one packet in 1000 gets dropped") . "</span>"; |
|
| 4110 | 4110 |
$form .= "</td></tr>"; |
| 4111 | 4111 |
$form .= "<tr style=\"display:none\" id=\"sprtable2\">"; |
| 4112 | 4112 |
$form .= "<td valign=\"middle\" class=\"vncellreq\">" . gettext("Queue Size") . "</td>";
|
| ... | ... | |
| 4115 | 4115 |
$form .= $this->GetQlimit() . "\" />"; |
| 4116 | 4116 |
$form .= " slots<br />"; |
| 4117 | 4117 |
$form .= "<span class=\"vexpl\">" . gettext("Hint: in most cases, you "
|
| 4118 |
. "should leave the field empty. All packets in this pipe are placed into a fixed-size queue first, "
|
|
| 4119 |
. "then they are delayed by value specified in the Delay field, and then they "
|
|
| 4120 |
. "are delivered to their destination.") . "</span>";
|
|
| 4118 |
. "should leave the field empty. All packets in this pipe are placed into a fixed-size queue first, " |
|
| 4119 |
. "then they are delayed by value specified in the Delay field, and then they " |
|
| 4120 |
. "are delivered to their destination.") . "</span>"; |
|
| 4121 | 4121 |
$form .= "</td></tr>"; |
| 4122 | 4122 |
$form .= "<tr style=\"display:none\" id=\"sprtable5\">"; |
| 4123 | 4123 |
$form .= "<td valign=\"middle\" class=\"vncellreq\">" . gettext("Bucket Size") . "</td>";
|
| ... | ... | |
| 4126 | 4126 |
$form .= $this->GetBuckets() . "\" />"; |
| 4127 | 4127 |
$form .= " " . gettext("slots") . "<br />";
|
| 4128 | 4128 |
$form .= "<span class=\"vexpl\">" . gettext("Hint: in most cases, you "
|
| 4129 |
. "should leave the field empty. It increases the hash size set.");
|
|
| 4129 |
. "should leave the field empty. It increases the hash size set."); |
|
| 4130 | 4130 |
$form .= "</span></td></tr>"; |
| 4131 | 4131 |
|
| 4132 | 4132 |
$form .= "<input type=\"hidden\" id=\"pipe\" name=\"pipe\""; |
| ... | ... | |
| 4268 | 4268 |
$form .= "</td><td class=\"vncellreq\">"; |
| 4269 | 4269 |
$form .= " <input type=\"checkbox\" id=\"enabled\" name=\"enabled\" value=\"on\" "; |
| 4270 | 4270 |
if ($this->GetREnabled() == "on") {
|
| 4271 |
$form .= "checked=\"checked\"";
|
|
| 4271 |
$form .= "checked=\"checked\""; |
|
| 4272 | 4272 |
} |
| 4273 | 4273 |
$form .= " /><span class=\"vexpl\"> " . gettext("Enable/Disable layer7 Container") . "</span>";
|
| 4274 | 4274 |
$form .= "</td></tr>"; |
| ... | ... | |
| 4816 | 4816 |
foreach ($shaperIFlist as $shif => $shDescr) {
|
| 4817 | 4817 |
if ($altq_list_queues[$shif]) {
|
| 4818 | 4818 |
continue; |
| 4819 |
} else {
|
|
| 4819 |
} else {
|
|
| 4820 | 4820 |
if (!is_altq_capable(get_real_interface($shif))) {
|
| 4821 | 4821 |
continue; |
| 4822 | 4822 |
} |
| ... | ... | |
| 4952 | 4952 |
} |
| 4953 | 4953 |
|
| 4954 | 4954 |
|
| 4955 |
$default_shaper_msg = "<tr><td align=\"center\" width=\"80%\">";
|
|
| 4955 |
$default_shaper_msg = "<tr><td align=\"center\" width=\"80%\">"; |
|
| 4956 | 4956 |
$default_shaper_msg .= "<span class=\"vexpl\"><strong><b>" . sprintf(gettext("Welcome to the %s Traffic Shaper."), $g['product_name']) . "</b><br />";
|
| 4957 | 4957 |
$default_shaper_msg .= gettext("The tree on the left helps you navigate through the queues <br />"
|
| 4958 | 4958 |
. "buttons at the bottom represent queue actions and are activated accordingly."); |
| 4959 | 4959 |
$default_shaper_msg .= "</strong></span>"; |
| 4960 | 4960 |
$default_shaper_msg .= "</td></tr>"; |
| 4961 | 4961 |
|
| 4962 |
$dn_default_shaper_msg = "<tr><td align=\"center\" width=\"80%\">";
|
|
| 4962 |
$dn_default_shaper_msg = "<tr><td align=\"center\" width=\"80%\">"; |
|
| 4963 | 4963 |
$dn_default_shaper_msg .= "<span class=\"vexpl\"><strong><b>" . sprintf(gettext("Welcome to the %s Traffic Shaper."), $g['product_name']) . "</b><br />";
|
| 4964 | 4964 |
$dn_default_shaper_msg .= gettext("The tree on the left helps you navigate through the queues <br />"
|
| 4965 | 4965 |
. "buttons at the bottom represent queue actions and are activated accordingly."); |
Also available in: Unified diff
Code spacing
and other random stuff I noticed.
I think this finishes messing with code style. The codebase should match
the developer style guide closely enough that 99.9% of changes will not
feel the need to also massage the formatting.