diff options
| author | Bart De Schuymer <bdschuym@pandora.be> | 2003-05-01 20:28:20 +0000 |
|---|---|---|
| committer | Bart De Schuymer <bdschuym@pandora.be> | 2003-05-01 20:28:20 +0000 |
| commit | 8751fb8c8e83470acee25c4999139db707a0145b (patch) | |
| tree | 52e096b60cba896ae6d27bc202136408e1167a4e | |
| parent | 6caf621b0d616a03f1b698ed3dab0c5d29348620 (diff) | |
arp mac address matching was added by <blancher_at_cartel-securite.fr>
| -rw-r--r-- | kernel/linux/include/linux/netfilter_bridge/ebt_arp.h | 2 | ||||
| -rw-r--r-- | kernel/linux/net/bridge/netfilter/ebt_arp.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/kernel/linux/include/linux/netfilter_bridge/ebt_arp.h b/kernel/linux/include/linux/netfilter_bridge/ebt_arp.h index f733b4c..537ec6b 100644 --- a/kernel/linux/include/linux/netfilter_bridge/ebt_arp.h +++ b/kernel/linux/include/linux/netfilter_bridge/ebt_arp.h @@ -9,7 +9,7 @@ #define EBT_ARP_SRC_MAC 0x20 #define EBT_ARP_DST_MAC 0x40 #define EBT_ARP_MASK (EBT_ARP_OPCODE | EBT_ARP_HTYPE | EBT_ARP_PTYPE | \ - EBT_ARP_SRC_IP | EBT_ARP_DST_IP | EBT_ARP_SRC_MAC | EBT_ARP_DST_MAC ) + EBT_ARP_SRC_IP | EBT_ARP_DST_IP | EBT_ARP_SRC_MAC | EBT_ARP_DST_MAC) #define EBT_ARP_MATCH "arp" struct ebt_arp_info diff --git a/kernel/linux/net/bridge/netfilter/ebt_arp.c b/kernel/linux/net/bridge/netfilter/ebt_arp.c index 0b3ffe1..5a79e15 100644 --- a/kernel/linux/net/bridge/netfilter/ebt_arp.c +++ b/kernel/linux/net/bridge/netfilter/ebt_arp.c @@ -79,6 +79,7 @@ static int ebt_filter_arp(const struct sk_buff *skb, const struct net_device *in return EBT_NOMATCH; if (info->bitmask & EBT_ARP_SRC_MAC) { uint8_t verdict, i; + memcpy(&src, ((*skb).nh.raw) + sizeof(struct arphdr), ETH_ALEN); @@ -92,6 +93,7 @@ static int ebt_filter_arp(const struct sk_buff *skb, const struct net_device *in if (info->bitmask & EBT_ARP_DST_MAC) { uint8_t verdict, i; + memcpy(&dst, ((*skb).nh.raw) + sizeof(struct arphdr) + (((*skb).nh.arph)->ar_hln) + |