projects
/
NeonServV5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/development'
[NeonServV5.git]
/
src
/
WHOHandler.c
diff --git
a/src/WHOHandler.c
b/src/WHOHandler.c
index 13786787b1187f68b4a5ea18d8c8f373fc545554..5db3db6a3d58be68ad50a402308033f61d004c6c 100644
(file)
--- a/
src/WHOHandler.c
+++ b/
src/WHOHandler.c
@@
-1,4
+1,4
@@
-/* WHOHandler.c - NeonServ v5.
5
+/* WHOHandler.c - 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
@@
-23,6
+23,7
@@
#include "ClientSocket.h"
#include "IPNode.h"
#include "modules.h"
#include "ClientSocket.h"
#include "IPNode.h"
#include "modules.h"
+#include "log.h"
#define WHOQUEUETYPE_ISONQUEUE 0x01
#define WHOQUEUETYPE_USERLIST 0x02
#define WHOQUEUETYPE_ISONQUEUE 0x01
#define WHOQUEUETYPE_USERLIST 0x02
@@
-65,7
+66,7
@@
static struct WHOQueueEntry* addWHOQueueEntry(struct ClientSocket *client) {
struct WHOQueueEntry *entry = malloc(sizeof(*entry));
if (!entry)
{
struct WHOQueueEntry *entry = malloc(sizeof(*entry));
if (!entry)
{
- p
error("malloc() failed"
);
+ p
rintf_log("main", LOG_ERROR, "%s:%d malloc() failed", __FILE__, __LINE__
);
DESYNCHRONIZE(whohandler_sync);
return NULL;
}
DESYNCHRONIZE(whohandler_sync);
return NULL;
}
@@
-215,7
+216,7
@@
void get_userauth(struct UserNode *user, int module_id, userauth_callback_t call
callback(bot, user->nick, NULL, data);
return;
}
callback(bot, user->nick, NULL, data);
return;
}
- if((user->flags & (USERFLAG_ISAUTHED | USERFLAG_IS
IRCOP | USERFLAG_ISBOT | USERFLAG_IS
SERVER)) || (time(0) - user->last_who) <= REWHO_TIMEOUT) {
+ if((user->flags & (USERFLAG_ISAUTHED | USERFLAG_ISSERVER)) || (time(0) - user->last_who) <= REWHO_TIMEOUT) {
callback(bot, user->nick, user, data);
return;
}
callback(bot, user->nick, user, data);
return;
}