Update CMake environment and add new tool

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 42e0b3e55d9e4d37abb180a0f5b14b8667e7393c..5ece93ee3512b85fd0697d8e2c7bf33c809484b6 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,131 +1,34 @@
 cmake_minimum_required(VERSION 2.8.3)
-
 project(umurmurd C)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
 set(CMAKE_INSTALL_RPATH_USE_LINK_PATH true)
-
-set(UMURMUR_ROOT_PATH "${CMAKE_CURRENT_LIST_DIR}")
-set(UMURMUR_BINARY_DIR ${CMAKE_BINARY_DIR})
+set(UMURMUR_BINARY_DIR "${CMAKE_BINARY_DIR}/bin")
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${UMURMUR_BINARY_DIR}")
 
 if(NOT CMAKE_BUILD_TYPE)
-  set(CMAKE_BUILD_TYPE Release CACHE STRING "The type of build product that should be produced.")
-endif(NOT CMAKE_BUILD_TYPE)
-
-option(USE_POLARSSL_TESTCERT "Link to the PolarSSL test certificate and key." OFF)
-option(USE_POLARSSL_HAVEGE "Use the PolarSSL HAVEGE random generator key." OFF)
-
-option(USE_MBEDTLS_TESTCERT "Link to the mbedTLS test certificate and key." OFF)
-option(USE_MBEDTLS_HAVEGE "Use the mbedTLS HAVEGE random generator key." OFF)
+  set(CMAKE_BUILD_TYPE Release CACHE STRING "The type of build product that should be produced." FORCE)
+endif()
 
-option(USE_SHAREDMEMORY_API "Compile with Sharedmemory API support" OFF)
+include(CheckLibraryExists)
+include(CheckFunctionExists)
+include(SelectTLSBackend)
+include(SelectRTBackend)
 
-if(USE_POLARSSL_TESTCERT OR USE_POLARSSL_HAVEGE)
-  if(SSL MATCHES "openssl" OR SSL MATCHES "gnutls")
-    message(FATAL_ERROR "Selecting USE_POLARSSL_TESTCERT or USE_POLARSSL_HAVEGE implies SSL=polarssl")
-  endif(SSL MATCHES "openssl" OR SSL MATCHES "gnutls")
-endif(USE_POLARSSL_TESTCERT OR USE_POLARSSL_HAVEGE)
+SelectRTBackend()
+SelectTLSBackend("${SSL}")
 
-if(USE_MBEDTLS_TESTCERT OR USE_MBEDTLS_HAVEGE)
-  if(SSL MATCHES "openssl" OR SSL MATCHES "gnutls" OR SSL MATCHES "polarssl")
-    message(FATAL_ERROR "Selecting USE_MBEDTLS_TESTCERT or USE_MBEDTLS_HAVEGE implies SSL=mbedtls")
-  endif(SSL MATCHES "openssl" OR SSL MATCHES "gnutls" OR SSL MATCHES "polarssl")
-endif(USE_MBEDTLS_TESTCERT OR USE_MBEDTLS_HAVEGE)
+include(Options)
+include(Tools)
 
 find_package(Libconfig REQUIRED)
 find_package(ProtobufC REQUIRED)
