[netfilter-cvslog] r3715 - trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-02-15 14:49:13 +0100 (Tue, 15 Feb 2005)
New Revision: 3715

Modified:
   trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack.h
   trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_ftp.h
   trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_helper.h
   trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_tcp.h
Log:
further fixes of latest ip_conntrack resync


Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack.h
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack.h	2005-02-15 12:44:20 UTC (rev 3714)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack.h	2005-02-15 13:49:13 UTC (rev 3715)
@@ -191,7 +191,7 @@
 static inline struct nf_conn *
 tuplehash_to_ctrack(const struct nf_conntrack_tuple_hash *hash)
 {
-	return container_of(hash, struct ip_conntrack,
+	return container_of(hash, struct nf_conn,
 			    tuplehash[hash->tuple.dst.dir]);
 }
 

Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_ftp.h
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_ftp.h	2005-02-15 12:44:20 UTC (rev 3714)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_ftp.h	2005-02-15 13:49:13 UTC (rev 3715)
@@ -45,7 +45,7 @@
 	int seq_aft_nl_num[NF_CT_DIR_MAX];
 };
 
-struct ip_conntrack_expect;
+struct nf_conntrack_expect;
 
 /* For NAT to hook in when we find a packet which describes what other
  * connection we should expect. */

Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_helper.h
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_helper.h	2005-02-15 12:44:20 UTC (rev 3714)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_helper.h	2005-02-15 13:49:13 UTC (rev 3715)
@@ -30,7 +30,6 @@
 	/* Function to call when data passes; return verdict, or -1 to
            invalidate. */
 	int (*help)(struct sk_buff **pskb,
-		    unsigned int dataoff,
 		    struct nf_conn *ct,
 		    enum nf_conntrack_info conntrackinfo);
 };

Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_tcp.h
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_tcp.h	2005-02-15 12:44:20 UTC (rev 3714)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_tcp.h	2005-02-15 13:49:13 UTC (rev 3715)
@@ -49,10 +49,14 @@
 	u_int32_t	last_end;	/* Last seq + len */
 };
 
+/* Need this, since this file is included before the nf_conn definition
+ * in nf_conntrack.h */
+struct nf_conn;
+
 /* Update TCP window tracking data when NAT mangles the packet */
-extern int nf_conntrack_tcp_update(struct sk_buff *skb,
-				   unsigned int dataoff,
-				   struct nf_conn *conntrack,
-				   int dir);
+extern void nf_conntrack_tcp_update(struct sk_buff *skb,
+				    unsigned int dataoff,
+				    struct nf_conn *conntrack,
+				    int dir);
 
 #endif /* _NF_CONNTRACK_TCP_H */