using namespace std;
-#include "inspircd_config.h"
#include "configreader.h"
-#include "globals.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(const char *fname)
+DLLManager::DLLManager(InspIRCd* ServerInstance, const char *fname)
{
err = NULL;
}
#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");
- if (!x)
- {
- err = strerror(errno);
- 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)
- {
- fclose(x);
- err = strerror(errno);
- 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 );
-
+ h = dlopen(fname, RTLD_NOW|RTLD_LOCAL);
if (!h)
{
- err = dlerror();
+ err = (char*)dlerror();
+ ServerInstance->Log(DEBUG,"dlerror '%s' occured!", err);
return;
}
- if (close(fd) == -1)
- err = strerror(errno);
- if (fclose(x) == EOF)
- err = strerror(errno);
- // We can delete the tempfile once it's loaded, leaving just the inode.
- if (!err && !Config->debugging)
- {
- if (unlink(tmpfile_template) == -1)
- err = strerror(errno);
- }
+ 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
}
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;
if (h)
{
+ dlerror(); // clear value
*v = dlsym(h, sym_name);
- err = dlerror();
- return !err;
+ err = (char*)dlerror();
+ if (!*v || err)
+ return false;
+ }
+
+ if (err)
+ {
+ return false;
}
else
{
- return false;
+ return true;
}
}
#endif
-DLLFactoryBase::DLLFactoryBase(const char* fname, const 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())
{
#ifdef STATIC_LINK
- GetSymbol( factory_func, factory ? factory : "init_module" );
+ if (!GetSymbol( factory_func, symbol ? symbol : "init_module"))
#else
- GetSymbol( (void **)&factory_func, factory ? factory : "init_module" );
+ if (!GetSymbol( (void **)&factory_func, symbol ? symbol : "init_module"))
#endif
+ {
+ throw ModuleException("Missing init_module() entrypoint!");
+ }
}
}
-
DLLFactoryBase::~DLLFactoryBase()
{
}
+