Changeset 7f9c823 in nscp for service/NSClient++.h

Timestamp:

11/08/09 23:24:31 (4 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

6672c56

Parents:

3b4097d

Message:

First attempt at serious boostification.
NOTICE! This is NOT a complete edition, it build and runs but many features are disabled and/or broken.
But we have working, sockets and mutexes and conversion functions from boost inside now and more to come...
Also started to build with CMake since it works better then boost.build

File:

• service/NSClient++.h (modified) (4 diffs)

service/NSClient++.h

@@ -22 +22 @@
 
 #include <config.h>
-#include <ServiceCmd.h>
-#include <NTService.h>
+#include <service/system_service.hpp>
 #include "NSCPlugin.h"
 #include <Mutex.h>
@@ -31 +30 @@
 #include <com_helpers.hpp>
 #include <nsclient_session.hpp>
-
+#include <boost/thread/thread.hpp>
+#include <boost/thread/locks.hpp>
 
 /**
@@ -99 +99 @@
   pluginList messageHandlers_;
   std::wstring basePath;
-  MutexHandler internalVariables;
-  MutexHandler messageMutex;
+  boost::timed_mutex internalVariables;
+  boost::timed_mutex messageMutex;
   MutexRW  m_mutexRW;
   MutexRW  m_mutexRWcmdDescriptions;
@@ -180 +180 @@
 };
 
-typedef service_helper::NTService<NSClientT> NSClient;
+typedef service_helper::impl<NSClientT>::system_service NSClient;
 
 extern NSClient mainClient; // Global core instance forward declaration.
 
 
-std::wstring Encrypt(std::wstring str, unsigned int algorithm = NSCAPI::xor);
-std::wstring Decrypt(std::wstring str, unsigned int algorithm = NSCAPI::xor);
+std::wstring Encrypt(std::wstring str, unsigned int algorithm = NSCAPI::encryption_xor);
+std::wstring Decrypt(std::wstring str, unsigned int algorithm = NSCAPI::encryption_xor);
 
 //////////////////////////////////////////////////////////////////////////