-include(CheckFunctionExists)
-include(CheckLibraryExists)
-
-if("${SSL}" STREQUAL "")
-  set(SSL "polarssl")
-endif("${SSL}" STREQUAL "")
-
-if("${SSL}" STREQUAL "openssl")
-  find_package(OpenSSL REQUIRED)
-  if(OPENSSL_FOUND)
-    set(SSLIMP_LIBRARIES ${OPENSSL_LIBRARIES})
-    set(SSLIMP_INCLUDE_DIR ${OPENSSL_INCLUDE_DIR})
-    set(SSLIMP_LIBRARY_DIR ${OPENSSL_LIB_DIR})
-
-    if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-deprecated-declarations")
-    endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-
-  endif(OPENSSL_FOUND)
-elseif("${SSL}" STREQUAL "polarssl")
-  find_package(PolarSSL REQUIRED)
-  if(POLARSSL_FOUND)
-    set(USE_POLARSSL ON)
-    set(SSLIMP_LIBRARIES ${POLARSSL_LIBRARIES})
-    set(SSLIMP_INCLUDE_DIR ${POLARSSL_INCLUDE_DIR})
-    set(SSLIMP_LIBRARY_DIR ${POLARSSL_LIB_DIR})
-  endif(POLARSSL_FOUND)
-elseif("${SSL}" STREQUAL "mbedtls")
-  find_package(mbedTLS REQUIRED)
-  if(MBEDTLS_FOUND)
-    set(USE_MBEDTLS ON)
-    set(SSLIMP_LIBRARIES ${MBEDTLS_LIBRARIES})
-    set(SSLIMP_INCLUDE_DIR ${MBEDTLS_INCLUDE_DIR})
-    set(SSLIMP_LIBRARY_DIR ${MBEDTLS_LIB_DIR})
-  endif(MBEDTLS_FOUND)
-elseif("${SSL}" STREQUAL "gnutls")
-  find_package(GnuTLS 3 REQUIRED)
-  if(GNUTLS_FOUND)
-    set(USE_GNUTLS ON)
-    set(SSLIMP_LIBRARIES ${GNUTLS_LIBRARIES})
-    set(SSLIMP_INCLUDE_DIR ${GNUTLS_INCLUDE_DIR})
-    set(SSLIMP_LIBRARY_DIR ${GNUTLS_LIB_DIR})
-  endif(GNUTLS_FOUND)
-  find_package(Nettle REQUIRED)
-  if(NETTLE_FOUND)
-    set(CRYPTO_LIBRARIES "${NETTLE_LIBRARIES}")
-  endif(NETTLE_FOUND)
-endif("${SSL}" STREQUAL "openssl")
 
-check_library_exists(rt clock_gettime "time.h" HAVE_CLOCK_GETTIME_RT)
-
-if(NOT HAVE_CLOCK_GETTIME_RT)
-  check_function_exists(clock_gettime HAVE_CLOCK_GETTIME)
-  if(NOT HAVE_CLOCK_GETTIME)
-    check_library_exists(c clock_get_time "mach/time.h" HAVE_CLOCK_GET_TIME)
-    if(NOT HAVE_CLOCK_GET_TIME)
-      message(FATAL_ERROR "Didn't find clock_gettime() or clock_get_time()!")
-    endif()
-  endif()
-else()
-  set(LIBRT rt)
-endif()
-
-if(USE_SHAREDMEMORY_API)
-  set(UMURMUR_MONITOR_SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/tools/umurmur-monitor/" CACHE PATH "The path to the umurmur-monitor source directory")
-  option(BUILD_UMURMUR_MONITOR "Build the umurmur-monitor utility" OFF)
-
-  if(BUILD_UMURMUR_MONITOR)
-    if(EXISTS "${UMURMUR_MONITOR_SOURCE_DIR}/CMakeLists.txt")
-      add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/tools/umurmur-monitor")
-    else()
-      message(FATAL_ERROR "Could not find umurmur-monitor source. Please specify UMURMUR_MONITOR_SOURCE_DIR")
-    endif()
-  endif()
-endif()
-
-set(SOURCE "")
 add_subdirectory(src)
 
-configure_file(src/config.h.in ${CMAKE_SOURCE_DIR}/src/config.h)
-
-include_directories(${LIBCONFIG_INCLUDE_DIR} ${PROTOBUFC_INCLUDE_DIR} ${SSLIMP_INCLUDE_DIR})
-link_directories(${LIBCONFIG_LIB_DIR} ${PROTOBUFC_LIB_DIR} ${SSLIMP_LIB_DIR})
-
-add_executable(${PROJECT_NAME} ${SOURCE})
-install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION "bin")
-
 find_path(OLD_CONFIG_FILE NAMES "umurmur.conf" PATHS ${CMAKE_INSTALL_PREFIX} PATH_SUFFIXES "etc")
