Changeset c327ce5 in nscp


Ignore:
Timestamp:
07/17/12 15:37:04 (10 months ago)
Author:
Michael Medin <michael@…>
Branches:
master, 0.4.1, 0.4.2
Children:
d6194a0
Parents:
53be5c8
Message:
  • Performance enhancements to build time
Files:
2 added
1 deleted
23 edited

Legend:

Unmodified
Added
Removed

  • build/cmake/GoogleProtoBuf.cmake

    r53be5c8 rc327ce5  
    4343   
    4444  ADD_CUSTOM_COMMAND( 
    45   OUTPUT ${${VAR}} ${INCL}  ${PROJECT_BINARY_DIR}/scripts/python/lib/${FIL_WE}_pb2.py 
     45  OUTPUT ${${VAR}} ${INCL} ${PROJECT_BINARY_DIR}/scripts/python/lib/${FIL_WE}_pb2.py 
    4646  COMMAND  ${PROTOBUF_PROTOC_EXECUTABLE} 
    4747  ARGS ${ARGS} 

  • build/cmake/functions.cmake

    ra48fd4c rc327ce5  
    3030  #message(STATUS " - Copying ${source_file} to ${target_file}...") 
    3131  ADD_CUSTOM_COMMAND( 
    32     TARGET ${target} 
    33     PRE_BUILD 
    3432    OUTPUT ${target_file} 
    35     COMMAND cmake  
    36     ARGS -E copy "${source_file}" "${target_file}" 
     33    COMMAND cmake ARGS -E copy "${source_file}" "${target_file}" 
    3734    OUTPUT ${target_file} 
    3835    COMMENT Copying ${source_file} to ${target_file} 
     36    DEPENDS ${source_file} 
    3937    ) 
    40   SET(ALL_FILES ${ALL_FILES} ${target_file}) 
     38  LIST(APPEND ALL_FILES ${target_file}) 
    4139ENDMACRO(copy_single_file) 
    4240 

  • changelog

    r53be5c8 rc327ce5  
    44 * Fix dependonservice LanManWorkStation (old win) 
    55 * Fix RtlStringFromGUID problem on NT4 
     6 
     72012-07-17 MickeM 
     8 * Performance enhancements to build time 
    69 
    7102012-07-11 MickeM 

  • docs/CMakeLists.txt

    ra48fd4c rc327ce5  
    55copy_single_file(copy_docs "NSClient++ Reference Manual.pdf" docs) 
    66 
    7 ADD_CUSTOM_TARGET(copy_docs ALL) 
     7ADD_CUSTOM_TARGET(copy_docs DEPENDS ${ALL_FILES}) 
    88SET_TARGET_PROPERTIES(copy_docs PROPERTIES FOLDER "files") 
    99#INSTALL(CODE "FILE(INSTALL DESTINATION \${CMAKE_INSTALL_PREFIX}/${destDir} TYPE EXECUTABLE FILES \"${source_file}\")") 

  • files/CMakeLists.txt

    ra48fd4c rc327ce5  
    11cmake_minimum_required(VERSION 2.6) 
    22 
     3SET(ALL_FILES) 
    34copy_single_file(copy_files license.txt .) 
    45copy_single_file(copy_files nrpe_dh_512.pem security) 
    56copy_single_file(copy_files old-settings.map .) 
    67copy_single_file(copy_files counters.defs .) 
     8copy_single_file(copy_files nsclient.dist .) 
    79copy_single_file(copy_files ../changelog .) 
    810 
    9 ADD_CUSTOM_TARGET(copy_files ALL) 
     11ADD_CUSTOM_TARGET(copy_files DEPENDS ${ALL_FILES}) 
    1012SET_TARGET_PROPERTIES(copy_files PROPERTIES FOLDER "files") 

  • helpers/installers/installer/CMakeLists.txt

    r04ef932 rc327ce5  
    1616# WixUI.wixlib 
    1717SET(DEPENDENCIES 
    18   nscp 
    1918  main_dll 
    20    
    21   check_60s.bat_scripts 
    22   check_battery.vbs_scripts 
    23   check_files.vbs_scripts 
    24   check_long.bat_scripts 
    25   check_no_rdp.bat_scripts 
    26   check_ok.bat_scripts 
    27   check_ping.bat_scripts 
    28   check_printer.vbs_scripts 
    29   check_test.bat_scripts 
    30   check_test.ps1_scripts 
    31   check_test.vbs_scripts 
    32   check_updates.vbs_scripts 
    33   powershell.ps1_scripts 
    34    
    35   "NagiosPlugins.vbs_script lib" 
    36   "wrapper.vbs_script lib" 
    37  
    38   "test.py.vbs_script lib" 
    39   "test_second.py.vbs_script lib" 
    40    
    41   counters.defs_files 
    42   license.txt_files 
    43   nrpe_dh_512.pem_files 
    44   old-settings.map_files 
    45   changelog_files 
    46    
    47   "Nagios Usage Guide.pdf_docs" 
    48   "NSClient++ Reference Manual.pdf_docs" 
    4919) 
    5020#GET_FILENAME_COMPONENT(_tmp_FILE WixUI_en-us.wxl ABSOLUTE) 
    … …  
    6434ADD_WIX_INSTALLER(${ALIAS} "${SRCS}" "${DEPENDENCIES}" "${LOCALIZATIONS}") 
    6535 
    66 ADD_DEPENDENCIES(${TARGET} ${MAIN_NSCP_TARGET} ${ALL_MODULE_NAMES} ${ALL_TOOL_NAMES} ${ALL_INSTALLERS_DLLS_NAMES}) 
     36ADD_DEPENDENCIES(${TARGET} ${MAIN_NSCP_TARGET} ${ALL_MODULE_NAMES} ${ALL_TOOL_NAMES} ${ALL_INSTALLERS_DLLS_NAMES} copy_files copy_docs copy_scripts) 
    6737 
    6838SET_TARGET_PROPERTIES(${TARGET} PROPERTIES FOLDER "installers") 

  • include/nsca/client/nsca_client_protocol.hpp

    rc3f233d rc327ce5  
    2727      std::vector<char> packet_buffer_; 
    2828      boost::shared_ptr<client_handler> handler_; 
    29       nsca_encrypt crypto_; 
     29      nscp::encryption::engine crypto_; 
    3030      int time_; 
    3131      nsca::packet packet_; 

  • include/nsca/nsca_packet.hpp

    raf05fa1 rc327ce5  
    55#include <types.hpp> 
    66#include <swap_bytes.hpp> 
    7 #include <nsca/nsca_enrypt.hpp> 
     7#include <cryptopp/cryptopp.hpp> 
    88 
    99#include <unicode_char.hpp> 

  • include/nsca/server/parser.hpp

    ra48fd4c rc327ce5  
    55 
    66#include <nsca/nsca_packet.hpp> 
    7 #include <nsca/nsca_enrypt.hpp> 
     7#include <cryptopp/cryptopp.hpp> 
    88 
    99#include "handler.hpp" 
    … …  
    3131      } 
    3232 
    33       void decrypt(nsca::nsca_encrypt &encryption) { 
     33      void decrypt(nscp::encryption::engine &encryption) { 
    3434        encryption.decrypt_buffer(buffer_); 
    3535      } 

  • include/nsca/server/protocol.hpp

    ra48fd4c rc327ce5  
    3838     
    3939    std::string data_; 
    40     nsca::nsca_encrypt encryption_instance_; 
     40    nscp::encryption::engine encryption_instance_; 
    4141 
    4242    read_protocol(socket_helpers::connection_info info, handler_type handler)  
    … …  
    7070      std::vector<boost::asio::const_buffer> buffers; 
    7171 
    72       std::string iv = nsca::nsca_encrypt::generate_transmitted_iv(); 
     72      std::string iv = nscp::encryption::engine::generate_transmitted_iv(); 
    7373      encryption_instance_.encrypt_init(handler_->get_password(), handler_->get_encryption(), iv); 
    7474 
    … …  
    108108          } catch (const std::exception &e) { 
    109109            log_error(__FILE__, __LINE__, std::string("Exception processing request: ") + e.what()); 
    110             log_debug(__FILE__, __LINE__, "Using: encryption = " + nsca::nsca_encrypt::helpers::encryption_to_string(handler_->get_encryption()) + ", password = '" + handler_->get_password() + "'"); 
     110            log_debug(__FILE__, __LINE__, "Using: encryption = " + nscp::encryption::helpers::encryption_to_string(handler_->get_encryption()) + ", password = '" + handler_->get_password() + "'"); 
    111111          } catch (...) { 
    112112            log_error(__FILE__, __LINE__, "Exception processing request"); 

  • libs/cryptopp/CMakeLists.txt

    rd66ccee rc327ce5  
    1818 
    1919IF (HAVE_CRYPTOPP) 
    20   FILE (GLOB cryptopp_SOURCES "${CRYPTOPP_SOURCE_DIR}/*.cpp") 
    21   FILE (GLOB cryptopp_HEADERS "${CRYPTOPP_SOURCE_DIR}/*.h") 
     20  LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/des.cpp) 
     21  LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/rijndael.cpp) 
     22  LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/cast.cpp) 
     23  LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/tea.cpp) 
     24  LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/3way.cpp) 
     25  LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/blowfish.cpp) 
     26  LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/twofish.cpp) 
     27  LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/rc2.cpp) 
     28  LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/arc4.cpp) 
     29  LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/serpent.cpp) 
     30  LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/gost.cpp) 
     31   
     32  LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/filters.cpp) 
     33  LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/osrng.cpp) 
     34  LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/modes.cpp) 
     35  LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/cryptlib.cpp) 
     36  LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/misc.cpp) 
     37   
     38  LIST(APPEND cryptopp_SOURCES cryptopp.cpp) 
     39  IF (WIN32) 
     40    LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/des.h) 
     41    LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/aes.h) 
     42    LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/cast.h) 
     43    LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/tea.h) 
     44    LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/3way.h) 
     45    LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/blowfish.h) 
     46    LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/twofish.h) 
     47    LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/rc2.h) 
     48    LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/arc4.h) 
     49    LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/serpent.h) 
     50    LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/gost.h) 
     51     
     52    LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/filters.h) 
     53    LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/osrng.h) 
     54    LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/modes.h) 
     55    LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/cryptlib.h) 
     56    LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/misc.h) 
     57     
     58    LIST(APPEND cryptopp_SOURCES ${NSCP_INCLUDEDIR}/cryptopp/cryptopp.hpp) 
     59  ENDIF (WIN32) 
    2260  message(STATUS "Using Crypto++ from ${CRYPTOPP_SOURCE_DIR}") 
    2361  IF (MSVC) 
    … …  
    3977  #endif(CMAKE_ASM_MASM_COMPILER_WORKS) 
    4078  IF (WIN32) 
    41     ADD_DEFINITIONS (-DCRYPTOPP_DISABLE_ASM) 
    42     SET(Cryptopp_DEFINES -DCRYPTOPP_DISABLE_ASM) 
     79    ADD_DEFINITIONS (-DCRYPTOPP_DISABLE_ASM -DUNICODE  -D_UNICODE) 
    4380  ENDIF (WIN32) 
     81   
     82  INCLUDE_DIRECTORIES(${NSCP_INCLUDEDIR}) 
    4483 
    45   ADD_LIBRARY (cryptopp SHARED ${cryptopp_SOURCES}) 
    46   SET_TARGET_PROPERTIES(cryptopp PROPERTIES FOLDER "libraries") 
     84  #ADD_LIBRARY (cryptopp SHARED ${cryptopp_SOURCES}) 
     85  #SET_TARGET_PROPERTIES(cryptopp PROPERTIES FOLDER "libraries") 
    4786  #IF(NOT WIN32) 
    4887  ADD_LIBRARY(cryptopp_static STATIC  ${cryptopp_SOURCES}) 
    … …  
    5392 
    5493  IF (WIN32) 
    55     TARGET_LINK_LIBRARIES (cryptopp Ws2_32.lib) 
     94    #TARGET_LINK_LIBRARIES (cryptopp Ws2_32.lib) 
    5695    TARGET_LINK_LIBRARIES (cryptopp_static Ws2_32.lib) 
    5796    # We cannot build static versions of this in windows for some reason 
    5897  ENDIF (WIN32) 
    5998 
    60   #IF (WIN32) 
    61     #INSTALL (TARGETS cryptopp  
    62     # RUNTIME DESTINATION bin 
    63     # LIBRARY DESTINATION bin 
    64     # ARCHIVE DESTINATION bin 
    65     # ) 
    66   #ELSE (WIN32) 
    67     #INSTALL  (TARGETS cryptopp cryptopp_static 
    68     # RUNTIME DESTINATION bin 
    69     # LIBRARY DESTINATION bin 
    70     # ARCHIVE DESTINATION bin 
    71     #) 
    72   #ENDIF (WIN32) 
    73  
    7499  IF(APPLE) 
    75      SET_TARGET_PROPERTIES(cryptopp PROPERTIES COMPILE_FLAGS "-fPIC -w -DOSX  -DNDEBUG -finline-functions -O3 -DCRYPTOPP_DISABLE_ASM") 
     100     #SET_TARGET_PROPERTIES(cryptopp PROPERTIES COMPILE_FLAGS "-fPIC -w -DOSX  -DNDEBUG -finline-functions -O3 -DCRYPTOPP_DISABLE_ASM") 
    76101     SET_TARGET_PROPERTIES(cryptopp_static PROPERTIES COMPILE_FLAGS "-w -DOSX  -DNDEBUG -finline-functions -O3 -DCRYPTOPP_DISABLE_ASM") 
    77102  ELSEIF(UNIX AND NOT APPLE) 
    78     SET_TARGET_PROPERTIES(cryptopp PROPERTIES COMPILE_FLAGS "-fPIC -w -pipe -DNDEBUG -DLINUX -finline-functions -O3") 
     103    #SET_TARGET_PROPERTIES(cryptopp PROPERTIES COMPILE_FLAGS "-fPIC -w -pipe -DNDEBUG -DLINUX -finline-functions -O3") 
    79104    SET_TARGET_PROPERTIES(cryptopp_static PROPERTIES COMPILE_FLAGS " -w -pipe -DNDEBUG -DLINUX -finline-functions -O3") 
    80105  ELSEIF(WIN32) 
    81106    IF(NOT MSVC) 
    82     SET_TARGET_PROPERTIES(cryptopp PROPERTIES COMPILE_FLAGS "-mthreads -w -finline-functions -O3 -DNDEBUG -D__MINGW__ -DWIN32 -D_WIN32_WINNT=0x0501 -D_WIN32") 
     107    #SET_TARGET_PROPERTIES(cryptopp PROPERTIES COMPILE_FLAGS "-mthreads -w -finline-functions -O3 -DNDEBUG -D__MINGW__ -DWIN32 -D_WIN32_WINNT=0x0501 -D_WIN32") 
    83108    SET_TARGET_PROPERTIES(cryptopp_static PROPERTIES COMPILE_FLAGS "-mthreads -w -finline-functions -O3 -DNDEBUG -D__MINGW__ -DWIN32 -D_WIN32_WINNT=0x0501 -D_WIN32") 
    84109    ENDIF(NOT MSVC) 

  • libs/lua_pb/CMakeLists.txt

    r53be5c8 rc327ce5  
    1919    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Oi") 
    2020  ENDIF (MSVC) 
     21 
     22  SET_SOURCE_FILES_PROPERTIES(${lua_pb_SOURCES} PROPERTIES GENERATED TRUE) 
    2123 
    2224 

  • modules/GraphiteClient/GraphiteClient.h

    ra48fd4c rc327ce5  
    131131  */ 
    132132  static std::wstring getModuleName() { 
    133 #ifdef HAVE_LIBCRYPTOPP 
    134     return _T("NSCAClient"); 
    135 #else 
    136     return _T("NSCAClient (without encryption support)"); 
    137 #endif 
     133    return _T("GraphiteClient"); 
    138134  } 
    139135  /** 
    … …  
    167163  void add_target(std::wstring key, std::wstring args); 
    168164 
    169   static std::wstring getCryptos(); 
    170165  void set_delay(std::wstring key) { 
    171166    time_delta_ = strEx::stol_as_time_sec(key, 1); 

  • modules/LUAScript/script_wrapper.hpp

    r53be5c8 rc327ce5  
    1313 
    1414#ifdef HAVE_LUA_PB 
    15 #include <Plugin.pb-lua.h> 
     15#include <plugin.pb-lua.h> 
    1616#endif 
    1717namespace script_wrapper { 

  • modules/NSCAClient/CMakeLists.txt

    rc3f233d rc327ce5  
    3232    ${NSCP_INCLUDEDIR}/nsca/nsca_packet.hpp 
    3333    ${NSCP_INCLUDEDIR}/nsca/client/nsca_client_protocol.hpp 
    34     ${NSCP_INCLUDEDIR}/nsca/nsca_enrypt.hpp 
     34    ${NSCP_INCLUDEDIR}/cryptopp/cryptopp.hpp 
    3535    ${NSCP_INCLUDEDIR}/swap_bytes.hpp 
    3636    ${NSCP_INCLUDEDIR}/socket/socket_helpers.hpp 

  • modules/NSCAClient/NSCAClient.cpp

    rc6a974c rc327ce5  
    2525#include <strEx.h> 
    2626 
    27 #include <nsca/nsca_enrypt.hpp> 
     27#include <cryptopp/cryptopp.hpp> 
    2828#include <nsca/nsca_packet.hpp> 
    2929 
    … …  
    143143} 
    144144 
    145 std::wstring NSCAAgent::getCryptos() { 
    146   std::wstring ret = _T("{"); 
    147   for (int i=0;i<LAST_ENCRYPTION_ID;i++) { 
    148     if (nsca::nsca_encrypt::hasEncryption(i)) { 
    149       std::wstring name; 
    150       try { 
    151         boost::shared_ptr<nsca::nsca_encrypt::any_encryption> core(nsca::nsca_encrypt::get_encryption_core(i)); 
    152         if (core == NULL) 
    153           name = _T("Broken<NULL>"); 
    154         else 
    155           name = utf8::to_unicode(core->getName()); 
    156       } catch (nsca::nsca_encrypt::encryption_exception &e) { 
    157         name = utf8::to_unicode(e.what()); 
    158       } 
    159       if (ret.size() > 1) 
    160         ret += _T(", "); 
    161       ret += strEx::itos(i) + _T("=") + name; 
    162     } 
    163   } 
    164   return ret + _T("}"); 
    165 } 
    166  
    167145std::string get_command(std::string alias, std::string command = "") { 
    168146  if (!alias.empty()) 
    … …  
    423401    client.shutdown(); 
    424402    return boost::make_tuple(NSCAPI::returnUNKNOWN, _T("")); 
    425   } catch (const nsca::nsca_encrypt::encryption_exception &e) { 
     403  } catch (const nscp::encryption::encryption_exception &e) { 
    426404    NSC_LOG_ERROR_STD(_T("NSCA Error: ") + utf8::to_unicode(e.what())); 
    427405    return boost::make_tuple(NSCAPI::returnUNKNOWN, _T("NSCA error: ") + utf8::to_unicode(e.what())); 

  • modules/NSCAClient/NSCAClient.h

    r6090c98 rc327ce5  
    111111    } 
    112112    unsigned int get_encryption() { 
    113       return nsca::nsca_encrypt::helpers::encryption_to_int(encryption); 
     113      return nscp::encryption::helpers::encryption_to_int(encryption); 
    114114    } 
    115115 
    … …  
    175175  } 
    176176  static std::wstring getModuleDescription() { 
    177     return std::wstring(_T("Passive check support over NSCA.\nAvalible crypto are: ")) + getCryptos(); 
     177    return std::wstring(_T("Passive check support over NSCA.")); 
    178178  } 
    179179 
    … …  
    196196  void add_target(std::wstring key, std::wstring args); 
    197197 
    198   static std::wstring getCryptos(); 
    199198  void set_delay(std::wstring key) { 
    200199    time_delta_ = strEx::stol_as_time_sec(key, 1); 

  • modules/NSCAServer/CMakeLists.txt

    r9bd40e2 rc327ce5  
    4343    ${NSCP_INCLUDEDIR}/socket/server.hpp 
    4444    ${NSCP_INCLUDEDIR}/socket/connection.hpp 
     45    ${NSCP_INCLUDEDIR}/cryptopp/cryptopp.hpp 
    4546 
    4647    ${NSCP_DEF_PLUGIN_HPP} 

  • modules/NSCAServer/NSCAServer.cpp

    ra48fd4c rc327ce5  
    137137} 
    138138 
    139  
    140 std::wstring NSCAServer::getCryptos() { 
    141   std::wstring ret = _T("{"); 
    142   for (int i=0;i<LAST_ENCRYPTION_ID;i++) { 
    143     if (nsca::nsca_encrypt::hasEncryption(i)) { 
    144       std::wstring name; 
    145       try { 
    146         nsca::nsca_encrypt::any_encryption *core = nsca::nsca_encrypt::get_encryption_core(i); 
    147         if (core == NULL) 
    148           name = _T("Broken<NULL>"); 
    149         else 
    150           name = str::to_wstring(core->getName()); 
    151       } catch (nsca::nsca_encrypt::encryption_exception &e) { 
    152         name = str::to_wstring(e.what()); 
    153       } 
    154       if (ret.size() > 1) 
    155         ret += _T(", "); 
    156       ret += strEx::itos(i) + _T("=") + name; 
    157     } 
    158   } 
    159   return ret + _T("}"); 
    160 } 
    161  
    162  
    163139NSC_WRAP_DLL() 
    164140NSC_WRAPPERS_MAIN_DEF(NSCAServer) 

  • modules/NSCAServer/NSCAServer.h

    ra48fd4c rc327ce5  
    5050  } 
    5151  static std::wstring getModuleDescription() { 
    52     return _T("A simple server that listens for incoming NSCA connection and handles them.\nAvalible crypto are: ") + getCryptos(); 
     52    return _T("A simple server that listens for incoming NSCA connection and handles them."); 
    5353  } 
    54  
    55   static std::wstring getCryptos(); 
    5654 
    5755  boost::shared_ptr<nsca::server::server> server_; 

  • modules/NSCAServer/handler_impl.hpp

    ra48fd4c rc327ce5  
    44 
    55#include <nsca/nsca_packet.hpp> 
    6 #include <nsca/nsca_enrypt.hpp> 
     6#include <cryptopp/cryptopp.hpp> 
    77#include <nsca/server/handler.hpp> 
    88 
    … …  
    3838  } 
    3939  void set_encryption(std::string enc) { 
    40     encryption_ = nsca::nsca_encrypt::helpers::encryption_to_int(enc); 
     40    encryption_ = nscp::encryption::helpers::encryption_to_int(enc); 
    4141  } 
    4242  int get_encryption() { 

  • scripts/CMakeLists.txt

    ra48fd4c rc327ce5  
    3636  STRING(REPLACE "/" "_" alias "${relpath}") 
    3737  STRING(REPLACE "." "_" alias "${alias}") 
    38   #MESSAGE(STATUS " + python - ${filename} - ${relpath} - ${alias}") 
     38  MESSAGE(STATUS " + python - ${filename} - ${relpath} - ${alias}") 
    3939  copy_single_file(copy_scripts ${relpath}/${filename} scripts/${relpath}) 
    4040ENDFOREACH(file ${scripts_PYT}) 
    … …  
    4646ENDFOREACH(file ${scripts_LUA}) 
    4747 
    48 ADD_CUSTOM_TARGET(copy_scripts ALL) 
     48ADD_CUSTOM_TARGET(copy_scripts DEPENDS ${ALL_FILES}) 
    4949SET_TARGET_PROPERTIES(copy_scripts PROPERTIES FOLDER "files") 
    5050#INSTALL(CODE "FILE(INSTALL DESTINATION \${CMAKE_INSTALL_PREFIX}/${destDir} TYPE EXECUTABLE FILES \"${source_file}\")") 

  • version.txt

    r6090c98 rc327ce5  
    11version=0.4.1 
    2 build=4 
    3 date=2012-06-17 
     2build=21 
     3date=2012-07-15 
Note: See TracChangeset for help on using the changeset viewer.