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

Commit 2a04aabf authored by Julia Lawall's avatar Julia Lawall Committed by Pablo Neira Ayuso
Browse files

netfilter: constify nf_conntrack_l3/4proto parameters 



When a nf_conntrack_l3/4proto parameter is not on the left hand side
of an assignment, its address is not taken, and it is not passed to a
function that may modify its fields, then it can be declared as const.

This change is useful from a documentation point of view, and can
possibly facilitate making some nf_conntrack_l3/4proto structures const
subsequently.

Done with the help of Coccinelle.

Signed-off-by: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 5b9ccdcb

include/net/netfilter/nf_conntrack_l4proto.h

+7 −7
Original line number Diff line number Diff line
@@ -125,23 +125,23 @@ struct nf_conntrack_l4proto *__nf_ct_l4proto_find(u_int16_t l3proto, 


struct nf_conntrack_l4proto *nf_ct_l4proto_find_get(u_int16_t l3proto,

						    u_int8_t l4proto);

void nf_ct_l4proto_put(struct nf_conntrack_l4proto *p);

void nf_ct_l4proto_put(const struct nf_conntrack_l4proto *p);



/* Protocol pernet registration. */

int nf_ct_l4proto_pernet_register_one(struct net *net,

				      struct nf_conntrack_l4proto *proto);

				const struct nf_conntrack_l4proto *proto);

void nf_ct_l4proto_pernet_unregister_one(struct net *net,

					 struct nf_conntrack_l4proto *proto);

				const struct nf_conntrack_l4proto *proto);

int nf_ct_l4proto_pernet_register(struct net *net,

				  struct nf_conntrack_l4proto *proto[],

				  struct nf_conntrack_l4proto *const proto[],

				  unsigned int num_proto);

void nf_ct_l4proto_pernet_unregister(struct net *net,

				     struct nf_conntrack_l4proto *proto[],

				struct nf_conntrack_l4proto *const proto[],

				unsigned int num_proto);



/* Protocol global registration. */

int nf_ct_l4proto_register_one(struct nf_conntrack_l4proto *proto);

void nf_ct_l4proto_unregister_one(struct nf_conntrack_l4proto *proto);

void nf_ct_l4proto_unregister_one(const struct nf_conntrack_l4proto *proto);

int nf_ct_l4proto_register(struct nf_conntrack_l4proto *proto[],

			   unsigned int num_proto);

