Index: ctnetlink.patch
===================================================================
RCS file: /cvsroot/netfilter/userspace/patch-o-matic/ctnetlink.patch,v
retrieving revision 1.1
diff -u -r1.1 ctnetlink.patch
--- ctnetlink.patch	19 Jun 2001 00:18:18 -0000	1.1
+++ ctnetlink.patch	6 Nov 2001 05:26:28 -0000
@@ -1,6 +1,6 @@
-diff -ruN linux-2.4.5-ac5/include/linux/netfilter_ipv4/ip_conntrack.h linux/include/linux/netfilter_ipv4/ip_conntrack.h
---- linux-2.4.5-ac5/include/linux/netfilter_ipv4/ip_conntrack.h	Fri Apr 27 14:15:01 2001
-+++ linux/include/linux/netfilter_ipv4/ip_conntrack.h	Fri Jun  1 06:47:50 2001
+diff -ruN linux-2.4.14/include/linux/netfilter_ipv4/ip_conntrack.h linux-2.4.14_traf/include/linux/netfilter_ipv4/ip_conntrack.h
+--- linux-2.4.14/include/linux/netfilter_ipv4/ip_conntrack.h	Wed Oct 31 10:08:12 2001
++++ linux-2.4.14_traf/include/linux/netfilter_ipv4/ip_conntrack.h	Tue Nov  6 14:04:45 2001
 @@ -23,8 +23,26 @@
  	/* >= this indicates reply direction */
  	IP_CT_IS_REPLY,
@@ -52,7 +52,27 @@
  struct ip_conntrack_expect
  {
  	/* Internal linked list */
-@@ -163,9 +166,24 @@
+@@ -77,6 +80,11 @@
+ 	struct ip_conntrack *expectant;
+ };
+ 
++struct ip_conntrack_traffic
++{
++	__u64 octets_original, octets_reply;
++};
++
+ #ifdef CONFIG_IP_NF_NAT_NEEDED
+ #include <linux/netfilter_ipv4/ip_nat.h>
+ #endif
+@@ -143,6 +151,7 @@
+ 	} nat;
+ #endif /* CONFIG_IP_NF_NAT_NEEDED */
+ 
++	struct ip_conntrack_traffic traffic;
+ };
+ 
+ /* Alter reply tuple (maybe alter helper).  If it's already taken,
+@@ -170,9 +179,24 @@
  extern void ip_ct_refresh(struct ip_conntrack *ct,
  			  unsigned long extra_jiffies);
  
@@ -80,9 +100,9 @@
  
  /* Returns new sk_buff, or NULL */
  struct sk_buff *
-diff -ruN linux-2.4.5-ac5/include/linux/netfilter_ipv4/ip_conntrack_core.h linux/include/linux/netfilter_ipv4/ip_conntrack_core.h
---- linux-2.4.5-ac5/include/linux/netfilter_ipv4/ip_conntrack_core.h	Fri Apr 27 14:15:01 2001
-+++ linux/include/linux/netfilter_ipv4/ip_conntrack_core.h	Fri Jun  1 06:47:50 2001
+diff -ruN linux-2.4.14/include/linux/netfilter_ipv4/ip_conntrack_core.h linux-2.4.14_traf/include/linux/netfilter_ipv4/ip_conntrack_core.h
+--- linux-2.4.14/include/linux/netfilter_ipv4/ip_conntrack_core.h	Sat Apr 28 07:15:01 2001
++++ linux-2.4.14_traf/include/linux/netfilter_ipv4/ip_conntrack_core.h	Tue Nov  6 14:03:46 2001
 @@ -29,7 +29,7 @@
  		     struct ip_conntrack_protocol *protocol);
  
@@ -100,9 +120,9 @@
  extern struct list_head *ip_conntrack_hash;
  extern struct list_head expect_list;
  DECLARE_RWLOCK_EXTERN(ip_conntrack_lock);
