From e71c5d6e8908d366e15dd29bea9507d45b0f3b3d Mon Sep 17 00:00:00 2001 From: pk910 Date: Thu, 20 Oct 2011 21:28:21 +0200 Subject: [PATCH] prevent excessive WHO usage by checking if a WHO is really necessary --- src/UserNode.c | 4 +++ src/UserNode.h | 2 +- src/WHOHandler.c | 63 +++++++++++++++++++++++++++++++++++++----------- src/main.h | 1 + 4 files changed, 55 insertions(+), 15 deletions(-) diff --git a/src/UserNode.c b/src/UserNode.c index 60360e8..452d17d 100644 --- a/src/UserNode.c +++ b/src/UserNode.c @@ -187,6 +187,7 @@ struct UserNode* addUser(const char *nick) { user->realname[0] = 0; user->flags = 0; user->channel = NULL; + user->last_who = 0; user->next = userList[userListIndex]; userList[userListIndex] = user; return user; @@ -241,6 +242,7 @@ struct UserNode* createTempUser(const char *mask) { user->realname[0] = 0; user->flags = 0; user->channel = NULL; + user->last_who = 0; ii = i+1; } else if(cmask[i] == '.' && !user) { //it's a server @@ -257,6 +259,7 @@ struct UserNode* createTempUser(const char *mask) { user->realname[0] = 0; user->flags = USERFLAG_ISSERVER; user->channel = NULL; + user->last_who = 0; return user; } else if(cmask[i] == '@') { if(user == NULL) return NULL; @@ -279,6 +282,7 @@ struct UserNode* createTempUser(const char *mask) { user->realname[0] = 0; user->flags = 0; user->channel = NULL; + user->last_who = 0; return user; } strcpy(user->host, &cmask[ii]); diff --git a/src/UserNode.h b/src/UserNode.h index 08b6d97..1ae5560 100644 --- a/src/UserNode.h +++ b/src/UserNode.h @@ -41,7 +41,7 @@ struct UserNode { char realname[REALLEN+1]; char auth[AUTHLEN+1]; unsigned int flags; - time_t created; + time_t created, last_who; struct ChanUser *channel; struct language *language; diff --git a/src/WHOHandler.c b/src/WHOHandler.c index a296298..25d2467 100644 --- a/src/WHOHandler.c +++ b/src/WHOHandler.c @@ -19,6 +19,7 @@ #include "ChanNode.h" #include "UserNode.h" #include "ChanUser.h" +#include "ModeNode.h" #include "ClientSocket.h" #define WHOQUEUETYPE_ISONQUEUE 0x01 @@ -86,13 +87,26 @@ void get_userlist(struct ChanNode *chan, userlist_callback_t callback, void *dat 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 = callback; + entry->data = data; + 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) { @@ -102,13 +116,27 @@ void get_userlist_with_invisible(struct ChanNode *chan, userlist_callback_t call 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) { + 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 = callback; + entry->data = data; + 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) { @@ -118,6 +146,11 @@ void get_userauth(struct UserNode *user, userauth_callback_t callback, void *dat break; } if(bot == NULL) bot = getBots(SOCKET_FLAG_READY, NULL); + //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; + } struct WHOQueueEntry* entry = addWHOQueueEntry(bot); entry->type = WHOQUEUETYPE_ISONQUEUE | WHOQUEUETYPE_USERAUTH; entry->user = user; @@ -180,6 +213,7 @@ void recv_whohandler_354(struct ClientSocket *client, char **argv, unsigned int } } user->flags = (user->flags & ~USERFLAG_ISIRCOP) | userflags; + user->last_who = time(0); if(!*user->ident) strcpy(user->ident, argv[2]); if(!*user->host) @@ -191,6 +225,7 @@ void recv_whohandler_354(struct ClientSocket *client, char **argv, unsigned int } 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; diff --git a/src/main.h b/src/main.h index 6b7591a..522373f 100644 --- a/src/main.h +++ b/src/main.h @@ -89,6 +89,7 @@ #define INVITE_TIMEOUT 30 #define BOTWAR_DETECTION_TIME 7 #define BOTWAR_DETECTION_EVENTS 6 +#define REWHO_TIMEOUT 10 /* wait 10 seconds before WHO an unauthed user again */ //valid nick chars #define VALID_NICK_CHARS "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890{|}~[\\]^-_`" -- 2.20.1