adyxax/bastion
Archived
1
0
Fork 0
Code Issues Activity

Fixed session recording that was broken, and install the session player from the termrec project

Browse source
This commit is contained in:
Julien Dessaux 2019-03-28 08:50:59 +01:00
parent 455172075b
commit a6f8d1da2a
3 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.0) cmake_minimum_required(VERSION 3.0)
project(bastion LANGUAGES C VERSION 0.1.1) project(bastion LANGUAGES C VERSION 0.1.2)
set(CMAKE_VERBOSE_MAKEFILE FALSE) set(CMAKE_VERBOSE_MAKEFILE FALSE)
if(EXISTS "${CMAKE_SOURCE_DIR}/.git") if(EXISTS "${CMAKE_SOURCE_DIR}/.git")
@ -22,6 +22,10 @@ set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -ggdb3 -pg")
option(LIBSSH_VERBOSE_OUTPUT "whether or not verbose output for libssh mode is activated" OFF) option(LIBSSH_VERBOSE_OUTPUT "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) option(SESSION_RECORDING "whether or not recording feature based on lib termrec is activated" ON)
if(SESSION_RECORDING)
add_definitions(-DSESSION_RECORDING)
endif()
configure_file("common/config.h.in" "common/config.h") configure_file("common/config.h.in" "common/config.h")
include_directories("${CMAKE_CURRENT_BINARY_DIR}") include_directories("${CMAKE_CURRENT_BINARY_DIR}")
include_directories("${CMAKE_CURRENT_SOURCE_DIR}") include_directories("${CMAKE_CURRENT_SOURCE_DIR}")

4
bastion/CMakeLists.txt
View file

@ -4,10 +4,10 @@ file(GLOB_RECURSE SOURCES *.c)
add_executable(bastion ${SOURCES}) add_executable(bastion ${SOURCES})
target_link_libraries(bastion common) target_link_libraries(bastion common)
if (${SESSION_RECORDING}) if (SESSION_RECORDING)
target_link_libraries(bastion libtty) target_link_libraries(bastion libtty)
endif() endif()
target_link_libraries(bastion bz2 config lzma ssh z) target_link_libraries(bastion bz2 config curl lzma ssh z)
install(TARGETS bastion DESTINATION bin) install(TARGETS bastion DESTINATION bin)

19
external/CMakeLists.txt vendored
View file

@ -1,4 +1,4 @@
if (${SESSION_RECORDING}) if (SESSION_RECORDING)
# Build libtty from the termrec project # Build libtty from the termrec project
if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/termrec/) if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/termrec/)
message("Unable to find termrec, running git submodule update --init") message("Unable to find termrec, running git submodule update --init")
@ -12,10 +12,25 @@ if (${SESSION_RECORDING})
message("Unable to find config.h file for termrec, running configure script") message("Unable to find config.h file for termrec, running configure script")
execute_process(COMMAND ./configure WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/termrec) execute_process(COMMAND ./configure WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/termrec)
endif() endif()
file(GLOB_RECURSE LIBTTY_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/termrec/libtty/*.c) file(GLOB_RECURSE LIBTTY_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/termrec/libtty/*.c
${CMAKE_CURRENT_SOURCE_DIR}/termrec/libstream/*.c)
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/termrec/") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/termrec/")
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/termrec/common")
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/termrec/libtty") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/termrec/libtty")
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/termrec/sys") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/termrec/sys")
ADD_LIBRARY(libtty STATIC ${LIBTTY_SOURCES}) ADD_LIBRARY(libtty STATIC ${LIBTTY_SOURCES})
SET_TARGET_PROPERTIES(libtty PROPERTIES COMPILE_FLAGS "-Wno-all -Wno-error -Wno-extra -Wno-pedantic") SET_TARGET_PROPERTIES(libtty PROPERTIES COMPILE_FLAGS "-Wno-all -Wno-error -Wno-extra -Wno-pedantic")
# Build termplay from the termrec project
file(GLOB TERMPLAY_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/termrec/common/*.c
${CMAKE_CURRENT_SOURCE_DIR}/termrec/play/*.c
${CMAKE_CURRENT_SOURCE_DIR}/termrec/sys/*.c
${CMAKE_CURRENT_SOURCE_DIR}/termrec/sys/unix/*.c)
add_executable(termplay ${TERMPLAY_SOURCES})
SET_TARGET_PROPERTIES(termplay PROPERTIES COMPILE_FLAGS "-Wno-all -Wno-error -Wno-extra -Wno-pedantic")
target_link_libraries(termplay libtty)
target_link_libraries(termplay bz2 curl lzma pthread z)
install(TARGETS termplay DESTINATION bin)
endif() endif()