-diff -ruN linux-2.4.5-ac5/include/linux/netfilter_ipv4/ip_conntrack_ftp.h linux/include/linux/netfilter_ipv4/ip_conntrack_ftp.h
---- linux-2.4.5-ac5/include/linux/netfilter_ipv4/ip_conntrack_ftp.h	Wed Apr 25 15:00:28 2001
-+++ linux/include/linux/netfilter_ipv4/ip_conntrack_ftp.h	Fri Jun  1 06:47:50 2001
+diff -ruN linux-2.4.14/include/linux/netfilter_ipv4/ip_conntrack_ftp.h linux-2.4.14_traf/include/linux/netfilter_ipv4/ip_conntrack_ftp.h
+--- linux-2.4.14/include/linux/netfilter_ipv4/ip_conntrack_ftp.h	Thu Apr 26 08:00:28 2001
++++ linux-2.4.14_traf/include/linux/netfilter_ipv4/ip_conntrack_ftp.h	Tue Nov  6 14:03:46 2001
 @@ -2,15 +2,6 @@
  #define _IP_CONNTRACK_FTP_H
  /* FTP tracking. */
@@ -130,10 +150,10 @@
 +DECLARE_LOCK_EXTERN(ip_ftp_lock);
 +#endif /* __KERNEL__ */
  #endif /* _IP_CONNTRACK_FTP_H */
-diff -ruN linux-2.4.5-ac5/include/linux/netfilter_ipv4/ip_conntrack_netlink.h linux/include/linux/netfilter_ipv4/ip_conntrack_netlink.h
---- linux-2.4.5-ac5/include/linux/netfilter_ipv4/ip_conntrack_netlink.h	Wed Dec 31 16:00:00 1969
-+++ linux/include/linux/netfilter_ipv4/ip_conntrack_netlink.h	Fri Jun  1 05:55:25 2001
-@@ -0,0 +1,119 @@
+diff -ruN linux-2.4.14/include/linux/netfilter_ipv4/ip_conntrack_netlink.h linux-2.4.14_traf/include/linux/netfilter_ipv4/ip_conntrack_netlink.h
+--- linux-2.4.14/include/linux/netfilter_ipv4/ip_conntrack_netlink.h	Thu Jan  1 10:00:00 1970
++++ linux-2.4.14_traf/include/linux/netfilter_ipv4/ip_conntrack_netlink.h	Tue Nov  6 14:04:45 2001
+@@ -0,0 +1,120 @@
 +#ifndef _IP_CONNTRACK_NETLINK_H
 +#define _IP_CONNTRACK_NETLINK_H
 +
@@ -162,7 +182,8 @@
 +	CTA_PROTOINFO,	/* [rta_proto] Protocol specific ct information. */
 +	CTA_HELPINFO,	/* [rta_help] Helper specific information. */
 +	CTA_NATINFO,	/* [rta_nat] Any NAT transformations. */
-+	CTA_MAX = CTA_NATINFO 
++	CTA_TRAFINFO,
++	CTA_MAX = CTA_TRAFINFO
 +};
 +
 +/* Generic structure for encapsulation optional conntrack information.
@@ -253,9 +274,9 @@
 +   __cta_fill(skb, attrtype, attrlen, data); })
 +#endif	/* __KERNEL__ */
 +#endif	/* _IP_CONNTRACK_NETLINK_H */
