[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [libvirt] [PATCH] Fix formatting of network address in iptables helpers



 On 10/25/2010 11:04 AM, Daniel P. Berrange wrote:
The network address was being set to 192.168.122.0 instead
of 192.168.122.0/24. Fix this by removing the unneccessary
'network' field from virNetworkDef and just pass the
network address and netmask into the iptables APIs directly.

* src/conf/network_conf.h, src/conf/network_conf.c: Remove
   the 'network' field from virNEtworkDef.
* src/network/bridge_driver.c: Update for iptables API changes
* src/util/iptables.c, src/util/iptables.h: Require the
   network address + netmask pair to be passed in
---
  src/conf/network_conf.c     |    4 -
  src/conf/network_conf.h     |    1 -
  src/network/bridge_driver.c |   62 ++++++++++++------
  src/util/iptables.c         |  149 +++++++++++++++++++++++++------------------
  src/util/iptables.h         |   24 +++++--
  5 files changed, 142 insertions(+), 98 deletions(-)

[
[...]
  int              iptablesRemoveForwardMasquerade (iptablesContext *ctx,
-                                                  virSocketAddr *network,
+                                                  virSocketAddr *netaddr,
+                                                  virSocketAddr *netmask,
                                                    const char *physdev,
                                                    const char *protocol);
  int              iptablesAddOutputFixUdpChecksum (iptablesContext *ctx,

Locally applied and passes v2 of the test. ACK.

   Stefan


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]