+
 if(NOT OLD_CONFIG_FILE)
   install(FILES "umurmur.conf.example" DESTINATION "etc" RENAME "umurmur.conf")
-endif(NOT OLD_CONFIG_FILE)
-
-add_definitions(${SSLIMP_CFLAGS})
+endif()
 
-target_link_libraries(${PROJECT_NAME} ${LIBCONFIG_LIBRARIES} ${PROTOBUFC_LIBRARIES} ${SSLIMP_LIBRARIES} ${LIBRT} ${CRYPTO_LIBRARIES})

diff --git a/cmake/Modules/Options.cmake b/cmake/Modules/Options.cmake
new file mode 100644 (file)
index 0000000..e4750c3
--- /dev/null
+++ b/cmake/Modules/Options.cmake
@@ -0,0 +1,23 @@
+# PolarSSL
+option(USE_POLARSSL_TESTCERT "Link to the PolarSSL test certificate and key." OFF)
+option(USE_POLARSSL_HAVEGE "Use the PolarSSL HAVEGE random generator key." OFF)
+
+if(USE_POLARSSL_TESTCERT OR USE_POLARSSL_HAVEGE)
+  if(SSL NOT MATCHES "polarssl")
+    message(FATAL_ERROR "Selecting USE_POLARSSL_TESTCERT or USE_POLARSSL_HAVEGE implies SSL=polarssl")
+  endif()
+endif()
+
+# mbedTLS
+option(USE_MBEDTLS_TESTCERT "Link to the mbedTLS test certificate and key." OFF)
+option(USE_MBEDTLS_HAVEGE "Use the mbedTLS HAVEGE random generator key." OFF)
+
+if(USE_MBEDTLS_TESTCERT OR USE_MBEDTLS_HAVEGE)
+  if(SSL NOT MATCHES "mbedtls")
+    message(FATAL_ERROR "Selecting USE_MBEDTLS_TESTCERT or USE_MBEDTLS_HAVEGE implies SSL=mbedtls")
+  endif()
+endif()
+
+# SHM API
+option(USE_SHAREDMEMORY_API "Compile with Sharedmemory API support" OFF)
+

diff --git a/cmake/Modules/SelectRTBackend.cmake b/cmake/Modules/SelectRTBackend.cmake
new file mode 100644 (file)
index 0000000..0f2b07e
--- /dev/null
+++ b/cmake/Modules/SelectRTBackend.cmake
@@ -0,0 +1,15 @@
+function(SelectRTBackend)
+  check_library_exists(rt clock_gettime "time.h" HAVE_CLOCK_GETTIME_RT)
+
+  if(NOT HAVE_CLOCK_GETTIME_RT)
+    check_function_exists(clock_gettime HAVE_CLOCK_GETTIME)
+    if(NOT HAVE_CLOCK_GETTIME)
+      check_library_exists(c clock_get_time "mach/time.h" HAVE_CLOCK_GET_TIME)
+      if(NOT HAVE_CLOCK_GET_TIME)
+        message(FATAL_ERROR "Didn't find clock_gettime() or clock_get_time()!")
+      endif()
+    endif()
+  else()
+    set(LIBRT rt PARENT_SCOPE)
+  endif()
+endfunction()

