added some code & compiler information to cmd_netinfo

[NeonServV5.git] / WHOHandler.c

diff --git a/WHOHandler.c b/WHOHandler.c
index c87ef409bdd5038f0ec329f8c0b47b409e0a6da3..543b6257b91c7e9092b45dc9d402b6b76c0fc9da 100644 (file)
--- a/WHOHandler.c
+++ b/WHOHandler.c
@@ -2,9 +2,14 @@
 #include "WHOHandler.h"
 #include "ChanNode.h"
 #include "UserNode.h"
+#include "ChanUser.h"
+#include "ClientSocket.h"
 
 #define WHOQUEUETYPE_ISONQUEUE 0x01
 #define WHOQUEUETYPE_USERLIST  0x02
+#define WHOQUEUETYPE_USERAUTH  0x04
+#define WHOQUEUETYPE_CHECKTYPE 0x07
+#define WHOQUEUETYPE_FOUND     0x08
 
 struct WHOQueueEntry {
     char type;
@@ -12,7 +17,7 @@ struct WHOQueueEntry {
     struct ChanNode *chan;
     struct UserNode *user;
     struct WHOQueueEntry *next;
-    userlist_callback_t *callback;
+    void *callback;
     void *data;
 };
 
@@ -29,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;
@@ -43,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;
 }
@@ -66,13 +78,29 @@ void get_userlist(struct ChanNode *chan, userlist_callback_t callback, void *dat
     putsock(bot, "WHO %s,%d %%tuhnaf,%d", chan->name, entry->type, entry->type);
 }
 
+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(bot->flags & SOCKET_FLAG_PREFERRED)
+            break;
+    }
+    if(bot == NULL) bot = getBots(SOCKET_FLAG_READY, NULL);
+    struct WHOQueueEntry* entry = addWHOQueueEntry(bot);
+    entry->type = WHOQUEUETYPE_ISONQUEUE | WHOQUEUETYPE_USERAUTH;
+    entry->user = user;
+    entry->callback = callback;
+    entry->data = data;
+    //WHO ".$user->getNick().",".$id." %tuhna,".$id
+    putsock(bot, "WHO %s,%d %%tuhna,%d", user->nick, entry->type, entry->type);
+}
+
 void recv_whohandler_354(struct ClientSocket *client, char **argv, unsigned int argc) {
     int i;
     if(argc < 2) return;
     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
@@ -113,6 +141,15 @@ void recv_whohandler_354(struct ClientSocket *client, char **argv, unsigned int
             strcpy(user->auth, argv[6]);
             user->flags |= USERFLAG_ISAUTHED;
         }
+    } else if(type & WHOQUEUETYPE_USERAUTH) {
+        //:OGN2.OnlineGamesNet.net 354 Skynet 1 pk910 2001:41d0:2:1d3b::babe Skynet pk910
+        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;
+        }
+        userauth_callback_t *callback = entry->callback;
+        callback(client, entry->user, entry->data);
     }
 }
 
@@ -122,11 +159,27 @@ 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;
-        entry->callback(client, entry->chan, entry->data);
+        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);
 }
+
+void free_whoqueue() {
+    struct WHOQueueEntry *entry, *next;
+    for(entry = first_entry; entry; entry = next) {
+        next = entry->next;
+        free(entry);
+    }
+    first_entry = NULL;
+    last_entry = NULL;
+}