X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fmain.h;h=879f46c5c70852be87521c10f2d1e7fda5082ea7;hb=55831bf424312a6908ca07a904f288fba0919a9a;hp=ca0342f04eb99c5a8c60dab07bd669932fc54c89;hpb=95fed4deda0319bee515e44ceec0c77061a2c04e;p=NeonServV5.git

diff --git a/src/main.h b/src/main.h
index ca0342f..879f46c 100644
--- a/src/main.h
+++ b/src/main.h
@@ -1,5 +1,5 @@
-/* main.h - NeonServ v5.0
- * 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,12 +16,10 @@
  */
 #ifndef _main_h
 #define _main_h
+#include "../config.h"
 
-#define NEONSERV_VERSION "5.0.1-dev"
-
-#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>
@@ -30,16 +28,35 @@
 #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>
+#ifdef HAVE_THREADS
+#define THREAD_MUTEX_INIT(var) { \
+    pthread_mutexattr_t mutex_attr; \
+    pthread_mutexattr_init(&mutex_attr);\
+    pthread_mutexattr_setkind_np(&mutex_attr, PTHREAD_MUTEX_RECURSIVE_NP);\
+    pthread_mutex_init(&var, mutex_attr); \
+}
+#define SYNCHRONIZE(var) pthread_mutex_lock(&var)
+#define DESYNCHRONIZE(var) pthread_mutex_unlock(&var)
+#include <pthread.h>
+#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)))
@@ -71,7 +88,8 @@
 #define COMPILER "Unknown"
 #endif
 
-#define SOCKET_SELECT_TIME 2
+#define SOCKET_SELECT_TIME    1
+#define SOCKET_RECONNECT_TIME 20
 
 #define NICKLEN         30
 #define USERLEN         10
@@ -88,6 +106,7 @@
 #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{|}~[\\]^-_`"
@@ -100,8 +119,15 @@
 #define TEMPUSER_LIST_INDEX VALID_NICK_CHARS_FIRST_LEN
 
 extern time_t start_time;
+extern int statistics_enabled;
 
 int stricmp (const char *s1, const char *s2);
 int stricmplen (const char *s1, const char *s2, int len);
 
+void restart_bot(int do_hard_restart);
+void stop_bot();
+void reload_config();
+
+void statistics_update();
+
 #endif
\ No newline at end of file