X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fmain.c;h=5ab1efd0bd5f93ccce05657783bcdda7f8722484;hb=4812835346f724fcea86e78f741cc6c72c86b676;hp=1730e38026f4389f721f33b8d15891190034e812;hpb=d8d2d7509f04822ba3910f8f1acecdff270bfe60;p=NeonServV5.git

diff --git a/src/main.c b/src/main.c
index 1730e38..5ab1efd 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,4 +1,4 @@
-/* main.c - NeonServ v5.3
+/* main.c - NeonServ v5.6
  * Copyright (C) 2011-2012  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -34,11 +34,13 @@
 #include "ModeNode.h"
 #include "IRCQueue.h"
 #include "DBHelper.h"
-#include "commands.h"
 #include "ConfigParser.h"
-#include "ssl.h"
 #include "QServer.h"
 #include "version.h"
+#include "modules.h"
+#include "module_commands.h"
+#include "ModuleFunctions.h"
+#include "IOHandler.h"
 
 time_t start_time;
 static int running, hard_restart;
@@ -58,7 +60,10 @@ pthread_mutex_t whohandler_sync, whohandler_mass_sync;
 static pthread_mutex_t log_sync;
 #endif
 
+static void check_firstrun();
+
 void cleanup() {
+    stop_modules();
     free_sockets();
     qserver_free();
     free_parser();
@@ -67,7 +72,6 @@ void cleanup() {
     free_bind();
     free_modcmd();
     free_whoqueue();
-    free_bots();
     free_mysql();
     free_handleinfohandler();
     free_lang();
@@ -104,23 +108,23 @@ static int load_mysql_config() {
     return 1;
 }
 
-#ifdef HAVE_THREADS
-pthread_t *current_threads = NULL;
+static TIMEQ_CALLBACK(clear_cache) {
+    timeq_add(CLEAR_CACHE_INTERVAL, 0, clear_cache, NULL);
+    clearTempUsers();
+    destroyEvents();
+    mysql_free();
+}
 
-void * thread_main(void *arg) {
-    time_t socket_wait;
+void *thread_main(void *arg) {
     while(running) {
-        socket_wait = time(0) + SOCKET_SELECT_TIME;
-        do {
-            socket_loop(SOCKET_SELECT_TIME);
-        } while(time(0) < socket_wait);
-        clearTempUsers();
-        destroyEvents();
+        iohandler_poll();
     }
-    running_threads--;
     return NULL;
 }
 
+#ifdef HAVE_THREADS
+pthread_t *current_threads = NULL;
+
 int getCurrentThreadID() {
     if(!current_threads) return 0;
     int i;
@@ -139,49 +143,83 @@ int getCurrentThreadID() {
 #endif
 
 void exit_daemon() {
+    running = 0;
     if(daemonized) {
         remove(PID_FILE);
     }
+    if(log_fptr) {
+        fclose(log_fptr);
+        log_fptr = NULL;
+    }
 }
 
 int main(int argc, char *argv[]) {
     int run_as_daemon = 1;
-    int argi;
+    int c;
     process_argv = argv;
     process_argc = argc;
     printf("NeonServ v%s\n\n", NEONSERV_VERSION);
-    for(argi = 1; argi < argc; argi++) {
-        if(!strcmp(argv[argi], "-f") || !strcmp(argv[argi], "--foreground")) {
+    struct option options[] = {
+        {"show", 1, 0, 's'},
+        {"foreground", 0, 0, 'f'},
+        {"help", 0, 0, 'h'},
+        {"version", 0, 0, 'v'},
+        {0, 0, 0, 0}
+    };
+    while ((c = getopt_long(argc, argv, "s:fvh", options, NULL)) != -1) {
+        switch (c) {
+        case 's':
+            print_loglevel = atoi(optarg);
+            break;
+        case 'f':
             run_as_daemon = 0;
-        } else if(!strcmp(argv[argi], "-s") || !strcmp(argv[argi], "--show")) {
-            if(argi+1 == argc) break;
-            argi++;
-            print_loglevel = atoi(argv[argi]);
-        } else if(!strcmp(argv[argi], "-v") || !strcmp(argv[argi], "--version")) {
+            break;
+        case 'v':
             printf("Version: %s.%d (%s)\n", NEONSERV_VERSION, patchlevel, (strcmp(revision, "") ? revision : "-"));
             printf("Build: #%s %s (%s lines, " COMPILER ")\n", compilation, creation, codelines);
             exit(0);
-        } else if(!strcmp(argv[argi], "-h") || !strcmp(argv[argi], "--help")) {
+            break;
+        case 'h':
             printf("Usage: ./neonserv [-s loglevel] [-f] [-h|-v]\n");
             printf(" -s, --show           show log lines matching loglevel in stdout.\n");
             printf(" -f, --foreground     run NeonServ in the foreground.\n");
             printf(" -h, --help           prints this usage message.\n");
             printf(" -v, --version        prints this program's version.\n");
             exit(0);
+            break;
         }
     }
+    #ifndef WIN32
     if(geteuid() == 0 || getuid() == 0) {
         fprintf(stderr, "NeonServ may not be run with super user privileges.\n");
         exit(0);
     }
+    #endif
+    #ifdef ENABLE_MEMORY_DEBUG
+    initMemoryDebug();
+    #endif
     if(!loadConfig(CONF_FILE)) {
         fprintf(stderr, "Unable to load " CONF_FILE "\n");
         exit(0);
     }
+    init_bind();
+    event_reload(1);
     #if HAVE_THREADS
     THREAD_MUTEX_INIT(log_sync);
     #endif
+    if(!load_mysql_config()) {
+        fprintf(stderr, "Unable to connect to MySQL\n");
+        exit(0);
+    }
+    check_firstrun();
+    char **modulelist = get_all_fieldnames("modules");
+    if(!modulelist || !modulelist[0]) {
+        fprintf(stderr, "no modules loaded... Please update your configuration!\n");
+        exit(0);
+    }
+    free(modulelist);
     if (run_as_daemon) {
+        #ifndef WIN32
         /* Attempt to fork into the background if daemon mode is on. */
         pid_t pid = fork();
         if (pid < 0) {
@@ -196,15 +234,17 @@ int main(int argc, char *argv[]) {
         atexit(exit_daemon);
         FILE *pidfile = fopen(PID_FILE, "w");
         if (pidfile == NULL) {
-            fprintf(stderr, "Unable to create PID file: %s", strerror(errno));
-            putlog(LOGLEVEL_ERROR, "Unable to create PID file: %s", strerror(errno));
+            fprintf(stderr, "Unable to create PID file: %s\n", strerror(errno));
+            putlog(LOGLEVEL_ERROR, "Unable to create PID file: %s\n", strerror(errno));
         } else {
             fprintf(pidfile, "%i\n", (int)getpid());
             fclose(pidfile);
         }
-        fclose(stdin);
-        fclose(stdout);
-        fclose(stderr);
+		FILE *retn;
+        fclose(stdin); retn = fopen("/dev/null", "r");
+        fclose(stdout); retn = fopen("/dev/null", "w");
+        fclose(stderr); retn = fopen("/dev/null", "w");
+        #endif
     }
     
 main:
@@ -215,26 +255,8 @@ main:
     signal(SIGSEGV, sighandler);
     signal(SIGTERM, sighandler);
     
-    #ifdef ENABLE_MEMORY_DEBUG
-    initMemoryDebug();
-    #endif
-    
     start_time = time(0);
     
-    #ifdef WIN32
-    int res;
-    WSADATA wsadata;
-    // Start Windows Sockets.
-    res = WSAStartup(MAKEWORD(2, 0), &wsadata);
-    if (res)
-    {
-        perror("Unable to start Windows Sockets");
-        return 0;
-    }
-    #endif
-    
-    if(!load_mysql_config()) return 0;
-    
     statistics_enabled = get_int_field("statistics.enable");
     
     #ifdef HAVE_THREADS
@@ -243,20 +265,18 @@ main:
     THREAD_MUTEX_INIT(whohandler_mass_sync);
     #endif
     
-    queue_init();
-    init_sockets();
-    init_timeq();
     init_lang();
-    ssl_init();
     init_parser();
     init_UserNode();
     init_ChanNode();
     init_ModeNode();
     init_bind();
 	init_modcmd();
+    register_module_commands();
     init_handleinfohandler();
     init_tools();
-    register_commands();
+    init_modulefunctions();
+    loadModules();
     init_bots();
     init_DBHelper();
     qserver_init();
@@ -264,9 +284,11 @@ main:
     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(update_minutes * 60 + 10, 0, main_statistics, NULL);
     
-    timeq_add(90, main_checkauths, NULL);
+    timeq_add(90, 0, main_checkauths, NULL);
+    
+    timeq_add(CLEAR_CACHE_INTERVAL, 0, clear_cache, NULL);
     
     int worker_threads = get_int_field("General.worker_threads");
     if(!worker_threads) worker_threads = 1;
@@ -278,32 +300,13 @@ main:
         running_threads++;
         pthread_create(&current_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);
-    }
+    #endif
+    thread_main(NULL);
+    #ifdef HAVE_THREADS
     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(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();
-        qserver_loop();
-        queue_loop();
-    }
     #endif
     cleanup();
     if(hard_restart) {
@@ -365,6 +368,7 @@ void stop_bot() {
 
 void reload_config() {
     loadConfig(CONF_FILE);
+    event_reload(0);
 }
 
 static int getCurrentSecondsOfDay() {
@@ -384,15 +388,24 @@ static AUTHLOOKUP_CALLBACK(main_checkauths_callback) {
     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]))) {
+        int diff = registered - atoi(row[1]);
+        if(diff < 0)
+            diff *= -1;
+        if(!exists || (strcmp(row[1], "0") && diff > 86400)) {
             //User is no longer valid! Delete it...
             deleteUser(atoi(row[0]));
             char *alertchan = get_string_field("General.CheckAuths.alertchan");
             if(alertchan) {
+                char reason[MAXLEN];
+                if(!exists) {
+                    strcpy(reason, "USER_NOT_EXISTS");
+                } else {
+                    sprintf(reason, "USER_REGISTERED_MISSMATCH: %lu, expected %d (diff: %d)", (unsigned long) registered, atoi(row[1]), diff);
+                }
                 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);
+                    putsock(alertclient, "PRIVMSG %s :Deleted User %s (%s)", alertchan_chan->name, auth, reason);
                 }
             }
         } else if(exists && !strcmp(row[1], "0")) {
@@ -425,7 +438,7 @@ TIMEQ_CALLBACK(main_checkauths) {
             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);
+                    lookup_authname(row[0], 0, main_checkauths_callback, NULL);
                 } else 
                     next_call = 300;
             }
