X-Git-Url: http://git.pk910.de/?p=NeonServV5.git;a=blobdiff_plain;f=src%2Fmodules.c;h=f48c41a0b2b0eda7a55987eda7522398057f807f;hp=53ff4afc4e6463f0fa3053420e070a491e025489;hb=HEAD;hpb=92aff95471b2d258d9fc4852d0b14ab9855cd447
diff --git a/src/modules.c b/src/modules.c
index 53ff4af..f48c41a 100644
--- a/src/modules.c
+++ b/src/modules.c
@@ -1,4 +1,4 @@
-/* modules.c - NeonServ v5.3
+/* modules.c - NeonServ v5.6
* Copyright (C) 2011-2012 Philipp Kreil (pk910)
*
* This program is free software: you can redistribute it and/or modify
@@ -15,9 +15,18 @@
* along with this program. If not, see .
*/
#include "modules.h"
+#ifndef WIN32
#include
+#endif
-/* 000-011 */ #include "main.h"
+/* 000-001 */ #include "main.h"
+/* 002-004 */ #include "tools.h"
+#ifdef ENABLE_MUTEX_DEBUG
+/* 005-006 */ #include "mutexDebug.h"
+#endif
+/* 007-009 */ /* main.h */
+/* 010 */ #include "log.h"
+/* 011 */ /* main.h */
/* 012 */ #include "BanNode.h"
/* 013-019 */ #include "bots.h"
/* 020-025 */ #include "ChanNode.h"
@@ -34,29 +43,42 @@
/* 099-102 */ #include "memoryDebug.h"
#endif
/* 103-106 */ #include "memoryInfo.h"
-/* 107-125 */ #include "modcmd.h"
+/* 107-122 */ #include "modcmd.h"
+/* 123 */ /* deprecated */
+/* 124-125 */ /* modcmd.h */
/* 126-136 */ #include "ModeNode.h"
/* 137-142 */ #include "mysqlConn.h"
/* 143-149 */ #include "timeq.h"
-/* 150-169 */ #include "tools.h"
+/* 150-169 */ /* tools.h */
/* 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 */
+/* 195-196 */ /* version.h */
+/* 197-198 */ /* IRCEvents.h */
#define Function void *
void *global_functions[] = {
/* 000 */ (Function) getStartTime,
/* 001 */ (Function) getRunningThreads,
-/* 002 */ (Function) exit_daemon,
+/* 002 */ (Function) getCurrentSecondsOfDay,
/* 003 */ (Function) stricmp,
/* 004 */ (Function) stricmplen,
-/* 005 */ (Function) restart_process,
-/* 006 */ (Function) cleanup,
+#ifdef ENABLE_MUTEX_DEBUG
+/* 005 */ (Function) xmutex,
+/* 006 */ (Function) mutex_debug,
+#else
+/* 005 */ (Function) NULL,
+/* 006 */ (Function) NULL,
+#endif
/* 007 */ (Function) restart_bot,
/* 008 */ (Function) stop_bot,
/* 009 */ (Function) reload_config,
-/* 010 */ (Function) putlog,
+/* 010 */ (Function) printf_log,
#ifdef HAVE_THREADS
/* 011 */ (Function) getCurrentThreadID,
#else
@@ -83,7 +105,7 @@ void *global_functions[] = {
/* 030 */ (Function) create_socket,
/* 031 */ (Function) connect_socket,
/* 032 */ (Function) close_socket,
-/* 033 */ (Function) disconnect_socket,
+/* 033 */ (Function) destroy_socket,
/* 034 */ (Function) write_socket,
/* 035 */ (Function) putsock,
/* 036 */ (Function) getBots,
@@ -107,8 +129,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) bind_reload,
+/* 058 */ (Function) unbind_reload,
/* 059 */ (Function) bind_kick,
/* 060 */ (Function) unbind_kick,
/* 061 */ (Function) bind_topic,
@@ -180,7 +202,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,7 +267,17 @@ void *global_functions[] = {
/* 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,
+/* 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,
+/* 195 */ (Function) is_stable_revision,
+/* 196 */ (Function) get_dev_revision,
+/* 197 */ (Function) bind_freeclient,
+/* 198 */ (Function) unbind_freeclient
};
static int module_id_counter = 1;
@@ -255,79 +287,92 @@ static void unregister_module_hooks(int module_id);
void loadModules() {
char **modulelist = get_all_fieldnames("modules");
+ if(!modulelist) return;
int i = 0;
+ char tmp[MAXLEN];
+ struct ModuleInfo *modinfo;
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++;
}
+ 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 0;
+ 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) {
+ printf_log("main", LOG_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* loopfunc = dlsym(module, "loop_module");
void* stopfunc = dlsym(module, "stop_module");
void* modversion = dlsym(module, "modversion");
#else
sprintf(fname, "%s.dll", name);
HMODULE module = LoadLibrary(fname);
if(!module) {
- putlog(LOGLEVEL_ERROR, "Error loading module '%s': %s not found.\n", name, fname);
- return 0;
+ printf_log("main", LOG_ERROR, "Error loading module '%s': %s not found.\n", name, fname);
+ return NULL;
}
FARPROC initfunc = GetProcAddress(module, "init_module");
FARPROC startfunc = GetProcAddress(module, "start_module");
- FARPROC loopfunc = GetProcAddress(module, "loop_module");
FARPROC stopfunc = GetProcAddress(module, "stop_module");
FARPROC modversion = GetProcAddress(module, "modversion");
#endif
- if(!startfunc || !loopfunc || !stopfunc || !modversion) {
- putlog(LOGLEVEL_ERROR, "Error loading module '%s': required symbols not found.\n", name);
- return 0;
+ if(!startfunc || !stopfunc || !modversion) {
+ printf_log("main", LOG_ERROR, "Error loading module '%s': required symbols not found.\n", name);
+ 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;
+ printf_log("main", LOG_ERROR, "Error loading module '%s': version mismatch ('%d' main code, '%d' module)\n", name, MODULE_VERSION, version);
+ 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;
+ printf_log("main", LOG_ERROR, "Error loading module '%s': module reported error (errid: %d)\n", name, errid);
+ return NULL;
}
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->module = module;
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
@@ -357,6 +402,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)) {
+ if(old_modinfo->state & MODINFO_STATE_PROTECTED) {
+ return 0;
+ }
if(old_prev)
old_prev->next = old_modinfo->next;
else
@@ -364,6 +412,7 @@ int ext_unload_module(char *name) {
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;
@@ -374,9 +423,11 @@ int ext_unload_module(char *name) {
}
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
@@ -384,13 +435,14 @@ int ext_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)) {
@@ -416,13 +468,6 @@ void start_modules() {
}
}
-void loop_modules() {
- struct ModuleInfo *modinfo;
- for(modinfo = modules; modinfo; modinfo = modinfo->next) {
- ((void (*)(void)) modinfo->loopfunc)();
- }
-}
-
void stop_modules() {
struct ModuleInfo *modinfo, *next;
for(modinfo = modules; modinfo; modinfo = next) {
@@ -430,6 +475,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);
}
@@ -440,6 +486,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) {
@@ -451,3 +498,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;
+}
+
+