From e530a41bf4ef1b84917cd1295d5aaf30051e42c9 Mon Sep 17 00:00:00 2001
From: Michael Janczyk
Date: Fri, 9 Apr 2010 22:07:25 +0200
Subject: qemukvm network configuration

---
 os-plugins/plugins/qemukvm/files/ifup | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

(limited to 'os-plugins/plugins/qemukvm/files/ifup')

diff --git a/os-plugins/plugins/qemukvm/files/ifup b/os-plugins/plugins/qemukvm/files/ifup
index 9d94ac64..b3218798 100644
--- a/os-plugins/plugins/qemukvm/files/ifup
+++ b/os-plugins/plugins/qemukvm/files/ifup
@@ -29,21 +29,20 @@ QKTMPDIR=/tmp/qemukvm/${USER}/${VM_ID}
 # should be set up (passed in $1): tap0 = bridge, tap1 = nat, tap2 = hostonly.
 case "$1" in
   tapbridge0*)
-    # Adding the tap0 interface to the existing bridge configured in stage3
-    #sudo /opt/openslx/uclib-rootfs/sbin/tunctl -t $1 >/dev/null 2>&1
     sudo ip link set dev $1 up
-    #sudo /opt/openslx/uclib-rootfs/usr/sbin/brctl addif br0 $1
-    echo "1" >/proc/sys/net/ipv4/conf/br0/forwarding
-    echo "1" >/proc/sys/net/ipv4/conf/$1/forwarding
+    # TODO: forwarding?, where needed
+    echo "1" >${QKTMPDIR}/forwarding
+    sudo cp ${QKTMPDIR}/forwarding /proc/sys/net/ipv4/conf/br0/forwarding
+    sudo cp ${QKTMPDIR}/forwarding /proc/sys/net/ipv4/conf/$1/forwarding
   ;;
   tapnat0*)
-    # Configuring DHCP on host tap1 interface and enable IP masquerading
-    #sudo /opt/openslx/uclib-rootfs/sbin/tunctl -t $1 >/dev/null 2>&1
+    # Configuring DHCP on host tapnat interface and enable IP masquerading
     sudo ip addr add ${nataddress} dev $1
     sudo ip link set dev $1 up
-    # not necessary since already done by run-virt.include
-    #[ -d ${QKTMPDIR} ] || mkdir -p ${QKTMPDIR}
-    # cut the last .NNN/MM from nataddress ${natnetwork%.*}
+    # TODO: forwarding?, where needed
+    echo "1" >${QKTMPDIR}/forwarding
+    sudo cp ${QKTMPDIR}/forwarding /proc/sys/net/ipv4/conf/br0/forwarding
+    sudo cp ${QKTMPDIR}/forwarding /proc/sys/net/ipv4/conf/$1/forwarding
     # TODO: we use here atatic address, maybe change later
     sed -e "s,NWIF,$1,;s,CNETWORK,192.168.1${VM_ID}," \
         -e "s,PIDFILE,${QKTMPDIR}/udhcpd.pid," \
@@ -51,29 +50,26 @@ case "$1" in
            ${OPENSLX_DEFAULT_CONFDIR}/udhcpd.conf \
       >${QKTMPDIR}/udhcpd.conf
     touch ${QKTMPDIR}/udhcpd.leases
-    # ip link set $1 up
-    # ip addr add 192.168.101.254/24 dev $1
     sudo /opt/openslx/uclib-rootfs/usr/sbin/udhcpd \
       -S ${QKTMPDIR}/udhcpd.conf
     # iptables -t nat -A POSTROUTING -o br0 -j MASQUERADE
   ;;
   taphost0*)
-    # Configuring DHCP on host tap2 interface
-    #sudo /opt/openslx/uclib-rootfs/sbin/tunctl -t $1 >/dev/null 2>&1
+    # Configuring DHCP on host taphost interface
     sudo ip addr add ${hoaddress} dev $1
     sudo ip link set dev $1 up
-    #[ -d ${QKTMPDIR} ] || mkdir -p ${QKTMPDIR}
+    # TODO: forwarding?, where needed
+    echo "1" >${QKTMPDIR}/forwarding
+    sudo cp ${QKTMPDIR}/forwarding /proc/sys/net/ipv4/conf/br0/forwarding
+    sudo cp ${QKTMPDIR}/forwarding /proc/sys/net/ipv4/conf/$1/forwarding
     sed -e "s,NWIF,$1,;s,USER,${USER},;s,CNETWORK,192.168.1${VM_ID}," \
         -e "s,PIDFILE,${QKTMPDIR}/udhcpd.pid," \
         -e "s,LEASEFILE,${QKTMPDIR}/udhcpd.leases," \
       ${OPENSLX_DEFAULT_CONFDIR}/udhcpd.conf >${QKTMPDIR}/udhcpd.conf
     touch ${QKTMPDIR}/udhcpd.leases
-    # ip link set $1 up
-    # ip addr add 192.168.102.254/24 dev $1
     sudo /opt/openslx/uclib-rootfs/usr/sbin/udhcpd \
       -S ${QKTMPDIR}/udhcpd.conf
   ;;
 esac
 
-# Produce a clean exit status
 exit 0
-- 
cgit v1.2.3-55-g7522