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

[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
...@@ -103,8 +103,8 @@ struct ctl_table nf_ct_ipv6_sysctl_table[] = { ...@@ -103,8 +103,8 @@ struct ctl_table nf_ct_ipv6_sysctl_table[] = {
}; };
#endif #endif
static unsigned int ip6qhashfn(__be32 id, struct in6_addr *saddr, static unsigned int ip6qhashfn(__be32 id, const struct in6_addr *saddr,
struct in6_addr *daddr) const struct in6_addr *daddr)
{ {
u32 a, b, c; u32 a, b, c;
...@@ -132,7 +132,7 @@ static unsigned int ip6qhashfn(__be32 id, struct in6_addr *saddr, ...@@ -132,7 +132,7 @@ static unsigned int ip6qhashfn(__be32 id, struct in6_addr *saddr,
static unsigned int nf_hashfn(struct inet_frag_queue *q) 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); nq = container_of(q, struct nf_ct_frag6_queue, q);
return ip6qhashfn(nq->id, &nq->saddr, &nq->daddr); return ip6qhashfn(nq->id, &nq->saddr, &nq->daddr);
...@@ -222,7 +222,7 @@ fq_find(__be32 id, struct in6_addr *src, struct in6_addr *dst) ...@@ -222,7 +222,7 @@ fq_find(__be32 id, struct in6_addr *src, struct in6_addr *dst)
static int nf_ct_frag6_queue(struct nf_ct_frag6_queue *fq, struct sk_buff *skb, 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; struct sk_buff *prev, *next;
int offset, end; int offset, end;
......
...@@ -53,7 +53,7 @@ enum amanda_strings { ...@@ -53,7 +53,7 @@ enum amanda_strings {
}; };
static struct { static struct {
char *string; const char *string;
size_t len; size_t len;
struct ts_config *ts; struct ts_config *ts;
} search[] __read_mostly = { } search[] __read_mostly = {
......
...@@ -350,8 +350,9 @@ static int help(struct sk_buff *skb, ...@@ -350,8 +350,9 @@ static int help(struct sk_buff *skb,
enum ip_conntrack_info ctinfo) enum ip_conntrack_info ctinfo)
{ {
unsigned int dataoff, datalen; unsigned int dataoff, datalen;
struct tcphdr _tcph, *th; const struct tcphdr *th;
char *fb_ptr; struct tcphdr _tcph;
const char *fb_ptr;
int ret; int ret;
u32 seq; u32 seq;
int dir = CTINFO2DIR(ctinfo); int dir = CTINFO2DIR(ctinfo);
......
...@@ -126,7 +126,7 @@ void nf_conntrack_helper_unregister(struct nf_conntrack_helper *me) ...@@ -126,7 +126,7 @@ void nf_conntrack_helper_unregister(struct nf_conntrack_helper *me)
{ {
struct nf_conntrack_tuple_hash *h; struct nf_conntrack_tuple_hash *h;
struct nf_conntrack_expect *exp; struct nf_conntrack_expect *exp;
struct hlist_node *n, *next; const struct hlist_node *n, *next;
unsigned int i; unsigned int i;
mutex_lock(&nf_ct_helper_mutex); mutex_lock(&nf_ct_helper_mutex);
......
...@@ -50,7 +50,7 @@ MODULE_PARM_DESC(max_dcc_channels, "max number of expected DCC channels per " ...@@ -50,7 +50,7 @@ MODULE_PARM_DESC(max_dcc_channels, "max number of expected DCC channels per "
module_param(dcc_timeout, uint, 0400); module_param(dcc_timeout, uint, 0400);
MODULE_PARM_DESC(dcc_timeout, "timeout on for unestablished DCC channels"); 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 " "SEND ", "CHAT ", "MOVE ", "TSEND ", "SCHAT "
}; };
...@@ -65,7 +65,7 @@ static const char *dccprotos[] = { ...@@ -65,7 +65,7 @@ static const char *dccprotos[] = {
* ad_beg_p returns pointer to first byte of addr data * ad_beg_p returns pointer to first byte of addr data
* ad_end_p returns pointer to last 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) u_int16_t *port, char **ad_beg_p, char **ad_end_p)
{ {
/* at least 12: "AAAAAAAA P\1\n" */ /* at least 12: "AAAAAAAA P\1\n" */
...@@ -93,9 +93,11 @@ static int help(struct sk_buff *skb, unsigned int protoff, ...@@ -93,9 +93,11 @@ static int help(struct sk_buff *skb, unsigned int protoff,
struct nf_conn *ct, enum ip_conntrack_info ctinfo) struct nf_conn *ct, enum ip_conntrack_info ctinfo)
{ {
unsigned int dataoff; unsigned int dataoff;
struct iphdr *iph; const struct iphdr *iph;
struct tcphdr _tcph, *th; const struct tcphdr *th;
char *data, *data_limit, *ib_ptr; struct tcphdr _tcph;
const char *data_limit;
char *data, *ib_ptr;
int dir = CTINFO2DIR(ctinfo); int dir = CTINFO2DIR(ctinfo);
struct nf_conntrack_expect *exp; struct nf_conntrack_expect *exp;
struct nf_conntrack_tuple *tuple; struct nf_conntrack_tuple *tuple;
...@@ -159,7 +161,7 @@ static int help(struct sk_buff *skb, unsigned int protoff, ...@@ -159,7 +161,7 @@ static int help(struct sk_buff *skb, unsigned int protoff,
/* we have at least /* we have at least
* (19+MINMATCHLEN)-5-dccprotos[i].matchlen bytes valid * (19+MINMATCHLEN)-5-dccprotos[i].matchlen bytes valid
* data left (== 14/13 bytes) */ * 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)) { &dcc_port, &addr_beg_p, &addr_end_p)) {
pr_debug("unable to parse dcc command\n"); pr_debug("unable to parse dcc command\n");
continue; continue;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment