rewrote IRC cache parser to be (hopefully) more stable

[NeonServV5.git] / src / ChanUser.c

diff --git a/src/ChanUser.c b/src/ChanUser.c
index 7638d6fe8c782e4fc141aea995e018af74dfa131..0d370c1dcd25ef9e55b127fcd58813c32d32471d 100644 (file)
--- a/src/ChanUser.c
+++ b/src/ChanUser.c
@@ -1,5 +1,5 @@
-/* ChanUser.c - NeonServ v5.1
- * Copyright (C) 2011  Philipp Kreil (pk910)
+/* ChanUser.c - NeonServ v5.4
+ * Copyright (C) 2011-2012  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,10 +17,11 @@
 
 #include "ChanUser.h"
 #include "ChanNode.h"
+#include "ModeNode.h"
 #include "UserNode.h"
 
 struct ChanUser* addChanUser(struct ChanNode *chan, struct UserNode *user) {
-    struct ChanUser *chanuser = malloc(sizeof(*chan));
+    struct ChanUser *chanuser = malloc(sizeof(*chanuser));
     if (!chanuser)
     {
         perror("malloc() failed");
@@ -29,10 +30,13 @@ struct ChanUser* addChanUser(struct ChanNode *chan, struct UserNode *user) {
     chanuser->flags = 0;
     chanuser->user = user;
     chanuser->chan = chan;
+    chanuser->visCount = 0;
     
     chanuser->changeTime = 0;
     chanuser->spamnode = NULL;
 
+    SYNCHRONIZE(cache_sync);
+
     chanuser->next_user = chan->user;
     chan->user = chanuser;
     chan->usercount++;
@@ -40,11 +44,13 @@ struct ChanUser* addChanUser(struct ChanNode *chan, struct UserNode *user) {
     chanuser->next_chan = user->channel;
     user->channel = chanuser;
 
+    DESYNCHRONIZE(cache_sync);
+
     return chanuser;
 }
 
 struct ChanUser* addInvisibleChanUser(struct ChanNode *chan, struct UserNode *user) {
-    struct ChanUser *chanuser = malloc(sizeof(*chan));
+    struct ChanUser *chanuser = malloc(sizeof(*chanuser));
     if (!chanuser)
     {
         perror("malloc() failed");
@@ -53,12 +59,15 @@ struct ChanUser* addInvisibleChanUser(struct ChanNode *chan, struct UserNode *us
     chanuser->flags = CHANUSERFLAG_INVISIBLE;
     chanuser->user = user;
     chanuser->chan = chan;
+    chanuser->visCount = 0;
     
     chanuser->changeTime = 0;
     chanuser->spamnode = NULL;
 
+    SYNCHRONIZE(cache_sync);
     chanuser->next_user = chan->user;
     chan->user = chanuser;
+    DESYNCHRONIZE(cache_sync);
     chan->usercount++;
 
     return chanuser;
@@ -66,18 +75,32 @@ struct ChanUser* addInvisibleChanUser(struct ChanNode *chan, struct UserNode *us
 
 int isUserOnChan(struct UserNode *user, struct ChanNode *chan) {
     struct ChanUser *chanuser;
-    for(chanuser = user->channel; chanuser; chanuser = chanuser->next_chan) {
-        if(chanuser->chan == chan)
-            return 1;
+    if(isModeSet(chan->modes, 'd') || isModeSet(chan->modes, 'D')) {
+        for(chanuser = chan->user; chanuser; chanuser = chanuser->next_user) {
+            if(chanuser->user == user)
+                return 1;
+        }
+    } else {
+        for(chanuser = user->channel; chanuser; chanuser = chanuser->next_chan) {
+            if(chanuser->chan == chan)
+                return 1;
+        }
     }
     return 0;
 }
 
 struct ChanUser* getChanUser(struct UserNode *user, struct ChanNode *chan) {
     struct ChanUser *chanuser;
-    for(chanuser = user->channel; chanuser; chanuser = chanuser->next_chan) {
-        if(chanuser->chan == chan)
-            return chanuser;
+    if(isModeSet(chan->modes, 'd') || isModeSet(chan->modes, 'D')) {
+        for(chanuser = chan->user; chanuser; chanuser = chanuser->next_user) {
+            if(chanuser->user == user)
+                return chanuser;
+        }
+    } else {
+        for(chanuser = user->channel; chanuser; chanuser = chanuser->next_chan) {
+            if(chanuser->chan == chan)
+                return chanuser;
+        }
     }
     return NULL;
 }
@@ -97,6 +120,7 @@ struct ChanUser* getUserChannels(struct UserNode *user, struct ChanUser *last) {
 }
 
 void delChanUser(struct ChanUser *chanuser, int do_freeChanUser) {
+    SYNCHRONIZE(cache_sync);
     struct ChanUser *cchanuser, *last;
     //remove it from the user's channel-list
     if(!(chanuser->flags & CHANUSERFLAG_INVISIBLE)) {
@@ -133,9 +157,11 @@ void delChanUser(struct ChanUser *chanuser, int do_freeChanUser) {
         chanuser->next_chan = NULL;
         chanuser->next_user = NULL;
     }
+    DESYNCHRONIZE(cache_sync);
 }
 
 void removeChanUserFromLists(struct ChanUser *chanuser, int remove_from_userlist, int remove_from_channellist, int do_freeChanUser) {
+    SYNCHRONIZE(cache_sync);
     struct ChanUser *cchanuser, *last;
     if(remove_from_userlist) {
         //remove it from the channel's user-list
@@ -172,6 +198,7 @@ void removeChanUserFromLists(struct ChanUser *chanuser, int remove_from_userlist
     if(do_freeChanUser) {
         freeChanUser(chanuser);
     }
+    DESYNCHRONIZE(cache_sync);
 }
 
 void freeChanUser(struct ChanUser *chanuser) {