projects
/
NeonServV5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added stats module for neonserv.krypton-bouncer.de stats
[NeonServV5.git]
/
src
/
modules.c
diff --git
a/src/modules.c
b/src/modules.c
index b848f6d3d13af756379039c3667edce98776d8f8..d024c3e186f3abb39bdf80534cf77aa3f16f2d8d 100644
(file)
--- a/
src/modules.c
+++ b/
src/modules.c
@@
-1,4
+1,4
@@
-/* modules.c - NeonServ v5.
3
+/* modules.c - NeonServ v5.
4
* Copyright (C) 2011-2012 Philipp Kreil (pk910)
*
* This program is free software: you can redistribute it and/or modify
* Copyright (C) 2011-2012 Philipp Kreil (pk910)
*
* This program is free software: you can redistribute it and/or modify
@@
-15,7
+15,9
@@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "modules.h"
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "modules.h"
+#ifndef WIN32
#include <dlfcn.h>
#include <dlfcn.h>
+#endif
/* 000-011 */ #include "main.h"
/* 012 */ #include "BanNode.h"
/* 000-011 */ #include "main.h"
/* 012 */ #include "BanNode.h"
@@
-42,6
+44,7
@@
/* 170-180 */ #include "UserNode.h"
/* 181-183 */ #include "WHOHandler.h"
/* 184-188 */ #include "version.h"
/* 170-180 */ #include "UserNode.h"
/* 181-183 */ #include "WHOHandler.h"
/* 184-188 */ #include "version.h"
+/* 189 */ /* modules.h */
#define Function void *
#define Function void *
@@
-245,7
+248,8
@@
void *global_functions[] = {
/* 185 */ (Function) get_creation,
/* 186 */ (Function) get_revision,
/* 187 */ (Function) get_codelines,
/* 185 */ (Function) get_creation,
/* 186 */ (Function) get_revision,
/* 187 */ (Function) get_codelines,
-/* 188 */ (Function) get_patchlevel
+/* 188 */ (Function) get_patchlevel,
+/* 189 */ (Function) get_module_name
};
static int module_id_counter = 1;
};
static int module_id_counter = 1;
@@
-256,29
+260,41
@@
static void unregister_module_hooks(int module_id);
void loadModules() {
char **modulelist = get_all_fieldnames("modules");
int i = 0;
void loadModules() {
char **modulelist = get_all_fieldnames("modules");
int i = 0;
+ char tmp[MAXLEN];
+ struct ModuleInfo *modinfo;
while(modulelist[i]) {
while(modulelist[i]) {
- loadModule(modulelist[i]);
+ sprintf(tmp, "modules.%s.enabled", modulelist[i]);
+ if(get_int_field(tmp)) {
+ modinfo = loadModule(modulelist[i]);
+ sprintf(tmp, "modules.%s.protected", modulelist[i]);
+ if(get_int_field(tmp))
+ modinfo->state |= MODINFO_STATE_PROTECTED;
+ }
i++;
}
start_modules();
}
i++;
}
start_modules();
}
-
int
loadModule(char *name) {
+
struct ModuleInfo *
loadModule(char *name) {
struct ModuleInfo *modinfo;
for(modinfo = modules; modinfo; modinfo = modinfo->next) {
struct ModuleInfo *modinfo;
for(modinfo = modules; modinfo; modinfo = modinfo->next) {
- if(!stricmp(modinfo->name, name)) return
0
;
+ if(!stricmp(modinfo->name, name)) return
NULL
;
}
char fname[256];
#ifndef WIN32
sprintf(fname, "%s.so", name);
void* module = dlopen(fname, RTLD_LAZY);
}
char fname[256];
#ifndef WIN32
sprintf(fname, "%s.so", name);
void* module = dlopen(fname, RTLD_LAZY);
+ if(!module) {
+ sprintf(fname, "./%s.so", name);
+ module = dlopen(fname, RTLD_LAZY);
+ }
if(!module) {
sprintf(fname, ".libs/%s.so", name);
module = dlopen(fname, RTLD_LAZY);
if(!module) {
sprintf(fname, ".libs/%s.so", name);
module = dlopen(fname, RTLD_LAZY);
- if(!module) {
- putlog(LOGLEVEL_ERROR, "Error loading module '%s': %s not found.\n", name, fname);
-
return 0
;
- }
+ }
+ if(!module) {
+
putlog(LOGLEVEL_ERROR, "Error loading module '%s': %s not found.\n", name, fname)
;
+ return NULL;
}
void* initfunc = dlsym(module, "init_module");
void* startfunc = dlsym(module, "start_module");
}
void* initfunc = dlsym(module, "init_module");
void* startfunc = dlsym(module, "start_module");
@@
-290,7
+306,7
@@
int loadModule(char *name) {
HMODULE module = LoadLibrary(fname);
if(!module) {
putlog(LOGLEVEL_ERROR, "Error loading module '%s': %s not found.\n", name, fname);
HMODULE module = LoadLibrary(fname);
if(!module) {
putlog(LOGLEVEL_ERROR, "Error loading module '%s': %s not found.\n", name, fname);
- return
0
;
+ return
NULL
;
}
FARPROC initfunc = GetProcAddress(module, "init_module");
FARPROC startfunc = GetProcAddress(module, "start_module");
}
FARPROC initfunc = GetProcAddress(module, "init_module");
FARPROC startfunc = GetProcAddress(module, "start_module");
@@
-300,24
+316,24
@@
int loadModule(char *name) {
#endif
if(!startfunc || !loopfunc || !stopfunc || !modversion) {
putlog(LOGLEVEL_ERROR, "Error loading module '%s': required symbols not found.\n", name);
#endif
if(!startfunc || !loopfunc || !stopfunc || !modversion) {
putlog(LOGLEVEL_ERROR, "Error loading module '%s': required symbols not found.\n", name);
- return
0
;
+ return
NULL
;
}
int version = ((int (*)(void)) modversion)();
if(version != MODULE_VERSION) {
putlog(LOGLEVEL_ERROR, "Error loading module '%s': version mismatch ('%d' main code, '%d' module)\n", name, MODULE_VERSION, version);
}
int version = ((int (*)(void)) modversion)();
if(version != MODULE_VERSION) {
putlog(LOGLEVEL_ERROR, "Error loading module '%s': version mismatch ('%d' main code, '%d' module)\n", name, MODULE_VERSION, version);
- return
0
;
+ return
NULL
;
}
//start module
int errid;
int module_id = module_id_counter++;
if((errid = ((int (*)(void **, int)) initfunc)(global_functions, module_id))) {
putlog(LOGLEVEL_ERROR, "Error loading module '%s': module reported error (errid: %d)\n", name, errid);
}
//start module
int errid;
int module_id = module_id_counter++;
if((errid = ((int (*)(void **, int)) initfunc)(global_functions, module_id))) {
putlog(LOGLEVEL_ERROR, "Error loading module '%s': module reported error (errid: %d)\n", name, errid);
- return
0
;
+ return
NULL
;
}
modinfo = malloc(sizeof(*modinfo));
if(!modinfo) {
unregister_module_hooks(module_id);
}
modinfo = malloc(sizeof(*modinfo));
if(!modinfo) {
unregister_module_hooks(module_id);
- return
0
;
+ return
NULL
;
}
modinfo->name = strdup(name);
modinfo->module_id = module_id;
}
modinfo->name = strdup(name);
modinfo->module_id = module_id;
@@
-325,9
+341,10
@@
int loadModule(char *name) {
modinfo->startfunc = startfunc;
modinfo->loopfunc = loopfunc;
modinfo->stopfunc = stopfunc;
modinfo->startfunc = startfunc;
modinfo->loopfunc = loopfunc;
modinfo->stopfunc = stopfunc;
+ modinfo->state = 0;
modinfo->next = modules;
modules = modinfo;
modinfo->next = modules;
modules = modinfo;
- return
1
;
+ return
modinfo
;
}
#ifndef WIN32
}
#ifndef WIN32
@@
-357,6
+374,9
@@
int ext_unload_module(char *name) {
struct ModuleInfo *old_modinfo, *old_prev = NULL;
for(old_modinfo = modules; old_modinfo; old_modinfo = old_modinfo->next) {
if(!stricmp(old_modinfo->name, name)) {
struct ModuleInfo *old_modinfo, *old_prev = NULL;
for(old_modinfo = modules; old_modinfo; old_modinfo = old_modinfo->next) {
if(!stricmp(old_modinfo->name, name)) {
+ if(old_modinfo->state & MODINFO_STATE_PROTECTED) {
+ return 0;
+ }
if(old_prev)
old_prev->next = old_modinfo->next;
else
if(old_prev)
old_prev->next = old_modinfo->next;
else
@@
-453,3
+473,13
@@
int module_loaded(int module_id) {
}
return 0;
}
}
return 0;
}
+
+char *get_module_name(int module_id) {
+ if(!module_id) return NULL;
+ struct ModuleInfo *modinfo;
+ for(modinfo = modules; modinfo; modinfo = modinfo->next) {
+ if(modinfo->module_id == module_id)
+ return modinfo->name;
+ }
+ return NULL;
+}