-/* WHOHandler.c - NeonServ v5.1
+/* WHOHandler.c - NeonServ v5.2
* Copyright (C) 2011 Philipp Kreil (pk910)
*
* This program is free software: you can redistribute it and/or modify
#include "ChanNode.h"
#include "UserNode.h"
#include "ChanUser.h"
+#include "ModeNode.h"
#include "ClientSocket.h"
#define WHOQUEUETYPE_ISONQUEUE 0x01
#define WHOQUEUETYPE_CHECKTYPE 0x07
#define WHOQUEUETYPE_FOUND 0x08
+#define MAXCALLBACKS 3
+
struct WHOQueueEntry {
char type;
struct ClientSocket *client;
struct ChanNode *chan;
struct UserNode *user;
struct WHOQueueEntry *next;
- void *callback;
- void *data;
+ void *callback[MAXCALLBACKS];
+ void *data[MAXCALLBACKS];
};
static struct WHOQueueEntry *first_entry = NULL, *last_entry = NULL;
if(entry == first_entry)
first_entry = entry->next;
if(entry == last_entry) {
- struct WHOQueueEntry *last;
+ struct WHOQueueEntry *last = NULL;
for(last = first_entry; last; last = last->next)
if(last->next == NULL) break;
last_entry = last;
break;
}
if(bot == NULL) return;
- struct WHOQueueEntry* entry = addWHOQueueEntry(bot);
- entry->type = WHOQUEUETYPE_ISONQUEUE | WHOQUEUETYPE_USERLIST;
- entry->chan = chan;
- entry->callback = callback;
- entry->data = data;
- //WHO ".$channel->getName().",".$id." d%tuhnaf,".$id
- putsock(bot, "WHO %s,%d %%tuhnaf,%d", chan->name, entry->type, entry->type);
+ //check if we really need to who the channel
+ int do_who = (!(chan->flags & CHANFLAG_RECEIVED_USERLIST));
+ if(!do_who) {
+ struct ChanUser *chanuser;
+ for(chanuser = getChannelUsers(chan, NULL); chanuser; chanuser = getChannelUsers(chan, chanuser)) {
+ if(!(chanuser->user->flags & (USERFLAG_ISAUTHED | USERFLAG_ISIRCOP | USERFLAG_ISBOT)) && (time(0) - chanuser->user->last_who) > REWHO_TIMEOUT) {
+ do_who = 1;
+ break;
+ }
+ }
+ }
+ if(do_who) {
+ struct WHOQueueEntry* entry = addWHOQueueEntry(bot);
+ entry->type = WHOQUEUETYPE_ISONQUEUE | WHOQUEUETYPE_USERLIST;
+ entry->chan = chan;
+ entry->callback[0] = callback;
+ int i;
+ for(i = 1; i < MAXCALLBACKS; i++)
+ entry->callback[i] = NULL;
+ entry->data[0] = data;
+ for(i = 1; i < MAXCALLBACKS; i++)
+ entry->data[i] = NULL;
+ putsock(bot, "WHO %s,%d %%tuhnaf,%d", chan->name, entry->type, entry->type);
+ } else
+ callback(bot, chan, data);
}
-void get_userlist_with_invisible(struct ChanNode *chan, userlist_callback_t callback, void *data) {
+void _get_userlist_with_invisible(struct ChanNode *chan, 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))
break;
}
if(bot == NULL) return;
- struct WHOQueueEntry* entry = addWHOQueueEntry(bot);
- entry->type = WHOQUEUETYPE_ISONQUEUE | WHOQUEUETYPE_USERLIST;
- entry->chan = chan;
- entry->callback = callback;
- entry->data = data;
- //WHO ".$channel->getName().",".$id." d%tuhnaf,".$id
- putsock(bot, "WHO %s,%d d%%tuhnaf,%d", chan->name, entry->type, entry->type);
+ //check if we really need to who the channel
+ //invisible users can only be present if chanmode +D or +d is set!
+ int do_who = (!(chan->flags & CHANFLAG_RECEIVED_USERLIST)) || (isModeSet(chan->modes, 'd') || isModeSet(chan->modes, 'D'));
+ if(!do_who && force) {
+ struct ChanUser *chanuser;
+ for(chanuser = getChannelUsers(chan, NULL); chanuser; chanuser = getChannelUsers(chan, chanuser)) {
+ if(!(chanuser->user->flags & (USERFLAG_ISAUTHED | USERFLAG_ISIRCOP | USERFLAG_ISBOT)) && (time(0) - chanuser->user->last_who) > REWHO_TIMEOUT) {
+ do_who = 1;
+ break;
+ }
+ }
+ }
+ if(do_who) {
+ struct WHOQueueEntry* entry = addWHOQueueEntry(bot);
+ entry->type = WHOQUEUETYPE_ISONQUEUE | WHOQUEUETYPE_USERLIST;
+ entry->chan = chan;
+ entry->callback[0] = callback;
+ int i;
+ for(i = 1; i < MAXCALLBACKS; i++)
+ entry->callback[i] = NULL;
+ entry->data[0] = data;
+ for(i = 1; i < MAXCALLBACKS; i++)
+ entry->data[i] = NULL;
+ putsock(bot, "WHO %s,%d d%%tuhnaf,%d", chan->name, entry->type, entry->type);
+ } else
+ callback(bot, chan, data);
}
void get_userauth(struct UserNode *user, userauth_callback_t callback, void *data) {
+ //check if we have already an active WHO for this user
+ struct WHOQueueEntry *entry;
+ for(entry = first_entry; entry; entry = entry->next) {
+ if((entry->type & WHOQUEUETYPE_USERAUTH) && entry->user == user) {
+ int i = 0;
+ for(i = 1; i < MAXCALLBACKS; i++) {
+ if(!entry->callback[i]) {
+ entry->callback[i] = callback;
+ entry->data[i] = data;
+ return;
+ }
+ }
+ }
+ }
struct ClientSocket *bot;
for(bot = getBots(SOCKET_FLAG_READY, NULL); bot; bot = getBots(SOCKET_FLAG_READY, bot)) {
if(bot->flags & SOCKET_FLAG_PREFERRED)
break;
}
if(bot == NULL) bot = getBots(SOCKET_FLAG_READY, NULL);
- struct WHOQueueEntry* entry = addWHOQueueEntry(bot);
+ //check if we really need to who the user
+ if((user->flags & (USERFLAG_ISAUTHED | USERFLAG_ISIRCOP | USERFLAG_ISBOT | USERFLAG_ISSERVER)) || (time(0) - user->last_who) <= REWHO_TIMEOUT) {
+ callback(bot, user->nick, user, data);
+ return;
+ }
+ entry = addWHOQueueEntry(bot);
entry->type = WHOQUEUETYPE_ISONQUEUE | WHOQUEUETYPE_USERAUTH;
entry->user = user;
- entry->callback = callback;
- entry->data = data;
+ entry->callback[0] = callback;
+ int i;
+ for(i = 1; i < MAXCALLBACKS; i++)
+ entry->callback[i] = NULL;
+ entry->data[0] = data;
+ for(i = 1; i < MAXCALLBACKS; i++)
+ entry->data[i] = NULL;
//WHO ".$user->getNick().",".$id." %tuhna,".$id
putsock(bot, "WHO %s,%d %%tuhna,%d", user->nick, entry->type, entry->type);
}
int i;
if(argc < 2) return;
int type = atoi(argv[1]);
+ if(!type) return;
if(!(type & WHOQUEUETYPE_ISONQUEUE)) return;
struct WHOQueueEntry* entry = getNextWHOQueueEntry(client, 0);
if(entry == NULL || (entry->type & WHOQUEUETYPE_CHECKTYPE) != (type & WHOQUEUETYPE_CHECKTYPE)) return;
}
}
user->flags = (user->flags & ~USERFLAG_ISIRCOP) | userflags;
+ user->last_who = time(0);
if(!*user->ident)
strcpy(user->ident, argv[2]);
if(!*user->host)
} else if(type & WHOQUEUETYPE_USERAUTH) {
//:OGN2.OnlineGamesNet.net 354 Skynet 1 pk910 2001:41d0:2:1d3b::babe Skynet pk910
entry->type |= WHOQUEUETYPE_FOUND;
+ entry->user->last_who = time(0);
if(strcmp(argv[5], "0") && !(entry->user->flags & USERFLAG_ISAUTHED)) {
strcpy(entry->user->auth, argv[5]);
entry->user->flags |= USERFLAG_ISAUTHED;
}
- userauth_callback_t *callback = entry->callback;
- callback(client, entry->user->nick, entry->user, entry->data);
+ 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]);
+ }
}
}
void recv_whohandler_315(struct ClientSocket *client, char **argv, unsigned int argc) {
if(argc < 2) return;
- char *typestr = strstr(argv[1], ",") + 1;
+ char *typestr = strstr(argv[1], ",");
+ if(!typestr) return;
+ typestr++;
int type = atoi(typestr);
if(!(type & WHOQUEUETYPE_ISONQUEUE)) return;
struct WHOQueueEntry* entry = getNextWHOQueueEntry(client, 1);
if(type & WHOQUEUETYPE_USERLIST) {
//:OGN2.OnlineGamesNet.net 315 skynet #pk910,1 :End of /WHO list.
entry->chan->flags |= CHANFLAG_RECEIVED_USERLIST;
- userlist_callback_t *callback = entry->callback;
- callback(client, entry->chan, entry->data);
+ userlist_callback_t *callback;
+ int i;
+ for(i = 0; i < MAXCALLBACKS; i++) {
+ callback = entry->callback[i];
+ if(!callback) break;
+ callback(client, entry->chan, entry->data[i]);
+ }
if(entry->chan->flags & CHANFLAG_HAVE_INVISIBLES) {
//remove all invisible users again
struct ChanUser *chanuser, *next;
}
} else if(type & WHOQUEUETYPE_USERAUTH) {
if(!(entry->type & WHOQUEUETYPE_FOUND)) {
- userauth_callback_t *callback = entry->callback;
- callback(client, entry->user->nick, NULL, entry->data);
+ userauth_callback_t *callback;
+ int i;
+ for(i = 0; i < MAXCALLBACKS; i++) {
+ callback = entry->callback[i];
+ if(!callback) break;
+ callback(client, entry->user->nick, NULL, entry->data[i]);
+ }
}
}
free(entry);
projects / NeonServV5.git / blobdiff