[PATCH] resync ipt_cluster structure

[PATCH] resync ipt_cluster structure

[Pablo Neira]

[-- Attachment #1: Type: text/plain, Size: 344 bytes --]

Hi Harald,

Currently ipt_clusterip_tgt_info structure is out of sync with regards 
to iptables snapshot in SVN. This happened because the patch to fix 
deletion was applied to iptables but not the kernel part, so it got lost 
somehow.

The patch attached fixes it, please apply.

Signed-off-by: Pablo Neira Ayuso <pablo@eurodev.net>

--
Pablo

[-- Attachment #2: x --]
[-- Type: text/plain, Size: 724 bytes --]

Index: include/linux/netfilter_ipv4/ipt_CLUSTERIP.h
===================================================================
--- 6d7098bc350768f59a41090ca248ae430cd95b25/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h  (mode:100644 sha1:baa83e757156c66d9e34015f554512eadb84f1f1)
+++ uncommitted/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h  (mode:100644)
@@ -18,7 +18,6 @@
 struct ipt_clusterip_tgt_info {
 
 	u_int32_t flags;
-	struct clusterip_config *config;
 	
 	/* only relevant for new ones */
 	u_int8_t clustermac[6];
@@ -27,6 +26,8 @@
 	u_int16_t local_nodes[CLUSTERIP_MAX_NODES];
 	enum clusterip_hashmode hash_mode;
 	u_int32_t hash_initval;
+
+	struct clusterip_config *config;
 };
 
 #endif /*_IPT_CLUSTERIP_H_target*/

Re: [PATCH] resync ipt_cluster structure

[Harald Welte]

[-- Attachment #1: Type: text/plain, Size: 806 bytes --]

On Thu, May 05, 2005 at 06:20:31PM +0200, Pablo Neira wrote:
> Hi Harald,
> 
> Currently ipt_clusterip_tgt_info structure is out of sync with regards to 
> iptables snapshot in SVN. This happened because the patch to fix deletion was 
> applied to iptables but not the kernel part, so it got lost somehow.

thanks, I'll push it with my other change to davem.  Trying to set up a
local git tree where he can pull from, before.
-- 
- Harald Welte <laforge@netfilter.org>                 http://netfilter.org/
============================================================================
  "Fragmentation is like classful addressing -- an interesting early
   architectural error that shows how much experimentation was going
   on while IP was being designed."                    -- Paul Vixie

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]