Changeset d6194a0 in nscp

Timestamp:

07/27/12 07:06:17 (10 months ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.1, 0.4.2

Children:

724a835

Parents:

c327ce5

Message:

• Fixed some memoryelaks in LUAModule
• Extracted the test functions into a library
• Added lib folder as search path for lua scripts
• Tweaks and improvments all around
• Improved the build scripts a lot making files work on linux (still need to manually build the targets though)
• Added support for LUAScripts to linux enviornments (still a few warnings to sort out)
• Improved lua unit test scripts
• Added support for using member functions as handlers in Lua scripts

Files:

• CMakeLists.txt (modified) (1 diff)
• build/cmake/GoogleProtoBuf.cmake (modified) (1 diff)
• build/cmake/functions.cmake (modified) (3 diffs)
• changelog (modified) (1 diff)
• files/CMakeLists.txt (modified) (1 diff)
• files/nsclient.dist (added)
• helpers/installer-dlls/main_dll/main_dll.cpp (modified) (1 diff)
• include/nrpe/packet.hpp (modified) (1 diff)
• include/nsca/client/nsca_client_protocol.hpp (modified) (1 diff)
• include/nsclient/base_logger_impl.hpp (modified) (1 diff)
• include/settings/client/settings_client.hpp (modified) (2 diffs)
• include/socket/client.hpp (modified) (1 diff)
• libs/cryptopp/CMakeLists.txt (modified) (5 diffs)
• libs/lua/CMakeLists.txt (modified) (1 diff)
• libs/lua_pb/CMakeLists.txt (modified) (2 diffs)
• modules/LUAScript/CMakeLists.txt (modified) (1 diff)
• modules/LUAScript/LUAScript.cpp (modified) (7 diffs)
• modules/LUAScript/LUAScript.h (modified) (1 diff)
• modules/LUAScript/lua_wrappers.cpp (modified) (6 diffs)
• modules/LUAScript/lua_wrappers.hpp (modified) (18 diffs)
• modules/LUAScript/script_wrapper.hpp (modified) (20 diffs)
• modules/NRPEClient/NRPEClient.cpp (modified) (2 diffs)
• scripts/CMakeLists.txt (modified) (4 diffs)
• scripts/lua/lib/test_helper.lua (added)
• scripts/lua/test_nrpe.lua (modified) (8 diffs)
• service/NSClient++.cpp (modified) (2 diffs)
• service/NSClient++.h (modified) (1 diff)
• service/cli_parser.hpp (modified) (4 diffs)
• service/logger_impl.cpp (modified) (4 diffs)

CMakeLists.txt

@@ -57 +57 @@
   ${LUA_DIR}/src
   /usr/include/lua
-)
+  /usr/include/lua5.1
+)
+FIND_PROGRAM(PROTOC_GEN_LUA_FOUND
+  NAMES protoc-gen-lua
+  PATHS 
+    /usr/local/bin/
+    /usr/bin/
+)
+
 IF (LUA_INCLUE_DIR)
   message(STATUS "Found lua in ${LUA_INCLUE_DIR}")
-  SET(HAVE_LUA TRUE PARENT_SCOPE)
   SET(HAVE_LUA TRUE)
   SET(LUA_SOURCE_DIR ${LUA_INCLUE_DIR})

build/cmake/GoogleProtoBuf.cmake

@@ -38 +38 @@
   LIST(APPEND ARGS --python_out ${PROJECT_BINARY_DIR}/scripts/python/lib)
   IF(PROTOC_GEN_LUA_FOUND)
-  SET(PROTOC_GEN_LUA_EXTRA --plugin=protoc-gen-lua=${PROTOC_GEN_LUA_CMD})
+  IF(PROTOC_GEN_LUA_CMD)
+    SET(PROTOC_GEN_LUA_EXTRA --plugin=protoc-gen-lua=${PROTOC_GEN_LUA_CMD})
+  ENDIF(PROTOC_GEN_LUA_CMD)
   LIST(APPEND ARGS --lua_out ${PROJECT_BINARY_DIR}/libs/lua_pb ${PROTOC_GEN_LUA_EXTRA})
   ENDIF(PROTOC_GEN_LUA_FOUND)

build/cmake/functions.cmake

@@ -20 +20 @@
 
 
-MACRO(copy_single_file target, src destDir)
+MACRO(copy_single_file _TARGET_LIST src destDir)
   GET_FILENAME_COMPONENT(TARGET ${src} NAME)
   SET(source_file ${CMAKE_CURRENT_SOURCE_DIR}/${src})
@@ -28 +28 @@
     SET(target_file ${CMAKE_BINARY_DIR}/${destDir}/${TARGET})
   ENDIF(${destDir} STREQUAL ".")
-  #message(STATUS " - Copying ${source_file} to ${target_file}...")
+  message(STATUS " - Copying ${source_file} to ${target_file}...")
   ADD_CUSTOM_COMMAND(
     OUTPUT ${target_file}
@@ -36 +36 @@
     DEPENDS ${source_file}
     )
-  LIST(APPEND ALL_FILES ${target_file})
+  SET(${_TARGET_LIST} ${${_TARGET_LIST}} ${target_file})
 ENDMACRO(copy_single_file)
 

changelog

@@ -4 +4 @@
  * Fix dependonservice LanManWorkStation (old win)
  * Fix RtlStringFromGUID problem on NT4
+
+2012-07-26 MickeM
+ * Fixed some memoryelaks in LUAModule
+ * Extracted the test functions into a library
+ * Added lib folder as search path for lua scripts
+ * Tweaks and improvments all around
+ * Improved the build scripts a lot making files work on linux (still need to manually build the targets though)
+
+2012-07-23 MickeM
+ * Added support for LUAScripts to linux enviornments (still a few warnings to sort out)
+ * Improved lua unit test scripts
+ * Added support for using member functions as handlers in Lua scripts
 
 2012-07-17 MickeM

files/CMakeLists.txt

@@ -2 +2 @@
 
 SET(ALL_FILES)
-copy_single_file(copy_files license.txt .)
-copy_single_file(copy_files nrpe_dh_512.pem security)
-copy_single_file(copy_files old-settings.map .)
-copy_single_file(copy_files counters.defs .)
-copy_single_file(copy_files nsclient.dist .)
-copy_single_file(copy_files ../changelog .)
+copy_single_file(ALL_FILES license.txt .)
+copy_single_file(ALL_FILES nrpe_dh_512.pem security)
+copy_single_file(ALL_FILES old-settings.map .)
+copy_single_file(ALL_FILES counters.defs .)
+copy_single_file(ALL_FILES nsclient.dist .)
+copy_single_file(ALL_FILES ../changelog .)
 
 ADD_CUSTOM_TARGET(copy_files DEPENDS ${ALL_FILES})

helpers/installer-dlls/main_dll/main_dll.cpp

@@ -46 +46 @@
 
 
-  void do_log(const std::string &data) {
+  void do_log(const std::string data) {
     std::wstring str = utf8::cvt<std::wstring>(data);
     if (str.empty())

include/nrpe/packet.hpp

@@ -172 +172 @@
       unsigned int packet_length = nrpe::length::get_packet_length(payload_length_);
       tmpBuffer = new char[packet_length+1];
+      memset(tmpBuffer, 0, packet_length+1);
       //TODO readd this ZeroMemory(tmpBuffer, getBufferLength()+1);
       nrpe::data::packet *p = reinterpret_cast<nrpe::data::packet*>(tmpBuffer);

include/nsca/client/nsca_client_protocol.hpp

@@ -37 +37 @@
         sent_request,
         has_request,
-        done,
+        done
       };
       state current_state_;

include/nsclient/base_logger_impl.hpp

@@ -66 +66 @@
       }
 
