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

Commit 4e665afb authored by Harsha Sharma's avatar Harsha Sharma Committed by Pablo Neira Ayuso
Browse files

netfilter: cttimeout: move ctnl_untimeout to nf_conntrack 



As, ctnl_untimeout is required by nft_ct, so move ctnl_timeout from
nfnetlink_cttimeout to nf_conntrack_timeout and rename as nf_ct_timeout.

Signed-off-by: default avatarHarsha Sharma <harshasharmaiitr@gmail.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 35a8a3bd

include/net/netfilter/nf_conntrack_timeout.h

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ static inline unsigned int *nf_ct_timeout_lookup(const struct nf_conn *ct) 
#ifdef CONFIG_NF_CONNTRACK_TIMEOUT

int nf_conntrack_timeout_init(void);

void nf_conntrack_timeout_fini(void);

void nf_ct_untimeout(struct net *net, struct ctnl_timeout *timeout);

#else

static inline int nf_conntrack_timeout_init(void)

{

net/netfilter/nf_conntrack_timeout.c

+17 −0
Original line number Diff line number Diff line
@@ -31,6 +31,23 @@ EXPORT_SYMBOL_GPL(nf_ct_timeout_find_get_hook); 
void (*nf_ct_timeout_put_hook)(struct ctnl_timeout *timeout) __read_mostly;

EXPORT_SYMBOL_GPL(nf_ct_timeout_put_hook);



static int untimeout(struct nf_conn *ct, void *timeout)

{

	struct nf_conn_timeout *timeout_ext = nf_ct_timeout_find(ct);



	if (timeout_ext && (!timeout || timeout_ext->timeout == timeout))

		RCU_INIT_POINTER(timeout_ext->timeout, NULL);



	/* We are not intended to delete this conntrack. */

	return 0;

}



void nf_ct_untimeout(struct net *net, struct ctnl_timeout *timeout)

{

	nf_ct_iterate_cleanup_net(net, untimeout, timeout, 0, 0);

}

EXPORT_SYMBOL_GPL(nf_ct_untimeout);



static const struct nf_ct_ext_type timeout_extend = {

	.len	= sizeof(struct nf_conn_timeout),

	.align	= __alignof__(struct nf_conn_timeout),

net/netfilter/nfnetlink_cttimeout.c

+2 −18
Original line number Diff line number Diff line
@@ -297,22 +297,6 @@ static int cttimeout_get_timeout(struct net *net, struct sock *ctnl, 
	return ret;

}



static int untimeout(struct nf_conn *ct, void *timeout)

{

	struct nf_conn_timeout *timeout_ext = nf_ct_timeout_find(ct);



	if (timeout_ext && (!timeout || timeout_ext->timeout == timeout))

		RCU_INIT_POINTER(timeout_ext->timeout, NULL);



	/* We are not intended to delete this conntrack. */

	return 0;

}



static void ctnl_untimeout(struct net *net, struct ctnl_timeout *timeout)

{

	nf_ct_iterate_cleanup_net(net, untimeout, timeout, 0, 0);

}



/* try to delete object, fail if it is still in use. */

static int ctnl_timeout_try_del(struct net *net, struct ctnl_timeout *timeout)

{
@@ -325,7 +309,7 @@ static int ctnl_timeout_try_del(struct net *net, struct ctnl_timeout *timeout) 
		/* We are protected by nfnl mutex. */

		list_del_rcu(&timeout->head);

		nf_ct_l4proto_put(timeout->l4proto);

		ctnl_untimeout(net, timeout);

		nf_ct_untimeout(net, timeout);

		kfree_rcu(timeout, rcu_head);

	} else {

		ret = -EBUSY;
@@ -573,7 +557,7 @@ static void __net_exit cttimeout_net_exit(struct net *net) 
	struct ctnl_timeout *cur, *tmp;



	nf_ct_unconfirmed_destroy(net);

	ctnl_untimeout(net, NULL);

	nf_ct_untimeout(net, NULL);



	list_for_each_entry_safe(cur, tmp, &net->nfct_timeout_list, head) {

		list_del_rcu(&cur->head);