Commit Graph

36 Commits

Author SHA1 Message Date
Tony Ambardar 8214106013 sqm-scripts: Fix return value bug in postrm script
The script removes the UCI option ucitrack.@sqm[0] if present and then
returns success. If that UCI option is already absent however, the
script incorrectly returns failure, which blocks upgrade of the
luci-app-sqm package.

Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
2018-03-01 11:57:51 +01:00
Etienne Champetier 4006865ae8 treewide: run "make check FIXUP=1"
fix Makefile chmod (644)
replace MD5SUM with HASH
add PKG_MIRROR_HASH when PKG_SOURCE_PROTO:=git

(PKG_SOURCE_PROTO:=svn tarballs are not reproducible for now)

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
2017-08-29 21:41:14 -07:00
Toke Høiland-Jørgensen 079472eacf sqm-scripts: Bump to v1.1.3 2017-02-03 17:06:09 +01:00
Toke Høiland-Jørgensen e7cfe41c81 sqm-scripts: Bump to v1.1.2, depend on kmod-sched-core
The needed shaper modules are now in kmod-sched-core, so we don't need
to depend on the full kmod-sched anymore.

Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
2017-01-29 17:11:10 +01:00
Toke Høiland-Jørgensen a84d421b18 sqm-scripts: Bump to v1.1.1, depend on kmod-sched-cake
The kmod-sched-cake dependency is to avoid

Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
2017-01-22 20:05:15 +01:00
Toke Høiland-Jørgensen 6dee23a0f6 sqm-scripts: Update to v1.1.0 2017-01-03 23:22:54 +01:00
Alberto Bursi e55c088877 sqm-scripts: use https link (#3741)
change download link from git:// to https:// .
Git links are less safe (not encrypted) and, more importantly, they are blocked by company firewalls.
Https links do not have either issue.

Signed-off-by: Alberto Bursi <alberto.bursi@outlook.it>
2017-01-03 11:23:07 +01:00
Toke Høiland-Jørgensen 6a8e4abf9d sqm-scripts: Bump to v1.0.9
Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
2016-11-19 16:49:05 +01:00
Toke Høiland-Jørgensen 6ec116f8be sqm-scripts: Bump to v1.0.8.
Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
2016-10-02 21:44:35 +02:00
Toke Høiland-Jørgensen d93b4ab307 sqm-scripts: Bump to v1.0.7.
Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
2016-02-16 12:32:21 +01:00
Toke Høiland-Jørgensen 91a597eebe sqm-scripts: Bump to v1.0.6.
Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
2015-12-09 15:01:14 +01:00
Toke Høiland-Jørgensen 7069b07a12 sqm-scripts: Drop dependency on 'ip'. 2015-11-19 17:20:07 +01:00
Toke Høiland-Jørgensen 5346fa8dc5 sqm-scripts: Bump to v1.0.5. 2015-11-19 11:44:47 +01:00
Toke Høiland-Jørgensen 8b18ca42f0 sqm-scripts: Bump to v1.0.4. 2015-11-02 18:05:14 +01:00
Toke Høiland-Jørgensen 884534873c sqm-scripts: Bump to v1.0.3.
Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
2015-09-03 15:26:38 +02:00
Toke Høiland-Jørgensen 6ce677caf0 sqm-scripts: Bump to v1.0.2.
Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
2015-08-26 00:18:29 +02:00
Toke Høiland-Jørgensen 423aad97e3 sqm-scripts: Bump to v1.0.1.
Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
2015-08-17 12:24:11 +01:00
Toke Høiland-Jørgensen 4a51d6001e sqm-scripts: Fix dependency on tc.
Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
2015-08-14 00:55:31 +02:00
Toke Høiland-Jørgensen 15547edba9 sqm-scripts: Bump to v1.0.
sqm-scripts and luci-app-sqm now live in the same Makefile and are built
from the upstream git repository, rather than having the files included
here.

Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
2015-08-06 22:14:01 +02:00
Toke Høiland-Jørgensen d29c656c99 sqm-scripts: Default to ECN on for egress.
Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
2015-07-12 22:24:21 +02:00
Sebastian Moeller 517954b7f5 [SQM] Fix simple.qos to allow using cake as ingress shaper
simple.qos had accidentally set up the egress shaper twice, once
with the true egress parameters and a second time using the ingress
parameters, effectively misconfiguring both directions. This bub
only affected situations where 3-tier ingress classification was
used.

Signed-off-by: Sebastian Moeller <moeller0@gmx.de>
2015-07-12 22:24:21 +02:00
Sebastian Moeller 034e4d2475 [SQM] Fix sqm_logger to accept empty strings as input
sqm_logger tried tro wait indefinitely if passed an empty string.
This in turn makes sqm-scripts hang. Quoting the input argument in sqm_logger
seems to fix the problem.

Signed-off-by: Sebastian Moeller <moeller0@gmx.de>
2015-07-12 22:24:21 +02:00
Sebastian Moeller a754eb7a74 [SQM] Fix changes relating to cake lnk layer adjustments
The last batch of changes tried to teach the GUI to pass link layer
options to cake but forgot to actually call the function that parses
the GUI variables and used it as a string insteead. So this fixes that
it also tries to allow the use of the tc_stab link layer adjustment
method with cake so the implementations can be validated against each other
easily. Needs testing...

Signed-off-by: Sebastian Moeller <moeller0@gmx.de>
2015-07-12 22:24:21 +02:00
Sebastian Moeller 2ba6a3f9ab [SQM/luci-app-sqm] Wire up link layer dandling for cake
The cake traffic-shaper qdisc omne stop solution knows how to handle
link layer adjustments for ATM and can account for per packet overhead.
This commit adds cake as link layer adjustment mechanism in the GUI and
passes numerically specified overhead as well as the ATM linklayer
keywords on to cake. This change also passes the "advanced option strings"
from the Queue Discipline tab to cake. But as before no error checking.
This needs testing, as I have no working cake qdisc available so
caveat emptor...

Signed-off-by: Sebastian Moeller <moeller0@gmx.de>
2015-07-12 22:24:21 +02:00
Dave Taht 73db5d2311 sqm-scripts: Support the cake qdisc.
Signed-off-by: Dave Taht <dave.taht@bufferbloat.net>
2015-07-12 22:24:21 +02:00
Toke Høiland-Jørgensen 7d10659c66 sqm-scripts: Only run on hotplug if the init script is enabled.
Fixes #1202.

Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
2015-04-30 14:22:09 +02:00
Sebastian Moeller db2b613afe Remove dependeny on iptables-mod-filter from sqm-scripts
As Hnyman noted in https://github.com/dtaht/ceropackages-3.10/issues/13
we carry a few unnecessary dependecies in sqm-scripts, so remove one of
them (iptables-mod-filter) as we neither use it nor plan to use it.

Signed-off-by: Sebastian Moeller <moeller0@gmx.de>
2015-04-19 14:17:04 +02:00
Sebastian Moeller d5a203f1eb sqm-scripts: clean up interface selection for hotplugging
The initial conversion to restart sqm on interfaces it is configured
for in case of (transient) dis- and reappearance was half finished.
These changes clean up the handling of exlicitly passed interfaces
in run.sh: no second argument defaults to all configured interfaces
the alternative is an individual interface name passed as 2nd
argument to run.sh. The first argument either is start or stop.
No argument at all will behave as if start was passed.
Survives light testing...

Signed-off-by: Sebastian Moeller <moeller0@gmx.de>
2015-03-25 10:35:58 +01:00
Sebastian Moeller 1561003a70 sqm-scripts: change default for qdisc target parameter
Alan Jenkins noted a bug in the smq luci GUI that effectively
erased several configuration paramters if two checkboxes were deselected.
This behaviour seems consistent in luci but certainly has the potential
to confuse users. While confusion can not really be avoided generally
it seems wise to change the default interpretation for empty or non-existent
itarget and etarget variables from the qdisc's default (5ms in the case of
one of the codels) to automatic determination of tghis variable dependent on
the configured bandwidth, as codels target variable should be large enough
to contain at least one full packet. With this change sqm-scripts will
do the right thing by default, but will yet allow the user to specify
over-ridding values (as long as the user does not un-check the
entry-field exposing check boxes). Survives light testing...
This change set also changes the sqm-scripts luci gui to note the user
of the change. For compatibility with existing setups sqm-scripts
will still honor "auto" as an alternative explicit way of requesting
automatic target selection. This might turn into a warning in the future
and might be phased out...

