diff options
| author |   Jan Engelhardt <jengelh@computergmbh.de> | 2008-01-14 23:41:50 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2008-01-28 15:02:25 -0800 |
| commit | 57de0abbffa9724e2a89860a49725d805bfc07ca (patch) | |
| tree | a350ff6b3b6debf9b6ced42b6baa83652f674af1 /net/netfilter/xt_pkttype.c | |
| parent | [NETFILTER]: xt_pkttype: Add explicit check for IPv4 (diff) | |
| download | linux-dev-57de0abbffa9724e2a89860a49725d805bfc07ca.tar.xz linux-dev-57de0abbffa9724e2a89860a49725d805bfc07ca.zip | |
[NETFILTER]: xt_pkttype: IPv6 multicast address recognition
Signed-off-by: Jan Engelhart <jengelh@computergmbh.de>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/xt_pkttype.c')
| -rw-r--r-- | net/netfilter/xt_pkttype.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/net/netfilter/xt_pkttype.c b/net/netfilter/xt_pkttype.c index 080f3246eee7..cbcb8ea3b8d2 100644 --- a/net/netfilter/xt_pkttype.c +++ b/net/netfilter/xt_pkttype.c @@ -11,6 +11,7 @@ #include <linux/if_packet.h> #include <linux/in.h> #include <linux/ip.h> +#include <linux/ipv6.h> #include <linux/netfilter/xt_pkttype.h> #include <linux/netfilter/x_tables.h> @@ -27,16 +28,19 @@ pkttype_mt(const struct sk_buff *skb, const struct net_device *in, const void *matchinfo, int offset, unsigned int protoff, bool *hotdrop) { - u_int8_t type; const struct xt_pkttype_info *info = matchinfo; + u_int8_t type; - if (skb->pkt_type == PACKET_LOOPBACK) - type = match->family == AF_INET && - ipv4_is_multicast(ip_hdr(skb)->daddr) - ? PACKET_MULTICAST - : PACKET_BROADCAST; - else + if (skb->pkt_type != PACKET_LOOPBACK) type = skb->pkt_type; + else if (match->family == AF_INET && + ipv4_is_multicast(ip_hdr(skb)->daddr)) + type = PACKET_MULTICAST; + else if (match->family == AF_INET6 && + ipv6_hdr(skb)->daddr.s6_addr[0] == 0xFF) + type = PACKET_MULTICAST; + else + type = PACKET_BROADCAST; return (type == info->pkttype) ^ info->invert; } |