-/* WHOHandler.c - NeonServ v5.3
+/* WHOHandler.c - NeonServ v5.6
* Copyright (C) 2011-2012 Philipp Kreil (pk910)
*
* This program is free software: you can redistribute it and/or modify
#include "ModeNode.h"
#include "ClientSocket.h"
#include "IPNode.h"
+#include "modules.h"
#define WHOQUEUETYPE_ISONQUEUE 0x01
#define WHOQUEUETYPE_USERLIST 0x02
#define WHOQUEUETYPE_CHECKTYPE 0x07
#define WHOQUEUETYPE_FOUND 0x08
-#define MAXCALLBACKS 3
+#define MAXCALLBACKS 10
struct WHOQueueEntry {
char type;
struct UserNode *user;
struct WHOQueueEntry *next;
void *callback[MAXCALLBACKS];
+ int module_id[MAXCALLBACKS];
void *data[MAXCALLBACKS];
- #ifdef HAVE_THREADS
- unsigned long lock_tid;
- pthread_mutex_t lock_mutex;
- int lock_count;
- #endif
};
static int checkWHOID(struct ClientSocket *client, int whoid) {
}
entry->next = NULL;
entry->whoid = whoid;
- #ifdef HAVE_THREADS
- entry->lock_tid = 0;
- THREAD_MUTEX_INIT(entry->lock_mutex);
- entry->lock_count = 0;
- #endif
if(client->whoqueue_last) {
client->whoqueue_last->next = entry;
} else {
if(entry == client->whoqueue_last) {
client->whoqueue_last = NULL;
}
- #ifdef HAVE_THREADS
- entry->lock_tid = -1;
- if(entry->lock_count) {
- int i;
- for(i = 0; i < entry->lock_count; i++) {
- DESYNCHRONIZE(entry->lock_mutex); //unlock ALL
- }
- }
- #endif
}
DESYNCHRONIZE(whohandler_sync);
return entry;
struct WHOQueueEntry *entry, *next;
for(entry = client->whoqueue_first; entry; entry = next) {
next = entry->next;
- #ifdef HAVE_THREADS
- entry->lock_tid = -1;
- if(entry->lock_count) {
- int i;
- for(i = 0; i < entry->lock_count; i++) {
- DESYNCHRONIZE(entry->lock_mutex); //unlock ALL
- }
- }
- #endif
free(entry);
}
client->whoqueue_last = NULL;
DESYNCHRONIZE(whohandler_sync);
}
-#if HAVE_THREADS
-void whohandler_end_of_recv(struct ClientSocket *client) {
- SYNCHRONIZE(whohandler_sync);
- unsigned long tid = syscall(SYS_gettid);
- struct WHOQueueEntry *entry;
- for(entry = client->whoqueue_first; entry; entry = entry->next) {
- if(entry->lock_tid == tid) {
- entry->lock_tid = 0;
- DESYNCHRONIZE(entry->lock_mutex);
- }
- }
- DESYNCHRONIZE(whohandler_sync);
-}
-#endif
-
-void get_userlist(struct ChanNode *chan, userlist_callback_t callback, void *data) {
+void get_userlist(struct ChanNode *chan, int module_id, userlist_callback_t callback, void *data) {
struct ClientSocket *bot;
for(bot = getBots(SOCKET_FLAG_READY, NULL); bot; bot = getBots(SOCKET_FLAG_READY, bot)) {
if(isUserOnChan(bot->user, chan))
entry->type = WHOQUEUETYPE_ISONQUEUE | WHOQUEUETYPE_USERLIST;
entry->chan = chan;
entry->callback[0] = callback;
+ entry->module_id[0] = module_id;
int i;
for(i = 1; i < MAXCALLBACKS; i++)
entry->callback[i] = NULL;
callback(bot, chan, data);
}
-void _get_userlist_with_invisible(struct ChanNode *chan, userlist_callback_t callback, void *data, int force) {
+void _get_userlist_with_invisible(struct ChanNode *chan, int module_id, userlist_callback_t callback, void *data, int force) {
struct ClientSocket *bot;
for(bot = getBots(SOCKET_FLAG_READY, NULL); bot; bot = getBots(SOCKET_FLAG_READY, bot)) {
if(isUserOnChan(bot->user, chan))
entry->type = WHOQUEUETYPE_ISONQUEUE | WHOQUEUETYPE_USERLIST;
entry->chan = chan;
entry->callback[0] = callback;
+ entry->module_id[0] = module_id;
int i;
for(i = 1; i < MAXCALLBACKS; i++)
entry->callback[i] = NULL;
callback(bot, chan, data);
}
-void get_userauth(struct UserNode *user, userauth_callback_t callback, void *data) {
+void get_userauth(struct UserNode *user, int module_id, userauth_callback_t callback, void *data) {
//check if we have already an active WHO for this user
struct ClientSocket *bot, *whobot = NULL;
struct WHOQueueEntry *entry;
for(i = 1; i < MAXCALLBACKS; i++) {
if(!entry->callback[i]) {
entry->callback[i] = callback;
+ entry->module_id[i] = module_id;
entry->data[i] = data;
return;
}
callback(bot, user->nick, NULL, data);
return;
}
- if((user->flags & (USERFLAG_ISAUTHED | USERFLAG_ISIRCOP | USERFLAG_ISBOT | USERFLAG_ISSERVER)) || (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;
}
entry->user = user;
user->flags |= USERFLAG_IS_ON_WHO_QUEUE;
entry->callback[0] = callback;
+ entry->module_id[0] = module_id;
int i;
for(i = 1; i < MAXCALLBACKS; i++)
entry->callback[i] = NULL;
struct WHOQueueEntry* entry = getNextWHOQueueEntry(client, type, 0);
if(entry == NULL) return;
#ifdef HAVE_THREADS
- unsigned long tid = syscall(SYS_gettid);
- if(entry->lock_tid != tid) {
- entry->lock_count++;
- SYNCHRONIZE(entry->lock_mutex);
- if(entry->lock_tid == -1) {
- return; //entry has been destroyed
- }
- entry->lock_tid = tid;
+ unsigned int tid = (unsigned int) pthread_self_tid();
+ while(!clientsocket_parseorder_top(tid)) {
+ usleep(1000); //1ms
}
#endif
if(entry->type & WHOQUEUETYPE_USERLIST) {
struct UserNode *user = getUserByNick(argv[5]);
struct ChanUser *chanuser;
- if((chanuserflags & CHANUSERFLAG_INVISIBLE) && (!user || !isBot(user))) {
- user = createTempUser(argv[5]);
+ if((chanuserflags & CHANUSERFLAG_INVISIBLE) && (!user || (user && !isBot(user)))) {
+ user = createTempUser(argv[5]); //always add a temponary user to prevent cache problems when the user joins right now (while it's stored in our cache as being invisible)
user->flags |= USERFLAG_ISTMPUSER;
chan->flags |= CHANFLAG_HAVE_INVISIBLES;
chanuser = addInvisibleChanUser(chan, user);
for(i = 0; i < MAXCALLBACKS; i++) {
userauth_callback_t *callback = entry->callback[i];
if(!callback) break;
- callback(client, entry->user->nick, entry->user, entry->data[i]);
+ if(!entry->module_id[i] || module_loaded(entry->module_id[i]))
+ callback(client, entry->user->nick, entry->user, entry->data[i]);
}
}
}
struct WHOQueueEntry* entry = getNextWHOQueueEntry(client, type, 0);
if(entry == NULL) return;
#ifdef HAVE_THREADS
- unsigned long tid = syscall(SYS_gettid);
- if(entry->lock_tid != tid) {
- entry->lock_count++;
- SYNCHRONIZE(entry->lock_mutex);
- if(entry->lock_tid == -1) {
- return; //entry has been destroyed
- }
- entry->lock_tid = tid;
+ unsigned int tid = (unsigned int) pthread_self_tid();
+ while(!clientsocket_parseorder_top(tid)) {
+ usleep(1000); //1ms
}
#endif
getNextWHOQueueEntry(client, type, 1);
for(i = 0; i < MAXCALLBACKS; i++) {
callback = entry->callback[i];
if(!callback) break;
- callback(client, entry->chan, entry->data[i]);
+ if(!entry->module_id[i] || module_loaded(entry->module_id[i]))
+ callback(client, entry->chan, entry->data[i]);
}
if(entry->chan->flags & CHANFLAG_HAVE_INVISIBLES) {
//remove all invisible users again
for(i = 0; i < MAXCALLBACKS; i++) {
callback = entry->callback[i];
if(!callback) break;
- callback(client, entry->user->nick, NULL, entry->data[i]);
+ if(!entry->module_id[i] || module_loaded(entry->module_id[i]))
+ callback(client, entry->user->nick, NULL, entry->data[i]);
}
}
entry->user->flags &= ~USERFLAG_IS_ON_WHO_QUEUE;