X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvpp-api%2Fjava%2Fjvpp-ioamexport%2Fjvpp_ioam_export.c;h=74ae438e136a6b2f038d350a998728ffca443230;hb=e86a8edd3c14fb41ace2a12efd17bc7772bf623f;hp=bf0e9f0ae7ce8ec8727a3f9191b3c5dedac9f9dc;hpb=2291a36008e197423a0f0414f6dcca4afa3ac4c1;p=vpp.git diff --git a/src/vpp-api/java/jvpp-ioamexport/jvpp_ioam_export.c b/src/vpp-api/java/jvpp-ioamexport/jvpp_ioam_export.c index bf0e9f0ae7c..74ae438e136 100644 --- a/src/vpp-api/java/jvpp-ioamexport/jvpp_ioam_export.c +++ b/src/vpp-api/java/jvpp-ioamexport/jvpp_ioam_export.c @@ -20,15 +20,6 @@ #include #undef vl_typedefs -#define vl_endianfun -#include -#undef vl_endianfun - -#define vl_print(handle, ...) -#define vl_printfun -#include -#undef vl_printfun - #include #include #include @@ -56,14 +47,14 @@ JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_ioamexport_JVppIoamexportImpl_init0 clib_warning ("Java_io_fd_vpp_jvpp_ioamexport_JVppIoamexportImpl_init0"); plugin_main->my_client_index = my_client_index; - plugin_main->vl_input_queue = (unix_shared_memory_queue_t *)queue_address; + plugin_main->vl_input_queue = uword_to_pointer (queue_address, svm_queue_t *); plugin_main->callbackObject = (*env)->NewGlobalRef(env, callback); plugin_main->callbackClass = (jclass)(*env)->NewGlobalRef(env, (*env)->GetObjectClass(env, callback)); // verify API has not changed since jar generation #define _(N) \ - get_message_id(env, #N); + if (get_message_id(env, #N) == 0) return; foreach_supported_api_message; #undef _ @@ -71,8 +62,8 @@ JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_ioamexport_JVppIoamexportImpl_init0 vl_msg_api_set_handlers(get_message_id(env, #N), #n, \ vl_api_##n##_t_handler, \ vl_noop_handler, \ - vl_api_##n##_t_endian, \ - vl_api_##n##_t_print, \ + vl_noop_handler, \ + vl_noop_handler, \ sizeof(vl_api_##n##_t), 1); foreach_api_reply_handler; #undef _