fixed required parameter count for cmd_kick & cmd_kickban

[NeonServV5.git] / WHOHandler.c

diff --git a/WHOHandler.c b/WHOHandler.c
index 994f288aa399fc3edfe462bb897679b8a10bd389..543b6257b91c7e9092b45dc9d402b6b76c0fc9da 100644 (file)
--- a/WHOHandler.c
+++ b/WHOHandler.c
@@ -8,6 +8,8 @@
 #define WHOQUEUETYPE_ISONQUEUE 0x01
 #define WHOQUEUETYPE_USERLIST  0x02
 #define WHOQUEUETYPE_USERAUTH  0x04
+#define WHOQUEUETYPE_CHECKTYPE 0x07
+#define WHOQUEUETYPE_FOUND     0x08
 
 struct WHOQueueEntry {
     char type;
@@ -32,6 +34,8 @@ static struct WHOQueueEntry* addWHOQueueEntry(struct ClientSocket *client) {
     entry->client = client;
     if(last_entry)
         last_entry->next = entry;
+    else
+        last_entry = entry;
     if(!first_entry)
         first_entry = entry;
     return entry;
@@ -46,9 +50,14 @@ static struct WHOQueueEntry* getNextWHOQueueEntry(struct ClientSocket *client, i
     }
     if(entry == NULL) return NULL;
     if(freeEntry) {
-        first_entry = first_entry->next;
-        if(last_entry == first_entry)
-            last_entry = NULL;
+        if(entry == first_entry)
+            first_entry = entry->next;
+        if(entry == last_entry) {
+            struct WHOQueueEntry *last;
+            for(last = first_entry; last; last = last->next)
+                if(last->next == NULL) break;
+            last_entry = last;
+        }
     }
     return entry;
 }
@@ -72,10 +81,10 @@ void get_userlist(struct ChanNode *chan, userlist_callback_t callback, void *dat
 void get_userauth(struct UserNode *user, userauth_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))
+        if(bot->flags & SOCKET_FLAG_PREFERRED)
             break;
     }
-    if(bot == NULL) return;
+    if(bot == NULL) bot = getBots(SOCKET_FLAG_READY, NULL);
     struct WHOQueueEntry* entry = addWHOQueueEntry(bot);
     entry->type = WHOQUEUETYPE_ISONQUEUE | WHOQUEUETYPE_USERAUTH;
     entry->user = user;
@@ -91,7 +100,7 @@ void recv_whohandler_354(struct ClientSocket *client, char **argv, unsigned int
     int type = atoi(argv[1]);
     if(!(type & WHOQUEUETYPE_ISONQUEUE)) return;
     struct WHOQueueEntry* entry = getNextWHOQueueEntry(client, 0);
-    if(entry == NULL || entry->type != type) return;
+    if(entry == NULL || (entry->type & WHOQUEUETYPE_CHECKTYPE) != (type & WHOQUEUETYPE_CHECKTYPE)) return;
     if(type & WHOQUEUETYPE_USERLIST) {
         if(argc < 7) return;
         //:OGN2.OnlineGamesNet.net 354 skynet 1 pk910 2001:41d0:2:1d3b::babe skynet H@ pk910
@@ -134,7 +143,8 @@ 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
-        if(!strcmp(argv[5], "0") && !(entry->user->flags & USERFLAG_ISAUTHED)) {
+        entry->type |= WHOQUEUETYPE_FOUND;
+        if(strcmp(argv[5], "0") && !(entry->user->flags & USERFLAG_ISAUTHED)) {
             strcpy(entry->user->auth, argv[5]);
             entry->user->flags |= USERFLAG_ISAUTHED;
         }
@@ -149,12 +159,17 @@ void recv_whohandler_315(struct ClientSocket *client, char **argv, unsigned int
     int type = atoi(typestr);
     if(!(type & WHOQUEUETYPE_ISONQUEUE)) return;
     struct WHOQueueEntry* entry = getNextWHOQueueEntry(client, 1);
-    if(entry == NULL || entry->type != type) return;
+    if(entry == NULL || (entry->type & WHOQUEUETYPE_CHECKTYPE) != (type & WHOQUEUETYPE_CHECKTYPE)) return;
     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);
+    } else if(type & WHOQUEUETYPE_USERAUTH) {
+        if(!(entry->type & WHOQUEUETYPE_FOUND)) {
+            userauth_callback_t *callback = entry->callback;
+            callback(client, NULL, entry->data);
+        }
     }
     free(entry);
 }