1 files changed, 27 insertions, 8 deletions
diff --git a/src/irmd/CMakeLists.txt b/src/irmd/CMakeLists.txt
index c9c2e553..32904d59 100644
--- a/src/irmd/CMakeLists.txt
+++ b/src/irmd/CMakeLists.txt
@@ -4,13 +4,14 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${CMAKE_SOURCE_DIR}/include)
 include_directories(${CMAKE_BINARY_DIR}/include)
 
+set(OUROBOROS_CONFIG_DIR /etc/ouroboros CACHE STRING
+  "Configuration directory")
+
 find_library(LIBTOML_LIBRARIES toml QUIET)
 if (LIBTOML_LIBRARIES)
   set(DISABLE_CONFIGFILE FALSE CACHE BOOL
     "Disable configuration file support")
   if (NOT DISABLE_CONFIGFILE)
-    set(OUROBOROS_CONFIG_DIR /etc/ouroboros/ CACHE STRING
-      "Configuration directory")
     set(OUROBOROS_CONFIG_FILE irmd.conf CACHE STRING
       "Name of the IRMd configuration file")
     set(HAVE_TOML TRUE)
@@ -23,11 +24,11 @@ if (LIBTOML_LIBRARIES)
     install(FILES "${CMAKE_BINARY_DIR}/irmd.conf.example"
       DESTINATION "${OUROBOROS_CONFIG_DIR}")
     unset(INSTALL_DIR)
-    mark_as_advanced(LIBTOML_LIBRARIES)
+    find_path(LIBTOML_INCLUDE toml.h)
+    mark_as_advanced(LIBTOML_LIBRARIES LIBTOML_INCLUDE)
   else ()
     message(STATUS "Configuration file support disabled by user")
     unset(OUROBOROS_CONFIG_FILE CACHE)
-    unset(OUROBOROS_CONFIG_DIR CACHE)
     set(HAVE_TOML FALSE)
   endif ()
 else ()
@@ -38,16 +39,26 @@ else ()
   unset(HAVE_TOML)
 endif ()
 
+set(OUROBOROS_SECURITY_DIR "${OUROBOROS_CONFIG_DIR}/security" CACHE STRING
+  "Security directory holding authentication information")
+set(OUROBOROS_CA_CRT_DIR "${OUROBOROS_SECURITY_DIR}/cacert" CACHE STRING
+  "Directory holding trusted CA certificates")
+set(OUROBOROS_SRV_CRT_DIR "${OUROBOROS_SECURITY_DIR}/server" CACHE STRING
+  "Directory holding trusted CA certificates")
+set(OUROBOROS_CLI_CRT_DIR "${OUROBOROS_SECURITY_DIR}/client" CACHE STRING
+  "Directory holding trusted CA certificates")
+set(OUROBOROS_UNTRUSTED_DIR "${OUROBOROS_SECURITY_DIR}/untrusted" CACHE STRING
+  "Directory holding untrusted intermediate certificates")
+
 set(IRMD_REQ_ARR_TIMEOUT 1000 CACHE STRING
   "Timeout for an application to respond to a new flow (ms)")
-
 set(BOOTSTRAP_TIMEOUT 5000 CACHE STRING
   "Timeout for an IPCP to bootstrap (ms)")
 set(ENROLL_TIMEOUT 20000 CACHE STRING
   "Timeout for an IPCP to enroll (ms)")
 set(REG_TIMEOUT 20000 CACHE STRING
   "Timeout for registering a name (ms)")
-set(QUERY_TIMEOUT 20000 CACHE STRING
+set(QUERY_TIMEOUT 200 CACHE STRING
   "Timeout to query a name with an IPCP (ms)")
 set(CONNECT_TIMEOUT 20000 CACHE STRING
   "Timeout to connect an IPCP to another IPCP (ms)")
@@ -61,6 +72,8 @@ set(IRMD_PKILL_TIMEOUT 30 CACHE STRING
   "Number of seconds to wait before sending SIGKILL to subprocesses on exit")
 set(IRMD_KILL_ALL_PROCESSES TRUE CACHE BOOL
   "Kill all processes on exit")
+set(DEBUG_PROTO_OAP FALSE CACHE BOOL
+  "Add Flow allocation protocol message output to IRMd debug logging")
 
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/config.h.in"
   "${CMAKE_CURRENT_BINARY_DIR}/config.h" @ONLY)
@@ -70,6 +83,7 @@ set(SOURCE_FILES
   ipcp.c
   configfile.c
   main.c
+  oap.c
   reg/flow.c
   reg/ipcp.c
   reg/proc.c
@@ -83,6 +97,10 @@ add_executable (irmd ${SOURCE_FILES})
 target_link_libraries (irmd LINK_PUBLIC ouroboros-common
   ${LIBTOML_LIBRARIES})
 
+if (HAVE_TOML)
+  target_include_directories(irmd PUBLIC ${LIBTOML_INCLUDE})
+endif ()
+
 include(AddCompileFlags)
 if (CMAKE_BUILD_TYPE MATCHES "Debug*")
   add_compile_flags(irmd -DCONFIG_OUROBOROS_DEBUG)
@@ -90,6 +108,7 @@ endif ()
 
 install(TARGETS irmd RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR})
 
-# Enable once irmd has tests
-#add_subdirectory(tests)
 add_subdirectory(reg)
+if(BUILD_TESTS)
+  add_subdirectory(tests)
+endif ()