X-Git-Url: http://git.pk910.de/?p=NeonServV5.git;a=blobdiff_plain;f=src%2Fmodules.c;h=4de2468fb237d819ffc5bda26f62a91a301ea30e;hp=064d84f64a67192b2358af4a2d747f1a1c99e67e;hb=c8e7ce1c57afaebf3996a6712c45f4c89c34ba44;hpb=2a7eea23fa213f73de99899fd324250e30f1d42b
diff --git a/src/modules.c b/src/modules.c
index 064d84f..4de2468 100644
--- 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
@@ -15,7 +15,9 @@
* along with this program. If not, see .
*/
#include "modules.h"
+#ifndef WIN32
#include
+#endif
/* 000-011 */ #include "main.h"
/* 012 */ #include "BanNode.h"
@@ -42,6 +44,10 @@
/* 170-180 */ #include "UserNode.h"
/* 181-183 */ #include "WHOHandler.h"
/* 184-188 */ #include "version.h"
+/* 189 */ /* modules.h */
+/* 190 */ /* UserNode.h */
+/* 191-193 */ #include "ModuleFunctions.h"
+/* 194 */ /* bots.h */
#define Function void *
@@ -107,8 +113,8 @@ void *global_functions[] = {
/* 054 */ (Function) unbind_nick,
/* 055 */ (Function) bind_part,
/* 056 */ (Function) unbind_part,
-/* 057 */ (Function) bind_quit,
-/* 058 */ (Function) unbind_quit,
+/* 057 */ (Function) NULL, /* deprecated */
+/* 058 */ (Function) NULL, /* deprecated */
/* 059 */ (Function) bind_kick,
/* 060 */ (Function) unbind_kick,
/* 061 */ (Function) bind_topic,
@@ -180,7 +186,7 @@ void *global_functions[] = {
/* 120 */ (Function) find_botwise_cmd_binding,
/* 121 */ (Function) bind_botwise_unbound_required_functions,
/* 122 */ (Function) find_cmd_function,
-/* 123 */ (Function) getTextBot,
+/* 123 */ (Function) NULL, /* deprecated */
/* 124 */ (Function) register_command_alias,
/* 125 */ (Function) getAllBinds,
/* 126 */ (Function) createModeNode,
@@ -245,24 +251,13 @@ void *global_functions[] = {
/* 185 */ (Function) get_creation,
/* 186 */ (Function) get_revision,
/* 187 */ (Function) get_codelines,
-/* 188 */ (Function) get_patchlevel
-};
-
-#define MODINFO_STATE_STARTED 0x01
-
-struct ModuleInfo {
- char *name;
- int module_id;
- #ifndef WIN32
- void *module;
- #else
- HMODULE module;
- #endif
- int state;
- void *startfunc;
- void *loopfunc;
- void *stopfunc;
- struct ModuleInfo *next;
+/* 188 */ (Function) get_patchlevel,
+/* 189 */ (Function) get_module_name,
+/* 190 */ (Function) isUserModeSet,
+/* 191 */ (Function) module_global_cmd_register_neonbackup,
+/* 192 */ (Function) module_global_cmd_unregister_neonbackup,
+/* 193 */ (Function) module_neonbackup_recover_chan,
+/* 194 */ (Function) requestInvite
};
static int module_id_counter = 1;
@@ -272,26 +267,44 @@ static void unregister_module_hooks(int module_id);
void loadModules() {
char **modulelist = get_all_fieldnames("modules");
+ if(!modulelist) return;
int i = 0;
- while(*modulelist[i]) {
- loadModule(modulelist[i]);
+ char tmp[MAXLEN];
+ struct ModuleInfo *modinfo;
+ while(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++;
}
+ free(modulelist);
start_modules();
}
-int loadModule(char *name) {
+struct ModuleInfo *loadModule(char *name) {
+ struct ModuleInfo *modinfo;
+ for(modinfo = modules; modinfo; modinfo = modinfo->next) {
+ if(!stricmp(modinfo->name, name)) return NULL;
+ }
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) {
- 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");
@@ -303,7 +316,7 @@ int loadModule(char *name) {
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");
@@ -313,24 +326,24 @@ int loadModule(char *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);
- 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);
- return 0;
+ return NULL;
}
- struct ModuleInfo *modinfo = malloc(sizeof(*modinfo));
+ modinfo = malloc(sizeof(*modinfo));
if(!modinfo) {
unregister_module_hooks(module_id);
- return 0;
+ return NULL;
}
modinfo->name = strdup(name);
modinfo->module_id = module_id;
@@ -338,9 +351,11 @@ int loadModule(char *name) {
modinfo->startfunc = startfunc;
modinfo->loopfunc = loopfunc;
modinfo->stopfunc = stopfunc;
+ modinfo->state = 0;
modinfo->next = modules;
modules = modinfo;
- return 1;
+ scan_module(modinfo);
+ return modinfo;
}
#ifndef WIN32
@@ -353,10 +368,49 @@ static void closemodule(HMODULE module) {
}
#endif
-int reload_module(char *name) {
+int ext_load_module(char *name) {
+ if(!loadModule(name)) return 0;
+ struct ModuleInfo *modinfo;
+ for(modinfo = modules; modinfo; modinfo = modinfo->next) {
+ if(!(modinfo->state & MODINFO_STATE_STARTED)) {
+ modinfo->state |= MODINFO_STATE_STARTED;
+ ((void (*)(int)) modinfo->startfunc)(MODSTATE_STARTSTOP);
+ } else
+ ((void (*)(int)) modinfo->startfunc)(MODSTATE_REBIND);
+ }
+ return 1;
+}
+
+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)) {
+ if(old_modinfo->state & MODINFO_STATE_PROTECTED) {
+ return 0;
+ }
+ if(old_prev)
+ old_prev->next = old_modinfo->next;
+ else
+ modules = old_modinfo->next;
+ unregister_module_hooks(old_modinfo->module_id);
+ ((void (*)(int)) old_modinfo->stopfunc)(MODSTATE_STARTSTOP);
+ closemodule(old_modinfo->module);
+ free_module_functions(old_modinfo);
+ free(old_modinfo->name);
+ free(old_modinfo);
+ return 1;
+ } else
+ old_prev = old_modinfo;
+ }
+ return 0;
+}
+
+int ext_reload_module(char *name) {
+ char libname[256];
+ struct ModuleInfo *old_modinfo, *old_prev = NULL;
+ for(old_modinfo = modules; old_modinfo; old_modinfo = old_modinfo->next) {
+ if(!stricmp(old_modinfo->name, name)) {
+ strcpy(libname, old_modinfo->name);
if(old_prev)
old_prev->next = old_modinfo->next;
else
@@ -364,24 +418,29 @@ int reload_module(char *name) {
unregister_module_hooks(old_modinfo->module_id);
((void (*)(int)) old_modinfo->stopfunc)(MODSTATE_RELOAD);
closemodule(old_modinfo->module);
+ free_module_functions(old_modinfo);
free(old_modinfo->name);
free(old_modinfo);
break;
} else
old_prev = old_modinfo;
}
- if(!loadModule(name)) return 0;
+ if(!loadModule(libname)) return 0;
struct ModuleInfo *modinfo;
for(modinfo = modules; modinfo; modinfo = modinfo->next) {
if(!(modinfo->state & MODINFO_STATE_STARTED)) {
modinfo->state |= MODINFO_STATE_STARTED;
- ((void (*)(int)) modinfo->startfunc)(MODSTATE_STARTSTOP);
+ ((void (*)(int)) modinfo->startfunc)(MODSTATE_RELOAD);
} else
((void (*)(int)) modinfo->startfunc)(MODSTATE_REBIND);
}
return 1;
}
+struct ModuleInfo *ext_get_modules(struct ModuleInfo *last) {
+ return (last ? last->next : modules);
+}
+
void start_modules() {
struct ModuleInfo *modinfo;
for(modinfo = modules; modinfo; modinfo = modinfo->next) {
@@ -406,6 +465,7 @@ void stop_modules() {
unregister_module_hooks(modinfo->module_id);
((void (*)(int)) modinfo->stopfunc)(MODSTATE_STARTSTOP);
closemodule(modinfo->module);
+ free_module_functions(modinfo);
free(modinfo->name);
free(modinfo);
}
@@ -416,6 +476,7 @@ static void unregister_module_hooks(int module_id) {
unregister_module_commands(module_id);
unregister_module_events(module_id);
unregister_module_timers(module_id);
+
}
int module_loaded(int module_id) {
@@ -427,3 +488,15 @@ int module_loaded(int module_id) {
}
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;
+}
+
+