Update of /cvsroot/leaf/src/bering-uclibc4/source/ppp-hsh
In directory
sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv24692/source/ppp-hsh
Modified Files:
buildtool.cfg ppp-down ppp-hsh.conf ppp-mod ppp-up
Log Message:
Updated hash shaper script for ppp to support shaping traffic from 2 uplink
interfaces (incoming - based on marks, outgoing - by interfaces)
Index: ppp-up
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/ppp-hsh/ppp-up,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ppp-up 7 Jul 2010 20:15:37 -0000 1.2
--- ppp-up 6 Dec 2010 22:36:07 -0000 1.3
***************
*** 31,54 ****
FILTERS=`$AWK '/Filter-Id/ {print $2}' /var/run/radattr.$OUTPUT`
- if [ "$($IPT -L|grep "Chain PPP")" = "" ];
- then
- $IPT -N PPP 2>/dev/null || $IPTM -F PPP
- $IPT -N LAN 2>/dev/null || $IPTM -F LAN
- $IPT -D FORWARD -i ppp+ -j PPP 2>/dev/null
- $IPT -A FORWARD -i ppp+ -j PPP
- $IPT -A LAN -d 10.251.0.0/22 -j ACCEPT
- $IPT -A LAN -d 192.168.7.10/32 -j ACCEPT
- $IPT -A LAN -s 10.250.0.0/16 -j ACCEPT
- $IPT -A LAN -d 10.255.0.2/32 -j ACCEPT
- $IPT -A LAN -d 10.255.0.12/32 -j ACCEPT
- $IPT -A LAN -d 10.255.0.13/32 -j ACCEPT
- $IPT -A LAN -d 10.255.0.14/32 -j ACCEPT
- $IPT -A LAN -d 10.255.0.15/32 -j ACCEPT
- $IPT -A LAN -j REJECT
- $IPT -A PPP -d 192.168.0.0/16 -j LAN
- $IPT -A PPP -d 10.0.0.0/8 -j LAN
- fi
-
-
if [ w${debug} = w1 ] ; then
echo "Debug mode" >>/tmp/pptpd
--- 31,34 ----
***************
*** 60,63 ****
--- 40,52 ----
/sbin/tc qdisc del dev $OUTPUT root > /dev/null
+ #### Filters
+ if [ w$FILTERS != w ] ;
+ then
+ FILTARR=`echo $FILTERS|sed 's/,/\n/g'`
+ IXSPEED=`echo "$FILTARR"|awk '/IXSPEED/ {split($1, a, ":"); print a[2]}'`
+ NEGDEP=`echo "$FILTARR"|awk '/NEGDEP/ {split($1, a, ":"); print a[2]}'`
+ fi
+
+
##### speed server->client
if [ "$UPSPEED" != "0" ] ;
***************
*** 77,82 ****
$TCQR dev $OUTPUT parent 1:10 handle 10: sfq perturb 10 quantum 1514
$TCQR dev $OUTPUT parent 1:20 handle 20: sfq perturb 10 quantum 1514
! $TCFR dev $OUTPUT parent 1:0 protocol ip prio 10 u32 match ip tos 0x10
0xff flowid 1:10
! $TCFR dev $OUTPUT parent 1:0 protocol ip prio 10 u32 match ip protocol 1
0xff flowid 1:10
##### speed client->server
--- 66,75 ----
$TCQR dev $OUTPUT parent 1:10 handle 10: sfq perturb 10 quantum 1514
$TCQR dev $OUTPUT parent 1:20 handle 20: sfq perturb 10 quantum 1514
! $TCFR dev $OUTPUT parent 1:0 protocol ip prio 1 handle 1 fw flowid 1:10
! if [ -n "$IXSPEED" ]; then
! $TCCR dev $OUTPUT parent 1: classid 1:2 htb rate ${IXSPEED}kbit $UBURST
prio 2 quantum 1514
! $TCQR dev $OUTPUT parent 1:2 handle 2: sfq perturb 10 quantum 1514
! $TCFR dev $OUTPUT parent 1:0 protocol ip prio 0 handle 2 fw flowid 1:2
! fi
##### speed client->server
***************
*** 88,102 ****
fi
else
! DOWNSPEED = 1024000
fi
$TCQR dev $OUTPUT handle ffff: ingress
- $TCFR dev $OUTPUT parent ffff: protocol ip u32 match u32 0 0 action mirred
egress redirect dev ifb$IDEV
/usr/sbin/hsh.sh set $IP $DOWNSPEED
- #### Filters
- if [ w$FILTERS != w ] ;
- then
- echo "filters not supported"
- fi
fi
--- 81,94 ----
fi
else
! DOWNSPEED = 102400
fi
$TCQR dev $OUTPUT handle ffff: ingress
/usr/sbin/hsh.sh set $IP $DOWNSPEED
+ if [ -z "$IXSPEED" ]; then
+ $TCFR dev $OUTPUT parent ffff: protocol ip u32 match u32 0 0 action
mirred egress redirect dev $IDEV
+ else
+ [ -n "$IXDEV" ] && /usr/sbin/hsh.sh set $IP $IXSPEED $IXDEV
+ fi
fi
Index: ppp-mod
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/ppp-hsh/ppp-mod,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ppp-mod 26 Apr 2010 09:03:12 -0000 1.1.1.1
--- ppp-mod 6 Dec 2010 22:36:07 -0000 1.2
***************
*** 38,73 ****
fi;
##### speed server->client
! if [ "$UPSPEED" != "0" ] ;
! then
! if [ -n "$COEF" ] ;
! then
! UPSPEED=$(($UPSPEED*$COEF))
! fi
! else
UPSPEED=102400
! fi
! URATE=$(($UPSPEED/2))
! $TCCR dev $OUTPUT parent 1: classid 1:1 htb rate ${UPSPEED}kbit $UBURST
quantum 1514
! $TCCR dev $OUTPUT parent 1:1 classid 1:10 htb rate ${URATE}kbit ceil
${UPSPEED}kbit $UBURST prio 1 quantum 1514
! $TCCR dev $OUTPUT parent 1:1 classid 1:20 htb rate ${URATE}kbit ceil
${UPSPEED}kbit $UBURST prio 2 quantum 1514
##### speed client->server
! if [ "$DOWNSPEED" != "0" ] ;
! then
! if [ -n "$COEF" ] ;
! then
! DOWNSPEED=$(($DOWNSPEED*$COEF))
! fi
! else
! DOWNSPEED = 1024000
! fi
! /usr/sbin/hsh.sh set $IP $DOWNSPEED
!
! #### Filters
! if [ w$FILTERS != w ] ;
then
! echo "filters not supported"
fi
fi
--- 38,78 ----
fi;
+ #### Filters
+ if [ w$FILTERS != w ] ;
+ then
+ FILTARR=`echo $FILTERS|sed 's/,/\n/g'`
+ IXSPEED=`echo "$FILTARR"|awk '/IXSPEED/ {split($1, a, ":"); print a[2]}'`
+ NEGDEP=`echo "$FILTARR"|awk '/NEGDEP/ {split($1, a, ":"); print a[2]}'`
+ fi
+
##### speed server->client
! if [ "$UPSPEED" != "0" ] ;
! then
! if [ -n "$COEF" ] ;
! then
! UPSPEED=$(($UPSPEED*$COEF))
! fi
! else
UPSPEED=102400
! fi
! URATE=$(($UPSPEED/2))
! $TCCR dev $OUTPUT parent 1: classid 1:1 htb rate ${UPSPEED}kbit $UBURST
quantum 1514
! $TCCR dev $OUTPUT parent 1:1 classid 1:10 htb rate ${URATE}kbit ceil
${UPSPEED}kbit $UBURST prio 1 quantum 1514
! $TCCR dev $OUTPUT parent 1:1 classid 1:20 htb rate ${URATE}kbit ceil
${UPSPEED}kbit $UBURST prio 2 quantum 1514
! [ -n "$IXSPEED" ] && $TCCR dev $OUTPUT parent 1: classid 1:2 htb rate
${IXSPEED}kbit $UBURST prio 2 quantum 1514
##### speed client->server
! if [ "$DOWNSPEED" != "0" ] ;
then
! if [ -n "$COEF" ] ;
! then
! DOWNSPEED=$(($DOWNSPEED*$COEF))
! fi
! else
! DOWNSPEED = 102400
fi
+ /usr/sbin/hsh.sh set $IP $DOWNSPEED
+ [ -n "$IXSPEED" -a -n "$IXDEV" ]/usr/sbin/hsh.sh set $IP $IXSPEED $IXDEV
+
fi
Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/ppp-hsh/buildtool.cfg,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** buildtool.cfg 7 Jul 2010 20:15:37 -0000 1.4
--- buildtool.cfg 6 Dec 2010 22:36:07 -0000 1.5
***************
*** 33,40 ****
<ppp-hsh>
Version = 0.1
! Revision = 4
Help <<EOF
! QoS HTB+IFB hash-based shaper package for PPP server with
RADIUS plugin
Homepage:
Requires: tc.lrp iptables.lrp ppp-rad.lrp hsh.lrp
--- 33,42 ----
<ppp-hsh>
Version = 0.1
! Revision = 5
Help <<EOF
! QoS HTB+IFB hash-based shaper package for PPP server with
RADIUS plugin.
! Needs packet marking in iptables for high-priority traffic. Can
handle traffic
! for 2 separate directions (for ex., world and local/IX) if
specified by filter.
Homepage:
Requires: tc.lrp iptables.lrp ppp-rad.lrp hsh.lrp
Index: ppp-hsh.conf
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/ppp-hsh/ppp-hsh.conf,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ppp-hsh.conf 26 Apr 2010 09:03:12 -0000 1.1.1.1
--- ppp-hsh.conf 6 Dec 2010 22:36:07 -0000 1.2
***************
*** 3,10 ****
#IFB device
! IDEV=0
#burst settings
! UBURST="burst 512k"
#speed bonus
--- 3,16 ----
#IFB device
! IDEV=ifb0
!
! #INET output device
! INETDEV=vlan1
!
! #IX device
! IXDEV=vlan2
#burst settings
! UBURST="burst 1024k"
#speed bonus
Index: ppp-down
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/ppp-hsh/ppp-down,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ppp-down 26 Apr 2010 09:03:12 -0000 1.1.1.1
--- ppp-down 6 Dec 2010 22:36:07 -0000 1.2
***************
*** 56,63 ****
#### Filters
! if [ w$FILTERS != w ] ;
! then
! echo "filters not supported"
! fi
fi
--- 56,63 ----
#### Filters
! # if [ w$FILTERS != w ] ;
! # then
! #
! # fi
fi
------------------------------------------------------------------------------
What happens now with your Lotus Notes apps - do you make another costly
upgrade, or settle for being marooned without product support? Time to move
off Lotus Notes and onto the cloud with Force.com, apps are easier to build,
use, and manage than apps on traditional platforms. Sign up for the Lotus
Notes Migration Kit to learn more. http://p.sf.net/sfu/salesforce-d2d
_______________________________________________
leaf-cvs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/leaf-cvs-commits
