[PATCH -1/4] kill the slipped through patch

[PATCH -1/4] kill the slipped through patch

[Pablo Neira]

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

Kill 'slipped through' patch from Harald's git tree:

[PATCH 6/7] add support for zeroing counters at getting (04/11/2005)

This is the same patch, but inverted.

-- 
The dawn of the fourth age of Linux firewalling is coming; a time of
great struggle and heroic deeds -- J.Kadlecsik got inspired by J.Morris

[-- Attachment #2: 02slipped-through.patch --]
[-- Type: text/plain, Size: 860 bytes --]

Kill 'slipped through' patch from Harald's git tree ;)

[PATCH 6/7] add support for zeroing counters at getting (04/11/2005)

Index: netfilter-2.6.14.git/net/ipv4/netfilter/ip_conntrack_netlink.c
===================================================================
--- netfilter-2.6.14.git.orig/net/ipv4/netfilter/ip_conntrack_netlink.c	2005-11-09 19:13:35.000000000 +0100
+++ netfilter-2.6.14.git/net/ipv4/netfilter/ip_conntrack_netlink.c	2005-11-09 19:15:25.000000000 +0100
@@ -788,12 +788,6 @@ ctnetlink_get_conntrack(struct sock *ctn
 
 	err = ctnetlink_fill_info(skb2, NETLINK_CB(skb).pid, nlh->nlmsg_seq, 
 				  IPCTNL_MSG_CT_NEW, 1, ct);
-
-#ifdef CONFIG_IP_NF_CT_ACCT
-	if (NFNL_MSG_TYPE(nlh->nlmsg_type) == IPCTNL_MSG_CT_GET_CTRZERO) 
-		memset(&ct->counters, 0, sizeof(ct->counters));
-#endif
-	
 	ip_conntrack_put(ct);
 	if (err <= 0)
 		goto free;

Re: [PATCH -1/4] kill the slipped through patch

[Harald Welte]

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

On Thu, Nov 10, 2005 at 02:04:00AM +0100, Pablo Neira wrote:
> Kill 'slipped through' patch from Harald's git tree:

applied.

-- 
- 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 --]