diff --git a/cmake/Modules/SelectTLSBackend.cmake b/cmake/Modules/SelectTLSBackend.cmake
new file mode 100644 (file)
index 0000000..6097c4d
--- /dev/null
+++ b/cmake/Modules/SelectTLSBackend.cmake
@@ -0,0 +1,64 @@
+function(SelectTLSBackend SSL)
+  if("${SSL}" STREQUAL "")
+    set(SSL "polarssl")
+  endif()
+
+  set(LIBRARIES "")
+  set(INCLUDE_DIR "")
+  set(LIBRARY_DIR "")
+
+  if("${SSL}" STREQUAL "openssl")
+    find_package(OpenSSL REQUIRED)
+
+    if(OPENSSL_FOUND)
+      set(LIBRARIES ${OPENSSL_LIBRARIES})
+      set(INCLUDE_DIR ${OPENSSL_INCLUDE_DIR})
+      set(LIBRARY_DIR ${OPENSSL_LIB_DIR})
+
+      if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-deprecated-declarations" PARENT_SCOPE)
+      endif()
+
+    endif()
+  elseif("${SSL}" STREQUAL "polarssl")
+    find_package(PolarSSL REQUIRED)
+
+    if(POLARSSL_FOUND)
+      set(USE_POLARSSL ON PARENT_SCOPE)
+
+      set(LIBRARIES ${POLARSSL_LIBRARIES})
+      set(INCLUDE_DIR ${POLARSSL_INCLUDE_DIR})
+      set(LIBRARY_DIR ${POLARSSL_LIB_DIR})
+    endif()
+  elseif("${SSL}" STREQUAL "mbedtls")
+    find_package(mbedTLS REQUIRED)
+
+    if(MBEDTLS_FOUND)
+      set(USE_MBEDTLS ON PARENT_SCOPE)
+
+      set(LIBRARIES ${MBEDTLS_LIBRARIES})
+      set(INCLUDE_DIR ${MBEDTLS_INCLUDE_DIR})
+      set(LIBRARY_DIR ${MBEDTLS_LIB_DIR})
+    endif()
+  elseif("${SSL}" STREQUAL "gnutls")
+    find_package(GnuTLS 3 REQUIRED)
+
+    if(GNUTLS_FOUND)
+      set(USE_GNUTLS ON PARENT_SCOPE)
+
+      set(LIBRARIES ${GNUTLS_LIBRARIES})
+      set(INCLUDE_DIR ${GNUTLS_INCLUDE_DIR})
+      set(LIBRARY_DIR ${GNUTLS_LIB_DIR})
+    endif()
+
+    find_package(Nettle REQUIRED)
+
+    if(NETTLE_FOUND)
+      list(APPEND LIBRARIES ${NETTLE_LIBRARIES})
+    endif()
+  endif()
+
+  set(SSLIMP_LIBRARIES ${LIBRARIES} PARENT_SCOPE)
+  set(SSLIMP_LIBRARY_DIR ${LIBRARY_DIR} PARENT_SCOPE)
+  set(SSLIMP_INCLUDE_DIR ${INCLUDE_DIR} PARENT_SCOPE)
+endfunction()

diff --git a/cmake/Modules/Tools.cmake b/cmake/Modules/Tools.cmake
new file mode 100644 (file)
index 0000000..4be3dec
--- /dev/null
+++ b/cmake/Modules/Tools.cmake
@@ -0,0 +1,31 @@
+function(EnableSHMAPI)
+  if(NOT USE_SHAREDMEMORY_API)
+    message(STATUS "Enabling shared memory API")
+    set(USE_SHAREDMEMORY_API ON CACHE BOOL "" FORCE)
+  endif()
+endfunction()
+
+set(TOOLS_DIR "${PROJECT_SOURCE_DIR}/tools")
+
+if(EXISTS "${TOOLS_DIR}/umurmur-monitor/CMakeLists.txt")
+  set(UMURMUR_MONITOR_DIR "${TOOLS_DIR}/umurmur-monitor")
+  option(BUILD_UMURMUR_MONITOR "Build the umurmur-monitor utility" OFF)
+endif()
+
+if(EXISTS "${TOOLS_DIR}/numurmon/CMakeLists.txt")
+  set(NUMURMON_DIR "${TOOLS_DIR}/numurmon")
+  option(BUILD_NUMURMON "Build the numurmon utility" OFF)
+endif()
+
+if(BUILD_UMURMUR_MONITOR OR BUILD_NUMURMON)
+  set(UMURMUR_ROOT_PATH "${PROJECT_SOURCE_DIR}")
+  EnableSHMAPI()
+endif()
+
+if(BUILD_UMURMUR_MONITOR)
+  add_subdirectory(${UMURMUR_MONITOR_DIR})
+endif()
+
+if(BUILD_NUMURMON)
+  add_subdirectory(${NUMURMON_DIR})
+endif()

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f89f00863080ffe0c9dfd03e6c0e83af5d5c32b7..f7c967828118a4bc484a85df4bf9008e6bc0724b 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -31,5 +31,23 @@ if(USE_SHAREDMEMORY_API)
   list(APPEND SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/sharedmemory.c)
 endif(USE_SHAREDMEMORY_API)
 
