diff options
| author |   Nathan Skrzypczak <nathan.skrzypczak@gmail.com> | 2019-09-12 16:02:13 +0200 |
|---|---|---|
| committer |   Florin Coras <florin.coras@gmail.com> | 2019-10-08 01:12:24 +0000 |
| commit | 8095b602c79c411999f04ded541db918cf1fabe0 (patch) | |
| tree | 7a4ddade5c1c6fd00bdf0c340c67918dbfaa0966 /src/plugins/hs_apps/sapi/vpp_echo_common.h | |
| parent | caa7acf5c55a78ef4f7addfb94da0ad788f59a75 (diff) | |
hsa: make vpp_echo use mq instead of bapi
Type: refactor
Change-Id: I4f370b09e22dbbc8920272df9a042dae04825bfc
Signed-off-by: Nathan Skrzypczak <nathan.skrzypczak@gmail.com>
Diffstat (limited to 'src/plugins/hs_apps/sapi/vpp_echo_common.h')
| -rw-r--r-- | src/plugins/hs_apps/sapi/vpp_echo_common.h | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/src/plugins/hs_apps/sapi/vpp_echo_common.h b/src/plugins/hs_apps/sapi/vpp_echo_common.h index 0e9eaebd345..ea20e2b9e09 100644 --- a/src/plugins/hs_apps/sapi/vpp_echo_common.h +++ b/src/plugins/hs_apps/sapi/vpp_echo_common.h @@ -73,8 +73,8 @@ _(ECHO_FAIL_VL_API_DETACH_REPLY, "ECHO_FAIL_VL_API_DETACH_REPLY") \ _(ECHO_FAIL_VL_API_BIND_URI_REPLY, "ECHO_FAIL_VL_API_BIND_URI_REPLY") \ _(ECHO_FAIL_VL_API_UNBIND_REPLY, "ECHO_FAIL_VL_API_UNBIND_REPLY") \ - _(ECHO_FAIL_VL_API_DISCONNECT_SESSION_REPLY, \ - "ECHO_FAIL_VL_API_DISCONNECT_SESSION_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, \ @@ -189,6 +189,8 @@ enum quic_session_state_t typedef enum { STATE_START, + STATE_ATTACHED_NO_CERT, + STATE_ATTACHED_ONE_CERT, STATE_ATTACHED, STATE_LISTEN, STATE_READY, @@ -221,7 +223,7 @@ typedef struct echo_proto_cb_vft_ void (*bound_uri_cb) (session_bound_msg_t * mp, echo_session_t * session); /* Session got bound */ void (*reset_cb) (session_reset_msg_t * mp, echo_session_t * s); /* Received RESET on session */ void (*disconnected_cb) (session_disconnected_msg_t * mp, echo_session_t * s); /* Received DISCONNECT on session */ - void (*disconnected_reply_cb) (echo_session_t * s); /* ACK disconnect we sent to vpp */ + void (*sent_disconnect_cb) (echo_session_t * s); /* ACK disconnect we sent to vpp */ void (*cleanup_cb) (echo_session_t * s, u8 parent_died); /* Session should be cleaned up (parent listener may be dead) */ /* Add CLI options */ int (*process_opts_cb) (unformat_input_t * a); @@ -249,7 +251,8 @@ typedef struct u32 my_client_index; /* API client handle */ u8 *uri; /* The URI we're playing with */ echo_session_t *sessions; /* Session pool */ - svm_msg_q_t *our_event_queue; /* Our event queue */ + svm_msg_q_t *app_mq; /* Our receiveing event queue */ + svm_msg_q_t *ctrl_mq; /* Our control queue (towards vpp) */ clib_time_t clib_time; /* For deadman timers */ u8 *socket_name; int i_am_master; @@ -289,6 +292,7 @@ typedef struct 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 */ u8 *appns_id; u64 appns_flags; @@ -373,16 +377,19 @@ int wait_for_state_change (echo_main_t * em, connection_state_t state, f64 timeout); void echo_notify_event (echo_main_t * em, echo_test_evt_t e); void echo_session_print_stats (echo_main_t * em, echo_session_t * session); +u8 *echo_format_crypto_engine (u8 * s, va_list * args); +uword echo_unformat_crypto_engine (unformat_input_t * input, va_list * args); /* Binary API */ void echo_send_attach (echo_main_t * em); void echo_send_detach (echo_main_t * em); void echo_send_listen (echo_main_t * em); -void echo_send_unbind (echo_main_t * em); -void echo_send_connect (u8 * uri, u32 opaque); +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); #endif /* __included_vpp_echo_common_h__ */ |