diff options
Diffstat (limited to 'src/vpp-api/java/jvpp-common/jvpp_common.c')
| -rw-r--r-- | src/vpp-api/java/jvpp-common/jvpp_common.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/src/vpp-api/java/jvpp-common/jvpp_common.c b/src/vpp-api/java/jvpp-common/jvpp_common.c index b88c0ea2..c00298bf 100644 --- a/src/vpp-api/java/jvpp-common/jvpp_common.c +++ b/src/vpp-api/java/jvpp-common/jvpp_common.c @@ -14,6 +14,7 @@ */ #define _GNU_SOURCE /* for strcasestr(3) */ +#include <vnet/api_errno.h> #include "jvpp_common.h" #ifndef JVPP_DEBUG @@ -26,6 +27,16 @@ #define DEBUG_LOG(...) #endif +#define _(error,errorCode,msg) \ +if (errorCode == code) \ + message = msg; \ +else + +#define get_error_message(errno) \ +int code = errno; \ +foreach_vnet_api_error \ + message = "Reason unknown"; + /* shared jvpp main structure */ jvpp_main_t jvpp_main __attribute__((aligned (64))); @@ -40,7 +51,7 @@ void call_on_error(const char* callName, int contextId, int retval, return; } jmethodID excConstructor = (*env)->GetMethodID(env, callbackExceptionClass, - "<init>", "(Ljava/lang/String;II)V"); + "<init>", "(Ljava/lang/String;Ljava/lang/String;II)V"); if (!excConstructor) { DEBUG_LOG("CallOnError : excConstructor is null!\n"); return; @@ -52,8 +63,11 @@ void call_on_error(const char* callName, int contextId, int retval, return; } + char *message; + get_error_message(clib_net_to_host_u32(retval)); jobject excObject = (*env)->NewObject(env, callbackExceptionClass, excConstructor, (*env)->NewStringUTF(env, callName), + (*env)->NewStringUTF(env, message), clib_net_to_host_u32(contextId), clib_net_to_host_u32(retval)); if (!excObject) { DEBUG_LOG("CallOnError : excObject is null!\n"); @@ -63,6 +77,7 @@ void call_on_error(const char* callName, int contextId, int retval, (*env)->CallVoidMethod(env, callbackObject, callbackExcMethod, excObject); DEBUG_LOG("CallOnError : Response sent\n"); } +#undef _ u32 get_message_id(JNIEnv *env, const char *key) { uword *p = hash_get(jvpp_main.messages_hash, key); |