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

diff --git a/src/main.h b/src/main.h
index 12c6899..26f4319 100644
--- a/src/main.h
+++ b/src/main.h
@@ -1,4 +1,4 @@
-/* main.h - NeonServ v5.3
+/* main.h - NeonServ v5.6
  * Copyright (C) 2011-2012  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -16,138 +16,9 @@
  */
 #ifndef _main_h
 #define _main_h
-#include "../config.h"
-
-#define NEONSERV_VERSION "5.3"
-#define VERSION_PATCHLEVEL 543
-
-#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 <features.h>
-#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>
-#ifdef HAVE_THREADS
-#include <pthread.h>
-#ifdef WIN32
-#define pthread_self_tid() pthread_self().p
-#else
-#define pthread_self_tid() pthread_self()
-#endif
-#define THREAD_MUTEX_INIT(var) { \
-    pthread_mutexattr_t mutex_attr; \
-    pthread_mutexattr_init(&mutex_attr);\
-    pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_RECURSIVE_NP);\
-    pthread_mutex_init(&var, &mutex_attr); \
-}
-#define THREAD_MUTEX_INIT_TYPE(var, type) { \
-    pthread_mutexattr_t mutex_attr; \
-    pthread_mutexattr_init(&mutex_attr);\
-    pthread_mutexattr_settype(&mutex_attr, type);\
-    pthread_mutex_init(&var, &mutex_attr); \
-}
-#define SYNCHRONIZE(var) pthread_mutex_lock(&var)
-#define SET_SYNCHRONIZE(var) pthread_mutex_trylock(&var)
-#define DESYNCHRONIZE(var) pthread_mutex_unlock(&var)
-#else
-#define THREAD_MUTEX_INIT(var)
-#define SYNCHRONIZE(var)
-#define DESYNCHRONIZE(var)
-#endif
-
-#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
-
-#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"
-#endif
-
-#ifdef ENABLE_MEMORY_DEBUG
-#include "memoryDebug.h"
-#endif
-
-#define PID_FILE "neonserv.pid"
-#define CONF_FILE "neonserv.conf"
-#define LOG_FILE "neonserv.log"
-
-#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 MAXLOGLEN       1024
-#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 */
-#define TICKS_PER_SECOND 10
-
-//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
-
-#define TEMPUSER_LIST_INDEX VALID_NICK_CHARS_FIRST_LEN
-
-#define LOGLEVEL_INFO  0x01
-#define LOGLEVEL_ERROR 0x02
-#define LOGLEVEL_RAW   0x04
-#define LOGLEVEL_MYSQL 0x08
-
-#define timeval_is_bigger(x,y) ((x.tv_sec > y.tv_sec) || (x.tv_sec == y.tv_sec && x.tv_usec > y.tv_usec))
+#include "overall.h"
 
+#ifndef DND_FUNCTIONS
 extern time_t start_time;
 extern int statistics_enabled;
 #ifdef HAVE_THREADS
@@ -155,24 +26,25 @@ extern int running_threads;
 extern pthread_mutex_t cache_sync;
 extern pthread_mutex_t whohandler_sync, whohandler_mass_sync;
 
-int getCurrentThreadID();
+/* MODULAR ACCESSIBLE */ int getCurrentThreadID();
 #endif
 
-void exit_daemon();
-
-int stricmp (const char *s1, const char *s2);
-int stricmplen (const char *s1, const char *s2, int len);
+/* MODULAR ACCESSIBLE */ time_t getStartTime();
+/* MODULAR ACCESSIBLE */ int getRunningThreads();
 
-void restart_process();
-void cleanup();
-void restart_bot(int do_hard_restart);
-void stop_bot();
-void reload_config();
+void exit_daemon();
 
-void statistics_update();
+/* MODULAR ACCESSIBLE */ int stricmp (const char *s1, const char *s2);
+/* MODULAR ACCESSIBLE */ int stricmplen (const char *s1, const char *s2, int len);
 
-void putlog(int loglevel, const char *text, ...) PRINTF_LIKE(2, 3);
+/* 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();
 
-#define perror(errmsg) (putlog(LOGLEVEL_ERROR, "ERROR (%s:%d) %s", __FILE__, __LINE__, errmsg))
+int statistics_update();
 
+/* MODULAR ACCESSIBLE */ void putlog(int loglevel, const char *text, ...) PRINTF_LIKE(2, 3);
+#endif
 #endif
\ No newline at end of file