[Astlinux-commits] SF.net SVN: astlinux: [1340] trunk

[<kr...@us...>]

Revision: 1340
          http://astlinux.svn.sourceforge.net/astlinux/?rev=1340&view=rev
Author:   krisk84
Date:     2007-10-30 11:50:57 -0700 (Tue, 30 Oct 2007)

Log Message:
-----------
more astshape changes

Modified Paths:
--------------
    trunk/package/iproute2/astshape
    trunk/target/generic/target_skeleton/stat/etc/rc.conf

Modified: trunk/package/iproute2/astshape
===================================================================
--- trunk/package/iproute2/astshape	2007-10-30 16:50:17 UTC (rev 1339)
+++ trunk/package/iproute2/astshape	2007-10-30 18:50:57 UTC (rev 1340)
@@ -49,12 +49,12 @@
 
 # Auto detect QoS on bridges
 # Isn't AstLinux nice? :)
-if [ "$EXTIF" = "br0" -a "$BRIDGE0" ]
-then
-DEVICE="$BRIDGE0"
-else
+#if [ "$EXTIF" = "br0" -a "$BRIDGE0" ]
+#then
+#DEVICE="$BRIDGE0"
+#else
 DEVICE="$EXTIF"
-fi
+#fi
 
 if [ "$SHAPETYPE" ]
 then
@@ -189,7 +189,8 @@
 then
 if [ "$BRIDGE0" ]
 then
-iptables -t mangle -A POSTROUTING -m physdev --physdev-out $DEV -j astshape
+# iptables -t mangle -A POSTROUTING -m physdev --physdev-in eth1 --physdev-out $DEV -j astshape
+iptables -t mangle -A POSTROUTING -m physdev --physdev-is-bridged -j astshape
 else
 iptables -t mangle -A POSTROUTING -o $DEV -j astshape
 fi
@@ -197,9 +198,9 @@
 
 if [ "$TRAFFIC" = "host" -o "$TRAFFIC" = "all" ]
 then
-if [ "$BRIDGE0" ]
-then
-iptables -t mangle -A OUTPUT -m physdev --physdev-out $DEV -j astshape
+if [ "$BRIDGE0" ]      
+then               
+echo -n
 else
 iptables -t mangle -A OUTPUT -o $DEV -j astshape
 fi
@@ -243,8 +244,11 @@
 fi
 
 # PRIO TCP ACKs
+if [ ! "$DOWNLINK" = "$UPLINK" ]
+then
 iptables -t mangle -A astshape -p tcp -m tcp --tcp-flags FIN,SYN,RST,ACK ACK \
 -m length --length :64 -j CLASSIFY --set-class 1:20
+fi
 
 # put large (512+) icmp packets in default category
 #iptables -t mangle -A astshape -p icmp -m length --length 512: -j CLASSIFY --set-class 1:30
@@ -257,19 +261,19 @@
 
 start)
 astshape_iptables
-for i in $DEVICE
-do
-DEV="$i"
+#for i in $DEVICE
+#do
+DEV="$DEVICE"
 astshape_start
-done
+#done
 ;;
 
 stop)
-for i in $DEVICE
-do
-DEV="$i"
+#for i in $DEVICE
+#do
+DEV="$DEVICE"
 astshape_stop
-done
+#done
 ;;
 
 restart)
@@ -282,18 +286,18 @@
 ;;
 
 status)
-if [ "$BRIDGE0" ]
-then
-echo "Running in bridge mode with $BRIDGE0"
-echo
-fi
+#if [ "$BRIDGE0" ]
+#then
+#echo "Running in bridge mode with $BRIDGE0"
+#echo
+#fi
 echo "Showing mangle table:"
 iptables -t mangle -L -v
-for i in $DEVICE
-do
-DEV="$i"
+#for i in $DEVICE
+#do
+DEV="$DEVICE"
 astshape_status
-done
+#done
 ;;
 
 *)

Modified: trunk/target/generic/target_skeleton/stat/etc/rc.conf
===================================================================
--- trunk/target/generic/target_skeleton/stat/etc/rc.conf	2007-10-30 16:50:17 UTC (rev 1339)
+++ trunk/target/generic/target_skeleton/stat/etc/rc.conf	2007-10-30 18:50:57 UTC (rev 1340)
@@ -330,9 +330,21 @@
 #EXTUP=300
 #EXTDOWN=2000
 
-##Traffic from asterisk is moved into the top Q because I set tos=0x18
-##which is automatically given highest priority by astshape. Perfect, huh?
+##VoIP Ports
+##Traffic in this port range will automatically be mapped into the VoIP queue.
+##Only UDP traffic is marked. Standard iptables syntax is allowed.
+#VOIPPORTS="5060 18000:20000"
 
+##Interactive Ports
+##Traffic in this port range will automatically be mapped into the interactive
+##queue. TCP and UDP traffic is marked.
+#INTPORTS="110"
+
+##Shapetype.  This defines the qdisc type.  AstShape currently supports htb
+##(default and well tested) or the new HFSC version (untested). You can
+##select which one you'd like here
+#SHAPETYPE="hfsc"
+
 ##low priority OUTGOING traffic - you can leave this blank if you want
 ##low priority source netmasks
 NOPRIOHOSTSRC=


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.