X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-xen-config.git/blobdiff_plain/eec0fc5b94f1bed727d1255dba2dc6cfd046a871..00fc1ec722eafe57d1d8fc9816f2916e70ddc596:/vif-invirtroute?ds=sidebyside

diff --git a/vif-invirtroute b/vif-invirtroute
index ed2d072..b3d9207 100755
--- a/vif-invirtroute
+++ b/vif-invirtroute
@@ -13,11 +13,11 @@
 # vif-route (add|remove|online|offline)
 #
 # Environment vars:
-# vif         vif interface name (required).
+# vif    vif interface name (required).
 # XENBUS_PATH path to this device's details in the XenStore (required).
 # Read from the store:
-# ip      list of IP networks for the vif, space-separated (default given in
-#         this script).
+# ip     list of IP networks for the vif, space-separated (default given in
+#        this script).
 #
 # This script will set up proxy arp  for any ip addresses that are being routed
 # type read to determine if the device is ioemu
@@ -31,23 +31,23 @@ dev=${dev:-${vif}}
 
 case "$command" in
     online|add)
-        ifconfig ${dev} ${main_ip} netmask 255.255.255.255 up
-        echo 1 >/proc/sys/net/ipv4/conf/${dev}/proxy_arp
+	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 
 	xenstore-write "$XENBUS_PATH/feature-gso-tcpv4" 0
-        if [ x${qemu_online} != xyes ]; then
-          ethtool -K ${dev} tx off
-        fi
-        ipcmd='add'
+	if [ x${qemu_online} != xyes ]; then
+	  ethtool -K ${dev} tx off
+	fi
+	ipcmd='add'
 	ipt_action='-A'
-        cmdprefix=''
-        ;;
+	cmdprefix=''
+	;;
     offline|remove)
-        do_without_error ifdown ${vif}
-        ipcmd='del'
+	do_without_error ifdown ${vif}
+	ipcmd='del'
 	ipt_action='-D'
-        cmdprefix='do_without_error'
-        ;;
+	cmdprefix='do_without_error'
+	;;
 esac
 
 vif_type=$(xenstore_read_default "$XENBUS_PATH/type" "viffront")
@@ -77,7 +77,9 @@ if [  ${vif_type} != "ioemu"  -o  x${qemu_online} = xyes ] ; then
 	    # (with metric 1) should take precedence over the vif
 	    # route and carry all the traffic.
 
+	    src=""
 	    if [ $ipcmd == "add" ]; then
+		src="src ${main_ip}"
 		case $dev in
 		    vif*)
 			metric="metric 2"
@@ -87,19 +89,19 @@ if [  ${vif_type} != "ioemu"  -o  x${qemu_online} = xyes ] ; then
 			;;
 		esac
 	    fi
-	    ${cmdprefix} ip route ${ipcmd} ${addr} dev ${dev} src ${main_ip} $metric
+	    ${cmdprefix} ip route ${ipcmd} ${addr} dev ${dev} ${src} $metric
 	    case "$command" in
 		online|add)
-		    timeout 5 arpspoof -i $(invirt-getconf xen.iface) -t ${gateway} ${addr} || :
+		    timeout -s KILL 5 arpspoof -i $(invirt-getconf xen.iface) -t ${gateway} ${addr} || :
 		    ;;
 	    esac
 	done 
 	if [ -n "$other_ip" ]; then
-	    ${cmdprefix} ip route ${ipcmd} ${other_ip} dev ${dev} src ${main_ip} $metric
+	    ${cmdprefix} ip route ${ipcmd} ${other_ip} dev ${dev} ${src} $metric
 	    iptables -t nat ${ipt_action} PREROUTING -d ${other_ip} -j DNAT --to-destination ${addr}
 	    case "$command" in
 		online|add)
-		    timeout 5 arpspoof -i $(invirt-getconf xen.iface) -t ${other_gateway} ${other_ip} || :
+		    timeout -s KILL 5 arpspoof -i $(invirt-getconf xen.iface) -t ${other_gateway} ${other_ip} || :
 		    ;;
 	    esac
 	fi