Changeset 80

Timestamp:

06/05/06 18:04:20 (7 years ago)

Author:

root

Message:

A tweaked Wondershaper script by Brad Skiff.

Files:

• floppyfw/scripts/wshaper.htb (modified) (5 diffs)

floppyfw/scripts/wshaper.htb

@@ -1 +1 @@
 #!/bin/sh
 #
-# Wonder Shaper
-#
-
-# --
+# Wonder Shaper r12
+#
+
+# --#
 # Some small things changed by Thomas Lundquist <thomasez@zelow.no>
 # to make it work with floppyfw
 # Basically, it's grabbing values from files in /etc and changing the
 # calculations from bash'ism to using expr.
+# r1 Brad Skiff added mods for SunRocket VoIP <bbbrad2dbone@hotmail.com> 
+# r1 Mostly adapted from Kristian Kielhofner's htb script <kris@krisk.org>
+# 060530 r2 dropped r2q 100 part and changed default class to 30 from 20.
+# 060530 r2 added "...Stopped - exit" message.
+# 060530 r3 added dst $SERVER_IP/32 to voip "tos" selection
+# 060531 r4 added r2q calc (r2q = 125*${UPLINK}kbit/mtu)
+# 060531 r5 added fixed rate values and calc'd ceil values to prio 1-4
+# 060531 r6 upped ingress burst from 10K to 20K - boosted download speed
+# 060531 r7 cleanup and tweaking - removed 90% and 80% CUTTED values
+# 060601 r8 added calc'd quantum to classes
+# 060601 r9 added kog script suggestions correctly
+# 060602 r10 calculating more stuff to make it easier to tweak
+# 060602 r11 made for-do loop for stochastic fairness
+# 060605 r12 thomasez: s/SERVER_IP/PHONE_IP/
 # --
-
-cut_to_percentage () {
-        BAR=`expr $2 \* $1`
-        CUTTED=`expr $BAR / 100`
-}
 
 . /etc/config
@@ -20 +29 @@
 . /etc/inside.info
 
+#
+# Rate settings in bits per second for all classes should be <= UPLINK bps
+#
+RT10=90000
+RT20=110000
+RT30=110000
+RT40=50000
+
+#
+# calculated values
+#
+cut_to_percentage () {
+        echo `expr $2 \* $1 / 100`
+}
+
+calc_r2q_val () {
+        echo `expr $2 \* $1 / 1500`
+}
+
+calc_qtc_val () {
+        echo `expr $2 / $1`
+}
+
 # This makes it "Somewhat less" based on the accurate numbers in /etc/config
-cut_to_percentage $DOWNLOAD_SPEED 94
-DOWNLINK=$CUTTED
-
-cut_to_percentage $UPLOAD_SPEED 94
-UPLINK=$CUTTED
+DOWNLINK=`cut_to_percentage $DOWNLOAD_SPEED 94`
+UPLINK=`cut_to_percentage $UPLOAD_SPEED 94`
 
 DEV=$OUTSIDE_DEVICE
 
-echo "Running Wondershaper with downlink $DOWNLINK and uplink $UPLINK on $DEV"
+QTUM=`calc_r2q_val ${UPLINK} 125`
+echo "Wondershaper with downlink $DOWNLINK - uplink $UPLINK - r2q $QTUM - on $DEV"
+
+# VOIP ATA IP - The IP of your Analog Telephone Adapter goes here
+PHONE_IP=
+
+# VOIP SunRocket rtp ports - space separated list
+VOIPPORTS="16384 16385 16386 16387 16388 16389 16390 16391 16392 16393 16394 16395 16396 16397 16398 16399 16400 16401 16402 16403"
+
+# INT SunRocket SIP priority ports - space separated if more than 1
+INTPORTS="5060"
 
 # low priority OUTGOING traffic - you can leave this blank if you want
@@ -51 +90 @@
 fi
 
-
 # clean existing down- and uplink qdiscs, hide errors
 tc qdisc del dev $DEV root    2> /dev/null > /dev/null
@@ -58 +96 @@
 if [ "$1" = "stop" ] 
 then 
+        echo "Wondershaper Stopped - exit"
         exit
 fi
 
-
 ###### uplink
 
