summaryrefslogtreecommitdiff
path: root/src/common/socket.c
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-10-30 18:38:14 -0200
committershennetsind <ind@henn.et>2013-10-30 18:38:14 -0200
commit7fefefdde386f13f8fefa8db3ffe9ed140c8aa10 (patch)
tree715f3b80d75cab3a9c2a3abd04ae4461165e8854 /src/common/socket.c
parenta2405882a4123d6a11d24e895b40148dc7cb455e (diff)
parentbd04c6c566902d03d633b4dfee5335361155a79e (diff)
downloadhercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.tar.gz
hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.tar.bz2
hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.tar.xz
hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/common/socket.c')
-rw-r--r--src/common/socket.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/common/socket.c b/src/common/socket.c
index 7c8b3738b..c66153550 100644
--- a/src/common/socket.c
+++ b/src/common/socket.c
@@ -896,7 +896,7 @@ int do_sockets(int next)
typedef struct _connect_history {
struct _connect_history* next;
uint32 ip;
- uint32 tick;
+ int64 tick;
int count;
unsigned ddos : 1;
} ConnectHistory;
@@ -1043,8 +1043,7 @@ static int connect_check_(uint32 ip)
/// Timer function.
/// Deletes old connection history records.
-static int connect_check_clear(int tid, unsigned int tick, int id, intptr_t data)
-{
+static int connect_check_clear(int tid, int64 tick, int id, intptr_t data) {
int i;
int clear = 0;
int list = 0;