projects
/
NeonServV5.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1bea357
)
merge WHO's for the same user
author
pk910
<philipp@zoelle1.de>
Thu, 20 Oct 2011 20:23:10 +0000
(22:23 +0200)
committer
pk910
<philipp@zoelle1.de>
Thu, 20 Oct 2011 20:24:51 +0000
(22:24 +0200)
src/WHOHandler.c
patch
|
blob
|
history
diff --git
a/src/WHOHandler.c
b/src/WHOHandler.c
index 4ee579fc2c1ef39eca71da05634c65ff12c52148..961cfab948d604e03f225b9ceb4980baaefe1a06 100644
(file)
--- a/
src/WHOHandler.c
+++ b/
src/WHOHandler.c
@@
-28,13
+28,15
@@
#define WHOQUEUETYPE_CHECKTYPE 0x07
#define WHOQUEUETYPE_FOUND 0x08
#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;
struct WHOQueueEntry {
char type;
struct ClientSocket *client;
struct ChanNode *chan;
struct UserNode *user;
struct WHOQueueEntry *next;
- void *callback;
+ void *callback
[MAXCALLBACKS]
;
void *data;
};
void *data;
};
@@
-102,7
+104,10
@@
void get_userlist(struct ChanNode *chan, userlist_callback_t callback, void *dat
struct WHOQueueEntry* entry = addWHOQueueEntry(bot);
entry->type = WHOQUEUETYPE_ISONQUEUE | WHOQUEUETYPE_USERLIST;
entry->chan = chan;
struct WHOQueueEntry* entry = addWHOQueueEntry(bot);
entry->type = WHOQUEUETYPE_ISONQUEUE | WHOQUEUETYPE_USERLIST;
entry->chan = chan;
- entry->callback = callback;
+ entry->callback[0] = callback;
+ int i;
+ for(i = 1; i < MAXCALLBACKS; i++)
+ entry->callback[i] = NULL;
entry->data = data;
putsock(bot, "WHO %s,%d %%tuhnaf,%d", chan->name, entry->type, entry->type);
} else
entry->data = data;
putsock(bot, "WHO %s,%d %%tuhnaf,%d", chan->name, entry->type, entry->type);
} else
@@
-132,7
+137,10
@@
void _get_userlist_with_invisible(struct ChanNode *chan, userlist_callback_t cal
struct WHOQueueEntry* entry = addWHOQueueEntry(bot);
entry->type = WHOQUEUETYPE_ISONQUEUE | WHOQUEUETYPE_USERLIST;
entry->chan = chan;
struct WHOQueueEntry* entry = addWHOQueueEntry(bot);
entry->type = WHOQUEUETYPE_ISONQUEUE | WHOQUEUETYPE_USERLIST;
entry->chan = chan;
- entry->callback = callback;
+ entry->callback[0] = callback;
+ int i;
+ for(i = 1; i < MAXCALLBACKS; i++)
+ entry->callback[i] = NULL;
entry->data = data;
putsock(bot, "WHO %s,%d d%%tuhnaf,%d", chan->name, entry->type, entry->type);
} else
entry->data = data;
putsock(bot, "WHO %s,%d d%%tuhnaf,%d", chan->name, entry->type, entry->type);
} else
@@
-140,6
+148,19
@@
void _get_userlist_with_invisible(struct ChanNode *chan, userlist_callback_t cal
}
void get_userauth(struct UserNode *user, userauth_callback_t callback, void *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;
+ return;
+ }
+ }
+ }
+ }
struct ClientSocket *bot;
for(bot = getBots(SOCKET_FLAG_READY, NULL); bot; bot = getBots(SOCKET_FLAG_READY, bot)) {
if(bot->flags & SOCKET_FLAG_PREFERRED)
struct ClientSocket *bot;
for(bot = getBots(SOCKET_FLAG_READY, NULL); bot; bot = getBots(SOCKET_FLAG_READY, bot)) {
if(bot->flags & SOCKET_FLAG_PREFERRED)
@@
-151,10
+172,13
@@
void get_userauth(struct UserNode *user, userauth_callback_t callback, void *dat
callback(bot, user->nick, user, data);
return;
}
callback(bot, user->nick, user, data);
return;
}
-
struct WHOQueueEntry*
entry = addWHOQueueEntry(bot);
+ entry = addWHOQueueEntry(bot);
entry->type = WHOQUEUETYPE_ISONQUEUE | WHOQUEUETYPE_USERAUTH;
entry->user = user;
entry->type = WHOQUEUETYPE_ISONQUEUE | WHOQUEUETYPE_USERAUTH;
entry->user = user;
- entry->callback = callback;
+ entry->callback[0] = callback;
+ int i;
+ for(i = 1; i < MAXCALLBACKS; i++)
+ entry->callback[i] = NULL;
entry->data = data;
//WHO ".$user->getNick().",".$id." %tuhna,".$id
putsock(bot, "WHO %s,%d %%tuhna,%d", user->nick, entry->type, entry->type);
entry->data = data;
//WHO ".$user->getNick().",".$id." %tuhna,".$id
putsock(bot, "WHO %s,%d %%tuhna,%d", user->nick, entry->type, entry->type);
@@
-230,8
+254,11
@@
void recv_whohandler_354(struct ClientSocket *client, char **argv, unsigned int
strcpy(entry->user->auth, argv[5]);
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);
+ }
}
}
}
}
@@
-246,8
+273,13
@@
void recv_whohandler_315(struct ClientSocket *client, char **argv, unsigned int
if(type & WHOQUEUETYPE_USERLIST) {
//:OGN2.OnlineGamesNet.net 315 skynet #pk910,1 :End of /WHO list.
entry->chan->flags |= CHANFLAG_RECEIVED_USERLIST;
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);
+ }
if(entry->chan->flags & CHANFLAG_HAVE_INVISIBLES) {
//remove all invisible users again
struct ChanUser *chanuser, *next;
if(entry->chan->flags & CHANFLAG_HAVE_INVISIBLES) {
//remove all invisible users again
struct ChanUser *chanuser, *next;
@@
-260,8
+292,13
@@
void recv_whohandler_315(struct ClientSocket *client, char **argv, unsigned int
}
} else if(type & WHOQUEUETYPE_USERAUTH) {
if(!(entry->type & WHOQUEUETYPE_FOUND)) {
}
} 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);
+ }
}
}
free(entry);
}
}
free(entry);