X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fmain.c;h=876dc70be79891645b6edfa6050b8cf84302c273;hb=bb5692b9cbff069abbf9573c81e86c3cd2061ceb;hp=0aa1a1bb8b2bec5be0908f34ec345c7ccb5e78e4;hpb=8942135758dbad0f07add7c1e2567867d4f53d6b;p=NeonServV5.git

diff --git a/src/main.c b/src/main.c
index 0aa1a1b..876dc70 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,3 +1,19 @@
+/* main.c - NeonServ v5.3
+ * Copyright (C) 2011-2012  Philipp Kreil (pk910)
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License 
+ * along with this program. If not, see <http://www.gnu.org/licenses/>. 
+ */
 
 #include "main.h"
 #include "ClientSocket.h"
@@ -15,8 +31,17 @@
 #include "timeq.h"
 #include "EventLogger.h"
 #include "ModeNode.h"
+#include "IRCQueue.h"
+#include "DBHelper.h"
+#include "commands.h"
+#include "ConfigParser.h"
+#include "ssl.h"
 
 time_t start_time;
+static int running, hard_restart;
+static int statistics_requested_lusers = 0;
+int statistics_enabled;
+TIMEQ_CALLBACK(main_statistics);
 
 void cleanup() {
     free_sockets();
@@ -32,8 +57,44 @@ void cleanup() {
     free_lang();
 }
 
-int main(void)
-{
+static int load_mysql_config() {
+    char *mysql_host, *mysql_user, *mysql_pass, *mysql_base;
+    int mysql_serverport;
+    if(loadConfig("neonserv.conf")) {
+        mysql_host = get_string_field("MySQL.host");
+        if(!mysql_host) {
+            perror("invalid neonserv.conf: missing MySQL.host");
+            return 0;
+        }
+        mysql_serverport = get_int_field("MySQL.port");
+        if(!mysql_serverport)
+            mysql_serverport = 3306;
+        mysql_user = get_string_field("MySQL.user");
+        if(!mysql_user) {
+            perror("invalid neonserv.conf: missing MySQL.user");
+            return 0;
+        }
+        mysql_pass = get_string_field("MySQL.pass");
+        if(!mysql_pass) {
+            perror("invalid neonserv.conf: missing MySQL.pass");
+            return 0;
+        }
+        mysql_base = get_string_field("MySQL.base");
+        if(!mysql_base) {
+            perror("invalid neonserv.conf: missing MySQL base");
+            return 0;
+        }
+    } else {
+        perror("Unable to load neonserv.conf");
+        return 0;
+    }
+    init_mysql(mysql_host, mysql_serverport, mysql_user, mysql_pass, mysql_base);
+    return 1;
+}
+
+int main(int argc, char *argv[]) {
+main:
+    
     start_time = time(0);
     
     #ifdef WIN32
@@ -48,8 +109,13 @@ int main(void)
     }
     #endif
     
-    init_mysql();
+    if(!load_mysql_config()) return 0;
+    
+    statistics_enabled = get_int_field("statistics.enable");
+    
+    queue_init();
     init_lang();
+    ssl_init();
     init_parser();
     init_UserNode();
     init_ChanNode();
@@ -58,12 +124,18 @@ int main(void)
 	init_modcmd();
     init_handleinfohandler();
     init_tools();
+    register_commands();
     init_bots();
+    init_DBHelper();
     
     load_languages();
+    int update_minutes = get_int_field("statistics.frequency");
+    if(!update_minutes) update_minutes = 2;
+    timeq_add(update_minutes * 60 + 10, main_statistics, NULL);
     
     time_t socket_wait;
-    while(1) {
+    running = 1;
+    while(running) {
         socket_wait = time(0) + SOCKET_SELECT_TIME;
         do {
             socket_loop(SOCKET_SELECT_TIME);
@@ -72,7 +144,22 @@ int main(void)
         loop_bots();
         clearTempUsers();
         destroyEvents();
+        queue_loop();
     }
+    cleanup();
+    if(hard_restart) {
+        /* Append a NULL to the end of argv[]. */
+        char **restart_argv = (char **)alloca((argc + 1) * sizeof(char *));
+        memcpy(restart_argv, argv, argc * sizeof(char *));
+        restart_argv[argc] = NULL;
+        
+        #ifdef WIN32
+        execv(argv[0], (const char * const*)restart_argv);
+        #else
+        execv(argv[0], restart_argv);
+        #endif
+    }
+    goto main;
 }
 
 int stricmp (const char *s1, const char *s2)
@@ -104,3 +191,59 @@ int stricmplen (const char *s1, const char *s2, int len)
    return c1 - c2;
 }
 
+void restart_bot(int do_hard_restart) {
+    hard_restart = do_hard_restart;
+    running = 0;
+}
+
+void stop_bot() {
+    cleanup();
+    exit(0);
+}
+
+void reload_config() {
+    loadConfig("neonserv.conf");
+}
+
+TIMEQ_CALLBACK(main_statistics) {
+    int update_minutes = get_int_field("statistics.frequency");
+    if(!update_minutes) update_minutes = 2;
+    timeq_add(update_minutes * 60, main_statistics, NULL);
+    if(get_int_field("statistics.enable")) {
+        statistics_enabled = 1;
+        statistics_requested_lusers = 1;
+        if(get_int_field("statistics.include_lusers")) {
+            struct ClientSocket *bot, *lusersbot = NULL;
+            for(bot = getBots(SOCKET_FLAG_READY, NULL); bot; bot = getBots(SOCKET_FLAG_READY, bot)) {
+                if(bot->flags & SOCKET_FLAG_PREFERRED)
+                    lusersbot = bot;
+            }
+            bot = lusersbot;
+            if(bot == NULL) bot = getBots(SOCKET_FLAG_READY, NULL);
+            putsock(bot, "LUSERS");
+        } else {
+            statistics_update();
+        }
+    } else
+        statistics_enabled = 0;
+}
+
+void statistics_update() {
+    if(get_int_field("statistics.enable") && statistics_requested_lusers && get_string_field("statistics.execute")) {
+        statistics_requested_lusers = 0;
+        char command[MAXLEN];
+        /* parameters:
+         - visible users
+         - visible chanusers
+         - visible channels
+         - privmsg per minute
+         - commands per minute
+         - network users
+         - network channels
+        */
+        sprintf(command, "%s %d %d %d %d %d %d %d", get_string_field("statistics.execute"), getUserCount(), getChanUserCount(), getChannelCount(), statistics_privmsg, statistics_commands, statistics_network_users, statistics_network_channels);
+        statistics_privmsg = 0;
+        statistics_commands = 0;
+        system(command);
+    }
+}