[netfilter-cvslog] r3719 -
trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter
yasuyuki at netfilter.org
yasuyuki at netfilter.org
Thu Feb 17 16:52:47 CET 2005
Author: yasuyuki at netfilter.org
Date: 2005-02-17 16:52:46 +0100 (Thu, 17 Feb 2005)
New Revision: 3719
Modified:
trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_core.h
Log:
- protocol_list and l3proto_list are unused already.
- add missing comment
- editorial cleanup to reduce difference with ip_conntrack.
Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_core.h
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_core.h 2005-02-17 08:12:29 UTC (rev 3718)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_core.h 2005-02-17 15:52:46 UTC (rev 3719)
@@ -15,35 +15,38 @@
#include <linux/netfilter.h>
#include <linux/netfilter_ipv4/lockhelp.h>
-extern unsigned int
-nf_conntrack_in(int pf, unsigned int hooknum, struct sk_buff **pskb);
+/* This header is used to share core functionality between the
+ standalone connection tracking module, and the compatibility layer's use
+ of connection tracking. */
+extern unsigned int nf_conntrack_in(int pf,
+ unsigned int hooknum,
+ struct sk_buff **pskb);
extern int nf_conntrack_init(void);
extern void nf_conntrack_cleanup(void);
-extern struct list_head protocol_list;
-
struct nf_conntrack_l3proto;
extern struct nf_conntrack_l3proto *nf_ct_find_l3proto(u_int16_t pf);
/* Like above, but you already have conntrack read lock. */
extern struct nf_conntrack_l3proto *__nf_ct_find_l3proto(u_int16_t l3proto);
-extern struct list_head l3proto_list;
struct nf_conntrack_protocol;
-extern int nf_ct_get_tuple(const struct sk_buff *skb,
- unsigned int nhoff,
- unsigned int dataoff,
- u_int16_t l3num,
- u_int8_t protonum,
- struct nf_conntrack_tuple *tuple,
- const struct nf_conntrack_l3proto *l3proto,
- const struct nf_conntrack_protocol *protocol);
+extern int
+nf_ct_get_tuple(const struct sk_buff *skb,
+ unsigned int nhoff,
+ unsigned int dataoff,
+ u_int16_t l3num,
+ u_int8_t protonum,
+ struct nf_conntrack_tuple *tuple,
+ const struct nf_conntrack_l3proto *l3proto,
+ const struct nf_conntrack_protocol *protocol);
-extern int nf_ct_invert_tuple(struct nf_conntrack_tuple *inverse,
- const struct nf_conntrack_tuple *orig,
- const struct nf_conntrack_l3proto *l3proto,
- const struct nf_conntrack_protocol *protocol);
+extern int
+nf_ct_invert_tuple(struct nf_conntrack_tuple *inverse,
+ const struct nf_conntrack_tuple *orig,
+ const struct nf_conntrack_l3proto *l3proto,
+ const struct nf_conntrack_protocol *protocol);
/* Find a connection corresponding to a tuple. */
extern struct nf_conntrack_tuple_hash *
@@ -58,7 +61,6 @@
if ((*pskb)->nfct
&& !is_confirmed((struct nf_conn *)(*pskb)->nfct))
return __nf_conntrack_confirm(pskb);
-
return NF_ACCEPT;
}
More information about the netfilter-cvslog
mailing list