reorder: new library

[dpdk.git] / lib / librte_ip_frag / rte_ipv6_reassembly.c

diff --git a/lib/librte_ip_frag/rte_ipv6_reassembly.c b/lib/librte_ip_frag/rte_ipv6_reassembly.c
index 1d83c79..71cf721 100644 (file)
--- a/lib/librte_ip_frag/rte_ipv6_reassembly.c
+++ b/lib/librte_ip_frag/rte_ipv6_reassembly.c
@@ -45,11 +45,21 @@
  *
  */
 
+static inline void
+ip_frag_memmove(char *dst, char *src, int len)
+{
+       int i;
+
+       /* go backwards to make sure we don't overwrite anything important */
+       for (i = len - 1; i >= 0; i--)
+               dst[i] = src[i];
+}
+
 /*
  * Reassemble fragments into one packet.
  */
 struct rte_mbuf *
-ipv6_frag_reassemble(const struct rte_ip_frag_pkt *fp)
+ipv6_frag_reassemble(const struct ip_frag_pkt *fp)
 {
        struct ipv6_hdr *ip_hdr;
        struct ipv6_extension_fragment *frag_hdr;
@@ -99,7 +109,7 @@ ipv6_frag_reassemble(const struct rte_ip_frag_pkt *fp)
 
        /* update ipv6 header for the reassembled datagram */
        ip_hdr = (struct ipv6_hdr *) (rte_pktmbuf_mtod(m, uint8_t *) +
-                                                                 m->pkt.vlan_macip.f.l2_len);
+                                                                 m->l2_len);
 
        ip_hdr->payload_len = rte_cpu_to_be_16(payload_len);
 
@@ -110,12 +120,11 @@ ipv6_frag_reassemble(const struct rte_ip_frag_pkt *fp)
         * other headers, so we assume there are no other headers and thus update
         * the main IPv6 header instead.
         */
-       move_len = m->pkt.vlan_macip.f.l2_len + m->pkt.vlan_macip.f.l3_len -
-                       sizeof(*frag_hdr);
+       move_len = m->l2_len + m->l3_len - sizeof(*frag_hdr);
        frag_hdr = (struct ipv6_extension_fragment *) (ip_hdr + 1);
        ip_hdr->proto = frag_hdr->next_header;
 
-       memmove(rte_pktmbuf_mtod(m, char*) + sizeof(*frag_hdr),
+       ip_frag_memmove(rte_pktmbuf_mtod(m, char*) + sizeof(*frag_hdr),
                        rte_pktmbuf_mtod(m, char*), move_len);
 
        rte_pktmbuf_adj(m, sizeof(*frag_hdr));
@@ -148,7 +157,7 @@ rte_ipv6_frag_reassemble_packet(struct rte_ip_frag_tbl *tbl,
                struct rte_ip_frag_death_row *dr, struct rte_mbuf *mb, uint64_t tms,
                struct ipv6_hdr *ip_hdr, struct ipv6_extension_fragment *frag_hdr)
 {
-       struct rte_ip_frag_pkt *fp;
+       struct ip_frag_pkt *fp;
        struct ip_frag_key key;
        uint16_t ip_len, ip_ofs;