X-Git-Url: http://git.pk910.de/?p=NeonServV5.git;a=blobdiff_plain;f=src%2FChanNode.c;h=977b9b4c985eb8d9270e0f788607882a9db81d3a;hp=82198e76eeb02c6727bd6102b454dfb120b9010b;hb=55831bf424312a6908ca07a904f288fba0919a9a;hpb=7d31bc7adfcfc4a16e5ace2f383a18cae5cd5618

diff --git a/src/ChanNode.c b/src/ChanNode.c
index 82198e7..977b9b4 100644
--- a/src/ChanNode.c
+++ b/src/ChanNode.c
@@ -1,5 +1,5 @@
-/* ChanNode.c - NeonServ v5.1
- * Copyright (C) 2011  Philipp Kreil (pk910)
+/* ChanNode.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
@@ -21,10 +21,15 @@
 #include "modcmd.h"
 #include "ModeNode.h"
 #include "bot_NeonSpam.h"
+#include "IRCEvents.h"
 
 static struct ChanNode **chanList;
+#ifdef HAVE_THREADS
+pthread_mutex_t cache_sync;
+#endif
 
 void init_ChanNode() {
+    THREAD_MUTEX_INIT(cache_sync);
     /*
      len pos chars 
      26  0   a-z
@@ -39,6 +44,7 @@ void init_ChanNode() {
 }
 
 void free_ChanNode() {
+    SYNCHRONIZE(cache_sync);
     //kamikaze free all channels and chanusers
     int i;
     struct ChanNode *chan, *next;
@@ -54,6 +60,7 @@ void free_ChanNode() {
         }
     }
     free(chanList);
+    DESYNCHRONIZE(cache_sync);
 }
 
 int is_valid_chan(const char *name) {
@@ -104,8 +111,9 @@ struct ChanNode* getAllChans(struct ChanNode *last) {
             cindex++;
         if(cindex >= CHANNEL_LIST_SIZE) return NULL;
         return chanList[cindex];
-    } else
+    } else {
         return last->next;
+    }
 }
 
 struct ChanNode* getChanByName(const char *name) { //case insensitive
@@ -142,8 +150,10 @@ struct ChanNode* addChannel(const char *name) {
     chan->modes = createModeNode(chan);
     chan->trigger = NULL;
     
+    SYNCHRONIZE(cache_sync);
     chan->next = chanList[chanListIndex];
     chanList[chanListIndex] = chan;
+    DESYNCHRONIZE(cache_sync);
     return chan;
 }
 
@@ -185,6 +195,7 @@ int getChanBanCount() {
 void delChannel(struct ChanNode* chan, int freeChan) {
     int chanListIndex = get_chanlist_entry(chan->name[1]);
     if(chanListIndex == -1) return;
+    SYNCHRONIZE(cache_sync);
     struct ChanNode *cchan, *last_chan = NULL;
     for(cchan = chanList[chanListIndex]; cchan; cchan = cchan->next) {
         if(cchan == chan) {
@@ -208,9 +219,11 @@ void delChannel(struct ChanNode* chan, int freeChan) {
         freeChanNode(chan);
     else
         chan->next = NULL;
+    DESYNCHRONIZE(cache_sync);
 }
 
 void freeChanNode(struct ChanNode* chan) {
+    event_freechan(chan);
     if(chan->trigger) {
         struct trigger_cache *trigger, *next_trigger;
         for(trigger = chan->trigger; trigger; trigger = next_trigger) {
@@ -227,15 +240,16 @@ void freeChanNode(struct ChanNode* chan) {
     free(chan);
 }
 
-void checkChannelVisibility(struct ChanNode* chan) {
+int checkChannelVisibility(struct ChanNode* chan) {
     struct ChanUser *chanuser, *next;
     for(chanuser = getChannelUsers(chan, NULL); chanuser; chanuser = getChannelUsers(chan, chanuser)) {
         if(chanuser->user->flags & USERFLAG_ISBOT) {
             chan->chanbot = chanuser->user;
-            return;
+            return 1;
         }
     }
     //free the channel...
+    SYNCHRONIZE(cache_sync);
     for(chanuser = getChannelUsers(chan, NULL); chanuser; chanuser = next) {
         next = getChannelUsers(chan, chanuser);
         //remove the channel from the user's channel-list
@@ -248,4 +262,6 @@ void checkChannelVisibility(struct ChanNode* chan) {
     }
     chan->user = NULL;
     delChannel(chan, 1);
+    DESYNCHRONIZE(cache_sync);
+    return 0;
 }