$IP tunnel add $EGRE mode gre type eth remote $REMOTE key $KEY ttl 64
$IP link set $EGRE up
-### Setup etun
-ETUN0=a$LINK
-ETUN1=b$LINK
-ip link add name $ETUN0 type veth peer name $ETUN1
-ifconfig $ETUN0 mtu 1458 up
-ifconfig $ETUN1 up
-
-### Setup bridge
-BRIDGE=c$LINK
-brctl addbr $BRIDGE
-brctl addif $BRIDGE $EGRE
-brctl addif $BRIDGE $ETUN1
-ifconfig $BRIDGE up
-
-### Setup iptables so that packets are visible in the vserver
-iptables -t mangle -A FORWARD -o $BRIDGE -j MARK --set-mark $SLICEID
+### Setup macvlan
+MACV=a$LINK
+ip link add link $EGRE $MACV type macvlan
### Put a process in the vserver so we can move the interface there
su $SLICE -c "sleep 30 &"
PID=`su $SLICE -c "pgrep -n sleep"`
-$IP link set $ETUN0 netns $PID
+$IP link set $MACV netns $PID
naddress --add --nid $SLICEID --ip ${VIRTIP}${SUBNET}
-su $SLICE -c "sudo /sbin/ifconfig $ETUN0 ${VIRTIP}${SUBNET} up; sudo /sbin/route add -net $VIRTNET dev $ETUN0"
+su $SLICE -c "sudo /sbin/ifconfig $MACV ${VIRTIP}${SUBNET} mtu 1458 up"
### Set rate
tc qdisc add dev $EGRE root handle 1: htb default 10
sleep 1
su $SLICE -c "sudo /sbin/ifconfig $ETUN0 $INTNET up; \
- sudo /sbin/route add -net $BASENET $ETUN0; \
sudo /sbin/route add default gw $EXTIP; \
sudo /sbin/ifconfig lo 127.0.0.1/8 up"
LINK=${KEY}x${NODEID}
EGRE=d$LINK
-BRIDGE=c$LINK
-ETUN1=b$LINK
-MARK=`iptables -t mangle -L -v|grep -m 1 $BRIDGE|awk '{print $NF}'`
-
-# Remove iptables rules. Sometimes there is more than one.
-while [ $? -eq 0 ]; do
- iptables -t mangle -D FORWARD -o $BRIDGE -j MARK --set-mark $MARK
-done
-
-# Get rid of etun devices, only need name of one of them
-ip link delete dev $ETUN1
-
-# Get rid of bridge
-ifconfig $BRIDGE down
-brctl delbr $BRIDGE
-
-# Get rid of EGRE tunnel
+# Get rid of EGRE tunnel and MACVLAN interface
ip tunnel del $EGRE