Commit abfdf1c4 authored by Jan Engelhardt's avatar Jan Engelhardt Committed by David S. Miller
Browse files

[NETFILTER]: ebtables: remove casts, use consts 



Signed-off-by: default avatarJan Engelhardt <jengelh@computergmbh.de>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 000e8a53

include/net/arp.h

+5 −3
Original line number Diff line number Diff line
@@ -13,15 +13,17 @@ extern int arp_find(unsigned char *haddr, struct sk_buff *skb); 
extern int	arp_ioctl(struct net *net, unsigned int cmd, void __user *arg);

extern void     arp_send(int type, int ptype, __be32 dest_ip,

			 struct net_device *dev, __be32 src_ip,

			 unsigned char *dest_hw, unsigned char *src_hw, unsigned char *th);

			 const unsigned char *dest_hw,

			 const unsigned char *src_hw, const unsigned char *th);

extern int	arp_bind_neighbour(struct dst_entry *dst);

extern int	arp_mc_map(__be32 addr, u8 *haddr, struct net_device *dev, int dir);

extern void	arp_ifdown(struct net_device *dev);



extern struct sk_buff *arp_create(int type, int ptype, __be32 dest_ip,

				  struct net_device *dev, __be32 src_ip,

				  unsigned char *dest_hw, unsigned char *src_hw,

				  unsigned char *target_hw);

				  const unsigned char *dest_hw,

				  const unsigned char *src_hw,

				  const unsigned char *target_hw);

extern void arp_xmit(struct sk_buff *skb);



extern struct neigh_ops arp_broken_ops;

net/bridge/netfilter/ebt_802_3.c

+3 −3
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ 
static int ebt_filter_802_3(const struct sk_buff *skb, const struct net_device *in,

   const struct net_device *out, const void *data, unsigned int datalen)

