X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=factory%2Fsetup-link;h=e5cbd2f1f6270da78cdf2ce96a2f96c437327b50;hb=21f1fe1dd8b0c1073b16cbbde5af3beb55e61fd2;hp=5851ee67781d0fcdbd9c40b883804c9c0a6cea76;hpb=1f7b945a916a115c45e77c1bf737e2d8594a5f09;p=vsys.git

diff --git a/factory/setup-link b/factory/setup-link
index 5851ee6..e5cbd2f 100755
--- a/factory/setup-link
+++ b/factory/setup-link
@@ -4,29 +4,29 @@ IP=/sbin/ip
 
 SLICE=$1
 SLICEID=`id -u $SLICE`
-read LABEL
+read INDEX
 read REMOTE
 read KEY
 
-LINK=${LABEL}k$KEY
+LINK=${KEY}if${INDEX}
 
 modprobe ip_gre
 modprobe etun
 
 ### Setup EGRE tunnel
-EGRE=egre$LINK
+EGRE=d$LINK
 $IP tunnel add $EGRE  mode gre/eth remote $REMOTE key $KEY
 $IP link set $EGRE up
 
 ### Setup etun
-ETUN0=v$LINK
-ETUN1=etun$LINK
+ETUN0=a$LINK
+ETUN1=b$LINK
 echo $ETUN0,$ETUN1 > /sys/module/etun/parameters/newif
-ifconfig $ETUN0 up
+ifconfig $ETUN0 mtu 1458 up
 ifconfig $ETUN1 up
 
 ### Setup bridge
-BRIDGE=br$LINK
+BRIDGE=c$LINK
 brctl addbr $BRIDGE
 brctl addif $BRIDGE $EGRE 
 brctl addif $BRIDGE $ETUN1
@@ -36,7 +36,9 @@ ifconfig $BRIDGE up
 iptables -t mangle -A FORWARD -o $BRIDGE -j MARK --set-mark $SLICEID
 
 ### Create "grab link" script
-GRAB=/vsys/grab-$ETUN0
+GRAB=/vsys/local_grab-$ETUN0
+echo $SLICE > $GRAB.acl 
+rm -f $GRAB
 cat > $GRAB <<EOF
 #!/bin/sh
 
@@ -45,13 +47,37 @@ read PID
 chcontext --ctx 1 -- echo \$PID > /sys/class/net/$ETUN0/new_ns_pid 
 EOF
 chmod +x $GRAB
-echo $SLICE > $GRAB.acl 
+
+### Create script for setting link rate
+BIND=/vsys/local_rate-$ETUN0
+echo $SLICE > $BIND.acl 
+rm -f $BIND
+cat > $BIND <<EOF
+#!/bin/sh
+
+read rt
+
+tc qdisc add dev $EGRE root handle 1: htb default 10
+tc class add dev $EGRE parent 1: classid 1:10 htb rate \$rt ceil \$rt
+
+rm -rf $BIND.acl 
+touch $BIND.acl 
+
+EOF
+chmod +x $BIND
 
 ### Create "delete link" script
-DELETE=/vsys/delete-$ETUN0
+DELETE=/vsys/local_delete-$ETUN0
+echo $SLICE > $DELETE.acl 
+rm -f $DELETE
 cat > $DELETE <<EOF
 #!/bin/sh
 
+read NULL
+
+# Remove iptables rule
+iptables -t mangle -D FORWARD -o $BRIDGE -j MARK --set-mark $SLICEID
+
 # Get rid of etun devices, only need name of one of them
 echo $ETUN1 > /sys/module/etun/parameters/delif
 
@@ -63,11 +89,8 @@ brctl delbr $BRIDGE
 ip tunnel del $EGRE
 
 # Clean up files
-rm $GRAB
-rm $DELETE
-
+rm -f $GRAB $GRAB.acl
+rm -f $DELETE $DELETE.acl
+rm -f $BIND $BIND.acl
 EOF
 chmod +x $DELETE
-echo $SLICE > $DELETE.acl 
-
-