X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Ftlsopenssl%2Ftls_openssl_test.c;h=9a660758dee307e2b00583ca10c013b1f98069d5;hb=1e582206a;hp=1c810c9a7f8643a435382934b25db4da832c33ad;hpb=be4d1aa2c58efa8287bca8795bc4a83cb448993a;p=vpp.git diff --git a/src/plugins/tlsopenssl/tls_openssl_test.c b/src/plugins/tlsopenssl/tls_openssl_test.c index 1c810c9a7f8..9a660758dee 100644 --- a/src/plugins/tlsopenssl/tls_openssl_test.c +++ b/src/plugins/tlsopenssl/tls_openssl_test.c @@ -23,29 +23,8 @@ uword unformat_sw_if_index (unformat_input_t * input, va_list * args); /* Declare message IDs */ -#include - -/* define message structures */ -#define vl_typedefs -#include -#undef vl_typedefs - -/* declare message handlers for each api */ - -#define vl_endianfun /* define message structures */ -#include -#undef vl_endianfun - -/* instantiate all the print functions we know about */ -#define vl_print(handle, ...) -#define vl_printfun -#include -#undef vl_printfun - -/* Get the API version number. */ -#define vl_api_version(n,v) static u32 api_version=(v); -#include -#undef vl_api_version +#include +#include typedef struct { @@ -59,33 +38,6 @@ tls_openssl_test_main_t tls_openssl_test_main; #define __plugin_msg_base tls_openssl_test_main.msg_id_base #include -#define foreach_standard_reply_retval_handler \ -_(tls_openssl_set_engine_reply) - -#define _(n) \ - static void vl_api_##n##_t_handler \ - (vl_api_##n##_t * mp) \ - { \ - vat_main_t * vam = tls_openssl_test_main.vat_main; \ - i32 retval = ntohl(mp->retval); \ - if (vam->async_mode) { \ - vam->async_errors += (retval < 0); \ - } else { \ - vam->retval = retval; \ - vam->result_ready = 1; \ - } \ - } -foreach_standard_reply_retval_handler; -#undef _ - -/* - * Table of message reply handlers, must include boilerplate handlers - * we just generated - */ -#define foreach_vpe_api_reply_msg \ -_(TLS_OPENSSL_SET_ENGINE_REPLY, tls_openssl_set_engine_reply) - - static int api_tls_openssl_set_engine (vat_main_t * vam) { @@ -127,24 +79,24 @@ api_tls_openssl_set_engine (vat_main_t * vam) engine_alg = format (0, "ALL"); else { - for (int i = 0; i < strnlen ((char *) engine_alg, 64); i++) + for (int i = 0; i < strnlen ((char *) engine_alg, 63); i++) engine_alg[i] = toupper (engine_alg[i]); } /* Construct the API message */ M (TLS_OPENSSL_SET_ENGINE, mp); - mp->async = async; + mp->async_enable = async; clib_memcpy_fast (mp->engine, engine_name, - strnlen ((const char *) engine_name, 64)); + strnlen ((const char *) engine_name, 63)); clib_memcpy_fast (mp->algorithm, engine_alg, - strnlen ((const char *) engine_alg, 64)); + strnlen ((const char *) engine_alg, 63)); if (ciphers) clib_memcpy_fast (mp->ciphers, ciphers, - strnlen ((const char *) ciphers, 64)); + strnlen ((const char *) ciphers, 63)); /* send it... */ S (mp); @@ -154,42 +106,7 @@ api_tls_openssl_set_engine (vat_main_t * vam) return ret; } -/* - * List of messages that the api test plugin sends, - * and that the data plane plugin processes - */ -#define foreach_vpe_api_msg \ -_(tls_openssl_set_engine, "tls openssl set [engine ]" \ -"[alg [algorithm] [async]\n") - -static void -tls_openssl_api_hookup (vat_main_t * vam) -{ - tls_openssl_test_main_t *htmp = &tls_openssl_test_main; - /* Hook up handlers for replies from the data plane plug-in */ -#define _(N,n) \ - vl_msg_api_set_handlers((VL_API_##N + htmp->msg_id_base), \ - #n, \ - vl_api_##n##_t_handler, \ - vl_noop_handler, \ - vl_api_##n##_t_endian, \ - vl_api_##n##_t_print, \ - sizeof(vl_api_##n##_t), 1); - foreach_vpe_api_reply_msg; -#undef _ - - /* API messages we can send */ -#define _(n,h) hash_set_mem (vam->function_by_name, #n, api_##n); - foreach_vpe_api_msg; -#undef _ - - /* Help strings */ -#define _(n,h) hash_set_mem (vam->help_by_name, #n, h); - foreach_vpe_api_msg; -#undef _ -} - -VAT_PLUGIN_REGISTER (tls_openssl); +#include /* * fd.io coding-style-patch-verification: ON