diff options
Diffstat (limited to 'kernel/linux/net/bridge/netfilter/ebt_dnat.c')
| -rw-r--r-- | kernel/linux/net/bridge/netfilter/ebt_dnat.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/kernel/linux/net/bridge/netfilter/ebt_dnat.c b/kernel/linux/net/bridge/netfilter/ebt_dnat.c index a910d77..c4fea18 100644 --- a/kernel/linux/net/bridge/netfilter/ebt_dnat.c +++ b/kernel/linux/net/bridge/netfilter/ebt_dnat.c @@ -10,8 +10,6 @@ #include <linux/netfilter_bridge/ebtables.h> #include <linux/netfilter_bridge/ebt_nat.h> -#include <linux/netfilter_bridge.h> -#include <linux/skbuff.h> #include <linux/module.h> #include <net/sock.h> @@ -19,29 +17,28 @@ static int ebt_target_dnat(struct sk_buff **pskb, unsigned int hooknr, const struct net_device *in, const struct net_device *out, const void *data, unsigned int datalen) { - struct ebt_nat_info *infostuff = (struct ebt_nat_info *) data; + struct ebt_nat_info *info = (struct ebt_nat_info *)data; - memcpy(((**pskb).mac.ethernet)->h_dest, infostuff->mac, + memcpy(((**pskb).mac.ethernet)->h_dest, info->mac, ETH_ALEN * sizeof(unsigned char)); - return infostuff->target; + return info->target; } static int ebt_target_dnat_check(const char *tablename, unsigned int hookmask, const struct ebt_entry *e, void *data, unsigned int datalen) { - struct ebt_nat_info *infostuff = (struct ebt_nat_info *) data; + struct ebt_nat_info *info = (struct ebt_nat_info *)data; - if ((hookmask & (1 << NF_BR_NUMHOOKS)) && - infostuff->target == EBT_RETURN) + if (BASE_CHAIN && info->target == EBT_RETURN) return -EINVAL; - hookmask &= ~(1 << NF_BR_NUMHOOKS); + CLEAR_BASE_CHAIN_BIT; if ( (strcmp(tablename, "nat") || (hookmask & ~((1 << NF_BR_PRE_ROUTING) | (1 << NF_BR_LOCAL_OUT)))) && (strcmp(tablename, "broute") || hookmask & ~(1 << NF_BR_BROUTING)) ) return -EINVAL; if (datalen != sizeof(struct ebt_nat_info)) return -EINVAL; - if (infostuff->target < -NUM_STANDARD_TARGETS || infostuff->target >= 0) + if (INVALID_TARGET) return -EINVAL; return 0; } |