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

Commit b3480fe0 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: conntrack: make protocol tracker pointers const 



Doesn't change generated code, but will make it easier to eventually
make the actual trackers themselvers const.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent ea48cc83

include/net/netfilter/nf_conntrack_l3proto.h

+3 −3
Original line number Diff line number Diff line
@@ -64,10 +64,10 @@ struct nf_conntrack_l3proto { 
extern struct nf_conntrack_l3proto __rcu *nf_ct_l3protos[NFPROTO_NUMPROTO];



/* Protocol global registration. */

int nf_ct_l3proto_register(struct nf_conntrack_l3proto *proto);

void nf_ct_l3proto_unregister(struct nf_conntrack_l3proto *proto);

int nf_ct_l3proto_register(const struct nf_conntrack_l3proto *proto);

void nf_ct_l3proto_unregister(const struct nf_conntrack_l3proto *proto);



struct nf_conntrack_l3proto *nf_ct_l3proto_find_get(u_int16_t l3proto);

const struct nf_conntrack_l3proto *nf_ct_l3proto_find_get(u_int16_t l3proto);



/* Existing built-in protocols */

extern struct nf_conntrack_l3proto nf_conntrack_l3proto_generic;

include/net/netfilter/nf_conntrack_l4proto.h

+2 −2
Original line number Diff line number Diff line
@@ -114,10 +114,10 @@ extern struct nf_conntrack_l4proto nf_conntrack_l4proto_generic; 


#define MAX_NF_CT_PROTO 256



struct nf_conntrack_l4proto *__nf_ct_l4proto_find(u_int16_t l3proto,

const struct nf_conntrack_l4proto *__nf_ct_l4proto_find(u_int16_t l3proto,

						  u_int8_t l4proto);



struct nf_conntrack_l4proto *nf_ct_l4proto_find_get(u_int16_t l3proto,

const struct nf_conntrack_l4proto *nf_ct_l4proto_find_get(u_int16_t l3proto,

						    u_int8_t l4proto);

void nf_ct_l4proto_put(const struct nf_conntrack_l4proto *p);

include/net/netfilter/nf_conntrack_timeout.h

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ struct ctnl_timeout { 
	refcount_t		refcnt;

	char			name[CTNL_TIMEOUT_NAME_MAX];

	__u16			l3num;

	struct nf_conntrack_l4proto *l4proto;

	const struct nf_conntrack_l4proto *l4proto;

	char			data[0];

};

net/netfilter/nf_conntrack_core.c

+6 −6
Original line number Diff line number Diff line
@@ -250,8 +250,8 @@ bool nf_ct_get_tuplepr(const struct sk_buff *skb, unsigned int nhoff, 
		       u_int16_t l3num,

		       struct net *net, 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;

	unsigned int protoff;

	u_int8_t protonum;

	int ret;
@@ -400,7 +400,7 @@ static void 
destroy_conntrack(struct nf_conntrack *nfct)

{

	struct nf_conn *ct = (struct nf_conn *)nfct;

	struct nf_conntrack_l4proto *l4proto;

	const struct nf_conntrack_l4proto *l4proto;



	pr_debug("destroy_conntrack(%p)\n", ct);

	NF_CT_ASSERT(atomic_read(&nfct->use) == 0);
@@ -694,7 +694,7 @@ static int nf_ct_resolve_clash(struct net *net, struct sk_buff *skb, 
{

	/* This is the conntrack entry already in hashes that won race. */

	struct nf_conn *ct = nf_ct_tuplehash_to_ctrack(h);

	struct nf_conntrack_l4proto *l4proto;

	const struct nf_conntrack_l4proto *l4proto;



	l4proto = __nf_ct_l4proto_find(nf_ct_l3num(ct), nf_ct_protonum(ct));

	if (l4proto->allow_clash &&
@@ -1344,10 +1344,10 @@ unsigned int 
nf_conntrack_in(struct net *net, u_int8_t pf, unsigned int hooknum,

		struct sk_buff *skb)

{

	const struct nf_conntrack_l3proto *l3proto;

	const struct nf_conntrack_l4proto *l4proto;

	struct nf_conn *ct, *tmpl;

	enum ip_conntrack_info ctinfo;

	struct nf_conntrack_l3proto *l3proto;

	struct nf_conntrack_l4proto *l4proto;

	unsigned int *timeouts;

	unsigned int dataoff;

	u_int8_t protonum;

net/netfilter/nf_conntrack_netlink.c

+11 −11
Original line number Diff line number Diff line
@@ -109,9 +109,9 @@ static int ctnetlink_dump_tuples_ip(struct sk_buff *skb, 
static int ctnetlink_dump_tuples(struct sk_buff *skb,

				 const struct nf_conntrack_tuple *tuple)

{

	const struct nf_conntrack_l3proto *l3proto;

	const struct nf_conntrack_l4proto *l4proto;

	int ret;

	struct nf_conntrack_l3proto *l3proto;

	struct nf_conntrack_l4proto *l4proto;



	rcu_read_lock();

	l3proto = __nf_ct_l3proto_find(tuple->src.l3num);
@@ -163,7 +163,7 @@ static int ctnetlink_dump_timeout(struct sk_buff *skb, const struct nf_conn *ct) 


static int ctnetlink_dump_protoinfo(struct sk_buff *skb, struct nf_conn *ct)

{

	struct nf_conntrack_l4proto *l4proto;

	const struct nf_conntrack_l4proto *l4proto;

	struct nlattr *nest_proto;

	int ret;
@@ -535,9 +535,9 @@ ctnetlink_fill_info(struct sk_buff *skb, u32 portid, u32 seq, u32 type, 


static inline size_t ctnetlink_proto_size(const struct nf_conn *ct)

{

	struct nf_conntrack_l3proto *l3proto;

	struct nf_conntrack_l4proto *l4proto;

	size_t len = 0;

	const struct nf_conntrack_l3proto *l3proto;

	const struct nf_conntrack_l4proto *l4proto;

	size_t len;



	l3proto = __nf_ct_l3proto_find(nf_ct_l3num(ct));

	len = l3proto->nla_size;
@@ -936,8 +936,8 @@ static const struct nla_policy proto_nla_policy[CTA_PROTO_MAX+1] = { 
static int ctnetlink_parse_tuple_proto(struct nlattr *attr,

				       struct nf_conntrack_tuple *tuple)

{

	const struct nf_conntrack_l4proto *l4proto;

	struct nlattr *tb[CTA_PROTO_MAX+1];

	struct nf_conntrack_l4proto *l4proto;

	int ret = 0;



	ret = nla_parse_nested(tb, CTA_PROTO_MAX, attr, proto_nla_policy,
@@ -1580,8 +1580,8 @@ static int ctnetlink_change_protoinfo(struct nf_conn *ct, 
				      const struct nlattr * const cda[])

{

	const struct nlattr *attr = cda[CTA_PROTOINFO];

	const struct nf_conntrack_l4proto *l4proto;

	struct nlattr *tb[CTA_PROTOINFO_MAX+1];

	struct nf_conntrack_l4proto *l4proto;

	int err = 0;



	err = nla_parse_nested(tb, CTA_PROTOINFO_MAX, attr, protoinfo_policy,
@@ -2475,11 +2475,11 @@ static int ctnetlink_exp_dump_mask(struct sk_buff *skb, 
				   const struct nf_conntrack_tuple *tuple,

				   const struct nf_conntrack_tuple_mask *mask)

{

	int ret;

	struct nf_conntrack_l3proto *l3proto;

	struct nf_conntrack_l4proto *l4proto;

	const struct nf_conntrack_l3proto *l3proto;

	const struct nf_conntrack_l4proto *l4proto;

	struct nf_conntrack_tuple m;

	struct nlattr *nest_parms;

	int ret;



	memset(&m, 0xFF, sizeof(m));

	memcpy(&m.src.u3, &mask->src.u3, sizeof(m.src.u3));