Signed-off-by: Sebastian Moeller <moeller0@gmx.de>
2015-03-25 10:34:18 +01:00
Sebastian Moeller 1b5afe8f46 sqm-scripts: make run.sh ignore spurious incomplete hotplug ifups
During system start up pppoe devices seem to receice ifup events before
the interface actually exists. This commit makes sqm's run.sh script
test whether the sys files for an interface exist before actually trying
to start an SQM instance on an interface. This seems to nicely avoid
starting on an not fully established pppoe interface and avoids a number
of error messages during startup.

In addition, debug logging is disabled.

Signed-off-by: Sebastian Moeller <moeller0@gmx.de>
2015-03-05 16:23:42 +01:00
Sebastian Moeller 5b61cfba07 Teach SQM hotplug tricks
Some interfaces like wan-pppoe go away, when the ppp connection is lost
and get recreated once the link is established again. SQM now
has its own hotplug script to re-enable itself on the interfae just hotplugged.
SQM will not touch other instances of itself running on other interfaces
if called by hotplug.d. The implementation now allows this functionality by
calling run.sh like:
/usr/lib/sqm/run.sh interface YOUR_INTERFACE_NAME_HERE
e.g.: /usr/lib/sqm/run.sh interface ge00-pppoe
If called with a specific interface SQM will only try to disable itself
on that interface to clean up all left over state and the re-enable
itself on just that interface. Hopefully that allows for better service
with instable interfaces like pppoe. The current code passes a simple manual
stop start test of the ge00-pppoe interface from the GUI and does seem
to do the right thing, at least on cerowrt 3.10.50-1...
2015-03-03 17:49:50 +01:00
Hannu Nyman 0f0b241d56 sqm-scripts: Modify installation step to ensure correct file permissions
Use INSTALL_BIN & INSTALL_DATA macros instead of cp
to ensure correct file permissions for the executable files.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2014-11-09 10:23:54 +02:00
Hannu Nyman 8001ca4c94 sqm-scripts: use masks with markings
Apply mask for markings to enable co-existence with multiwan, mwan3 etc.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2014-11-02 11:01:54 +02:00
Hannu Nyman 16d96ec143 sqm-scripts: Fix a minor bug, add copyrights, improve logging
Changes committed to the cerowrt original repo after the initial import here:
 - Better license & copyright statements, as requested
 - Fixed a minor bug in stopping sqm
 - Logging improvements
 - Dead code removed
 - Typos corrected

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2014-10-18 13:25:46 +03:00
Toke Høiland-Jørgensen 26eae4b9be Add PKG_LICENSE tags for luci-app-sqm and sqm-scripts. 2014-10-15 20:15:20 +02:00
Hannu Nyman 5113575fb9 sqm-scripts: Smart Queue Management - experimental QoS
sqm-scripts is a new QoS system from Cerowrt / Bufferbloat.
I have tested it in my own community build.

More info at:
http://www.bufferbloat.net/projects/cerowrt/wiki/Smart_Queue_Management
http://www.bufferbloat.net/projects/cerowrt/wiki/Setting_up_SQM_for_CeroWrt_310

Dave Täht submitted this first via openwrt-devel mailing list in March 2014,
but that was not picked up before the switch to Github:
http://patchwork.openwrt.org/patch/5078/

Original code used as the base:
8ce2936110

I have modified:
- set the default interface to be eth1, like the Openwrt default.
- modified config to hide some of the advanced options by default
- beautified Makefile a bit
- added Toke Høiland-Jørgensen <toke@toke.dk> as the maintainer, as discussed
  in https://github.com/dtaht/ceropackages-3.10/issues/8#issuecomment-59215905

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2014-10-15 18:56:37 +03:00