{

	struct ebt_802_3_info *info = (struct ebt_802_3_info *)data;

	struct ebt_802_3_hdr *hdr = ebt_802_3_hdr(skb);

	const struct ebt_802_3_info *info = data;

	const struct ebt_802_3_hdr *hdr = ebt_802_3_hdr(skb);

	__be16 type = hdr->llc.ui.ctrl & IS_UI ? hdr->llc.ui.type : hdr->llc.ni.type;



	if (info->bitmask & EBT_802_3_SAP) {
@@ -40,7 +40,7 @@ static struct ebt_match filter_802_3; 
static int ebt_802_3_check(const char *tablename, unsigned int hookmask,

   const struct ebt_entry *e, void *data, unsigned int datalen)

{

	struct ebt_802_3_info *info = (struct ebt_802_3_info *)data;

	const struct ebt_802_3_info *info = data;



	if (datalen < sizeof(struct ebt_802_3_info))

		return -EINVAL;

net/bridge/netfilter/ebt_among.c

+15 −9
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ static int ebt_mac_wormhash_contains(const struct ebt_mac_wormhash *wh, 
	const struct ebt_mac_wormhash_tuple *p;

	int start, limit, i;

	uint32_t cmp[2] = { 0, 0 };

	int key = (const unsigned char) mac[5];

	int key = ((const unsigned char *)mac)[5];



	memcpy(((char *) cmp) + 2, mac, 6);

	start = wh->table[key];
@@ -73,15 +73,18 @@ static int ebt_mac_wormhash_check_integrity(const struct ebt_mac_wormhash 
static int get_ip_dst(const struct sk_buff *skb, __be32 *addr)

{

	if (eth_hdr(skb)->h_proto == htons(ETH_P_IP)) {

		struct iphdr _iph, *ih;

		const struct iphdr *ih;

		struct iphdr _iph;



		ih = skb_header_pointer(skb, 0, sizeof(_iph), &_iph);

		if (ih == NULL)

			return -1;

		*addr = ih->daddr;

	} else if (eth_hdr(skb)->h_proto == htons(ETH_P_ARP)) {

		struct arphdr _arph, *ah;

		__be32 buf, *bp;

		const struct arphdr *ah;

		struct arphdr _arph;

		const __be32 *bp;

		__be32 buf;



		ah = skb_header_pointer(skb, 0, sizeof(_arph), &_arph);

		if (ah == NULL ||
@@ -101,15 +104,18 @@ static int get_ip_dst(const struct sk_buff *skb, __be32 *addr) 
static int get_ip_src(const struct sk_buff *skb, __be32 *addr)

{

	if (eth_hdr(skb)->h_proto == htons(ETH_P_IP)) {

		struct iphdr _iph, *ih;

		const struct iphdr *ih;

		struct iphdr _iph;



		ih = skb_header_pointer(skb, 0, sizeof(_iph), &_iph);

		if (ih == NULL)

			return -1;

		*addr = ih->saddr;

	} else if (eth_hdr(skb)->h_proto == htons(ETH_P_ARP)) {

		struct arphdr _arph, *ah;

		__be32 buf, *bp;

		const struct arphdr *ah;

		struct arphdr _arph;

		const __be32 *bp;

		__be32 buf;



		ah = skb_header_pointer(skb, 0, sizeof(_arph), &_arph);

		if (ah == NULL ||
@@ -130,7 +136,7 @@ static int ebt_filter_among(const struct sk_buff *skb, 
			    const struct net_device *out, const void *data,

			    unsigned int datalen)

{

	struct ebt_among_info *info = (struct ebt_among_info *) data;

	const struct ebt_among_info *info = data;

	const char *dmac, *smac;

	const struct ebt_mac_wormhash *wh_dst, *wh_src;

	__be32 dip = 0, sip = 0;
@@ -175,7 +181,7 @@ static int ebt_among_check(const char *tablename, unsigned int hookmask, 
			   const struct ebt_entry *e, void *data,

			   unsigned int datalen)

{

	struct ebt_among_info *info = (struct ebt_among_info *) data;

	const struct ebt_among_info *info = data;

	int expected_length = sizeof(struct ebt_among_info);

	const struct ebt_mac_wormhash *wh_dst, *wh_src;

	int err;

net/bridge/netfilter/ebt_arp.c

+8 −5
Original line number Diff line number Diff line
@@ -18,8 +18,9 @@ 
static int ebt_filter_arp(const struct sk_buff *skb, const struct net_device *in,

   const struct net_device *out, const void *data, unsigned int datalen)

{

	struct ebt_arp_info *info = (struct ebt_arp_info *)data;

	struct arphdr _arph, *ah;

	const struct ebt_arp_info *info = data;

	const struct arphdr *ah;

	struct arphdr _arph;



	ah = skb_header_pointer(skb, 0, sizeof(_arph), &_arph);

	if (ah == NULL)
@@ -35,7 +36,8 @@ static int ebt_filter_arp(const struct sk_buff *skb, const struct net_device *in 
		return EBT_NOMATCH;



	if (info->bitmask & (EBT_ARP_SRC_IP | EBT_ARP_DST_IP | EBT_ARP_GRAT)) {

		__be32 saddr, daddr, *sap, *dap;

		const __be32 *sap, *dap;

		__be32 saddr, daddr;



		if (ah->ar_pln != sizeof(__be32) || ah->ar_pro != htons(ETH_P_IP))

			return EBT_NOMATCH;
@@ -61,7 +63,8 @@ static int ebt_filter_arp(const struct sk_buff *skb, const struct net_device *in 
	}



	if (info->bitmask & (EBT_ARP_SRC_MAC | EBT_ARP_DST_MAC)) {

		unsigned char _mac[ETH_ALEN], *mp;

		const unsigned char *mp;

		unsigned char _mac[ETH_ALEN];

		uint8_t verdict, i;



		if (ah->ar_hln != ETH_ALEN || ah->ar_hrd != htons(ARPHRD_ETHER))
@@ -100,7 +103,7 @@ static int ebt_filter_arp(const struct sk_buff *skb, const struct net_device *in 
static int ebt_arp_check(const char *tablename, unsigned int hookmask,

   const struct ebt_entry *e, void *data, unsigned int datalen)

{

	struct ebt_arp_info *info = (struct ebt_arp_info *)data;

	const struct ebt_arp_info *info = data;



	if (datalen != EBT_ALIGN(sizeof(struct ebt_arp_info)))

		return -EINVAL;

net/bridge/netfilter/ebt_arpreply.c

+8 −5
Original line number Diff line number Diff line
@@ -19,10 +19,13 @@ static int ebt_target_reply(struct sk_buff *skb, unsigned int hooknr, 
   const struct net_device *in, const struct net_device *out,

   const void *data, unsigned int datalen)

{

	struct ebt_arpreply_info *info = (struct ebt_arpreply_info *)data;

	__be32 _sip, *siptr, _dip, *diptr;

	struct arphdr _ah, *ap;

	unsigned char _sha[ETH_ALEN], *shp;

	struct ebt_arpreply_info *info = (void *)data;

	const __be32 *siptr, *diptr;

	__be32 _sip, _dip;

	const struct arphdr *ap;

	struct arphdr _ah;

	const unsigned char *shp;

	unsigned char _sha[ETH_ALEN];



	ap = skb_header_pointer(skb, 0, sizeof(_ah), &_ah);

	if (ap == NULL)
@@ -58,7 +61,7 @@ static int ebt_target_reply(struct sk_buff *skb, unsigned int hooknr, 
static int ebt_target_reply_check(const char *tablename, unsigned int hookmask,

   const struct ebt_entry *e, void *data, unsigned int datalen)

{

	struct ebt_arpreply_info *info = (struct ebt_arpreply_info *)data;

	const struct ebt_arpreply_info *info = data;



	if (datalen != EBT_ALIGN(sizeof(struct ebt_arpreply_info)))

		return -EINVAL;