X-Git-Url: http://git.pk910.de/?p=NeonServV5.git;a=blobdiff_plain;f=src%2FChanUser.c;h=e18ce4dd57590d7a718f13cebfda8edfadd02243;hp=d683e22bd83e88c1468412fd2ff4e42e64f6e550;hb=HEAD;hpb=c575e458c6257e75b97884847143b20965a5dfda

diff --git a/src/ChanUser.c b/src/ChanUser.c
index d683e22..e18ce4d 100644
--- a/src/ChanUser.c
+++ b/src/ChanUser.c
@@ -1,5 +1,5 @@
-/* ChanUser.c - NeonServ v5.2
- * Copyright (C) 2011  Philipp Kreil (pk910)
+/* ChanUser.c - NeonServ v5.6
+ * 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,22 +17,27 @@
 
 #include "ChanUser.h"
 #include "ChanNode.h"
+#include "ModeNode.h"
 #include "UserNode.h"
+#include "log.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");
+        printf_log("main", LOG_ERROR, "%s:%d malloc() failed", __FILE__, __LINE__);
         return NULL;
     }
     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,25 +45,30 @@ 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");
+        printf_log("main", LOG_ERROR, "%s:%d malloc() failed", __FILE__, __LINE__);
         return NULL;
     }
     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 +76,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,20 +121,19 @@ 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)) {
-        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;
-        }
+    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
@@ -133,9 +156,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 +197,7 @@ void removeChanUserFromLists(struct ChanUser *chanuser, int remove_from_userlist
     if(do_freeChanUser) {
         freeChanUser(chanuser);
     }
+    DESYNCHRONIZE(cache_sync);
 }
 
 void freeChanUser(struct ChanUser *chanuser) {