Changed xen.network -> xen.

[invirt/packages/invirt-xen-config.git] / vif-invirtroute

diff --git a/vif-invirtroute b/vif-invirtroute
index e5b96bd..c76a95e 100755 (executable)
--- a/vif-invirtroute
+++ b/vif-invirtroute
@@ -1,9 +1,5 @@
 #!/bin/bash
 
-
-
-
-
 #============================================================================
 # /etc/xen/vif-route
 #
@@ -22,8 +18,7 @@
 # Read from the store:
 # ip      list of IP networks for the vif, space-separated (default given in
 #         this script).
-# V6PREFIX  prefix of v6 address to use
-# Note that the v6 support is kind of broken because there's not really a way to populate the v6 prefix
+#
 # This script will set up proxy arp  for any ip addresses that are being routed
 # type read to determine if the device is ioemu
 
@@ -40,22 +35,19 @@ case "$command" in
         ifconfig ${dev} ${main_ip} netmask 255.255.255.255 up
         echo 1 >/proc/sys/net/ipv4/conf/${dev}/proxy_arp
        echo 1 >/proc/sys/net/ipv4/conf/${dev}/rp_filter 
-        ethtool -K ${dev} tx off
+        if [ x${qemu_online} != xyes ]; then
+          ethtool -K ${dev} tx off
+        fi
         ipcmd='add'
         cmdprefix=''
         ;;
     offline)
         do_without_error ifdown ${vif}
-       if [ -f /var/run/radvd/radvd.pid.${vif} ] ; then
-           do_without_error kill `cat /var/run/radvd/radvd.pid.${vif}`
-           fi
         ipcmd='del'
         cmdprefix='do_without_error'
         ;;
 esac
 
-v6prefix=${v6prefix:-}
-v6prefix=$(xenstore_read_default "$XENBUS_PATH/v6prefix" "$v6prefix")
 vif_type=$(xenstore_read_default "$XENBUS_PATH/type" "viffront")
 if [  ${vif_type} != "ioemu"  -o  x${qemu_online} = xyes ] ; then
     if [ "${ip}" ] ; then
@@ -63,24 +55,13 @@ if [  ${vif_type} != "ioemu"  -o  x${qemu_online} = xyes ] ; then
     # the guest using those addresses.
        for addr in ${ip} ; do
            ${cmdprefix} ip route ${ipcmd} ${addr} dev ${dev} src ${main_ip}
-           arpspoof -i eth2 -t 18.181.0.1 ${addr}&
+           arpspoof -i $(invirt-getconf xen.iface) -t 18.181.0.1 ${addr}&
            sleep 5
            kill %arpspoof
        done 
     fi
-
-    if [ x${v6prefix} != x ] ; then
-       sed -e "s/@interface@/${dev}/" -e "s+@prefix@+${v6prefix}+" /etc/xen/radvd.conf.template >/var/run/radvd.conf.${vif}
-       ${cmdprefix} ip -6 addr  ${ipcmd}  fe80::/64 scope link  dev ${dev} 
-       if [ $1 = online ] ; then
-           radvd  -u radvd -C /var/run/radvd.conf.${vif} -p /var/run/radvd/radvd.pid.${vif}
-       fi
-       ${cmdprefix} ip -6 route ${ipcmd} ${v6prefix} dev ${dev} 
-    fi
 fi
 
-handle_iptable
-
 log debug "Successful vif-route $command for $vif."
 if [ "$command" == "online" ]
 then