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;
// 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");
+ FILE* x = fopen(fname,"rb");
if (!x)
{
err = strerror(errno);
return;
}
- log(DEBUG,"Opened module file %s",fname);
+ ServerInstance->Log(DEBUG,"Opened module file %s",fname);
char tmpfile_template[255];
char buffer[65536];
- snprintf(tmpfile_template, 255, "%s/inspircd_file.so.%d.XXXXXXXXXX",Config->TempDir,getpid());
+ snprintf(tmpfile_template, 255, "%s/inspircd_file.so.%d.XXXXXXXXXX",ServerInstance->Config->TempDir,getpid());
int fd = mkstemp(tmpfile_template);
if (fd == -1)
{
err = strerror(errno);
return;
}
- log(DEBUG,"Copying %s to %s",fname, tmpfile_template);
+ ServerInstance->Log(DEBUG,"Copying %s to %s",fname, tmpfile_template);
while (!feof(x))
{
int n = fread(buffer, 1, 65535, x);
}
}
}
- log(DEBUG,"Copied entire file.");
+ ServerInstance->Log(DEBUG,"Copied entire file.");
// Try to open the library now and get any error message.
if (close(fd) == -1)
err = strerror(errno);
if (fclose(x) == EOF)
- err = strerror(errno);*/
+ err = strerror(errno);
h = dlopen(fname, RTLD_NOW|RTLD_LOCAL);
if (!h)
{
- log(DEBUG,"dlerror occured!");
- err = dlerror();
+ ServerInstance->Log(DEBUG,"dlerror occured!");
+ err = (char*)dlerror();
return;
}
- /*log(DEBUG,"Finished loading '%s': %0x",tmpfile_template, h);
+ ServerInstance->Log(DEBUG,"Finished loading '%s': %0x",tmpfile_template, h);
// We can delete the tempfile once it's loaded, leaving just the inode.
- if (!err && !Config->debugging)
+ if (!err && !ServerInstance->Config->debugging)
{
- log(DEBUG,"Deleteting %s",tmpfile_template);
+ ServerInstance->Log(DEBUG,"Deleteting %s",tmpfile_template);
if (unlink(tmpfile_template) == -1)
err = strerror(errno);
- }*/
+ }
#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)
{
- log(DEBUG,"Found symbol %s", sym_name);
dlerror(); // clear value
- *v = dlsym(h, "init_module");
- err = dlerror();
-
- log(DEBUG,"%s",err);
+ *v = dlsym(h, sym_name);
+ err = (char*)dlerror();
if (!*v || err)
return false;
-
- log(DEBUG,"%0x %0x",dlsym(h, "init_module"), *v);
}
if (err)
{
- log(DEBUG,"Not found symbol");
return false;
}
else
#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
- if (!GetSymbol( factory_func, factory ? factory : "init_module" ))
+ if (!GetSymbol( factory_func, symbol ? symbol : "init_module"))
#else
- if (!GetSymbol( (void **)&factory_func, factory ? factory : "init_module" ))
+ if (!GetSymbol( (void **)&factory_func, symbol ? symbol : "init_module"))
#endif
{
throw ModuleException("Missing init_module() entrypoint!");