#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"
time_t start_time;
static int running, hard_restart;
static void check_firstrun();
void cleanup() {
+ stop_modules();
free_sockets();
qserver_free();
free_parser();
free_bind();
free_modcmd();
free_whoqueue();
- free_bots();
free_mysql();
free_handleinfohandler();
free_lang();
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;
}
}
if(geteuid() == 0 || getuid() == 0) {
init_ModeNode();
init_bind();
init_modcmd();
+ register_module_commands();
init_handleinfohandler();
init_tools();
- register_commands();
+ loadModules();
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(update_minutes * 60 + 10, 0, main_statistics, NULL);
- timeq_add(90, main_checkauths, NULL);
+ timeq_add(90, 0, main_checkauths, NULL);
int worker_threads = get_int_field("General.worker_threads");
if(!worker_threads) worker_threads = 1;
int usleep_delay = 1000000 / TICKS_PER_SECOND;
while(running) {
timeq_tick();
- loop_bots();
+ loop_modules();
qserver_loop();
queue_loop();
mysql_free();
}
} while(time(0) < socket_wait);
timeq_tick();
- loop_bots();
+ loop_modules();
clearTempUsers();
destroyEvents();
qserver_loop();
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;
}
}
}
- 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;
}
}
+time_t getStartTime() {
+ return start_time;
+}
+
+int getRunningThreads() {
+ return running_threads;
+}
+
void write_log(int loglevel, const char *line, int len) {
SYNCHRONIZE(log_sync);
if(!daemonized && (print_loglevel & loglevel)) {