Whoops, make /stats s work

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

diff --git a/src/dynamic.cpp b/src/dynamic.cpp
index 0e207dbd9513d61c46baf67d7896d4e053baa03f..76efd4b1f388f900e73eabf719ec40a061678d45 100644 (file)
--- a/src/dynamic.cpp
+++ b/src/dynamic.cpp
@@ -16,9 +16,7 @@
 
 using namespace std;
 
-#include "inspircd_config.h"
 #include "configreader.h"
-#include "globals.h"
 #include "dynamic.h"
 
 #ifndef STATIC_LINK
@@ -27,15 +25,9 @@ using namespace std;
 #include "modlist.h"
 #endif
 
-#include "inspstring.h"
-#include "helperfuncs.h"
-#include <unistd.h>
-#include <sys/types.h>
-#include <stdio.h>
+#include "inspircd.h"
 
-extern ServerConfig* Config;
-
-DLLManager::DLLManager(char *fname)
+DLLManager::DLLManager(InspIRCd* ServerInstance, const char *fname)
 {
        err = NULL;
 
@@ -46,13 +38,13 @@ DLLManager::DLLManager(char *fname)
        }
 #ifdef STATIC_LINK
        this->staticname[0] = '\0';
-       log(DEBUG,"Loading core-compiled module '%s'",fname);
+       ServerInstance->Log(DEBUG,"Loading core-compiled module '%s'",fname);
        for (int j = 0; modsyms[j].name; j++)
        {
-               log(DEBUG,"Check %s",modsyms[j].name);
+               ServerInstance->Log(DEBUG,"Check %s",modsyms[j].name);
                if (!strcmp(modsyms[j].name,fname))
                {
-                       log(DEBUG,"Found %s",fname);
+                       ServerInstance->Log(DEBUG,"Found %s",fname);
                        strlcpy(this->staticname,fname,1020);
                        err = 0;
                        return;
@@ -60,49 +52,15 @@ DLLManager::DLLManager(char *fname)
        }
        err = "Module is not statically compiled into the ircd";
 #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)
-       {
-               err = "Module file not found or cannot access, game over man!";
-               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);
-       if (fd == -1)
+       h = dlopen(fname, RTLD_NOW|RTLD_LOCAL);
+       if (!h)
        {
-               fclose(x);
-               err = strerror(errno);
+               err = (char*)dlerror();
+               ServerInstance->Log(DEBUG,"dlerror '%s' occured!", err);
                return;
        }
-       while (!feof(x))
-       {
-               int n = fread(buffer, 1, 65535, x);
-               if (n)
-               {
-                       int written = write(fd,buffer,n);
-                       if (written != n)
-                       {
-                               fclose(x);
-                               err = strerror(errno);
-                               return;
-                       }
-               }
-       }
-       // Try to open the library now and get any error message.
-       
-       h = dlopen(tmpfile_template, RTLD_NOW );
-       err = (char*)dlerror();
-       close(fd);
-       fclose(x);
-       // We can delete the tempfile once it's loaded, leaving just the inode.
-       if (!Config->debugging)
-               unlink(tmpfile_template);
+
+       ServerInstance->Log(DEBUG,"Finished loading '%s': %0x", fname, h);
 #endif
 }
 
@@ -110,8 +68,8 @@ DLLManager::~DLLManager()
 {
 #ifndef STATIC_LINK
        // close the library if it isn't null
-       if (h != 0)
-       dlclose(h);
+       if (h)
+               dlclose(h);
 #endif
 }
 
@@ -119,14 +77,12 @@ DLLManager::~DLLManager()
 
 #ifdef STATIC_LINK
 
-bool DLLManager::GetSymbol(initfunc* &v, char *sym_name)
+bool DLLManager::GetSymbol(initfunc* &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;
@@ -138,45 +94,51 @@ bool DLLManager::GetSymbol(initfunc* &v, char *sym_name)
 
 #else
 
-bool DLLManager::GetSymbol(void **v, char *sym_name)
+bool DLLManager::GetSymbol(void** v, const 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 );
+               dlerror(); // clear value
+               *v = dlsym(h, sym_name);
                err = (char*)dlerror();
-               if( err == 0 )
-                       return true;
-               else
+               if (!*v || err)
                        return false;
        }
+       
+       if (err)
+       {
+               return false;
+       }
        else
        {       
-               return false;
+               return true;
        }
 }
 
 #endif
 
-DLLFactoryBase::DLLFactoryBase(char *fname, char *factory) : DLLManager(fname)
+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() == 0)
+       if (!LastError())
        {
 #ifdef STATIC_LINK
-               GetSymbol( factory_func, factory ? factory : (char*)"init_module" );
+               if (!GetSymbol( factory_func, symbol ? symbol : "init_module"))
 #else
-               GetSymbol( (void **)&factory_func, factory ? factory : (char*)"init_module" );
+               if (!GetSymbol( (void **)&factory_func, symbol ? symbol : "init_module"))
 #endif
+               {
+                       throw ModuleException("Missing init_module() entrypoint!");
+               }
        }
 }
 
-
 DLLFactoryBase::~DLLFactoryBase()
 {
 }
+