Merge remote-tracking branch 'ProjectTox/master'

5 files changed, 96 insertions, 8 deletions

diff --git a/other/bootstrap_serverdaemon/CMakeLists.txt b/other/bootstrap_serverdaemon/CMakeLists.txt
index 6aa4dbee..512179f3 100644
--- a/other/bootstrap_serverdaemon/CMakeLists.txt
+++ b/other/bootstrap_serverdaemon/CMakeLists.txt
@@ -3,8 +3,17 @@ project(DHT_bootstrap_daemon C)
 
 set(exe_name DHT_bootstrap_daemon)
 
+find_package(LIBCONFIG REQUIRED)
+
+include_directories(${LIBCONFIG_INCLUDE_DIR})
+
 add_executable(${exe_name}
-        DHT_bootstrap_daemon.c)
+        DHT_bootstrap_daemon.c)
+
+target_link_libraries(${exe_name}
+        ${LIBCONFIG_LIBRARY})
 
-target_link_libraries(${exe_name} config)
 linkCoreLibraries(${exe_name})
+
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules")
+find_package(LibConfig REQUIRED)
diff --git a/other/bootstrap_serverdaemon/DHT_bootstrap_daemon.c b/other/bootstrap_serverdaemon/DHT_bootstrap_daemon.c
index 8e278b28..4f28fb3c 100644
--- a/other/bootstrap_serverdaemon/DHT_bootstrap_daemon.c
+++ b/other/bootstrap_serverdaemon/DHT_bootstrap_daemon.c
@@ -123,11 +123,12 @@ void manage_keys(char *keys_file)
 {
     const uint32_t KEYS_SIZE = crypto_box_PUBLICKEYBYTES + crypto_box_SECRETKEYBYTES;
     uint8_t keys[KEYS_SIZE];
-
-    /* TODO: stat the file before trying to open it. We aren't cave people! */
-    FILE *keysf = fopen(keys_file, "r");
-    if (keysf != NULL) {
-        /* if file was opened successfully -- load keys */
+    struct stat existence;
+    FILE *keysf;
+    
+    /* Check if file exits, proceed to open and load keys */
+    if(stat(keys_file,&existence) >= 0) {
+        keysf = fopen(keys_file, "r");
         size_t read_size = fread(keys, sizeof(uint8_t), KEYS_SIZE, keysf);
         if (read_size != KEYS_SIZE) {
             printf("Error while reading the key file\nExiting.\n");
diff --git a/other/bootstrap_serverdaemon/cmake/Modules/FindLibConfig.cmake b/other/bootstrap_serverdaemon/cmake/Modules/FindLibConfig.cmake
new file mode 100644
index 00000000..7d6270e6
--- /dev/null
+++ b/other/bootstrap_serverdaemon/cmake/Modules/FindLibConfig.cmake
@@ -0,0 +1,73 @@
+#Ref: https://github.com/schnorr/pajeng/blob/master/cmake/FindLibConfig.cmake
+#
+# This module defines
+# LIBCONFIG_INCLUDE_DIR, where to find cppunit include files, etc.
+# LIBCONFIG_LIBRARIES, the libraries to link against to use CppUnit.
+# LIBCONFIG_STATIC_LIBRARIY_PATH
+# LIBCONFIG_FOUND, If false, do not try to use CppUnit.
+
+# also defined, but not for general use are
+# LIBCONFIG_LIBRARY, where to find the CUnit library.
+
+#MESSAGE("Searching for libconfig library")
+
+FIND_PATH(LIBCONFIG_INCLUDE_DIR libconfig.h
+  /usr/local/include
+  /usr/include
+)
+
+FIND_PATH(LIBCONFIGPP_INCLUDE_DIR libconfig.h++
+  /usr/local/include
+  /usr/include
+)
+
+FIND_LIBRARY(LIBCONFIG_LIBRARY config
+  /usr/local/lib
+  /usr/lib
+)
+
+FIND_LIBRARY(LIBCONFIGPP_LIBRARY config++
+  /usr/local/lib
+  /usr/lib
+)
+
+FIND_LIBRARY(LIBCONFIG_STATIC_LIBRARY "libconfig${CMAKE_STATIC_LIBRARY_SUFFIX}"
+  /usr/local/lib
+  /usr/lib
+)
+
+FIND_LIBRARY(LIBCONFIGPP_STATIC_LIBRARY "libconfig++${CMAKE_STATIC_LIBRARY_SUFFIX}"
+    /usr/local/lib
+    /usr/lib
+)
+
+
+IF(LIBCONFIG_INCLUDE_DIR)
+  IF(LIBCONFIG_LIBRARY)
+    SET(LIBCONFIG_FOUND TRUE)
+    SET(LIBCONFIG_LIBRARIES ${LIBCONFIG_LIBRARY})
+    SET(LIBCONFIG_STATIC_LIBRARY_PATH ${LIBCONFIG_STATIC_LIBRARY})
+  ENDIF(LIBCONFIG_LIBRARY)
+ENDIF(LIBCONFIG_INCLUDE_DIR)
+
+IF(LIBCONFIGPP_INCLUDE_DIR)
+  IF(LIBCONFIGPP_LIBRARY)
+    SET(LIBCONFIGPP_FOUND TRUE)
+    SET(LIBCONFIGPP_LIBRARIES ${LIBCONFIGPP_LIBRARY})
+    SET(LIBCONFIGPP_STATIC_LIBRARY_PATH ${LIBCONFIGPP_STATIC_LIBRARY})
+  ENDIF(LIBCONFIGPP_LIBRARY)
+ENDIF(LIBCONFIGPP_INCLUDE_DIR)
+
+IF (LIBCONFIG_FOUND)
+   IF (NOT LibConfig_FIND_QUIETLY)
+      MESSAGE(STATUS "Found LibConfig++: ${LIBCONFIGPP_LIBRARIES}" )
+      MESSAGE(STATUS "Found LibConfig: ${LIBCONFIG_LIBRARIES}")
+      MESSAGE(STATUS "static LibConfig path: ${LIBCONFIG_STATIC_LIBRARY_PATH}")
+   ENDIF (NOT LibConfig_FIND_QUIETLY)
+ELSE (LIBCONFIG_FOUND)
+   IF (LibConfig_FIND_REQUIRED)
+      MESSAGE(SEND_ERROR "Could NOT find LibConfig")
+   ENDIF (LibConfig_FIND_REQUIRED)
+ENDIF (LIBCONFIG_FOUND)
+
+MARK_AS_ADVANCED(LIBCONFIG_INCLUDE_DIR LIBCONFIG_LIBRARIES)
diff --git a/other/bootstrap_serverdaemon/server.cfg b/other/bootstrap_serverdaemon/server.cfg
index 8ef516ca..527c2a72 100644
--- a/other/bootstrap_serverdaemon/server.cfg
+++ b/other/bootstrap_serverdaemon/server.cfg
@@ -6,11 +6,15 @@ port = 33445;
 // The key file
 // make sure that the user who runs the server
 // does have permissions to read it/write to it
+// Remember to replace the provided example with
+// the directory the DHT server will run in.
 keys_file = "/home/tom/.bootstrap_server.keys"
 
 // The PID file written to by bootstrap_server,
 // make sure that the user who runs the server
 // does have permissions to write to it
+// Remember to replace the provided example with
+// the directory the DHT server will run in.
 pid_file = "/home/tom/.bootstrap_server.pid";
 
 // The info of the node bootstap_server will
diff --git a/other/cmake/DHT_bootstrap.cmake b/other/cmake/DHT_bootstrap.cmake
index e2b164ba..403522ab 100644
--- a/other/cmake/DHT_bootstrap.cmake
+++ b/other/cmake/DHT_bootstrap.cmake
@@ -4,6 +4,7 @@ project(DHT_bootstrap C)
 set(exe_name DHT_bootstrap)
 
 add_executable(${exe_name}
-        DHT_bootstrap.c ../testing/misc_tools.c)
+        DHT_bootstrap.c
+        ../testing/misc_tools.c)
 
 linkCoreLibraries(${exe_name})