projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[NETFILTER]: nf_conntrack_expect: function naming unification
[deliverable/linux.git]
/
include
/
net
/
netfilter
/
nf_conntrack_core.h
diff --git
a/include/net/netfilter/nf_conntrack_core.h
b/include/net/netfilter/nf_conntrack_core.h
index da254525a4ceb739f63abc7d784573c3cc8b2320..a18f79c80db8ef4fe3ff4182b550189e0e5267cf 100644
(file)
--- a/
include/net/netfilter/nf_conntrack_core.h
+++ b/
include/net/netfilter/nf_conntrack_core.h
@@
-13,6
+13,9
@@
#define _NF_CONNTRACK_CORE_H
#include <linux/netfilter.h>
#define _NF_CONNTRACK_CORE_H
#include <linux/netfilter.h>
+#include <net/netfilter/nf_conntrack_l3proto.h>
+#include <net/netfilter/nf_conntrack_l4proto.h>
+#include <net/netfilter/nf_conntrack_ecache.h>
/* This header is used to share core functionality between the
standalone connection tracking module, and the compatibility layer's use
/* This header is used to share core functionality between the
standalone connection tracking module, and the compatibility layer's use
@@
-24,12
+27,18
@@
extern unsigned int nf_conntrack_in(int pf,
extern int nf_conntrack_init(void);
extern void nf_conntrack_cleanup(void);
extern int nf_conntrack_init(void);
extern void nf_conntrack_cleanup(void);
+extern int nf_conntrack_proto_init(void);
+extern void nf_conntrack_proto_fini(void);
+
+extern int nf_conntrack_helper_init(void);
+extern void nf_conntrack_helper_fini(void);
+
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);
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);
-struct nf_conntrack_
protocol
;
+struct nf_conntrack_
l4proto
;
extern int
nf_ct_get_tuple(const struct sk_buff *skb,
extern int
nf_ct_get_tuple(const struct sk_buff *skb,
@@
-39,18
+48,17
@@
nf_ct_get_tuple(const struct sk_buff *skb,
u_int8_t protonum,
struct nf_conntrack_tuple *tuple,
const struct nf_conntrack_l3proto *l3proto,
u_int8_t protonum,
struct nf_conntrack_tuple *tuple,
const struct nf_conntrack_l3proto *l3proto,
- const struct nf_conntrack_
protocol *protocol
);
+ const struct nf_conntrack_
l4proto *l4proto
);
extern int
nf_ct_invert_tuple(struct nf_conntrack_tuple *inverse,
const struct nf_conntrack_tuple *orig,
const struct nf_conntrack_l3proto *l3proto,
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
);
+ const struct nf_conntrack_
l4proto *l4proto
);
/* Find a connection corresponding to a tuple. */
extern struct nf_conntrack_tuple_hash *
/* Find a connection corresponding to a tuple. */
extern struct nf_conntrack_tuple_hash *
-nf_conntrack_find_get(const struct nf_conntrack_tuple *tuple,
- const struct nf_conn *ignored_conntrack);
+nf_conntrack_find_get(const struct nf_conntrack_tuple *tuple);
extern int __nf_conntrack_confirm(struct sk_buff **pskb);
extern int __nf_conntrack_confirm(struct sk_buff **pskb);
@@
-61,7
+69,7
@@
static inline int nf_conntrack_confirm(struct sk_buff **pskb)
int ret = NF_ACCEPT;
if (ct) {
int ret = NF_ACCEPT;
if (ct) {
- if (!nf_ct_is_confirmed(ct))
+ if (!nf_ct_is_confirmed(ct)
&& !nf_ct_is_dying(ct)
)
ret = __nf_conntrack_confirm(pskb);
nf_ct_deliver_cached_events(ct);
}
ret = __nf_conntrack_confirm(pskb);
nf_ct_deliver_cached_events(ct);
}
@@
-70,7
+78,14
@@
static inline int nf_conntrack_confirm(struct sk_buff **pskb)
extern void __nf_conntrack_attach(struct sk_buff *nskb, struct sk_buff *skb);
extern void __nf_conntrack_attach(struct sk_buff *nskb, struct sk_buff *skb);
-extern struct list_head *nf_conntrack_hash;
-extern struct list_head nf_conntrack_expect_list;
+int
+print_tuple(struct seq_file *s, const struct nf_conntrack_tuple *tuple,
+ struct nf_conntrack_l3proto *l3proto,
+ struct nf_conntrack_l4proto *proto);
+
+extern struct hlist_head *nf_conntrack_hash;
+extern struct list_head nf_ct_expect_list;
extern rwlock_t nf_conntrack_lock ;
extern rwlock_t nf_conntrack_lock ;
+extern struct hlist_head unconfirmed;
+
#endif /* _NF_CONNTRACK_CORE_H */
#endif /* _NF_CONNTRACK_CORE_H */
This page took
0.029246 seconds
and
5
git commands to generate.