TARPIT: resolve build errors with newer kernels

Adds fragment offset arg to ipv6_skip_exthdr() and also removes usage
of ipv6_addr_copy() in favor or direct assignment.

Signed-off-by: Josh Hunt <johunt@akamai.com>

diff --git a/extensions/xt_TARPIT.c b/extensions/xt_TARPIT.c
index cdd0f5a3aae6c08d4830e7b00458640efd44b081..ac693644e9776ae4f75a691a5f753749bf4ccf88 100644 (file)
--- a/extensions/xt_TARPIT.c
+++ b/extensions/xt_TARPIT.c
@@ -310,10 +310,11 @@ static void tarpit_tcp6(struct sk_buff *oldskb, unsigned int hook,
        const uint8_t tclass = 0;
        uint8_t proto;
        uint16_t payload;
+       __be16 frag_off;
 
        proto   = oip6h->nexthdr;
        tcphoff = ipv6_skip_exthdr(oldskb,
-                 (uint8_t *)(oip6h + 1) - oldskb->data, &proto);
+                 (uint8_t *)(oip6h + 1) - oldskb->data, &proto, &frag_off);
 
        if (tcphoff < 0 || tcphoff > oldskb->len) {
                pr_debug("Cannot get TCP header.\n");
@@ -365,8 +366,8 @@ static void tarpit_tcp6(struct sk_buff *oldskb, unsigned int hook,
        ip6h = ipv6_hdr(nskb);
        *(__be32 *)ip6h =  htonl(0x60000000 | (tclass << 20));
        ip6h->nexthdr = IPPROTO_TCP;
-       ipv6_addr_copy(&ip6h->saddr, &oip6h->daddr);
-       ipv6_addr_copy(&ip6h->daddr, &oip6h->saddr);
+       ip6h->saddr = oip6h->daddr;
+       ip6h->daddr = oip6h->saddr;
 
        /* Adjust IP TTL */
        if (mode == XTTARPIT_HONEYPOT)
@@ -464,6 +465,7 @@ tarpit_tg6(struct sk_buff **pskb, const struct xt_action_param *par)
        const struct rt6_info *rt = (struct rt6_info *)skb_dst(skb);
        const struct xt_tarpit_tginfo *info = par->targinfo;
        uint8_t proto;
+       __be16 frag_off;
 
        /* Do we have an input route cache entry? (Not in PREROUTING.) */
        if (rt == NULL) {
@@ -483,8 +485,8 @@ tarpit_tg6(struct sk_buff **pskb, const struct xt_action_param *par)
         * options, and probably should not try.
         */
        proto = iph->nexthdr;
-       if (ipv6_skip_exthdr(skb, skb_network_header_len(skb), &proto) !=
-           sizeof(struct ipv6hdr))
+       if (ipv6_skip_exthdr(skb, skb_network_header_len(skb), &proto,
+           &frag_off) != sizeof(struct ipv6hdr))
                return NF_DROP;
 
        if ((!(ipv6_addr_type(&iph->saddr) & IPV6_ADDR_UNICAST)) ||