X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/622ea9fa13bf212e52c04602112ee1117a863af9..119dd315ef79722cf49719738409ab0fc604ff1a:/package/qos-scripts/files/usr/lib/qos/generate.sh

diff --git a/package/qos-scripts/files/usr/lib/qos/generate.sh b/package/qos-scripts/files/usr/lib/qos/generate.sh
index 7715a452f..a531e2898 100755
--- a/package/qos-scripts/files/usr/lib/qos/generate.sh
+++ b/package/qos-scripts/files/usr/lib/qos/generate.sh
@@ -14,6 +14,7 @@ add_insmod() {
 	# only try to parse network config on openwrt
 
 	find_ifname() {(
+		reset_cb
 		include /lib/network
 		scan_interfaces
 		config_get "$1" ifname
@@ -110,6 +111,19 @@ parse_matching_rule() {
 				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"
+			;;
+			*: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
@@ -148,8 +162,8 @@ config_cb() {
 	# Section start
 	case "$1" in
 		interface)
-			config_set "$1" "classgroup" "Default"
-			config_set "$1" "upload" "128"
+			config_set "$2" "classgroup" "Default"
+			config_set "$2" "upload" "128"
 		;;
 		classify|default|reclassify)
 			option_cb() {
@@ -162,18 +176,18 @@ config_cb() {
 	config_get TYPE "$CONFIG_SECTION" TYPE
 	case "$TYPE" in
 		interface)
-			config_get enabled "$CONFIG_SECTION" enabled
-			config_get download "$CONFIG_SECTION" download
+			config_get_bool enabled "$CONFIG_SECTION" enabled 1
+			[ 1 -eq "$enabled" ] || return 0
 			config_get classgroup "$CONFIG_SECTION" classgroup
 			config_set "$CONFIG_SECTION" imqdev "$C"
-			[ -z "$enabled" -o "$(($enabled))" -eq 0 ] || {
-				C=$(($C+1))
-				INTERFACES="$INTERFACES $CONFIG_SECTION"
-				config_set "$classgroup" enabled 1
-			}
+			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}"
+			[ -z "$device" ] && {
+				device="$(find_ifname ${CONFIG_SECTION})"
+				config_set "$CONFIG_SECTION" device "${device:-eth0}"
+			}
 		;;
 		classgroup) append CG "$CONFIG_SECTION";;
 		classify|default|reclassify)
@@ -231,19 +245,22 @@ start_interface() {
 	local iface="$1"
 	local num_imq="$2"
 	config_get device "$iface" device
-	config_get enabled "$iface" enabled
-	[ -z "$device" -o -z "$enabled" ] && exit
+	config_get_bool enabled "$iface" enabled 1
+	[ -z "$device" -o 1 -ne "$enabled" ] && {
+		return 1 
+	}
 	config_get upload "$iface" upload
 	config_get 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 up${halfduplex} ${download:+down}; do
 		case "$dir" in
 			up)
-				upload=$(($upload * 98 / 100 - (32 * 128 / $upload)))
+				[ "$overhead" = 1 ] && upload=$(($upload * 98 / 100 - (15 * 128 / $upload)))
 				dev="$device"
 				rate="$upload"
 				dl_mode=""
@@ -252,7 +269,7 @@ start_interface() {
 			down)
 				add_insmod imq numdevs="$num_imq"
 				config_get imqdev "$iface" imqdev
-				download=$(($download * 98 / 100 - (100 * 1024 / $download)))
+				[ "$overhead" = 1 ] && download=$(($download * 98 / 100 - (80 * 1024 / $download)))
 				dev="imq$imqdev"
 				rate="$download"
 				dl_mode=1
@@ -347,6 +364,7 @@ start_cg() {
 				append down "iptables -t mangle -A POSTROUTING -o $device -j IMQ --todev $imqdev" "$N"
 			}
 			append down "iptables -t mangle -A PREROUTING -i $device -j ${cg}" "$N"
+			append down "iptables -t mangle -A POSTROUTING -o $device -j ${cg}" "$N"
 			append down "iptables -t mangle -A PREROUTING -i $device -j IMQ --todev $imqdev" "$N"
 		}
 	done