X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fmain.h;h=26f4319379e5d8c3f22b37b139034858f0f5bcbd;hb=8a1a716ef73af7b5288f7b5f8ab1b37be80f1247;hp=3ffae355d1dcf5ec10b28c35d1cfde458eea0cc7;hpb=b5fafdc62441f47ab1dfe47205a52c33d0ec8c9a;p=NeonServV5.git

diff --git a/src/main.h b/src/main.h
index 3ffae35..26f4319 100644
--- a/src/main.h
+++ b/src/main.h
@@ -1,5 +1,5 @@
-/* main.h - NeonServ v5.2
- * Copyright (C) 2011  Philipp Kreil (pk910)
+/* main.h - NeonServ v5.6
+ * 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
@@ -16,107 +16,35 @@
  */
 #ifndef _main_h
 #define _main_h
-#include "../config.h"
+#include "overall.h"
 
-#define NEONSERV_VERSION "5.2"
-#define VERSION_PATCHLEVEL 414
-
-#ifndef BOTWAR_ALERT_CHAN
-#define BOTWAR_ALERT_CHAN NULL
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#ifdef WIN32
-#include <windows.h>
-#include <winsock2.h>
-#include <malloc.h>
-#else
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <sys/wait.h>
-#endif
-#include <unistd.h>
-#include <stdarg.h>
-#include <sys/time.h>
-#include <time.h>
-
-#if __GNUC__
-#define PRINTF_LIKE(M,N) __attribute__((format (printf, M, N)))
-#else
-#define PRINTF_LIKE(M,N)
-#endif
-
-#if __GNUC__ >= 2
-#define UNUSED_ARG(ARG) ARG __attribute__((unused))
-#elif defined(S_SPLINT_S)
-#define UNUSED_ARG(ARG) /*@unused@*/ ARG
-#define const /*@observer@*/ /*@temp@*/
-#else
-#define UNUSED_ARG(ARG) ARG
-#endif
+#ifndef DND_FUNCTIONS
+extern time_t start_time;
+extern int statistics_enabled;
+#ifdef HAVE_THREADS
+extern int running_threads;
+extern pthread_mutex_t cache_sync;
+extern pthread_mutex_t whohandler_sync, whohandler_mass_sync;
 
-#define STRINGIFY_(x) #x
-#define STRINGIFY(x) STRINGIFY_(x)
- 
-#if defined(__GNUC__)
-#if defined(__GNUC_PATCHLEVEL__)
-#define COMPILER "GCC" " " STRINGIFY(__GNUC__) "." STRINGIFY(__GNUC_MINOR__) "." STRINGIFY(__GNUC_PATCHLEVEL__)
-#else
-#define COMPILER "GCC" " " STRINGIFY(__GNUC__) "." STRINGIFY(__GNUC_MINOR__)
-#endif
-#elif defined (__IMAGECRAFT__)
-#define COMPILER "ICCAVR"
-#else
-#define COMPILER "Unknown"
+/* MODULAR ACCESSIBLE */ int getCurrentThreadID();
 #endif
 
-#define SOCKET_SELECT_TIME    1
-#define SOCKET_RECONNECT_TIME 20
-
-#define NICKLEN         30
-#define USERLEN         10
-#define AUTHLEN         32
-#define HOSTLEN         63
-#define REALLEN         50
-#define TOPICLEN        500
-#define CHANNELLEN      200
-#define MAXLEN          512
-#define TRIGGERLEN      50
-#define MAXNUMPARAMS    200 /* maximum number of parameters in one line */
-#define MAXLANGUAGES    5
-#define MAXMODES        6
-#define INVITE_TIMEOUT  30
-#define BOTWAR_DETECTION_TIME 7
-#define BOTWAR_DETECTION_EVENTS 6
-#define REWHO_TIMEOUT   10 /* wait 10 seconds before WHO an unauthed user again */
-
-//valid nick chars
-#define VALID_NICK_CHARS "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890{|}~[\\]^-_`"
-//the first char is a little bit different
-//                              0        1         2         3         4         5          6
-//                              1234567890123456789012345678901234567890123456789012345678 9012   62
-#define VALID_NICK_CHARS_FIRST "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ{|}~[\\]^_`"
-#define VALID_NICK_CHARS_FIRST_LEN 62
+/* MODULAR ACCESSIBLE */ time_t getStartTime();
+/* MODULAR ACCESSIBLE */ int getRunningThreads();
 
-#define TEMPUSER_LIST_INDEX VALID_NICK_CHARS_FIRST_LEN
+void exit_daemon();
 
-extern time_t start_time;
-extern int statistics_enabled;
+/* MODULAR ACCESSIBLE */ int stricmp (const char *s1, const char *s2);
+/* MODULAR ACCESSIBLE */ int stricmplen (const char *s1, const char *s2, int len);
 
-int stricmp (const char *s1, const char *s2);
-int stricmplen (const char *s1, const char *s2, int len);
+/* MODULAR ACCESSIBLE */ void restart_process();
+/* MODULAR ACCESSIBLE */ void cleanup();
+/* MODULAR ACCESSIBLE */ void restart_bot(int do_hard_restart);
+/* MODULAR ACCESSIBLE */ void stop_bot();
+/* MODULAR ACCESSIBLE */ void reload_config();
 
-void restart_bot(int do_hard_restart);
-void stop_bot();
-void reload_config();
-
-void statistics_update();
+int statistics_update();
 
+/* MODULAR ACCESSIBLE */ void putlog(int loglevel, const char *text, ...) PRINTF_LIKE(2, 3);
+#endif
 #endif
\ No newline at end of file