X-Git-Url: http://git.pk910.de/?p=NeonServV5.git;a=blobdiff_plain;f=src%2Fmain.c;h=60b7ec6ac4b37fb9e1f5f08f95ea29a0c02b176b;hp=d6258a7598e5fce77fdb7b4116f27c68a681d30b;hb=55831bf424312a6908ca07a904f288fba0919a9a;hpb=ffc462dec2b405f14d7b13d37e17b95ea6fdf2f5

diff --git a/src/main.c b/src/main.c
index d6258a7..60b7ec6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,5 @@
-/* main.c - NeonServ v5.2
- * Copyright (C) 2011  Philipp Kreil (pk910)
+/* 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
@@ -34,9 +34,14 @@
 #include "IRCQueue.h"
 #include "DBHelper.h"
 #include "commands.h"
-#include "lib/ini.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();
@@ -53,48 +58,60 @@ void cleanup() {
 }
 
 static int load_mysql_config() {
-    char mysql_host[MAXLEN], mysql_port_str[MAXLEN], mysql_user[MAXLEN], mysql_pass[MAXLEN], mysql_base[MAXLEN];
+    char *mysql_host, *mysql_user, *mysql_pass, *mysql_base;
     int mysql_serverport;
-    if(loadINI("neonserv.ini") == FILE_SUCCESS) {
-        mysql_host[0] = '\0';
-        ReadString("MySQL", "host", mysql_host);
-        if(!*mysql_host) {
-            perror("invalid neonserv.ini: missing MySQL host");
+    if(loadConfig("neonserv.conf")) {
+        mysql_host = get_string_field("MySQL.host");
+        if(!mysql_host) {
+            perror("invalid neonserv.conf: missing MySQL.host");
             return 0;
         }
-        mysql_port_str[0] = '\0';
-        ReadString("MySQL", "port", mysql_port_str);
-        mysql_serverport = atoi(mysql_port_str);
+        mysql_serverport = get_int_field("MySQL.port");
         if(!mysql_serverport)
             mysql_serverport = 3306;
-        mysql_user[0] = '\0';
-        ReadString("MySQL", "user", mysql_user);
-        if(!*mysql_user) {
-            perror("invalid neonserv.ini: missing MySQL user");
+        mysql_user = get_string_field("MySQL.user");
+        if(!mysql_user) {
+            perror("invalid neonserv.conf: missing MySQL.user");
             return 0;
         }
-        mysql_pass[0] = '\0';
-        ReadString("MySQL", "pass", mysql_pass);
-        if(!*mysql_pass) {
-            perror("invalid neonserv.ini: missing MySQL pass");
+        mysql_pass = get_string_field("MySQL.pass");
+        if(!mysql_pass) {
+            perror("invalid neonserv.conf: missing MySQL.pass");
             return 0;
         }
-        mysql_base[0] = '\0';
-        ReadString("MySQL", "base", mysql_base);
-        if(!*mysql_base) {
-            perror("invalid neonserv.ini: missing MySQL base");
+        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.ini");
+        perror("Unable to load neonserv.conf");
         return 0;
     }
     init_mysql(mysql_host, mysql_serverport, mysql_user, mysql_pass, mysql_base);
     return 1;
 }
 
-int main(void)
-{
+#ifdef HAVE_THREADS
+void * thread_main(void *arg) {
+    time_t socket_wait;
+    while(running) {
+        socket_wait = time(0) + SOCKET_SELECT_TIME;
+        do {
+            socket_loop(SOCKET_SELECT_TIME);
+        } while(time(0) < socket_wait);
+        timeq_tick();
+        loop_bots();
+        clearTempUsers();
+        destroyEvents();
+        queue_loop();
+    }
+    return NULL;
+}
+#endif
+
+int main(int argc, char *argv[]) {
+main:
     
     start_time = time(0);
     
@@ -112,8 +129,12 @@ int main(void)
     
     if(!load_mysql_config()) return 0;
     
+    statistics_enabled = get_int_field("statistics.enable");
+    
     queue_init();
+    init_timeq();
     init_lang();
+    ssl_init();
     init_parser();
     init_UserNode();
     init_ChanNode();
@@ -127,9 +148,26 @@ int main(void)
     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);
+    
+    int worker_threads = get_int_field("General.worker_threads");
+    if(!worker_threads) worker_threads = 1;
     
+    running = 1;
+    #ifdef HAVE_THREADS
+    pthread_t tid[worker_threads];
+    int tid_id = 0;
+    for(tid_id = 0; tid_id < worker_threads; tid_id++) {
+        pthread_create(&tid[tid_id], NULL, thread_main, NULL);
+    }
+    for(tid_id = 0; tid_id < worker_threads; tid_id++) {
+        pthread_join(tid[tid_id], NULL);
+    }
+    #else
     time_t socket_wait;
-    while(1) {
+    while(running) {
         socket_wait = time(0) + SOCKET_SELECT_TIME;
         do {
             socket_loop(SOCKET_SELECT_TIME);
@@ -140,6 +178,21 @@ int main(void)
         destroyEvents();
         queue_loop();
     }
+    #endif
+    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)
@@ -171,3 +224,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);
+    }
+}