using namespace std;
-#include "inspircd_config.h"
-#include "inspircd_io.h"
-#include "globals.h"
+#include "configreader.h"
#include "dynamic.h"
#ifndef STATIC_LINK
#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;
+
+ if (!strstr(fname,".so"))
+ {
+ err = "This doesn't look like a module file to me...";
+ return;
+ }
#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;
}
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");
- char tmpfile_template[255];
- char buffer[65536];
- snprintf(tmpfile_template, 255, "/tmp/inspircd_file.so.%d.XXXXXXXXXX",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 = (char*)dlerror();
+ ServerInstance->Log(DEBUG,"dlerror '%s' occured!", err);
+ 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);
+
+ ServerInstance->Log(DEBUG,"Finished loading '%s': %0x", fname, h);
#endif
}
{
#ifndef STATIC_LINK
// close the library if it isn't null
- if (h != 0)
- dlclose(h);
+ if (h)
+ dlclose(h);
#endif
}
#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;
#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()
{
}
+