ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

new version handling

Browse Source 
Change-Id: I90983f3df94a3b28199908b29ffd8f827ab0c379
Signed-off-by: Damjan Marion <damarion@cisco.com>
This commit is contained in:
Damjan Marion
2015-12-12 14:40:59 +01:00
parent 29726ab117
commit a0d4a1a6d1
13 changed files with 88 additions and 1011 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
vpp-japi/japi/vppjni.c
View File

@ -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);

4
vpp-japi/japi/vppjni.h
View File

@ -156,10 +156,10 @@ typedef struct {
u8 collect_indices;
u32 * sw_if_dump_if_indices;
/* program name, build_dir, git_version */
/* program name, build_dir, version */
u8 program_name[32];
u8 build_directory[256];
u8 git_branch[32];
u8 version[32];
u8 build_date[32];
/* subinterface table */