X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fmodules.c;h=aca36d08bb01c21441618e1d849a1038d9d9939b;hb=689da1db7e2517c187ce76c6c553e20d630a7f36;hp=064d84f64a67192b2358af4a2d747f1a1c99e67e;hpb=2a7eea23fa213f73de99899fd324250e30f1d42b;p=NeonServV5.git

diff --git a/src/modules.c b/src/modules.c
index 064d84f..aca36d0 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 <http://www.gnu.org/licenses/>. 
  */
 #include "modules.h"
+#ifndef WIN32
 #include <dlfcn.h>
+#endif
 
 /* 000-011 */ #include "main.h"
 /* 012     */ #include "BanNode.h"
@@ -248,23 +250,6 @@ void *global_functions[] = {
 /* 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;
-};
-
 static int module_id_counter = 1;
 static struct ModuleInfo *modules = NULL;
 
@@ -273,14 +258,26 @@ static void unregister_module_hooks(int module_id);
 void loadModules() {
     char **modulelist = get_all_fieldnames("modules");
     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++;
     }
     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);
@@ -290,7 +287,7 @@ int loadModule(char *name) {
         module = dlopen(fname, RTLD_LAZY);
         if(!module) {
             putlog(LOGLEVEL_ERROR, "Error loading module '%s': %s not found.\n", name, fname);
-            return 0;
+            return NULL;
         }
     }
     void* initfunc = dlsym(module, "init_module");
@@ -303,7 +300,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 +310,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 +335,10 @@ int loadModule(char *name) {
     modinfo->startfunc = startfunc;
     modinfo->loopfunc = loopfunc;
     modinfo->stopfunc = stopfunc;
+    modinfo->state = 0;
     modinfo->next = modules;
     modules = modinfo;
-    return 1;
+    return modinfo;
 }
 
 #ifndef WIN32
@@ -353,10 +351,48 @@ 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(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
@@ -370,18 +406,22 @@ int reload_module(char *name) {
         } 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) {