Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into hvm

Browse Source
This commit is contained in:
Marek Marczykowski 2012-03-03 02:19:02 +01:00
commit fa905c764d
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
network/vif-route-qubes
View File

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