X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fmain.c;h=b86633e7e01536e4df08fa7fb657f429dca994fc;hb=2b9e305af713f0960ac0cd7645af3e0ef85a8515;hp=8d0cd68d34f57afa54d58ca3b22668300ff959d1;hpb=2d9db1adb1946aba00b203f40eff7d5db8163f01;p=NeonServV5.git diff --git a/src/main.c b/src/main.c index 8d0cd68..b86633e 100644 --- a/src/main.c +++ b/src/main.c @@ -1,5 +1,5 @@ -/* main.c - NeonServ v5.1 - * 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 @@ -31,12 +31,28 @@ #include "timeq.h" #include "EventLogger.h" #include "ModeNode.h" -#include "lib/ini.h" +#include "IRCQueue.h" +#include "DBHelper.h" +#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); +#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(); @@ -50,48 +66,76 @@ 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 +pthread_t *current_threads = NULL; + +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; +} + +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: start_time = time(0); @@ -109,7 +153,19 @@ int main(void) if(!load_mysql_config()) return 0; + 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(); @@ -118,12 +174,43 @@ int main(void) init_modcmd(); init_handleinfohandler(); init_tools(); + 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 + 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(¤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(current_threads[tid_id], NULL); + } + running_threads = 0; + #else time_t socket_wait; - while(1) { + while(running) { socket_wait = time(0) + SOCKET_SELECT_TIME; do { socket_loop(SOCKET_SELECT_TIME); @@ -132,7 +219,24 @@ int main(void) 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; } int stricmp (const char *s1, const char *s2) @@ -164,3 +268,135 @@ 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"); +} + +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; + 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); + } +}