Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

wshaper: minor fixes

Browse source 
Adjust package version and release to reflect upstream compatibility,
replace deprecated uci_get_state with network_get_device.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
This commit is contained in:
Jo-Philipp Wich 2014-06-11 16:37:03 +02:00
parent 1fa58a1b1a
commit 6b2f1d0047
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
net/wshaper/Makefile
View file

@ -1,5 +1,5 @@
# #
# Copyright (C) 2007-2011 OpenWrt.org # Copyright (C) 2007-2014 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -8,8 +8,8 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=wshaper PKG_NAME:=wshaper
PKG_VERSION:=0.2 PKG_VERSION:=1.1a
PKG_RELEASE:=2 PKG_RELEASE:=1
PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org> PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>

9
net/wshaper/files/wshaper.htb
View file

@ -8,13 +8,18 @@
# All config needs to be done in /etc/config/wshaper # All config needs to be done in /etc/config/wshaper
. /lib/functions.sh . /lib/functions.sh
. /lib/functions/network.sh
config_load wshaper config_load wshaper
for s in downlink uplink network nopriohostdst nopriohostsrc noprioportdst noprioportsrc; do for s in downlink uplink network nopriohostdst nopriohostsrc noprioportdst noprioportsrc; do
config_get $s settings $s config_get $s settings $s
done done
device=$(uci_get_state network "$network" ifname "$network") if ! network_get_device device "$network"; then
[ -z "$device" ] && logger -t wondershaper "Error: Could not find the device for network $network, aborting." && exit 1 logger -t wondershaper "Error: Could not find the device for network $network, aborting."
exit 1
fi
[ -z "$downlink" ] && logger -t wondershaper "Error: Downlink speed not set, aborting." && exit 1 [ -z "$downlink" ] && logger -t wondershaper "Error: Downlink speed not set, aborting." && exit 1
[ -z "$uplink" ] && logger -t wondershaper "Error: Uplink speed not set, aborting." && exit 1 [ -z "$uplink" ] && logger -t wondershaper "Error: Uplink speed not set, aborting." && exit 1