diff options
116 files changed, 282 insertions, 161 deletions
diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt index 5fed15380..f2a950a6d 100644 --- a/apps/CMakeLists.txt +++ b/apps/CMakeLists.txt @@ -30,10 +30,19 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) include_directories(${LIBTRANSPORT_INCLUDE_DIRS}) set(HICN_APPS hicn-apps) else() - set(LIBTRANSPORT_LIBRARIES ${LIBTRANSPORT_SHARED}) - list(APPEND DEPENDENCIES - ${LIBTRANSPORT_LIBRARIES} - ) + if (ANDROID_API) + find_package(OpenSSL REQUIRED) + find_package(ZLIB REQUIRED) + set(LIBTRANSPORT_LIBRARIES ${LIBTRANSPORT}) + list(APPEND DEPENDENCIES + ${LIBTRANSPORT_LIBRARIES} + ) + else () + set(LIBTRANSPORT_LIBRARIES ${LIBTRANSPORT_SHARED}) + list(APPEND DEPENDENCIES + ${LIBTRANSPORT_LIBRARIES} + ) + endif () endif() set(SUFFIX "") @@ -45,6 +54,7 @@ set(HICN_APPS "${HICN_APPS}${SUFFIX}") list(APPEND LIBRARIES ${LIBTRANSPORT_LIBRARIES} + ${OPENSSL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ) diff --git a/apps/http-server/CMakeLists.txt b/apps/http-server/CMakeLists.txt index bedb6afc1..65dcc9a98 100644 --- a/apps/http-server/CMakeLists.txt +++ b/apps/http-server/CMakeLists.txt @@ -62,6 +62,7 @@ include_directories( http-client ) + set(LIBHTTP_SERVER hicnhttpserver) build_library(${LIBHTTP_SERVER} @@ -75,7 +76,7 @@ build_library(${LIBHTTP_SERVER} build_executable(${HTTP_SERVER} SOURCES ${APP_SOURCE_FILES} - LINK_LIBRARIES ${LIBHTTP_SERVER} ${WSOCK32_LIBRARY} ${WS2_32_LIBRARY} + LINK_LIBRARIES ${LIBHTTP_SERVER} ${LIBRARIES} ${ZLIB_LIBRARIES} ${WSOCK32_LIBRARY} ${WS2_32_LIBRARY} DEPENDS ${LIBHTTP_SERVER} COMPONENT ${HICN_APPS} DEFINITIONS ${COMPILER_DEFINITIONS} diff --git a/hicn-light/CMakeLists.txt b/hicn-light/CMakeLists.txt index 70ca8ed15..489359baf 100644 --- a/hicn-light/CMakeLists.txt +++ b/hicn-light/CMakeLists.txt @@ -59,11 +59,18 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) set(HICN_LIGHT_CONTROL hicn-light-control) set(HICN_LIGHT_DAEMON hicn-light-daemon) else() - set(HICN_LIBRARIES ${LIBHICN_SHARED}) - set(DEPENDENCIES - ${LIBHICN} - ${LIBHICN_SHARED} - ) + if (ANDROID_API) + set(HICN_LIBRARIES ${LIBHICN}) + list(APPEND DEPENDENCIES + ${LIBHICN} + ) + else () + set(HICN_LIBRARIES ${LIBHICN_SHARED}) + list(APPEND DEPENDENCIES + ${LIBHICN} + ${LIBHICN_SHARED} + ) + endif () endif() include( Packaging ) diff --git a/hicn-light/src/hicn/CMakeLists.txt b/hicn-light/src/hicn/CMakeLists.txt index 1b63f7535..bcef7c9dd 100644 --- a/hicn-light/src/hicn/CMakeLists.txt +++ b/hicn-light/src/hicn/CMakeLists.txt @@ -1,7 +1,7 @@ # Define a few configuration variables that we want accessible in the software include(BuildMacros) -configure_file(config.h.in config.h @ONLY) +configure_file(config.h.in hicn-light/config.h @ONLY) if(NOT ANDROID_API AND NOT COMPILE_FOR_IOS) add_subdirectory(command_line) @@ -20,7 +20,7 @@ add_subdirectory(strategies) add_subdirectory(utils) list(APPEND HEADER_FILES - ${CMAKE_CURRENT_BINARY_DIR}/config.h + ${CMAKE_CURRENT_BINARY_DIR}/hicn-light/config.h ) if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux" AND ENABLE_PUNTING) @@ -35,17 +35,36 @@ list(APPEND COMPILER_DEFINITIONS list(INSERT HICN_LIGHT_INCLUDE_DIRS 0 ${CMAKE_CURRENT_SOURCE_DIR}/.. + ${CMAKE_CURRENT_BINARY_DIR}/.. ) -build_library(${LIBHICN_LIGHT} - STATIC NO_DEV - SOURCES ${SOURCE_FILES} - INSTALL_HEADERS ${TO_INSTALL_HEADER_FILES} - LINK_LIBRARIES ${LIBRARIES} - DEPENDS ${DEPENDENCIES} - COMPONENT ${LIBHICN_LIGHT} - INCLUDE_DIRS ${HICN_LIGHT_INCLUDE_DIRS} - INSTALL_ROOT_DIR hicn - DEFINITIONS ${COMPILER_DEFINITIONS} +list(APPEND TO_INSTALL_HEADER_FILES + ${CMAKE_CURRENT_BINARY_DIR}/hicn-light/config.h ) +if (ANDROID_API) + build_library(${LIBHICN_LIGHT} + STATIC + SOURCES ${SOURCE_FILES} + INSTALL_HEADERS ${TO_INSTALL_HEADER_FILES} + LINK_LIBRARIES ${LIBRARIES} + DEPENDS ${DEPENDENCIES} + COMPONENT ${LIBHICN_LIGHT} + INCLUDE_DIRS ${HICN_LIGHT_INCLUDE_DIRS} + INSTALL_ROOT_DIR hicn + DEFINITIONS ${COMPILER_DEFINITIONS} + ) +else () + build_library(${LIBHICN_LIGHT} + STATIC NO_DEV + SOURCES ${SOURCE_FILES} + INSTALL_HEADERS ${TO_INSTALL_HEADER_FILES} + LINK_LIBRARIES ${LIBRARIES} + DEPENDS ${DEPENDENCIES} + COMPONENT ${LIBHICN_LIGHT} + INCLUDE_DIRS ${HICN_LIGHT_INCLUDE_DIRS} + INSTALL_ROOT_DIR hicn + DEFINITIONS ${COMPILER_DEFINITIONS} + ) +endif () + diff --git a/hicn-light/src/hicn/api/CMakeLists.txt b/hicn-light/src/hicn/api/CMakeLists.txt index dd73bd10d..a2be46948 100644 --- a/hicn-light/src/hicn/api/CMakeLists.txt +++ b/hicn-light/src/hicn/api/CMakeLists.txt @@ -32,10 +32,20 @@ set(TO_INSTALL_HEADER_FILES PARENT_SCOPE ) -build_library(hicn-light-ctrl - SHARED - SOURCES ${SOURCE_FILES} - COMPONENT ${LIBHICN_LIGHT} - LINK_LIBRARIES ${HICN_LIGHT_LINK_LIBRARIES} - DEPENDS ${LIBHICN_LIGHT} -)
\ No newline at end of file +if (ANDROID_API) + build_library(hicn-light-ctrl + STATIC + SOURCES ${SOURCE_FILES} + COMPONENT ${LIBHICN_LIGHT} + LINK_LIBRARIES ${HICN_LIGHT_LINK_LIBRARIES} + DEPENDS ${LIBHICN_LIGHT} + ) +else () + build_library(hicn-light-ctrl + STATIC SHARED + SOURCES ${SOURCE_FILES} + COMPONENT ${LIBHICN_LIGHT} + LINK_LIBRARIES ${HICN_LIGHT_LINK_LIBRARIES} + DEPENDS ${LIBHICN_LIGHT} + ) +endif ()
\ No newline at end of file diff --git a/hicn-light/src/hicn/command_line/controller/hicnLightControl_main.c b/hicn-light/src/hicn/command_line/controller/hicnLightControl_main.c index 9ba155ede..8cbccde34 100644 --- a/hicn-light/src/hicn/command_line/controller/hicnLightControl_main.c +++ b/hicn-light/src/hicn/command_line/controller/hicnLightControl_main.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #ifndef _WIN32 #include <arpa/inet.h> diff --git a/hicn-light/src/hicn/command_line/daemon/hicnLightDaemon_main.c b/hicn-light/src/hicn/command_line/daemon/hicnLightDaemon_main.c index f1841274b..c0b332b91 100644 --- a/hicn-light/src/hicn/command_line/daemon/hicnLightDaemon_main.c +++ b/hicn-light/src/hicn/command_line/daemon/hicnLightDaemon_main.c @@ -18,7 +18,6 @@ #endif #include <errno.h> #include <fcntl.h> -#include <src/hicn/config.h> #include <stdbool.h> #include <stdint.h> #include <stdio.h> @@ -26,6 +25,7 @@ #include <string.h> #include <sys/stat.h> +#include <hicn/hicn-light/config.h> #include <parc/algol/parc_FileOutputStream.h> #include <parc/logging/parc_LogLevel.h> #include <parc/logging/parc_LogReporterFile.h> diff --git a/hicn-light/src/hicn/config/commandOps.c b/hicn-light/src/hicn/config/commandOps.c index 2081782bc..fa2dc7a7d 100644 --- a/hicn-light/src/hicn/config/commandOps.c +++ b/hicn-light/src/hicn/config/commandOps.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdbool.h> #include <stdint.h> #include <stdio.h> diff --git a/hicn-light/src/hicn/config/commandParser.c b/hicn-light/src/hicn/config/commandParser.c index 38b017835..fa3269c9a 100644 --- a/hicn-light/src/hicn/config/commandParser.c +++ b/hicn-light/src/hicn/config/commandParser.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <parc/assert/parc_Assert.h> #include <stdbool.h> diff --git a/hicn-light/src/hicn/config/configuration.c b/hicn-light/src/hicn/config/configuration.c index fa3a858c2..07120f95b 100644 --- a/hicn-light/src/hicn/config/configuration.c +++ b/hicn-light/src/hicn/config/configuration.c @@ -27,7 +27,7 @@ #endif #include <ctype.h> #include <parc/assert/parc_Assert.h> -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/hicn-light/src/hicn/config/configurationFile.c b/hicn-light/src/hicn/config/configurationFile.c index f1991897f..adc089396 100644 --- a/hicn-light/src/hicn/config/configurationFile.c +++ b/hicn-light/src/hicn/config/configurationFile.c @@ -18,7 +18,7 @@ #endif #include <ctype.h> #include <errno.h> -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdio.h> #include <string.h> diff --git a/hicn-light/src/hicn/config/configurationListeners.c b/hicn-light/src/hicn/config/configurationListeners.c index a8dc09201..a16c434f5 100644 --- a/hicn-light/src/hicn/config/configurationListeners.c +++ b/hicn-light/src/hicn/config/configurationListeners.c @@ -18,7 +18,7 @@ #include <unistd.h> #endif #include <parc/assert/parc_Assert.h> -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/hicn-light/src/hicn/config/controlAdd.c b/hicn-light/src/hicn/config/controlAdd.c index f77897dc4..7667f467e 100644 --- a/hicn-light/src/hicn/config/controlAdd.c +++ b/hicn-light/src/hicn/config/controlAdd.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <parc/assert/parc_Assert.h> #include <stdbool.h> diff --git a/hicn-light/src/hicn/config/controlAddConnection.c b/hicn-light/src/hicn/config/controlAddConnection.c index 813c40929..e09b61b37 100644 --- a/hicn-light/src/hicn/config/controlAddConnection.c +++ b/hicn-light/src/hicn/config/controlAddConnection.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <ctype.h> #include <parc/assert/parc_Assert.h> diff --git a/hicn-light/src/hicn/config/controlAddListener.c b/hicn-light/src/hicn/config/controlAddListener.c index 48ea02e68..7fdf46228 100644 --- a/hicn-light/src/hicn/config/controlAddListener.c +++ b/hicn-light/src/hicn/config/controlAddListener.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <ctype.h> #include <inttypes.h> diff --git a/hicn-light/src/hicn/config/controlAddPunting.c b/hicn-light/src/hicn/config/controlAddPunting.c index c86901089..61308b33b 100644 --- a/hicn-light/src/hicn/config/controlAddPunting.c +++ b/hicn-light/src/hicn/config/controlAddPunting.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <ctype.h> #include <stdbool.h> diff --git a/hicn-light/src/hicn/config/controlAddRoute.c b/hicn-light/src/hicn/config/controlAddRoute.c index f1c85e29a..d7847f837 100644 --- a/hicn-light/src/hicn/config/controlAddRoute.c +++ b/hicn-light/src/hicn/config/controlAddRoute.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <ctype.h> #include <stdbool.h> diff --git a/hicn-light/src/hicn/config/controlCache.c b/hicn-light/src/hicn/config/controlCache.c index fa228994c..1c830c956 100644 --- a/hicn-light/src/hicn/config/controlCache.c +++ b/hicn-light/src/hicn/config/controlCache.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdbool.h> #include <stdint.h> diff --git a/hicn-light/src/hicn/config/controlCacheClear.c b/hicn-light/src/hicn/config/controlCacheClear.c index be9a4ac38..f412faa29 100644 --- a/hicn-light/src/hicn/config/controlCacheClear.c +++ b/hicn-light/src/hicn/config/controlCacheClear.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdbool.h> #include <stdint.h> diff --git a/hicn-light/src/hicn/config/controlCacheServe.c b/hicn-light/src/hicn/config/controlCacheServe.c index e0c1c20eb..881c49ed3 100644 --- a/hicn-light/src/hicn/config/controlCacheServe.c +++ b/hicn-light/src/hicn/config/controlCacheServe.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdbool.h> #include <stdint.h> diff --git a/hicn-light/src/hicn/config/controlCacheStore.c b/hicn-light/src/hicn/config/controlCacheStore.c index 6f21f912b..e54eae4f7 100644 --- a/hicn-light/src/hicn/config/controlCacheStore.c +++ b/hicn-light/src/hicn/config/controlCacheStore.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdbool.h> #include <stdint.h> diff --git a/hicn-light/src/hicn/config/controlList.c b/hicn-light/src/hicn/config/controlList.c index 8c1b2e125..8ec47ad23 100644 --- a/hicn-light/src/hicn/config/controlList.c +++ b/hicn-light/src/hicn/config/controlList.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdbool.h> #include <stdint.h> diff --git a/hicn-light/src/hicn/config/controlListConnections.c b/hicn-light/src/hicn/config/controlListConnections.c index feed36d2a..f94a1e7ca 100644 --- a/hicn-light/src/hicn/config/controlListConnections.c +++ b/hicn-light/src/hicn/config/controlListConnections.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdbool.h> #include <stdint.h> diff --git a/hicn-light/src/hicn/config/controlListInterfaces.c b/hicn-light/src/hicn/config/controlListInterfaces.c index 0b8c3d7bb..9800dca74 100644 --- a/hicn-light/src/hicn/config/controlListInterfaces.c +++ b/hicn-light/src/hicn/config/controlListInterfaces.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdbool.h> #include <stdint.h> diff --git a/hicn-light/src/hicn/config/controlListListeners.c b/hicn-light/src/hicn/config/controlListListeners.c index 735be6acb..1f4ad7f2c 100644 --- a/hicn-light/src/hicn/config/controlListListeners.c +++ b/hicn-light/src/hicn/config/controlListListeners.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdbool.h> #include <stdint.h> diff --git a/hicn-light/src/hicn/config/controlListRoutes.c b/hicn-light/src/hicn/config/controlListRoutes.c index 97e7c2f5c..3dc8fa3a3 100644 --- a/hicn-light/src/hicn/config/controlListRoutes.c +++ b/hicn-light/src/hicn/config/controlListRoutes.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdbool.h> #include <stdint.h> diff --git a/hicn-light/src/hicn/config/controlMapMe.c b/hicn-light/src/hicn/config/controlMapMe.c index 896f53b8a..a4901db17 100644 --- a/hicn-light/src/hicn/config/controlMapMe.c +++ b/hicn-light/src/hicn/config/controlMapMe.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdbool.h> #include <stdint.h> diff --git a/hicn-light/src/hicn/config/controlMapMeDiscovery.c b/hicn-light/src/hicn/config/controlMapMeDiscovery.c index a4815c08b..814c380de 100644 --- a/hicn-light/src/hicn/config/controlMapMeDiscovery.c +++ b/hicn-light/src/hicn/config/controlMapMeDiscovery.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdbool.h> #include <stdint.h> diff --git a/hicn-light/src/hicn/config/controlMapMeEnable.c b/hicn-light/src/hicn/config/controlMapMeEnable.c index 04b103a54..a2733e600 100644 --- a/hicn-light/src/hicn/config/controlMapMeEnable.c +++ b/hicn-light/src/hicn/config/controlMapMeEnable.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdbool.h> #include <stdint.h> diff --git a/hicn-light/src/hicn/config/controlMapMeRetx.c b/hicn-light/src/hicn/config/controlMapMeRetx.c index 5546ded9a..49e5b419d 100644 --- a/hicn-light/src/hicn/config/controlMapMeRetx.c +++ b/hicn-light/src/hicn/config/controlMapMeRetx.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdbool.h> #include <stdint.h> diff --git a/hicn-light/src/hicn/config/controlMapMeTimescale.c b/hicn-light/src/hicn/config/controlMapMeTimescale.c index d621cdfed..3bfc98269 100644 --- a/hicn-light/src/hicn/config/controlMapMeTimescale.c +++ b/hicn-light/src/hicn/config/controlMapMeTimescale.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdbool.h> #include <stdint.h> diff --git a/hicn-light/src/hicn/config/controlQuit.c b/hicn-light/src/hicn/config/controlQuit.c index ddea256b2..8c11e48c2 100644 --- a/hicn-light/src/hicn/config/controlQuit.c +++ b/hicn-light/src/hicn/config/controlQuit.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdbool.h> #include <stdint.h> diff --git a/hicn-light/src/hicn/config/controlRemove.c b/hicn-light/src/hicn/config/controlRemove.c index 1768b7651..d33d57206 100644 --- a/hicn-light/src/hicn/config/controlRemove.c +++ b/hicn-light/src/hicn/config/controlRemove.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdbool.h> #include <stdint.h> diff --git a/hicn-light/src/hicn/config/controlRemoveConnection.c b/hicn-light/src/hicn/config/controlRemoveConnection.c index 0f2d315c3..7c79f9c2f 100644 --- a/hicn-light/src/hicn/config/controlRemoveConnection.c +++ b/hicn-light/src/hicn/config/controlRemoveConnection.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <ctype.h> #include <stdbool.h> diff --git a/hicn-light/src/hicn/config/controlRemovePunting.c b/hicn-light/src/hicn/config/controlRemovePunting.c index b105449ee..bf00389d6 100644 --- a/hicn-light/src/hicn/config/controlRemovePunting.c +++ b/hicn-light/src/hicn/config/controlRemovePunting.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <ctype.h> #include <stdbool.h> diff --git a/hicn-light/src/hicn/config/controlRemoveRoute.c b/hicn-light/src/hicn/config/controlRemoveRoute.c index 6bfe12674..8cb888f7c 100644 --- a/hicn-light/src/hicn/config/controlRemoveRoute.c +++ b/hicn-light/src/hicn/config/controlRemoveRoute.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <ctype.h> #include <parc/algol/parc_List.h> diff --git a/hicn-light/src/hicn/config/controlRoot.c b/hicn-light/src/hicn/config/controlRoot.c index 38a371e73..675fe4c6e 100644 --- a/hicn-light/src/hicn/config/controlRoot.c +++ b/hicn-light/src/hicn/config/controlRoot.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdbool.h> #include <stdint.h> diff --git a/hicn-light/src/hicn/config/controlSet.c b/hicn-light/src/hicn/config/controlSet.c index 4c94893dc..4f6a17450 100644 --- a/hicn-light/src/hicn/config/controlSet.c +++ b/hicn-light/src/hicn/config/controlSet.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdbool.h> #include <stdint.h> diff --git a/hicn-light/src/hicn/config/controlSetDebug.c b/hicn-light/src/hicn/config/controlSetDebug.c index a18c860af..75e0e5a44 100644 --- a/hicn-light/src/hicn/config/controlSetDebug.c +++ b/hicn-light/src/hicn/config/controlSetDebug.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdbool.h> #include <stdint.h> diff --git a/hicn-light/src/hicn/config/controlSetStrategy.c b/hicn-light/src/hicn/config/controlSetStrategy.c index c7909bbb7..1b1396342 100644 --- a/hicn-light/src/hicn/config/controlSetStrategy.c +++ b/hicn-light/src/hicn/config/controlSetStrategy.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdbool.h> #include <stdint.h> diff --git a/hicn-light/src/hicn/config/controlSetWldr.c b/hicn-light/src/hicn/config/controlSetWldr.c index 22729705a..6d990ac19 100644 --- a/hicn-light/src/hicn/config/controlSetWldr.c +++ b/hicn-light/src/hicn/config/controlSetWldr.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdbool.h> #include <stdint.h> diff --git a/hicn-light/src/hicn/config/controlState.c b/hicn-light/src/hicn/config/controlState.c index ad26c1bab..6cd1b905d 100644 --- a/hicn-light/src/hicn/config/controlState.c +++ b/hicn-light/src/hicn/config/controlState.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdbool.h> #include <stdint.h> diff --git a/hicn-light/src/hicn/config/controlUnset.c b/hicn-light/src/hicn/config/controlUnset.c index b0950c141..28507fbeb 100644 --- a/hicn-light/src/hicn/config/controlUnset.c +++ b/hicn-light/src/hicn/config/controlUnset.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdbool.h> #include <stdint.h> diff --git a/hicn-light/src/hicn/config/controlUnsetDebug.c b/hicn-light/src/hicn/config/controlUnsetDebug.c index 87ad24fce..fa95c5127 100644 --- a/hicn-light/src/hicn/config/controlUnsetDebug.c +++ b/hicn-light/src/hicn/config/controlUnsetDebug.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdbool.h> #include <stdint.h> diff --git a/hicn-light/src/hicn/config/symbolicNameTable.c b/hicn-light/src/hicn/config/symbolicNameTable.c index 7ddb20668..746c4e647 100644 --- a/hicn-light/src/hicn/config/symbolicNameTable.c +++ b/hicn-light/src/hicn/config/symbolicNameTable.c @@ -18,7 +18,7 @@ #include <parc/algol/parc_HashCodeTable.h> #include <parc/algol/parc_Memory.h> #include <parc/assert/parc_Assert.h> -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdio.h> #include <hicn/config/symbolicNameTable.h> diff --git a/hicn-light/src/hicn/content_store/contentStoreEntry.c b/hicn-light/src/hicn/content_store/contentStoreEntry.c index 1e03f42b6..45f98881e 100644 --- a/hicn-light/src/hicn/content_store/contentStoreEntry.c +++ b/hicn-light/src/hicn/content_store/contentStoreEntry.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdio.h> #include <parc/algol/parc_Memory.h> diff --git a/hicn-light/src/hicn/content_store/contentStoreInterface.c b/hicn-light/src/hicn/content_store/contentStoreInterface.c index b82fa906e..2f5ddb8c2 100644 --- a/hicn-light/src/hicn/content_store/contentStoreInterface.c +++ b/hicn-light/src/hicn/content_store/contentStoreInterface.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdio.h> #include <hicn/content_store/contentStoreInterface.h> diff --git a/hicn-light/src/hicn/content_store/contentStoreLRU.c b/hicn-light/src/hicn/content_store/contentStoreLRU.c index 6add33d78..847d7a90e 100644 --- a/hicn-light/src/hicn/content_store/contentStoreLRU.c +++ b/hicn-light/src/hicn/content_store/contentStoreLRU.c @@ -16,7 +16,7 @@ #ifndef _WIN32 #include <sys/queue.h> #endif -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdio.h> #include <parc/algol/parc_DisplayIndented.h> diff --git a/hicn-light/src/hicn/content_store/listLRU.c b/hicn-light/src/hicn/content_store/listLRU.c index 0a75c01a1..242af4078 100644 --- a/hicn-light/src/hicn/content_store/listLRU.c +++ b/hicn-light/src/hicn/content_store/listLRU.c @@ -16,7 +16,7 @@ #ifndef _WIN32 #include <sys/queue.h> #endif -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdbool.h> #include <stdio.h> diff --git a/hicn-light/src/hicn/content_store/listTimeOrdered.c b/hicn-light/src/hicn/content_store/listTimeOrdered.c index 33808349b..690c6e412 100644 --- a/hicn-light/src/hicn/content_store/listTimeOrdered.c +++ b/hicn-light/src/hicn/content_store/listTimeOrdered.c @@ -14,7 +14,7 @@ */ #include <parc/assert/parc_Assert.h> -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <hicn/content_store/listTimeOrdered.h> #include <parc/algol/parc_Object.h> diff --git a/hicn-light/src/hicn/core/CMakeLists.txt b/hicn-light/src/hicn/core/CMakeLists.txt index a29409af6..c6e000524 100644 --- a/hicn-light/src/hicn/core/CMakeLists.txt +++ b/hicn-light/src/hicn/core/CMakeLists.txt @@ -54,3 +54,9 @@ list(APPEND SOURCE_FILES set(SOURCE_FILES ${SOURCE_FILES} PARENT_SCOPE) set(HEADER_FILES ${HEADER_FILES} PARENT_SCOPE) + +set(TO_INSTALL_HEADER_FILES + ${TO_INSTALL_HEADER_FILES} + ${HEADER_FILES} + PARENT_SCOPE +)
\ No newline at end of file diff --git a/hicn-light/src/hicn/core/connection.c b/hicn-light/src/hicn/core/connection.c index a5d5fb5b9..d9b2770b9 100644 --- a/hicn-light/src/hicn/core/connection.c +++ b/hicn-light/src/hicn/core/connection.c @@ -14,7 +14,7 @@ */ #include <limits.h> -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdio.h> #include <hicn/core/connection.h> diff --git a/hicn-light/src/hicn/core/connection.h b/hicn-light/src/hicn/core/connection.h index 204c4668f..df1c780a1 100644 --- a/hicn-light/src/hicn/core/connection.h +++ b/hicn-light/src/hicn/core/connection.h @@ -24,7 +24,7 @@ #ifndef connection_h #define connection_h -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <hicn/core/connectionState.h> #include <hicn/io/ioOperations.h> #include <hicn/utils/address.h> diff --git a/hicn-light/src/hicn/core/connectionList.c b/hicn-light/src/hicn/core/connectionList.c index cc76f84de..d51a9aad5 100644 --- a/hicn-light/src/hicn/core/connectionList.c +++ b/hicn-light/src/hicn/core/connectionList.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdio.h> #include <parc/algol/parc_ArrayList.h> diff --git a/hicn-light/src/hicn/core/connectionManager.c b/hicn-light/src/hicn/core/connectionManager.c index 0b2c51f9c..709f0902a 100644 --- a/hicn-light/src/hicn/core/connectionManager.c +++ b/hicn-light/src/hicn/core/connectionManager.c @@ -22,7 +22,7 @@ * */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <hicn/core/connectionManager.h> #include <hicn/core/forwarder.h> #include <hicn/messenger/messenger.h> diff --git a/hicn-light/src/hicn/core/connectionTable.c b/hicn-light/src/hicn/core/connectionTable.c index b0f717bc6..0a1301328 100644 --- a/hicn-light/src/hicn/core/connectionTable.c +++ b/hicn-light/src/hicn/core/connectionTable.c @@ -23,7 +23,7 @@ #ifndef _WIN32 #include <unistd.h> #endif -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/hicn-light/src/hicn/core/dispatcher.c b/hicn-light/src/hicn/core/dispatcher.c index 8d39e651a..59951e950 100644 --- a/hicn-light/src/hicn/core/dispatcher.c +++ b/hicn-light/src/hicn/core/dispatcher.c @@ -30,7 +30,7 @@ #include <errno.h> #include <fcntl.h> #include <signal.h> -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h> diff --git a/hicn-light/src/hicn/core/forwarder.c b/hicn-light/src/hicn/core/forwarder.c index 9b05304e8..c8cac98ba 100644 --- a/hicn-light/src/hicn/core/forwarder.c +++ b/hicn-light/src/hicn/core/forwarder.c @@ -31,7 +31,7 @@ #include <errno.h> #include <fcntl.h> #include <signal.h> -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h> diff --git a/hicn-light/src/hicn/core/logger.c b/hicn-light/src/hicn/core/logger.c index 9399b9857..43740f73b 100644 --- a/hicn-light/src/hicn/core/logger.c +++ b/hicn-light/src/hicn/core/logger.c @@ -18,7 +18,7 @@ #endif #include <errno.h> -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h> diff --git a/hicn-light/src/hicn/core/message.c b/hicn-light/src/hicn/core/message.c index 423241084..ef8fa5d91 100644 --- a/hicn-light/src/hicn/core/message.c +++ b/hicn-light/src/hicn/core/message.c @@ -14,7 +14,7 @@ */ #include <errno.h> -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdio.h> #include <string.h> diff --git a/hicn-light/src/hicn/core/message.h b/hicn-light/src/hicn/core/message.h index 9e5e125c6..e77dab2b5 100644 --- a/hicn-light/src/hicn/core/message.h +++ b/hicn-light/src/hicn/core/message.h @@ -21,7 +21,7 @@ #ifndef message_h #define message_h -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <hicn/core/logger.h> #include <hicn/core/messagePacketType.h> #include <hicn/core/streamBuffer.h> diff --git a/hicn-light/src/hicn/core/name.c b/hicn-light/src/hicn/core/name.c index 91652b887..ed3432ec5 100644 --- a/hicn-light/src/hicn/core/name.c +++ b/hicn-light/src/hicn/core/name.c @@ -14,7 +14,7 @@ */ #include <limits.h> -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdbool.h> #include <stdio.h> #include <string.h> diff --git a/hicn-light/src/hicn/core/numberSet.c b/hicn-light/src/hicn/core/numberSet.c index 9788a29c5..106e13be6 100644 --- a/hicn-light/src/hicn/core/numberSet.c +++ b/hicn-light/src/hicn/core/numberSet.c @@ -15,7 +15,7 @@ #include <parc/algol/parc_ArrayList.h> #include <parc/algol/parc_Memory.h> -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <hicn/core/numberSet.h> #include <stdio.h> diff --git a/hicn-light/src/hicn/core/streamBuffer.c b/hicn-light/src/hicn/core/streamBuffer.c index 6efc82004..c30139498 100644 --- a/hicn-light/src/hicn/core/streamBuffer.c +++ b/hicn-light/src/hicn/core/streamBuffer.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdio.h> #include <parc/assert/parc_Assert.h> diff --git a/hicn-light/src/hicn/core/wldr.h b/hicn-light/src/hicn/core/wldr.h index 0e63fe7e7..e21889f63 100644 --- a/hicn-light/src/hicn/core/wldr.h +++ b/hicn-light/src/hicn/core/wldr.h @@ -16,7 +16,7 @@ #ifndef wldr_h #define wldr_h -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <hicn/core/connection.h> #include <hicn/core/message.h> diff --git a/hicn-light/src/hicn/io/CMakeLists.txt b/hicn-light/src/hicn/io/CMakeLists.txt index f65f0b580..eb69485a5 100644 --- a/hicn-light/src/hicn/io/CMakeLists.txt +++ b/hicn-light/src/hicn/io/CMakeLists.txt @@ -49,5 +49,11 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") ) endif() +set(TO_INSTALL_HEADER_FILES + ${TO_INSTALL_HEADER_FILES} + ${HEADER_FILES} + PARENT_SCOPE +) + set(SOURCE_FILES ${SOURCE_FILES} PARENT_SCOPE) set(HEADER_FILES ${HEADER_FILES} PARENT_SCOPE)
\ No newline at end of file diff --git a/hicn-light/src/hicn/io/addressPair.c b/hicn-light/src/hicn/io/addressPair.c index 9dfd8f507..f9451f900 100644 --- a/hicn-light/src/hicn/io/addressPair.c +++ b/hicn-light/src/hicn/io/addressPair.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdio.h> #include <parc/algol/parc_Hash.h> diff --git a/hicn-light/src/hicn/io/hicnConnection.c b/hicn-light/src/hicn/io/hicnConnection.c index c6831df57..6193e8696 100644 --- a/hicn-light/src/hicn/io/hicnConnection.c +++ b/hicn-light/src/hicn/io/hicnConnection.c @@ -21,7 +21,7 @@ */ #include <errno.h> -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdio.h> #include <string.h> #include <sys/uio.h> diff --git a/hicn-light/src/hicn/io/hicnListener.c b/hicn-light/src/hicn/io/hicnListener.c index 525cae31c..40cdadcd6 100644 --- a/hicn-light/src/hicn/io/hicnListener.c +++ b/hicn-light/src/hicn/io/hicnListener.c @@ -15,7 +15,7 @@ #include <errno.h> #include <fcntl.h> -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdbool.h> #include <stdio.h> #include <string.h> diff --git a/hicn-light/src/hicn/io/hicnTunnel.c b/hicn-light/src/hicn/io/hicnTunnel.c index f22c731c3..baf10c637 100644 --- a/hicn-light/src/hicn/io/hicnTunnel.c +++ b/hicn-light/src/hicn/io/hicnTunnel.c @@ -14,7 +14,7 @@ */ #include <errno.h> -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdbool.h> #include <stdio.h> #include <string.h> diff --git a/hicn-light/src/hicn/io/ioOperations.c b/hicn-light/src/hicn/io/ioOperations.c index 5693f86c5..bbcea41f8 100644 --- a/hicn-light/src/hicn/io/ioOperations.c +++ b/hicn-light/src/hicn/io/ioOperations.c @@ -14,7 +14,7 @@ */ #include <parc/assert/parc_Assert.h> -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <hicn/io/ioOperations.h> #include <stdio.h> diff --git a/hicn-light/src/hicn/io/listenerSet.c b/hicn-light/src/hicn/io/listenerSet.c index 102496877..982373b63 100644 --- a/hicn-light/src/hicn/io/listenerSet.c +++ b/hicn-light/src/hicn/io/listenerSet.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdio.h> #include <parc/algol/parc_ArrayList.h> diff --git a/hicn-light/src/hicn/io/streamConnection.c b/hicn-light/src/hicn/io/streamConnection.c index 1c868c611..ce2341cb8 100644 --- a/hicn-light/src/hicn/io/streamConnection.c +++ b/hicn-light/src/hicn/io/streamConnection.c @@ -18,7 +18,7 @@ */ #include <errno.h> -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdbool.h> #include <stdio.h> #include <string.h> diff --git a/hicn-light/src/hicn/io/tcpListener.c b/hicn-light/src/hicn/io/tcpListener.c index 7a89248cf..cc6fdbba8 100644 --- a/hicn-light/src/hicn/io/tcpListener.c +++ b/hicn-light/src/hicn/io/tcpListener.c @@ -14,7 +14,7 @@ */ #include <errno.h> -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdbool.h> #include <stdio.h> #include <string.h> diff --git a/hicn-light/src/hicn/io/tcpTunnel.c b/hicn-light/src/hicn/io/tcpTunnel.c index 710b88f5b..7a04a4222 100644 --- a/hicn-light/src/hicn/io/tcpTunnel.c +++ b/hicn-light/src/hicn/io/tcpTunnel.c @@ -14,7 +14,7 @@ */ #include <errno.h> -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdbool.h> #include <stdio.h> #include <string.h> diff --git a/hicn-light/src/hicn/io/udpConnection.c b/hicn-light/src/hicn/io/udpConnection.c index fb1865df3..78157f01f 100644 --- a/hicn-light/src/hicn/io/udpConnection.c +++ b/hicn-light/src/hicn/io/udpConnection.c @@ -24,7 +24,7 @@ #include <sys/uio.h> #endif #include <errno.h> -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdio.h> #include <string.h> diff --git a/hicn-light/src/hicn/io/udpListener.c b/hicn-light/src/hicn/io/udpListener.c index 9b7cf60af..3d3455f41 100644 --- a/hicn-light/src/hicn/io/udpListener.c +++ b/hicn-light/src/hicn/io/udpListener.c @@ -19,7 +19,7 @@ #endif #include <errno.h> #include <fcntl.h> -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdbool.h> #include <stdio.h> #include <string.h> diff --git a/hicn-light/src/hicn/io/udpTunnel.c b/hicn-light/src/hicn/io/udpTunnel.c index 79a15de41..2f2f84105 100644 --- a/hicn-light/src/hicn/io/udpTunnel.c +++ b/hicn-light/src/hicn/io/udpTunnel.c @@ -14,7 +14,7 @@ */ #include <errno.h> -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdbool.h> #include <stdio.h> #include <string.h> diff --git a/hicn-light/src/hicn/messenger/messenger.c b/hicn-light/src/hicn/messenger/messenger.c index 201969ae2..45437539d 100644 --- a/hicn-light/src/hicn/messenger/messenger.c +++ b/hicn-light/src/hicn/messenger/messenger.c @@ -33,7 +33,7 @@ #include <parc/algol/parc_EventScheduler.h> #include <parc/algol/parc_Memory.h> #include <parc/assert/parc_Assert.h> -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdio.h> #include <hicn/messenger/messenger.h> diff --git a/hicn-light/src/hicn/messenger/messengerRecipient.c b/hicn-light/src/hicn/messenger/messengerRecipient.c index 684eebd6c..17407030a 100644 --- a/hicn-light/src/hicn/messenger/messengerRecipient.c +++ b/hicn-light/src/hicn/messenger/messengerRecipient.c @@ -15,7 +15,7 @@ #include <parc/algol/parc_Memory.h> #include <parc/assert/parc_Assert.h> -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdio.h> #include <hicn/messenger/messenger.h> diff --git a/hicn-light/src/hicn/messenger/missive.c b/hicn-light/src/hicn/messenger/missive.c index 8d332d96b..5162e683d 100644 --- a/hicn-light/src/hicn/messenger/missive.c +++ b/hicn-light/src/hicn/messenger/missive.c @@ -16,7 +16,7 @@ #include <parc/algol/parc_Memory.h> #include <parc/algol/parc_Object.h> #include <parc/assert/parc_Assert.h> -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdio.h> #include <hicn/messenger/missive.h> diff --git a/hicn-light/src/hicn/messenger/missiveDeque.c b/hicn-light/src/hicn/messenger/missiveDeque.c index c659d8685..ab94a4f18 100644 --- a/hicn-light/src/hicn/messenger/missiveDeque.c +++ b/hicn-light/src/hicn/messenger/missiveDeque.c @@ -22,7 +22,7 @@ #include <parc/algol/parc_Deque.h> #include <parc/algol/parc_Memory.h> #include <parc/assert/parc_Assert.h> -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdio.h> #include <hicn/messenger/missive.h> diff --git a/hicn-light/src/hicn/platforms/android/system.c b/hicn-light/src/hicn/platforms/android/system.c index 0cbe05b9c..ba91748a0 100644 --- a/hicn-light/src/hicn/platforms/android/system.c +++ b/hicn-light/src/hicn/platforms/android/system.c @@ -14,7 +14,7 @@ */ #include <errno.h> -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/hicn-light/src/hicn/platforms/darwin/system.c b/hicn-light/src/hicn/platforms/darwin/system.c index 591e0507b..d817248a8 100644 --- a/hicn-light/src/hicn/platforms/darwin/system.c +++ b/hicn-light/src/hicn/platforms/darwin/system.c @@ -15,7 +15,7 @@ #include <errno.h> #include <ifaddrs.h> -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/hicn-light/src/hicn/platforms/linux/system.c b/hicn-light/src/hicn/platforms/linux/system.c index 996660dbf..3bf23cf57 100644 --- a/hicn-light/src/hicn/platforms/linux/system.c +++ b/hicn-light/src/hicn/platforms/linux/system.c @@ -15,7 +15,7 @@ #include <errno.h> #include <ifaddrs.h> -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/hicn-light/src/hicn/platforms/windows/system.c b/hicn-light/src/hicn/platforms/windows/system.c index df2a014a6..55d89f63a 100644 --- a/hicn-light/src/hicn/platforms/windows/system.c +++ b/hicn-light/src/hicn/platforms/windows/system.c @@ -14,7 +14,7 @@ */
#include <parc/assert/parc_Assert.h>
-#include <src/hicn/config.h>
+#include <hicn/hicn-light/config.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/hicn-light/src/hicn/processor/fib.c b/hicn-light/src/hicn/processor/fib.c index e7a680f9c..19e4db60b 100644 --- a/hicn-light/src/hicn/processor/fib.c +++ b/hicn-light/src/hicn/processor/fib.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdio.h> #include <hicn/processor/fib.h> diff --git a/hicn-light/src/hicn/processor/fibEntry.c b/hicn-light/src/hicn/processor/fibEntry.c index e32a1448c..6f6b3aa12 100644 --- a/hicn-light/src/hicn/processor/fibEntry.c +++ b/hicn-light/src/hicn/processor/fibEntry.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdio.h> #include <hicn/core/numberSet.h> diff --git a/hicn-light/src/hicn/processor/fibEntryList.c b/hicn-light/src/hicn/processor/fibEntryList.c index 1b9257bbc..56d7b8bea 100644 --- a/hicn-light/src/hicn/processor/fibEntryList.c +++ b/hicn-light/src/hicn/processor/fibEntryList.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdio.h> #include <stdlib.h> diff --git a/hicn-light/src/hicn/processor/hashTableFunction.c b/hicn-light/src/hicn/processor/hashTableFunction.c index 2272f0ede..98afa1294 100644 --- a/hicn-light/src/hicn/processor/hashTableFunction.c +++ b/hicn-light/src/hicn/processor/hashTableFunction.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdio.h> #include <parc/algol/parc_Hash.h> diff --git a/hicn-light/src/hicn/processor/matchingRulesTable.c b/hicn-light/src/hicn/processor/matchingRulesTable.c index a035f5890..e57239321 100644 --- a/hicn-light/src/hicn/processor/matchingRulesTable.c +++ b/hicn-light/src/hicn/processor/matchingRulesTable.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdio.h> #include <parc/algol/parc_Hash.h> diff --git a/hicn-light/src/hicn/processor/messageProcessor.c b/hicn-light/src/hicn/processor/messageProcessor.c index f4c71a0b6..4db1a0eb2 100644 --- a/hicn-light/src/hicn/processor/messageProcessor.c +++ b/hicn-light/src/hicn/processor/messageProcessor.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdio.h> #include <string.h> diff --git a/hicn-light/src/hicn/processor/pit.c b/hicn-light/src/hicn/processor/pit.c index 948291286..66ad85410 100644 --- a/hicn-light/src/hicn/processor/pit.c +++ b/hicn-light/src/hicn/processor/pit.c @@ -19,7 +19,7 @@ */ #include <parc/assert/parc_Assert.h> -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdio.h> #include <hicn/processor/pit.h> diff --git a/hicn-light/src/hicn/processor/pitEntry.c b/hicn-light/src/hicn/processor/pitEntry.c index abc1dbcff..99b3f1f2b 100644 --- a/hicn-light/src/hicn/processor/pitEntry.c +++ b/hicn-light/src/hicn/processor/pitEntry.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdio.h> #include <parc/algol/parc_Memory.h> diff --git a/hicn-light/src/hicn/processor/pitStandard.c b/hicn-light/src/hicn/processor/pitStandard.c index 1574f70ab..9a3a829bd 100644 --- a/hicn-light/src/hicn/processor/pitStandard.c +++ b/hicn-light/src/hicn/processor/pitStandard.c @@ -29,7 +29,7 @@ * */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdio.h> #define __STDC_FORMAT_MACROS diff --git a/hicn-light/src/hicn/socket/CMakeLists.txt b/hicn-light/src/hicn/socket/CMakeLists.txt index 6ea94dcfa..ce2a9caf4 100644 --- a/hicn-light/src/hicn/socket/CMakeLists.txt +++ b/hicn-light/src/hicn/socket/CMakeLists.txt @@ -13,7 +13,7 @@ cmake_minimum_required(VERSION 3.5 FATAL_ERROR) -if (UNIX AND NOT APPLE AND NOT ANDROID_API) +if (UNIX AND NOT APPLE) list(APPEND HEADER_FILES socket/api.h socket/error.h @@ -27,5 +27,11 @@ if (UNIX AND NOT APPLE AND NOT ANDROID_API) ) endif() +set(TO_INSTALL_HEADER_FILES + ${TO_INSTALL_HEADER_FILES} + ${HEADER_FILES} + PARENT_SCOPE +) + set(SOURCE_FILES ${SOURCE_FILES} PARENT_SCOPE) set(HEADER_FILES ${HEADER_FILES} PARENT_SCOPE)
\ No newline at end of file diff --git a/hicn-light/src/hicn/socket/ops_linux.c b/hicn-light/src/hicn/socket/ops_linux.c index d085f0d3d..1356e1ba0 100644 --- a/hicn-light/src/hicn/socket/ops_linux.c +++ b/hicn-light/src/hicn/socket/ops_linux.c @@ -224,7 +224,9 @@ int _nl_del_lo_prio_rule(const ip_address_t *ip_address, #define FLAGS_LIST NLM_F_REQUEST | NLM_F_DUMP +#ifndef __ANDROID__ #define IF_NAMESIZE 16 +#endif #define FR_ACT_TO_TBL 1 #define NLMSG_BOTTOM(nlmsg) \ ((struct rtattr *)(((void *)(nlmsg)) + NLMSG_ALIGN((nlmsg)->nlmsg_len))) @@ -1539,8 +1541,9 @@ int _nl_del_lo_prio_rule(const ip_address_t *ip_address, uint8_t address_family, // #include <net/if.h> // duplicate declarations, in the meantime +#ifndef __ANDROID__ #define IF_NAMESIZE 16 - +#endif //#define WITH_TUN_PI 1 #ifdef WITH_TUN_PI diff --git a/hicn-light/src/hicn/strategies/loadBalancer.c b/hicn-light/src/hicn/strategies/loadBalancer.c index cdf4f5165..6ab26b7ca 100644 --- a/hicn-light/src/hicn/strategies/loadBalancer.c +++ b/hicn-light/src/hicn/strategies/loadBalancer.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/hicn-light/src/hicn/strategies/loadBalancerWithPD.c b/hicn-light/src/hicn/strategies/loadBalancerWithPD.c index acd466866..58f3b25fc 100644 --- a/hicn-light/src/hicn/strategies/loadBalancerWithPD.c +++ b/hicn-light/src/hicn/strategies/loadBalancerWithPD.c @@ -14,7 +14,7 @@ */ #include <limits.h> -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/hicn-light/src/hicn/strategies/nexthopState.c b/hicn-light/src/hicn/strategies/nexthopState.c index 13c7dbe7a..0997193ce 100644 --- a/hicn-light/src/hicn/strategies/nexthopState.c +++ b/hicn-light/src/hicn/strategies/nexthopState.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdio.h> #include <parc/algol/parc_DisplayIndented.h> diff --git a/hicn-light/src/hicn/strategies/nexthopStateWithPD.c b/hicn-light/src/hicn/strategies/nexthopStateWithPD.c index ac23de289..1a5d34b78 100644 --- a/hicn-light/src/hicn/strategies/nexthopStateWithPD.c +++ b/hicn-light/src/hicn/strategies/nexthopStateWithPD.c @@ -15,7 +15,7 @@ #include <float.h> #include <limits.h> -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdio.h> #include <parc/algol/parc_DisplayIndented.h> diff --git a/hicn-light/src/hicn/strategies/rnd.c b/hicn-light/src/hicn/strategies/rnd.c index e797bb4d9..e2d74036c 100644 --- a/hicn-light/src/hicn/strategies/rnd.c +++ b/hicn-light/src/hicn/strategies/rnd.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/hicn-light/src/hicn/strategies/rndSegment.c b/hicn-light/src/hicn/strategies/rndSegment.c index ca1cffefc..d7a5c6aec 100644 --- a/hicn-light/src/hicn/strategies/rndSegment.c +++ b/hicn-light/src/hicn/strategies/rndSegment.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/hicn-light/src/hicn/utils/CMakeLists.txt b/hicn-light/src/hicn/utils/CMakeLists.txt index 0934fd366..ad9c8e4c1 100644 --- a/hicn-light/src/hicn/utils/CMakeLists.txt +++ b/hicn-light/src/hicn/utils/CMakeLists.txt @@ -32,5 +32,11 @@ list(APPEND SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/utils.c ) +set(TO_INSTALL_HEADER_FILES + ${TO_INSTALL_HEADER_FILES} + ${HEADER_FILES} + PARENT_SCOPE +) + set(SOURCE_FILES ${SOURCE_FILES} PARENT_SCOPE) set(HEADER_FILES ${HEADER_FILES} PARENT_SCOPE) diff --git a/hicn-light/src/hicn/utils/address.c b/hicn-light/src/hicn/utils/address.c index fe222a43c..619097e1d 100644 --- a/hicn-light/src/hicn/utils/address.c +++ b/hicn-light/src/hicn/utils/address.c @@ -18,7 +18,7 @@ #include <unistd.h> #endif #include <errno.h> -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdio.h> #include <hicn/utils/address.h> diff --git a/hicn-light/src/hicn/utils/addressList.c b/hicn-light/src/hicn/utils/addressList.c index 434ceb7ca..a64fd6f9e 100644 --- a/hicn-light/src/hicn/utils/addressList.c +++ b/hicn-light/src/hicn/utils/addressList.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdio.h> #include <parc/assert/parc_Assert.h> diff --git a/hicn-light/src/hicn/utils/interface.c b/hicn-light/src/hicn/utils/interface.c index dce9ed8f3..d8597f3ed 100644 --- a/hicn-light/src/hicn/utils/interface.c +++ b/hicn-light/src/hicn/utils/interface.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/hicn-light/src/hicn/utils/interfaceSet.c b/hicn-light/src/hicn/utils/interfaceSet.c index 35c97812b..3ae52bb80 100644 --- a/hicn-light/src/hicn/utils/interfaceSet.c +++ b/hicn-light/src/hicn/utils/interfaceSet.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdio.h> #include <hicn/utils/interfaceSet.h> diff --git a/hicn-light/src/hicn/utils/punting.c b/hicn-light/src/hicn/utils/punting.c index 06466172c..8f33cf763 100644 --- a/hicn-light/src/hicn/utils/punting.c +++ b/hicn-light/src/hicn/utils/punting.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <src/hicn/config.h> +#include <hicn/hicn-light/config.h> #include <stdio.h> #include <parc/assert/parc_Assert.h> diff --git a/hicn-plugin/src/data_push_node.c b/hicn-plugin/src/data_push_node.c index 8f9e137f7..8f9ecbb8e 100644 --- a/hicn-plugin/src/data_push_node.c +++ b/hicn-plugin/src/data_push_node.c @@ -128,7 +128,7 @@ hicn_new_data (vlib_main_t * vm, hicn_data_push_runtime_t * rt, } pitp = hicn_pit_get_data (nodep); - hicn_pit_init_data (pitp); + hicn_cs_init_data (pitp); pitp->shared.create_time = tnow; if (dmsg_lifetime < HICN_PARAM_CS_LIFETIME_MIN diff --git a/hicn-plugin/src/pcs.h b/hicn-plugin/src/pcs.h index f87cccf8a..b9b40a3fb 100644 --- a/hicn-plugin/src/pcs.h +++ b/hicn-plugin/src/pcs.h @@ -256,6 +256,14 @@ hicn_pit_init_data (hicn_pcs_entry_t * p) p->u.pit.faces.next_bucket = face_bkt - hicn_face_bucket_pool; } +/* Init pit/cs data block (usually inside hash table node) */ +static inline void +hicn_cs_init_data (hicn_pcs_entry_t * p) +{ + p->shared.entry_flags = 0; + p->u.pit.faces.n_faces = 0; + p->u.pit.faces.is_overflow = 0; +} static inline f64 diff --git a/lib/src/CMakeLists.txt b/lib/src/CMakeLists.txt index d7c39831a..29fc5d865 100644 --- a/lib/src/CMakeLists.txt +++ b/lib/src/CMakeLists.txt @@ -55,17 +55,29 @@ set (COMPILER_DEFINITIONS "-DWITH_MAPME -DWITH_MAPME_FIXES") include(BuildMacros) include(WindowsMacros) -build_library(${LIBHICN} - SHARED STATIC - SOURCES ${LIBHICN_SOURCE_FILES} ${LIBHICN_HEADER_FILES} ${LIBHICN_HEADER_FILES_PROTOCOL} - COMPONENT lib${LIBHICN} - INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/.. - DEFINITIONS ${COMPILER_DEFINITIONS} - INSTALL_ROOT_DIR hicn - INSTALL_HEADERS ${LIBHICN_HEADER_FILES} ${LIBHICN_HEADER_FILES_PROTOCOL} - LINK_LIBRARIES ${WSOCK32_LIBRARY} ${WS2_32_LIBRARY} -) - +if (ANDROID_API) + build_library(${LIBHICN} + STATIC + SOURCES ${LIBHICN_SOURCE_FILES} ${LIBHICN_HEADER_FILES} ${LIBHICN_HEADER_FILES_PROTOCOL} + COMPONENT lib${LIBHICN} + INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/.. + DEFINITIONS ${COMPILER_DEFINITIONS} + INSTALL_ROOT_DIR hicn + INSTALL_HEADERS ${LIBHICN_HEADER_FILES} ${LIBHICN_HEADER_FILES_PROTOCOL} + LINK_LIBRARIES ${WSOCK32_LIBRARY} ${WS2_32_LIBRARY} + ) +else () + build_library(${LIBHICN} + SHARED STATIC + SOURCES ${LIBHICN_SOURCE_FILES} ${LIBHICN_HEADER_FILES} ${LIBHICN_HEADER_FILES_PROTOCOL} + COMPONENT lib${LIBHICN} + INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/.. + DEFINITIONS ${COMPILER_DEFINITIONS} + INSTALL_ROOT_DIR hicn + INSTALL_HEADERS ${LIBHICN_HEADER_FILES} ${LIBHICN_HEADER_FILES_PROTOCOL} + LINK_LIBRARIES ${WSOCK32_LIBRARY} ${WS2_32_LIBRARY} + ) +endif () add_custom_command(TARGET hicn PRE_BUILD COMMAND ${CMAKE_COMMAND} -E remove_directory ${PROJECT_BINARY_DIR}/hicn ) diff --git a/libtransport/CMakeLists.txt b/libtransport/CMakeLists.txt index 757521574..d70a837b9 100644 --- a/libtransport/CMakeLists.txt +++ b/libtransport/CMakeLists.txt @@ -82,11 +82,18 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) endif() set(LIBTRANSPORT hicntransport) else() - set(HICN_LIBRARIES ${LIBHICN_SHARED}) - list(APPEND DEPENDENCIES - ${LIBHICN} - ${LIBHICN_SHARED} - ) + if (ANDROID_API) + set(HICN_LIBRARIES ${LIBHICN}) + list(APPEND DEPENDENCIES + ${LIBHICN} + ) + else () + set(HICN_LIBRARIES ${LIBHICN_SHARED}) + list(APPEND DEPENDENCIES + ${LIBHICN} + ${LIBHICN_SHARED} + ) + endif () if (__vpp__) list(APPEND DEPENDENCIES @@ -108,7 +115,7 @@ if (${COMPILE_TESTS}) endif() if(ANDROID_API) -find_package(OpenSSL REQUIRED) + find_package(OpenSSL REQUIRED) endif () list(APPEND LIBRARIES diff --git a/libtransport/src/hicn/transport/CMakeLists.txt b/libtransport/src/hicn/transport/CMakeLists.txt index 4c0982c58..b6be3f77a 100644 --- a/libtransport/src/hicn/transport/CMakeLists.txt +++ b/libtransport/src/hicn/transport/CMakeLists.txt @@ -48,18 +48,31 @@ endif () if (ANDROID_API) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -isystem -lm") endif() - -build_library(${LIBTRANSPORT} - STATIC SHARED - SOURCES ${SOURCE_FILES} ${HEADER_FILES} - INSTALL_HEADERS ${HEADER_FILES} - LINK_LIBRARIES ${LIBRARIES} - DEPENDS ${DEPENDENCIES} - COMPONENT lib${LIBTRANSPORT} - INCLUDE_DIRS ${LIBTRANSPORT_INCLUDE_DIRS} - INSTALL_ROOT_DIR hicn/transport - DEFINITIONS ${COMPILER_DEFINITIONS} -) +if (ANDROID_API) + build_library(${LIBTRANSPORT} + STATIC + SOURCES ${SOURCE_FILES} ${HEADER_FILES} + INSTALL_HEADERS ${HEADER_FILES} + LINK_LIBRARIES ${LIBRARIES} + DEPENDS ${DEPENDENCIES} + COMPONENT lib${LIBTRANSPORT} + INCLUDE_DIRS ${LIBTRANSPORT_INCLUDE_DIRS} + INSTALL_ROOT_DIR hicn/transport + DEFINITIONS ${COMPILER_DEFINITIONS} + ) +else () + build_library(${LIBTRANSPORT} + STATIC SHARED + SOURCES ${SOURCE_FILES} ${HEADER_FILES} + INSTALL_HEADERS ${HEADER_FILES} + LINK_LIBRARIES ${LIBRARIES} + DEPENDS ${DEPENDENCIES} + COMPONENT lib${LIBTRANSPORT} + INCLUDE_DIRS ${LIBTRANSPORT_INCLUDE_DIRS} + INSTALL_ROOT_DIR hicn/transport + DEFINITIONS ${COMPILER_DEFINITIONS} + ) +endif () if (${COMPILE_TESTS}) add_subdirectory(core/test) diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt index b1993e740..c78110949 100644 --- a/utils/CMakeLists.txt +++ b/utils/CMakeLists.txt @@ -29,7 +29,12 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) find_package(Libtransport REQUIRED) set(HICN_UTILS hicn-utils) else() - set(LIBTRANSPORT_LIBRARIES ${LIBTRANSPORT_SHARED}) + if (ANDROID_API) + set(LIBTRANSPORT_LIBRARIES ${LIBTRANSPORT}) + else () + set(LIBTRANSPORT_LIBRARIES ${LIBTRANSPORT_SHARED}) + endif () + endif() set(SUFFIX "") diff --git a/utils/src/ping_client.cc b/utils/src/ping_client.cc index d72177830..f88bc7eec 100644 --- a/utils/src/ping_client.cc +++ b/utils/src/ping_client.cc @@ -18,8 +18,10 @@ // Let's make the linker happy #if !TRANSPORT_LOG_EXTERN_GLOBAL_OUTPUT_LEVEL +#ifndef TRANSPORT_LOG_DEFINE_GLOBAL_OUTPUT_LEVEL TRANSPORT_LOG_DEFINE_GLOBAL_OUTPUT_LEVEL = 0; #endif +#endif #include <asio/steady_timer.hpp> #include <chrono> |