Commit 3cf93c96 authored by Jan Engelhardt's avatar Jan Engelhardt Committed by Patrick McHardy
Browse files

[NETFILTER]: annotate xtables targets with const and remove casts 



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

net/ipv4/netfilter/ipt_CLUSTERIP.c

+6 −6
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ clusterip_config_init_nodelist(struct clusterip_config *c, 
}



static struct clusterip_config *

clusterip_config_init(struct ipt_clusterip_tgt_info *i, __be32 ip,

clusterip_config_init(const struct ipt_clusterip_tgt_info *i, __be32 ip,

			struct net_device *dev)

{

	struct clusterip_config *c;
@@ -416,7 +416,7 @@ clusterip_tg_check(const char *tablename, const void *e_void, 
/* drop reference count of cluster config when rule is deleted */

static void clusterip_tg_destroy(const struct xt_target *target, void *targinfo)

{

	struct ipt_clusterip_tgt_info *cipinfo = targinfo;

	const struct ipt_clusterip_tgt_info *cipinfo = targinfo;



	/* if no more entries are referencing the config, remove it

	 * from the list and destroy the proc entry */
@@ -565,7 +565,7 @@ struct clusterip_seq_position { 


static void *clusterip_seq_start(struct seq_file *s, loff_t *pos)

{

	struct proc_dir_entry *pde = s->private;

	const struct proc_dir_entry *pde = s->private;

	struct clusterip_config *c = pde->data;

	unsigned int weight;

	u_int32_t local_nodes;
@@ -592,7 +592,7 @@ static void *clusterip_seq_start(struct seq_file *s, loff_t *pos) 


static void *clusterip_seq_next(struct seq_file *s, void *v, loff_t *pos)

{

	struct clusterip_seq_position *idx = (struct clusterip_seq_position *)v;

	struct clusterip_seq_position *idx = v;



	*pos = ++idx->pos;

	if (*pos >= idx->weight) {
@@ -611,7 +611,7 @@ static void clusterip_seq_stop(struct seq_file *s, void *v) 


static int clusterip_seq_show(struct seq_file *s, void *v)

{

	struct clusterip_seq_position *idx = (struct clusterip_seq_position *)v;

	struct clusterip_seq_position *idx = v;



	if (idx->pos != 0)

		seq_putc(s, ',');
@@ -667,7 +667,7 @@ static ssize_t clusterip_proc_write(struct file *file, const char __user *input, 
{

#define PROC_WRITELEN	10

	char buffer[PROC_WRITELEN+1];

	struct proc_dir_entry *pde = PDE(file->f_path.dentry->d_inode);

	const struct proc_dir_entry *pde = PDE(file->f_path.dentry->d_inode);

	struct clusterip_config *c = pde->data;

	unsigned long nodenum;

net/ipv4/netfilter/ipt_ECN.c

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ ecn_tg_check(const char *tablename, const void *e_void, 
             const struct xt_target *target, void *targinfo,

             unsigned int hook_mask)

{

	const struct ipt_ECN_info *einfo = (struct ipt_ECN_info *)targinfo;

	const struct ipt_ECN_info *einfo = targinfo;

	const struct ipt_entry *e = e_void;



	if (einfo->operation & IPT_ECN_OP_MASK) {

net/ipv4/netfilter/ipt_LOG.c

+2 −1
Original line number Diff line number Diff line
@@ -76,7 +76,8 @@ static void dump_packet(const struct nf_loginfo *info, 


	if ((logflags & IPT_LOG_IPOPT)

	    && ih->ihl * 4 > sizeof(struct iphdr)) {

		unsigned char _opt[4 * 15 - sizeof(struct iphdr)], *op;

		const unsigned char *op;

		unsigned char _opt[4 * 15 - sizeof(struct iphdr)];

		unsigned int i, optsize;



		optsize = ih->ihl * 4 - sizeof(struct iphdr);

net/ipv4/netfilter/ipt_REJECT.c

+4 −2
Original line number Diff line number Diff line
@@ -35,8 +35,10 @@ MODULE_DESCRIPTION("Xtables: packet \"rejection\" target for IPv4"); 
static void send_reset(struct sk_buff *oldskb, int hook)

{

	struct sk_buff *nskb;

	struct iphdr *oiph, *niph;

	struct tcphdr _otcph, *oth, *tcph;

	const struct iphdr *oiph;

	struct iphdr *niph;

	const struct tcphdr *oth;

	struct tcphdr _otcph, *tcph;

	unsigned int addr_type;



	/* IP header checks: fragment. */

net/ipv4/netfilter/ipt_recent.c

+3 −3
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ static void *recent_seq_start(struct seq_file *seq, loff_t *pos) 
static void *recent_seq_next(struct seq_file *seq, void *v, loff_t *pos)

{

	struct recent_iter_state *st = seq->private;

	struct recent_table *t = st->table;

	const struct recent_table *t = st->table;

	struct recent_entry *e = v;

	struct list_head *head = e->list.next;
@@ -361,7 +361,7 @@ static void recent_seq_stop(struct seq_file *s, void *v) 


static int recent_seq_show(struct seq_file *seq, void *v)

{

	struct recent_entry *e = v;

	const struct recent_entry *e = v;

	unsigned int i;



	i = (e->index - 1) % ip_pkt_list_tot;
@@ -396,7 +396,7 @@ static int recent_seq_open(struct inode *inode, struct file *file) 
static ssize_t recent_proc_write(struct file *file, const char __user *input,

				 size_t size, loff_t *loff)

{

	struct proc_dir_entry *pde = PDE(file->f_path.dentry->d_inode);

	const struct proc_dir_entry *pde = PDE(file->f_path.dentry->d_inode);

	struct recent_table *t = pde->data;

	struct recent_entry *e;

	char buf[sizeof("+255.255.255.255")], *c = buf;