projects
/
NeonServV5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed spamlimit setting mysql query
[NeonServV5.git]
/
src
/
overall.h
diff --git
a/src/overall.h
b/src/overall.h
index 718e82d7695abef13808e55ab95d4e887101929d..d500e4771a47cd13d18d69c628ae49d16009da2a 100644
(file)
--- a/
src/overall.h
+++ b/
src/overall.h
@@
-1,4
+1,4
@@
-/* overall.h - NeonServ v5.
4
+/* overall.h - NeonServ v5.
6
* Copyright (C) 2011-2012 Philipp Kreil (pk910)
*
* This program is free software: you can redistribute it and/or modify
* Copyright (C) 2011-2012 Philipp Kreil (pk910)
*
* This program is free software: you can redistribute it and/or modify
@@
-19,8
+19,8
@@
#define _overall_h
#include "../config.h"
#define _overall_h
#include "../config.h"
-#define NEONSERV_VERSION "5.
4
"
-#define VERSION_PATCHLEVEL
657
+#define NEONSERV_VERSION "5.
6
"
+#define VERSION_PATCHLEVEL
736
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
@@
-31,7
+31,9
@@
#include <winsock2.h>
#include <malloc.h>
#else
#include <winsock2.h>
#include <malloc.h>
#else
+#ifdef HAVE_FEATURES_H
#include <features.h>
#include <features.h>
+#endif
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
@@
-39,6
+41,7
@@
#include <arpa/inet.h>
#include <netdb.h>
#include <sys/wait.h>
#include <arpa/inet.h>
#include <netdb.h>
#include <sys/wait.h>
+#include <errno.h>
#endif
#include <unistd.h>
#include <getopt.h>
#endif
#include <unistd.h>
#include <getopt.h>
@@
-57,10
+60,15
@@
#else
#define pthread_self_tid() pthread_self()
#endif
#else
#define pthread_self_tid() pthread_self()
#endif
+#ifdef PTHREAD_MUTEX_RECURSIVE_NP
+#define PTHREAD_MUTEX_RECURSIVE_VAL PTHREAD_MUTEX_RECURSIVE_NP
+#else
+#define PTHREAD_MUTEX_RECURSIVE_VAL PTHREAD_MUTEX_RECURSIVE
+#endif
#define THREAD_MUTEX_INIT(var) { \
pthread_mutexattr_t mutex_attr; \
pthread_mutexattr_init(&mutex_attr);\
#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_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_RECURSIVE_
VAL
);\
pthread_mutex_init(&var, &mutex_attr); \
}
#define THREAD_MUTEX_INIT_TYPE(var, type) { \
pthread_mutex_init(&var, &mutex_attr); \
}
#define THREAD_MUTEX_INIT_TYPE(var, type) { \
@@
-112,10
+120,6
@@
#include "memoryDebug.h"
#endif
#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 SOCKET_SELECT_TIME 1
#define SOCKET_RECONNECT_TIME 20
@@
-136,7
+140,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 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
+#define
CLEAR_CACHE_INTERVAL
10
//valid nick chars
#define VALID_NICK_CHARS "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890{|}~[\\]^-_`"
//valid nick chars
#define VALID_NICK_CHARS "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890{|}~[\\]^-_`"
@@
-155,8
+159,6
@@
#define timeval_is_bigger(x,y) ((x.tv_sec > y.tv_sec) || (x.tv_sec == y.tv_sec && x.tv_usec > y.tv_usec))
#define timeval_is_bigger(x,y) ((x.tv_sec > y.tv_sec) || (x.tv_sec == y.tv_sec && x.tv_usec > y.tv_usec))
-#define perror(errmsg) (putlog(LOGLEVEL_ERROR, "ERROR (%s:%d) %s", __FILE__, __LINE__, errmsg))
-
#define MODSTATE_RELOAD 0x01
#define MODSTATE_STARTSTOP 0x02
#define MODSTATE_REBIND 0x03
#define MODSTATE_RELOAD 0x01
#define MODSTATE_STARTSTOP 0x02
#define MODSTATE_REBIND 0x03