-      virtual void do_log(const std::string &data) = 0;
+      virtual void do_log(const std::string data) = 0;
       virtual void configure() = 0;
       virtual bool shutdown() {

include/settings/client/settings_client.hpp

@@ -513 +513 @@
       settings_keys_easy_init(std::wstring path, settings_registry* owner_) : owner(owner_), path_(path) {}
       settings_keys_easy_init(std::wstring path, std::wstring parent, settings_registry* owner_) : owner(owner_), path_(path), parent_(parent) {}
+      virtual ~settings_keys_easy_init() {}
 
       settings_keys_easy_init& operator()(std::wstring path, std::wstring key_name, boost::shared_ptr<key_interface> value, std::wstring title, std::wstring description, bool advanced = false) {
@@ -643 +644 @@
     public:
       settings_registry(settings_impl_interface_ptr core) : core_(core) {}
+      virtual ~settings_registry() {}
       void add(boost::shared_ptr<key_info> info) {
         keys_.push_back(info);

include/socket/client.hpp

@@ -350 +350 @@
         , dh_key_(dh_key)
       {}
+      virtual ~client_handler() {}
 
       bool use_ssl() { return ssl_; }

libs/cryptopp/CMakeLists.txt

@@ -2 +2 @@
 
 IF (HAVE_CRYPTOPP)
-  message(STATUS "Found CACHED Crypto++ in ${CRYPTOPP_SOURCE_DIR}")
+  MESSAGE(STATUS "Found CACHED Crypto++ in ${CRYPTOPP_SOURCE_DIR}")
 ELSE (HAVE_CRYPTOPP)
   FIND_PATH(CRYPTOPP_SOURCE_DIR cryptlib.h ${CRYPTOPP_DIR})
   
   IF (CRYPTOPP_SOURCE_DIR)
-    message(STATUS "Found Crypto++ in ${CRYPTOPP_SOURCE_DIR}")
+    MESSAGE(STATUS "Found Crypto++ in ${CRYPTOPP_SOURCE_DIR}")
     SET(HAVE_CRYPTOPP TRUE PARENT_SCOPE)
     SET(HAVE_CRYPTOPP TRUE)
   ELSE (CRYPTOPP_SOURCE_DIR)
-    message(STATUS "Crypto++ was not found in ${CRYPTOPP_SOURCE_DIR} (CRYPTOPP_SOURCE_DIR)")
+    MESSAGE(STATUS "Crypto++ was not found in ${CRYPTOPP_SOURCE_DIR} (CRYPTOPP_SOURCE_DIR)")
   ENDIF (CRYPTOPP_SOURCE_DIR)
 
 ENDIF (HAVE_CRYPTOPP)
 
+SET(CRYPTOS des rijndael cast tea 3way blowfish twofish rc2 arc4 serpent gost )
 
 IF (HAVE_CRYPTOPP)
-  LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/des.cpp)
-  LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/rijndael.cpp)
-  LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/cast.cpp)
-  LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/tea.cpp)
-  LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/3way.cpp)
-  LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/blowfish.cpp)
-  LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/twofish.cpp)
-  LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/rc2.cpp)
-  LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/arc4.cpp)
-  LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/serpent.cpp)
-  LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/gost.cpp)
-  
+
+  FOREACH(CRYPTO ${CRYPTOS})
+    LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/${CRYPTO}.cpp)
+    IF (WIN32)
+      LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/${CRYPTO}.h)
+    ENDIF (WIN32)
+  ENDFOREACH(CRYPTO ${CRYPTOS})
+
+
   LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/filters.cpp)
   LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/osrng.cpp)
@@ -35 +33 @@
   LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/cryptlib.cpp)
   LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/misc.cpp)
-  
   LIST(APPEND cryptopp_SOURCES cryptopp.cpp)
+
   IF (WIN32)
-    LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/des.h)
-    LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/aes.h)
-    LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/cast.h)
-    LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/tea.h)
-    LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/3way.h)
-    LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/blowfish.h)
-    LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/twofish.h)
-    LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/rc2.h)
-    LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/arc4.h)
-    LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/serpent.h)
-    LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/gost.h)
-    
     LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/filters.h)
     LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/osrng.h)
@@ -55 +41 @@
     LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/cryptlib.h)
     LIST(APPEND cryptopp_SOURCES ${CRYPTOPP_SOURCE_DIR}/misc.h)
-    
     LIST(APPEND cryptopp_SOURCES ${NSCP_INCLUDEDIR}/cryptopp/cryptopp.hpp)
+
   ENDIF (WIN32)
-  message(STATUS "Using Crypto++ from ${CRYPTOPP_SOURCE_DIR}")
   IF (MSVC)
