| @@ -35,8 +35,6 @@ ebt_ip6_mt(const struct sk_buff *skb, const struct xt_match_param *par) · 34 unmodified lines |
| 35 | struct ipv6hdr _ip6h; | 35 | struct ipv6hdr _ip6h; |
| 36 | const struct tcpudphdr *pptr; | 36 | const struct tcpudphdr *pptr; |
| 37 | struct tcpudphdr _ports; | 37 | struct tcpudphdr _ports; |
| 38 | struct in6_addr tmp_addr; | | |
| 39 | int i; | | |
| 40 | | 38 | |
| 41 | ih6 = skb_header_pointer(skb, 0, sizeof(_ip6h), &_ip6h); | 39 | ih6 = skb_header_pointer(skb, 0, sizeof(_ip6h), &_ip6h); |
| 42 | if (ih6 == NULL) | 40 | if (ih6 == NULL) |
| @@ -44,18 +42,10 @@ ebt_ip6_mt(const struct sk_buff *skb, const struct xt_match_param *par) · 1 unmodified line |
| 44 | if (info->bitmask & EBT_IP6_TCLASS && | 42 | if (info->bitmask & EBT_IP6_TCLASS && |
| 45 | FWINV(info->tclass != ipv6_get_dsfield(ih6), EBT_IP6_TCLASS)) | 43 | FWINV(info->tclass != ipv6_get_dsfield(ih6), EBT_IP6_TCLASS)) |
| 46 | return false; | 44 | return false; |
| 47 | for (i = 0; i < 4; i++) | 45 | if (FWINV(ipv6_masked_addr_cmp(&ih6->saddr, &info->smsk, |
| 48 | tmp_addr.in6_u.u6_addr32[i] = ih6->saddr.in6_u.u6_addr32[i] & | 46 | &info->saddr), EBT_IP6_SOURCE) || |
| 49 | info->smsk.in6_u.u6_addr32[i]; | 47 | FWINV(ipv6_masked_addr_cmp(&ih6->daddr, &info->dmsk, |
| 50 | if (info->bitmask & EBT_IP6_SOURCE && | 48 | &info->daddr), EBT_IP6_DEST)) |
| 51 | FWINV((ipv6_addr_cmp(&tmp_addr, &info->saddr) != 0), | | |
| 52 | EBT_IP6_SOURCE)) | | |
| 53 | return false; | | |
| 54 | for (i = 0; i < 4; i++) | | |
| 55 | tmp_addr.in6_u.u6_addr32[i] = ih6->daddr.in6_u.u6_addr32[i] & | | |
| 56 | info->dmsk.in6_u.u6_addr32[i]; | | |
| 57 | if (info->bitmask & EBT_IP6_DEST && | | |
| 58 | FWINV((ipv6_addr_cmp(&tmp_addr, &info->daddr) != 0), EBT_IP6_DEST)) | | |
| 59 | return false; | 49 | return false; |
| 60 | if (info->bitmask & EBT_IP6_PROTO) { | 50 | if (info->bitmask & EBT_IP6_PROTO) { |
| 61 | uint8_t nexthdr = ih6->nexthdr; | 51 | uint8_t nexthdr = ih6->nexthdr; |