net: add rte prefix to esp structure

Add 'rte_' prefix to structures:
- rename struct esp_hdr as struct rte_esp_hdr.

Signed-off-by: Olivier Matz <olivier.matz@6wind.com>

diff --git a/app/test/test_ipsec.c b/app/test/test_ipsec.c
index 80a2d255fb5fd5d1401c22de2c0e00566911a6a6..7ad285a926505dcba0951d2f9a66e1547babb6aa 100644 (file)
--- a/app/test/test_ipsec.c
+++ b/app/test/test_ipsec.c
@@ -572,12 +572,12 @@ setup_test_string_tunneled(struct rte_mempool *mpool, const char *string,
        size_t len, uint32_t spi, uint32_t seq)
 {
        struct rte_mbuf *m = rte_pktmbuf_alloc(mpool);
-       uint32_t hdrlen = sizeof(struct ipv4_hdr) + sizeof(struct esp_hdr);
+       uint32_t hdrlen = sizeof(struct ipv4_hdr) + sizeof(struct rte_esp_hdr);
        uint32_t taillen = sizeof(struct esp_tail);
        uint32_t t_len = len + hdrlen + taillen;
        uint32_t padlen;
 
-       struct esp_hdr esph  = {
+       struct rte_esp_hdr esph  = {
                .spi = rte_cpu_to_be_32(spi),
                .seq = rte_cpu_to_be_32(seq)
        };

diff --git a/examples/ipsec-secgw/esp.c b/examples/ipsec-secgw/esp.c
index e33232c989ce1d584f1021186558044989d322d3..da031a3c92e53e52b5ad05c7abc9e6dee85c5709 100644 (file)
--- a/examples/ipsec-secgw/esp.c
+++ b/examples/ipsec-secgw/esp.c
@@ -49,7 +49,7 @@ esp_inbound(struct rte_mbuf *m, struct ipsec_sa *sa,
        }
 
        payload_len = rte_pktmbuf_pkt_len(m) - ip_hdr_len -
-               sizeof(struct esp_hdr) - sa->iv_len - sa->digest_len;
+               sizeof(struct rte_esp_hdr) - sa->iv_len - sa->digest_len;
 
        if ((payload_len & (sa->block_size - 1)) || (payload_len <= 0)) {
                RTE_LOG_DP(DEBUG, IPSEC_ESP, "payload %d not multiple of %u\n",
@@ -61,13 +61,13 @@ esp_inbound(struct rte_mbuf *m, struct ipsec_sa *sa,
        sym_cop->m_src = m;
 
        if (sa->aead_algo == RTE_CRYPTO_AEAD_AES_GCM) {
-               sym_cop->aead.data.offset =  ip_hdr_len + sizeof(struct esp_hdr) +
+               sym_cop->aead.data.offset =  ip_hdr_len + sizeof(struct rte_esp_hdr) +
                        sa->iv_len;
                sym_cop->aead.data.length = payload_len;
 
                struct cnt_blk *icb;
                uint8_t *aad;
-               uint8_t *iv = RTE_PTR_ADD(ip4, ip_hdr_len + sizeof(struct esp_hdr));
+               uint8_t *iv = RTE_PTR_ADD(ip4, ip_hdr_len + sizeof(struct rte_esp_hdr));
 
                icb = get_cnt_blk(m);
                icb->salt = sa->salt;
@@ -75,7 +75,7 @@ esp_inbound(struct rte_mbuf *m, struct ipsec_sa *sa,
                icb->cnt = rte_cpu_to_be_32(1);
 
                aad = get_aad(m);
-               memcpy(aad, iv - sizeof(struct esp_hdr), 8);
+               memcpy(aad, iv - sizeof(struct rte_esp_hdr), 8);
                sym_cop->aead.aad.data = aad;
                sym_cop->aead.aad.phys_addr = rte_pktmbuf_iova_offset(m,
                                aad - rte_pktmbuf_mtod(m, uint8_t *));
@@ -85,12 +85,12 @@ esp_inbound(struct rte_mbuf *m, struct ipsec_sa *sa,
                sym_cop->aead.digest.phys_addr = rte_pktmbuf_iova_offset(m,
                                rte_pktmbuf_pkt_len(m) - sa->digest_len);
        } else {
-               sym_cop->cipher.data.offset =  ip_hdr_len + sizeof(struct esp_hdr) +
+               sym_cop->cipher.data.offset =  ip_hdr_len + sizeof(struct rte_esp_hdr) +
                        sa->iv_len;
                sym_cop->cipher.data.length = payload_len;
 
                struct cnt_blk *icb;
-               uint8_t *iv = RTE_PTR_ADD(ip4, ip_hdr_len + sizeof(struct esp_hdr));
+               uint8_t *iv = RTE_PTR_ADD(ip4, ip_hdr_len + sizeof(struct rte_esp_hdr));
                uint8_t *iv_ptr = rte_crypto_op_ctod_offset(cop,
                                        uint8_t *, IV_OFFSET);
 
@@ -118,7 +118,7 @@ esp_inbound(struct rte_mbuf *m, struct ipsec_sa *sa,
                case RTE_CRYPTO_AUTH_SHA1_HMAC:
                case RTE_CRYPTO_AUTH_SHA256_HMAC:
                        sym_cop->auth.data.offset = ip_hdr_len;
-                       sym_cop->auth.data.length = sizeof(struct esp_hdr) +
+                       sym_cop->auth.data.length = sizeof(struct rte_esp_hdr) +
                                sa->iv_len + payload_len;
                        break;
                default:
@@ -192,7 +192,7 @@ esp_inbound_post(struct rte_mbuf *m, struct ipsec_sa *sa,
        if (unlikely(sa->flags == TRANSPORT)) {
                ip = rte_pktmbuf_mtod(m, struct ip *);
                ip4 = (struct ip *)rte_pktmbuf_adj(m,
-                               sizeof(struct esp_hdr) + sa->iv_len);
+                               sizeof(struct rte_esp_hdr) + sa->iv_len);
                if (likely(ip->ip_v == IPVERSION)) {
                        memmove(ip4, ip, ip->ip_hl * 4);
                        ip4->ip_p = *nexthdr;
@@ -206,7 +206,7 @@ esp_inbound_post(struct rte_mbuf *m, struct ipsec_sa *sa,
                                              sizeof(struct ip6_hdr));
                }
        } else
-               ipip_inbound(m, sizeof(struct esp_hdr) + sa->iv_len);
+               ipip_inbound(m, sizeof(struct rte_esp_hdr) + sa->iv_len);
 
        return 0;
 }
@@ -217,7 +217,7 @@ esp_outbound(struct rte_mbuf *m, struct ipsec_sa *sa,
 {
        struct ip *ip4;
        struct ip6_hdr *ip6;
-       struct esp_hdr *esp = NULL;
+       struct rte_esp_hdr *esp = NULL;
        uint8_t *padding = NULL, *new_ip, nlp;
        struct rte_crypto_sym_op *sym_cop;
        int32_t i;
@@ -268,7 +268,7 @@ esp_outbound(struct rte_mbuf *m, struct ipsec_sa *sa,
        }
 
        /* Check maximum packet size */
-       if (unlikely(ip_hdr_len + sizeof(struct esp_hdr) + sa->iv_len +
+       if (unlikely(ip_hdr_len + sizeof(struct rte_esp_hdr) + sa->iv_len +
                        pad_payload_len + sa->digest_len > IP_MAXPACKET)) {
                RTE_LOG(ERR, IPSEC_ESP, "ipsec packet is too big\n");
                return -EINVAL;
@@ -290,20 +290,20 @@ esp_outbound(struct rte_mbuf *m, struct ipsec_sa *sa,
 
        switch (sa->flags) {
        case IP4_TUNNEL:
-               ip4 = ip4ip_outbound(m, sizeof(struct esp_hdr) + sa->iv_len,
+               ip4 = ip4ip_outbound(m, sizeof(struct rte_esp_hdr) + sa->iv_len,
                                &sa->src, &sa->dst);
-               esp = (struct esp_hdr *)(ip4 + 1);
+               esp = (struct rte_esp_hdr *)(ip4 + 1);
                break;
        case IP6_TUNNEL:
-               ip6 = ip6ip_outbound(m, sizeof(struct esp_hdr) + sa->iv_len,
+               ip6 = ip6ip_outbound(m, sizeof(struct rte_esp_hdr) + sa->iv_len,
                                &sa->src, &sa->dst);
-               esp = (struct esp_hdr *)(ip6 + 1);
+               esp = (struct rte_esp_hdr *)(ip6 + 1);
                break;
        case TRANSPORT:
                new_ip = (uint8_t *)rte_pktmbuf_prepend(m,
-                               sizeof(struct esp_hdr) + sa->iv_len);
+                               sizeof(struct rte_esp_hdr) + sa->iv_len);
                memmove(new_ip, ip4, ip_hdr_len);
-               esp = (struct esp_hdr *)(new_ip + ip_hdr_len);
+               esp = (struct rte_esp_hdr *)(new_ip + ip_hdr_len);
                ip4 = (struct ip *)new_ip;
                if (likely(ip4->ip_v == IPVERSION)) {
                        ip4->ip_p = IPPROTO_ESP;
@@ -362,7 +362,7 @@ esp_outbound(struct rte_mbuf *m, struct ipsec_sa *sa,
                uint8_t *aad;
 
                sym_cop->aead.data.offset = ip_hdr_len +
-                       sizeof(struct esp_hdr) + sa->iv_len;
+                       sizeof(struct rte_esp_hdr) + sa->iv_len;
                sym_cop->aead.data.length = pad_payload_len;
 
                /* Fill pad_len using default sequential scheme */
@@ -392,12 +392,12 @@ esp_outbound(struct rte_mbuf *m, struct ipsec_sa *sa,
                case RTE_CRYPTO_CIPHER_3DES_CBC:
                case RTE_CRYPTO_CIPHER_AES_CBC:
                        sym_cop->cipher.data.offset = ip_hdr_len +
-                               sizeof(struct esp_hdr);
+                               sizeof(struct rte_esp_hdr);
                        sym_cop->cipher.data.length = pad_payload_len + sa->iv_len;
                        break;
                case RTE_CRYPTO_CIPHER_AES_CTR:
                        sym_cop->cipher.data.offset = ip_hdr_len +
-                               sizeof(struct esp_hdr) + sa->iv_len;
+                               sizeof(struct rte_esp_hdr) + sa->iv_len;
                        sym_cop->cipher.data.length = pad_payload_len;
                        break;
                default:
@@ -422,7 +422,7 @@ esp_outbound(struct rte_mbuf *m, struct ipsec_sa *sa,
                case RTE_CRYPTO_AUTH_SHA1_HMAC:
                case RTE_CRYPTO_AUTH_SHA256_HMAC:
                        sym_cop->auth.data.offset = ip_hdr_len;
-                       sym_cop->auth.data.length = sizeof(struct esp_hdr) +
+                       sym_cop->auth.data.length = sizeof(struct rte_esp_hdr) +
                                sa->iv_len + pad_payload_len;
                        break;
                default:

diff --git a/examples/ipsec-secgw/sa.c b/examples/ipsec-secgw/sa.c
index 414fcd26cf60f6f56e25d0560d3fbd860a32081e..eeb7c7b8af0960e89d59134d6e128d4dced603a7 100644 (file)
--- a/examples/ipsec-secgw/sa.c
+++ b/examples/ipsec-secgw/sa.c
@@ -1179,7 +1179,7 @@ static inline void
 single_inbound_lookup(struct ipsec_sa *sadb, struct rte_mbuf *pkt,
                struct ipsec_sa **sa_ret)
 {
-       struct esp_hdr *esp;
+       struct rte_esp_hdr *esp;
        struct ip *ip;
        uint32_t *src4_addr;
        uint8_t *src6_addr;
@@ -1189,9 +1189,9 @@ single_inbound_lookup(struct ipsec_sa *sadb, struct rte_mbuf *pkt,
 
        ip = rte_pktmbuf_mtod(pkt, struct ip *);
        if (ip->ip_v == IPVERSION)
-               esp = (struct esp_hdr *)(ip + 1);
+               esp = (struct rte_esp_hdr *)(ip + 1);
        else
-               esp = (struct esp_hdr *)(((struct ip6_hdr *)ip) + 1);
+               esp = (struct rte_esp_hdr *)(((struct ip6_hdr *)ip) + 1);
 
        if (esp->spi == INVALID_SPI)
                return;

diff --git a/lib/librte_ethdev/rte_flow.h b/lib/librte_ethdev/rte_flow.h
index 75c374552fe102cdb609bdff467d0d485adc283e..58ac9f4d7d8a0e957cacf84badcd41b82c05c16c 100644 (file)
--- a/lib/librte_ethdev/rte_flow.h
+++ b/lib/librte_ethdev/rte_flow.h
@@ -916,7 +916,7 @@ static const struct rte_flow_item_gtp rte_flow_item_gtp_mask = {
  * Matches an ESP header.
  */
 struct rte_flow_item_esp {
-       struct esp_hdr hdr; /**< ESP header definition. */
+       struct rte_esp_hdr hdr; /**< ESP header definition. */
 };
 
 /** Default mask for RTE_FLOW_ITEM_TYPE_ESP. */

diff --git a/lib/librte_ipsec/crypto.h b/lib/librte_ipsec/crypto.h
index b5f2648318b0cc7fb1b8c20825d34e2d9adddeb4..a3f788a5708dbb760023706b761d60340ba87a1b 100644 (file)
--- a/lib/librte_ipsec/crypto.h
+++ b/lib/librte_ipsec/crypto.h
@@ -37,7 +37,7 @@ struct aead_gcm_aad {
 } __attribute__((packed));
 
 struct gcm_esph_iv {
-       struct esp_hdr esph;
+       struct rte_esp_hdr esph;
        uint64_t iv;
 } __attribute__((packed));
 

diff --git a/lib/librte_ipsec/sa.c b/lib/librte_ipsec/sa.c
index 5f55c2a4e791001c50956eb1e1af08138293b3d1..ea05632ad8fba4ebf2b4acea42f7fc9689dd2243 100644 (file)
--- a/lib/librte_ipsec/sa.c
+++ b/lib/librte_ipsec/sa.c
@@ -199,7 +199,7 @@ esp_inb_init(struct rte_ipsec_sa *sa)
        /* these params may differ with new algorithms support */
        sa->ctp.auth.offset = 0;
        sa->ctp.auth.length = sa->icv_len - sa->sqh_len;
-       sa->ctp.cipher.offset = sizeof(struct esp_hdr) + sa->iv_len;
+       sa->ctp.cipher.offset = sizeof(struct rte_esp_hdr) + sa->iv_len;
        sa->ctp.cipher.length = sa->icv_len + sa->ctp.cipher.offset;
 }
 
@@ -223,13 +223,13 @@ esp_outb_init(struct rte_ipsec_sa *sa, uint32_t hlen)
 
        /* these params may differ with new algorithms support */
        sa->ctp.auth.offset = hlen;
-       sa->ctp.auth.length = sizeof(struct esp_hdr) + sa->iv_len + sa->sqh_len;
+       sa->ctp.auth.length = sizeof(struct rte_esp_hdr) + sa->iv_len + sa->sqh_len;
        if (sa->aad_len != 0) {
-               sa->ctp.cipher.offset = hlen + sizeof(struct esp_hdr) +
+               sa->ctp.cipher.offset = hlen + sizeof(struct rte_esp_hdr) +
                        sa->iv_len;
                sa->ctp.cipher.length = 0;
        } else {
-               sa->ctp.cipher.offset = sa->hdr_len + sizeof(struct esp_hdr);
+               sa->ctp.cipher.offset = sa->hdr_len + sizeof(struct rte_esp_hdr);
                sa->ctp.cipher.length = sa->iv_len;
        }
 }
@@ -476,7 +476,7 @@ esp_outb_tun_pkt_prepare(struct rte_ipsec_sa *sa, rte_be64_t sqc,
 {
        uint32_t clen, hlen, l2len, pdlen, pdofs, plen, tlen;
        struct rte_mbuf *ml;
-       struct esp_hdr *esph;
+       struct rte_esp_hdr *esph;
        struct esp_tail *espt;
        char *ph, *pt;
        uint64_t *iv;
@@ -524,7 +524,7 @@ esp_outb_tun_pkt_prepare(struct rte_ipsec_sa *sa, rte_be64_t sqc,
                        sqn_low16(sqc));
 
        /* update spi, seqn and iv */
-       esph = (struct esp_hdr *)(ph + sa->hdr_len);
+       esph = (struct rte_esp_hdr *)(ph + sa->hdr_len);
        iv = (uint64_t *)(esph + 1);
        copy_iv(iv, ivp, sa->iv_len);
 
@@ -644,7 +644,7 @@ esp_outb_trs_pkt_prepare(struct rte_ipsec_sa *sa, rte_be64_t sqc,
        uint8_t np;
        uint32_t clen, hlen, pdlen, pdofs, plen, tlen, uhlen;
        struct rte_mbuf *ml;
-       struct esp_hdr *esph;
+       struct rte_esp_hdr *esph;
        struct esp_tail *espt;
        char *ph, *pt;
        uint64_t *iv;
@@ -687,7 +687,7 @@ esp_outb_trs_pkt_prepare(struct rte_ipsec_sa *sa, rte_be64_t sqc,
                        IPPROTO_ESP);
 
        /* update spi, seqn and iv */
-       esph = (struct esp_hdr *)(ph + uhlen);
+       esph = (struct rte_esp_hdr *)(ph + uhlen);
        iv = (uint64_t *)(esph + 1);
        copy_iv(iv, ivp, sa->iv_len);
 
@@ -806,7 +806,7 @@ esp_inb_tun_cop_prepare(struct rte_crypto_op *cop,
                gcm = rte_crypto_op_ctod_offset(cop, struct aead_gcm_iv *,
                        sa->iv_ofs);
                ivp = rte_pktmbuf_mtod_offset(mb, uint64_t *,
-                       pofs + sizeof(struct esp_hdr));
+                       pofs + sizeof(struct rte_esp_hdr));
                aead_gcm_iv_fill(gcm, ivp[0], sa->salt);
        /* CRYPT+AUTH case */
        } else {
@@ -820,7 +820,7 @@ esp_inb_tun_cop_prepare(struct rte_crypto_op *cop,
                /* copy iv from the input packet to the cop */
                ivc = rte_crypto_op_ctod_offset(cop, uint64_t *, sa->iv_ofs);
                ivp = rte_pktmbuf_mtod_offset(mb, uint64_t *,
-                       pofs + sizeof(struct esp_hdr));
+                       pofs + sizeof(struct rte_esp_hdr));
                copy_iv(ivc, ivp, sa->iv_len);
        }
        return 0;
@@ -862,9 +862,9 @@ esp_inb_tun_pkt_prepare(const struct rte_ipsec_sa *sa,
        uint64_t sqn;
        uint32_t icv_ofs, plen;
        struct rte_mbuf *ml;
-       struct esp_hdr *esph;
+       struct rte_esp_hdr *esph;
 
-       esph = rte_pktmbuf_mtod_offset(mb, struct esp_hdr *, hlen);
+       esph = rte_pktmbuf_mtod_offset(mb, struct rte_esp_hdr *, hlen);
 
        /*
         * retrieve and reconstruct SQN, then check it, then
@@ -991,7 +991,7 @@ esp_inb_tun_single_pkt_process(struct rte_ipsec_sa *sa, struct rte_mbuf *mb,
        uint32_t *sqn)
 {
        uint32_t hlen, icv_len, tlen;
-       struct esp_hdr *esph;
+       struct rte_esp_hdr *esph;
        struct esp_tail *espt;
        struct rte_mbuf *ml;
        char *pd;
@@ -1021,7 +1021,7 @@ esp_inb_tun_single_pkt_process(struct rte_ipsec_sa *sa, struct rte_mbuf *mb,
 
        /* cut of L2/L3 headers, ESP header and IV */
        hlen = mb->l2_len + mb->l3_len;
-       esph = rte_pktmbuf_mtod_offset(mb, struct esp_hdr *, hlen);
+       esph = rte_pktmbuf_mtod_offset(mb, struct rte_esp_hdr *, hlen);
        rte_pktmbuf_adj(mb, hlen + sa->ctp.cipher.offset);
 
        /* retrieve SQN for later check */
@@ -1045,7 +1045,7 @@ esp_inb_trs_single_pkt_process(struct rte_ipsec_sa *sa, struct rte_mbuf *mb,
        uint32_t *sqn)
 {
        uint32_t hlen, icv_len, l2len, l3len, tlen;
-       struct esp_hdr *esph;
+       struct rte_esp_hdr *esph;
        struct esp_tail *espt;
        struct rte_mbuf *ml;
        char *np, *op, *pd;
@@ -1074,7 +1074,7 @@ esp_inb_trs_single_pkt_process(struct rte_ipsec_sa *sa, struct rte_mbuf *mb,
        l3len = mb->l3_len;
        hlen = l2len + l3len;
        op = rte_pktmbuf_mtod(mb, char *);
-       esph = (struct esp_hdr *)(op + hlen);
+       esph = (struct rte_esp_hdr *)(op + hlen);
        *sqn = rte_be_to_cpu_32(esph->seq);
 
        /* cut off ESP header and IV, update L3 header */

diff --git a/lib/librte_net/rte_esp.h b/lib/librte_net/rte_esp.h
index 8e1b3d2dd8568cbcdf8b013f07868e516e6d2cb2..c569b7906b9469685d9291ff3b7a9d6218f8574d 100644 (file)
--- a/lib/librte_net/rte_esp.h
+++ b/lib/librte_net/rte_esp.h
@@ -20,7 +20,7 @@ extern "C" {
 /**
  * ESP Header
  */
-struct esp_hdr {
+struct rte_esp_hdr {
        rte_be32_t spi;  /**< Security Parameters Index */
        rte_be32_t seq;  /**< packet sequence number */
 } __attribute__((__packed__));