X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fmain.c;h=7e1839f1c9ca27127ef907388c861e19c4a3ac3d;hb=db9df7a1356859ffb8dcca001317940c92a80045;hp=ffa830d2a90563b04f67c442a339feb45327596b;hpb=7650fa6f3ccabbbf8a8b02b1a706bafb1a17a169;p=NeonServV5.git diff --git a/src/main.c b/src/main.c index ffa830d..7e1839f 100644 --- a/src/main.c +++ b/src/main.c @@ -16,6 +16,7 @@ */ #include "main.h" +#include "signal.h" #include "ClientSocket.h" #include "UserNode.h" #include "ChanNode.h" @@ -36,18 +37,25 @@ #include "commands.h" #include "ConfigParser.h" #include "ssl.h" +#include "QServer.h" time_t start_time; static int running, hard_restart; static int statistics_requested_lusers = 0; int statistics_enabled; TIMEQ_CALLBACK(main_statistics); +TIMEQ_CALLBACK(main_checkauths); +static int process_argc; +static char **process_argv; #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(); @@ -96,6 +104,8 @@ static int load_mysql_config() { } #ifdef HAVE_THREADS +pthread_t *current_threads = NULL; + void * thread_main(void *arg) { time_t socket_wait; while(running) { @@ -109,10 +119,35 @@ void * thread_main(void *arg) { running_threads--; return NULL; } + +int getCurrentThreadID() { + if(!current_threads) return 0; + int i; + unsigned int my_tid = (unsigned int) pthread_self_tid(); + for(i = 0; i < running_threads; i++) { + #ifdef WIN32 + if((unsigned int) current_threads[i].p == my_tid) + #else + if((unsigned int) current_threads[i] == my_tid) + #endif + return i+1; + } + return 0; +} + #endif int main(int argc, char *argv[]) { main: + process_argv = argv; + process_argc = argc; + + signal(SIGABRT, sighandler); + signal(SIGFPE, sighandler); + signal(SIGILL, sighandler); + signal(SIGINT, sighandler); + signal(SIGSEGV, sighandler); + signal(SIGTERM, sighandler); start_time = time(0); @@ -132,6 +167,12 @@ 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(); @@ -148,32 +189,35 @@ 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); + 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; + current_threads = calloc(worker_threads, sizeof(*current_threads)); for(tid_id = 0; tid_id < worker_threads; tid_id++) { running_threads++; - pthread_create(&tid[tid_id], NULL, thread_main, NULL); + pthread_create(¤t_threads[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); + pthread_join(current_threads[tid_id], NULL); } running_threads = 0; #else @@ -187,25 +231,29 @@ 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 + restart_process(); } goto main; } +void restart_process() { + /* Append a NULL to the end of argv[]. */ + char **restart_argv = (char **)alloca((process_argc + 1) * sizeof(char *)); + memcpy(restart_argv, process_argv, process_argc * sizeof(char *)); + restart_argv[process_argc] = NULL; + #ifdef WIN32 + execv(process_argv[0], (const char * const*)restart_argv); + #else + execv(process_argv[0], restart_argv); + #endif +} + int stricmp (const char *s1, const char *s2) { if (s1 == NULL) return s2 == NULL ? 0 : -(*s2); @@ -249,6 +297,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;