--- vps-functions.orig	2006-11-27 13:49:37 +1000
+++ vps-functions	2006-11-27 15:52:56 +1000
@@ -115,12 +115,17 @@ vzgetnetdev()
 #   $NETDEVICES - Network devices used to take MAC addresses from
 vzarp()
 {
-	local DEV
+	local src_addr
+	local src_dev
 
 	[ -n "${NETDEVICES}" ] || vzwarning "Device list is empty"
-	for DEV in ${NETDEVICES}; do
-		${IP_CMD} neigh ${1} proxy ${2} dev ${DEV} > /dev/null 2>&1
-	done
+	src_addr=`ip route get ${2} | awk -F 'src ' '{print $2; exit}'`
+	if [ -n "${src_addr}" ]; then
+		src_dev=`ip route list ${src_addr} scope host table local | awk '{print $4; exit}'`
+		if [ -n "${src_dev}" ]; then
+		    ${IP_CMD} neigh ${1} proxy ${2} dev ${src_dev} > /dev/null 2>&1
+		fi
+	fi
 }
 
 # Send ARP request to detect that somebody already have this IP
@@ -130,16 +135,18 @@ vzarpipdetect()
 	local ip
 	local cmd
 
-	[ -z "${1}" ] && return
+	[ -n "$1" ] || return
 	[ "${SKIP_ARPDETECT}" = "yes" ] && return
 
-	for ip in ${1}; do
-		cmd="$cmd -e $ip"
-	done
-
 	for DEV in ${NETDEVICES}; do
-		${ARPSEND_CMD} -D ${cmd} ${DEV} ||
-			vzwarning "${ARPSEND_CMD} -D ${cmd} ${DEV} FAILED"
+		for ip in ${1}; do
+			! ${IP_CMD} route get ${ip} oif ${DEV} |grep -qs ' via .* src ' ||
+				continue
+			cmd="-e $ip"
+			[ -n "$cmd" ] || continue
+			${ARPSEND_CMD} -D ${cmd} ${DEV} ||
+			    vzwarning "${ARPSEND_CMD} -D ${cmd} ${DEV} FAILED"
+		done
 	done
 }
 
@@ -148,16 +155,21 @@ vzarpipset()
 {
 	local DEV
 	local ip
-	local dev
+	local cmd
+	local src_addr
 
-	[ -z "${1}" ] && return
+	[ -n "$1" ] || return
 
-	for dev in ${NETDEVICES}; do
-		for ip in ${1}; do
-			opt="-i ${ip} -e ${ip}"
-			${ARPSEND_CMD} -U ${opt} ${dev} ||
-				vzwarning "${ARPSEND_CMD} -U ${opt} ${dev} FAILED"
-		done
+	for ip in ${1}; do
+		src_addr=`ip route get ${ip} | awk -F 'src ' '{print $2; exit}'`
+		if [ -n "${src_addr}" ]; then
+			DEV=`ip route list ${src_addr} scope host table local | awk '{print $4; exit}'`
+			if [ -n "${DEV}" ]; then
+				cmd="-i ${ip} -e ${ip}"
+				${ARPSEND_CMD} -U ${cmd} ${DEV} ||
+					vzwarning "${ARPSEND_CMD} -U ${cmd} ${DEV} FAILED"
+			fi
+		fi
 	done
 }
 
@@ -171,9 +183,10 @@ vzaddrouting()
 	if ! ${IP_CMD} route list ${1} | grep "$1 dev venet0" > /dev/null 2>&1; then
 		if [ -n "${VE_ROUTE_SRC_DEV}" ]; then
 			device="dev ${VE_ROUTE_SRC_DEV}"
+			src_addr=`ip route get ${1} oif ${device} | awk -F 'src ' '{print $2; exit}'`
+		else
+			src_addr=`ip route get ${1} | awk -F 'src ' '{print $2; exit}'`
 		fi
-		src_addr=`ip route list table local ${device} | grep '^local' |
-			cut -d' ' -f2 | grep -v '^127\.' | head -n 1`
 		if [ -z "${src_addr}" ]; then
 			vzerror "Unable to get source ip [${device}]" ${VZ_CANT_ADDIP}
 		fi