X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fmain.c;h=17980b445762e5b2b9634d94bc2c4f2d93e98c98;hb=c32e8254ec4ed0d77757e32f8aa5aabcdb494057;hp=6698c5ca15f22863610a885304df8d055795b437;hpb=e9e5c06662ed53f276e7840648812e291b474291;p=NeonServV5.git

diff --git a/src/main.c b/src/main.c
index 6698c5c..17980b4 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
@@ -35,15 +35,24 @@
 #include "DBHelper.h"
 #include "commands.h"
 #include "ConfigParser.h"
+#include "ssl.h"
+#include "QServer.h"
 
 time_t start_time;
-static int running;
+static int running, hard_restart;
 static int statistics_requested_lusers = 0;
 int statistics_enabled;
 TIMEQ_CALLBACK(main_statistics);
+TIMEQ_CALLBACK(main_checkauths);
+#ifdef HAVE_THREADS
+int running_threads;
+pthread_mutex_t cache_sync;
+pthread_mutex_t whohandler_sync, whohandler_mass_sync;
+#endif
 
 void cleanup() {
     free_sockets();
+    qserver_free();
     free_parser();
     free_UserNode();
     free_ChanNode();
@@ -91,7 +100,23 @@ static int load_mysql_config() {
     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);
+        clearTempUsers();
+        destroyEvents();
+    }
+    running_threads--;
+    return NULL;
+}
+#endif
+
+int main(int argc, char *argv[]) {
 main:
     
     start_time = time(0);
@@ -112,8 +137,17 @@ main:
     
     statistics_enabled = get_int_field("statistics.enable");
     
+    #ifdef HAVE_THREADS
+    THREAD_MUTEX_INIT(cache_sync);
+    THREAD_MUTEX_INIT(whohandler_sync);
+    THREAD_MUTEX_INIT(whohandler_mass_sync);
+    #endif
+    
     queue_init();
+    init_sockets();
+    init_timeq();
     init_lang();
+    ssl_init();
     init_parser();
     init_UserNode();
     init_ChanNode();
@@ -125,14 +159,40 @@ main:
     register_commands();
     init_bots();
     init_DBHelper();
+    qserver_init();
     
     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;
+    timeq_add(90, main_checkauths, 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++) {
+        running_threads++;
+        pthread_create(&tid[tid_id], NULL, thread_main, NULL);
+    }
+    int usleep_delay = 1000000 / TICKS_PER_SECOND;
+    while(running) {
+        timeq_tick();
+        loop_bots();
+        qserver_loop();
+        queue_loop();
+        usleep(usleep_delay);
+    }
+    for(tid_id = 0; tid_id < worker_threads; tid_id++) {
+        pthread_join(tid[tid_id], NULL);
+    }
+    running_threads = 0;
+    #else
+    time_t socket_wait;
     while(running) {
         socket_wait = time(0) + SOCKET_SELECT_TIME;
         do {
@@ -142,9 +202,23 @@ main:
         loop_bots();
         clearTempUsers();
         destroyEvents();
+        qserver_loop();
         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;
 }
 
@@ -177,7 +251,8 @@ int stricmplen (const char *s1, const char *s2, int len)
    return c1 - c2;
 }
 
-void restart_bot(int hard_restart) {
+void restart_bot(int do_hard_restart) {
+    hard_restart = do_hard_restart;
     running = 0;
 }
 
@@ -190,6 +265,82 @@ void reload_config() {
     loadConfig("neonserv.conf");
 }
 
+static int getCurrentSecondsOfDay() {
+    time_t now = time(0);
+    struct tm *timeofday = localtime(&now);
+    int seconds = 0;
+    seconds += timeofday->tm_hour * 3600;
+    seconds += timeofday->tm_min * 60;
+    seconds += timeofday->tm_sec;
+    return seconds;
+}
+
+static AUTHLOOKUP_CALLBACK(main_checkauths_callback) {
+    //check if registered is still valid
+    MYSQL_RES *res;
+    MYSQL_ROW row;
+    printf_mysql_query("SELECT `user_id`, `user_registered` FROM `users` WHERE `user_user` = '%s'", escape_string(auth));
+    res = mysql_use();
+    if ((row = mysql_fetch_row(res)) != NULL) {
+        if(!exists || (strcmp(row[1], "0") && registered != atoi(row[1]))) {
+            //User is no longer valid! Delete it...
+            deleteUser(atoi(row[0]));
+            char *alertchan = get_string_field("General.CheckAuths.alertchan");
+            if(alertchan) {
+                struct ChanNode *alertchan_chan = getChanByName(alertchan);
+                struct ClientSocket *alertclient;
+                if(alertchan_chan && (alertclient = getChannelBot(alertchan_chan, 0)) != NULL) {
+                    putsock(alertclient, "PRIVMSG %s :Deleted User %s", alertchan_chan->name, auth);
+                }
+            }
+        } else if(exists && !strcmp(row[1], "0")) {
+            printf_mysql_query("UPDATE `users` SET `user_registered` = '%lu', `user_lastcheck` = UNIX_TIMESTAMP() WHERE `user_id` = '%s'", (unsigned long) registered, row[0]);
+        } else {
+            printf_mysql_query("UPDATE `users` SET `user_lastcheck` = UNIX_TIMESTAMP() WHERE `user_id` = '%s'", row[0]);
+        }
+    }
+}
+
+TIMEQ_CALLBACK(main_checkauths) {
+    int next_call = 600;
+    if(get_int_field("General.CheckAuths.enabled")) {
+        int check_start_time = get_int_field("General.CheckAuths.start_time") * 3600;
+        int duration = get_int_field("General.CheckAuths.duration") * 60;
+        int now = getCurrentSecondsOfDay();
+        if(now < check_start_time && check_start_time+duration >= 86400) {
+            check_start_time -= 86400;
+        }
+        if(now >= check_start_time && now < (check_start_time + duration)) {
+            next_call = get_int_field("General.CheckAuths.interval");
+            //get the "longest-unchecked-user"
+            MYSQL_RES *res;
+            MYSQL_ROW row;
+            int lastcheck;
+            time_t unixtime = time(0);
+            int min_unckecked = get_int_field("General.CheckAuths.min_unckecked");
+            printf_mysql_query("SELECT `user_user`, `user_lastcheck` FROM `users` ORDER BY `user_lastcheck` ASC LIMIT 1");
+            res = mysql_use();
+            if ((row = mysql_fetch_row(res)) != NULL) {
+                lastcheck = atoi(row[1]);
+                if(!lastcheck || unixtime - lastcheck >= min_unckecked) {
+                    lookup_authname(row[0], main_checkauths_callback, NULL);
+                } else 
+                    next_call = 300;
+            }
+        } else {
+            int pending;
+            if(now > check_start_time)
+                pending = 86400 - now + check_start_time;
+            else
+                pending = check_start_time - now;
+            if(pending < 600)
+                next_call = pending;
+        }
+        
+    }
+    timeq_add(next_call, main_checkauths, NULL);
+}
+
 TIMEQ_CALLBACK(main_statistics) {
     int update_minutes = get_int_field("statistics.frequency");
     if(!update_minutes) update_minutes = 2;