-set(SOURCE ${SOURCE} ${SOURCE_FILES} PARENT_SCOPE)
+configure_file(config.h.in ${CMAKE_SOURCE_DIR}/src/config.h)
 
+include_directories(${LIBCONFIG_INCLUDE_DIR}
+                    ${PROTOBUFC_INCLUDE_DIR}
+                    ${SSLIMP_INCLUDE_DIR})
+
+link_directories(${LIBCONFIG_LIB_DIR}
+                 ${PROTOBUFC_LIB_DIR}
+                 ${SSLIMP_LIB_DIR})
+
+add_executable(${PROJECT_NAME} ${SOURCE_FILES})
+
+target_link_libraries(${PROJECT_NAME}
+                      ${LIBCONFIG_LIBRARIES}
+                      ${PROTOBUFC_LIBRARIES}
+                      ${SSLIMP_LIBRARIES}
+                      ${LIBRT}
+                      ${CRYPTO_LIBRARIES})
+
+install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION "bin")

diff --git a/src/sharedmemory_struct.h b/src/sharedmemory_struct.h
index e696948b34fbcef3a1647af64a0c06aa30b180bb..649aac5fcf6ea6e60d57a26faae6f06c133ebdc3 100644 (file)
--- a/src/sharedmemory_struct.h
+++ b/src/sharedmemory_struct.h
@@ -4,7 +4,6 @@
 
 typedef struct
 {
-
   char username[121];
   char ipaddress[INET6_ADDRSTRLEN];
   char channel[121];
@@ -13,20 +12,18 @@ typedef struct
   bool_t bUDP, authenticated, deaf, mute, self_deaf, self_mute, recording, bOpus;
   int availableBandwidth;
   uint32_t online_secs, idle_secs;
+  uint8_t hash[20];
   bool_t isAdmin;
   bool_t isSuppressed;
   float UDPPingAvg, UDPPingVar, TCPPingAvg, TCPPingVar;
   uint32_t UDPPackets, TCPPackets;
-
 } shmclient_t;
 
 typedef struct
 {
-
   int shmtotal_size, shmclient_size;
   int clientcount, server_max_clients;
   unsigned int umurmurd_pid;
   uint8_t alive;
   shmclient_t client[];
-
 } shm_t;

diff --git a/tools/numurmon b/tools/numurmon
index 334aab7c2b1645c4fa66937e047f5adb3b3d8498..b8ec1a41087e58fb7249495494b6eaae62e43799 160000 (submodule)
--- a/tools/numurmon
+++ b/tools/numurmon
@@ -1 +1 @@
-Subproject commit 334aab7c2b1645c4fa66937e047f5adb3b3d8498
+Subproject commit b8ec1a41087e58fb7249495494b6eaae62e43799

diff --git a/tools/umurmur-monitor b/tools/umurmur-monitor
index 8a5c924024b750abccad46dd925a6a9be0bc352c..c4ffe06c860955fbef4b262067451145391031de 160000 (submodule)
--- a/tools/umurmur-monitor
+++ b/tools/umurmur-monitor
@@ -1 +1 @@
-Subproject commit 8a5c924024b750abccad46dd925a6a9be0bc352c
+Subproject commit c4ffe06c860955fbef4b262067451145391031de