Merge branch 'master' into hvm

This commit is contained in:
Marek Marczykowski 2012-03-03 02:19:02 +01:00
commit fa905c764d

View File

@ -29,14 +29,14 @@ case "$command" in
online)
ifconfig ${vif} up
echo 1 >/proc/sys/net/ipv4/conf/${vif}/proxy_arp
ipcmd='add'
iptables_cmd='-I FORWARD 1'
ipcmd='replace'
iptables_cmd='-I PREROUTING 1'
cmdprefix=''
;;
offline)
do_without_error ifdown ${vif}
ipcmd='del'
iptables_cmd='-D FORWARD'
iptables_cmd='-D PREROUTING'
cmdprefix='do_without_error'
;;
esac
@ -45,10 +45,9 @@ if [ "${ip}" ] ; then
# If we've been given a list of IP addresses, then add routes from dom0 to
# the guest using those addresses.
for addr in ${ip} ; do
${cmdprefix} ip route del ${addr} || true
${cmdprefix} ip route ${ipcmd} ${addr} dev ${vif} || true
done
echo ${cmdprefix} iptables $iptables_cmd -i ${vif} \! -s ${ip} -j DROP
echo ${cmdprefix} iptables -t raw $iptables_cmd -i ${vif} \! -s ${ip} -j DROP
${cmdprefix} iptables $iptables_cmd -i ${vif} \! -s ${ip} -j DROP
fi