added support for invisible users

diff --git a/ChanNode.h b/ChanNode.h
index d08ac7eced0921b1797df355a774482dc34089bf..fb63b564fa89a6fca04dbb71dd342bb5dafb3e40 100644 (file)
--- a/ChanNode.h
+++ b/ChanNode.h
@@ -8,6 +8,7 @@ struct trigger_cache;
 #define CHANFLAG_RECEIVED_USERLIST  0x01
 #define CHANFLAG_REQUESTED_CHANINFO 0x02
 #define CHANFLAG_CHAN_REGISTERED    0x04
+#define CHANFLAG_HAVE_INVISIBLES    0x08
 
 struct ChanNode {
     char name[CHANNELLEN+1];

diff --git a/ChanUser.c b/ChanUser.c
index 69fc006621744b3d91061f134c6560490e8c8817..0a61188e8c6eb13516d605f506c719a63f5e4ef8 100644 (file)
--- a/ChanUser.c
+++ b/ChanUser.c
@@ -24,6 +24,24 @@ struct ChanUser* addChanUser(struct ChanNode *chan, struct UserNode *user) {
     return chanuser;
 }
 
+struct ChanUser* addInvisibleChanUser(struct ChanNode *chan, struct UserNode *user) {
+    struct ChanUser *chanuser = malloc(sizeof(*chan));
+    if (!chanuser)
+    {
+        perror("malloc() failed");
+        return NULL;
+    }
+    chanuser->flags = CHANUSERFLAG_INVISIBLE;
+    chanuser->user = user;
+    chanuser->chan = chan;
+
+    chanuser->next_user = chan->user;
+    chan->user = chanuser;
+    chan->usercount++;
+
+    return chanuser;
+}
+
 int isUserOnChan(struct UserNode *user, struct ChanNode *chan) {
     struct ChanUser *chanuser;
     for(chanuser = user->channel; chanuser; chanuser = chanuser->next_chan) {
@@ -59,16 +77,18 @@ struct ChanUser* getUserChannels(struct UserNode *user, struct ChanUser *last) {
 void delChanUser(struct ChanUser *chanuser, int freeChanUser) {
     struct ChanUser *cchanuser, *last;
     //remove it from the user's channel-list
-    last = NULL;
-    for(cchanuser = chanuser->user->channel; cchanuser; cchanuser = cchanuser->next_chan) {
-        if(cchanuser == chanuser) {
-            if(last) 
-                last->next_chan = chanuser->next_chan;
-            else
-                chanuser->user->channel = chanuser->next_chan;
-            break;
-        } else
-            last = cchanuser;
+    if(!(chanuser->flags & CHANUSERFLAG_INVISIBLE)) {
+        last = NULL;
+        for(cchanuser = chanuser->user->channel; cchanuser; cchanuser = cchanuser->next_chan) {
+            if(cchanuser == chanuser) {
+                if(last) 
+                    last->next_chan = chanuser->next_chan;
+                else
+                    chanuser->user->channel = chanuser->next_chan;
+                break;
+            } else
+                last = cchanuser;
+        }
     }
 
     //remove it from the channel's user-list

diff --git a/ChanUser.h b/ChanUser.h
index ad074d47e87dd2ee2f46db10a7687ba327c85490..fd64f1924548f1561603bde1b20afd44b8fb99bb 100644 (file)
--- a/ChanUser.h
+++ b/ChanUser.h
@@ -3,6 +3,7 @@
 
 #define CHANUSERFLAG_OPPED  0x01
 #define CHANUSERFLAG_VOICED 0x02
+#define CHANUSERFLAG_INVISIBLE 0x04
 
 #define CHANUSERFLAG_OPPED_OR_VOICED (CHANUSERFLAG_OPPED | CHANUSERFLAG_VOICED)
 
@@ -19,6 +20,7 @@ struct ChanUser {
 };
 
 struct ChanUser* addChanUser(struct ChanNode *chan, struct UserNode *user);
+struct ChanUser* addInvisibleChanUser(struct ChanNode *chan, struct UserNode *user);
 int isUserOnChan(struct UserNode *user, struct ChanNode *chan);
 struct ChanUser* getChanUser(struct UserNode *user, struct ChanNode *chan);
 struct ChanUser* getChannelUsers(struct ChanNode *chan, struct ChanUser *last);

diff --git a/WHOHandler.c b/WHOHandler.c
index 543b6257b91c7e9092b45dc9d402b6b76c0fc9da..b74fb5cdbea4c1d1c0d1012c7485513dc297baf5 100644 (file)
--- a/WHOHandler.c
+++ b/WHOHandler.c
@@ -78,6 +78,22 @@ 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_userlist_with_invisible(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))
+            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);
+}
+
 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)) {
@@ -106,10 +122,6 @@ void recv_whohandler_354(struct ClientSocket *client, char **argv, unsigned int
         //:OGN2.OnlineGamesNet.net 354 skynet 1 pk910 2001:41d0:2:1d3b::babe skynet H@ pk910
         struct ChanNode *chan = entry->chan;
         //add the user toe the channel if he isn't added, yet and update its user data
-        struct UserNode *user = getUserByNick(argv[4]);
-        if(user == NULL) {
-            user = addUser(argv[4]);
-        }
         //parse flags
         int userflags = 0;
         int chanuserflags = 0;
@@ -124,15 +136,32 @@ void recv_whohandler_354(struct ClientSocket *client, char **argv, unsigned int
                 case '*':
                     userflags |= USERFLAG_ISIRCOP;
                     break;
+                case '<':
+                    chanuserflags |= CHANUSERFLAG_INVISIBLE;
+                    break;
                 default:
                     break;
             }
         }
-        user->flags = (user->flags & ~USERFLAG_ISIRCOP) | userflags;
-        if(!isUserOnChan(user, chan)) {
-            struct ChanUser *chanuser = addChanUser(chan, user);
+        
+        struct UserNode *user;
+        if(chanuserflags & CHANUSERFLAG_INVISIBLE) {
+            user = createTempUser(argv[4]);
+            user->flags |= USERFLAG_ISTMPUSER;
+            chan->flags |= CHANFLAG_HAVE_INVISIBLES;
+            struct ChanUser *chanuser = addInvisibleChanUser(chan, user);
             chanuser->flags = (chanuser->flags & ~CHANUSERFLAG_OPPED_OR_VOICED) | chanuserflags;
+        } else {
+            user = getUserByNick(argv[4]);
+            if(user == NULL) {
+                user = addUser(argv[4]);
+            }
+            if(!isUserOnChan(user, chan)) {
+                struct ChanUser *chanuser = addChanUser(chan, user);
+                chanuser->flags = (chanuser->flags & ~CHANUSERFLAG_OPPED_OR_VOICED) | chanuserflags;
+            }
         }
+        user->flags = (user->flags & ~USERFLAG_ISIRCOP) | userflags;
         if(!*user->ident)
             strcpy(user->ident, argv[2]);
         if(!*user->host)
@@ -165,6 +194,16 @@ void recv_whohandler_315(struct ClientSocket *client, char **argv, unsigned int
         entry->chan->flags |= CHANFLAG_RECEIVED_USERLIST;
         userlist_callback_t *callback = entry->callback;
         callback(client, entry->chan, entry->data);
+        if(entry->chan->flags & CHANFLAG_HAVE_INVISIBLES) {
+            //remove all invisible users again
+            struct ChanUser *chanuser, *next;
+            for(chanuser = getChannelUsers(entry->chan, NULL); chanuser; chanuser = next) {
+                next = getChannelUsers(entry->chan, chanuser);
+                if(chanuser->flags & CHANUSERFLAG_INVISIBLE) {
+                    delChanUser(chanuser, 1);
+                }
+            }
+        }
     } else if(type & WHOQUEUETYPE_USERAUTH) {
         if(!(entry->type & WHOQUEUETYPE_FOUND)) {
             userauth_callback_t *callback = entry->callback;

diff --git a/WHOHandler.h b/WHOHandler.h
index 7ea6c7faf60c9039d3e6601df52154ac23bbec6e..0ce05efc7fabbbe13fddaaf6bb6ff1785c2ec7f4 100644 (file)
--- a/WHOHandler.h
+++ b/WHOHandler.h
@@ -16,6 +16,7 @@ typedef USERAUTH_CALLBACK(userauth_callback_t);
 void recv_whohandler_354(struct ClientSocket *client, char **argv, unsigned int argc);
 void recv_whohandler_315(struct ClientSocket *client, char **argv, unsigned int argc);
 void get_userlist(struct ChanNode *chan, userlist_callback_t callback, void *data);
+void get_userlist_with_invisible(struct ChanNode *chan, userlist_callback_t callback, void *data);
 void get_userauth(struct UserNode *user, userauth_callback_t callback, void *data);
 void free_whoqueue();
 

diff --git a/cmd_neonserv_kick.c b/cmd_neonserv_kick.c
index 66aa32a0ca0e9f8a00cecd17be1385d6e3ee964f..8c6b0138ea47d0e6e536cf77d180858f5bcf8924 100644 (file)
--- a/cmd_neonserv_kick.c
+++ b/cmd_neonserv_kick.c
@@ -107,10 +107,13 @@ static void neonserv_cmd_kick_async1(struct ClientSocket *client, struct ClientS
             }
         } else {
             provided_nicks++;
-            cuser = searchUserByNick(nick);
+            cuser = NULL;
+            for(chanuser = getChannelUsers(chan, NULL); chanuser; chanuser = getChannelUsers(chan, chanuser)) {
+                if(!stricmp(chanuser->user->nick, nick)) {
+                    cuser = chanuser->user;
+                }
+            }
             if(!cuser) continue;
-            chanuser = getChanUser(cuser, chan);
-            if(!chanuser) continue;
             if(isNetworkService(cuser)) {
                 reply(textclient, user, "NS_SERVICE_IMMUNE", cuser->nick);
                 continue;