-diff -ruN linux-2.4.5-ac5/include/linux/netfilter_ipv4/ip_conntrack_protocol.h linux/include/linux/netfilter_ipv4/ip_conntrack_protocol.h
---- linux-2.4.5-ac5/include/linux/netfilter_ipv4/ip_conntrack_protocol.h	Fri Apr 27 14:15:01 2001
-+++ linux/include/linux/netfilter_ipv4/ip_conntrack_protocol.h	Fri Jun  1 06:47:50 2001
+diff -ruN linux-2.4.14/include/linux/netfilter_ipv4/ip_conntrack_protocol.h linux-2.4.14_traf/include/linux/netfilter_ipv4/ip_conntrack_protocol.h
+--- linux-2.4.14/include/linux/netfilter_ipv4/ip_conntrack_protocol.h	Sat Apr 28 07:15:01 2001
++++ linux-2.4.14_traf/include/linux/netfilter_ipv4/ip_conntrack_protocol.h	Tue Nov  6 14:03:46 2001
 @@ -35,7 +35,7 @@
  	/* Returns verdict for packet, or -1 for invalid. */
  	int (*packet)(struct ip_conntrack *conntrack,
@@ -265,9 +286,9 @@
  
  	/* Called when a new connection for this protocol found;
  	 * returns TRUE if it's OK.  If so, packet() called next. */
-diff -ruN linux-2.4.5-ac5/include/linux/netfilter_ipv4/ip_conntrack_tcp.h linux/include/linux/netfilter_ipv4/ip_conntrack_tcp.h
---- linux-2.4.5-ac5/include/linux/netfilter_ipv4/ip_conntrack_tcp.h	Fri Aug  4 13:07:24 2000
-+++ linux/include/linux/netfilter_ipv4/ip_conntrack_tcp.h	Fri Jun  1 00:31:00 2001
+diff -ruN linux-2.4.14/include/linux/netfilter_ipv4/ip_conntrack_tcp.h linux-2.4.14_traf/include/linux/netfilter_ipv4/ip_conntrack_tcp.h
+--- linux-2.4.14/include/linux/netfilter_ipv4/ip_conntrack_tcp.h	Sat Aug  5 06:07:24 2000
++++ linux-2.4.14_traf/include/linux/netfilter_ipv4/ip_conntrack_tcp.h	Tue Nov  6 14:03:46 2001
 @@ -2,10 +2,6 @@
  #define _IP_CONNTRACK_TCP_H
  /* TCP tracking. */
@@ -279,9 +300,9 @@
  enum tcp_conntrack {
  	TCP_CONNTRACK_NONE,
  	TCP_CONNTRACK_ESTABLISHED,
-diff -ruN linux-2.4.5-ac5/include/linux/netfilter_ipv4/ip_conntrack_tuple.h linux/include/linux/netfilter_ipv4/ip_conntrack_tuple.h
---- linux-2.4.5-ac5/include/linux/netfilter_ipv4/ip_conntrack_tuple.h	Thu Aug 10 12:35:15 2000
-+++ linux/include/linux/netfilter_ipv4/ip_conntrack_tuple.h	Fri Jun  1 00:31:00 2001
+diff -ruN linux-2.4.14/include/linux/netfilter_ipv4/ip_conntrack_tuple.h linux-2.4.14_traf/include/linux/netfilter_ipv4/ip_conntrack_tuple.h
+--- linux-2.4.14/include/linux/netfilter_ipv4/ip_conntrack_tuple.h	Fri Jul 27 06:58:26 2001
++++ linux-2.4.14_traf/include/linux/netfilter_ipv4/ip_conntrack_tuple.h	Tue Nov  6 14:03:46 2001
 @@ -62,8 +62,6 @@
  	} dst;
  };
@@ -300,9 +321,9 @@
  
  /* Connections have two entries in the hash table: one for each way */
  struct ip_conntrack_tuple_hash
-diff -ruN linux-2.4.5-ac5/include/linux/netfilter_ipv4/ip_nat.h linux/include/linux/netfilter_ipv4/ip_nat.h
---- linux-2.4.5-ac5/include/linux/netfilter_ipv4/ip_nat.h	Wed Apr 25 15:00:28 2001
-+++ linux/include/linux/netfilter_ipv4/ip_nat.h	Fri Jun  1 06:47:50 2001
+diff -ruN linux-2.4.14/include/linux/netfilter_ipv4/ip_nat.h linux-2.4.14_traf/include/linux/netfilter_ipv4/ip_nat.h
+--- linux-2.4.14/include/linux/netfilter_ipv4/ip_nat.h	Thu Apr 26 08:00:28 2001
++++ linux-2.4.14_traf/include/linux/netfilter_ipv4/ip_nat.h	Tue Nov  6 14:03:46 2001
 @@ -55,22 +55,6 @@
  	struct ip_nat_range range[1];
  };
