Changeset dcd90b2 in nscp

Timestamp:

11/23/09 22:54:09 (3 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

9b3f53c

Parents:

858ecc1

Message:

Added back openssl now builds (and presumably the NRPEClient works with it haven't tested but will do after I get the NRPEListener up and running...)

Files:

• CMakeLists.txt (modified) (2 diffs)
• build.cmake (modified) (1 diff)
• include/program_options_ex.hpp (modified) (3 diffs)
• modules/NRPEClient/CMakeLists.txt (modified) (1 diff)
• modules/NRPEClient/NRPEClient.cpp (modified) (7 diffs)
• modules/NRPEClient/NRPEClient.h (modified) (3 diffs)
• modules/NRPEClient/stdafx.h (modified) (1 diff)

CMakeLists.txt

@@ -49 +49 @@
 ENDIF(WIN32)
 
+SET(OPENSSL_INCLUDE_DIR ${OPENSSL_INCLUDE_DIR} CACHE PATH "Look for OPENSSL headers here")
+SET(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} CACHE PATH "Look for libraries here")
+
+FIND_PACKAGE(OpenSSL)
+if(OPENSSL_FOUND)
+  if(WIN32)
+    FIND_LIBRARY(LIB_EAY_DEBUG NAMES libeay32MDd libeay32)
+    FIND_LIBRARY(LIB_EAY_RELEASE NAMES libeay32MD libeay32)
+      IF(LIB_EAY_DEBUG AND LIB_EAY_RELEASE)
+         SET(OPENSSL_LIBRARIES ${OPENSSL_LIBRARIES} optimized ${LIB_EAY_RELEASE} debug ${LIB_EAY_DEBUG})
+      ELSE(LIB_EAY_DEBUG AND LIB_EAY_RELEASE)
+    SET(OPENSSL_FOUND FALSE)
+         SET(OPENSSL_LIBRARIES NOTFOUND)
+         MESSAGE(STATUS "Could not find the debug and release version of openssl")
+      ENDIF(LIB_EAY_DEBUG AND LIB_EAY_RELEASE)
+  endif(WIN32)
+endif(OPENSSL_FOUND)
+
+if(OPENSSL_FOUND)
+  message(STATUS, "Found openssl: ${OPENSSL_LIBRARIES}")
+  SET(NSCP_GLOBAL_DEFINES ${NSCP_GLOBAL_DEFINES} -DUSE_SSL)
+else(OPENSSL_FOUND)
+  message(STATUS, "openssl NOT found (no ssl support)")
+endif(OPENSSL_FOUND)
+
 FIND_PACKAGE(Boost COMPONENTS system filesystem thread REQUIRED)
 
@@ -83 +108 @@
 
 
-SET(NSCP_GLOBAL_DEFINES
-  -DUNICODE -D_UNICODE
-)
+SET(NSCP_GLOBAL_DEFINES ${NSCP_GLOBAL_DEFINES} -DUNICODE -D_UNICODE)
 
 IF(CMAKE_HOST_UNIX)

build.cmake

@@ -4 +4 @@
 set(BOOST_USE_MULTITHREADED ON)
 
-SET(BOOST_INCLUDEDIR D:/source/include/boost-1_40)
-SET(BOOST_LIBRARYDIR d:/source/lib/x86/)
+SET(BOOST_INCLUDEDIR c:/src/include/boost-1_39)
+#SET(BOOST_LIBRARYDIR c:/src/lib/x86/)
 SET(BOOST_LIB_SUFFIX vc80-mt)
-SET(BOOST_LIB_VERSION 1.40)
+#SET(BOOST_LIB_VERSION 1.40)
+
+
+SET(OPENSSL_INCLUDE_DIR c:/src/include/)
+SET(CMAKE_LIBRARY_PATH c:/src/lib/x86/)

include/program_options_ex.hpp

@@ -7 +7 @@
 class basic_command_line_parser_ex : public boost::program_options::basic_command_line_parser<charT> {
 public:
+  /*
   static boost::program_options::basic_parsed_options<charT> parse_command_line(int argc, charT* argv[], const boost::program_options::options_description& desc,
     int style = 0, boost::function1<std::pair<std::string, std::string>, const std::string&> ext = boost::program_options::ext_parser())
@@ -12 +13 @@
     return basic_command_line_parser_ex<charT>(argc, argv).options(desc).style(style).extra_parser(ext).run();
   }
+  */
 
   template<class charTx, class Iterator>
@@ -31 +33 @@
       )
     {}
-    /*
-#ifdef _WIN32
-    basic_command_line_parser_ex(const std::wstring args) 
-      : boost::program_options::basic_command_line_parser<charT>(boost::program_options::split_winmain(args))
+    basic_command_line_parser_ex(std::vector<charT> v) 
+      : boost::program_options::basic_command_line_parser<charT>(v)
     {}
-#endif
-    */
 
 };

