From 405e21d16731b2764ab82aaaadcf36a813b105f7 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 10 Oct 2012 12:32:29 +0000
Subject: packages: sort network related packages into package/network/
SVN-Revision: 33688
---
package/qos-scripts/files/usr/bin/qos-start | 4 -
package/qos-scripts/files/usr/bin/qos-stat | 67 ---
package/qos-scripts/files/usr/bin/qos-stop | 6 -
package/qos-scripts/files/usr/lib/qos/generate.sh | 497 ----------------------
package/qos-scripts/files/usr/lib/qos/tcrules.awk | 95 -----
5 files changed, 669 deletions(-)
delete mode 100755 package/qos-scripts/files/usr/bin/qos-start
delete mode 100755 package/qos-scripts/files/usr/bin/qos-stat
delete mode 100755 package/qos-scripts/files/usr/bin/qos-stop
delete mode 100755 package/qos-scripts/files/usr/lib/qos/generate.sh
delete mode 100644 package/qos-scripts/files/usr/lib/qos/tcrules.awk
(limited to 'package/qos-scripts/files/usr')
diff --git a/package/qos-scripts/files/usr/bin/qos-start b/package/qos-scripts/files/usr/bin/qos-start
deleted file mode 100755
index 261ffb4..0000000
--- a/package/qos-scripts/files/usr/bin/qos-start
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-qos-stop
-/usr/lib/qos/generate.sh all | sh
-
diff --git a/package/qos-scripts/files/usr/bin/qos-stat b/package/qos-scripts/files/usr/bin/qos-stat
deleted file mode 100755
index 78d1638..0000000
--- a/package/qos-scripts/files/usr/bin/qos-stat
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2011 OpenWrt.org
-
-. /lib/functions.sh
-
-include /lib/network
-
-get_ifname() {
- local interface="$1"
- local cfgt
-
- scan_interfaces
- config_get cfgt "$interface" TYPE
- [ "$cfgt" == "interface" ] && config_get "$interface" ifname
-}
-
-config_cb() {
- config_get TYPE "$CONFIG_SECTION" TYPE
- [ "interface" == "$TYPE" ] && {
- config_get device "$CONFIG_SECTION" ifname
- [ -z "$device" ] && device="$(get_ifname ${CONFIG_SECTION})"
- config_set "$CONFIG_SECTION" device "$device"
- }
-}
-
-config_load qos
-
-print_comments() {
- echo ''
- echo '# Interface: '"$1"
- echo '# Direction: '"$2"
- echo '# Stats: '"$3"
- echo ''
-}
-
-get_device() {
- ( config_load network; scan_interfaces; config_get "$1" ifname )
-}
-
-interface_stats() {
- local interface="$1"
- local device
-
- device="$(get_device "$interface")"
- [ -z "$device" ] && config_get device "$interface" device
- config_get_bool enabled "$interface" enabled 1
- [ -z "$device" -o 1 -ne "$enabled" ] && {
- return 1
- }
- config_get_bool halfduplex "$interface" halfduplex 0
-
- if [ 1 -ne "$halfduplex" ]; then
- unset halfduplex
- print_comments "$interface" "Egress" "Start"
- tc -s class show dev "$device"
- print_comments "$interface" "Egress" "End"
- id="root"
- else
- id=""
- fi
-
- print_comments "$interface" "Ingress${halfduplex:+/Egress}" "Start"
- tc -s class show dev "$(tc filter show dev $device $id | grep mirred | sed -e 's,.*\(ifb.*\)).*,\1,')"
- print_comments "$interface" "Ingress${halfduplex:+/Egress}" "End"
-}
-
-[ -z "$1" ] && config_foreach interface_stats interface || interface_stats "$1"
diff --git a/package/qos-scripts/files/usr/bin/qos-stop b/package/qos-scripts/files/usr/bin/qos-stop
deleted file mode 100755
index 7f654d8..0000000
--- a/package/qos-scripts/files/usr/bin/qos-stop
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-for iface in $(tc qdisc show | grep -E '(hfsc|ingress)' | awk '{print $5}'); do
- tc qdisc del dev "$iface" ingress 2>&- >&-
- tc qdisc del dev "$iface" root 2>&- >&-
-done
-/usr/lib/qos/generate.sh firewall stop | sh
diff --git a/package/qos-scripts/files/usr/lib/qos/generate.sh b/package/qos-scripts/files/usr/lib/qos/generate.sh
deleted file mode 100755
index 440b43f..0000000
--- a/package/qos-scripts/files/usr/lib/qos/generate.sh
+++ /dev/null
@@ -1,497 +0,0 @@
-#!/bin/sh
-[ -e /lib/functions.sh ] && . /lib/functions.sh || . ./functions.sh
-[ -x /sbin/modprobe ] && {
- insmod="modprobe"
- rmmod="$insmod -r"
-} || {
- insmod="insmod"
- rmmod="rmmod"
-}
-
-add_insmod() {
- eval "export isset=\${insmod_$1}"
- case "$isset" in
- 1) ;;
- *) {
- [ "$2" ] && append INSMOD "$rmmod $1 >&- 2>&-" "$N"
- append INSMOD "$insmod $* >&- 2>&-" "$N"; export insmod_$1=1
- };;
- esac
-}
-
-[ -e /etc/config/network ] && {
- # only try to parse network config on openwrt
-
- find_ifname() {(
- reset_cb
- include /lib/network
- scan_interfaces
- config_get "$1" ifname
- )}
-} || {
- find_ifname() {
- echo "Interface not found."
- exit 1
- }
-}
-
-parse_matching_rule() {
- local var="$1"
- local section="$2"
- local options="$3"
- local prefix="$4"
- local suffix="$5"
- local proto="$6"
- local mport=""
- local ports=""
-
- append "$var" "$prefix" "$N"
- for option in $options; do
- case "$option" in
- proto) config_get value "$section" proto; proto="${proto:-$value}";;
- esac
- done
- config_get type "$section" TYPE
- case "$type" in
- classify) unset pkt; append "$var" "-m mark --mark 0/0xff";;
- default) pkt=1; append "$var" "-m mark --mark 0/0xff";;
- reclassify) pkt=1;;
- esac
- append "$var" "${proto:+-p $proto}"
- for option in $options; do
- config_get value "$section" "$option"
-
- case "$pkt:$option" in
- *:srchost)
- append "$var" "-s $value"
- ;;
- *:dsthost)
- append "$var" "-d $value"
- ;;
- *:layer7)
- add_insmod ipt_layer7
- add_insmod xt_layer7
- append "$var" "-m layer7 --l7proto $value${pkt:+ --l7pkt}"
- ;;
- *:ports|*:srcports|*:dstports)
- value="$(echo "$value" | sed -e 's,-,:,g')"
- lproto=${lproto:-tcp}
- case "$proto" in
- ""|tcp|udp) append "$var" "-m ${proto:-tcp -p tcp} -m multiport";;
- *) unset "$var"; return 0;;
- esac
- case "$option" in
- ports)
- config_set "$section" srcports ""
- config_set "$section" dstports ""
- config_set "$section" portrange ""
- append "$var" "--ports $value"
- ;;
- srcports)
- config_set "$section" ports ""
- config_set "$section" dstports ""
- config_set "$section" portrange ""
- append "$var" "--sports $value"
- ;;
- dstports)
- config_set "$section" ports ""
- config_set "$section" srcports ""
- config_set "$section" portrange ""
- append "$var" "--dports $value"
- ;;
- esac
- ports=1
- ;;
- *:portrange)
- config_set "$section" ports ""
- config_set "$section" srcports ""
- config_set "$section" dstports ""
- value="$(echo "$value" | sed -e 's,-,:,g')"
- case "$proto" in
- ""|tcp|udp) append "$var" "-m ${proto:-tcp -p tcp} --sport $value --dport $value";;
- *) unset "$var"; return 0;;
- esac
- ports=1
- ;;
- *:connbytes)
- value="$(echo "$value" | sed -e 's,-,:,g')"
- add_insmod ipt_connbytes
- append "$var" "-m connbytes --connbytes $value --connbytes-dir both --connbytes-mode bytes"
- ;;
- *:tos)
- add_insmod ipt_tos
- case "$value" in
- !*) append "$var" "-m tos ! --tos $value";;
- *) append "$var" "-m tos --tos $value"
- esac
- ;;
- *:dscp)
- add_insmod ipt_dscp
- dscp_option="--dscp"
- [ -z "${value%%[EBCA]*}" ] && dscp_option="--dscp-class"
- case "$value" in
- !*) append "$var" "-m dscp ! $dscp_option $value";;
- *) append "$var" "-m dscp $dscp_option $value"
- esac
- ;;
- *:direction)
- value="$(echo "$value" | sed -e 's,-,:,g')"
- if [ "$value" = "out" ]; then
- append "$var" "-o $device"
- elif [ "$value" = "in" ]; then
- append "$var" "-i $device"
- fi
- ;;
- 1:pktsize)
- value="$(echo "$value" | sed -e 's,-,:,g')"
- add_insmod ipt_length
- append "$var" "-m length --length $value"
- ;;
- 1:limit)
- add_insmod ipt_limit
- append "$var" "-m limit --limit $value"
- ;;
- 1:tcpflags)
- case "$proto" in
- tcp) append "$var" "-m tcp --tcp-flags ALL $value";;
- *) unset $var; return 0;;
- esac
- ;;
- 1:mark)
- config_get class "${value##!}" classnr
- [ -z "$class" ] && continue;
- case "$value" in
- !*) append "$var" "-m mark ! --mark $class/0xff";;
- *) append "$var" "-m mark --mark $class/0xff";;
- esac
- ;;
- 1:TOS)
- add_insmod ipt_TOS
- config_get TOS "$rule" 'TOS'
- suffix="-j TOS --set-tos "${TOS:-"Normal-Service"}
- ;;
- 1:DSCP)
- add_insmod ipt_DSCP
- config_get DSCP "$rule" 'DSCP'
- [ -z "${DSCP%%[EBCA]*}" ] && set_value="--set-dscp-class $DSCP" \
- || set_value="--set-dscp $DSCP"
- suffix="-j DSCP $set_value"
- ;;
- esac
- done
- append "$var" "$suffix"
- case "$ports:$proto" in
- 1:) parse_matching_rule "$var" "$section" "$options" "$prefix" "$suffix" "udp";;
- esac
-}
-
-config_cb() {
- option_cb() {
- return 0
- }
-
- # Section start
- case "$1" in
- interface)
- config_set "$2" "classgroup" "Default"
- config_set "$2" "upload" "128"
- ;;
- classify|default|reclassify)
- option_cb() {
- append options "$1"
- }
- ;;
- esac
-
- # Section end
- config_get TYPE "$CONFIG_SECTION" TYPE
- case "$TYPE" in
- interface)
- config_get_bool enabled "$CONFIG_SECTION" enabled 1
- [ 1 -eq "$enabled" ] || return 0
- config_get classgroup "$CONFIG_SECTION" classgroup
- config_set "$CONFIG_SECTION" ifbdev "$C"
- C=$(($C+1))
- append INTERFACES "$CONFIG_SECTION"
- config_set "$classgroup" enabled 1
- config_get device "$CONFIG_SECTION" device
- [ -z "$device" ] && {
- device="$(find_ifname ${CONFIG_SECTION})"
- config_set "$CONFIG_SECTION" device "${device:-eth0}"
- }
- ;;
- classgroup) append CG "$CONFIG_SECTION";;
- classify|default|reclassify)
- case "$TYPE" in
- classify) var="ctrules";;
- *) var="rules";;
- esac
- config_get target "$CONFIG_SECTION" target
- config_set "$CONFIG_SECTION" options "$options"
- append "$var" "$CONFIG_SECTION"
- unset options
- ;;
- esac
-}
-
-
-enum_classes() {
- local c="0"
- config_get classes "$1" classes
- config_get default "$1" default
- for class in $classes; do
- c="$(($c + 1))"
- config_set "${class}" classnr $c
- case "$class" in
- $default) class_default=$c;;
- esac
- done
- class_default="${class_default:-$c}"
-}
-
-cls_var() {
- local varname="$1"
- local class="$2"
- local name="$3"
- local type="$4"
- local default="$5"
- local tmp tmp1 tmp2
- config_get tmp1 "$class" "$name"
- config_get tmp2 "${class}_${type}" "$name"
- tmp="${tmp2:-$tmp1}"
- tmp="${tmp:-$tmp2}"
- export ${varname}="${tmp:-$default}"
-}
-
-tcrules() {
- dir=/usr/lib/qos
- [ -e $dir/tcrules.awk ] || dir=.
- echo "$cstr" | awk \
- -v device="$dev" \
- -v linespeed="$rate" \
- -f $dir/tcrules.awk
-}
-
-start_interface() {
- local iface="$1"
- local num_ifb="$2"
- config_get device "$iface" device
- config_get_bool enabled "$iface" enabled 1
- [ -z "$device" -o 1 -ne "$enabled" ] && {
- return 1
- }
- config_get upload "$iface" upload
- config_get_bool halfduplex "$iface" halfduplex
- config_get download "$iface" download
- config_get classgroup "$iface" classgroup
- config_get_bool overhead "$iface" overhead 0
-
- download="${download:-${halfduplex:+$upload}}"
- enum_classes "$classgroup"
- for dir in ${halfduplex:-up} ${download:+down}; do
- case "$dir" in
- up)
- [ "$overhead" = 1 ] && upload=$(($upload * 98 / 100 - (15 * 128 / $upload)))
- dev="$device"
- rate="$upload"
- dl_mode=""
- prefix="cls"
- ;;
- down)
- [ "$(ls -d /proc/sys/net/ipv4/conf/ifb* 2>&- | wc -l)" -ne "$num_ifb" ] && add_insmod ifb numifbs="$num_ifb"
- config_get ifbdev "$iface" ifbdev
- [ "$overhead" = 1 ] && download=$(($download * 98 / 100 - (80 * 1024 / $download)))
- dev="ifb$ifbdev"
- rate="$download"
- dl_mode=1
- prefix="d_cls"
- ;;
- *) continue;;
- esac
- cstr=
- for class in $classes; do
- cls_var pktsize "$class" packetsize $dir 1500
- cls_var pktdelay "$class" packetdelay $dir 0
- cls_var maxrate "$class" limitrate $dir 100
- cls_var prio "$class" priority $dir 1
- cls_var avgrate "$class" avgrate $dir 0
- cls_var qdisc "$class" qdisc $dir ""
- cls_var filter "$class" filter $dir ""
- config_get classnr "$class" classnr
- append cstr "$classnr:$prio:$avgrate:$pktsize:$pktdelay:$maxrate:$qdisc:$filter" "$N"
- done
- append ${prefix}q "$(tcrules)" "$N"
- export dev_${dir}="ifconfig $dev up txqueuelen 5 >&- 2>&-
-tc qdisc del dev $dev root >&- 2>&-
-tc qdisc add dev $dev root handle 1: hfsc default ${class_default}0
-tc class add dev $dev parent 1: classid 1:1 hfsc sc rate ${rate}kbit ul rate ${rate}kbit"
- done
- [ -n "$download" ] && {
- add_insmod cls_u32
- add_insmod em_u32
- add_insmod act_connmark
- add_insmod act_mirred
- add_insmod sch_ingress
- }
- if [ -n "$halfduplex" ]; then
- export dev_up="tc qdisc del dev $device root >&- 2>&-
-tc qdisc add dev $device root handle 1: hfsc
-tc filter add dev $device parent 1: protocol ip prio 10 u32 match u32 0 0 flowid 1:1 action mirred egress redirect dev ifb$ifbdev"
- elif [ -n "$download" ]; then
- append dev_${dir} "tc qdisc del dev $device ingress >&- 2>&-
-tc qdisc add dev $device ingress
-tc filter add dev $device parent ffff: protocol ip prio 1 u32 match u32 0 0 flowid 1:1 action connmark action mirred egress redirect dev ifb$ifbdev" "$N"
- fi
- add_insmod cls_fw
- add_insmod sch_hfsc
- add_insmod sch_fq_codel
-
- cat <<EOF
-${INSMOD:+$INSMOD$N}${dev_up:+$dev_up
-$clsq
-}${ifbdev:+$dev_down
-$d_clsq
-$d_clsl
-$d_clsf
-}
-EOF
- unset INSMOD clsq clsf clsl d_clsq d_clsl d_clsf dev_up dev_down
-}
-
-start_interfaces() {
- local C="$1"
- for iface in $INTERFACES; do
- start_interface "$iface" "$C"
- done
-}
-
-add_rules() {
- local var="$1"
- local rules="$2"
- local prefix="$3"
-
- for rule in $rules; do
- unset iptrule
- config_get target "$rule" target
- config_get target "$target" classnr
- config_get options "$rule" options
-
- ## If we want to override the TOS field, let's clear the DSCP field first.
- [ ! -z "$(echo $options | grep 'TOS')" ] && {
- s_options=${options%%TOS}
- add_insmod ipt_DSCP
- parse_matching_rule iptrule "$rule" "$s_options" "$prefix" "-j DSCP --set-dscp 0"
- append "$var" "$iptrule" "$N"
- unset iptrule
- }
-
- parse_matching_rule iptrule "$rule" "$options" "$prefix" "-j MARK --set-mark $target/0xff"
- append "$var" "$iptrule" "$N"
- done
-}
-
-start_cg() {
- local cg="$1"
- local iptrules
- local pktrules
- local sizerules
- enum_classes "$cg"
- add_rules iptrules "$ctrules" "iptables -t mangle -A qos_${cg}_ct"
- config_get classes "$cg" classes
- for class in $classes; do
- config_get mark "$class" classnr
- config_get maxsize "$class" maxsize
- [ -z "$maxsize" -o -z "$mark" ] || {
- add_insmod ipt_length
- append pktrules "iptables -t mangle -A qos_${cg} -m mark --mark $mark/0xff -m length --length $maxsize: -j MARK --set-mark 0/0xff" "$N"
- }
- done
- add_rules pktrules "$rules" "iptables -t mangle -A qos_${cg}"
- for iface in $INTERFACES; do
- config_get classgroup "$iface" classgroup
- config_get device "$iface" device
- config_get ifbdev "$iface" ifbdev
- config_get upload "$iface" upload
- config_get download "$iface" download
- config_get halfduplex "$iface" halfduplex
- download="${download:-${halfduplex:+$upload}}"
- append up "iptables -t mangle -A OUTPUT -o $device -j qos_${cg}" "$N"
- append up "iptables -t mangle -A FORWARD -o $device -j qos_${cg}" "$N"
- done
- cat <<EOF
-$INSMOD
-iptables -t mangle -N qos_${cg} >&- 2>&-
-iptables -t mangle -N qos_${cg}_ct >&- 2>&-
-${iptrules:+${iptrules}${N}iptables -t mangle -A qos_${cg}_ct -j CONNMARK --save-mark --mask 0xff}
-iptables -t mangle -A qos_${cg} -j CONNMARK --restore-mark --mask 0xff
-iptables -t mangle -A qos_${cg} -m mark --mark 0/0xff -j qos_${cg}_ct
-$pktrules
-$up$N${down:+${down}$N}
-EOF
- unset INSMOD
-}
-
-start_firewall() {
- add_insmod ipt_multiport
- add_insmod ipt_CONNMARK
- stop_firewall
- for group in $CG; do
- start_cg $group
- done
-}
-
-stop_firewall() {
- # Builds up a list of iptables commands to flush the qos_* chains,
- # remove rules referring to them, then delete them
-
- # Print rules in the mangle table, like iptables-save
- iptables -t mangle -S |
- # Find rules for the qos_* chains
- grep '^-N qos_\|-j qos_' |
- # Exclude rules in qos_* chains (inter-qos_* refs)
- grep -v '^-A qos_' |
- # Replace -N with -X and hold, with -F and print
- # Replace -A with -D
- # Print held lines at the end (note leading newline)
- sed -e '/^-N/{s/^-N/-X/;H;s/^-X/-F/}' \
- -e 's/^-A/-D/' \
- -e '${p;g}' |
- # Make into proper iptables calls
- # Note: awkward in previous call due to hold space usage
- sed -n -e 's/^./iptables -t mangle &/p'
-}
-
-C="0"
-INTERFACES=""
-[ -e ./qos.conf ] && {
- . ./qos.conf
- config_cb
-} || config_load qos
-
-C="0"
-for iface in $INTERFACES; do
- export C="$(($C + 1))"
-done
-
-case "$1" in
- all)
- start_interfaces "$C"
- start_firewall
- ;;
- interface)
- start_interface "$2" "$C"
- ;;
- interfaces)
- start_interfaces
- ;;
- firewall)
- case "$2" in
- stop)
- stop_firewall
- ;;
- start|"")
- start_firewall
- ;;
- esac
- ;;
-esac
diff --git a/package/qos-scripts/files/usr/lib/qos/tcrules.awk b/package/qos-scripts/files/usr/lib/qos/tcrules.awk
deleted file mode 100644
index a19b651..0000000
--- a/package/qos-scripts/files/usr/lib/qos/tcrules.awk
+++ /dev/null
@@ -1,95 +0,0 @@
-BEGIN {
- dmax=100
- if (!(linespeed > 0)) linespeed = 128
- FS=":"
- n = 0
-}
-
-($1 != "") {
- n++
- class[n] = $1
- prio[n] = $2
- avgrate[n] = ($3 * linespeed / 100)
- pktsize[n] = $4
- delay[n] = $5
- maxrate[n] = ($6 * linespeed / 100)
- qdisc[n] = $7
- filter[n] = $8
-}
-
-END {
- allocated = 0
- maxdelay = 0
-
- for (i = 1; i <= n; i++) {
- # set defaults
- if (!(pktsize[i] > 0)) pktsize[i] = 1500
- if (!(prio[i] > 0)) prio[i] = 1
-
- allocated += avgrate[i]
- sum_prio += prio[i]
- if ((avgrate[i] > 0) && !(delay[i] > 0)) {
- sum_rtprio += prio[i]
- }
- }
-
- # allocation of m1 in rt classes:
- # sum(d * m1) must not exceed dmax * (linespeed - allocated)
- dmax = 0
- for (i = 1; i <= n; i++) {
- if (avgrate[i] > 0) {
- rtm2[i] = avgrate[i]
- if (delay[i] > 0) {
- d[i] = delay[i]
- } else {
- d[i] = 2 * pktsize[i] * 1000 / (linespeed * 1024)
- if (d[i] > dmax) dmax = d[i]
- }
- }
- }
-
- ds_avail = dmax * (linespeed - allocated)
- for (i = 1; i <= n; i++) {
- lsm1[i] = 0
- rtm1[i] = 0
- lsm2[i] = linespeed * prio[i] / sum_prio
- if ((avgrate[i] > 0) && (d[i] > 0)) {
- if (!(delay[i] > 0)) {
- ds = ds_avail * prio[i] / sum_rtprio
- ds_avail -= ds
- rtm1[i] = rtm2[i] + ds/d[i]
- }
- lsm1[i] = rtm1[i]
- }
- else {
- d[i] = 0
- }
- }
-
- # main qdisc
- for (i = 1; i <= n; i++) {
- printf "tc class add dev "device" parent 1:1 classid 1:"class[i]"0 hfsc"
- if (rtm1[i] > 0) {
- printf " rt m1 " int(rtm1[i]) "kbit d " int(d[i] * 1000) "us m2 " int(rtm2[i])"kbit"
- }
- printf " ls m1 " int(lsm1[i]) "kbit d " int(d[i] * 1000) "us m2 " int(lsm2[i]) "kbit"
- print " ul rate " int(maxrate[i]) "kbit"
- }
-
- # leaf qdisc
- avpkt = 1200
- for (i = 1; i <= n; i++) {
- print "tc qdisc add dev "device" parent 1:"class[i]"0 handle "class[i]"00: fq_codel"
- }
-
- # filter rule
- for (i = 1; i <= n; i++) {
- print "tc filter add dev "device" parent 1: prio "class[i]" protocol ip handle "class[i]"/0xff fw flowid 1:"class[i] "0"
- filterc=1
- if (filter[i] != "") {
- print " tc filter add dev "device" parent "class[i]"00: handle "filterc"0 "filter[i]
- filterc=filterc+1
- }
- }
-}
-
--
cgit v1.1