diff options
| author |   Alberto Compagno <acompagn+fdio@cisco.com> | 2019-12-04 09:47:10 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2019-12-04 09:47:10 +0000 |
| commit | 0a60657a56073c1c1d043a63b93cffd764ca40d3 (patch) | |
| tree | 12b759df4b748379b2d062b581d1f7a94eb2dcfb /ctrl/libhicnctrl/src | |
| parent | 3e0ff4e7897bb8bc03538f1b2643fe73de158714 (diff) | |
| parent | 36d699cc16a609cb7cd87945b5a618448dca5889 (diff) | |
Merge "[HICN-428] Creating libctrl deb and rpm packages specific for hicn-plugin"
Diffstat (limited to 'ctrl/libhicnctrl/src')
| -rw-r--r-- | ctrl/libhicnctrl/src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | ctrl/libhicnctrl/src/hicn_plugin_api.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ctrl/libhicnctrl/src/CMakeLists.txt b/ctrl/libhicnctrl/src/CMakeLists.txt index 42fe3d543..6f4066238 100644 --- a/ctrl/libhicnctrl/src/CMakeLists.txt +++ b/ctrl/libhicnctrl/src/CMakeLists.txt @@ -30,7 +30,7 @@ set(SOURCE_FILES route.c ) -if(BUILD_CTRL_HICNPLUGIN) +if(BUILD_HICNPLUGIN) set(SOURCE_FILES ${SOURCE_FILES} hicn_plugin_api.c @@ -53,7 +53,7 @@ set(INCLUDE_DIRS ${HICN_INCLUDE_DIRS} ) -# Android requires static libraries +# Android requires static libraries if (${CMAKE_SYSTEM_NAME} STREQUAL "Android") set(LIBRARIES ${LIBRARIES} ${LIBHICN_STATIC}) set(LINK_TYPE STATIC) diff --git a/ctrl/libhicnctrl/src/hicn_plugin_api.c b/ctrl/libhicnctrl/src/hicn_plugin_api.c index d0f1eae10..233abb0f8 100644 --- a/ctrl/libhicnctrl/src/hicn_plugin_api.c +++ b/ctrl/libhicnctrl/src/hicn_plugin_api.c @@ -360,6 +360,7 @@ int hc_sock_connect(hc_sock_t *s) { vapi_ctx_free(vapi_skc.g_vapi_ctx_instance); goto ERR_CONNECT; } + s->g_vapi_ctx_instance = vapi_skc.g_vapi_ctx_instance; printf("[hc_sock_connect] *connected %s ok", APP_NAME); } else if (s->async == vapi_skc.async){ s->g_vapi_ctx_instance = vapi_skc.g_vapi_ctx_instance; |