@@ -356,9 +377,9 @@
  
  /* Set up the info structure to map into this range. */
  extern unsigned int ip_nat_setup_info(struct ip_conntrack *conntrack,
-diff -ruN linux-2.4.5-ac5/include/linux/netlink.h linux/include/linux/netlink.h
---- linux-2.4.5-ac5/include/linux/netlink.h	Sun Nov 12 20:37:17 2000
-+++ linux/include/linux/netlink.h	Fri Jun  1 00:31:00 2001
+diff -ruN linux-2.4.14/include/linux/netlink.h linux-2.4.14_traf/include/linux/netlink.h
+--- linux-2.4.14/include/linux/netlink.h	Fri Jul 27 07:00:17 2001
++++ linux-2.4.14_traf/include/linux/netlink.h	Tue Nov  6 14:03:46 2001
 @@ -5,6 +5,7 @@
  #define NETLINK_SKIP		1	/* Reserved for ENskip  			*/
  #define NETLINK_USERSOCK	2	/* Reserved for user mode socket protocols 	*/
@@ -367,9 +388,9 @@
  #define NETLINK_ARPD		8
  #define NETLINK_ROUTE6		11	/* af_inet6 route comm channel */
  #define NETLINK_IP6_FW		13
-diff -ruN linux-2.4.5-ac5/net/ipv4/netfilter/ip_conntrack_core.c linux/net/ipv4/netfilter/ip_conntrack_core.c
---- linux-2.4.5-ac5/net/ipv4/netfilter/ip_conntrack_core.c	Fri Apr 27 14:15:01 2001
-+++ linux/net/ipv4/netfilter/ip_conntrack_core.c	Fri Jun  1 00:31:00 2001
+diff -ruN linux-2.4.14/net/ipv4/netfilter/ip_conntrack_core.c linux-2.4.14_traf/net/ipv4/netfilter/ip_conntrack_core.c
+--- linux-2.4.14/net/ipv4/netfilter/ip_conntrack_core.c	Wed Aug  8 01:30:50 2001
++++ linux-2.4.14_traf/net/ipv4/netfilter/ip_conntrack_core.c	Tue Nov  6 14:04:45 2001
 @@ -45,10 +45,10 @@
  
  DECLARE_RWLOCK(ip_conntrack_lock);
@@ -457,7 +478,16 @@
  	kmem_cache_free(ip_conntrack_cachep, ct);
  	atomic_dec(&ip_conntrack_count);
  }
-@@ -570,7 +618,7 @@
+@@ -520,6 +568,8 @@
+ 	conntrack->tuplehash[IP_CT_DIR_ORIGINAL].ctrack = conntrack;
+ 	conntrack->tuplehash[IP_CT_DIR_REPLY].tuple = repl_tuple;
+ 	conntrack->tuplehash[IP_CT_DIR_REPLY].ctrack = conntrack;
++	conntrack->traffic.octets_original = 0;
++	conntrack->traffic.octets_reply = 0;
+ 	for (i=0; i < IP_CT_NUMBER; i++)
+ 		conntrack->infos[i].master = &conntrack->ct_general;
+ 
+@@ -570,7 +620,7 @@
  static inline struct ip_conntrack *
  resolve_normal_ct(struct sk_buff *skb,
  		  struct ip_conntrack_protocol *proto,
@@ -466,7 +496,7 @@
  		  unsigned int hooknum,
  		  enum ip_conntrack_info *ctinfo)
  {
-@@ -611,6 +659,7 @@
+@@ -611,6 +661,7 @@
  			DEBUGP("ip_conntrack_in: new packet for %p\n",
  			       h->ctrack);
  			*ctinfo = IP_CT_NEW;
@@ -474,7 +504,7 @@
  		}
  		*set_reply = 0;
  	}
-@@ -628,7 +677,7 @@
+@@ -628,7 +679,7 @@
  	struct ip_conntrack *ct;
  	enum ip_conntrack_info ctinfo;
  	struct ip_conntrack_protocol *proto;
@@ -483,7 +513,7 @@
  	int ret;
  
  	/* FIXME: Do this right please. --RR */
