Skip to content

L
linux-davinci
Commit f8eb24a8 authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files
Options

[NETFILTER]: nf_conntrack: move extern declaration to header files 

Using extern in a C file is a bad idea because the compiler can't
catch type errors.
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent d7346853
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 37 deletions
include/net/netfilter/ipv4/nf_conntrack_ipv4.h
View file @ f8eb24a8
...@@ -37,4 +37,8 @@ struct nf_conntrack_ipv4 { ...@@ -37,4 +37,8 @@ struct nf_conntrack_ipv4 {
struct sk_buff * struct sk_buff *
nf_ct_ipv4_ct_gather_frags(struct sk_buff *skb); nf_ct_ipv4_ct_gather_frags(struct sk_buff *skb);
extern struct nf_conntrack_l4proto nf_conntrack_l4proto_tcp4;
extern struct nf_conntrack_l4proto nf_conntrack_l4proto_udp4;
extern struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp;
#endif /*_NF_CONNTRACK_IPV4_H*/ #endif /*_NF_CONNTRACK_IPV4_H*/
include/net/netfilter/ipv6/nf_conntrack_ipv6.h 0 → 100644
View file @ f8eb24a8
#ifndef _NF_CONNTRACK_IPV6_H
#define _NF_CONNTRACK_IPV6_H
extern struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv6;
extern struct nf_conntrack_l4proto nf_conntrack_l4proto_tcp6;
extern struct nf_conntrack_l4proto nf_conntrack_l4proto_udp6;
extern struct nf_conntrack_l4proto nf_conntrack_l4proto_icmpv6;
extern int nf_ct_ipv6_skip_exthdr(struct sk_buff *skb, int start,
u8 *nexthdrp, int len);
extern int nf_ct_frag6_init(void);
extern void nf_ct_frag6_cleanup(void);
extern struct sk_buff *nf_ct_frag6_gather(struct sk_buff *skb);
extern void nf_ct_frag6_output(unsigned int hooknum, struct sk_buff *skb,
struct net_device *in,
struct net_device *out,
int (*okfn)(struct sk_buff *));
extern unsigned int nf_ct_frag6_timeout;
extern unsigned int nf_ct_frag6_low_thresh;
extern unsigned int nf_ct_frag6_high_thresh;
#endif /* _NF_CONNTRACK_IPV6_H*/
include/net/netfilter/nf_conntrack.h
View file @ f8eb24a8
...@@ -79,6 +79,8 @@ struct nf_conn_help { ...@@ -79,6 +79,8 @@ struct nf_conn_help {
#include <net/netfilter/ipv4/nf_conntrack_ipv4.h> #include <net/netfilter/ipv4/nf_conntrack_ipv4.h>
#include <net/netfilter/ipv6/nf_conntrack_ipv6.h>
struct nf_conn struct nf_conn
{ {
/* Usage count in here is 1 for hash table/destruct timer, 1 per skb, /* Usage count in here is 1 for hash table/destruct timer, 1 per skb,
...@@ -241,7 +243,10 @@ static inline int nf_ct_is_dying(struct nf_conn *ct) ...@@ -241,7 +243,10 @@ static inline int nf_ct_is_dying(struct nf_conn *ct)
extern unsigned int nf_conntrack_htable_size; extern unsigned int nf_conntrack_htable_size;
extern int nf_conntrack_checksum; extern int nf_conntrack_checksum;
extern atomic_t nf_conntrack_count;
extern int nf_conntrack_max;
DECLARE_PER_CPU(struct ip_conntrack_stat, nf_conntrack_stat);
#define NF_CT_STAT_INC(count) (__get_cpu_var(nf_conntrack_stat).count++) #define NF_CT_STAT_INC(count) (__get_cpu_var(nf_conntrack_stat).count++)
/* no helper, no nat */ /* no helper, no nat */
......
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
View file @ f8eb24a8
...@@ -38,8 +38,6 @@ ...@@ -38,8 +38,6 @@
#define DEBUGP(format, args...) #define DEBUGP(format, args...)
#endif #endif
DECLARE_PER_CPU(struct nf_conntrack_stat, nf_conntrack_stat);
static int ipv4_pkt_to_tuple(const struct sk_buff *skb, unsigned int nhoff, static int ipv4_pkt_to_tuple(const struct sk_buff *skb, unsigned int nhoff,
struct nf_conntrack_tuple *tuple) struct nf_conntrack_tuple *tuple)
{ {
...@@ -429,10 +427,6 @@ struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv4 = { ...@@ -429,10 +427,6 @@ struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv4 = {
.me = THIS_MODULE, .me = THIS_MODULE,
}; };
extern struct nf_conntrack_l4proto nf_conntrack_l4proto_tcp4;
extern struct nf_conntrack_l4proto nf_conntrack_l4proto_udp4;
extern struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp;
MODULE_ALIAS("nf_conntrack-" __stringify(AF_INET)); MODULE_ALIAS("nf_conntrack-" __stringify(AF_INET));
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
......
net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
View file @ f8eb24a8
...@@ -43,8 +43,6 @@ ...@@ -43,8 +43,6 @@
#define DEBUGP(format, args...) #define DEBUGP(format, args...)
#endif #endif
DECLARE_PER_CPU(struct ip_conntrack_stat, nf_conntrack_stat);
static int ipv6_pkt_to_tuple(const struct sk_buff *skb, unsigned int nhoff, static int ipv6_pkt_to_tuple(const struct sk_buff *skb, unsigned int nhoff,
struct nf_conntrack_tuple *tuple) struct nf_conntrack_tuple *tuple)
{ {
...@@ -211,11 +209,6 @@ out: ...@@ -211,11 +209,6 @@ out:
return nf_conntrack_confirm(pskb); return nf_conntrack_confirm(pskb);
} }
extern struct sk_buff *nf_ct_frag6_gather(struct sk_buff *skb);
extern void nf_ct_frag6_output(unsigned int hooknum, struct sk_buff *skb,
struct net_device *in,
struct net_device *out,
int (*okfn)(struct sk_buff *));
static unsigned int ipv6_defrag(unsigned int hooknum, static unsigned int ipv6_defrag(unsigned int hooknum,
struct sk_buff **pskb, struct sk_buff **pskb,
const struct net_device *in, const struct net_device *in,
...@@ -335,11 +328,6 @@ static struct nf_hook_ops ipv6_conntrack_ops[] = { ...@@ -335,11 +328,6 @@ static struct nf_hook_ops ipv6_conntrack_ops[] = {
/* From nf_conntrack_proto_icmpv6.c */ /* From nf_conntrack_proto_icmpv6.c */
extern unsigned int nf_ct_icmpv6_timeout; extern unsigned int nf_ct_icmpv6_timeout;
/* From nf_conntrack_reasm.c */
extern unsigned int nf_ct_frag6_timeout;
extern unsigned int nf_ct_frag6_low_thresh;
extern unsigned int nf_ct_frag6_high_thresh;
static struct ctl_table_header *nf_ct_ipv6_sysctl_header; static struct ctl_table_header *nf_ct_ipv6_sysctl_header;
static ctl_table nf_ct_sysctl_table[] = { static ctl_table nf_ct_sysctl_table[] = {
...@@ -458,12 +446,6 @@ struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv6 = { ...@@ -458,12 +446,6 @@ struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv6 = {
.me = THIS_MODULE, .me = THIS_MODULE,
}; };
extern struct nf_conntrack_l4proto nf_conntrack_l4proto_tcp6;
extern struct nf_conntrack_l4proto nf_conntrack_l4proto_udp6;
extern struct nf_conntrack_l4proto nf_conntrack_l4proto_icmpv6;
extern int nf_ct_frag6_init(void);
extern void nf_ct_frag6_cleanup(void);
MODULE_ALIAS("nf_conntrack-" __stringify(AF_INET6)); MODULE_ALIAS("nf_conntrack-" __stringify(AF_INET6));
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_AUTHOR("Yasuyuki KOZAKAI @USAGI <yasuyuki.kozakai@toshiba.co.jp>"); MODULE_AUTHOR("Yasuyuki KOZAKAI @USAGI <yasuyuki.kozakai@toshiba.co.jp>");
......
net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
View file @ f8eb24a8
...@@ -142,9 +142,6 @@ static int icmpv6_new(struct nf_conn *conntrack, ...@@ -142,9 +142,6 @@ static int icmpv6_new(struct nf_conn *conntrack,
return 1; return 1;
} }
extern int
nf_ct_ipv6_skip_exthdr(struct sk_buff *skb, int start, u8 *nexthdrp, int len);
extern struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv6;
static int static int
icmpv6_error_message(struct sk_buff *skb, icmpv6_error_message(struct sk_buff *skb,
unsigned int icmp6off, unsigned int icmp6off,
......
net/netfilter/nf_conntrack_expect.c
View file @ f8eb24a8
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
LIST_HEAD(nf_conntrack_expect_list); LIST_HEAD(nf_conntrack_expect_list);
kmem_cache_t *nf_conntrack_expect_cachep __read_mostly; kmem_cache_t *nf_conntrack_expect_cachep __read_mostly;
DECLARE_PER_CPU(struct ip_conntrack_stat, nf_conntrack_stat);
static unsigned int nf_conntrack_expect_next_id; static unsigned int nf_conntrack_expect_next_id;
/* nf_conntrack_expect helper functions */ /* nf_conntrack_expect helper functions */
......
net/netfilter/nf_conntrack_l3proto_generic.c
View file @ f8eb24a8
...@@ -37,8 +37,6 @@ ...@@ -37,8 +37,6 @@
#define DEBUGP(format, args...) #define DEBUGP(format, args...)
#endif #endif
DECLARE_PER_CPU(struct nf_conntrack_stat, nf_conntrack_stat);
static int generic_pkt_to_tuple(const struct sk_buff *skb, unsigned int nhoff, static int generic_pkt_to_tuple(const struct sk_buff *skb, unsigned int nhoff,
struct nf_conntrack_tuple *tuple) struct nf_conntrack_tuple *tuple)
{ {
......
net/netfilter/nf_conntrack_standalone.c
View file @ f8eb24a8
...@@ -44,9 +44,6 @@ ...@@ -44,9 +44,6 @@
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
extern atomic_t nf_conntrack_count;
DECLARE_PER_CPU(struct ip_conntrack_stat, nf_conntrack_stat);
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
int int
print_tuple(struct seq_file *s, const struct nf_conntrack_tuple *tuple, print_tuple(struct seq_file *s, const struct nf_conntrack_tuple *tuple,
...@@ -334,10 +331,6 @@ int nf_conntrack_checksum __read_mostly = 1; ...@@ -334,10 +331,6 @@ int nf_conntrack_checksum __read_mostly = 1;
#ifdef CONFIG_SYSCTL #ifdef CONFIG_SYSCTL
/* From nf_conntrack_core.c */
extern int nf_conntrack_max;
extern unsigned int nf_conntrack_htable_size;
/* From nf_conntrack_proto_tcp.c */ /* From nf_conntrack_proto_tcp.c */
extern unsigned int nf_ct_tcp_timeout_syn_sent; extern unsigned int nf_ct_tcp_timeout_syn_sent;
extern unsigned int nf_ct_tcp_timeout_syn_recv; extern unsigned int nf_ct_tcp_timeout_syn_recv;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment