Moved code around

CMakeLists.txt

@@ -10,5 +10,7 @@ set(CMAKE_C_FLAGS_RELEASE "-Os")
 set(CMAKE_C_FLAGS_RELWITHDEBINFO "-Os -g")
 
 option(LIBSSH_VERBOSE_OUTPOUT "whether or not verbose output for libssh mode is activated" OFF)
+option(SESSION_RECORDING "whether or not recording feature based on lib termrec is activated" ON)
 
-add_subdirectory(src)
+add_subdirectory(bastion)
+add_subdirectory(common)

bastion/CMakeLists.txt

@@ -1,9 +1,10 @@
 include_directories("${bastion_SOURCE_DIR}/termrec/libtty/")
+include_directories("${bastion_SOURCE_DIR}/common")
 
 file(GLOB_RECURSE SOURCES *.c)
 
 add_executable(bastion ${SOURCES})
 add_library(libtty.a STATIC IMPORTED)
 set_property(TARGET libtty.a PROPERTY IMPORTED_LOCATION "${bastion_SOURCE_DIR}/libtty.a")
-target_link_libraries(bastion libtty.a)
+target_link_libraries(bastion libtty.a common)
 target_link_libraries(bastion bz2 curl lzma mysqlclient pthread ssh z)

common/CMakeLists.txt

@@ -0,0 +1,3 @@
+file(GLOB_RECURSE SOURCES *.c)
+
+ADD_LIBRARY(common STATIC ${SOURCES})

config.h

@@ -14,11 +14,8 @@
 #define MYSQL_PASS "graou"
 #define MYSQL_DB "sshportal"
 
-#define SESSION_RECORDING  // comment this to deactivate
 #define LOG_FILENAME_FORMAT "./log/$d/$h/$u/$i.gz" // $d : date in iso format, $h : hostname, $u : username : $i session id
 #define LOG_FILENAME_MAX_LEN 255
 #define LOG_DIRECTORY_MODE S_IRUSR | S_IWUSR | S_IXUSR
 
-#define LIBSSH_VERBOSE_OUTPOUT // comment this to deactivate
-
 #endif