From 8ef6fb320ae814f2f9ed610cdbaa5f4bb9573f32 Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Wed, 27 Apr 2016 14:16:49 +0300 Subject: [PATCH] spectrum2_manager: enable SSL only when using OpenSSL library --- spectrum_manager/src/CMakeLists.txt | 3 ++- spectrum_manager/src/server.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/spectrum_manager/src/CMakeLists.txt b/spectrum_manager/src/CMakeLists.txt index 2fb114a6..7ddcc255 100644 --- a/spectrum_manager/src/CMakeLists.txt +++ b/spectrum_manager/src/CMakeLists.txt @@ -7,8 +7,9 @@ ADD_DEPENDENCIES(spectrum2_manager pb) SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_SOURCE_DIR}/../../include/transport/protocol.pb.cc PROPERTIES GENERATED 1) target_link_libraries(spectrum2_manager transport ${SWIFTEN_LIBRARY} ${PROTOBUF_LIBRARIES}) - +if (${OPENSSL_FOUND}) add_definitions(-DMG_ENABLE_SSL) +endif() if (CMAKE_COMPILER_IS_GNUCXX) target_link_libraries(spectrum2_manager ${OPENSSL_LIBRARIES}) endif() diff --git a/spectrum_manager/src/server.cpp b/spectrum_manager/src/server.cpp index a5dcb4f2..ed79b65b 100644 --- a/spectrum_manager/src/server.cpp +++ b/spectrum_manager/src/server.cpp @@ -75,7 +75,7 @@ Server::Server(ManagerConfig *config, const std::string &config_file) { std::cerr << "Error creating server: " << error_string << "\n"; exit(1); } - +#ifdef MG_ENABLE_SSL if (!CONFIG_STRING(m_config, "service.cert").empty()) { const char *err_str = mg_set_ssl(m_nc, CONFIG_STRING(m_config, "service.cert").c_str(), NULL); if (err_str) { @@ -83,6 +83,7 @@ Server::Server(ManagerConfig *config, const std::string &config_file) { exit(1); } } +#endif mg_set_protocol_http_websocket(m_nc); s_http_server_opts.document_root = CONFIG_STRING(m_config, "service.data_dir").c_str();