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

Commit 58c0fb0d authored by Jan Engelhardt's avatar Jan Engelhardt Committed by Patrick McHardy
Browse files

[NETFILTER]: annotate rest of nf_conntrack_* with const 



Signed-off-by: default avatarJan Engelhardt <jengelh@computergmbh.de>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent 5452e425

net/ipv6/netfilter/nf_conntrack_reasm.c

+4 −4
Original line number Diff line number Diff line
@@ -103,8 +103,8 @@ struct ctl_table nf_ct_ipv6_sysctl_table[] = { 
};

#endif



static unsigned int ip6qhashfn(__be32 id, struct in6_addr *saddr,

			       struct in6_addr *daddr)

static unsigned int ip6qhashfn(__be32 id, const struct in6_addr *saddr,

			       const struct in6_addr *daddr)

{

	u32 a, b, c;
@@ -132,7 +132,7 @@ static unsigned int ip6qhashfn(__be32 id, struct in6_addr *saddr, 


static unsigned int nf_hashfn(struct inet_frag_queue *q)

{

	struct nf_ct_frag6_queue *nq;

	const struct nf_ct_frag6_queue *nq;



	nq = container_of(q, struct nf_ct_frag6_queue, q);

	return ip6qhashfn(nq->id, &nq->saddr, &nq->daddr);
@@ -222,7 +222,7 @@ oom: 




static int nf_ct_frag6_queue(struct nf_ct_frag6_queue *fq, struct sk_buff *skb,

			     struct frag_hdr *fhdr, int nhoff)

			     const struct frag_hdr *fhdr, int nhoff)

{

	struct sk_buff *prev, *next;

	int offset, end;

net/netfilter/nf_conntrack_amanda.c

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ enum amanda_strings { 
};



static struct {

	char			*string;

	const char		*string;

	size_t			len;

	struct ts_config	*ts;

} search[] __read_mostly = {

net/netfilter/nf_conntrack_ftp.c

+3 −2
Original line number Diff line number Diff line
@@ -350,8 +350,9 @@ static int help(struct sk_buff *skb, 
		enum ip_conntrack_info ctinfo)

{

	unsigned int dataoff, datalen;

	struct tcphdr _tcph, *th;

	char *fb_ptr;

	const struct tcphdr *th;

	struct tcphdr _tcph;

	const char *fb_ptr;

	int ret;

	u32 seq;

	int dir = CTINFO2DIR(ctinfo);

net/netfilter/nf_conntrack_helper.c

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ void nf_conntrack_helper_unregister(struct nf_conntrack_helper *me) 
{

	struct nf_conntrack_tuple_hash *h;

	struct nf_conntrack_expect *exp;

	struct hlist_node *n, *next;

	const struct hlist_node *n, *next;

	unsigned int i;



	mutex_lock(&nf_ct_helper_mutex);

net/netfilter/nf_conntrack_irc.c

+8 −6
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ MODULE_PARM_DESC(max_dcc_channels, "max number of expected DCC channels per " 
module_param(dcc_timeout, uint, 0400);

MODULE_PARM_DESC(dcc_timeout, "timeout on for unestablished DCC channels");



static const char *dccprotos[] = {

static const char *const dccprotos[] = {

	"SEND ", "CHAT ", "MOVE ", "TSEND ", "SCHAT "

};
@@ -65,7 +65,7 @@ static const char *dccprotos[] = { 
 *	ad_beg_p	returns pointer to first byte of addr data

 *	ad_end_p	returns pointer to last byte of addr data

 */

static int parse_dcc(char *data, char *data_end, u_int32_t *ip,

static int parse_dcc(char *data, const char *data_end, u_int32_t *ip,

		     u_int16_t *port, char **ad_beg_p, char **ad_end_p)

{

	/* at least 12: "AAAAAAAA P\1\n" */
@@ -93,9 +93,11 @@ static int help(struct sk_buff *skb, unsigned int protoff, 
		struct nf_conn *ct, enum ip_conntrack_info ctinfo)

{

	unsigned int dataoff;

	struct iphdr *iph;

	struct tcphdr _tcph, *th;

	char *data, *data_limit, *ib_ptr;

	const struct iphdr *iph;

	const struct tcphdr *th;

	struct tcphdr _tcph;

	const char *data_limit;

	char *data, *ib_ptr;

	int dir = CTINFO2DIR(ctinfo);

	struct nf_conntrack_expect *exp;

	struct nf_conntrack_tuple *tuple;
@@ -159,7 +161,7 @@ static int help(struct sk_buff *skb, unsigned int protoff, 
			/* we have at least

			 * (19+MINMATCHLEN)-5-dccprotos[i].matchlen bytes valid

			 * data left (== 14/13 bytes) */

			if (parse_dcc((char *)data, data_limit, &dcc_ip,

			if (parse_dcc(data, data_limit, &dcc_ip,

				       &dcc_port, &addr_beg_p, &addr_end_p)) {

				pr_debug("unable to parse dcc command\n");

				continue;