diff options
| -rw-r--r-- | lib/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | lib/doc/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | lib/doc/Doxyfile.in | 2 | ||||
| -rw-r--r-- | lib/src/mapme.c | 4 |
4 files changed, 8 insertions, 6 deletions
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 8b0280d7b..44d8526c6 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -49,4 +49,6 @@ if (ANDROID_API) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ANDROID_C_FLAGS} -std=c99") endif () -add_subdirectory (src)
\ No newline at end of file +add_subdirectory (src) +add_subdirectory (doc) + diff --git a/lib/doc/CMakeLists.txt b/lib/doc/CMakeLists.txt index cf022dc52..9b4660337 100644 --- a/lib/doc/CMakeLists.txt +++ b/lib/doc/CMakeLists.txt @@ -7,6 +7,7 @@ if(BUILD_DOCUMENTATION) message(FATAL_ERROR "Doxygen is needed to build the documentation.") endif() + set(doxy_main_page ${CMAKE_CURRENT_SOURCE_DIR}/../README.md) set(doxyfile_in ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in) set(doxyfile ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile) @@ -18,6 +19,5 @@ if(BUILD_DOCUMENTATION) COMMENT "Generating API documentation with Doxygen" VERBATIM) -# FIXME MS : wrong install path - install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION share/doc) + install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION share/doc OPTIONAL) endif() diff --git a/lib/doc/Doxyfile.in b/lib/doc/Doxyfile.in index 839de9f8a..ce352c734 100644 --- a/lib/doc/Doxyfile.in +++ b/lib/doc/Doxyfile.in @@ -9,4 +9,4 @@ FILE_PATTERNS = *.md \ *.h \ *.cc RECURSIVE = YES -USE_MDFILE_AS_MAINPAGE = ../README.md +USE_MDFILE_AS_MAINPAGE = @doxy_main_page@ diff --git a/lib/src/mapme.c b/lib/src/mapme.c index e4c5ee1f2..746336205 100644 --- a/lib/src/mapme.c +++ b/lib/src/mapme.c @@ -120,7 +120,7 @@ hicn_mapme_v4_create_ack (u8 * buf, const mapme_params_t * params) mh->ip.daddr = mh->ip.saddr; mh->ip.saddr = tmp; mh->ip.ttl = HICN_MAPME_TTL; - mh->icmp.type = (params->type == UPDATE) ? UPDATE_ACK : NOTIFICATION_ACK; + mh->icmp.type = HICN_MAPME_ICMP_TYPE_ACK_IPV4; mh->icmp.csum = 0; return HICN_MAPME_V4_HDRLEN; @@ -136,7 +136,7 @@ hicn_mapme_v6_create_ack (u8 * buf, const mapme_params_t * params) mh->ip.daddr = mh->ip.saddr; mh->ip.saddr = tmp; mh->ip.hlim = HICN_MAPME_TTL; - mh->icmp.type = (params->type == UPDATE) ? UPDATE_ACK : NOTIFICATION_ACK; + mh->icmp.type = HICN_MAPME_ICMP_TYPE_ACK_IPV6; mh->icmp.csum = 0; return HICN_MAPME_V6_HDRLEN; |