From 87dcc05fccbaaec3563cb241dceaa77058e3816b Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Thu, 12 Apr 2012 12:56:15 +0200 Subject: [PATCH] Initial commit --- COPYING | 340 ++++++++++++++++++ createlinks | 19 + .../db/configuration/defaults/qos/DownLink | 1 + .../db/configuration/defaults/qos/TCPPrio | 1 + .../db/configuration/defaults/qos/UDPPrio | 1 + .../db/configuration/defaults/qos/UpLink | 1 + .../configuration/defaults/qos/WebGlobalLimit | 1 + .../defaults/qos/WebThrottleExtensions | 1 + .../defaults/qos/WebThrottleLimit | 1 + .../db/configuration/defaults/qos/status | 1 + .../db/configuration/defaults/qos/type | 1 + root/etc/e-smith/events/actions/reload-squid | 3 + .../en-us/etc/e-smith/web/functions/qos | 130 +++++++ .../locale/fr/etc/e-smith/web/functions/qos | 130 +++++++ .../templates.metadata/etc/rc.d/init.d/qos | 1 + .../templates/etc/rc.d/init.d/qos/00source | 3 + .../templates/etc/rc.d/init.d/qos/01path | 3 + .../templates/etc/rc.d/init.d/qos/02Interface | 6 + .../templates/etc/rc.d/init.d/qos/20LinkSpeed | 5 + .../templates/etc/rc.d/init.d/qos/25Classes | 18 + .../etc/rc.d/init.d/qos/30Functions10Status | 8 + .../etc/rc.d/init.d/qos/30Functions15Stop | 15 + .../rc.d/init.d/qos/30Functions20Start_begin | 3 + .../init.d/qos/30Functions25DefineClasses | 35 ++ .../etc/rc.d/init.d/qos/30Functions28QOSTable | 4 + .../etc/rc.d/init.d/qos/30Functions31VPN | 25 ++ .../etc/rc.d/init.d/qos/30Functions32Exclude | 13 + .../etc/rc.d/init.d/qos/30Functions35HighPrio | 35 ++ .../etc/rc.d/init.d/qos/30Functions38Lowdelay | 5 + .../etc/rc.d/init.d/qos/30Functions40Icmp | 7 + .../etc/rc.d/init.d/qos/30Functions50DNS | 5 + .../etc/rc.d/init.d/qos/30Functions55NTP | 5 + .../etc/rc.d/init.d/qos/30Functions60SMTP | 8 + .../etc/rc.d/init.d/qos/30Functions65SynAck | 7 + .../etc/rc.d/init.d/qos/30Functions67Apps | 10 + .../etc/rc.d/init.d/qos/30Functions70CatchAll | 6 + .../etc/rc.d/init.d/qos/30Functions75SetMark | 11 + .../etc/rc.d/init.d/qos/30Functions80Ingress | 8 + .../rc.d/init.d/qos/30Functions90Start_end | 3 + .../templates/etc/rc.d/init.d/qos/40control | 42 +++ .../etc/rc.d/init.d/qos/template-begin | 12 + .../etc/squid/squid.conf/90DelayPools | 57 +++ root/etc/e-smith/web/functions/qos | 137 +++++++ .../site_perl/esmith/FormMagick/Panel/qos.pm | 120 +++++++ smeserver-qos.spec | 141 ++++++++ 45 files changed, 1389 insertions(+) create mode 100644 COPYING create mode 100644 createlinks create mode 100644 root/etc/e-smith/db/configuration/defaults/qos/DownLink create mode 100644 root/etc/e-smith/db/configuration/defaults/qos/TCPPrio create mode 100644 root/etc/e-smith/db/configuration/defaults/qos/UDPPrio create mode 100644 root/etc/e-smith/db/configuration/defaults/qos/UpLink create mode 100644 root/etc/e-smith/db/configuration/defaults/qos/WebGlobalLimit create mode 100644 root/etc/e-smith/db/configuration/defaults/qos/WebThrottleExtensions create mode 100644 root/etc/e-smith/db/configuration/defaults/qos/WebThrottleLimit create mode 100644 root/etc/e-smith/db/configuration/defaults/qos/status create mode 100644 root/etc/e-smith/db/configuration/defaults/qos/type create mode 100644 root/etc/e-smith/events/actions/reload-squid create mode 100644 root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/qos create mode 100644 root/etc/e-smith/locale/fr/etc/e-smith/web/functions/qos create mode 100644 root/etc/e-smith/templates.metadata/etc/rc.d/init.d/qos create mode 100644 root/etc/e-smith/templates/etc/rc.d/init.d/qos/00source create mode 100644 root/etc/e-smith/templates/etc/rc.d/init.d/qos/01path create mode 100644 root/etc/e-smith/templates/etc/rc.d/init.d/qos/02Interface create mode 100644 root/etc/e-smith/templates/etc/rc.d/init.d/qos/20LinkSpeed create mode 100644 root/etc/e-smith/templates/etc/rc.d/init.d/qos/25Classes create mode 100644 root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions10Status create mode 100644 root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions15Stop create mode 100644 root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions20Start_begin create mode 100644 root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions25DefineClasses create mode 100644 root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions28QOSTable create mode 100644 root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions31VPN create mode 100644 root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions32Exclude create mode 100644 root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions35HighPrio create mode 100644 root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions38Lowdelay create mode 100644 root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions40Icmp create mode 100644 root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions50DNS create mode 100644 root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions55NTP create mode 100644 root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions60SMTP create mode 100644 root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions65SynAck create mode 100644 root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions67Apps create mode 100644 root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions70CatchAll create mode 100644 root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions75SetMark create mode 100644 root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions80Ingress create mode 100644 root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions90Start_end create mode 100644 root/etc/e-smith/templates/etc/rc.d/init.d/qos/40control create mode 100644 root/etc/e-smith/templates/etc/rc.d/init.d/qos/template-begin create mode 100644 root/etc/e-smith/templates/etc/squid/squid.conf/90DelayPools create mode 100644 root/etc/e-smith/web/functions/qos create mode 100644 root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/qos.pm create mode 100644 smeserver-qos.spec diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..196760e --- /dev/null +++ b/COPYING @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) 19yy + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/createlinks b/createlinks new file mode 100644 index 0000000..39f00f1 --- /dev/null +++ b/createlinks @@ -0,0 +1,19 @@ +#!/usr/bin/perl -w + +use esmith::Build::CreateLinks qw(:all); + +panel_link("qos", 'manager'); + +service_link_enhanced("qos", "S85", "7"); +service_link_enhanced("qos", "K25", "6"); +service_link_enhanced("qos", "K25", "0"); + +templates2events("/etc/rc.d/init.d/qos", "bootstrap-console-save"); +templates2events("/etc/rc.d/init.d/qos", "qos-update"); +templates2events("/etc/squid/squid.conf", "qos-update"); + +event_link("reload-squid", "qos-update", "90"); + +safe_symlink("adjust", "root/etc/e-smith/events/qos-update/services2adjust/qos"); +safe_symlink("adjust", "root/etc/e-smith/events/ip-up/services2adjust/qos"); + diff --git a/root/etc/e-smith/db/configuration/defaults/qos/DownLink b/root/etc/e-smith/db/configuration/defaults/qos/DownLink new file mode 100644 index 0000000..26a4dd3 --- /dev/null +++ b/root/etc/e-smith/db/configuration/defaults/qos/DownLink @@ -0,0 +1 @@ +4000 diff --git a/root/etc/e-smith/db/configuration/defaults/qos/TCPPrio b/root/etc/e-smith/db/configuration/defaults/qos/TCPPrio new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/root/etc/e-smith/db/configuration/defaults/qos/TCPPrio @@ -0,0 +1 @@ + diff --git a/root/etc/e-smith/db/configuration/defaults/qos/UDPPrio b/root/etc/e-smith/db/configuration/defaults/qos/UDPPrio new file mode 100644 index 0000000..be601f2 --- /dev/null +++ b/root/etc/e-smith/db/configuration/defaults/qos/UDPPrio @@ -0,0 +1 @@ +5060,10000-20000,4569 diff --git a/root/etc/e-smith/db/configuration/defaults/qos/UpLink b/root/etc/e-smith/db/configuration/defaults/qos/UpLink new file mode 100644 index 0000000..d411bb7 --- /dev/null +++ b/root/etc/e-smith/db/configuration/defaults/qos/UpLink @@ -0,0 +1 @@ +400 diff --git a/root/etc/e-smith/db/configuration/defaults/qos/WebGlobalLimit b/root/etc/e-smith/db/configuration/defaults/qos/WebGlobalLimit new file mode 100644 index 0000000..29d6383 --- /dev/null +++ b/root/etc/e-smith/db/configuration/defaults/qos/WebGlobalLimit @@ -0,0 +1 @@ +100 diff --git a/root/etc/e-smith/db/configuration/defaults/qos/WebThrottleExtensions b/root/etc/e-smith/db/configuration/defaults/qos/WebThrottleExtensions new file mode 100644 index 0000000..e085d6f --- /dev/null +++ b/root/etc/e-smith/db/configuration/defaults/qos/WebThrottleExtensions @@ -0,0 +1 @@ +.rar,.zip,.tar,.tar.gz,.tar.bz2,.tgz,.tbz2,.avi,.mpg,.mpeg,.mkv,.mov,.flv,.iso diff --git a/root/etc/e-smith/db/configuration/defaults/qos/WebThrottleLimit b/root/etc/e-smith/db/configuration/defaults/qos/WebThrottleLimit new file mode 100644 index 0000000..29d6383 --- /dev/null +++ b/root/etc/e-smith/db/configuration/defaults/qos/WebThrottleLimit @@ -0,0 +1 @@ +100 diff --git a/root/etc/e-smith/db/configuration/defaults/qos/status b/root/etc/e-smith/db/configuration/defaults/qos/status new file mode 100644 index 0000000..7a68b11 --- /dev/null +++ b/root/etc/e-smith/db/configuration/defaults/qos/status @@ -0,0 +1 @@ +disabled diff --git a/root/etc/e-smith/db/configuration/defaults/qos/type b/root/etc/e-smith/db/configuration/defaults/qos/type new file mode 100644 index 0000000..24e1098 --- /dev/null +++ b/root/etc/e-smith/db/configuration/defaults/qos/type @@ -0,0 +1 @@ +service diff --git a/root/etc/e-smith/events/actions/reload-squid b/root/etc/e-smith/events/actions/reload-squid new file mode 100644 index 0000000..4e00709 --- /dev/null +++ b/root/etc/e-smith/events/actions/reload-squid @@ -0,0 +1,3 @@ +#!/bin/bash + +/usr/sbin/squid -k reconfigure diff --git a/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/qos b/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/qos new file mode 100644 index 0000000..56ba010 --- /dev/null +++ b/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/qos @@ -0,0 +1,130 @@ + + + QOS + Quality of Service + + + FORM_TITLE + Configure quality of service + + + DESC_QOS + You can manage quality of service on your server. You must define the capacities of the band-width + + + DESC_UDPPrio + You can configure specific high priority ports for the UDP protocol. You can enter a list of port or ports ranges separated by a comma (for example 5060,10000-20000,4569). Outgoing paquets to these ports will have the highest priority + + + DESC_TCPPrio + You can configure specific high priority ports for the TCP protocol. The format is the same as UDP. + + + DESC_HostsPrio + You can configure a list of high priority hosts. Any traffic to these hosts will have the highest priority + + + DESC_BP + Enter your link capacity. + + + INVALID_PORT_RANGE + This is not a valid list of port or port range + + + INVALID_HOST_IP + This is not a valid list of ip address + + + LABEL_UPLINK + Uplink Bandwith (in kbps) + + + LABEL_DOWNLINK + Downlink Bandwith (in kbps) + + + LABEL_UDPPrio + UDP High Priority Ports + + + LABEL_TCPPrio + TCP Hight Priority Ports + + + LABEL_HostsPrio + Hight Priority Hosts + + + IN_SERVERONLY_MODE + You are running in server only mode. It doesn't make sens to configure QOS as your server do not control outgoing trafic]]> + + + DESC_STATUS + Do you want to enable the service + + + LABEL_STATUS + Status + + + ENABLED + enabled + + + DISABLED + disabled + + + DESC_WEB_THROTTLE + The following settings only apply to web downloads which pass through the proxy on this server. Web proxy need to be enabled for this to take effect. + + + DESC_WEB_GLOBAL_LIMIT + This settings will define a global speed limit for web trafic as a percent of your total available downlink speed. For example, if you set 90, downloads from the web will be limited to 90% of your total bandwidth. You use this to reduce the impact of big downloads on critial streams, like VoIP. + + + LABEL_WEB_GLOBAL_LIMIT + Web global limit + + + DESC_WEB_THROTTLE_LIMIT + This settings controls per host limit. For example, if you choose 70, each host will be limited to 70% of the total bandwidth (after the burst at full speed). This setting helps preventing one user to slow down everything with big downloads + + + LABEL_WEB_THROTTLE_LIMIT + Per host limit + + + DESC_WEB_THROTTLE_EXTENSIONS + Enter here the list of extensions which will be affected by the per host limit, one per line. If you want everything to be limited, just enter a dot (.) + + + LABEL_WEB_THROTTLE_EXTENSIONS + Extensions to throttle + + + DESC_WEB_SOURCE_EXCEPTION + You can enter here IP address of internal host which won't be limited by the per host throttle, one IP address per line. Usefull for example to let your boss surf at full speed. Global limit will still apply to this list. + + + LABEL_WEB_SOURCE_EXCEPTION + Exceptions (sources) + + + DESC_WEB_DEST_EXCEPTION + You can also enter a list of domain names which won't be affected by the per host throttle, one per line (global limit still applies). + + + LABEL_WEB_DEST_EXCEPTION + Exceptions (destinations) + + + VALUE_NEED_TO_BE_PERCENT + This value must be between 0 and 100 + + + VALUE_ZERO_OR_POSITIVE + This value must be positive or null + + diff --git a/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/qos b/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/qos new file mode 100644 index 0000000..3ea7126 --- /dev/null +++ b/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/qos @@ -0,0 +1,130 @@ + + + QOS + Qualité de service + + + FORM_TITLE + Configuration de la qualité de service + + + DESC_QOS + Vous pouvez contrôler la qualité de service sur votre serveur. Vous devez d'abord définir les capacité de votre ligne (bande passante). + + + DESC_UDPPrio + Vous pouvez configurer une liste de ports prioritaires pour le protocole UDP. Vous pouvez entrer une liste de ports, ou de plages de ports, séparés par des virgules (par exemple 5060,10000-20000,4569). Les paquets sortants utilisant ces ports en destination auront la plus hautes priorité. + + + DESC_TCPPrio + Vous pouvez définir une liste de ports prioritaires pour le protocole TCP. Le format est le même que pour l'UDP. + + + DESC_HostsPrio + Vous puvez configurer une liste d'hôtes prioritaires. Tout le trafic à destination de ces hôtes aura la plus haute priorité. + + + DESC_BP + Entrez les capacités de votre ligne. + + + INVALID_PORT_RANGE + Ceci n'est pas une liste valide de ports, ou de plage de ports + + + INVALID_HOST_IP + Ceci n'est pas une liste valide d'adresses IP + + + LABEL_UPLINK + Bande passante montante (en kbps) + + + LABEL_DOWNLINK + Bande passante descendante (en kbps) + + + LABEL_UDPPrio + Ports UDP prioritaires + + + LABEL_TCPPrio + Ports TCP prioritaires + + + LABEL_HostsPrio + Hôtes prioritaires + + + IN_SERVERONLY_MODE + Votre serveur est configuré en mode serveur simple. La QoS ne sera pas gérée puisque votre serveur ne contrôle pas le trafic sortant]]> + + + DESC_STATUS + Voulez-vous activer le service + + + LABEL_STATUS + Statut + + + ENABLED + activé + + + DISABLED + désactivé + + + DESC_WEB_THROTTLE + Les réglages suivants ne s'appliquent qu'aux téléchargements sur le web passant à travers le proxy de ce serveur. Le proxy HTTP doit être activé pour que ces réglages soient effectifs + + + DESC_WEB_GLOBAL_LIMIT + Ce paramètre permet de définir une limite de vitesse pour le trafic web exprimée comme un pourcentage de la bande passante descendante totale. Par exemple, si vous le réglez à 90, les téléchargements seront limités à 90% de votre bande passante totale. Vous pouvez utiliser ce réglage pour limiter l'impacte de gros téléchargements sur des flux critiques, comme la VoIP. + + + LABEL_WEB_GLOBAL_LIMIT + Limite web globale + + + DESC_WEB_THROTTLE_LIMIT + Ce paramètre contrôle la limite de vitesse par hôte. Par exemple, si vous choisissez 70, chaque machine de votre réseau sera limitée à 70% de la bande passante totale. Ce paramètre permet d'éviter qu'un utilisateur ralentisse tout le réseau avec de gros téléchargements. + + + LABEL_WEB_THROTTLE_LIMIT + Limite par machine + + + DESC_WEB_THROTTLE_EXTENSIONS + Entrez ici une liste d'extensions sur lesquelles appliquer la limite par machine, une par ligne. Si vous voulez limiter tout type de fichier, entrez simplement un point (.) + + + LABEL_WEB_THROTTLE_EXTENSIONS + Extensions à limiter + + + DESC_WEB_SOURCE_EXCEPTION + Vous pouvez entrer ici une liste d'adresses IP des machines internes qui ne seront pas affectées par la limite par machine, une adresse par ligne. Ce réglage est utile par exemple pour laisser votre patron surfer à pleine vitesse. La limite globale s'applique tout de même. + + + LABEL_WEB_SOURCE_EXCEPTION + Exceptions (sources) + + + DESC_WEB_DEST_EXCEPTION + Vous pouvez aussi entrer une liste de noms de domaine qui ne seront pas affectés par la limite par machine, un domaine par ligne. (le limite globale s'applique toujours) + + + LABEL_WEB_DEST_EXCEPTION + Exceptions (destinations) + + + VALUE_NEED_TO_BE_PERCENT + Cette valeure doit être comprise entre 0 et 100 + + + VALUE_ZERO_OR_POSITIVE + Cette valeure doit être positive ou nulle + + diff --git a/root/etc/e-smith/templates.metadata/etc/rc.d/init.d/qos b/root/etc/e-smith/templates.metadata/etc/rc.d/init.d/qos new file mode 100644 index 0000000..76f5e22 --- /dev/null +++ b/root/etc/e-smith/templates.metadata/etc/rc.d/init.d/qos @@ -0,0 +1 @@ +PERMS=0554 diff --git a/root/etc/e-smith/templates/etc/rc.d/init.d/qos/00source b/root/etc/e-smith/templates/etc/rc.d/init.d/qos/00source new file mode 100644 index 0000000..366fc13 --- /dev/null +++ b/root/etc/e-smith/templates/etc/rc.d/init.d/qos/00source @@ -0,0 +1,3 @@ +# Source function library. +. /etc/rc.d/init.d/functions + diff --git a/root/etc/e-smith/templates/etc/rc.d/init.d/qos/01path b/root/etc/e-smith/templates/etc/rc.d/init.d/qos/01path new file mode 100644 index 0000000..9478c57 --- /dev/null +++ b/root/etc/e-smith/templates/etc/rc.d/init.d/qos/01path @@ -0,0 +1,3 @@ +TC=/sbin/tc +IPT=/sbin/iptables + diff --git a/root/etc/e-smith/templates/etc/rc.d/init.d/qos/02Interface b/root/etc/e-smith/templates/etc/rc.d/init.d/qos/02Interface new file mode 100644 index 0000000..c53000b --- /dev/null +++ b/root/etc/e-smith/templates/etc/rc.d/init.d/qos/02Interface @@ -0,0 +1,6 @@ +{ + my $extdev = $ExternalInterface{'Name'} || 'eth0'; + my $landev = $InternalInterface{'Name'} || 'eth0'; + $OUT .= "EXTDEV=$extdev\n"; + $OUT .= "LANDEV=$landev\n"; +} diff --git a/root/etc/e-smith/templates/etc/rc.d/init.d/qos/20LinkSpeed b/root/etc/e-smith/templates/etc/rc.d/init.d/qos/20LinkSpeed new file mode 100644 index 0000000..34fd509 --- /dev/null +++ b/root/etc/e-smith/templates/etc/rc.d/init.d/qos/20LinkSpeed @@ -0,0 +1,5 @@ +{ + $OUT .= "UPLINK=$qos{UpLink}\n"; + $OUT .= "DOWNLINK=$qos{DownLink}\n"; +} + diff --git a/root/etc/e-smith/templates/etc/rc.d/init.d/qos/25Classes b/root/etc/e-smith/templates/etc/rc.d/init.d/qos/25Classes new file mode 100644 index 0000000..041209c --- /dev/null +++ b/root/etc/e-smith/templates/etc/rc.d/init.d/qos/25Classes @@ -0,0 +1,18 @@ +# Class 10 will handle real time traffic, like VoIP +# and user specified high priority UDP and TCP ports as well as +# High priority hosts +CLASS_1=$[{ ($qos{'Class1'} || '45') }*$UPLINK/100] + +# This class will handle high priority traffic, like ICMP, DNS, NTP, TCP Ack +CLASS_2=$[{ ($qos{'Class2'} || '25') }*$UPLINK/100] + +# This class will handle all the traffic which is not marked +CLASS_3=$[{ ($qos{'Class3'} || '15') }*$UPLINK/100] + +# This class will handle low prio traffic like SMTP +CLASS_4=$[{ ($qos{'Class4'} || '10') }*$UPLINK/100] + +# This class will handle very low priority traffic +CLASS_5=$[{ ($qos{'Class5'} || '5') }*$UPLINK/100] + + diff --git a/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions10Status b/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions10Status new file mode 100644 index 0000000..3bd938a --- /dev/null +++ b/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions10Status @@ -0,0 +1,8 @@ + +# Display the status +status()\{ + $TC -s qdisc ls dev $EXTDEV + $TC -s class ls dev $EXTDEV + exit +\} + diff --git a/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions15Stop b/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions15Stop new file mode 100644 index 0000000..a42a946 --- /dev/null +++ b/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions15Stop @@ -0,0 +1,15 @@ + +stop()\{ + # Flush classes and Qdiscs + $TC qdisc del dev $EXTDEV root 2> /dev/null > /dev/null + $TC qdisc del dev $EXTDEV ingress 2> /dev/null > /dev/null + + # Flush mangle table + $IPT -t mangle -F + if [ $($IPT -t mangle -L | grep -c QOS) -gt 0 ]; then + $IPT -t mangle -F QOS + $IPT -t mangle -X QOS + fi + +\} + diff --git a/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions20Start_begin b/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions20Start_begin new file mode 100644 index 0000000..e4d47f9 --- /dev/null +++ b/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions20Start_begin @@ -0,0 +1,3 @@ + +start()\{ + diff --git a/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions25DefineClasses b/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions25DefineClasses new file mode 100644 index 0000000..b4dd086 --- /dev/null +++ b/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions25DefineClasses @@ -0,0 +1,35 @@ +{ + +$OUT = ''; +our $r2q = $qos{'r2q'} || ''; +$r2q = "r2q $r2q" if ($r2q ne ''); + +} + + +$TC qdisc add dev $EXTDEV root handle 1: htb {"$r2q";} + +$TC class add dev $EXTDEV parent 1: classid 1:1 htb rate $\{UPLINK\}kbit ceil $\{UPLINK\}kbit burst 10k + +$TC class add dev $EXTDEV parent 1:1 classid 1:10 htb rate $\{CLASS_1\}kbit ceil $\{UPLINK\}kbit prio 1 burst 5k +$TC class add dev $EXTDEV parent 1:1 classid 1:11 htb rate $\{CLASS_2\}kbit ceil $\{UPLINK\}kbit prio 2 burst 5k +$TC class add dev $EXTDEV parent 1:1 classid 1:12 htb rate $\{CLASS_3\}kbit ceil $\{UPLINK\}kbit prio 3 +$TC class add dev $EXTDEV parent 1:1 classid 1:13 htb rate $\{CLASS_4\}kbit ceil $\{UPLINK\}kbit prio 4 +$TC class add dev $EXTDEV parent 1:1 classid 1:14 htb rate $\{CLASS_5\}kbit ceil $\{UPLINK\}kbit prio 5 + +$TC qdisc add dev $EXTDEV parent 1:10 handle 110: pfifo limit 1000 +$TC qdisc add dev $EXTDEV parent 1:11 handle 111: sfq perturb 10 +$TC qdisc add dev $EXTDEV parent 1:12 handle 112: sfq perturb 10 +$TC qdisc add dev $EXTDEV parent 1:13 handle 113: sfq perturb 10 +$TC qdisc add dev $EXTDEV parent 1:14 handle 114: sfq perturb 10 + +$TC filter add dev $EXTDEV parent 1:0 protocol ip prio 1 handle 1 fw flowid 1:10 +$TC filter add dev $EXTDEV parent 1:0 protocol ip prio 2 handle 2 fw flowid 1:11 +$TC filter add dev $EXTDEV parent 1:0 protocol ip prio 3 handle 3 fw flowid 1:12 +$TC filter add dev $EXTDEV parent 1:0 protocol ip prio 4 handle 4 fw flowid 1:13 +$TC filter add dev $EXTDEV parent 1:0 protocol ip prio 5 handle 5 fw flowid 1:14 + +# Handle "excludes" hosts +$TC filter add dev $EXTDEV parent 1:0 protocol ip prio 6 handle 6 fw flowid 1: + + diff --git a/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions28QOSTable b/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions28QOSTable new file mode 100644 index 0000000..b4cbef7 --- /dev/null +++ b/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions28QOSTable @@ -0,0 +1,4 @@ + +# Create the QOS table, used to classify trafic +$IPT -t mangle -N QOS + diff --git a/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions31VPN b/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions31VPN new file mode 100644 index 0000000..44ffae4 --- /dev/null +++ b/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions31VPN @@ -0,0 +1,25 @@ +{ +# VPN paquets have already a tos set (when they entered the tun interface +# So, we just need to send them in the QOS table + +# For OpenVPN Bridge +if (defined ${'openvpn-bridge'}{'UDPPort'}){ + $OUT .= "\$IPT -t mangle -A QOS -p udp --sport ${'openvpn-bridge'}{'UDPPort'} -j RETURN\n"; +} +elsif (defined ${'openvpn-bridge'}{'TCPPort'}){ + $OUT .= "\$IPT -t mangle -A QOS -p tcp --sport ${'openvpn-bridge'}{'TCPPort'} -j RETURN\n"; +} + +# For OpenVPN Site To Site +my $ovpndb = esmith::ConfigDB->open_ro('openvpn-s2s') || return ""; + +foreach my $server ($ovpndb->get_all_by_prop(type=>'server')){ + $OUT .= "\$IPT -t mangle -A QOS -p " . ($server->prop('Protocol') || 'udp') . " --sport " . $server->prop('Port') . " -j RETURN\n"; +} +foreach my $client ($ovpndb->get_all_by_prop(type=>'client')){ + $OUT .= "\$IPT -t mangle -A QOS -p " . ($client->prop('Protocol') || 'udp') . " --dport " . $client->prop('Port') . " -j RETURN\n"; +} + +$OUT .= ''; + +} diff --git a/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions32Exclude b/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions32Exclude new file mode 100644 index 0000000..d92111b --- /dev/null +++ b/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions32Exclude @@ -0,0 +1,13 @@ + +# Hosts to exclude from the BW limit +{ +my $excludes = ${qos}{'excludes'} || ''; + +foreach(split(/[;,]/,$excludes)){ + $OUT .= "\$IPT -t mangle -A POSTROUTING -d $_ -j MARK --set-mark 0x6\n"; + $OUT .= "\$IPT -t mangle -A POSTROUTING -d $_ -j RETURN\n"; +} + +} + + diff --git a/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions35HighPrio b/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions35HighPrio new file mode 100644 index 0000000..1ffe523 --- /dev/null +++ b/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions35HighPrio @@ -0,0 +1,35 @@ + +{ +$OUT .= "# High prio UDP Ports;\n"; + + +my $TCPPrio = ${qos}{'TCPPrio'} || ''; +my $UDPPrio = ${qos}{'UDPPrio'} || ''; +my $HostsPrio = ${qos}{'HostsPrio'} || ''; + +$UDPPrio =~ s/-/:/g; +$TCPPrio =~ s/-/:/g; + +foreach (split(/[;,]/,$UDPPrio)){ + $OUT .= "\$IPT -t mangle -A QOS -p udp --dport $_ -j DSCP --set-dscp 1\n"; + $OUT .= "\$IPT -t mangle -A QOS -p udp --dport $_ -j RETURN\n"; +} + + +$OUT .= "\n# High prio TCP Ports:\n"; + +foreach (split(/[;,]/,$TCPPrio)){ + $OUT .= "\$IPT -t mangle -A QOS -p tcp --dport $_ -j DSCP --set-dscp 1\n"; + $OUT .= "\$IPT -t mangle -A QOS -p tcp --dport $_ -j RETURN\n"; +} + +$OUT .= "\n# High prio Hosts:\n"; + +foreach (split(/[;,]/,$HostsPrio)){ + $OUT .= "\$IPT -t mangle -A QOS -d $_ -j DSCP --set-dscp 1\n"; + $OUT .= "\$IPT -t mangle -A QOS -d $_ -j RETURN\n"; +} + +} + + diff --git a/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions38Lowdelay b/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions38Lowdelay new file mode 100644 index 0000000..b07f153 --- /dev/null +++ b/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions38Lowdelay @@ -0,0 +1,5 @@ + +# Packets marked for lowdelay (TOS field) should be in the first class +$IPT -t mangle -A QOS -m tos --tos Minimize-Delay -j DSCP --set-dscp 1 +$IPT -t mangle -A QOS -m tos --tos Minimize-Delay -j RETURN + diff --git a/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions40Icmp b/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions40Icmp new file mode 100644 index 0000000..0d08bbd --- /dev/null +++ b/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions40Icmp @@ -0,0 +1,7 @@ + +# Icmp ping should have a hight priority +$IPT -t mangle -A QOS -p icmp --icmp-type echo-request -j DSCP --set-dscp 2 +$IPT -t mangle -A QOS -p icmp --icmp-type echo-request -j RETURN +$IPT -t mangle -A QOS -p icmp --icmp-type echo-reply -j DSCP --set-dscp 2 +$IPT -t mangle -A QOS -p icmp --icmp-type echo-reply -j RETURN + diff --git a/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions50DNS b/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions50DNS new file mode 100644 index 0000000..b126898 --- /dev/null +++ b/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions50DNS @@ -0,0 +1,5 @@ + +# DNS Requests +$IPT -t mangle -A QOS -p udp --dport 53 -j DSCP --set-dscp 2 +$IPT -t mangle -A QOS -p udp --dport 53 -j RETURN + diff --git a/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions55NTP b/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions55NTP new file mode 100644 index 0000000..ac75b1e --- /dev/null +++ b/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions55NTP @@ -0,0 +1,5 @@ + +# NTP +$IPT -t mangle -A QOS -p udp --dport 123 -j DSCP --set-dscp 2 +$IPT -t mangle -A QOS -p udp --dport 123 -j RETURN + diff --git a/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions60SMTP b/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions60SMTP new file mode 100644 index 0000000..5b6bfdc --- /dev/null +++ b/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions60SMTP @@ -0,0 +1,8 @@ +# SMTP(s) +$IPT -t mangle -A QOS -p tcp --dport 25 -j DSCP --set-dscp 4 +$IPT -t mangle -A QOS -p tcp --dport 25 -j RETURN +$IPT -t mangle -A QOS -p tcp --dport 465 -j DSCP --set-dscp 4 +$IPT -t mangle -A QOS -p tcp --dport 465 -j RETURN +$IPT -t mangle -A QOS -p tcp --dport 587 -j DSCP --set-dscp 4 +$IPT -t mangle -A QOS -p tcp --dport 587 -j RETURN + diff --git a/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions65SynAck b/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions65SynAck new file mode 100644 index 0000000..8996396 --- /dev/null +++ b/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions65SynAck @@ -0,0 +1,7 @@ + +# Small packets (like TCP control) should also go first +$IPT -t mangle -A QOS -p tcp --tcp-flags ALL SYN -m length --length 40:64 -j DSCP --set-dscp 2 +$IPT -t mangle -A QOS -p tcp --tcp-flags ALL SYN -m length --length 40:64 -j RETURN +$IPT -t mangle -A QOS -p tcp --tcp-flags ALL SYN,ACK -m length --length 40:64 -j DSCP --set-dscp 2 +$IPT -t mangle -A QOS -p tcp --tcp-flags ALL SYN,ACK -m length --length 40:64 -j RETURN + diff --git a/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions67Apps b/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions67Apps new file mode 100644 index 0000000..e5295df --- /dev/null +++ b/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions67Apps @@ -0,0 +1,10 @@ + +# Zabbix Agent responses +$IPT -t mangle -A QOS -p tcp --sport 10050 -j DSCP --set-dscp 2 +$IPT -t mangle -A QOS -p tcp --sport 10050 -j RETURN + +# Zabbix Agent in active mode or zabbix proxy to Zabbix Server +$IPT -t mangle -A QOS -p tcp --dport 10051 -j DSCP --set-dscp 2 +$IPT -t mangle -A QOS -p tcp --dport 10051 -j RETURN + + diff --git a/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions70CatchAll b/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions70CatchAll new file mode 100644 index 0000000..1a04c29 --- /dev/null +++ b/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions70CatchAll @@ -0,0 +1,6 @@ + +# Catch everything else +$IPT -t mangle -A QOS -j DSCP --set-dscp 3 +$IPT -t mangle -A QOS -j RETURN + + diff --git a/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions75SetMark b/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions75SetMark new file mode 100644 index 0000000..1f06bda --- /dev/null +++ b/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions75SetMark @@ -0,0 +1,11 @@ + +# Clasification based on the DSCP field set previously + +$IPT -t mangle -A POSTROUTING -o $LANDEV -j RETURN +$IPT -t mangle -A POSTROUTING -o $EXTDEV -j QOS +$IPT -t mangle -A POSTROUTING -m dscp --dscp 1 -o $EXTDEV -j MARK --set-mark 0x1 +$IPT -t mangle -A POSTROUTING -m dscp --dscp 2 -o $EXTDEV -j MARK --set-mark 0X2 +$IPT -t mangle -A POSTROUTING -m dscp --dscp 3 -o $EXTDEV -j MARK --set-mark 0x3 +$IPT -t mangle -A POSTROUTING -m dscp --dscp 4 -o $EXTDEV -j MARK --set-mark 0x4 +$IPT -t mangle -A POSTROUTING -m dscp --dscp 5 -o $EXTDEV -j MARK --set-mark 0x5 + diff --git a/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions80Ingress b/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions80Ingress new file mode 100644 index 0000000..41654f7 --- /dev/null +++ b/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions80Ingress @@ -0,0 +1,8 @@ +#Equilibrage des telechargements avec les emissions +$TC qdisc add dev $EXTDEV handle ffff: ingress + + +$TC filter add dev $EXTDEV parent ffff: protocol ip prio 50 u32 match ip src \ + 0.0.0.0/0 police rate $\{DOWNLINK\}kbit burst 200k drop flowid :1 + + diff --git a/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions90Start_end b/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions90Start_end new file mode 100644 index 0000000..66605f9 --- /dev/null +++ b/root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions90Start_end @@ -0,0 +1,3 @@ + +\} + diff --git a/root/etc/e-smith/templates/etc/rc.d/init.d/qos/40control b/root/etc/e-smith/templates/etc/rc.d/init.d/qos/40control new file mode 100644 index 0000000..7e27d51 --- /dev/null +++ b/root/etc/e-smith/templates/etc/rc.d/init.d/qos/40control @@ -0,0 +1,42 @@ + +case "$1" in + start) + echo -n $"Starting QoS: " + start + RETVAL=$? + ;; + stop) + echo -n $"Stoping QoS: " + stop + RETVAL=$? + ;; + restart) + echo -n $"Restarting QoS: " + stop && start + RETVAL=$? + ;; + adjust) + echo -n $"Adjusting QoS: " + stop + if [ $(/sbin/e-smith/db configuration getprop qos status) == 'enabled' ]; then + start + fi + RETVAL=$? + ;; + status) + status + ;; + *) + echo "Usage: $0 start|stop|restart|status" + ;; +esac + +if [ $RETVAL -eq 0 ]; then + echo_success +else + echo_failure +fi +echo + +exit $RETVAL + diff --git a/root/etc/e-smith/templates/etc/rc.d/init.d/qos/template-begin b/root/etc/e-smith/templates/etc/rc.d/init.d/qos/template-begin new file mode 100644 index 0000000..9638b74 --- /dev/null +++ b/root/etc/e-smith/templates/etc/rc.d/init.d/qos/template-begin @@ -0,0 +1,12 @@ +#!/bin/bash + +#------------------------------------------------------------ +# !!DO NOT MODIFY THIS FILE!! +# +# Manual changes will be lost when this file is regenerated. +# +# Please read the developer's guide, which is available +# at http://www.contribs.org/development/ +# +# Copyright (C) 1999-2006 Mitel Networks Corporation +#------------------------------------------------------------ diff --git a/root/etc/e-smith/templates/etc/squid/squid.conf/90DelayPools b/root/etc/e-smith/templates/etc/squid/squid.conf/90DelayPools new file mode 100644 index 0000000..64763d8 --- /dev/null +++ b/root/etc/e-smith/templates/etc/squid/squid.conf/90DelayPools @@ -0,0 +1,57 @@ +{ + +my $status = $qos{'status'} || 'disabled'; + +return "" unless ($status eq 'enabled'); + +my $down = $qos{'DownLink'} || '4000'; +my $weblimit = $qos{'WebGlobalLimit'} || '100'; +my $limit = $qos{'WebThrottleLimit'} || '99'; + +# Convert weblimit and per user limit in absolute values (in bytes) +$weblimit = $down * $weblimit * 1024 / (100 * 8); +$limit = $down * $limit * 1024 / (100 * 8); + +my $extensions = $qos{'WebThrottleExtensions'} || '.rar .zip .tar .tar.gz .tar.bz2 .tgz .tbz2 .avi .mpg .mpeg .mkv .mov .flv .iso'; +$extensions =~ s/[,;]/\ /g; +$extensions =~ s/\./\\\./g; + +my @sexcludes = split(/[;,]/, ($qos{'WebThrottleSourceException'} || '')); +my @dexcludes = split(/[;,]/, ($qos{'WebThrottleDestException'} || '')); + +$OUT .=<<"EOF"; + +acl throttle url_regex -i $extensions + +delay_pools 2 +delay_class 1 1 +delay_parameters 1 $weblimit/$weblimit + +delay_class 2 2 +delay_parameters 2 $weblimit/$weblimit $limit/$limit + +delay_access 1 allow localdst + +acl exclude_throttle_src src 127.0.0.1 +acl exclude_throttle_dst dstdomain $DomainName + +EOF + +foreach (@sexcludes){ + $OUT .= "acl exclude_throttle_src src $_\n"; +} +foreach (@dexcludes){ + $_ =~ s/^/\./ unless $_ =~ m/^\./; + $OUT .= "acl exclude_throttle_dst dstdomain $_\n"; +} + +$OUT .=<<"EOF" + +delay_access 1 allow localdst +delay_access 1 allow exclude_throttle_src +delay_access 1 allow exclude_throttle_dst +delay_access 2 allow throttle +delay_access 1 allow !throttle + +EOF +} diff --git a/root/etc/e-smith/web/functions/qos b/root/etc/e-smith/web/functions/qos new file mode 100644 index 0000000..cfde09d --- /dev/null +++ b/root/etc/e-smith/web/functions/qos @@ -0,0 +1,137 @@ +#!/usr/bin/perl -wT +#vim: ft=xml: + +#-------------------------------------------------------------------------------------------- +# heading : Configuration +# description : QOS +# navigation : 5000 5400 +#-------------------------------------------------------------------------------------------- + +use strict; +use warnings; + +use esmith::FormMagick::Panel::qos; +my $f = esmith::FormMagick::Panel::qos->new(); +$f->display(); + +__DATA__ +
+ + + + + + DESC_QOS + + + DESC_STATUS + + + + DESC_BP + + + + + + DESC_UDPPrio + + + + DESC_TCPPrio + + + + DESC_HostsPrio + + + + + + + DESC_WEB_THROTTLE + + + + DESC_WEB_GLOBAL_LIMIT + + + + DESC_WEB_THROTTLE_LIMIT + + + + DESC_WEB_THROTTLE_EXTENSIONS + + + + DESC_WEB_SOURCE_EXCEPTION + + + + DESC_WEB_DEST_EXCEPTION + + + + + +
diff --git a/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/qos.pm b/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/qos.pm new file mode 100644 index 0000000..7c188c1 --- /dev/null +++ b/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/qos.pm @@ -0,0 +1,120 @@ +#!/usr/bin/perl -w + +package esmith::FormMagick::Panel::qos; + +use strict; +use warnings; + +use esmith::FormMagick; +use esmith::ConfigDB; + +our @ISA = qw(esmith::FormMagick Exporter); + +our @EXPORT = qw(); + +our $VERSION = sprintf '%d.%03d', q$Revision: 2.00 $ =~ /: (\d+).(\d+)/; + +our $db = esmith::ConfigDB->open(); + +sub new +{ + shift; + my $self = esmith::FormMagick->new(); + $self->{calling_package} = (caller) [0]; + bless $self; + return $self; +} + +sub get_prop{ + my ($self,$prop) = @_; + return $db->get_prop("qos", $prop); +} + +sub get_list{ + my ($self,$prop) = @_; + my $values = get_prop($self,$prop); + $values =~ s/[;,]/\n/g; + return $values; +} + +sub print_section_bar{ + my ($fm) = @_; + print " \n \n"; + print "
\n"; + return undef; +} + +sub print_serveronly_msg{ + my $self = shift; + my $mode = $db->get_value('SystemMode'); + my $msg = ''; + if ($mode eq 'serveronly'){ + $msg = $self->localise('IN_SERVERONLY_MODE'); + } + return $msg; +} + +sub zero_or_positive{ + my $self = shift; + my $val = shift || 0; + + return 'OK' if($val =~ /^\d+$/ and $val >= 0); + return $self->localise('VALUE_ZERO_OR_POSITIVE'); +} + +sub is_percent{ + my ($self,$val) = @_; + if ($val =~ m/^\d+$/ && $val <= 100 && $val >= 0){ + return 'OK'; + } + return $self->localise('VALUE_NEED_TO_BE_PERCENT'); +} + +sub port_range{ + my $self = shift; + my $val = shift || 0; + my $RePort = qr/\d{1,4}|[0-6]\d{4}/; + my $RePortRange = qr/$RePort(-$RePort)?/; + if ($val =~ m/^$RePortRange(,$RePortRange)*$/) { + return 'OK'; + } + else { + return $self->localise('INVALID_PORT_RANGE'); + } +} + +sub host_ip{ + my $self = shift; + my $val = shift || ''; + my $ReIpNum = qr{([01]?\d\d?|2[0-4]\d|25[0-5])}; + my $ReIpAddr = qr{($ReIpNum\.$ReIpNum\.$ReIpNum\.$ReIpNum)}; + if (($val =~ m/^$ReIpAddr(,$ReIpAddr)*$/) || ($val eq '')) { + return 'OK'; + } + else { + return $self->localise('INVALID_HOST_IP'); + } +} + +sub change_settings { + my $fm = shift; + my $q = $fm->{'cgi'}; + + foreach (qw/status UDPPrio TCPPrio HostsPrio UpLink DownLink WebGlobalLimit WebThrottleLimit/){ + $db->set_prop('qos', "$_", $q->param("$_") ||''); + } + + foreach (qw/WebThrottleExtensions WebThrottleSourceException WebThrottleDestException/){ + my $list = $q->param("$_") || ''; + $list =~ s/\r?\n/,/g; + $db->set_prop('qos', "$_", $list); + } + + unless (system ("/sbin/e-smith/signal-event qos-update") == 0 ){ + $fm->error('ERROR'); + } + + $fm->success('SUCCESS'); +} + +1; diff --git a/smeserver-qos.spec b/smeserver-qos.spec new file mode 100644 index 0000000..050d1e5 --- /dev/null +++ b/smeserver-qos.spec @@ -0,0 +1,141 @@ +# $Id: smeserver-qos-1.0.spec,v 1.8 2009/03/03 21:36:59 slords Exp $ +# Authority: VIP-ire +# Name: Daniel Berteaud + +%define name smeserver-qos +%define version 1.2 +%define release 0.beta5 + +Summary: Install management web console for QoS +Name: %{name} +Version: %{version} +Release: %{release}%{?dist} +License: GNU GPL version 2 +URL: http://contribs.org +Group: SMEserver/addon +Source: %{name}-%{version}.tar.gz +Patch0: smeserver-qos-1.2-fix_throttle_access.patch +Patch1: smeserver-qos-1.2-stop_prio_ack.patch +Patch2: smeserver-qos-1.2-only_mark_out_on_extdev.patch +Patch3: smeserver-qos-1.2-remove_bogus_burst_param.patch +Patch4: smeserver-qos-1.2-bigger_burst_on_ingress.patch +Patch5: smeserver-qos-1.2-locale_fr_fix.patch + +BuildRoot: %{_tmppath}/%{name}-buildroot +BuildArchitectures: noarch +BuildRequires: e-smith-devtools >= 1.13.1-03 +Requires: e-smith-base +Conflicts: smeserver-htbwshaper + +%description +SME Server admin interface for QoS + +%changelog +* Fri Oct 07 2011 Daniel B. - 1.2-1.sme +- Add squid delay pools +- Translate in french +- Stop giving TCP ACK such a high priority (SYN and SYNACK are not affected) +- Only mark packets going out on EXTDEV + +* Tue Apr 19 2011 Daniel B. - 1.1-10.sme +- Add rules for SMTP submission port (587) + +* Mon Oct 25 2010 Daniel B. - 1.1-9.sme +- Add another class (very low priority) + +* Mon Oct 25 2010 Daniel B. - 1.1-8.sme +- Use DSCP field instead of TOS + +* Fri Oct 22 2010 Daniel B. - 1.1-7.sme +- Just return LAN trafic + +* Wed Oct 20 2010 Daniel B. - 1.1-6.sme +- Classification based on TOS field +- Support for OpenVPN trafic shaping + +* Mon May 03 2010 Daniel B. - 1.1-5.sme +- % of each class can be specidied in the DB +- r2q can be changed in the db + +* Thu Apr 29 2010 Daniel B. - 1.1-4.sme +- packets with tos set as minimize-cost sent in lowest priority + class +- syn-acks go in class 2 +- Zabbix communications go in class 2 + +* Tue Apr 27 2010 Daniel B. - 1.1-3.sme +- Add burst to the root class +- remove .orig file +- changes in % reserved for each class (50, 25, 15, 10) +- give TCP SYN the same prio than TCP ACKs +- revert class 2 to sfq +- reduce r2q for low bandwidth links, and remove useless default + +* Tue Apr 27 2010 Daniel B. - 1.1-2.sme +- Detects TCP Acks just before the catch all rule + +* Mon Apr 26 2010 Daniel B. - 1.1-1.sme +- Fixe high priority class handle +- Use pfifo instead of sfq for high priority traffic (often UDP) +- Better TCP ACK detection +- Adjust r2q for low bandwidth connexions +- remove useless OUTPUT rules (catched in POSTROUTING) +- changes in % reserved for each class +- allow 5k burst for the highest priority classes (10 and 11) + +* Thu Oct 01 2009 Daniel B. - 1.0-4.sme +- Various cleanups +- Add high priority hosts +- translate panel name + +* Mon May 04 2009 Daniel B. - 1.0-3.sme +- Add TC rules for OUTPUT so outgoing traffic from the server itself + is also shaped + +* Mon Apr 14 2009 Daniel B. - 1.0-2 +- Adjust qos on ip-up event +- Print action (stop/start/restart) in init script + +* Mon Mar 16 2009 Daniel B. - 1.0-1 +- Change default status to disabled +- Class 1 gets 70%, class 2 15%, class 3 10% and class 4 5% (reserved) +- Add missing -j RETURN after the catchall rule + +* Wed Mar 13 2009 Daniel B. - 1.0-0 +- Initial release based on smeserver-htbwshaper, but with a lot of + changes and enhancement + + +%prep +%setup +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 + +%{__rm} -f root/etc/e-smith/templates/etc/rc.d/init.d/qos/30Functions25DefineClasses.orig + +%build +perl createlinks + +%install +rm -rf $RPM_BUILD_ROOT +(cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT) +rm -f %{name}-%{version}-filelist +/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \ + > %{name}-%{version}-filelist +echo "%doc COPYING" >> %{name}-%{version}-filelist + +%clean +cd .. +rm -rf %{name}-%{version} + +%files -f %{name}-%{version}-filelist +%defattr(-,root,root) + +%post +%preun +%postun +