-# install root HTB, point default traffic to 1:20:
+# install root HTB, point default traffic to 1:30:
 
 # The "r2q 100" may be wrong but default is 10 and seems to be too little.
-# It should probably be calculated somehow.
-tc qdisc add dev $DEV root handle 1: htb default 20 r2q 100
+# It should probably be calculated somehow. r2q = 125*${UPLINK}/mtu
+
+QTUM=`calc_r2q_val ${UPLINK} 125`
+tc qdisc add dev $DEV root handle 1: htb default 30 r2q $QTUM
 
 # shape everything at $UPLINK speed - this prevents huge queues in your
 # DSL modem which destroy latency:
-
-tc class add dev $DEV parent 1: classid 1:1 htb rate ${UPLINK}kbit burst 6k
-
-# high prio class 1:10:
-
-tc class add dev $DEV parent 1:1 classid 1:10 htb rate ${UPLINK}kbit \
-   burst 6k prio 1
-
-# bulk & default class 1:20 - gets slightly less traffic, 
-# and a lower priority:
-
-# Making it 90% of the uplink.
-cut_to_percentage $UPLINK 90
-tc class add dev $DEV parent 1:1 classid 1:20 htb rate ${CUTTED}kbit \
-   burst 6k prio 2
-
-cut_to_percentage $UPLINK 80
-tc class add dev $DEV parent 1:1 classid 1:30 htb rate ${CUTTED}kbit \
-   burst 6k prio 2
+tc class add dev $DEV parent 1: classid 1:1 htb rate ${UPLINK}kbit ceil ${UPLINK}kbit burst 6k
+
+QTC10=`calc_qtc_val $QTUM $RT10`
+QTC20=`calc_qtc_val $QTUM $RT20`
+QTC30=`calc_qtc_val $QTUM $RT30`
+QTC40=`calc_qtc_val $QTUM $RT40`
+
+# VoIP prio class 1:10:
+tc class add dev $DEV parent 1:1 classid 1:10 htb rate $RT10 ceil ${UPLINK}kbit burst 6k prio 1 quantum $QTC10
+
+# high prio class 1:20 - gets slightly less traffic and a lower priority:
+tc class add dev $DEV parent 1:1 classid 1:20 htb rate $RT20 ceil ${UPLINK}kbit burst 6k prio 2 quantum $QTC20
+
+# The default class, 'non-interactive' ie 'bulk' traffic in 1:30
+tc class add dev $DEV parent 1:1 classid 1:30 htb rate $RT30 ceil ${UPLINK}kbit burst 6k prio 3 quantum $QTC30
+
+# low priority OUTGOING traffic class 1:40
+tc class add dev $DEV parent 1:1 classid 1:40 htb rate $RT40 ceil ${UPLINK} burst 6k prio 4 quantum $QTC40
 
 # all get Stochastic Fairness:
-tc qdisc add dev $DEV parent 1:10 handle 10: sfq perturb 10
-tc qdisc add dev $DEV parent 1:20 handle 20: sfq perturb 10
-tc qdisc add dev $DEV parent 1:30 handle 30: sfq perturb 10
-
-# TOS Minimum Delay (ssh, NOT scp) in 1:10:
-
-tc filter add dev $DEV parent 1:0 protocol ip prio 10 u32 \
-      match ip tos 0x10 0xff  flowid 1:10
-
-# ICMP (ip protocol 1) in the interactive class 1:10 so we 
-# can do measurements & impress our friends:
-tc filter add dev $DEV parent 1:0 protocol ip prio 10 u32 \
-        match ip protocol 1 0xff flowid 1:10
-
-# To speed up downloads while an upload is going on, put ACK packets in
-# the interactive class:
-
-tc filter add dev $DEV parent 1: protocol ip prio 10 u32 \
+for i in 10 20 30 40
+do
+tc qdisc add dev $DEV parent 1:$i handle $i: sfq perturb 10
+done
+
+# Voip TOS in 1:10 # try matching the ATA's IP - seems to work ok!
+tc filter add dev $DEV parent 1:0 protocol ip prio 10 u32 match ip src $PHONE_IP/32 flowid 1:10
+tc filter add dev $DEV parent 1:0 protocol ip prio 10 u32 match ip dst $PHONE_IP/32 flowid 1:10
+
+# Ports as defined above
+for a in $VOIPPORTS
+do
+        tc filter add dev $DEV parent 1:0 protocol ip prio 11 u32 match ip dport $a 0xffff flowid 1:10
+        tc filter add dev $DEV parent 1:0 protocol ip prio 11 u32 match ip sport $a 0xffff flowid 1:10
+done
+
+# TOS Minimum Delay (ssh, NOT scp) in 1:20:
+tc filter add dev $DEV parent 1:0 protocol ip prio 20 u32 match ip tos 0x10 0xff  flowid 1:20
+
+# DNS in interactive class 1:20
+tc filter add dev $DEV parent 1:0 protocol ip prio 21 u32 match ip sport 53 0xffff flowid 1:20
+tc filter add dev $DEV parent 1:0 protocol ip prio 22 u32 match ip dport 53 0xffff flowid 1:20
+
+# only give TCP ACK's higher priority if this connection is asymmetrical
+if [ ! $DOWNLINK = $UPLINK ]
+then
+# give TCP ACK's higher priority in 1:20
+tc filter add dev $DEV parent 1: protocol ip prio 23 u32 \
    match ip protocol 6 0xff \
    match u8 0x05 0x0f at 0 \
    match u16 0x0000 0xffc0 at 2 \
    match u8 0x10 0xff at 33 \
