fixed possible cache errors due receive time shifts

diff --git a/src/ChanNode.c b/src/ChanNode.c
index 1ea32d4e4894b3054b48d1f3b2f87d3bf2b99a22..4dd16b34744ad6b313622778bfd5d0d5b26a56e2 100644 (file)
--- a/src/ChanNode.c
+++ b/src/ChanNode.c
@@ -138,6 +138,7 @@ struct ChanNode* addChannel(const char *name) {
     chan->bans = NULL;
     chan->spam_settings = NULL;
     chan->usercount = 0;
+    chan->botcount = 0;
     chan->topic[0] = 0;
     chan->flags = 0;
     /* mode lists */

diff --git a/src/ChanNode.h b/src/ChanNode.h
index f17792f3c2901be4180bd6bd4a3106151f5c5f7a..eba80afb34406c5aad47a7ab921e19937bbc2ddd 100644 (file)
--- a/src/ChanNode.h
+++ b/src/ChanNode.h
@@ -37,6 +37,7 @@ struct ChanNode {
     char topic[TOPICLEN+1];
     struct ChanUser *user;
     unsigned int usercount;
+    unsigned int botcount;
     unsigned char flags;
     struct ModeNode *modes;
     struct BanNode *bans;

diff --git a/src/IRCParser.c b/src/IRCParser.c
index bd505f23ab514ff92106d39602d6a8ed53b3e2e6..c8cd526a5b37dae8ca0f6f9c72f231ae18aa74a3 100644 (file)
--- a/src/IRCParser.c
+++ b/src/IRCParser.c
@@ -322,6 +322,7 @@ static IRC_CMD(raw_join) {
         chan = addChannel(argv[0]);
         chanuser = addChanUser(chan, user);
         chanuser->visCount = 1;
+        chan->botcount = 1;
         get_userlist_with_invisible(chan, 0, got_channel_userlist, chanuser);
         putsock(client, "MODE %s", chan->name);
         putsock(client, "MODE %s +b", chan->name);
@@ -341,6 +342,7 @@ static IRC_CMD(raw_join) {
         
         chanuser = addChanUser(chan, user);
         chanuser->visCount = 1;
+        chan->botcount++;
         
         if(isModeSet(chan->modes, 'D')) //if the bot joins a channel it could also be invisible
             chanuser->flags |= CHANUSERFLAG_INVISIBLE;
@@ -354,6 +356,7 @@ static IRC_CMD(raw_join) {
             if(isModeSet(chan->modes, 'D')) //if the bot joins a channel it could also be invisible
                 chanuser->flags |= CHANUSERFLAG_INVISIBLE;
             increase_viscount_butone(chan, chanuser);
+            chan->botcount++;
         }
         
         event_join(chanuser);
@@ -368,8 +371,15 @@ static IRC_CMD(raw_join) {
         chanuser = getChanUser(user, chan);
         chanuser->visCount++;
         
-        if(isBot(user) && client->user == user)
+        if(isBot(user) && client->user == user) {
             increase_viscount_butone(chan, chanuser);
+            chan->botcount++;
+        }
+        
+        if(chanuser->visCount > chan->botcount) {
+            chanuser->visCount = chan->botcount;
+            //TODO: Trigger WARNING
+        }
         
         //if multiple bots see the user, it can't be invisible
         chanuser->flags &= ~CHANUSERFLAG_INVISIBLE;
@@ -388,8 +398,10 @@ static IRC_CMD(raw_part) {
         DESYNCHRONIZE(cache_sync);
         return 0;
     }
-    if(isBot(user) && user == client->user) 
+    if(isBot(user) && user == client->user) {
         decrease_viscount_butone(chan, chanuser);
+        chan->botcount--;
+    }
     chanuser->visCount--;
     if(chanuser->visCount == 0) {
         delChanUser(chanuser, 0); //not free, yet!
@@ -441,8 +453,10 @@ static IRC_CMD(raw_kick) {
         DESYNCHRONIZE(cache_sync);
         return 0;
     }
-    if(isBot(target) && target == client->user) 
+    if(isBot(target) && target == client->user) {
         decrease_viscount_butone(chan, chanuser);
+        chan->botcount--;
+    }
     chanuser->visCount--;
     if(chanuser->visCount == 0) {
         delChanUser(chanuser, 0); //not free, yet!
@@ -546,6 +560,7 @@ void bot_disconnect(struct ClientSocket *client) {
         for(chanuser = getUserChannels(user, NULL); chanuser; chanuser = next_chanuser) {
             next_chanuser = getUserChannels(user, chanuser);
             decrease_viscount_butone(chanuser->chan, chanuser);
+            chanuser->chan->botcount--;
             chanuser->visCount--;
             if(chanuser->visCount <= 0) {
                 delChanUser(chanuser, 0); //not free, yet!