Remove InspIRCd* parameters and fields

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

diff --git a/src/dynamic.cpp b/src/dynamic.cpp
index 77513bbb49c0b3b816ff033738590fbf091da2ec..8731489c435cc5761f0a452b2ca6dbd5fedbaa90 100644 (file)
--- a/src/dynamic.cpp
+++ b/src/dynamic.cpp
@@ -2,171 +2,66 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  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.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
+/* $Core */
 
-#include "inspircd_config.h"
-#include "inspircd_io.h"
-#include "globals.h"
+#include "inspircd.h"
 #include "dynamic.h"
-
-#ifndef STATIC_LINK
+#ifndef WIN32
 #include <dlfcn.h>
-#else
-#include "modlist.h"
 #endif
 
-#include "inspstring.h"
-#include "helperfuncs.h"
-#include <unistd.h>
-#include <sys/types.h>
-#include <stdio.h>
-
-extern ServerConfig* Config;
-
-DLLManager::DLLManager(char *fname)
+DLLManager::DLLManager(const char *fname)
 {
-#ifdef STATIC_LINK
-       this->staticname[0] = '\0';
-       log(DEBUG,"Loading core-compiled module '%s'",fname);
-       for (int j = 0; modsyms[j].name; j++)
-       {
-               log(DEBUG,"Check %s",modsyms[j].name);
-               if (!strcmp(modsyms[j].name,fname))
-               {
-                       log(DEBUG,"Found %s",fname);
-                       strlcpy(this->staticname,fname,1020);
-                       err = 0;
-                       return;
-               }
-       }
-       err = "Module is not statically compiled into the ircd";
-#else
-#ifdef IS_CYGWIN
-       // Cygwin behaviour is handled slightly differently
-       // With the advent of dynamic modules. Because Windows
-       // wont let you overwrite a file which is currently in
-       // Use, we can safely attempt to load the module from its
-       // Current location :)
+       err = NULL;
 
-       h = dlopen(fname, RTLD_NOW );
-       err = (char*)dlerror();
-
-#else
-       // Copy the library to a temp location, this makes recompiles
-       // a little safer if the ircd is running at the time as the
-       // shared libraries are mmap()ed and not doing this causes
-       // segfaults.
-       FILE* x = fopen(fname,"rb");
-       if (!x)
+       if (!strstr(fname,".so"))
        {
-               err = "Module file not found or cannot access, game over man!";
+               err = "This doesn't look like a module file to me...";
+               return;
        }
-       char tmpfile_template[255];
-       char buffer[65536];
-       snprintf(tmpfile_template, 255, "%s/inspircd_file.so.%d.XXXXXXXXXX",Config->TempDir,getpid());
-       int fd = mkstemp(tmpfile_template);
-       while (!feof(x))
+
+       h = dlopen(fname, RTLD_NOW|RTLD_LOCAL);
+       if (!h)
        {
-               int n = fread(buffer, 1, 65535, x);
-               if (n)
-                       write(fd,buffer,n);
+               err = dlerror();
+               return;
        }
-       
-       // Try to open the library now and get any error message.
-       
-       h = dlopen(tmpfile_template, RTLD_NOW );
-       err = (char*)dlerror();
-       close(fd);
-       // We can delete the tempfile once it's loaded, leaving just the inode.
-       if (!Config->debugging)
-               unlink(tmpfile_template);
-#endif
-#endif
 }
 
 DLLManager::~DLLManager()
 {
-#ifndef STATIC_LINK
-       // close the library if it isn't null
-       if (h != 0)
-       dlclose(h);
-#endif
+       /* close the library */
+       if (h)
+               dlclose(h);
 }
 
 
 
-#ifdef STATIC_LINK
-
-bool DLLManager::GetSymbol(initfunc* &v, char *sym_name)
+bool DLLManager::GetSymbol(void** v, const char* sym_name)
 {
-       log(DEBUG,"Symbol search...");
-       for (int j = 0; modsyms[j].name; j++)
-       {
-               if (!strcmp(this->staticname,modsyms[j].name))
-               {
-                       log(DEBUG,"Loading symbol...");
-                       v = modsyms[j].value;
-                       err = 0;
-                       return true;
-               }
-       }
-       err = "Module symbol missing from the core";
-       return false;
-}
+       /*
+        * try extract a symbol from the library
+        * get any error message is there is any
+        */
 
-#else
-
-bool DLLManager::GetSymbol(void **v, char *sym_name)
-{
-       // try extract a symbol from the library
-       // get any error message is there is any
-       
-       if(h != 0)
+       if (h)
        {
-               *v = dlsym( h, sym_name );
-               err = (char*)dlerror();
-               if( err == 0 )
-                       return true;
-               else
+               dlerror(); // clear value
+               *v = dlsym(h, sym_name);
+               err = dlerror();
+               if (!*v || err)
                        return false;
        }
-       else
-       {       
-               return false;
-       }
-}
-
-#endif
-
-DLLFactoryBase::DLLFactoryBase(char *fname, char *factory) : DLLManager(fname)
-{
-       // try get the factory function if there is no error yet
-       
-       factory_func = 0;
-       
-       if(LastError() == 0)
-       {
-#ifdef STATIC_LINK
-               GetSymbol( factory_func, factory ? factory : (char*)"init_module" );
-#else
-               GetSymbol( (void **)&factory_func, factory ? factory : (char*)"init_module" );
-#endif
-       }
-}
-
 
-DLLFactoryBase::~DLLFactoryBase()
-{
+       /* succeeded :) */
+       return true;
 }