-   flowid 1:10
-
-# rest is 'non-interactive' ie 'bulk' and ends up in 1:20
-
+   flowid 1:20
+fi
+
+#Ports as defined above
+for a in $INTPORTS
+do
+        tc filter add dev $DEV parent 1:0 protocol ip prio 24 u32 match ip dport $a 0xffff flowid 1:20
+        tc filter add dev $DEV parent 1:0 protocol ip prio 24 u32 match ip sport $a 0xffff flowid 1:20
+done
+
+# ICMP (ip protocol 1) in the 'high prio' interactive class 1:20 so we 
+# can do measurements & impress our friends:
+tc filter add dev $DEV parent 1: protocol ip prio 25 u32 match ip protocol 1 0xff flowid 1:20
+
+# The low priority OUTGOING traffic (if used) ends up here in 1:40
 # some traffic however suffers a worse fate
 for a in $NOPRIOPORTDST
 do
-        tc filter add dev $DEV parent 1: protocol ip prio 14 u32 \
-           match ip dport $a 0xffff flowid 1:30
+        tc filter add dev $DEV parent 1: protocol ip prio 40 u32 match ip dport $a 0xffff flowid 1:40
 done
 
 for a in $NOPRIOPORTSRC
 do
-        tc filter add dev $DEV parent 1: protocol ip prio 15 u32 \
-           match ip sport $a 0xffff flowid 1:30
+        tc filter add dev $DEV parent 1: protocol ip prio 40 u32 match ip sport $a 0xffff flowid 1:40
 done
 
 for a in $NOPRIOHOSTSRC
 do
-        tc filter add dev $DEV parent 1: protocol ip prio 16 u32 \
-           match ip src $a flowid 1:30
+        tc filter add dev $DEV parent 1: protocol ip prio 40 u32 match ip src $a flowid 1:40
 done
 
 for a in $NOPRIOHOSTDST
 do
-        tc filter add dev $DEV parent 1: protocol ip prio 17 u32 \
-           match ip dst $a flowid 1:30
-done
-
-# rest is 'non-interactive' ie 'bulk' and ends up in 1:20
-
-tc filter add dev $DEV parent 1: protocol ip prio 18 u32 \
-   match ip dst 0.0.0.0/0 flowid 1:20
-
+        tc filter add dev $DEV parent 1: protocol ip prio 40 u32 match ip dst $a flowid 1:40
+done
+
+# The default class, 'non-interactive' ie 'bulk' traffic end up here in 1:30
+tc filter add dev $DEV parent 1: protocol ip prio 30 u32 match ip dst 0.0.0.0/0 flowid 1:30
 
 ########## downlink #############
@@ -163 +216 @@
 
 tc filter add dev $DEV parent ffff: protocol ip prio 50 u32 match ip src \
-   0.0.0.0/0 police rate ${DOWNLINK}kbit burst 10k drop flowid :1
-
-
+   0.0.0.0/0 police rate ${DOWNLINK}kbit burst 20k drop flowid :1
+
+