-@@ -668,7 +717,8 @@
+@@ -668,7 +719,8 @@
  	    && icmp_error_track(*pskb, &ctinfo, hooknum))
  		return NF_ACCEPT;
  
@@ -493,17 +523,22 @@
  		/* Not valid part of a connection */
  		return NF_ACCEPT;
  
-@@ -678,7 +728,8 @@
+@@ -678,7 +730,13 @@
  
  	IP_NF_ASSERT((*pskb)->nfct);
  
 -	ret = proto->packet(ct, (*pskb)->nh.iph, (*pskb)->len, ctinfo);
++	if (set_reply)
++		ct->traffic.octets_reply += (*pskb)->len;
++	else
++		ct->traffic.octets_original += (*pskb)->len;
++
 +	ret = proto->packet(ct, (*pskb)->nh.iph, (*pskb)->len, ctinfo,
 +	    &set_notify);
  	if (ret == -1) {
  		/* Invalid */
  		nf_conntrack_put((*pskb)->nfct);
-@@ -698,7 +749,8 @@
+@@ -698,7 +756,8 @@
  	}
  	if (set_reply)
  		set_bit(IPS_SEEN_REPLY_BIT, &ct->status);
@@ -513,7 +548,7 @@
  	return ret;
  }
  
-@@ -1050,6 +1102,7 @@
+@@ -1050,6 +1109,7 @@
  #ifdef CONFIG_SYSCTL
  	unregister_sysctl_table(ip_conntrack_sysctl_header);
  #endif