modules/NRPEClient/CMakeLists.txt

@@ -36 +36 @@
   ${Boost_LIBRARIES}
   ${CMAKE_THREAD_LIBS_INIT}
+  ${OPENSSL_LIBRARIES}
   ${EXTRA_LIBS}
 )

modules/NRPEClient/NRPEClient.cpp

@@ -26 +26 @@
 #include <msvc_wrappers.h>
 //#include <execute_process.hpp>
-#include <program_options_ex.hpp>
 #include <strEx.h>
+
+
 
 NRPEClient gNRPEClient;
@@ -39 +40 @@
 #endif
 
-NRPEClient::NRPEClient() : buffer_length_(0), bInitSSL(false) {
+NRPEClient::NRPEClient() : buffer_length_(0) {
 }
 
@@ -67 +68 @@
   return true;
 }
-void NRPEClient::initSSL() {
-  if (bInitSSL)
-    return;
-#ifdef USE_SSL
-  simpleSSL::SSL_init();
-#endif
-  bInitSSL = true;
-}
+
+void NRPEClient::add_options(po::options_description &desc, nrpe_connection_data command_data) {
+  desc.add_options()
+    ("help,h", "Show this help message.")
+    ("host,H", po::wvalue<std::wstring>(&command_data.host), "The address of the host running the NRPE daemon")
+    ("port,p", po::value<int>(&command_data.port), "The port on which the daemon is running (default=5666)")
+    ("command,c", po::wvalue<std::wstring>(&command_data.command), "The name of the command that the remote daemon should run")
+    ("timeout,t", po::value<int>(&command_data.timeout), "Number of seconds before connection times out (default=10)")
+    ("buffer-length,l", po::value<unsigned int>(&command_data.buffer_length), std::string("Length of payload (has to be same as on the server (default=" + to_string(buffer_length_) + ")").c_str())
+    ("no-ssl,n", po::value<bool>(&command_data.no_ssl)->zero_tokens()->default_value(false), "Do not initial an ssl handshake with the server, talk in plaintext.")
+    ("arguments,a", po::wvalue<std::vector<std::wstring> >(&command_data.argument_vector), "list of arguments")
+    ;
+}
+
 
 void NRPEClient::addCommand(strEx::blindstr key, std::wstring args) {
   try {
-    /*
-    TODO: reimplem,ent this!
-    boost::program_options::options_description desc = get_optionDesc();
-    boost::program_options::positional_options_description p = get_optionsPositional();
-
+
+    NRPEClient::nrpe_connection_data command_data;
     boost::program_options::variables_map vm;
-    boost::program_options::store(
-      basic_command_line_parser_ex<wchar_t>(args).options(desc).positional(p).run()
-      , vm);
-    boost::program_options::notify(vm); 
-    nrpe_connection_data cd = get_ConectionData(vm);
-    NSC_DEBUG_MSG_STD(_T("Added NRPE Client: ") + key.c_str() + _T(" = ") + cd.toString());
-    commands[key] = cd;
-    */
+
+    po::options_description desc("Allowed options");
+    buffer_length_ = SETTINGS_GET_INT(nrpe::PAYLOAD_LENGTH);
+    add_options(desc, command_data);
+
+    po::positional_options_description p;
+    p.add("arguments", -1);
+
+    std::vector<std::wstring> list;
+    //explicit escaped_list_separator(Char e = '\\', Char c = ',',Char q = '\"')
+    boost::escaped_list_separator<wchar_t> sep(L'\\', L' ', L'\"');
+    typedef boost::tokenizer<boost::escaped_list_separator<wchar_t>,std::wstring::const_iterator, std::wstring > tokenizer_t;
+    tokenizer_t tok(args, sep);
+    for(tokenizer_t::iterator beg=tok.begin(); beg!=tok.end();++beg){
+      std::wcout << *beg << std::endl;
+      list.push_back(*beg);
+    }
+
+    po::wparsed_options parsed = po::basic_command_line_parser<wchar_t>(list).options(desc).positional(p).run();
+    po::store(parsed, vm);
+    po::notify(vm);
+    command_data.parse_arguments();
+
+    NSC_DEBUG_MSG_STD(_T("Added NRPE Client: ") + key.c_str() + _T(" = ") + command_data.toString());
+    commands[key] = command_data;
   } catch (boost::program_options::validation_error &e) {
     NSC_LOG_ERROR_STD(_T("Could not parse: ") + key.c_str() + strEx::string_to_wstring(e.what()));
@@ -138 +159 @@
 }
 
-boost::program_options::options_description NRPEClient::get_optionDesc() {
-  boost::program_options::options_description desc("Allowed options");
-  buffer_length_ = SETTINGS_GET_INT(nrpe::PAYLOAD_LENGTH);
-  desc.add_options()
-    ("help,h", "Show this help message.")
-    ("host,H", boost::program_options::wvalue<std::wstring>(), "The address of the host running the NRPE daemon")
-    ("port,p", boost::program_options::value<int>(), "The port on which the daemon is running (default=5666)")
-    ("command,c", boost::program_options::wvalue<std::wstring>(), "The name of the command that the remote daemon should run")
-    ("timeout,t", boost::program_options::value<int>(), "Number of seconds before connection times out (default=10)")
-    ("buffer-length,l", boost::program_options::value<int>(), std::string("Length of payload (has to be same as on the server (default=" + strEx::s::itos(buffer_length_) + ")").c_str())
-    ("no-ssl,n", "Do not initial an ssl handshake with the server, talk in plaintext.")
-    ("arguments,a", boost::program_options::wvalue<std::vector<std::wstring> >(), "list of arguments")
-    ;
-  return desc;
-}
-boost::program_options::positional_options_description NRPEClient::get_optionsPositional() {
-  boost::program_options::positional_options_description p;
-  p.add("arguments", -1);
-  return p;
-}
-
-namespace po = boost::program_options;
 int NRPEClient::commandLineExec(const unsigned int argLen, TCHAR** args) {
   try {
@@ -168 +167 @@
     po::options_description desc("Allowed options");
     buffer_length_ = SETTINGS_GET_INT(nrpe::PAYLOAD_LENGTH);
-    desc.add_options()
-      ("help,h", "Show this help message.")
-      ("host,H", po::wvalue<std::wstring>(&command_data.host), "The address of the host running the NRPE daemon")
-      ("port,p", po::value<int>(&command_data.port), "The port on which the daemon is running (default=5666)")
-      ("command,c", po::wvalue<std::wstring>(&command_data.command), "The name of the command that the remote daemon should run")
-      ("timeout,t", po::value<int>(&command_data.timeout), "Number of seconds before connection times out (default=10)")
-      ("buffer-length,l", po::value<unsigned int>(&command_data.buffer_length), std::string("Length of payload (has to be same as on the server (default=" + to_string(buffer_length_) + ")").c_str())
-      ("no-ssl,n", po::value<bool>(&command_data.no_ssl)->zero_tokens()->default_value(false), "Do not initial an ssl handshake with the server, talk in plaintext.")
-      ("arguments,a", po::wvalue<std::vector<std::wstring> >(&command_data.argument_vector), "list of arguments")
-      ;
+    add_options(desc, command_data);
 
     po::positional_options_description p;
@@ -185 +175 @@
     po::notify(vm);
     command_data.parse_arguments();
-
-    std::wcout << _T("parsed data: ") << command_data.toString()<< std::endl;
 
     if (vm.count("help")) {
@@ -229 +217 @@
 #else
   
-  initSSL();
   simpleSSL::Socket socket(true);
   socket.connect(host, port);

modules/NRPEClient/NRPEClient.h

@@ -23 +23 @@
 #include <map>
 #include <nrpe/nrpepacket.hpp>
-#include <boost/program_options.hpp>
 
 
@@ -86 +85 @@
   command_list commands;
   unsigned int buffer_length_;
-  bool bInitSSL;
 
 public:
@@ -125 +123 @@
   NRPEPacket send_nossl(std::wstring host, int port, int timeout, NRPEPacket packet);
   NRPEPacket send_ssl(std::wstring host, int port, int timeout, NRPEPacket packet);
-  void initSSL();
-  boost::program_options::options_description get_optionDesc();
-  boost::program_options::positional_options_description get_optionsPositional();
-  nrpe_connection_data get_ConectionData(boost::program_options::variables_map &vm);
+  void add_options(po::options_description &desc, nrpe_connection_data command_data);
 
 

modules/NRPEClient/stdafx.h

@@ -46 +46 @@
 #include <boost/asio/ssl.hpp>
 #endif
+#include <program_options_ex.hpp>
+namespace po = boost::program_options;
 
+