On 17 October 2015 at 13:14, Florian Westphal <fw@xxxxxxxxx> wrote:
> @@ -425,6 +425,35 @@ nf_ct_frag6_reasm(struct frag_queue *fq, struct net_device *dev)
> add_frag_mem_limit(fq->q.net, clone->truesize);
> }
>
> + /* morph head into last received skb: prev.
> + *
> + * This allows callers of ipv6 conntrack defrag to continue
> + * to use the last skb(frag) passed into the reasm engine.
> + * The last skb frag 'silently' turns into the full reassembled skb.
> + *
> + * Since prev is also part of q->fragments we have to clone it first.
> + */
> + if (head != prev) {
> + struct sk_buff *iter;
> +
> + fp = skb_clone(prev, GFP_ATOMIC);
> + if (!fp)
> + goto out_oom;
> +
> + fp->next = prev->next;
> + skb_queue_walk(head, iter) {
> + if (iter->next != prev)
> + continue;
> + iter->next = fp;
> + break;
> + }
> +
> + skb_morph(prev, head);
> + prev->next = head->next;
> + consume_skb(head);
> + head = prev;
> + }
> +
> /* We have to remove fragment header from datagram and to relocate
> * header in order to calculate ICV correctly. */
> skb_network_header(head)[fq->nhoffset] = skb_transport_header(head)[0];
This hunk looks very similar to the logic in ip_frag_reasm(). Did you
consider refactoring to share it?
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
