[netfilter-cvslog] r3722 - in trunk/patch-o-matic-ng/nf_conntrack/linux-2.6: include/linux/netfilter net/netfilter

[yasuyuki at netfilter.org]

Author: yasuyuki at netfilter.org
Date: 2005-02-17 17:15:22 +0100 (Thu, 17 Feb 2005)
New Revision: 3722

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_protocol.h
   trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_core.c
   trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_proto_udp.c
Log:
- editorial cleanup to reduce difference with ip_conntrack.



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-17 16:13:40 UTC (rev 3721)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack.h	2005-02-17 16:15:22 UTC (rev 3722)
@@ -101,33 +101,6 @@
 #define NF_CT_ASSERT(x)
 #endif
 
-struct nf_conntrack_expect
-{
-	/* Internal linked list (global expectation list) */
-	struct list_head list;
-
-	/* We expect this tuple, with the following mask */
-	struct nf_conntrack_tuple tuple, mask;
- 
-	/* Function to call after setup and insertion */
-	void (*expectfn)(struct nf_conn *new,
-			 struct nf_conntrack_expect *this);
-
-	/* The conntrack of the master connection */
-	struct nf_conn *master;
-
-	/* Timer function; deletes the expectation. */
-	struct timer_list timeout;
-
-#ifdef CONFIG_NF_NAT_NEEDED
-	/* This is the original per-proto part, used to map the
-	 * expected connection the way the recipient expects. */
-	union nf_conntrack_manip_proto saved_proto;
-	/* Direction relative to the master connection. */
-	enum nf_conntrack_dir dir;
-#endif
-};
-
 struct nf_conntrack_counter
 {
 	u_int64_t packets;
@@ -188,6 +161,33 @@
 	void *data[0];
 };
 
+struct nf_conntrack_expect
+{
+	/* Internal linked list (global expectation list) */
+	struct list_head list;
+
+	/* We expect this tuple, with the following mask */
+	struct nf_conntrack_tuple tuple, mask;
+ 
+	/* Function to call after setup and insertion */
+	void (*expectfn)(struct nf_conn *new,
+			 struct nf_conntrack_expect *this);
+
+	/* The conntrack of the master connection */
+	struct nf_conn *master;
+
+	/* Timer function; deletes the expectation. */
+	struct timer_list timeout;
+
+#ifdef CONFIG_NF_NAT_NEEDED
+	/* This is the original per-proto part, used to map the
+	 * expected connection the way the recipient expects. */
+	union nf_conntrack_manip_proto saved_proto;
+	/* Direction relative to the master connection. */
+	enum nf_conntrack_dir dir;
+#endif
+};
+
 static inline struct nf_conn *
 tuplehash_to_ctrack(const struct nf_conntrack_tuple_hash *hash)
 {

Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_protocol.h
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_protocol.h	2005-02-17 16:13:40 UTC (rev 3721)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_protocol.h	2005-02-17 16:15:22 UTC (rev 3722)
@@ -27,7 +27,7 @@
 	/* Protocol name */
 	const char *name;
 
-	/* Try to fill in the third arg: dataoff is offset past NF
+	/* Try to fill in the third arg: dataoff is offset past network protocol
            hdr.  Return true if possible. */
 	int (*pkt_to_tuple)(const struct sk_buff *skb,
 			    unsigned int dataoff,

Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_core.c
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_core.c	2005-02-17 16:13:40 UTC (rev 3721)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_core.c	2005-02-17 16:15:22 UTC (rev 3722)
@@ -1153,7 +1153,7 @@
 #ifdef CONFIG_NF_CT_ACCT
 	if (skb) {
 		ct->counters[NFCTINFO2DIR(ctinfo)].packets++;
-		/* XXX totlen should be used ? - kozakai */
+		/* XXX totlen should be used ? - YK */
 		ct->counters[NFCTINFO2DIR(ctinfo)].bytes +=
 			ntohs(skb->len - (unsigned int)(skb->nh.raw
 							- skb->data));

Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_proto_udp.c
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_proto_udp.c	2005-02-17 16:13:40 UTC (rev 3721)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_proto_udp.c	2005-02-17 16:15:22 UTC (rev 3722)
@@ -90,6 +90,13 @@
 	return NF_ACCEPT;
 }
 
+/* Called when a new connection for this protocol found. */
+static int udp_new(struct nf_conn *conntrack, const struct sk_buff *skb,
+		   unsigned int dataoff)
+{
+	return 1;
+}
+
 static int udp_error(struct sk_buff *skb, unsigned int dataoff,
 		     enum nf_conntrack_info *ctinfo,
 		     int pf,
@@ -173,13 +180,6 @@
 	return udp_error(skb, dataoff, ctinfo, pf, hooknum, csum6);
 }
 
-/* Called when a new connection for this protocol found. */
-static int udp_new(struct nf_conn *conntrack, const struct sk_buff *skb,
-		   unsigned int dataoff)
-{
-	return 1;
-}
-
 struct nf_conntrack_protocol nf_conntrack_protocol_udp4 =
 {
 	.l3proto		= PF_INET,