@@ -440,13 +453,13 @@ TIMEQ_CALLBACK(main_checkauths) {
         }
         
     }
-    timeq_add(next_call, main_checkauths, NULL);
+    timeq_add(next_call, 0, 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);
+    timeq_add(update_minutes * 60, 0, main_statistics, NULL);
     if(get_int_field("statistics.enable")) {
         statistics_enabled = 1;
         statistics_requested_lusers = 1;
@@ -466,7 +479,7 @@ TIMEQ_CALLBACK(main_statistics) {
         statistics_enabled = 0;
 }
 
-void statistics_update() {
+int statistics_update() {
     if(get_int_field("statistics.enable") && statistics_requested_lusers && get_string_field("statistics.execute")) {
         statistics_requested_lusers = 0;
         char command[MAXLEN];
@@ -482,8 +495,21 @@ void statistics_update() {
         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);
+        return system(command);
     }
+	return -1;
+}
+
+time_t getStartTime() {
+    return start_time;
+}
+
+int getRunningThreads() {
+	#ifdef HAVE_THREADS
+    return running_threads;
+	#else
+	return 1;
+	#endif
 }
 
 void write_log(int loglevel, const char *line, int len) {
@@ -524,3 +550,108 @@ void putlog(int loglevel, const char *text, ...) {
     write_log(loglevel, logBuf, pos);
 }
 
+static void check_firstrun() {
+    MYSQL_RES *res;
+    MYSQL_ROW row;
+    printf_mysql_query("SELECT `user_id` FROM `users` WHERE `user_access` = 1000 LIMIT 1");
+    res = mysql_use();
+    if (mysql_fetch_row(res) == NULL) {
+        //first run!
+        printf("No superuser found...\n");
+        check_firstrun_admin:
+        printf("AuthServ account name of admin user: ");
+        char *ptr;
+        char adminuser[31];
+        ptr = fgets(adminuser, 30, stdin);
+        for(ptr = adminuser; *ptr; ptr++) { if(*ptr == '\n' || *ptr == '\r') *ptr = '\0'; }
+        if(strlen(adminuser) < 2) goto check_firstrun_admin;
+        printf_mysql_query("SELECT `user_id` FROM `users` WHERE `user_user` = '%s'", escape_string(adminuser));
+        res = mysql_use();
+        if ((row = mysql_fetch_row(res)) != NULL)
+            printf_mysql_query("UPDATE `users` SET `user_access` = 1000 WHERE `user_id` = '%s'", row[0]);
+        else
+            printf_mysql_query("INSERT INTO `users` (`user_user`, `user_access`) VALUES ('%s', 1000)", escape_string(adminuser));
+    }
+    printf_mysql_query("SELECT `id` FROM `bots` WHERE `active` = 1 LIMIT 1");
+    res = mysql_use();
+    if (mysql_fetch_row(res) == NULL) {
+        //no bot active
+        printf("No active bot found...\n\n");
+        printf("ADD NEW BOT\n");
+        char *ptr;
+        char bot_nick[31];
+        check_firstrun_bot_nick:
+        printf("Nick: ");
+        ptr = fgets(bot_nick, 30, stdin);
+        for(ptr = bot_nick; *ptr; ptr++) { if(*ptr == '\n' || *ptr == '\r') *ptr = '\0'; }
+        if(strlen(bot_nick) < 2) goto check_firstrun_bot_nick;
+        char bot_ident[16];
+        check_firstrun_bot_ident:
+        printf("Ident: ");
+        ptr = fgets(bot_ident, 15, stdin);
+        for(ptr = bot_ident; *ptr; ptr++) { if(*ptr == '\n' || *ptr == '\r') *ptr = '\0'; }
+        if(strlen(bot_ident) < 2) goto check_firstrun_bot_ident;
+        char bot_realname[101];
+        check_firstrun_bot_realname:
+        printf("Realname: ");
+        ptr = fgets(bot_realname, 100, stdin);
+        for(ptr = bot_realname; *ptr; ptr++) { if(*ptr == '\n' || *ptr == '\r') *ptr = '\0'; }
+        if(strlen(bot_realname) < 2) goto check_firstrun_bot_realname;
+        char bot_server[101];
+        check_firstrun_bot_server:
+        printf("Server: [irc.onlinegamesnet.net] ");
+        ptr = fgets(bot_server, 100, stdin);
+        for(ptr = bot_server; *ptr; ptr++) { if(*ptr == '\n' || *ptr == '\r') *ptr = '\0'; }
+        if(*bot_server && strlen(bot_nick) < 5) goto check_firstrun_bot_server;
+        if(!*bot_server)
+            strcpy(bot_server, "irc.onlinegamesnet.net");
+        int bot_port;
+        char bot_port_buf[7];
+        printf("Port: [6667] ");
+        ptr = fgets(bot_port_buf, 6, stdin);
+        for(ptr = bot_port_buf; *ptr; ptr++) { if(*ptr == '\n' || *ptr == '\r') *ptr = '\0'; }
+        if(!*bot_port_buf)
+            bot_port = 6667;
+        else
+            bot_port = atoi(bot_port_buf);
+        int bot_ssl;
+        char bot_ssl_buf[5];
+        check_firstrun_bot_ssl:
+        printf("SSL: [y/N] ");
+        ptr = fgets(bot_ssl_buf, 4, stdin);
+        for(ptr = bot_ssl_buf; *ptr; ptr++) { if(*ptr == '\n' || *ptr == '\r') *ptr = '\0'; }
+        if(!*bot_ssl_buf || tolower(*bot_ssl_buf) == 'n')
+            bot_ssl = 0;
+        else if(tolower(*bot_ssl_buf) == 'y')
+            bot_ssl = 1;
+        else
+            goto check_firstrun_bot_ssl;
+        char bot_pass[101];
+        printf("Server Password: [] ");
+        ptr = fgets(bot_pass, 100, stdin);
+        for(ptr = bot_pass; *ptr; ptr++) { if(*ptr == '\n' || *ptr == '\r') *ptr = '\0'; }
+        int bot_maxchan;
+        char bot_maxchan_buf[5];
+        printf("MaxChannel: [20] ");
+        ptr = fgets(bot_maxchan_buf, 5, stdin);
+        for(ptr = bot_maxchan_buf; *ptr; ptr++) { if(*ptr == '\n' || *ptr == '\r') *ptr = '\0'; }
+        if(*bot_maxchan_buf)
+            bot_maxchan = atoi(bot_maxchan_buf);
+        else
+            bot_maxchan = 20;
+        int bot_queue;
+        char bot_queue_buf[5];
+        check_firstrun_bot_queue:
+        printf("Queue (prevents excess floods): [Y/n] ");
+        ptr = fgets(bot_queue_buf, 4, stdin);
+        for(ptr = bot_queue_buf; *ptr; ptr++) { if(*ptr == '\n' || *ptr == '\r') *ptr = '\0'; }
+        if(!*bot_queue_buf || tolower(*bot_queue_buf) == 'y')
+            bot_queue = 1;
+        else if(tolower(*bot_queue_buf) == 'n')
+            bot_queue = 0;
+        else
+            goto check_firstrun_bot_queue;
+        printf_mysql_query("INSERT INTO `bots` (`active`, `nick`, `server`, `port`, `pass`, `ssl`, `ident`, `realname`, `botclass`, `textbot`, `queue`, `defaulttrigger`, `max_channels`) VALUES ('1', '%s', '%s', '%d', '%s', '%d', '%s', '%s', '1', '1', '%d', '+', '%d')", escape_string(bot_nick), escape_string(bot_server), bot_port, escape_string(bot_pass), bot_ssl, escape_string(bot_ident), escape_string(bot_realname), bot_queue, bot_maxchan);
+    }
+}
+