New upstream version 17.11~rc4

[deb_dpdk.git] / lib / librte_ip_frag / rte_ipv4_reassembly.c

diff --git a/lib/librte_ip_frag/rte_ipv4_reassembly.c b/lib/librte_ip_frag/rte_ipv4_reassembly.c
index 26d07f9..040bd70 100644 (file)
--- a/lib/librte_ip_frag/rte_ipv4_reassembly.c
+++ b/lib/librte_ip_frag/rte_ipv4_reassembly.c
@@ -41,11 +41,12 @@
  * Reassemble fragments into one packet.
  */
 struct rte_mbuf *
-ipv4_frag_reassemble(const struct ip_frag_pkt *fp)
+ipv4_frag_reassemble(struct ip_frag_pkt *fp)
 {
        struct ipv4_hdr *ip_hdr;
        struct rte_mbuf *m, *prev;
        uint32_t i, n, ofs, first_len;
+       uint32_t curr_idx = 0;
 
        first_len = fp->frags[IP_FIRST_FRAG_IDX].len;
        n = fp->last_idx - 1;
@@ -53,6 +54,7 @@ ipv4_frag_reassemble(const struct ip_frag_pkt *fp)
        /*start from the last fragment. */
        m = fp->frags[IP_LAST_FRAG_IDX].mb;
        ofs = fp->frags[IP_LAST_FRAG_IDX].ofs;
+       curr_idx = IP_LAST_FRAG_IDX;
 
        while (ofs != first_len) {
 
@@ -67,6 +69,10 @@ ipv4_frag_reassemble(const struct ip_frag_pkt *fp)
                                rte_pktmbuf_adj(m, (uint16_t)(m->l2_len + m->l3_len));
                                rte_pktmbuf_chain(fp->frags[i].mb, m);
 
+                               /* this mbuf should not be accessed directly */
+                               fp->frags[curr_idx].mb = NULL;
+                               curr_idx = i;
+
                                /* update our last fragment and offset. */
                                m = fp->frags[i].mb;
                                ofs = fp->frags[i].ofs;
@@ -87,7 +93,7 @@ ipv4_frag_reassemble(const struct ip_frag_pkt *fp)
        /* update mbuf fields for reassembled packet. */
        m->ol_flags |= PKT_TX_IP_CKSUM;
 
-       /* update ipv4 header for the reassmebled packet */
+       /* update ipv4 header for the reassembled packet */
        ip_hdr = rte_pktmbuf_mtod_offset(m, struct ipv4_hdr *, m->l2_len);
 
        ip_hdr->total_length = rte_cpu_to_be_16((uint16_t)(fp->total_size +
@@ -111,8 +117,8 @@ ipv4_frag_reassemble(const struct ip_frag_pkt *fp)
  * @param ip_hdr
  *   Pointer to the IPV4 header inside the fragment.
  * @return
- *   Pointer to mbuf for reassebled packet, or NULL if:
- *   - an error occured.
+ *   Pointer to mbuf for reassembled packet, or NULL if:
+ *   - an error occurred.
  *   - not all fragments of the packet are collected yet.
  */
 struct rte_mbuf *