-  # ADD_DEFINITIONS (-DCRYPTOPP_GENERATE_X64_MASM)
-  # ADD_DEFINITIONS (-DCRYPTOPP_DISABLE_ASM)
-  # ADD_DEFINITIONS (-DNDEBUG)
+    # ADD_DEFINITIONS (-DCRYPTOPP_GENERATE_X64_MASM)
+    # ADD_DEFINITIONS (-DCRYPTOPP_DISABLE_ASM)
+    # ADD_DEFINITIONS (-DNDEBUG)
     CMAKE_POLICY(SET CMP0008 NEW)
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Oi")
+      
+    IF(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
+      string(REGEX REPLACE "/W[0-4]" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+    ENDIF(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
   ENDIF (MSVC)
 
@@ -85 +74 @@
   #SET_TARGET_PROPERTIES(cryptopp PROPERTIES FOLDER "libraries")
   #IF(NOT WIN32)
+  MESSAGE(STATUS "===> ${CMAKE_CXX_FLAGS}")
   ADD_LIBRARY(cryptopp_static STATIC  ${cryptopp_SOURCES})
   SET_TARGET_PROPERTIES(cryptopp_static PROPERTIES FOLDER "libraries")
@@ -98 +88 @@
 
   IF(APPLE)
-     #SET_TARGET_PROPERTIES(cryptopp PROPERTIES COMPILE_FLAGS "-fPIC -w -DOSX  -DNDEBUG -finline-functions -O3 -DCRYPTOPP_DISABLE_ASM")
-     SET_TARGET_PROPERTIES(cryptopp_static PROPERTIES COMPILE_FLAGS "-w -DOSX  -DNDEBUG -finline-functions -O3 -DCRYPTOPP_DISABLE_ASM")
+    #SET_TARGET_PROPERTIES(cryptopp PROPERTIES COMPILE_FLAGS "-fPIC -w -DOSX  -DNDEBUG -finline-functions -O3 -DCRYPTOPP_DISABLE_ASM")
+    SET_TARGET_PROPERTIES(cryptopp_static PROPERTIES COMPILE_FLAGS "-w -DOSX  -DNDEBUG -finline-functions -O3 -DCRYPTOPP_DISABLE_ASM")
   ELSEIF(UNIX AND NOT APPLE)
-    #SET_TARGET_PROPERTIES(cryptopp PROPERTIES COMPILE_FLAGS "-fPIC -w -pipe -DNDEBUG -DLINUX -finline-functions -O3")
-    SET_TARGET_PROPERTIES(cryptopp_static PROPERTIES COMPILE_FLAGS " -w -pipe -DNDEBUG -DLINUX -finline-functions -O3")
+    #SET_TARGET_PROPERTIES(cryptopp PROPERTIES COMPILE_FLAGS "-fPIC -w -pipe -DNDEBUG -DLINUX -finline-functions -O3")
+    SET_TARGET_PROPERTIES(cryptopp_static PROPERTIES COMPILE_FLAGS " -w -pipe -DNDEBUG -DLINUX -finline-functions -O3")
   ELSEIF(WIN32)
-    IF(NOT MSVC)
-    #SET_TARGET_PROPERTIES(cryptopp PROPERTIES COMPILE_FLAGS "-mthreads -w -finline-functions -O3 -DNDEBUG -D__MINGW__ -DWIN32 -D_WIN32_WINNT=0x0501 -D_WIN32")
-    SET_TARGET_PROPERTIES(cryptopp_static PROPERTIES COMPILE_FLAGS "-mthreads -w -finline-functions -O3 -DNDEBUG -D__MINGW__ -DWIN32 -D_WIN32_WINNT=0x0501 -D_WIN32")
-    ENDIF(NOT MSVC)
+    IF(NOT MSVC)
+      #SET_TARGET_PROPERTIES(cryptopp PROPERTIES COMPILE_FLAGS "-mthreads -w -finline-functions -O3 -DNDEBUG -D__MINGW__ -DWIN32 -D_WIN32_WINNT=0x0501 -D_WIN32")
+      SET_TARGET_PROPERTIES(cryptopp_static PROPERTIES COMPILE_FLAGS "-mthreads -w -finline-functions -O3 -DNDEBUG -D__MINGW__ -DWIN32 -D_WIN32_WINNT=0x0501 -D_WIN32")
+    ENDIF(NOT MSVC)
   ENDIF(APPLE)
 ENDIF (HAVE_CRYPTOPP)

libs/lua/CMakeLists.txt

@@ -2 +2 @@
 
 IF (HAVE_LUA)
-  SET(LUA_SOURCE_DIR ${LUA_INCLUE_DIR})
-  #FILE (GLOB lua_SOURCES "${LUA_SOURCE_DIR}/*.c")
+
+
+  FIND_LIBRARY(LUA_LIB
+    NAMES liblua5.1 lua5.1 lua
+  )
+  IF(LUA_LIB)
+    MESSAGE(STATUS "Found existing LUA lib: ${LUA_LIB}")
+  ELSE(LUA_LIB)
+    FIND_PATH(LUA_SOURCE_DIR lapi.c
+      ${LUA_INCLUE_DIR}
+      ${LUA_INCLUE_DIR}/src
+      ${LUA_DIR}
+      ${LUA_DIR}/src
+    )
   
-  SET(lua_SOURCES
-    ${LUA_SOURCE_DIR}/lapi.c
-    ${LUA_SOURCE_DIR}/lauxlib.c
-    ${LUA_SOURCE_DIR}/lbaselib.c
-    ${LUA_SOURCE_DIR}/lcode.c
-    ${LUA_SOURCE_DIR}/ldblib.c
-    ${LUA_SOURCE_DIR}/ldebug.c
-    ${LUA_SOURCE_DIR}/ldo.c
-    ${LUA_SOURCE_DIR}/ldump.c
-    ${LUA_SOURCE_DIR}/lfunc.c
-    ${LUA_SOURCE_DIR}/lgc.c
-    ${LUA_SOURCE_DIR}/linit.c
-    ${LUA_SOURCE_DIR}/liolib.c
-    ${LUA_SOURCE_DIR}/llex.c
-    ${LUA_SOURCE_DIR}/lmathlib.c
-    ${LUA_SOURCE_DIR}/lmem.c
-    ${LUA_SOURCE_DIR}/loadlib.c
-    ${LUA_SOURCE_DIR}/lobject.c
-    ${LUA_SOURCE_DIR}/lopcodes.c
-    ${LUA_SOURCE_DIR}/loslib.c
-    ${LUA_SOURCE_DIR}/lparser.c
-    ${LUA_SOURCE_DIR}/lstate.c
-    ${LUA_SOURCE_DIR}/lstring.c
-    ${LUA_SOURCE_DIR}/lstrlib.c
-    ${LUA_SOURCE_DIR}/ltable.c
-    ${LUA_SOURCE_DIR}/ltablib.c
-    ${LUA_SOURCE_DIR}/ltm.c
-    ${LUA_SOURCE_DIR}/lundump.c
-    ${LUA_SOURCE_DIR}/lvm.c
-    ${LUA_SOURCE_DIR}/lzio.c
-  )
-  
-  FILE (GLOB lua_HEADERS "${LUA_SOURCE_DIR}/*.h")
-  IF (MSVC)
-    CMAKE_POLICY(SET CMP0008 NEW)
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Oi")
-  ENDIF (MSVC)
+    MESSAGE(STATUS "* * * * * NOT Found LUA sources (will build library): ${LUA_SOURCE_DIR}")
+    
+    SET(lua_SOURCES
+      ${LUA_SOURCE_DIR}/lapi.c
+      ${LUA_SOURCE_DIR}/lauxlib.c
+      ${LUA_SOURCE_DIR}/lbaselib.c
+      ${LUA_SOURCE_DIR}/lcode.c
+      ${LUA_SOURCE_DIR}/ldblib.c
+      ${LUA_SOURCE_DIR}/ldebug.c
+      ${LUA_SOURCE_DIR}/ldo.c
+      ${LUA_SOURCE_DIR}/ldump.c
+      ${LUA_SOURCE_DIR}/lfunc.c
+      ${LUA_SOURCE_DIR}/lgc.c
+      ${LUA_SOURCE_DIR}/linit.c
+      ${LUA_SOURCE_DIR}/liolib.c
+      ${LUA_SOURCE_DIR}/llex.c
+      ${LUA_SOURCE_DIR}/lmathlib.c
+      ${LUA_SOURCE_DIR}/lmem.c
+      ${LUA_SOURCE_DIR}/loadlib.c
+      ${LUA_SOURCE_DIR}/lobject.c
+      ${LUA_SOURCE_DIR}/lopcodes.c
+      ${LUA_SOURCE_DIR}/loslib.c
+      ${LUA_SOURCE_DIR}/lparser.c
+      ${LUA_SOURCE_DIR}/lstate.c
+      ${LUA_SOURCE_DIR}/lstring.c
+      ${LUA_SOURCE_DIR}/lstrlib.c
+      ${LUA_SOURCE_DIR}/ltable.c
+      ${LUA_SOURCE_DIR}/ltablib.c
+      ${LUA_SOURCE_DIR}/ltm.c
+      ${LUA_SOURCE_DIR}/lundump.c
+      ${LUA_SOURCE_DIR}/lvm.c
+      ${LUA_SOURCE_DIR}/lzio.c
+    )
+    
+    FILE (GLOB lua_HEADERS "${LUA_SOURCE_DIR}/*.h")
+    IF (MSVC)
+      CMAKE_POLICY(SET CMP0008 NEW)
+      SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Oi")
+    ENDIF (MSVC)
 
-  IF (WIN32)
-    ADD_DEFINITIONS (-DCRYPTOPP_DISABLE_ASM)
-    SET(lua_DEFINES -DCRYPTOPP_DISABLE_ASM)
-  ENDIF (WIN32)
+    IF (WIN32)
+      ADD_DEFINITIONS (-DCRYPTOPP_DISABLE_ASM)
+      SET(lua_DEFINES -DCRYPTOPP_DISABLE_ASM)
+    ENDIF (WIN32)
 
-  ADD_LIBRARY(lua SHARED ${lua_SOURCES})
-  SET_TARGET_PROPERTIES(lua PROPERTIES FOLDER "libraries")
-  ADD_LIBRARY(lua_static STATIC  ${lua_SOURCES})
-  SET_TARGET_PROPERTIES(lua_static PROPERTIES FOLDER "libraries")
+    ADD_LIBRARY(lua SHARED ${lua_SOURCES})
+    SET_TARGET_PROPERTIES(lua PROPERTIES FOLDER "libraries")
+    ADD_LIBRARY(lua_static STATIC  ${lua_SOURCES})
+    SET_TARGET_PROPERTIES(lua_static PROPERTIES FOLDER "libraries")
 
-  IF(APPLE)
-     SET_TARGET_PROPERTIES(lua PROPERTIES COMPILE_FLAGS "-fPIC -w -DOSX  -DNDEBUG -finline-functions -O3 -DCRYPTOPP_DISABLE_ASM")
-     SET_TARGET_PROPERTIES(lua_static PROPERTIES COMPILE_FLAGS "-w -DOSX  -DNDEBUG -finline-functions -O3 -DCRYPTOPP_DISABLE_ASM")
-  ELSEIF(UNIX AND NOT APPLE)
-    SET_TARGET_PROPERTIES(lua PROPERTIES COMPILE_FLAGS "-fPIC -w -pipe -DNDEBUG -DLINUX -finline-functions -O3")
-    SET_TARGET_PROPERTIES(lua_static PROPERTIES COMPILE_FLAGS " -w -pipe -DNDEBUG -DLINUX -finline-functions -O3")
-  ELSEIF(WIN32)
-    IF(NOT MSVC)
-    SET_TARGET_PROPERTIES(lua PROPERTIES COMPILE_FLAGS "-mthreads -w -finline-functions -O3 -DNDEBUG -D__MINGW__ -DWIN32 -D_WIN32_WINNT=0x0501 -D_WIN32")
-    SET_TARGET_PROPERTIES(lua_static PROPERTIES COMPILE_FLAGS "-mthreads -w -finline-functions -O3 -DNDEBUG -D__MINGW__ -DWIN32 -D_WIN32_WINNT=0x0501 -D_WIN32")
-    ENDIF(NOT MSVC)
-  ENDIF(APPLE)
+    IF(APPLE)
+       SET_TARGET_PROPERTIES(lua PROPERTIES COMPILE_FLAGS "-fPIC -w -DOSX  -DNDEBUG -finline-functions -O3 -DCRYPTOPP_DISABLE_ASM")
+       SET_TARGET_PROPERTIES(lua_static PROPERTIES COMPILE_FLAGS "-w -DOSX  -DNDEBUG -finline-functions -O3 -DCRYPTOPP_DISABLE_ASM")
+    ELSEIF(UNIX AND NOT APPLE)
+      SET_TARGET_PROPERTIES(lua PROPERTIES COMPILE_FLAGS "-fPIC -w -pipe -DNDEBUG -DLINUX -finline-functions -O3")
+      SET_TARGET_PROPERTIES(lua_static PROPERTIES COMPILE_FLAGS " -w -pipe -DNDEBUG -DLINUX -finline-functions -O3")
+    ELSEIF(WIN32)
+      IF(NOT MSVC)
+      SET_TARGET_PROPERTIES(lua PROPERTIES COMPILE_FLAGS "-mthreads -w -finline-functions -O3 -DNDEBUG -D__MINGW__ -DWIN32 -D_WIN32_WINNT=0x0501 -D_WIN32")
+      SET_TARGET_PROPERTIES(lua_static PROPERTIES COMPILE_FLAGS "-mthreads -w -finline-functions -O3 -DNDEBUG -D__MINGW__ -DWIN32 -D_WIN32_WINNT=0x0501 -D_WIN32")
+      ENDIF(NOT MSVC)
+    ENDIF(APPLE)
+    SET(LUA_LIB lua_static)
+    SET(LUA_LIB lua_static PARENT_SCOPE)
+  ENDIF(LUA_LIB)
 ENDIF (HAVE_LUA)

libs/lua_pb/CMakeLists.txt

@@ -31 +31 @@
     ${PROTOBUF_LIBRARY}
     protobuf
-    lua_static
+    ${LUA_LIB}
   )
   target_link_libraries(lua_pb_static
     ${PROTOBUF_LIBRARY}
     protobuf
-    lua_static
+    ${LUA_LIB}
   )
   
@@ -44 +44 @@
   ELSEIF(UNIX AND NOT APPLE)
     SET_TARGET_PROPERTIES(lua_pb PROPERTIES COMPILE_FLAGS "-fPIC -w -pipe -DNDEBUG -DLINUX -finline-functions -O3")
-    SET_TARGET_PROPERTIES(lua_pb_static PROPERTIES COMPILE_FLAGS " -w -pipe -DNDEBUG -DLINUX -finline-functions -O3")
+    SET_TARGET_PROPERTIES(lua_pb_static PROPERTIES COMPILE_FLAGS "-fPIC -w -pipe -DNDEBUG -DLINUX -finline-functions -O3")
   ELSEIF(WIN32)
     IF(NOT MSVC)

modules/LUAScript/CMakeLists.txt

@@ -44 +44 @@
   ${Boost_PROGRAM_OPTIONS_LIBRARY}
   ${NSCP_DEF_PLUGIN_LIB}
-  lua_static
+  ${LUA_LIB}
   ${LUA_PB}
 )

modules/LUAScript/LUAScript.cpp

@@ -26 +26 @@
 #include <strEx.h>
 #include <time.h>
-#include <filter_framework.hpp>
+//#include <filter_framework.hpp>
 #include <error.hpp>
 #include <file_helpers.hpp>
@@ -33 +33 @@
 
 
-LUAScript::LUAScript() : registry(new lua_wrappers::lua_registry()) {
+LUAScript::LUAScript() {
 }
 LUAScript::~LUAScript() {
@@ -45 +45 @@
 }
 bool LUAScript::loadModuleEx(std::wstring alias, NSCAPI::moduleLoadMode mode) {
+  registry.reset(new lua_wrappers::lua_registry());
   //std::wstring appRoot = file_helpers::folders::get_local_appdata_folder(SZAPPNAME);
   try {
@@ -72 +73 @@
     BOOST_FOREACH(script_container &script, scripts_) {
       try {
-        instances_.push_back(script_wrapper::lua_script::create_instance(get_core(), get_id(), registry, script.alias, script.script.string()));
+        instances_.push_back(script_wrapper::lua_script::create_instance(get_core(), get_id(), registry, script.alias, root_.string(), script.script.string()));
       } catch (const lua_wrappers::LUAException &e) {
         NSC_LOG_ERROR_STD(_T("Could not load script ") + script.to_wstring() + _T(": ") + e.getMessage());
@@ -135 +136 @@
 
 bool LUAScript::unloadModule() {
+  BOOST_FOREACH(script_instance &i, instances_) {
+    try {
+      i->unload();
+    } catch (const lua_wrappers::LUAException &e) {
+      NSC_LOG_ERROR_STD(_T("Exception when unloading script: ") + i->get_wscript() + _T(": ") + e.getMessage());
+    } catch (...) {
+      NSC_LOG_ERROR_STD(_T("Unhandeled Exception when unloading script: ") + i->get_wscript());
+    }
+  }
+  if (registry)
+    registry->clear();
   instances_.clear();
   scripts_.clear();
+  registry.reset();
   return true;
 }
@@ -210 +223 @@
 
     try {
-      instances_.push_back(script_wrapper::lua_script::create_instance(get_core(), get_id(), registry, _T("cmdline"), (*ofile).string()));
+      instances_.push_back(script_wrapper::lua_script::create_instance(get_core(), get_id(), registry, _T("cmdline"), root_.string(), (*ofile).string()));
     } catch (const lua_wrappers::LUAException &e) {
       NSC_LOG_ERROR_STD(_T("Could not load script ") + _T(": ") + e.getMessage());
@@ -253 +266 @@
 
 
-NSC_WRAP_DLL();
-NSC_WRAPPERS_MAIN_DEF(LUAScript);
-NSC_WRAPPERS_IGNORE_MSG_DEF();
-NSC_WRAPPERS_HANDLE_CMD_DEF();
-NSC_WRAPPERS_CLI_DEF();
-NSC_WRAPPERS_HANDLE_NOTIFICATION_DEF();
+NSC_WRAP_DLL()
+NSC_WRAPPERS_MAIN_DEF(LUAScript)
+NSC_WRAPPERS_IGNORE_MSG_DEF()
+NSC_WRAPPERS_HANDLE_CMD_DEF()
+NSC_WRAPPERS_CLI_DEF()
+NSC_WRAPPERS_HANDLE_NOTIFICATION_DEF()

modules/LUAScript/LUAScript.h

@@ -19 +19 @@
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
-NSC_WRAPPERS_MAIN();
-NSC_WRAPPERS_CLI();
-NSC_WRAPPERS_CHANNELS();
+NSC_WRAPPERS_MAIN()
+NSC_WRAPPERS_CLI()
+NSC_WRAPPERS_CHANNELS()
+
+#include <boost/optional.hpp>
 
 //#include <config.h>
 #include <strEx.h>
 #include <utils.h>
-#include <checkHelpers.hpp>
-#include "script_wrapper.hpp"
-
-#include <boost/optional.hpp>
-
 #include <scripts/functions.hpp>
 
+#include "script_wrapper.hpp"
 
 class LUAScript : public nscapi::impl::simple_command_line_exec, public nscapi::impl::simple_submission_handler, public nscapi::impl::simple_plugin {

modules/LUAScript/lua_wrappers.cpp

@@ -49 +49 @@
 }
 
+int lua_wrappers::lua_wrapper::gc(int what, int data)
+{
+  return lua_gc(L, what, data);
+}
+
 NSCAPI::nagiosReturn lua_wrappers::lua_registry::on_query(const wchar_t* command, const std::string &request, std::string &response) {
   function_map::iterator it = functions.find(command);
@@ -56 +61 @@
   lua_wrapper lua(prep_function(c));
   if (c.simple) {
+    int args = 2;
+    if (c.obj_ref != 0)
+      args = 3;
     nscapi::functions::decoded_simple_command_data data = nscapi::functions::parse_simple_query_request(command, request);
     lua.push_string(command);
     lua.push_array(data.args);
     std::wstring msg, perf;
-    if (lua.pcall(2, LUA_MULTRET, 0) != 0) {
+    if (lua.pcall(args, LUA_MULTRET, 0) != 0) {
       NSC_LOG_ERROR_STD(_T("Failed to handle command: ") + command + _T(": ") + lua.pop_string());
       return NSCAPI::returnUNKNOWN;
@@ -72 +80 @@
     if (arg_count > 0)
       ret = lua.pop_code();
+    lua.gc(LUA_GCCOLLECT, 0);
     nscapi::functions::create_simple_query_response(command, ret, msg, perf, response);
     return ret;
   } else {
+    int args = 2;
+    if (c.obj_ref != 0)
+      args = 3;
     lua.push_string(command);
     lua.push_raw_string(request);
-    if (lua.pcall(2, LUA_MULTRET, 0) != 0) {
+    if (lua.pcall(args, LUA_MULTRET, 0) != 0) {
       NSC_LOG_ERROR_STD(_T("Failed to handle command: ") + command + _T(": ") + lua.pop_string());
       return NSCAPI::returnUNKNOWN;
@@ -84 +96 @@
     if (arg_count > 1)
       response = utf8::cvt<std::string>(lua.pop_string());
+    lua.gc(LUA_GCCOLLECT, 0);
     if (arg_count > 0)
       return lua.pop_code();
@@ -106 +119 @@
   if (arg_count > 1)
     result = lua.pop_string();
+  lua.gc(LUA_GCCOLLECT, 0);
   if (arg_count > 0)
     return lua.pop_code();
@@ -127 +141 @@
     return NSCAPI::returnUNKNOWN;
   }
+  lua.gc(LUA_GCCOLLECT, 0);
   if (lua.size() > 0)
     return lua.pop_code();

modules/LUAScript/lua_wrappers.hpp

@@ -11 +11 @@
 #include <list>
 
+
+#include <boost/weak_ptr.hpp>
 #include <NSCAPI.h>
 #include <nscapi/nscapi_core_wrapper.hpp>
@@ -31 +33 @@
     }
     inline lua_State* get_state() const {
-      int i = lua_gettop(L);
+      lua_gettop(L);
       return L;
     }
@@ -46 +48 @@
     lua_wrapper(lua_State *L) : L(L) {}
 
+
+    int append_path(const std::string &path) {
+      lua_getglobal(L, "package");
+      lua_getfield(L, -1, "path");
+      std::string cur_path = lua_tostring(L, -1);
+      cur_path.append(";");
+      cur_path.append(path);
+      lua_pop(L, 1);
+      lua_pushstring(L, cur_path.c_str());
+      lua_setfield(L, -2, "path");
+      lua_pop(L, 1);
+      return 0;
+    }
     //////////////////////////////////////////////////////////////////////////
     /// get_xxx
@@ -59 +74 @@
       return _T("<NOT_A_STRING>");
     }
+    std::string get_sstring(int pos = -1) {
+      if (pos == -1)
+        pos = lua_gettop(L);
+      if (pos == 0)
+        return "<EMPTY>";
+      if (is_string(pos))
+        return lua_tostring(L, pos);
+      if (is_number(pos))
+        return strEx::s::xtos(lua_tonumber(L, pos));
+      return "<NOT_A_STRING>";
+    }
     bool get_string(std::wstring &str, int pos = -1) {
       if (pos == -1)
@@ -68 +94 @@
       else if (is_number(pos))
         str = strEx::itos(lua_tonumber(L, pos));
+      else
+        return false;
+      return true;
+    }
+    bool get_string(std::string &str, int pos = -1) {
+      if (pos == -1)
+        pos = lua_gettop(L);
+      if (pos == 0)
+        return false;
+      if (is_string(pos))
+        str = lua_tostring(L, pos);
+      else if (is_number(pos))
+        str = strEx::s::xtos(lua_tonumber(L, pos));
       else
         return false;
@@ -109 +148 @@
     //////////////////////////////////////////////////////////////////////////
     /// pop_xxx
-    boolean pop_boolean() {
+    bool pop_boolean() {
       int pos = lua_gettop(L);
       if (pos == 0)
@@ -126 +165 @@
       return ret;
     }
+    std::string pop_sstring() {
+      std::string ret;
+      int top = lua_gettop(L);
+      if (top == 0)
+        return "<EMPTY>";
+      ret = get_sstring(top);
+      pop();
+      return ret;
+    }
     bool pop_string(std::wstring &str) {
       int top = lua_gettop(L);
@@ -135 +183 @@
       return true;
     }
-    bool pop_function(int &funref) {
+    bool pop_function_ref(int &funref) {
       int top = lua_gettop(L);
       if (top == 0)
@@ -141 +189 @@
       if (!is_function(top))
         return false;
+      funref = luaL_ref(L, LUA_REGISTRYINDEX);
+      if (funref == 0)
+        return false;
+      return true;
+    }
+    bool pop_instance_ref(int &funref) {
+      int top = lua_gettop(L);
+      if (top == 0)
+        return false;
+//      if (!is_function(top))
+//        return false;
       funref = luaL_ref(L, LUA_REGISTRYINDEX);
       if (funref == 0)
@@ -263 +322 @@
       lua_pushlstring(L, s.c_str(), s.size());
     }
-    void push_array(std::list<std::wstring> &arr) {
+    void push_array(const std::list<std::wstring> &arr) {
       lua_createtable(L, 0, arr.size());
       int i=0;
@@ -331 +390 @@
       return luaL_checkstring(L, pos);
     }
+    /*
     std::wstring inline wstring(int pos) {
       return utf8::cvt<std::wstring>(string(pos));
     }
+    */
 
     std::list<std::wstring> inline checkarray(int pos) {
@@ -340 +401 @@
     }
 
-    boolean inline checkbool(int pos) {
+    bool inline checkbool(int pos) {
       return lua_toboolean(L, pos);
     }
@@ -349 +410 @@
       return luaL_checkint(L, pos);
     }
+    int gc(int what, int data);
   };
 
@@ -390 +452 @@
       , alias(alias)
       , script(script)
-    {}
+    {
+      std::wcout << _T("+++");
+    }
+
+    virtual ~lua_script_instance() {
+      std::wcout << _T("---");
+    }
 
     int get_plugin_id() const {
@@ -412 +480 @@
   };
 
-  class lua_registry {
+  class lua_registry : boost::noncopyable {
     struct function_container {
       boost::shared_ptr<lua_script_instance> instance;
       int func_ref;
+      int obj_ref;
       bool simple;
     };
@@ -427 +496 @@
       lua_State *L = c.instance->get_lua_state();
       lua_rawgeti(L, LUA_REGISTRYINDEX, c.func_ref);
+      if (c.obj_ref != 0)
+        lua_rawgeti(L, LUA_REGISTRYINDEX, c.obj_ref);
       return L;
     }
   public:
+    lua_registry() {}
+    ~lua_registry() {}
+
 
     NSCAPI::nagiosReturn on_query(const wchar_t* command, const std::string &request, std::string &response);
@@ -435 +509 @@
     NSCAPI::nagiosReturn on_submission(const std::wstring channel, const std::wstring source, const std::wstring command, NSCAPI::nagiosReturn code, std::wstring msg, std::wstring perf);
 
-    void register_query(const std::wstring &command, boost::shared_ptr<lua_script_instance> instance, int func_ref, bool simple = true) {
+    void register_query(const std::wstring &command, boost::shared_ptr<lua_script_instance> instance, int obj_ref, int func_ref, bool simple = true) {
       function_container c;
       c.func_ref = func_ref;
+      c.obj_ref = obj_ref;
       c.instance = instance;
       c.simple = simple;
@@ -476 +551 @@
   class lua_instance_manager {
   public:
-    typedef boost::shared_ptr<lua_script_instance> script_instance_type;
+    typedef boost::weak_ptr<lua_script_instance> script_instance_type;
     typedef std::vector<script_instance_type> script_map_type;
   private:
     static script_map_type scripts;
   public:
+    static void remove_script(script_instance_type script) {
+//      BOOST_FOREACH(script_instance_type &s, scripts) {
+//        if (s == script) {
+//          s.reset();
+//        }
+//      }
+    }
     static void set_script(lua_State *L, script_instance_type script) {
       int index = 0;

modules/LUAScript/script_wrapper.hpp

@@ -20 +20 @@
   typedef lua_wrappers::lua_script_instance script_instance;
   typedef lua_wrappers::lua_instance_manager instance_manager;
+  typedef boost::shared_ptr<lua_wrappers::lua_script_instance> script_instance_type;
 
 
@@ -30 +31 @@
       instance = instance_manager::get_script(L);
     }
-    instance_manager::script_instance_type get_instance() {
-      if (!instance)
+    script_instance_type get_instance() {
+      script_instance_type inst = instance.lock();
+      if (!inst)
         throw lua_wrappers::LUAException("Invalid instance");
-      return instance;
+      return inst;
     }
   };
@@ -94 +96 @@
       lua_wrappers::lua_wrapper lua(L);
       try {
-        int nargs = lua.size();
-        std::wstring target = lua.wstring(1);
-        std::wstring command = lua.wstring(2);
-        std::list<std::wstring> arguments = lua.checkarray(3);
+        // simple_exec(target, command, arguments)
+        if (lua.size() > 1)
+          return lua.error("Incorrect syntax: simple_exec(target, command, arguments)");
+        std::list<std::wstring> arguments = lua.pop_array();
+        std::wstring command = lua.pop_string();
+        std::wstring target = lua.pop_string();
         std::list<std::wstring> result;
         NSCAPI::nagiosReturn ret = nscapi::core_helper::exec_simple_command(target, command, arguments, result);
@@ -115 +119 @@
       lua_wrappers::lua_wrapper lua(L);
       try {
-        int nargs = lua.size();
-        std::wstring channel = lua.wstring(1);
-        std::wstring command = lua.wstring(2);
-        NSCAPI::nagiosReturn code = lua.get_code(3);
-        std::wstring message = lua.wstring(4);
-        std::wstring perf = lua.wstring(5);
+        // simple_submit(target, command, arguments)
+        if (lua.size() != 5)
+          return lua.error("Incorrect syntax: simple_submit(channel, command, code, message, perf)");
+        std::wstring perf = lua.pop_string();
+        std::wstring message = lua.pop_string();
+        NSCAPI::nagiosReturn code = lua.pop_code();
+        std::wstring command = lua.pop_string();
+        std::wstring channel = lua.pop_string();
         std::wstring result;
         NSCAPI::nagiosReturn ret = nscapi::core_helper::submit_simple_message(channel, command, code, message, perf, result);
@@ -143 +149 @@
         module = lua.pop_string();
       get_instance()->get_core()->reload(module);
+      return 0;
+    }
+    int log(lua_State *L) {
+      lua_wrappers::lua_wrapper lua(L);
+      // log([level], message)
+      if (lua.size() > 2 || lua.size() < 1)
+        return lua.error("Incorrect syntax: log([<level>], <message>);");
+      std::wstring level = _T("info");
+      std::wstring message;
+      message = lua.pop_string();
+      if (lua.size() > 0)
+        level = lua.pop_string();
+      get_instance()->get_core()->log(nscapi::logging::parse(level), __FILE__, __LINE__, message);
       return 0;
     }
@@ -156 +175 @@
     { "submit", &core_wrapper::submit },
     { "reload", &core_wrapper::reload },
+    { "log", &core_wrapper::log },
     { 0 }
   };
@@ -169 +189 @@
     static const Luna<registry_wrapper>::RegType methods[];
 
-    boost::optional<int> read_registration(lua_wrapper &lua, std::wstring &command, int &funref, std::wstring &description) {
+    boost::optional<int> read_registration(lua_wrapper &lua, std::wstring &command, int &objref, int &funref, std::wstring &description) {
+      // ...(name, function, description)
+      // ...(name, instance, function, description)
       std::wstring funname;
-      if (lua.size() != 2 && lua.size() != 3)
-        return lua.error("Invalid number of arguments: " + strEx::s::xtos(lua.size()) + " expected 2 or 3");
-      if (lua.size() > 2 && !lua.pop_string(description))
+      int count = lua.size();
+      if (count < 2 && count > 4)
+        return lua.error("Invalid number of arguments: " + strEx::s::xtos(lua.size()) + " expected 2-4 arguments");
+      if (count > 2 && !lua.pop_string(description)) {
         return lua.error("Invalid description");
+      }
       if (lua.pop_string(funname)) {
         lua.getglobal(funname);
       }
-      if (!lua.pop_function(funref))
+      if (!lua.pop_function_ref(funref))
         return lua.error("Invalid function");
+      if (count > 3) {
+        if (!lua.pop_instance_ref(objref))
+          return lua.error("Invalid object");
+      }
       if (!lua.pop_string(command))
         return lua.error("Invalid command");
@@ -187 +215 @@
       // void = (cmd, function, desc)
       std::wstring command, description;
-      int funref = 0;
-      lua_wrapper lua(L);
-      boost::optional<int> error = read_registration(lua, command, funref, description);
+      int funref = 0, objref = 0;
+      lua_wrapper lua(L);
+      boost::optional<int> error = read_registration(lua, command, objref, funref, description);
       if (error)
         return *error;
@@ -196 +224 @@
         description = _T("Lua script: ") + command;
       get_instance()->get_core()->registerCommand(get_instance()->get_plugin_id(), command, description);
-      get_instance()->get_registry()->register_query(command, get_instance(), funref, false);
+      get_instance()->get_registry()->register_query(command, get_instance(), objref, funref, false);
       return 0;
     }
@@ -202 +230 @@
       // void = (cmd, function, desc)
       std::wstring command, description;
-      int funref = 0;
-      lua_wrapper lua(L);
-      boost::optional<int> error = read_registration(lua, command, funref, description);
+      int funref = 0, objref = 0;
+      lua_wrapper lua(L);
+      boost::optional<int> error = read_registration(lua, command, objref, funref, description);
       if (error)
         return *error;
@@ -211 +239 @@
         description = _T("Lua script: ") + command;
       get_instance()->get_core()->registerCommand(get_instance()->get_plugin_id(), command, description);
-      get_instance()->get_registry()->register_query(command, get_instance(), funref, true);
+      get_instance()->get_registry()->register_query(command, get_instance(), objref, funref, true);
       return 0;
     }
@@ -298 +326 @@
     int get_string(lua_State *L) {
       lua_wrapper lua(L);
-      std::wstring s = lua.wstring(1);
-      std::wstring k = lua.wstring(2);
-      std::wstring v = lua.op_wstring(3);
+      if (lua.size() != 3 && lua.size() != 2)
+        return lua.error("Invalid syntax: get_string(section, key, [value])");
+      std::wstring v;
+      if (lua.size() > 2)
+        v = lua.pop_string();
+      std::wstring k = lua.pop_string();
+      std::wstring s = lua.pop_string();
       lua.push_string(get_instance()->get_core()->getSettingsString(s, k, v));
       return 1;
@@ -306 +338 @@
     int set_string(lua_State *L) {
       lua_wrapper lua(L);
-      std::wstring s = lua.wstring(1);
-      std::wstring k = lua.wstring(2);
-      std::wstring v = lua.wstring(3);
+      if (lua.size() != 3)
+        return lua.error("Invalid syntax: set_string(section, key, value)");
+      std::wstring v = lua.pop_string();
+      std::wstring k = lua.pop_string();
+      std::wstring s = lua.pop_string();
       get_instance()->get_core()->SetSettingsString(s, k, v);
       return 0;
@@ -314 +348 @@
     int get_bool(lua_State *L) {
       lua_wrapper lua(L);
-      std::wstring s = lua.wstring(1);
-      std::wstring k = lua.wstring(2);
-      bool v = lua.checkbool(3);
+      if (lua.size() != 3 && lua.size() != 2)
+        return lua.error("Invalid syntax: get_bool(section, key, [value])");
+      bool v = false;
+      if (lua.size() > 2)
+        v = lua.pop_boolean();
+      std::wstring k = lua.pop_string();
+      std::wstring s = lua.pop_string();
       lua.push_boolean(get_instance()->get_core()->getSettingsInt(s, k, v?1:0)==1);
       return 1;
@@ -322 +360 @@
     int set_bool(lua_State *L) {
       lua_wrapper lua(L);
-      std::wstring s = lua.wstring(1);
-      std::wstring k = lua.wstring(2);
-      bool v = lua.checkbool(3);
+      if (lua.size() != 3)
+        return lua.error("Invalid syntax: set_bool(section, key, value)");
+      bool v = lua.pop_boolean();
+      std::wstring k = lua.pop_string();
+      std::wstring s = lua.pop_string();
       get_instance()->get_core()->SetSettingsInt(s, k, v?1:0);
       return 0;
@@ -330 +370 @@
     int get_int(lua_State *L) {
       lua_wrapper lua(L);
-      std::wstring s = lua.wstring(1);
-      std::wstring k = lua.wstring(2);
-      int v = lua.checkint(3);
+      if (lua.size() != 3 && lua.size() != 2)
+        return lua.error("Invalid syntax: get_int(section, key, [value])");
+      int v = 0;
+      if (lua.size() > 2)
+        v = lua.pop_int();
+      std::wstring k = lua.pop_string();
+      std::wstring s = lua.pop_string();
       lua.push_int(get_instance()->get_core()->getSettingsInt(s, k, v));
       return 1;
@@ -338 +382 @@
     int set_int(lua_State *L) {
       lua_wrapper lua(L);
-      std::wstring s = lua.wstring(1);
-      std::wstring k = lua.wstring(2);
-      int v = lua.checkint(3);
+      if (lua.size() != 3)
+        return lua.error("Invalid syntax: set_int(section, key, value)");
+      int v = lua.pop_int();
+      std::wstring k = lua.pop_string();
+      std::wstring s = lua.pop_string();
       get_instance()->get_core()->SetSettingsInt(s, k, v);
       return 0;
@@ -350 +396 @@
     int register_path(lua_State *L) {
       lua_wrapper lua(L);
-      std::wstring path = lua.wstring(1);
-      std::wstring title = lua.wstring(1);
-      std::wstring description = lua.wstring(1);
+      if (lua.size() != 3)
+        return lua.error("Invalid syntax: register_path(path, title, description)");
+      std::wstring description = lua.pop_string();
+      std::wstring title = lua.pop_string();
+      std::wstring path = lua.pop_string();
       get_instance()->get_core()->settings_register_path(path, title, description, false);
       return 0;
     }
-    NSCAPI::settings_type script_wrapper::settings_wrapper::get_type(std::string stype) {
+    NSCAPI::settings_type get_type(std::string stype) {
       if (stype == "string" || stype == "str" || stype == "s")
         return NSCAPI::key_string;
@@ -369 +417 @@
     int register_key(lua_State *L) {
       lua_wrapper lua(L);
-      std::wstring path = lua.wstring(1);
-      std::wstring key = lua.wstring(1);
-      std::string stype = lua.string(1);
-      NSCAPI::settings_type type = get_type(stype);
-      std::wstring title = lua.wstring(1);
-      std::wstring description = lua.wstring(1);
-      std::wstring defaultValue = lua.wstring(1);
+
+      if (lua.size() != 5)
+        return lua.error("Invalid syntax: register_key(path, key, type, title, description, default)");
+      std::wstring defaultValue = lua.pop_string();
+      std::wstring description = lua.pop_string();
+      std::wstring title = lua.pop_string();
+      NSCAPI::settings_type type = get_type(lua.pop_sstring());
+      std::wstring key = lua.pop_string();
+      std::wstring path = lua.pop_string();
       get_instance()->get_core()->settings_register_key(path, key, type, title, description, defaultValue, false);
       return 0;
@@ -463 +513 @@
 
   class lua_script : public script_instance, public boost::enable_shared_from_this<lua_script>  {
-    lua_script(nscapi::core_wrapper* core, const int plugin_id, boost::shared_ptr<lua_wrappers::lua_registry> registry, const std::string alias, const std::string script) 
-      : script_instance(core, plugin_id, registry, alias, script) {}
+    std::string base_path_;
+    lua_script(nscapi::core_wrapper* core, const int plugin_id, boost::shared_ptr<lua_wrappers::lua_registry> registry, const std::string alias, const std::string base_path, const std::string script) 
+      : script_instance(core, plugin_id, registry, alias, script), base_path_(base_path) {
+        std::wcout << _T("AAA");
+    }
   public:
-
-    static boost::shared_ptr<lua_script> create_instance(nscapi::core_wrapper* core, const int plugin_id, boost::shared_ptr<lua_wrappers::lua_registry> registry, const std::wstring alias, const std::wstring script) {
-      boost::shared_ptr<lua_script> instance(new lua_script(core, plugin_id, registry, utf8::cvt<std::string>(alias), utf8::cvt<std::string>(script)));
+    virtual ~lua_script() {
+      std::wcout << _T("XXX");
+    }
+
+    static boost::shared_ptr<lua_script> create_instance(nscapi::core_wrapper* core, const int plugin_id, boost::shared_ptr<lua_wrappers::lua_registry> registry, const std::wstring alias, const std::wstring base_path, const std::wstring script) {
+      boost::shared_ptr<lua_script> instance(new lua_script(core, plugin_id, registry, utf8::cvt<std::string>(alias), utf8::cvt<std::string>(base_path), utf8::cvt<std::string>(script)));
       if (instance) {
-        instance->init();
         instance->load();
       }
       return instance;
     }
-    void init() {
+
+    void load() {
+      std::wcout << _T("lll");
       lua_wrappers::lua_instance_manager::set_script(get_lua_state(), shared_from_this());
-    }
-
-    void load() {
       lua_wrappers::lua_wrapper lua(get_lua_state());
       lua.openlibs();
       nsclient_wrapper::luaopen(get_lua_state());
+      lua.append_path(base_path_ + "\\scripts\\lua\\lib\\?.lua;" + base_path_ + "scripts\\lua\\?;");
       if (lua.loadfile(get_script()) != 0)
         throw lua_wrappers::LUAException(_T("Failed to load script: ") + get_wscript() + _T(": ") + lua.pop_string());
       if (lua.pcall(0, 0, 0) != 0)
         throw lua_wrappers::LUAException(_T("Failed to execute script: ") + get_wscript() + _T(": ") + lua.pop_string());
+      std::wcout << _T("LLL");
     }
     std::wstring get_wscript() const {
       return utf8::cvt<std::wstring>(get_script());
     }
-    void unload() {}
+    void unload() {
+      std::wcout << _T("uuu");
+      lua_wrappers::lua_wrapper lua(get_lua_state());
+      lua.gc(LUA_GCCOLLECT, 0);
+      lua_wrappers::lua_instance_manager::remove_script(shared_from_this());
+      std::wcout << _T("UUU");
+      std::wcout << shared_from_this().use_count();
+    }
     void reload() {
       unload();

modules/NRPEClient/NRPEClient.cpp

@@ -298 +298 @@
 
   }
+  virtual ~client_handler() {}
   void log_debug(std::string file, int line, std::string msg) const {
     if (GET_CORE()->should_log(NSCAPI::log_level::debug)) {
@@ -323 +324 @@
     socket_helpers::client::client<nrpe::client::protocol> client(boost::shared_ptr<client_handler>(new client_handler(con)));
     client.connect();
-    packet = client.process_request(packet);
+    nrpe::packet response = client.process_request(packet);
     client.shutdown();
-    return boost::make_tuple(static_cast<int>(packet.getResult()), packet.getPayload());
+    return boost::make_tuple(static_cast<int>(response.getResult()), response.getPayload());
   } catch (nrpe::nrpe_packet_exception &e) {
     return boost::make_tuple(NSCAPI::returnUNKNOWN, _T("NRPE Packet errro: ") + e.wwhat());

scripts/CMakeLists.txt

@@ -10 +10 @@
 #FILE (GLOB scripts_PYT "python/*.py" "python/lib/*.py")
 #ENDIF(WIN32)
-FILE (GLOB scripts_LUA "lua/*.lua")
+FILE (GLOB_RECURSE scripts_LUA "lua/*.lua")
 
 SET(script_ALL ${scripts_BAT} ${scripts_VBS} ${scripts_PS1})
@@ -20 +20 @@
   get_filename_component(filename ${file} NAME)
   #MESSAGE(STATUS " + ${filename} (${file})")
-  copy_single_file(copy_scripts ${filename} scripts)
+  copy_single_file(ALL_FILES ${filename} scripts)
 ENDFOREACH(file ${script_ALL})
 
@@ -27 +27 @@
   get_filename_component(filename ${file} NAME)
   #MESSAGE(STATUS " + lib - ${filename}")
-  copy_single_file(copy_scripts lib/${filename} scripts/lib)
+  copy_single_file(ALL_FILES lib/${filename} scripts/lib)
 ENDFOREACH(file ${scripts_LIB})
 
@@ -36 +36 @@
   STRING(REPLACE "/" "_" alias "${relpath}")
   STRING(REPLACE "." "_" alias "${alias}")
-  MESSAGE(STATUS " + python - ${filename} - ${relpath} - ${alias}")
-  copy_single_file(copy_scripts ${relpath}/${filename} scripts/${relpath})
+  #MESSAGE(STATUS " + python - ${filename} - ${relpath} - ${alias}")
+  copy_single_file(ALL_FILES ${relpath}/${filename} scripts/${relpath})
 ENDFOREACH(file ${scripts_PYT})
 
 FOREACH(file ${scripts_LUA})
   get_filename_component(filename ${file} NAME)
-  #MESSAGE(STATUS " + lua - ${filename}")
-  copy_single_file(copy_scripts lua/${filename} scripts/lua)
+  get_filename_component(filepath ${file} PATH)
+  file(RELATIVE_PATH relpath ${CMAKE_CURRENT_SOURCE_DIR} "${filepath}")
+  STRING(REPLACE "/" "_" alias "${relpath}")
+  STRING(REPLACE "." "_" alias "${alias}")
+  #MESSAGE(STATUS " + lua - ${filename} - ${relpath} - ${alias}")
+  copy_single_file(ALL_FILES ${relpath}/${filename} scripts/${relpath})
 ENDFOREACH(file ${scripts_LUA})
 

scripts/lua/test_nrpe.lua

@@ -1 @@
-valid_chars = {"a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z",
-  "0","1","2","3","4","5","6","7","8","9","-"}
-
-math.randomseed(os.time())
-
-function random(len) -- args: smallest and largest possible password lengths, inclusive
-  pass = {}
-  for z = 1,len do
-    case = math.random(1,2)
-    a = math.random(1,#valid_chars)
-    if case == 1 then
-      x=string.upper(valid_chars[a])
-    elseif case == 2 then
-      x=string.lower(valid_chars[a])
-    end
-  table.insert(pass, x)
-  end
-  return(table.concat(pass))
-end
-string.random = random
-
-function status_to_int(status)
-  if status == 'ok' then
-    return 0
-  elseif status == 'warn' then
-    return 1
-  elseif status == 'crit' then
-    return 2
-  elseif status == 'unknown' then
-    return 3
-  else
-    print("Unknown status: "..status)
-    return 3
-  end
-end
-
-TestResult = { status = true; children = {} }
-function TestResult:new(o)
-  o = o or {}
-  o["children"] = o["children"] or {}
-  if o["status"] == nil then o["status"] = true end
-  setmetatable(o, self)
-  self.__index = self
-  return o
-
-end
-function TestResult:add(result)
-  if not result.status then self.status = false end
-  table.insert(self.children,result)
-end
-function TestResult:add_message(result, message)
-  table.insert(self.children,TestResult:new{status=status, message=message})
-end
-function TestResult:assert_equals(a, b, message)
-  if a==b then
-    table.insert(self.children,TestResult:new{status=true, message=message})
-  else
-    table.insert(self.children,TestResult:new{status=false, message=message..': '..tostring(a)..' != '..tostring(b)})
-  end
-end
-
-
-function TestResult:print(indent)
-  indent = indent or 0
-  pad = string.rep(' ', indent)
-  if self.status then
-    print(pad .. "[OK ] - " .. self.message)
-  else
-    print(pad .. "[ERR] - " .. self.message)
-  end
-  if # self.children > 0 then
-    for i,v in ipairs(self.children) do v:print(indent+2) end
-  end
-end
-
-function TestResult:print_failed(indent)
-  indent = indent or 0
-  pad = string.rep(' ', indent)
-  if not self.status then
-    print(pad .. "[ERR] - " .. self.message)
-  end
-  if # self.children > 0 then
-    for i,v in ipairs(self.children) do v:print(indent+2) end
-  end
-end
-
-function TestResult:count()
-  local ok = 0
-  local err = 0
-  if self.status then
-    ok = ok + 1
-  else
-    err = err + 1
-  end
-  if # self.children > 0 then
-    for i,v in ipairs(self.children) do
-      local lok, lerr = v:count() 
-      ok = ok + lok
-      err = err + lerr
-    end
-  end
-  return ok, err
-end
-  
-
-
-function TestResult:get_nagios()
-  local ok, err = self:count()
-  if not self.status then
-    return 'crit', tostring(err)..' test cases failed', ''
-  else
-    return 'ok', tostring(ok)..' test cases succeded', ''
-  end
-end
-
+test = require("test_helper")
 
 TestMessage = {
@@ -150 +36 @@
 function TestNRPE:setup()
   local reg = Registry(plugin_id)
-  reg:simple_query('check_py_nrpe_test_s', self.simple_handler, 'TODO')
-  reg:query('check_py_nrpe_test', self.handler, 'TODO')
+  reg:simple_query('check_py_nrpe_test_s', self, self.simple_handler, 'TODO')
+  reg:query('check_py_nrpe_test', self, self.handler, 'TODO')
+end
+function TestNRPE:teardown()
 end
 
@@ -208 +96 @@
 end
 
-function TestNRPE.simple_handler(command, args)
-  msg = instance:get_response(args[0])
+function TestNRPE:simple_handler(command, args)
+  msg = self:get_response(args[0])
   msg.got_simple_response = true
-  instance:set_response(msg)
-  rmsg = instance:get_request(args[0])
+  self:set_response(msg)
+  rmsg = self:get_request(args[0])
   return rmsg.status, rmsg.message, rmsg.perfdata
 end
 
-function TestNRPE.handler(req)
-  msg = instance:get_response(args[0])
+function TestNRPE:handler(req)
+  msg = self:get_response(args[0])
   msg.got_response = true
-  instance:set_response(msg)
-  rmsg = instance:get_request(args[0])
+  self:set_response(msg)
+  rmsg = self:get_request(args[0])
 end
 
 function TestNRPE:submit_payload(tag, ssl, length, source, status, message, perf, target)
   local core = Core()
-  local result = TestResult:new{message='Testing NRPE: '..tag..' for '..target}
+  local result = test.TestResult:new{message='Testing NRPE: '..tag..' for '..target}
   
   local msg = protobuf.Plugin.QueryRequestMessage.new()
@@ -270 +158 @@
       result:add_message(response_message:size_payload() == 1, 'Verify that we only get one payload response for '..tag)
       pl = response_message:get_payload(1)
-      result:assert_equals(pl:get_result(), status_to_int(status), 'Verify that status is sent through '..tag)
+      result:assert_equals(pl:get_result(), test.status_to_int(status), 'Verify that status is sent through '..tag)
       result:assert_equals(pl:get_message(), rmsg.message, 'Verify that message is sent through '..tag)
       --#result.assert_equals(rmsg.perfdata, perf, 'Verify that performance data is sent through')
@@ -290 +178 @@
 function TestNRPE:test_one(ssl, length, status)
   tag = string.format("%s/%d/%s", tostring(ssl), length, status)
-  result = TestResult:new{message=string.format('Testing: %s with various targets', tag)}
+  local result = test.TestResult:new{message=string.format('Testing: %s with various targets', tag)}
   for k,t in pairs({'valid', 'test_rp', 'invalid'}) do
     result:add(self:submit_payload(tag, ssl, length, tag .. 'src' .. tag, status, tag .. 'msg' .. tag, '', t))
@@ -321 +209 @@
   core:reload('test_nrpe_client')
 
-  result = TestResult:new{message="Testing "..tostring(ssl)..", "..tostring(length)}
+  local result = test.TestResult:new{message="Testing "..tostring(ssl)..", "..tostring(length)}
   result:add(self:test_one(ssl, length, 'unknown'))
   result:add(self:test_one(ssl, length, 'ok'))
@@ -331 +219 @@
 
 function TestNRPE:run()
-  local result = TestResult:new{message="NRPE Test Suite"}
+  local result = test.TestResult:new{message="NRPE Test Suite"}
   result:add(self:do_one_test(true, 1024))
   result:add(self:do_one_test(false, 1024))
@@ -341 +229 @@
 
 
-function lua_unittest_handler(command, args)
-  result = instance:setup()
-  result = instance:run()
-  print "--"
-  result:print()
-  print "--"
-  result:print_failed()
-  print "--"
-  return result:get_nagios()
-end
-function install_test_manager()
-  instance:install({})
-  local reg = Registry(plugin_id)
-  reg:simple_query('lua_unittest', lua_unittest_handler, 'TODO')
-end
-
-instance = TestNRPE
-install_test_manager()
+instances = { TestNRPE }
+test.install_test_manager(instances)

service/NSClient++.cpp

@@ -263 +263 @@
 }
 
+NSClientT::~NSClientT() {
+  try {
+    nsclient::logging::logger::destroy();
+  } catch(...) {
+    std::wcerr << _T("UNknown exception raised: When destroying logger") << std::endl;
+  }
+}
+
 
 NSClientT::plugin_alias_list_type NSClientT::find_all_plugins(bool active) {
@@ -752 +760 @@
     }
     commands_.remove_all();
+    channels_.remove_all();
+    routers_.remove_all();
     plugins_.clear();
   }

service/NSClient++.h

@@ -103 +103 @@
   // c-tor, d-tor
   NSClientT();
-  virtual ~NSClientT() {}
+  virtual ~NSClientT();
 
   // Service helper functions

service/cli_parser.hpp

@@ -310 +310 @@
       if (vm.count("run")) {
         try {
-          mainClient.start_and_wait(name);
+          core_->start_and_wait(name);
         } catch (...) {
           get_logger()->error(__FILE__, __LINE__, _T("Unknown exception in service"));
@@ -544 +544 @@
       }
       if (args.mode == client_arguments::query) {
-        ret = mainClient.simple_query(args.module, args.command, args.arguments, resp);
+        ret = core_->simple_query(args.module, args.command, args.arguments, resp);
       } else if (args.mode == client_arguments::exec || args.mode == client_arguments::combined) {
         ret = mainClient.simple_exec(args.command, args.arguments, resp);
@@ -551 +551 @@
           std::wcout << _T("Command not found (by module): ") << args.command << std::endl;
           resp.push_back(_T("Command not found: ") + args.command);
-          mainClient.simple_exec(_T("help"), args.arguments, resp);
+          core_->simple_exec(_T("help"), args.arguments, resp);
         } else if (args.mode == client_arguments::combined) {
           if (ret == NSCAPI::returnOK) {
-            mainClient.reload(_T("service"));
-            ret = mainClient.simple_query(args.module, args.combined_query, args.arguments, resp);
+            core_->reload(_T("service"));
+            ret = core_->simple_query(args.module, args.combined_query, args.arguments, resp);
           } else {
             std::wcerr << _T("Failed to execute command, will not attempt query") << std::endl;
@@ -565 +565 @@
         std::wcerr << _T("Need to specify one of --exec, --query or --submit") << std::endl;
       }
-      mainClient.stop_unload_plugins_pre();
-      mainClient.stop_exit_pre();
-      mainClient.stop_exit_post();
+      core_->stop_unload_plugins_pre();
+      core_->stop_exit_pre();
+      core_->stop_exit_post();
 
       BOOST_FOREACH(std::wstring r, resp) {

service/logger_impl.cpp

@@ -115 +115 @@
 
 
-  void do_log(const std::string &data) {
+  void do_log(const std::string data) {
     if (file_.empty())
       return;
@@ -217 +217 @@
   simple_console_logger() : format_("%Y-%m-%d %H:%M:%S") {}
 
-  void do_log(const std::string &data) {
+  void do_log(const std::string data) {
     if (get_console_log()) {
       std::wcout << render_console_message(data);
@@ -274 +274 @@
   }
 
-  void do_log(const std::string &data) {
+  void do_log(const std::string data) {
     if (get_console_log()) {
       std::wcout << render_console_message(data);
@@ -325 +325 @@
         return false;
       }
+      background_logger_->shutdown();
       return nsclient::logging::logging_interface_impl::shutdown();
     } catch (const std::exception &e) {