added a data parameter to get_userlist that gets passed to the callback

diff --git a/IRCParser.c b/IRCParser.c
index de03a7380c2863eeda871310ce90b2d38b321e05..17cafd3f9004a178162b2d4a816d1ebf98c88b71 100644 (file)
--- a/IRCParser.c
+++ b/IRCParser.c
@@ -108,7 +108,7 @@ static IRC_CMD(raw_join) {
         chan = addChannel(argv[0]);
         //request member list
         addChanUser(chan, user); //it must be a bot
-        get_userlist(chan, got_channel_userlist);
+        get_userlist(chan, got_channel_userlist, NULL);
     } else if(!isUserOnChan(user, chan) && (chan->flags & CHANFLAG_RECEIVED_USERLIST)) {
         struct ChanUser *chanuser = addChanUser(chan, user);
         event_join(chanuser);

diff --git a/WHOHandler.c b/WHOHandler.c
index b4be93d1a06bd46793c87783f8db18c9a4784f2d..c87ef409bdd5038f0ec329f8c0b47b409e0a6da3 100644 (file)
--- a/WHOHandler.c
+++ b/WHOHandler.c
@@ -13,6 +13,7 @@ struct WHOQueueEntry {
     struct UserNode *user;
     struct WHOQueueEntry *next;
     userlist_callback_t *callback;
+    void *data;
 };
 
 static struct WHOQueueEntry *first_entry = NULL, *last_entry = NULL;
@@ -49,7 +50,7 @@ static struct WHOQueueEntry* getNextWHOQueueEntry(struct ClientSocket *client, i
     return entry;
 }
 
-void get_userlist(struct ChanNode *chan, userlist_callback_t callback) {
+void get_userlist(struct ChanNode *chan, 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))
@@ -60,6 +61,7 @@ void get_userlist(struct ChanNode *chan, userlist_callback_t callback) {
     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);
 }
@@ -124,7 +126,7 @@ 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;
-        entry->callback(client, entry->chan);
+        entry->callback(client, entry->chan, entry->data);
     }
     free(entry);
 }

diff --git a/WHOHandler.h b/WHOHandler.h
index 0c46dbd138b5d928ed23607d9d35b18b5a7a04cf..9a578ccb0d4a797caf62f6389b5f011a566d9792 100644 (file)
--- a/WHOHandler.h
+++ b/WHOHandler.h
@@ -6,7 +6,7 @@
 struct ClientSocket;
 struct ChanNode;
 
-#define USERLIST_CALLBACK(NAME) void NAME(UNUSED_ARG(struct ClientSocket *client), UNUSED_ARG(struct ChanNode *chan))
+#define USERLIST_CALLBACK(NAME) void NAME(UNUSED_ARG(struct ClientSocket *client), UNUSED_ARG(struct ChanNode *chan), UNUSED_ARG(void *data))
 typedef USERLIST_CALLBACK(userlist_callback_t);
 
 void recv_whohandler_354(struct ClientSocket *client, char **argv, unsigned int argc);