summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2005-05-20 21:52:25 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2005-05-20 21:52:25 +0000
commit75e19b2ff35d6b42fe83e7200d3675d81e43ecc1 (patch)
tree5ca84d3f8de3da717786520b17bb7e9008043092 /src
parent16bdaa927d2f532dfdc9f81ec25a843ebc99d9ff (diff)
*** empty log message ***
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@1466 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src')
-rw-r--r--src/dynamic.cpp90
-rw-r--r--src/inspircd.cpp10
-rw-r--r--src/modules/m_chanprotect.cpp8
3 files changed, 83 insertions, 25 deletions
diff --git a/src/dynamic.cpp b/src/dynamic.cpp
index cc7aeb0b9..2e787f341 100644
--- a/src/dynamic.cpp
+++ b/src/dynamic.cpp
@@ -17,66 +17,114 @@
using namespace std;
#include "globals.h"
-#include <dlfcn.h>
+#include "inspircd_config.h"
#include "dynamic.h"
+
+#ifndef STATIC_LINK
+#include <dlfcn.h>
+#else
+#include "modlist.h"
+#endif
+
#include "inspstring.h"
#include "helperfuncs.h"
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
// Try to open the library now and get any error message.
- h=dlopen( fname, RTLD_NOW );
- err=dlerror();
+ h = dlopen( fname, RTLD_NOW );
+ err = dlerror();
+#endif
}
DLLManager::~DLLManager()
{
+#ifndef STATIC_LINK
// close the library if it isn't null
- if (h!=0)
- dlclose(h);
+ if (h != 0)
+ dlclose(h);
+#endif
+}
+
+
+
+#ifdef STATIC_LINK
+
+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;
+ }
+ }
+ err = "Module symbol missing from the core";
+ return false;
}
+#else
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 != 0)
{
*v = dlsym( h, sym_name );
- err=dlerror();
- if( err==0 )
- return true;
- else
- return false;
+ err = dlerror();
+ if( err == 0 )
+ return true;
+ else
+ return false;
}
else
{
- return false;
+ return false;
}
-
}
+#endif
DLLFactoryBase::DLLFactoryBase(const char *fname, const char *factory) : DLLManager(fname)
{
// try get the factory function if there is no error yet
- factory_func=0;
+ factory_func = 0;
- if( LastError()==0 )
- {
- GetSymbol( (void **)&factory_func, factory ? factory : "init_module" );
+ if(LastError() == 0)
+ {
+#ifdef STATIC_LINK
+ GetSymbol( factory_func, factory ? factory : "init_module" );
+#else
+ GetSymbol( (void **)&factory_func, factory ? factory : "init_module" );
+#endif
}
-
}
DLLFactoryBase::~DLLFactoryBase()
{
}
-
-
-
diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 9f5a0e69c..4e6e0f86c 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -2440,17 +2440,25 @@ bool UnloadModule(const char* filename)
bool LoadModule(const char* filename)
{
char modfile[MAXBUF];
+#ifdef STATIC_LINK
+ snprintf(modfile,MAXBUF,"%s",filename);
+#else
snprintf(modfile,MAXBUF,"%s/%s",ModPath,filename);
+#endif
std::string filename_str = filename;
+#ifndef STATIC_LINK
if (!DirValid(modfile))
{
log(DEFAULT,"Module %s is not within the modules directory.",modfile);
snprintf(MODERR,MAXBUF,"Module %s is not within the modules directory.",modfile);
return false;
}
+#endif
log(DEBUG,"Loading module: %s",modfile);
+#ifndef STATIC_LINK
if (FileExists(modfile))
{
+#endif
for (int j = 0; j < module_names.size(); j++)
{
if (module_names[j] == filename_str)
@@ -2483,6 +2491,7 @@ bool LoadModule(const char* filename)
snprintf(MODERR,MAXBUF,"Factory function failed!");
return false;
}
+#ifndef STATIC_LINK
}
else
{
@@ -2490,6 +2499,7 @@ bool LoadModule(const char* filename)
snprintf(MODERR,MAXBUF,"Module file could not be found");
return false;
}
+#endif
MODCOUNT++;
return true;
}
diff --git a/src/modules/m_chanprotect.cpp b/src/modules/m_chanprotect.cpp
index 6314cca94..7155e1355 100644
--- a/src/modules/m_chanprotect.cpp
+++ b/src/modules/m_chanprotect.cpp
@@ -24,7 +24,7 @@ using namespace std;
/* $ModDesc: Provides channel modes +a and +q */
-char dummyvalue[] = "on";
+char fakevalue[] = "on";
class ModuleChanProtect : public Module
{
@@ -107,7 +107,7 @@ class ModuleChanProtect : public Module
// this way is best as it adds data thats accessible to other modules
// (so long as you document your code properly) without breaking anything
// because its encapsulated neatly in a map.
- if (user->Extend("cm_founder_"+std::string(channel->name),dummyvalue))
+ if (user->Extend("cm_founder_"+std::string(channel->name),fakevalue))
{
Srv->Log(DEBUG,"Marked user "+std::string(user->nick)+" as founder for "+std::string(channel->name));
}
@@ -222,7 +222,7 @@ class ModuleChanProtect : public Module
{
if (!theuser->GetExt("cm_founder_"+std::string(chan->name)))
{
- theuser->Extend("cm_founder_"+std::string(chan->name),dummyvalue);
+ theuser->Extend("cm_founder_"+std::string(chan->name),fakevalue);
return 1;
}
}
@@ -265,7 +265,7 @@ class ModuleChanProtect : public Module
{
if (!theuser->GetExt("cm_protect_"+std::string(chan->name)))
{
- theuser->Extend("cm_protect_"+std::string(chan->name),dummyvalue);
+ theuser->Extend("cm_protect_"+std::string(chan->name),fakevalue);
return 1;
}
}