Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfdb8d79 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Patrick McHardy
Browse files

netfilter: netns nf_conntrack: add netns boilerplate 



One comment: #ifdefs around #include is necessary to overcome amazing compile
breakages in NOTRACK-in-netns patch (see below).

Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent e10aad99

include/net/net_namespace.h

+6 −0
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 
#include <net/netns/ipv6.h>

#include <net/netns/dccp.h>

#include <net/netns/x_tables.h>

#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)

#include <net/netns/conntrack.h>

#endif



struct proc_dir_entry;

struct net_device;
@@ -67,6 +70,9 @@ struct net { 
#endif

#ifdef CONFIG_NETFILTER

	struct netns_xt		xt;

#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)

	struct netns_ct		ct;

#endif

#endif

	struct net_generic	*gen;

};

include/net/netfilter/nf_conntrack_core.h

+2 −2
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ extern unsigned int nf_conntrack_in(u_int8_t pf, 
				    unsigned int hooknum,

				    struct sk_buff *skb);



extern int nf_conntrack_init(void);

extern void nf_conntrack_cleanup(void);

extern int nf_conntrack_init(struct net *net);

extern void nf_conntrack_cleanup(struct net *net);



extern int nf_conntrack_proto_init(void);

extern void nf_conntrack_proto_fini(void);

include/net/netns/conntrack.h

0 → 100644
+6 −0
Original line number Diff line number Diff line 
#ifndef __NETNS_CONNTRACK_H

#define __NETNS_CONNTRACK_H



struct netns_ct {

};

#endif

net/netfilter/nf_conntrack_core.c

+2 −2
Original line number Diff line number Diff line
@@ -1006,7 +1006,7 @@ EXPORT_SYMBOL_GPL(nf_conntrack_flush); 


/* Mishearing the voices in his head, our hero wonders how he's

   supposed to kill the mall. */

void nf_conntrack_cleanup(void)

void nf_conntrack_cleanup(struct net *net)

{

	rcu_assign_pointer(ip_ct_attach, NULL);
@@ -1120,7 +1120,7 @@ EXPORT_SYMBOL_GPL(nf_conntrack_set_hashsize); 
module_param_call(hashsize, nf_conntrack_set_hashsize, param_get_uint,

		  &nf_conntrack_htable_size, 0600);



int __init nf_conntrack_init(void)

int nf_conntrack_init(struct net *net)

{

	int max_factor = 8;

	int ret;

net/netfilter/nf_conntrack_expect.c

+2 −2
Original line number Diff line number Diff line
@@ -537,7 +537,7 @@ static const struct file_operations exp_file_ops = { 
};

#endif /* CONFIG_PROC_FS */



static int __init exp_proc_init(void)

static int exp_proc_init(void)

{

#ifdef CONFIG_PROC_FS

	struct proc_dir_entry *proc;
@@ -558,7 +558,7 @@ static void exp_proc_remove(void) 


module_param_named(expect_hashsize, nf_ct_expect_hsize, uint, 0600);



int __init nf_conntrack_expect_init(void)

int nf_conntrack_expect_init(void)

{

	int err = -ENOMEM;