X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fmodules.c;h=7310c88465152f21f1dc0351869489867d1346e4;hb=a40e0df080a82db2b1150492a8952cdfe3559185;hp=ba3a43a6b8fb32937ad4665bc464d74bb3de053b;hpb=ff689d90ad836cbbb3f1b773618ce249377bc631;p=NeonServV5.git

diff --git a/src/modules.c b/src/modules.c
index ba3a43a..7310c88 100644
--- a/src/modules.c
+++ b/src/modules.c
@@ -1,4 +1,4 @@
-/* modules.c - NeonServ v5.4
+/* modules.c - NeonServ v5.6
  * Copyright (C) 2011-2012  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -19,7 +19,10 @@
 #include <dlfcn.h>
 #endif
 
-/* 000-011 */ #include "main.h"
+/* 000-001 */ #include "main.h"
+/* 002-004 */ #include "tools.h"
+/* 005-006 */ /* deprecated */
+/* 007-011 */ /* main.h */
 /* 012     */ #include "BanNode.h"
 /* 013-019 */ #include "bots.h"
 /* 020-025 */ #include "ChanNode.h"
@@ -40,22 +43,27 @@
 /* 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,
+/* 005 */ (Function) NULL, /* deprecated */
+/* 006 */ (Function) NULL, /* deprecated */
 /* 007 */ (Function) restart_bot,
 /* 008 */ (Function) stop_bot,
 /* 009 */ (Function) reload_config,
@@ -86,7 +94,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,
@@ -110,8 +118,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,
@@ -183,7 +191,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,
@@ -249,7 +257,16 @@ void *global_functions[] = {
 /* 186 */ (Function) get_revision,
 /* 187 */ (Function) get_codelines,
 /* 188 */ (Function) get_patchlevel,
-/* 189 */ (Function) get_module_name
+/* 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;
@@ -300,7 +317,6 @@ struct ModuleInfo *loadModule(char *name) {
     }
     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
@@ -312,11 +328,10 @@ struct ModuleInfo *loadModule(char *name) {
     }
     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) {
+    if(!startfunc || !stopfunc || !modversion) {
         putlog(LOGLEVEL_ERROR, "Error loading module '%s': required symbols not found.\n", name);
         return NULL;
     }
@@ -341,11 +356,11 @@ struct ModuleInfo *loadModule(char *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;
+    scan_module(modinfo);
     return modinfo;
 }
 
@@ -386,6 +401,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;
@@ -408,6 +424,7 @@ 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;
@@ -440,13 +457,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) {
@@ -454,6 +464,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);
     }
@@ -464,6 +475,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) {
@@ -485,3 +497,5 @@ char *get_module_name(int module_id) {
     }
     return NULL;
 }
+
+