[lng-odp] [PATCH API-NEXT v1 14/15] linux-gen: ipsec: support TFC dummy packet generation

[Github ODP bot]

From: Dmitry Eremin-Solenikov <dmitry.ereminsoleni...@linaro.org>

Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsoleni...@linaro.org>
---
/** Email created from pull request 494 (lumag:ipsec-tfc-imp)
 ** https://github.com/Linaro/odp/pull/494
 ** Patch: https://github.com/Linaro/odp/pull/494.patch
 ** Base sha: ea2afab619ae74108a03798bc358fdfcd29fdd88
 ** Merge commit sha: 7bc900650676584bfb99c8a92c3d8812b458f172
 **/
 platform/linux-generic/odp_ipsec.c | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/platform/linux-generic/odp_ipsec.c 
b/platform/linux-generic/odp_ipsec.c
index c0b9cd2a7..a9680ba0e 100644
--- a/platform/linux-generic/odp_ipsec.c
+++ b/platform/linux-generic/odp_ipsec.c
@@ -949,8 +949,10 @@ static int ipsec_out_tunnel_ipv4(odp_packet_t *pkt,
        state->ip_hdr_len = _ODP_IPV4HDR_LEN;
        if (state->is_ipv4)
                state->ip_next_hdr = _ODP_IPPROTO_IPIP;
-       else
+       else if (state->is_ipv6)
                state->ip_next_hdr = _ODP_IPPROTO_IPV6;
+       else
+               state->ip_next_hdr = _ODP_IPPROTO_NO_NEXT;
        state->ip_next_hdr_offset = state->ip_offset +
                _ODP_IPV4HDR_PROTO_OFFSET;
 
@@ -1008,8 +1010,10 @@ static int ipsec_out_tunnel_ipv6(odp_packet_t *pkt,
        state->ip_hdr_len = _ODP_IPV6HDR_LEN;
        if (state->is_ipv4)
                state->ip_next_hdr = _ODP_IPPROTO_IPIP;
-       else
+       else if (state->is_ipv6)
                state->ip_next_hdr = _ODP_IPPROTO_IPV6;
+       else
+               state->ip_next_hdr = _ODP_IPPROTO_NO_NEXT;
        state->ip_next_hdr_offset = state->ip_offset + _ODP_IPV6HDR_NHDR_OFFSET;
 
        state->is_ipv4 = 0;
@@ -1330,8 +1334,17 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
        state.ip_offset = odp_packet_l3_offset(pkt);
        ODP_ASSERT(ODP_PACKET_OFFSET_INVALID != state.ip_offset);
 
-       state.ip = odp_packet_l3_ptr(pkt, NULL);
-       ODP_ASSERT(NULL != state.ip);
+       if (opt->flag.tfc_dummy) {
+               state.ip = NULL;
+               state.is_ipv4 = 0;
+               state.is_ipv6 = 0;
+       } else {
+               state.ip = odp_packet_l3_ptr(pkt, NULL);
+               ODP_ASSERT(NULL != state.ip);
+
+               state.is_ipv4 = (((uint8_t *)state.ip)[0] >> 4) == 0x4;
+               state.is_ipv6 = (((uint8_t *)state.ip)[0] >> 4) == 0x6;
+       }
 
        ipsec_sa = _odp_ipsec_sa_use(sa);
        ODP_ASSERT(NULL != ipsec_sa);
@@ -1347,9 +1360,6 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
        /* Initialize parameters block */
        memset(&param, 0, sizeof(param));
 
-       state.is_ipv4 = (((uint8_t *)state.ip)[0] >> 4) == 0x4;
-       state.is_ipv6 = (((uint8_t *)state.ip)[0] >> 4) == 0x6;
-
        if (ODP_IPSEC_MODE_TRANSPORT == ipsec_sa->mode) {
                if (state.is_ipv4)
                        rc = ipsec_parse_ipv4(&state, pkt);
@@ -1365,7 +1375,12 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
                        rc = ipsec_out_tunnel_parse_ipv4(&state, ipsec_sa);
                else if (state.is_ipv6)
                        rc = ipsec_out_tunnel_parse_ipv6(&state, ipsec_sa);
-               else
+               else if (opt->flag.tfc_dummy) {
+                       state.out_tunnel.ip_tos = 0;
+                       state.out_tunnel.ip_df = 0;
+                       state.out_tunnel.ip_flabel = 0;
+                       rc = 0;
+               } else
                        rc = -1;
                if (rc < 0) {
                        status->error.alg = 1;