fixed renameAccount function (merging mode)

[NeonServV5.git] / src / modules.c

diff --git a/src/modules.c b/src/modules.c
index db3a291606f51ef8bd5fdc726a93ec21ac04dd4d..7310c88465152f21f1dc0351869489867d1346e4 100644 (file)
--- 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,7 +43,7 @@
 /* 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"
@@ -48,17 +51,19 @@
 /* 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,
@@ -89,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,
@@ -113,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,
@@ -257,7 +262,11 @@ void *global_functions[] = {
 /* 191 */ (Function) module_global_cmd_register_neonbackup,
 /* 192 */ (Function) module_global_cmd_unregister_neonbackup,
 /* 193 */ (Function) module_neonbackup_recover_chan,
-/* 194 */ (Function) requestInvite
+/* 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;
@@ -308,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
@@ -320,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;
     }
@@ -349,7 +356,6 @@ 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;
@@ -451,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) {