hsa: Add ckpair & crypto engine in vpp_echo

[vpp.git] / src / plugins / hs_apps / sapi / vpp_echo_common.h

diff --git a/src/plugins/hs_apps/sapi/vpp_echo_common.h b/src/plugins/hs_apps/sapi/vpp_echo_common.h
index a7010d8..5ddd8fb 100644 (file)
--- a/src/plugins/hs_apps/sapi/vpp_echo_common.h
+++ b/src/plugins/hs_apps/sapi/vpp_echo_common.h
@@ -64,6 +64,7 @@
   _(ECHO_FAIL_1ST_PTHREAD_CREATE, "ECHO_FAIL_1ST_PTHREAD_CREATE")       \
   _(ECHO_FAIL_PTHREAD_CREATE, "ECHO_FAIL_PTHREAD_CREATE")               \
   _(ECHO_FAIL_DETACH, "ECHO_FAIL_DETACH")                               \
+  _(ECHO_FAIL_DEL_CERT_KEY, "ECHO_FAIL_DEL_CERT_KEY")                               \
   _(ECHO_FAIL_MQ_PTHREAD, "ECHO_FAIL_MQ_PTHREAD")                       \
   _(ECHO_FAIL_VL_API_APP_ATTACH, "ECHO_FAIL_VL_API_APP_ATTACH")         \
   _(ECHO_FAIL_VL_API_MISSING_SEGMENT_NAME,                              \
@@ -79,10 +80,10 @@
   _(ECHO_FAIL_VL_API_UNBIND_REPLY, "ECHO_FAIL_VL_API_UNBIND_REPLY")     \
   _(ECHO_FAIL_SESSION_DISCONNECT, "ECHO_FAIL_SESSION_DISCONNECT")       \
   _(ECHO_FAIL_SESSION_RESET, "ECHO_FAIL_SESSION_RESET")                 \
-  _(ECHO_FAIL_VL_API_TLS_CERT_ADD_REPLY,                                \
-    "ECHO_FAIL_VL_API_TLS_CERT_ADD_REPLY")                              \
-  _(ECHO_FAIL_VL_API_TLS_KEY_ADD_REPLY,                                 \
-    "ECHO_FAIL_VL_API_TLS_KEY_ADD_REPLY")                               \
+  _(ECHO_FAIL_VL_API_CERT_KEY_ADD_REPLY,                                \
+    "ECHO_FAIL_VL_API_CERT_KEY_ADD_REPLY")                              \
+  _(ECHO_FAIL_VL_API_CERT_KEY_DEL_REPLY,                                \
+    "ECHO_FAIL_VL_API_CERT_KEY_DEL_REPLY")                              \
   _(ECHO_FAIL_GET_SESSION_FROM_HANDLE,                                  \
     "ECHO_FAIL_GET_SESSION_FROM_HANDLE")                                \
   _(ECHO_FAIL_QUIC_WRONG_CONNECT, "ECHO_FAIL_QUIC_WRONG_CONNECT")       \
@@ -108,15 +109,15 @@ extern char *echo_fail_code_str[];
 #define CHECK_SAME(fail, expected, result, _fmt, _args...)      \
 do {                                                            \
   if ((expected) != (result))                                   \
-    ECHO_FAIL ((fail), "expected same (%d, got %d) : "_fmt,     \
-               (expected), (result), ##_args);                  \
+    ECHO_FAIL ((fail), "expected same (%lld, got %lld) : "_fmt, \
+               (u64)(expected), (u64)(result), ##_args);        \
 } while (0)
 
 #define CHECK_DIFF(fail, expected, result, _fmt, _args...)      \
 do {                                                            \
   if ((expected) == (result))                                   \
-    ECHO_FAIL ((fail), "expected different (both %d) : "_fmt,   \
-               (expected), ##_args);                            \
+    ECHO_FAIL ((fail), "expected different (both %lld) : "_fmt, \
+               (u64)(expected), ##_args);                       \
 } while (0)
 
 #define ECHO_FAIL(fail, _fmt, _args...)                                 \
@@ -124,10 +125,10 @@ do {                                                                    \
     echo_main_t *em = &echo_main;                                       \
     em->has_failed = (fail);                                            \
     if (vec_len(em->fail_descr))                                        \
-      em->fail_descr = format(em->fail_descr, " | %s (%d): "_fmt,       \
+      em->fail_descr = format(em->fail_descr, " | %s (%u): "_fmt,       \
                               echo_fail_code_str[fail], fail, ##_args); \
     else                                                                \
-      em->fail_descr = format(0, "%s (%d): "_fmt,                       \
+      em->fail_descr = format(0, "%s (%u): "_fmt,                       \
                               echo_fail_code_str[fail], fail, ##_args); \
     em->time_to_stop = 1;                                               \
     if (em->log_lvl > 0)                                                \
@@ -203,12 +204,12 @@ typedef enum
 {
   STATE_START,
   STATE_ATTACHED_NO_CERT,
-  STATE_ATTACHED_ONE_CERT,
   STATE_ATTACHED,
   STATE_LISTEN,
   STATE_READY,
   STATE_DATA_DONE,
   STATE_DISCONNECTED,
+  STATE_CLEANED_CERT_KEY,
   STATE_DETACHED
 } connection_state_t;
 
@@ -299,15 +300,17 @@ typedef struct
   u64 bytes_to_receive;                /* target per stream */
   u32 fifo_size;
   u32 prealloc_fifo_pairs;
-  u32 rx_buf_size;
-  u32 tx_buf_size;
+  u64 rx_buf_size;
+  u64 tx_buf_size;
   data_source_t data_source;   /* Use no/dummy/mirrored data */
   u8 send_stream_disconnects;  /* actively send disconnect */
   u8 output_json;              /* Output stats as JSON */
+  volatile u8 wait_for_gdb;    /* Wait for gdb to attach */
   u8 log_lvl;                  /* Verbosity of the logging */
   int max_test_msg;            /* Limit the number of incorrect data messages */
   u32 evt_q_size;              /* Size of the vpp MQ (app<->vpp events) */
-  u32 crypto_ctx_engine;       /* crypto engine used */
+  u32 ckpair_index;            /* Cert key pair used */
+  u8 crypto_engine;            /* crypto engine used */
 
   u8 *appns_id;
   u64 appns_flags;
@@ -333,6 +336,8 @@ typedef struct
   {
     u64 tx_total;
     u64 rx_total;
+    u64 tx_expected;
+    u64 rx_expected;
     teardown_stat_t reset_count;       /* received reset from vpp */
     teardown_stat_t close_count;       /* received close from vpp */
     teardown_stat_t active_count;      /* sent close to vpp */
@@ -371,7 +376,6 @@ typedef struct
 u8 *format_ip4_address (u8 * s, va_list * args);
 u8 *format_ip6_address (u8 * s, va_list * args);
 u8 *format_ip46_address (u8 * s, va_list * args);
-uword unformat_data (unformat_input_t * input, va_list * args);
 u8 *format_api_error (u8 * s, va_list * args);
 void init_error_string_table ();
 u8 *echo_format_session (u8 * s, va_list * args);
@@ -407,7 +411,8 @@ void echo_send_unbind (echo_main_t * em, echo_session_t * s);
 void echo_send_connect (u64 vpp_session_handle, u32 opaque);
 void echo_send_disconnect_session (u64 handle, u32 opaque);
 void echo_api_hookup (echo_main_t * em);
-void echo_send_add_crypto_ctx (echo_main_t * em);
+void echo_send_add_cert_key (echo_main_t * em);
+void echo_send_del_cert_key (echo_main_t * em);
 
 #endif /* __included_vpp_echo_common_h__ */