aboutsummaryrefslogtreecommitdiffstats
path: root/vpp/api
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2015-12-12 14:40:59 +0100
committerDamjan Marion <damarion@cisco.com>2015-12-13 18:18:27 +0100
commita0d4a1a6d1b81b132787e382ac3f8487b71cf52c (patch)
treeaabeaa39e8b0e6db087e993c9acecadbf84811b7 /vpp/api
parent29726ab117a1fc5b3d92d1afaaaaa08ef7f138eb (diff)
new version handling
Change-Id: I90983f3df94a3b28199908b29ffd8f827ab0c379 Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'vpp/api')
-rw-r--r--vpp/api/api.c6
-rw-r--r--vpp/api/vpe.api4
2 files changed, 5 insertions, 5 deletions
diff --git a/vpp/api/api.c b/vpp/api/api.c
index 57eaa7237f6..a1e7f020e6c 100644
--- a/vpp/api/api.c
+++ b/vpp/api/api.c
@@ -3915,7 +3915,7 @@ vl_api_show_version_t_handler (vl_api_show_version_t *mp)
vl_api_show_version_reply_t *rmp;
int rv = 0;
char * vpe_api_get_build_directory(void);
- char * vpe_api_get_branch(void);
+ char * vpe_api_get_version(void);
char * vpe_api_get_build_date(void);
unix_shared_memory_queue_t * q =
@@ -3929,8 +3929,8 @@ vl_api_show_version_t_handler (vl_api_show_version_t *mp)
strncpy ((char *) rmp->program, "vpe", ARRAY_LEN(rmp->program)-1);
strncpy ((char *) rmp->build_directory, vpe_api_get_build_directory(),
ARRAY_LEN(rmp->build_directory)-1);
- strncpy ((char *) rmp->git_branch, vpe_api_get_branch(),
- ARRAY_LEN(rmp->git_branch)-1);
+ strncpy ((char *) rmp->version, vpe_api_get_version(),
+ ARRAY_LEN(rmp->version)-1);
strncpy ((char *) rmp->build_date, vpe_api_get_build_date(),
ARRAY_LEN(rmp->build_date)-1);
}));
diff --git a/vpp/api/vpe.api b/vpp/api/vpe.api
index 4301f549b4c..480558aa4c2 100644
--- a/vpp/api/vpe.api
+++ b/vpp/api/vpe.api
@@ -1988,14 +1988,14 @@ define show_version {
@param context - sender context, to match reply w/ request
@param retval - return code for the request
@param program - name of the program (vpe)
+ @param version - version of the program
@param build_directory - root of the workspace where the program was built
- @param git_branch - the git branch for the workspace
*/
manual_java define show_version_reply {
u32 context;
i32 retval;
u8 program[32];
- u8 git_branch[32];
+ u8 version[32];
u8 build_date[32];
u8 build_directory[256];
};