Changeset ea8a900 in nscp

Timestamp:

02/16/05 23:27:49 (8 years ago)

Author:

Michael Medin <michael@…>

Children:

c67f92f

Parents:

0a84a74

Message:

Changed plugin load/unload

Location:

trunk

Files:

• NSCPlugin.cpp (modified) (1 diff)
• NSCPlugin.h (modified) (1 diff)
• NSClient++.cpp (modified) (9 diffs)
• NSClient++.h (modified) (4 diffs)

trunk/NSCPlugin.cpp

@@ -154 +154 @@
 }
 /**
- * Helper function to create a plug in for a third party.
- * <b>Notice</b> though the name might suggest it the plug in is <b>not</b> actually loaded.
- *
- * @deprecated
- * @param file The file (DLL) of the plug in module
- * @return A pointer to a new instance of the plug in wrapper class.
- */
-NSCPlugin* NSCPlugin::loadPlugin(std::string file) {
-  return new NSCPlugin(file);
-}
-/**
  * Load all remote function pointers from the loaded module.
  * These pointers are cached for "speed" which might (?) be dangerous if something changes.

trunk/NSCPlugin.h

@@ -119 +119 @@
   void unload(void);
 
-  static NSCPlugin* loadPlugin(std::string file);
-
 private:
   bool isLoaded() const {

trunk/NSClient++.cpp

@@ -65 +65 @@
       LOG_MESSAGE("Enter command to inject or exit to terminate...");
       std::string s = "";
+      std::cin >> s;
       while (s != "exit") {
+        mainClient.inject(s);
         std::cin >> s;
-        mainClient.inject(s);
       }
       mainClient.TerminateService();
+      LOG_MESSAGE("DONE!");
       return 0;
     } else {
@@ -88 +90 @@
  */
 void NSClientT::InitiateService(void) {
-  char* buffer = new char[1024];
-  GetModuleFileName(NULL, buffer, 1023);
-  std::string path = buffer;
-  std::string::size_type pos = path.rfind('\\');
-  basePath = path.substr(0, pos) + "\\";
-  LOG_DEBUG_STD("Base path is: " + basePath);
-  delete [] buffer;
-  Settings::getInstance()->setFile(basePath + "NSC.ini");
+  Settings::getInstance()->setFile(getBasePath() + "NSC.ini");
 
   SettingsT::sectionList list = Settings::getInstance()->getSection("modules");
   for (SettingsT::sectionList::iterator it = list.begin(); it != list.end(); it++) {
     try {
-      LOG_DEBUG_STD("Loading: " + basePath + "modules\\" + (*it));
-      loadPlugin(basePath + "modules\\" + (*it));
+      LOG_DEBUG_STD("Loading: " + getBasePath() + "modules\\" + (*it));
+      loadPlugin(getBasePath() + "modules\\" + (*it));
     } catch(const NSPluginException& e) {
       LOG_ERROR_STD("Exception raised: " + e.error_ + " in module: " + e.file_);
@@ -116 +111 @@
     LOG_ERROR("Could not exit socket listener thread");
   try {
+    LOG_DEBUG("Socket closed, unloading plugins...");
     mainClient.unloadPlugins();
+    LOG_DEBUG("Plugins unloaded...");
   } catch(NSPluginException *e) {
     LOG_ERROR_STD("Exception raised: " + e->error_ + " in module: " + e->file_);
@@ -157 +154 @@
  */
 void NSClientT::unloadPlugins() {
+  pluginList::reverse_iterator it;
+  for (it = plugins_.rbegin(); it != plugins_.rend(); ++it) {
+#ifdef _DEBUG
+    std::cout << "Unloading plugin: " << (*it)->getName() << "...";
+#endif
+    (*it)->unload();
+#ifdef _DEBUG
+    std::cout << "OK" << std::endl;
+#endif
+  }
   messageHandlers_.clear();
   commandHandlers_.clear();
-  pluginList::reverse_iterator it;
   for (it = plugins_.rbegin(); it != plugins_.rend(); ++it) {
-    LOG_DEBUG_STD("---\n\n\nUnloading: " + (*it)->getName());
-    (*it)->unload();
     delete (*it);
   }
@@ -172 +176 @@
  */
 void NSClientT::loadPlugin(std::string file) {
-  addPlugin(NSCPlugin::loadPlugin(file));
+  addPlugin(new NSCPlugin(file));
 }
 /**
@@ -178 +182 @@
  * @param *plugin The plug-ininstance to load. The pointer is managed by the 
  */
-void NSClientT::addPlugin(NSCPlugin *plugin) {
+void NSClientT::addPlugin(plugin_type plugin) {
   plugin->load();
   LOG_DEBUG_STD("Loading: " + plugin->getName());
@@ -290 +294 @@
   }
 }
+std::string NSClientT::getBasePath(void) {
+  if (!basePath.empty())
+    return basePath;
+  char* buffer = new char[1024];
+  GetModuleFileName(NULL, buffer, 1023);
+  std::string path = buffer;
+  std::string::size_type pos = path.rfind('\\');
+  basePath = path.substr(0, pos) + "\\";
+  delete [] buffer;
+  Settings::getInstance()->setFile(basePath + "NSC.ini");
+  return basePath;
+}
+
 
 int NSAPIGetSettingsString(const char* section, const char* key, const char* defaultValue, char* buffer, unsigned int bufLen) {
@@ -298 +315 @@
 }
 
+
+int NSAPIGetBasePath(char*buffer, unsigned int bufLen) {
+  return NSCHelper::wrapReturnString(buffer, bufLen, mainClient.getBasePath());
+}
 int NSAPIGetApplicationName(char*buffer, unsigned int bufLen) {
   return NSCHelper::wrapReturnString(buffer, bufLen, SZAPPNAME);
@@ -329 +350 @@
   if (stricmp(buffer, "NSAPIInject") == 0)
     return &NSAPIInject;
+  if (stricmp(buffer, "NSAPIGetBasePath") == 0)
+    return &NSAPIGetBasePath;
   return NULL;
 }

trunk/NSClient++.h

@@ -37 +37 @@
 class NSClientT {
 private:
-  typedef std::list<NSCPlugin*> pluginList;
+  typedef NSCPlugin* plugin_type;
+  typedef std::list<plugin_type> pluginList;
   pluginList plugins_;
   pluginList commandHandlers_;
@@ -58 +59 @@
   // Member functions
   static std::string getPassword(void);
+  std::string getBasePath(void);
   std::string inject(std::string buffer);
   std::string execute(std::string password, std::string cmd, std::list<std::string> args);
@@ -68 +70 @@
 
 private:
-  void addPlugin(NSCPlugin *plugin);
+  void addPlugin(plugin_type plugin);
 
 };
@@ -82 +84 @@
 LPVOID NSAPILoader(char*buffer);
 int NSAPIGetApplicationName(char*buffer, unsigned int bufLen);
+int NSAPIGetBasePath(char*buffer, unsigned int bufLen);
 int NSAPIGetApplicationVersionStr(char*buffer, unsigned int bufLen);
 int NSAPIGetSettingsString(const char* section, const char* key, const char* defaultValue, char* buffer, unsigned int bufLen);