X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fmodules.c;h=4372c48433d1bec7140922c977e862a754acffce;hb=4929b3cfa489f3fc5868bf768479f30fff18a272;hp=b848f6d3d13af756379039c3667edce98776d8f8;hpb=602499790b63accdf081052900ae5cfcddd11def;p=NeonServV5.git

diff --git a/src/modules.c b/src/modules.c
index b848f6d..4372c48 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"
@@ -42,6 +44,8 @@
 /* 170-180 */ #include "UserNode.h"
 /* 181-183 */ #include "WHOHandler.h"
 /* 184-188 */ #include "version.h"
+/* 189     */ /* modules.h */
+/* 190     */ /* UserNode.h */
 
 #define Function void *
 
@@ -245,7 +249,9 @@ 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
 };
 
 static int module_id_counter = 1;
@@ -255,30 +261,44 @@ 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) {
+        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");
@@ -290,7 +310,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");
@@ -300,24 +320,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;
     }
     modinfo = malloc(sizeof(*modinfo));
     if(!modinfo) {
         unregister_module_hooks(module_id);
-        return 0;
+        return NULL;
     }
     modinfo->name = strdup(name);
     modinfo->module_id = module_id;
@@ -325,9 +345,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
@@ -357,6 +378,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
@@ -453,3 +477,13 @@ 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;
+}