git.droids-corp.org / dpdk.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
examples/ipsec-secgw: fix no SA found case
[dpdk.git] / examples / ipsec-secgw / sa.c
diff --git a/examples/ipsec-secgw/sa.c b/examples/ipsec-secgw/sa.c
index 91a5f6e..a193bdf 100644 (file)
--- a/examples/ipsec-secgw/sa.c
+++ b/examples/ipsec-secgw/sa.c
@@ -34,6 +34,8 @@
 /*
  * Security Associations
  */
+#include <sys/types.h>
+#include <netinet/in.h>
 #include <netinet/ip.h>
 
 #include <rte_memzone.h>
@@ -45,160 +47,112 @@
 #include "ipsec.h"
 #include "esp.h"
 
-/* SAs EP0 Outbound */
-const struct ipsec_sa sa_ep0_out[] = {
-       { 5, 0, IPv4(172, 16, 1, 5), IPv4(172, 16, 2, 5),
-               NULL, NULL,
-               esp4_tunnel_outbound_pre_crypto,
-               esp4_tunnel_outbound_post_crypto,
-               RTE_CRYPTO_CIPHER_AES_CBC, RTE_CRYPTO_AUTH_SHA1_HMAC,
-               12, 16, 16,
-               0, 0 },
-       { 6, 0, IPv4(172, 16, 1, 6), IPv4(172, 16, 2, 6),
-               NULL, NULL,
-               esp4_tunnel_outbound_pre_crypto,
-               esp4_tunnel_outbound_post_crypto,
-               RTE_CRYPTO_CIPHER_AES_CBC, RTE_CRYPTO_AUTH_SHA1_HMAC,
-               12, 16, 16,
-               0, 0 },
-       { 7, 0, IPv4(172, 16, 1, 7), IPv4(172, 16, 2, 7),
-               NULL, NULL,
-               esp4_tunnel_outbound_pre_crypto,
-               esp4_tunnel_outbound_post_crypto,
-               RTE_CRYPTO_CIPHER_AES_CBC, RTE_CRYPTO_AUTH_SHA1_HMAC,
-               12, 16, 16,
-               0, 0 },
-       { 8, 0, IPv4(172, 16, 1, 8), IPv4(172, 16, 2, 8),
-               NULL, NULL,
-               esp4_tunnel_outbound_pre_crypto,
-               esp4_tunnel_outbound_post_crypto,
-               RTE_CRYPTO_CIPHER_AES_CBC, RTE_CRYPTO_AUTH_SHA1_HMAC,
-               12, 16, 16,
-               0, 0 },
-       { 9, 0, IPv4(172, 16, 1, 5), IPv4(172, 16, 2, 5),
-               NULL, NULL,
-               esp4_tunnel_outbound_pre_crypto,
-               esp4_tunnel_outbound_post_crypto,
-               RTE_CRYPTO_CIPHER_NULL, RTE_CRYPTO_AUTH_NULL,
-               0, 0, 4,
-               0, 0 },
-};
-
-/* SAs EP0 Inbound */
-const struct ipsec_sa sa_ep0_in[] = {
-       { 5, 0, IPv4(172, 16, 2, 5), IPv4(172, 16, 1, 5),
-               NULL, NULL,
-               esp4_tunnel_inbound_pre_crypto,
-               esp4_tunnel_inbound_post_crypto,
-               RTE_CRYPTO_CIPHER_AES_CBC, RTE_CRYPTO_AUTH_SHA1_HMAC,
-               12, 16, 16,
-               0, 0 },
-       { 6, 0, IPv4(172, 16, 2, 6), IPv4(172, 16, 1, 6),
-               NULL, NULL,
-               esp4_tunnel_inbound_pre_crypto,
-               esp4_tunnel_inbound_post_crypto,
-               RTE_CRYPTO_CIPHER_AES_CBC, RTE_CRYPTO_AUTH_SHA1_HMAC,
-               12, 16, 16,
-               0, 0 },
-       { 7, 0, IPv4(172, 16, 2, 7), IPv4(172, 16, 1, 7),
-               NULL, NULL,
-               esp4_tunnel_inbound_pre_crypto,
-               esp4_tunnel_inbound_post_crypto,
-               RTE_CRYPTO_CIPHER_AES_CBC, RTE_CRYPTO_AUTH_SHA1_HMAC,
-               12, 16, 16,
-               0, 0 },
-       { 8, 0, IPv4(172, 16, 2, 8), IPv4(172, 16, 1, 8),
-               NULL, NULL,
-               esp4_tunnel_inbound_pre_crypto,
-               esp4_tunnel_inbound_post_crypto,
-               RTE_CRYPTO_CIPHER_AES_CBC, RTE_CRYPTO_AUTH_SHA1_HMAC,
-               12, 16, 16,
-               0, 0 },
-       { 9, 0, IPv4(172, 16, 2, 5), IPv4(172, 16, 1, 5),
-               NULL, NULL,
-               esp4_tunnel_inbound_pre_crypto,
-               esp4_tunnel_inbound_post_crypto,
-               RTE_CRYPTO_CIPHER_NULL, RTE_CRYPTO_AUTH_NULL,
-               0, 0, 4,
-               0, 0 },
-};
-
-/* SAs EP1 Outbound */
-const struct ipsec_sa sa_ep1_out[] = {
-       { 5, 0, IPv4(172, 16, 2, 5), IPv4(172, 16, 1, 5),
-               NULL, NULL,
-               esp4_tunnel_outbound_pre_crypto,
-               esp4_tunnel_outbound_post_crypto,
-               RTE_CRYPTO_CIPHER_AES_CBC, RTE_CRYPTO_AUTH_SHA1_HMAC,
-               12, 16, 16,
-               0, 0 },
-       { 6, 0, IPv4(172, 16, 2, 6), IPv4(172, 16, 1, 6),
-               NULL, NULL,
-               esp4_tunnel_outbound_pre_crypto,
-               esp4_tunnel_outbound_post_crypto,
-               RTE_CRYPTO_CIPHER_AES_CBC, RTE_CRYPTO_AUTH_SHA1_HMAC,
-               12, 16, 16,
-               0, 0 },
-       { 7, 0, IPv4(172, 16, 2, 7), IPv4(172, 16, 1, 7),
-               NULL, NULL,
-               esp4_tunnel_outbound_pre_crypto,
-               esp4_tunnel_outbound_post_crypto,
-               RTE_CRYPTO_CIPHER_AES_CBC, RTE_CRYPTO_AUTH_SHA1_HMAC,
-               12, 16, 16,
-               0, 0 },
-       { 8, 0, IPv4(172, 16, 2, 8), IPv4(172, 16, 1, 8),
-               NULL, NULL,
-               esp4_tunnel_outbound_pre_crypto,
-               esp4_tunnel_outbound_post_crypto,
-               RTE_CRYPTO_CIPHER_AES_CBC, RTE_CRYPTO_AUTH_SHA1_HMAC,
-               12, 16, 16,
-               0, 0 },
-       { 9, 0, IPv4(172, 16, 2, 5), IPv4(172, 16, 1, 5),
-               NULL, NULL,
-               esp4_tunnel_outbound_pre_crypto,
-               esp4_tunnel_outbound_post_crypto,
-               RTE_CRYPTO_CIPHER_NULL, RTE_CRYPTO_AUTH_NULL,
-               0, 0, 4,
-               0, 0 },
+/* SAs Outbound */
+const struct ipsec_sa sa_out[] = {
+       {
+       .spi = 5,
+       .src = IPv4(172, 16, 1, 5),
+       .dst = IPv4(172, 16, 2, 5),
+       .cipher_algo = RTE_CRYPTO_CIPHER_AES_CBC,
+       .auth_algo = RTE_CRYPTO_AUTH_SHA1_HMAC,
+       .digest_len = 12,
+       .iv_len = 16,
+       .block_size = 16,
+       },
+       {
+       .spi = 6,
+       .src = IPv4(172, 16, 1, 6),
+       .dst = IPv4(172, 16, 2, 6),
+       .cipher_algo = RTE_CRYPTO_CIPHER_AES_CBC,
+       .auth_algo = RTE_CRYPTO_AUTH_SHA1_HMAC,
+       .digest_len = 12,
+       .iv_len = 16,
+       .block_size = 16,
+       },
+       {
+       .spi = 7,
+       .src = IPv4(172, 16, 1, 7),
+       .dst = IPv4(172, 16, 2, 7),
+       .cipher_algo = RTE_CRYPTO_CIPHER_AES_CBC,
+       .auth_algo = RTE_CRYPTO_AUTH_SHA1_HMAC,
+       .digest_len = 12,
+       .iv_len = 16,
+       .block_size = 16,
+       },
+       {
+       .spi = 8,
+       .src = IPv4(172, 16, 1, 8),
+       .dst = IPv4(172, 16, 2, 8),
+       .cipher_algo = RTE_CRYPTO_CIPHER_AES_CBC,
+       .auth_algo = RTE_CRYPTO_AUTH_SHA1_HMAC,
+       .digest_len = 12,
+       .iv_len = 16,
+       .block_size = 16,
+       },
+       {
+       .spi = 9,
+       .src = IPv4(172, 16, 1, 9),
+       .dst = IPv4(172, 16, 2, 9),
+       .cipher_algo = RTE_CRYPTO_CIPHER_NULL,
+       .auth_algo = RTE_CRYPTO_AUTH_NULL,
+       .digest_len = 0,
+       .iv_len = 0,
+       .block_size = 4,
+       }
 };
 
-/* SAs EP1 Inbound */
-const struct ipsec_sa sa_ep1_in[] = {
-       { 5, 0, IPv4(172, 16, 1, 5), IPv4(172, 16, 2, 5),
-               NULL, NULL,
-               esp4_tunnel_inbound_pre_crypto,
-               esp4_tunnel_inbound_post_crypto,
-               RTE_CRYPTO_CIPHER_AES_CBC, RTE_CRYPTO_AUTH_SHA1_HMAC,
-               12, 16, 16,
-               0, 0 },
-       { 6, 0, IPv4(172, 16, 1, 6), IPv4(172, 16, 2, 6),
-               NULL, NULL,
-               esp4_tunnel_inbound_pre_crypto,
-               esp4_tunnel_inbound_post_crypto,
-               RTE_CRYPTO_CIPHER_AES_CBC, RTE_CRYPTO_AUTH_SHA1_HMAC,
-               12, 16, 16,
-               0, 0 },
-       { 7, 0, IPv4(172, 16, 1, 7), IPv4(172, 16, 2, 7),
-               NULL, NULL,
-               esp4_tunnel_inbound_pre_crypto,
-               esp4_tunnel_inbound_post_crypto,
-               RTE_CRYPTO_CIPHER_AES_CBC, RTE_CRYPTO_AUTH_SHA1_HMAC,
-               12, 16, 16,
-               0, 0 },
-       { 8, 0, IPv4(172, 16, 1, 8), IPv4(172, 16, 2, 8),
-               NULL, NULL,
-               esp4_tunnel_inbound_pre_crypto,
-               esp4_tunnel_inbound_post_crypto,
-               RTE_CRYPTO_CIPHER_AES_CBC, RTE_CRYPTO_AUTH_SHA1_HMAC,
-               12, 16, 16,
-               0, 0 },
-       { 9, 0, IPv4(172, 16, 1, 5), IPv4(172, 16, 2, 5),
-               NULL, NULL,
-               esp4_tunnel_inbound_pre_crypto,
-               esp4_tunnel_inbound_post_crypto,
-               RTE_CRYPTO_CIPHER_NULL, RTE_CRYPTO_AUTH_NULL,
-               0, 0, 4,
-               0, 0 },
+/* SAs Inbound */
+const struct ipsec_sa sa_in[] = {
+       {
+       .spi = 55,
+       .src = IPv4(172, 16, 2, 5),
+       .dst = IPv4(172, 16, 1, 5),
+       .cipher_algo = RTE_CRYPTO_CIPHER_AES_CBC,
+       .auth_algo = RTE_CRYPTO_AUTH_SHA1_HMAC,
+       .digest_len = 12,
+       .iv_len = 16,
+       .block_size = 16,
+       },
+       {
+       .spi = 56,
+       .src = IPv4(172, 16, 2, 6),
+       .dst = IPv4(172, 16, 1, 6),
+       .cipher_algo = RTE_CRYPTO_CIPHER_AES_CBC,
+       .auth_algo = RTE_CRYPTO_AUTH_SHA1_HMAC,
+       .digest_len = 12,
+       .iv_len = 16,
+       .block_size = 16,
+       },
+       {
+       .spi = 57,
+       .src = IPv4(172, 16, 2, 7),
+       .dst = IPv4(172, 16, 1, 7),
+       .cipher_algo = RTE_CRYPTO_CIPHER_AES_CBC,
+       .auth_algo = RTE_CRYPTO_AUTH_SHA1_HMAC,
+       .digest_len = 12,
+       .iv_len = 16,
+       .block_size = 16,
+       },
+       {
+       .spi = 58,
+       .src = IPv4(172, 16, 2, 8),
+       .dst = IPv4(172, 16, 1, 8),
+       .cipher_algo = RTE_CRYPTO_CIPHER_AES_CBC,
+       .auth_algo = RTE_CRYPTO_AUTH_SHA1_HMAC,
+       .digest_len = 12,
+       .iv_len = 16,
+       .block_size = 16,
+       },
+       {
+       .spi = 59,
+       .src = IPv4(172, 16, 2, 9),
+       .dst = IPv4(172, 16, 1, 9),
+       .cipher_algo = RTE_CRYPTO_CIPHER_NULL,
+       .auth_algo = RTE_CRYPTO_AUTH_NULL,
+       .digest_len = 0,
+       .iv_len = 0,
+       .block_size = 4,
+       }
 };
 
 static uint8_t cipher_key[256] = "sixteenbytes key";
@@ -207,15 +161,17 @@ static uint8_t cipher_key[256] = "sixteenbytes key";
 const struct rte_crypto_sym_xform aescbc_enc_xf = {
        NULL,
        RTE_CRYPTO_SYM_XFORM_CIPHER,
-       .cipher = { RTE_CRYPTO_CIPHER_OP_ENCRYPT, RTE_CRYPTO_CIPHER_AES_CBC,
+       {.cipher = { RTE_CRYPTO_CIPHER_OP_ENCRYPT, RTE_CRYPTO_CIPHER_AES_CBC,
                .key = { cipher_key, 16 } }
+       }
 };
 
 const struct rte_crypto_sym_xform aescbc_dec_xf = {
        NULL,
        RTE_CRYPTO_SYM_XFORM_CIPHER,
-       .cipher = { RTE_CRYPTO_CIPHER_OP_DECRYPT, RTE_CRYPTO_CIPHER_AES_CBC,
+       {.cipher = { RTE_CRYPTO_CIPHER_OP_DECRYPT, RTE_CRYPTO_CIPHER_AES_CBC,
                .key = { cipher_key, 16 } }
+       }
 };
 
 static uint8_t auth_key[256] = "twentybytes hash key";
@@ -224,28 +180,32 @@ static uint8_t auth_key[256] = "twentybytes hash key";
 const struct rte_crypto_sym_xform sha1hmac_gen_xf = {
        NULL,
        RTE_CRYPTO_SYM_XFORM_AUTH,
-       .auth = { RTE_CRYPTO_AUTH_OP_GENERATE, RTE_CRYPTO_AUTH_SHA1_HMAC,
+       {.auth = { RTE_CRYPTO_AUTH_OP_GENERATE, RTE_CRYPTO_AUTH_SHA1_HMAC,
                .key = { auth_key, 20 }, 12, 0 }
+       }
 };
 
 const struct rte_crypto_sym_xform sha1hmac_verify_xf = {
        NULL,
        RTE_CRYPTO_SYM_XFORM_AUTH,
-       .auth = { RTE_CRYPTO_AUTH_OP_VERIFY, RTE_CRYPTO_AUTH_SHA1_HMAC,
+       {.auth = { RTE_CRYPTO_AUTH_OP_VERIFY, RTE_CRYPTO_AUTH_SHA1_HMAC,
                .key = { auth_key, 20 }, 12, 0 }
+       }
 };
 
 /* AES CBC xform */
 const struct rte_crypto_sym_xform null_cipher_xf = {
        NULL,
        RTE_CRYPTO_SYM_XFORM_CIPHER,
-       .cipher = { .algo = RTE_CRYPTO_CIPHER_NULL }
+       {.cipher = { .algo = RTE_CRYPTO_CIPHER_NULL }
+       }
 };
 
 const struct rte_crypto_sym_xform null_auth_xf = {
        NULL,
        RTE_CRYPTO_SYM_XFORM_AUTH,
-       .auth = { .algo = RTE_CRYPTO_AUTH_NULL }
+       {.auth = { .algo = RTE_CRYPTO_AUTH_NULL }
+       }
 };
 
 struct sa_ctx {
@@ -360,15 +320,15 @@ sa_init(struct socket_ctx *ctx, int socket_id, unsigned ep)
                                "initialized\n", socket_id);
 
        if (ep == 0) {
-               sa_out_entries = sa_ep0_out;
-               nb_out_entries = RTE_DIM(sa_ep0_out);
-               sa_in_entries = sa_ep0_in;
-               nb_in_entries = RTE_DIM(sa_ep0_in);
+               sa_out_entries = sa_out;
+               nb_out_entries = RTE_DIM(sa_out);
+               sa_in_entries = sa_in;
+               nb_in_entries = RTE_DIM(sa_in);
        } else if (ep == 1) {
-               sa_out_entries = sa_ep1_out;
-               nb_out_entries = RTE_DIM(sa_ep1_out);
-               sa_in_entries = sa_ep1_in;
-               nb_in_entries = RTE_DIM(sa_ep1_in);
+               sa_out_entries = sa_in;
+               nb_out_entries = RTE_DIM(sa_in);
+               sa_in_entries = sa_out;
+               nb_in_entries = RTE_DIM(sa_out);
        } else
                rte_exit(EXIT_FAILURE, "Invalid EP value %u. "
                                "Only 0 or 1 supported.\n", ep);
DPDK repo used for reviews