added error message if modules block is missing in configuration

[NeonServV5.git] / src / modules.c

diff --git a/src/modules.c b/src/modules.c
index 0d65cb8e6eb781474c0cafbe719ad1099b1b3ac9..ba3a43a6b8fb32937ad4665bc464d74bb3de053b 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
@@ -44,6 +44,7 @@
 /* 170-180 */ #include "UserNode.h"
 /* 181-183 */ #include "WHOHandler.h"
 /* 184-188 */ #include "version.h"
+/* 189     */ /* modules.h */
 
 #define Function void *
 
@@ -247,7 +248,8 @@ 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
 };
 
 static int module_id_counter = 1;
@@ -257,6 +259,7 @@ 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;
@@ -270,6 +273,7 @@ void loadModules() {
         }
         i++;
     }
+    free(modulelist);
     start_modules();
 }
 
@@ -282,13 +286,17 @@ struct ModuleInfo *loadModule(char *name) {
     #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 NULL;
-        }
+    }
+    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");
@@ -467,3 +475,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;
+}