File 91f9157e-fix-masq-rules.patch of Package libvirt
commit 91f9157e5b807ba641bc52593911f037445ec613
Author: Guido Günther <agx@sigxcpu.org>
Date: Thu Nov 5 20:28:11 2009 +0100
only remove masquerade roles for VIR_NETWORK_FORWARD_NAT
Fixes http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=549949
Index: libvirt-0.7.2/src/network/bridge_driver.c
===================================================================
--- libvirt-0.7.2.orig/src/network/bridge_driver.c
+++ libvirt-0.7.2/src/network/bridge_driver.c
@@ -765,16 +765,15 @@ static void
networkRemoveIptablesRules(struct network_driver *driver,
virNetworkObjPtr network) {
if (network->def->forwardType != VIR_NETWORK_FORWARD_NONE) {
- iptablesRemoveForwardMasquerade(driver->iptables,
- network->def->network,
- network->def->forwardDev);
-
- if (network->def->forwardType == VIR_NETWORK_FORWARD_NAT)
+ if (network->def->forwardType == VIR_NETWORK_FORWARD_NAT) {
+ iptablesRemoveForwardMasquerade(driver->iptables,
+ network->def->network,
+ network->def->forwardDev);
iptablesRemoveForwardAllowRelatedIn(driver->iptables,
network->def->network,
network->def->bridge,
network->def->forwardDev);
- else if (network->def->forwardType == VIR_NETWORK_FORWARD_ROUTE)
+ } else if (network->def->forwardType == VIR_NETWORK_FORWARD_ROUTE)
iptablesRemoveForwardAllowIn(driver->iptables,
network->def->network,
network->def->bridge,