aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--extras/japi/configure.ac1
-rw-r--r--extras/japi/java/jvpp-nsh/jvpp_nsh.c106
-rw-r--r--extras/japi/java/jvpp-nsh/jvpp_nsh.h42
3 files changed, 149 insertions, 0 deletions
diff --git a/extras/japi/configure.ac b/extras/japi/configure.ac
index 4b15bc61b08..f6e7b53ac7f 100644
--- a/extras/japi/configure.ac
+++ b/extras/japi/configure.ac
@@ -37,6 +37,7 @@ AM_CONDITIONAL(ENABLE_GBP_PLUGIN, test "yes" = "yes")
AM_CONDITIONAL(ENABLE_PPPOE_PLUGIN, test "yes" = "yes")
AM_CONDITIONAL(ENABLE_GTPU_PLUGIN, test "yes" = "yes")
AM_CONDITIONAL(ENABLE_IOAM_PLUGIN, test "yes" = "yes")
+AM_CONDITIONAL(ENABLE_NSH_PLUGIN, test "yes" = "yes")
AX_VPP_FIND_JDK8
AC_SUBST(JAVA_HOME)
diff --git a/extras/japi/java/jvpp-nsh/jvpp_nsh.c b/extras/japi/java/jvpp-nsh/jvpp_nsh.c
new file mode 100644
index 00000000000..b0577cf83ce
--- /dev/null
+++ b/extras/japi/java/jvpp-nsh/jvpp_nsh.c
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2016 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>
+
+#define vl_typedefs /* define message structures */
+#include <nsh/nsh.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-nsh/io_fd_vpp_jvpp_nsh_JVppNshImpl.h"
+#include "jvpp_nsh.h"
+#include "jvpp-nsh/jvpp_nsh_gen.h"
+
+/*
+ * Class: io_fd_vpp_jvpp_nsh_JVppnshImpl
+ * Method: init0
+ * Signature: (JI)V
+ */
+JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_nsh_JVppNshImpl_init0
+ (JNIEnv *env, jclass clazz, jobject callback, jlong queue_address, jint my_client_index) {
+ nsh_main_t * plugin_main = &nsh_main;
+ clib_warning ("Java_io_fd_vpp_jvpp_nsh_JVppNshImpl_init0");
+
+ plugin_main->my_client_index = my_client_index;
+ plugin_main->vl_input_queue = (svm_queue_t *)queue_address;
+
+ 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_nsh_JVppNshImpl_close0
+(JNIEnv *env, jclass clazz) {
+ nsh_main_t * plugin_main = &nsh_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 ACL */
+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 ACL */
+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/extras/japi/java/jvpp-nsh/jvpp_nsh.h b/extras/japi/java/jvpp-nsh/jvpp_nsh.h
new file mode 100644
index 00000000000..5f62af64215
--- /dev/null
+++ b/extras/japi/java/jvpp-nsh/jvpp_nsh.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2016 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_nsh_h__
+#define __included_jvpp_nsh_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-nsh */
+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;
+
+} nsh_main_t;
+
+nsh_main_t nsh_main __attribute__((aligned (64)));
+
+
+#endif /* __included_jvpp_nsh_h__ */