@@ -521,10 +556,10 @@
  	ip_ct_attach = NULL;
  	/* This makes sure all current packets have passed through
             netfilter framework.  Roll on, two-stage module
-diff -ruN linux-2.4.5-ac5/net/ipv4/netfilter/ip_conntrack_netlink.c linux/net/ipv4/netfilter/ip_conntrack_netlink.c
---- linux-2.4.5-ac5/net/ipv4/netfilter/ip_conntrack_netlink.c	Wed Dec 31 16:00:00 1969
-+++ linux/net/ipv4/netfilter/ip_conntrack_netlink.c	Fri Jun  1 00:31:00 2001
-@@ -0,0 +1,523 @@
+diff -ruN linux-2.4.14/net/ipv4/netfilter/ip_conntrack_netlink.c linux-2.4.14_traf/net/ipv4/netfilter/ip_conntrack_netlink.c
+--- linux-2.4.14/net/ipv4/netfilter/ip_conntrack_netlink.c	Thu Jan  1 10:00:00 1970
++++ linux-2.4.14_traf/net/ipv4/netfilter/ip_conntrack_netlink.c	Tue Nov  6 14:04:45 2001
+@@ -0,0 +1,524 @@
 +/* Connection tracking via netlink socket. Allows for user space
 + * protocol helpers and general trouble making from userspace.
 + *
@@ -611,6 +646,7 @@
 +		&ct->tuplehash[IP_CT_DIR_REPLY].tuple);
 +	s = ct->status;
 +	CTA_PUT(skb, CTA_STATUS, sizeof(unsigned long), &s);
++	CTA_PUT(skb, CTA_TRAFINFO, sizeof(struct ip_conntrack_traffic), &(ct->traffic));
 +	if(in)
 +		CTA_PUT(skb, CTA_IIF, IFNAMSIZ, in->name);
 +        if(out)
@@ -1048,9 +1084,9 @@
 +
 +module_init(ctnetlink_init);
 +module_exit(ctnetlink_exit);
-diff -ruN linux-2.4.5-ac5/net/ipv4/netfilter/ip_conntrack_proto_generic.c linux/net/ipv4/netfilter/ip_conntrack_proto_generic.c
---- linux-2.4.5-ac5/net/ipv4/netfilter/ip_conntrack_proto_generic.c	Fri Apr 27 14:15:01 2001
-+++ linux/net/ipv4/netfilter/ip_conntrack_proto_generic.c	Fri Jun  1 00:31:00 2001
+diff -ruN linux-2.4.14/net/ipv4/netfilter/ip_conntrack_proto_generic.c linux-2.4.14_traf/net/ipv4/netfilter/ip_conntrack_proto_generic.c
+--- linux-2.4.14/net/ipv4/netfilter/ip_conntrack_proto_generic.c	Sat Apr 28 07:15:01 2001
++++ linux-2.4.14_traf/net/ipv4/netfilter/ip_conntrack_proto_generic.c	Tue Nov  6 14:03:46 2001
 @@ -41,7 +41,7 @@
  /* Returns verdict for packet, or -1 for invalid. */
  static int established(struct ip_conntrack *conntrack,
@@ -1060,9 +1096,9 @@
  {
  	ip_ct_refresh(conntrack, GENERIC_TIMEOUT);
  	return NF_ACCEPT;
-diff -ruN linux-2.4.5-ac5/net/ipv4/netfilter/ip_conntrack_proto_icmp.c linux/net/ipv4/netfilter/ip_conntrack_proto_icmp.c
---- linux-2.4.5-ac5/net/ipv4/netfilter/ip_conntrack_proto_icmp.c	Fri Apr 27 14:15:01 2001
-+++ linux/net/ipv4/netfilter/ip_conntrack_proto_icmp.c	Fri Jun  1 00:31:00 2001
+diff -ruN linux-2.4.14/net/ipv4/netfilter/ip_conntrack_proto_icmp.c linux-2.4.14_traf/net/ipv4/netfilter/ip_conntrack_proto_icmp.c
+--- linux-2.4.14/net/ipv4/netfilter/ip_conntrack_proto_icmp.c	Sat Apr 28 07:15:01 2001
++++ linux-2.4.14_traf/net/ipv4/netfilter/ip_conntrack_proto_icmp.c	Tue Nov  6 14:03:46 2001
 @@ -70,7 +70,7 @@
  /* Returns verdict for packet, or -1 for invalid. */
  static int icmp_packet(struct ip_conntrack *ct,
@@ -1072,9 +1108,9 @@
  {
  	/* Try to delete connection immediately after all replies:
             won't actually vanish as we still have skb, and del_timer
-diff -ruN linux-2.4.5-ac5/net/ipv4/netfilter/ip_conntrack_proto_tcp.c linux/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
---- linux-2.4.5-ac5/net/ipv4/netfilter/ip_conntrack_proto_tcp.c	Fri Apr 27 14:15:01 2001
-+++ linux/net/ipv4/netfilter/ip_conntrack_proto_tcp.c	Fri Jun  1 00:31:00 2001
+diff -ruN linux-2.4.14/net/ipv4/netfilter/ip_conntrack_proto_tcp.c linux-2.4.14_traf/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
+--- linux-2.4.14/net/ipv4/netfilter/ip_conntrack_proto_tcp.c	Sat Apr 28 07:15:01 2001
++++ linux-2.4.14_traf/net/ipv4/netfilter/ip_conntrack_proto_tcp.c	Tue Nov  6 14:03:46 2001
 @@ -146,7 +146,7 @@
  /* Returns verdict for packet, or -1 for invalid. */
  static int tcp_packet(struct ip_conntrack *conntrack,
@@ -1106,9 +1142,9 @@
  
  		ip_ct_refresh(conntrack, tcp_timeouts[newconntrack]);
  	}
-diff -ruN linux-2.4.5-ac5/net/ipv4/netfilter/ip_conntrack_proto_udp.c linux/net/ipv4/netfilter/ip_conntrack_proto_udp.c
---- linux-2.4.5-ac5/net/ipv4/netfilter/ip_conntrack_proto_udp.c	Fri Apr 27 14:15:01 2001
-+++ linux/net/ipv4/netfilter/ip_conntrack_proto_udp.c	Fri Jun  1 00:31:00 2001
+diff -ruN linux-2.4.14/net/ipv4/netfilter/ip_conntrack_proto_udp.c linux-2.4.14_traf/net/ipv4/netfilter/ip_conntrack_proto_udp.c
+--- linux-2.4.14/net/ipv4/netfilter/ip_conntrack_proto_udp.c	Sat Apr 28 07:15:01 2001
++++ linux-2.4.14_traf/net/ipv4/netfilter/ip_conntrack_proto_udp.c	Tue Nov  6 14:03:46 2001
 @@ -47,14 +47,17 @@
  /* Returns verdict for packet, and may modify conntracktype */
  static int udp_packet(struct ip_conntrack *conntrack,
@@ -1128,10 +1164,10 @@
  	} else
  		ip_ct_refresh(conntrack, UDP_TIMEOUT);
  
-diff -ruN linux-2.4.5-ac5/net/ipv4/netfilter/ip_conntrack_standalone.c linux/net/ipv4/netfilter/ip_conntrack_standalone.c
---- linux-2.4.5-ac5/net/ipv4/netfilter/ip_conntrack_standalone.c	Fri Apr 27 14:15:01 2001
-+++ linux/net/ipv4/netfilter/ip_conntrack_standalone.c	Fri Jun  1 00:31:00 2001
-@@ -320,14 +320,19 @@
+diff -ruN linux-2.4.14/net/ipv4/netfilter/ip_conntrack_standalone.c linux-2.4.14_traf/net/ipv4/netfilter/ip_conntrack_standalone.c
+--- linux-2.4.14/net/ipv4/netfilter/ip_conntrack_standalone.c	Mon Oct  1 05:26:08 2001
++++ linux-2.4.14_traf/net/ipv4/netfilter/ip_conntrack_standalone.c	Tue Nov  6 14:03:46 2001
+@@ -327,14 +327,19 @@
  EXPORT_SYMBOL(ip_conntrack_protocol_register);
  EXPORT_SYMBOL(invert_tuplepr);
  EXPORT_SYMBOL(ip_conntrack_alter_reply);
@@ -1152,9 +1188,9 @@
 +EXPORT_SYMBOL(ip_conntrack_lock);
 +EXPORT_SYMBOL(ip_conntrack_put);
 +EXPORT_SYMBOL(ip_conntrack_find_get);
-diff -ruN linux-2.4.5-ac5/net/ipv4/netfilter/ip_nat_core.c linux/net/ipv4/netfilter/ip_nat_core.c
---- linux-2.4.5-ac5/net/ipv4/netfilter/ip_nat_core.c	Wed May 16 10:31:27 2001
-+++ linux/net/ipv4/netfilter/ip_nat_core.c	Fri Jun  1 00:31:00 2001
+diff -ruN linux-2.4.14/net/ipv4/netfilter/ip_nat_core.c linux-2.4.14_traf/net/ipv4/netfilter/ip_nat_core.c
+--- linux-2.4.14/net/ipv4/netfilter/ip_nat_core.c	Thu May 17 03:31:27 2001
++++ linux-2.4.14_traf/net/ipv4/netfilter/ip_nat_core.c	Tue Nov  6 14:03:46 2001
 @@ -856,6 +856,10 @@
  	return NF_ACCEPT;
  }
@@ -1185,9 +1221,9 @@
 -	ip_conntrack_destroyed = NULL;
 +	ip_conntrack_notify_unregister(&nat_notify);
  }
-diff -ruN linux-2.4.5-ac5/net/netlink/netlink_dev.c linux/net/netlink/netlink_dev.c
---- linux-2.4.5-ac5/net/netlink/netlink_dev.c	Fri Feb  9 11:29:44 2001
-+++ linux/net/netlink/netlink_dev.c	Fri Jun  1 00:31:00 2001
+diff -ruN linux-2.4.14/net/netlink/netlink_dev.c linux-2.4.14_traf/net/netlink/netlink_dev.c
+--- linux-2.4.14/net/netlink/netlink_dev.c	Sat Feb 10 06:29:44 2001
++++ linux-2.4.14_traf/net/netlink/netlink_dev.c	Tue Nov  6 14:03:46 2001
 @@ -200,6 +200,7 @@
  	make_devfs_entries ("skip", 1);
  	make_devfs_entries ("USERSOCK", 2);