void nf_ct_l4proto_unregister(struct nf_conntrack_l4proto *proto[],

include/net/netfilter/nf_conntrack_timeout.h

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ struct nf_conn_timeout *nf_ct_timeout_ext_add(struct nf_conn *ct, 


static inline unsigned int *

nf_ct_timeout_lookup(struct net *net, struct nf_conn *ct,

		     struct nf_conntrack_l4proto *l4proto)

		     const struct nf_conntrack_l4proto *l4proto)

{

#ifdef CONFIG_NF_CONNTRACK_TIMEOUT

	struct nf_conn_timeout *timeout_ext;

net/netfilter/nf_conntrack_core.c

+4 −4
Original line number Diff line number Diff line
@@ -1176,8 +1176,8 @@ EXPORT_SYMBOL_GPL(nf_conntrack_free); 
static noinline struct nf_conntrack_tuple_hash *

init_conntrack(struct net *net, struct nf_conn *tmpl,

	       const struct nf_conntrack_tuple *tuple,

	       struct nf_conntrack_l3proto *l3proto,

	       struct nf_conntrack_l4proto *l4proto,

	       const struct nf_conntrack_l3proto *l3proto,

	       const struct nf_conntrack_l4proto *l4proto,

	       struct sk_buff *skb,

	       unsigned int dataoff, u32 hash)

{
@@ -1288,8 +1288,8 @@ resolve_normal_ct(struct net *net, struct nf_conn *tmpl, 
		  unsigned int dataoff,

		  u_int16_t l3num,

		  u_int8_t protonum,

		  struct nf_conntrack_l3proto *l3proto,

		  struct nf_conntrack_l4proto *l4proto)

		  const struct nf_conntrack_l3proto *l3proto,

		  const struct nf_conntrack_l4proto *l4proto)

{

	const struct nf_conntrack_zone *zone;

	struct nf_conntrack_tuple tuple;

net/netfilter/nf_conntrack_netlink.c

+3 −3
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ static char __initdata version[] = "0.93"; 


static int ctnetlink_dump_tuples_proto(struct sk_buff *skb,

				const struct nf_conntrack_tuple *tuple,

				       struct nf_conntrack_l4proto *l4proto)

				const struct nf_conntrack_l4proto *l4proto)

{

	int ret = 0;

	struct nlattr *nest_parms;
@@ -86,7 +86,7 @@ static int ctnetlink_dump_tuples_proto(struct sk_buff *skb, 


static int ctnetlink_dump_tuples_ip(struct sk_buff *skb,

				    const struct nf_conntrack_tuple *tuple,

				    struct nf_conntrack_l3proto *l3proto)

				    const struct nf_conntrack_l3proto *l3proto)

{

	int ret = 0;

	struct nlattr *nest_parms;

net/netfilter/nf_conntrack_proto.c

+12 −12
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ nf_ct_l4proto_find_get(u_int16_t l3num, u_int8_t l4num) 
}

EXPORT_SYMBOL_GPL(nf_ct_l4proto_find_get);



void nf_ct_l4proto_put(struct nf_conntrack_l4proto *p)

void nf_ct_l4proto_put(const struct nf_conntrack_l4proto *p)

{

	module_put(p->me);

}
@@ -257,7 +257,7 @@ void nf_ct_l3proto_unregister(struct nf_conntrack_l3proto *proto) 
EXPORT_SYMBOL_GPL(nf_ct_l3proto_unregister);



static struct nf_proto_net *nf_ct_l4proto_net(struct net *net,

					      struct nf_conntrack_l4proto *l4proto)

				const struct nf_conntrack_l4proto *l4proto)

{

	if (l4proto->get_net_proto) {

		/* statically built-in protocols use static per-net */
@@ -272,7 +272,7 @@ static struct nf_proto_net *nf_ct_l4proto_net(struct net *net, 
static

int nf_ct_l4proto_register_sysctl(struct net *net,

				  struct nf_proto_net *pn,

				  struct nf_conntrack_l4proto *l4proto)

				  const struct nf_conntrack_l4proto *l4proto)

{

	int err = 0;
@@ -296,7 +296,7 @@ int nf_ct_l4proto_register_sysctl(struct net *net, 
static

void nf_ct_l4proto_unregister_sysctl(struct net *net,

				struct nf_proto_net *pn,

				     struct nf_conntrack_l4proto *l4proto)

				const struct nf_conntrack_l4proto *l4proto)

{

#ifdef CONFIG_SYSCTL

	if (pn->ctl_table_header != NULL)
@@ -366,7 +366,7 @@ int nf_ct_l4proto_register_one(struct nf_conntrack_l4proto *l4proto) 
EXPORT_SYMBOL_GPL(nf_ct_l4proto_register_one);



int nf_ct_l4proto_pernet_register_one(struct net *net,

				      struct nf_conntrack_l4proto *l4proto)

				const struct nf_conntrack_l4proto *l4proto)

{

	int ret = 0;

	struct nf_proto_net *pn = NULL;
@@ -391,7 +391,7 @@ int nf_ct_l4proto_pernet_register_one(struct net *net, 
}

EXPORT_SYMBOL_GPL(nf_ct_l4proto_pernet_register_one);



static void __nf_ct_l4proto_unregister_one(struct nf_conntrack_l4proto *l4proto)

static void __nf_ct_l4proto_unregister_one(const struct nf_conntrack_l4proto *l4proto)



{

	BUG_ON(l4proto->l3proto >= ARRAY_SIZE(nf_ct_protos));
@@ -404,7 +404,7 @@ static void __nf_ct_l4proto_unregister_one(struct nf_conntrack_l4proto *l4proto) 
			   &nf_conntrack_l4proto_generic);

}



void nf_ct_l4proto_unregister_one(struct nf_conntrack_l4proto *l4proto)

void nf_ct_l4proto_unregister_one(const struct nf_conntrack_l4proto *l4proto)

{

	mutex_lock(&nf_ct_proto_mutex);

	__nf_ct_l4proto_unregister_one(l4proto);
@@ -415,7 +415,7 @@ void nf_ct_l4proto_unregister_one(struct nf_conntrack_l4proto *l4proto) 
EXPORT_SYMBOL_GPL(nf_ct_l4proto_unregister_one);



void nf_ct_l4proto_pernet_unregister_one(struct net *net,

					 struct nf_conntrack_l4proto *l4proto)

				const struct nf_conntrack_l4proto *l4proto)

{

	struct nf_proto_net *pn = nf_ct_l4proto_net(net, l4proto);
@@ -449,7 +449,7 @@ int nf_ct_l4proto_register(struct nf_conntrack_l4proto *l4proto[], 
EXPORT_SYMBOL_GPL(nf_ct_l4proto_register);



int nf_ct_l4proto_pernet_register(struct net *net,

				  struct nf_conntrack_l4proto *l4proto[],

				  struct nf_conntrack_l4proto *const l4proto[],

				  unsigned int num_proto)

{

	int ret = -EINVAL;
@@ -485,7 +485,7 @@ void nf_ct_l4proto_unregister(struct nf_conntrack_l4proto *l4proto[], 
EXPORT_SYMBOL_GPL(nf_ct_l4proto_unregister);



void nf_ct_l4proto_pernet_unregister(struct net *net,

				     struct nf_conntrack_l4proto *l4proto[],

				struct nf_conntrack_l4proto *const l4proto[],

				unsigned int num_proto)

{

	while (num_proto-- != 0)