diff options
| -rw-r--r-- | java/CMakeLists.txt | 8 | ||||
| -rwxr-xr-x | java/jvpp-ikev2/jvpp_ikev2.c | 107 | ||||
| -rwxr-xr-x | java/jvpp-ikev2/jvpp_ikev2.h | 42 | ||||
| -rwxr-xr-x | scripts/install_jvpp.sh | 1 |
4 files changed, 158 insertions, 0 deletions
diff --git a/java/CMakeLists.txt b/java/CMakeLists.txt index 701a65c..c1c9e16 100644 --- a/java/CMakeLists.txt +++ b/java/CMakeLists.txt @@ -195,6 +195,7 @@ unset(PPPOE_JSON_FILE) unset(IOAM_TRACE_JSON_FILE) unset(IOAM_POT_JSON_FILE) unset(IOAM_EXPORT_JSON_FILE) +unset(IKEV2_JSON_FILE) if (${RELEASE_ID} IN_LIST DebianBasedOS) execute_process(COMMAND dpkg-query -L vpp-plugin-core @@ -237,6 +238,9 @@ foreach (FILE ${pluginfiles}) if ("${FILE}" MATCHES "/ioam_export.api.json") set(IOAM_EXPORT_JSON_FILE ${FILE}) endif () + if ("${FILE}" MATCHES "/ikev2.api.json") + set(IKEV2_JSON_FILE ${FILE}) + endif () endforeach () if (ACL_JSON_FILE) @@ -271,6 +275,10 @@ if (IOAM_EXPORT_JSON_FILE) java_api_binding(ioamexport ioam_export ${IOAM_EXPORT_JSON_FILE}) endif () +if (IKEV2_JSON_FILE) + java_api_binding(ikev2 ikev2 ${IKEV2_JSON_FILE}) +endif () + # Package Generator ####################################################### unset(vpp_version) diff --git a/java/jvpp-ikev2/jvpp_ikev2.c b/java/jvpp-ikev2/jvpp_ikev2.c new file mode 100755 index 0000000..4e6aa03 --- /dev/null +++ b/java/jvpp-ikev2/jvpp_ikev2.c @@ -0,0 +1,107 @@ +/* + * Copyright (c) 2019 Cisco and/or its affiliates. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include <vnet/vnet.h> + +#include <ikev2/ikev2_msg_enum.h> +#define vl_typedefs /* define message structures */ +#include <ikev2/ikev2_all_api.h> +#undef vl_typedefs + +#include <vnet/api_errno.h> +#include <vlibapi/api.h> +#include <vlibmemory/api.h> + +#if VPPJNI_DEBUG == 1 + #define DEBUG_LOG(...) clib_warning(__VA_ARGS__) +#else + #define DEBUG_LOG(...) +#endif + +#include <jvpp-common/jvpp_common.h> + +#include "jvpp-ikev2/io_fd_vpp_jvpp_ikev2_JVppIkev2Impl.h" +#include "jvpp_ikev2.h" +#include "jvpp-ikev2/jvpp_ikev2_gen.h" + +/* + * Class: io_fd_vpp_jvpp_ikev2_JVppIkev2Impl + * Method: init0 + * Signature: (JI)V + */ +JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_ikev2_JVppIkev2Impl_init0 + (JNIEnv *env, jclass clazz, jobject callback, jlong queue_address, jint my_client_index) { + ikev2_main_t * plugin_main = &ikev2_main; + clib_warning ("Java_io_fd_vpp_jvpp_ikev2_JVppIkev2Impl_init0"); + + plugin_main->my_client_index = my_client_index; + 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) \ + if (get_message_id(env, #N) == 0) return; + foreach_supported_api_message; + #undef _ + + #define _(N,n) \ + vl_msg_api_set_handlers(get_message_id(env, #N), #n, \ + vl_api_##n##_t_handler, \ + vl_noop_handler, \ + vl_noop_handler, \ + vl_noop_handler, \ + sizeof(vl_api_##n##_t), 1); + foreach_api_reply_handler; + #undef _ +} + +JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_ikev2_JVppIkev2Impl_close0 +(JNIEnv *env, jclass clazz) { + ikev2_main_t * plugin_main = &ikev2_main; + + // cleanup: + (*env)->DeleteGlobalRef(env, plugin_main->callbackClass); + (*env)->DeleteGlobalRef(env, plugin_main->callbackObject); + + plugin_main->callbackClass = NULL; + plugin_main->callbackObject = NULL; +} + +/* Attach thread to JVM and cache class references when initiating JVPP Ikev2 */ +jint JNI_OnLoad(JavaVM *vm, void *reserved) { + JNIEnv* env; + + if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_8) != JNI_OK) { + return JNI_EVERSION; + } + + if (cache_class_references(env) != 0) { + clib_warning ("Failed to cache class references\n"); + return JNI_ERR; + } + + return JNI_VERSION_1_8; +} + +/* Clean up cached references when disposing JVPP Ikev2 */ +void JNI_OnUnload(JavaVM *vm, void *reserved) { + JNIEnv* env; + if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_8) != JNI_OK) { + return; + } + delete_class_references(env); +} diff --git a/java/jvpp-ikev2/jvpp_ikev2.h b/java/jvpp-ikev2/jvpp_ikev2.h new file mode 100755 index 0000000..829a3df --- /dev/null +++ b/java/jvpp-ikev2/jvpp_ikev2.h @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2019 Cisco and/or its affiliates. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#ifndef __included_jvpp_ikev2_h__ +#define __included_jvpp_ikev2_h__ + +#include <vnet/vnet.h> +#include <vnet/ip/ip.h> +#include <vnet/api_errno.h> +#include <vlibapi/api.h> +#include <vlibmemory/api.h> +#include <jni.h> + +/* Global state for JVPP-IKEV2 */ +typedef struct { + /* Pointer to shared memory queue */ + svm_queue_t * vl_input_queue; + + /* VPP api client index */ + u32 my_client_index; + + /* Callback object and class references enabling asynchronous Java calls */ + jobject callbackObject; + jclass callbackClass; + +} ikev2_main_t; + +ikev2_main_t ikev2_main __attribute__((aligned (64))); + + +#endif /* __included_jvpp_ikev2_h__ */ diff --git a/scripts/install_jvpp.sh b/scripts/install_jvpp.sh index 0521287..7c53a1b 100755 --- a/scripts/install_jvpp.sh +++ b/scripts/install_jvpp.sh @@ -44,5 +44,6 @@ mvn install:install-file -Dfile=jvpp-ioamexport-${MAIN_VER}.jar -DgroupId=io.fd. mvn install:install-file -Dfile=jvpp-nat-${MAIN_VER}.jar -DgroupId=io.fd.vpp -DartifactId=jvpp-nat -Dversion=${VERSION} -Dpackaging=jar mvn install:install-file -Dfile=jvpp-nsh-${MAIN_VER}.jar -DgroupId=io.fd.vpp -DartifactId=jvpp-nsh -Dversion=${VERSION} -Dpackaging=jar mvn install:install-file -Dfile=jvpp-acl-${MAIN_VER}.jar -DgroupId=io.fd.vpp -DartifactId=jvpp-acl -Dversion=${VERSION} -Dpackaging=jar +mvn install:install-file -Dfile=jvpp-ikev2-${MAIN_VER}.jar -DgroupId=io.fd.vpp -DartifactId=jvpp-ikev2 -Dversion=${VERSION} -Dpackaging=jar echo "all done." |