3rd time lucky? Fix again for setsockopt.

[user/henk/code/inspircd.git] / src / dynamic.cpp

diff --git a/src/dynamic.cpp b/src/dynamic.cpp
index 0d719755a7b373748ce768ea6a5f3fc8a884aebe..453a80127f7c435abca11fad2da498e84f165051 100644 (file)
--- a/src/dynamic.cpp
+++ b/src/dynamic.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -11,12 +11,15 @@
  * ---------------------------------------------------
  */
 
-#include "configreader.h"
+/* $Core */
+
+#include "inspircd.h"
 #include "dynamic.h"
+#ifndef WIN32
 #include <dlfcn.h>
-#include "inspircd.h"
+#endif
 
-DLLManager::DLLManager(InspIRCd* ServerInstance, const char *fname)
+DLLManager::DLLManager(const char *fname)
 {
        err = NULL;
 
@@ -26,17 +29,17 @@ DLLManager::DLLManager(InspIRCd* ServerInstance, const char *fname)
                return;
        }
 
-       h = dlopen(fname, RTLD_NOW|RTLD_LOCAL);
+       h = dlopen(fname, RTLD_NOW|RTLD_LOCAL|RTLD_NODELETE);
        if (!h)
        {
-               err = (char*)dlerror();
+               err = dlerror();
                return;
        }
 }
 
 DLLManager::~DLLManager()
 {
-       // close the library if it isn't null
+       /* close the library */
        if (h)
                dlclose(h);
 }
@@ -45,43 +48,20 @@ DLLManager::~DLLManager()
 
 bool DLLManager::GetSymbol(void** v, const char* sym_name)
 {
-       // try extract a symbol from the library
-       // get any error message is there is any
-       
+       /*
+        * try extract a symbol from the library
+        * get any error message is there is any
+        */
+
        if (h)
        {
                dlerror(); // clear value
                *v = dlsym(h, sym_name);
-               err = (char*)dlerror();
+               err = dlerror();
                if (!*v || err)
                        return false;
        }
-       
-       if (err)
-       {
-               return false;
-       }
-       else
-       {       
-               return true;
-       }
-}
 
-DLLFactoryBase::DLLFactoryBase(InspIRCd* Instance, const char* fname, const char* symbol) : DLLManager(Instance, fname)
-{
-       // try get the factory function if there is no error yet
-       factory_func = 0;
-       
-       if (!LastError())
-       {
-               if (!GetSymbol( (void **)&factory_func, symbol ? symbol : "init_module"))
-               {
-                       throw ModuleException("Missing init_module() entrypoint!");
-               }
-       }
+       /* succeeded :) */
+       return true;
 }
-
-DLLFactoryBase::~DLLFactoryBase()
-{
-}
-