From a0d4a1a6d1b81b132787e382ac3f8487b71cf52c Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Sat, 12 Dec 2015 14:40:59 +0100 Subject: new version handling Change-Id: I90983f3df94a3b28199908b29ffd8f827ab0c379 Signed-off-by: Damjan Marion --- vpp-japi/japi/vppjni.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'vpp-japi/japi/vppjni.c') diff --git a/vpp-japi/japi/vppjni.c b/vpp-japi/japi/vppjni.c index 65c26403a1d..740a3425d90 100644 --- a/vpp-japi/japi/vppjni.c +++ b/vpp-japi/japi/vppjni.c @@ -153,11 +153,11 @@ JNIEXPORT jobject JNICALL Java_org_openvpp_vppjapi_vppConn_getVppVersion vppjni_lock (jm, 11); jstring progName = (*env)->NewStringUTF(env, (char *)jm->program_name); jstring buildDir = (*env)->NewStringUTF(env, (char *)jm->build_directory); - jstring gitBranch = (*env)->NewStringUTF(env, (char *)jm->git_branch); + jstring version = (*env)->NewStringUTF(env, (char *)jm->version); jstring buildDate = (*env)->NewStringUTF(env, (char *)jm->build_date); vppjni_unlock (jm); - return (*env)->NewObject(env, cls, constr, progName, buildDir, gitBranch, buildDate); + return (*env)->NewObject(env, cls, constr, progName, buildDir, version, buildDate); } static int jm_show_version (vppjni_main_t *jm) @@ -1349,9 +1349,9 @@ vl_api_show_version_reply_t_handler (vl_api_show_version_reply_t * mp) sizeof(jm->build_directory)-1); jm->build_directory[sizeof(jm->build_directory)-1] = 0; - strncpy((char*)jm->git_branch, (const char*)mp->git_branch, - sizeof(jm->git_branch)-1); - jm->git_branch[sizeof(jm->git_branch)-1] = 0; + strncpy((char*)jm->version, (const char*)mp->version, + sizeof(jm->version)-1); + jm->version[sizeof(jm->version)-1] = 0; strncpy((char*)jm->build_date, (const char*)mp->build_date, sizeof(jm->build_date)-1); -- cgit 1.2.3-korg