X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fmain.h;h=d14869e11564df1426fe6b2a56967b18659f8bd3;hb=2b9e305af713f0960ac0cd7645af3e0ef85a8515;hp=2e627939b8d49df4bdf77093f8cf161259c1b72b;hpb=410cb79dd46afc2da46d2ac3fc2010a77ccb9f0e;p=NeonServV5.git

diff --git a/src/main.h b/src/main.h
index 2e62793..d14869e 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.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
@@ -16,13 +16,10 @@
  */
 #ifndef _main_h
 #define _main_h
+#include "../config.h"
 
-#define NEONSERV_VERSION "5.2"
-#define VERSION_PATCHLEVEL 414
-
-#ifndef BOTWAR_ALERT_CHAN
-#define BOTWAR_ALERT_CHAN NULL
-#endif
+#define NEONSERV_VERSION "5.3"
+#define VERSION_PATCHLEVEL 543
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -31,10 +28,13 @@
 #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>
@@ -43,6 +43,33 @@
 #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)))
@@ -93,6 +120,7 @@
 #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{|}~[\\]^-_`"
@@ -104,13 +132,22 @@
 
 #define TEMPUSER_LIST_INDEX VALID_NICK_CHARS_FIRST_LEN
 
+#define timeval_is_bigger(x,y) ((x.tv_sec > y.tv_sec) || (x.tv_sec == y.tv_sec && x.tv_usec > y.tv_usec))
+
 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;
+
+int getCurrentThreadID();
+#endif
 
 int stricmp (const char *s1, const char *s2);
 int stricmplen (const char *s1, const char *s2, int len);
 
-void restart_bot(int hard_restart);
+void restart_bot(int do_hard_restart);
 void stop_bot();
 void reload_config();