X-Git-Url: http://git.pk910.de/?p=NeonServV5.git;a=blobdiff_plain;f=src%2FChanUser.c;h=9ac06912ef0683039cd2bb1accc4cf529e09365f;hp=c31e202340ee9099d5560c3169b8c76a4abbd1f6;hb=55831bf424312a6908ca07a904f288fba0919a9a;hpb=0f1dc61921eef1db8e404a5a82372e2d1cd55daa

diff --git a/src/ChanUser.c b/src/ChanUser.c
index c31e202..9ac0691 100644
--- a/src/ChanUser.c
+++ b/src/ChanUser.c
@@ -1,3 +1,19 @@
+/* ChanUser.c - NeonServ v5.3
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License 
+ * along with this program. If not, see <http://www.gnu.org/licenses/>. 
+ */
 
 #include "ChanUser.h"
 #include "ChanNode.h"
@@ -15,6 +31,9 @@ struct ChanUser* addChanUser(struct ChanNode *chan, struct UserNode *user) {
     chanuser->chan = chan;
     
     chanuser->changeTime = 0;
+    chanuser->spamnode = NULL;
+
+    SYNCHRONIZE(cache_sync);
 
     chanuser->next_user = chan->user;
     chan->user = chanuser;
@@ -23,6 +42,8 @@ struct ChanUser* addChanUser(struct ChanNode *chan, struct UserNode *user) {
     chanuser->next_chan = user->channel;
     user->channel = chanuser;
 
+    DESYNCHRONIZE(cache_sync);
+
     return chanuser;
 }
 
@@ -38,9 +59,12 @@ struct ChanUser* addInvisibleChanUser(struct ChanNode *chan, struct UserNode *us
     chanuser->chan = chan;
     
     chanuser->changeTime = 0;
+    chanuser->spamnode = NULL;
 
+    SYNCHRONIZE(cache_sync);
     chanuser->next_user = chan->user;
     chan->user = chanuser;
+    DESYNCHRONIZE(cache_sync);
     chan->usercount++;
 
     return chanuser;
@@ -78,7 +102,8 @@ struct ChanUser* getUserChannels(struct UserNode *user, struct ChanUser *last) {
         return last->next_chan;
 }
 
-void delChanUser(struct ChanUser *chanuser, int freeChanUser) {
+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)) {
@@ -109,15 +134,17 @@ void delChanUser(struct ChanUser *chanuser, int freeChanUser) {
             last = cchanuser;
     }
     
-    if(freeChanUser)
-        free(chanuser);
-    else {
+    if(do_freeChanUser) {
+        freeChanUser(chanuser);
+    } else {
         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 freeChanUser) {
+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
@@ -151,7 +178,15 @@ void removeChanUserFromLists(struct ChanUser *chanuser, int remove_from_userlist
         chanuser->next_chan = NULL;
     }
     
-    if(freeChanUser)
-        free(chanuser);
+    if(do_freeChanUser) {
+        freeChanUser(chanuser);
+    }
+    DESYNCHRONIZE(cache_sync);
+}
+
+void freeChanUser(struct ChanUser *chanuser) {
+    if(chanuser->spamnode)
+        free(chanuser->spamnode);
+    free(chanuser);
 }