Merge branch 'development'

[NeonServV5.git] / src / ChanNode.c

diff --git a/src/ChanNode.c b/src/ChanNode.c
index 011b997550deb86c16aa0c58e4d149cd6cbdf54b..44a335f1cb822f2d7c414ebeef955781c93601c1 100644 (file)
--- a/src/ChanNode.c
+++ b/src/ChanNode.c
@@ -1,5 +1,5 @@
-/* ChanNode.c - NeonServ v5.0
- * Copyright (C) 2011  Philipp Kreil (pk910)
+/* ChanNode.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
@@ -20,6 +20,9 @@
 #include "BanNode.h"
 #include "modcmd.h"
 #include "ModeNode.h"
+#include "IRCEvents.h"
+#include "tools.h"
+#include "log.h"
 
 static struct ChanNode **chanList;
 
@@ -38,6 +41,7 @@ void init_ChanNode() {
 }
 
 void free_ChanNode() {
+    SYNCHRONIZE(cache_sync);
     //kamikaze free all channels and chanusers
     int i;
     struct ChanNode *chan, *next;
@@ -47,12 +51,13 @@ void free_ChanNode() {
             next = chan->next;
             for(chanuser = getChannelUsers(chan, NULL); chanuser; chanuser = next_chanuser) {
                 next_chanuser = getChannelUsers(chan, chanuser);
-                free(chanuser);
+                freeChanUser(chanuser);
             }
             freeChanNode(chan);
         }
     }
     free(chanList);
+    DESYNCHRONIZE(cache_sync);
 }
 
 int is_valid_chan(const char *name) {
@@ -92,6 +97,22 @@ static int get_chanlist_entry(int name) {
     return 46;
 }
 
+struct ChanNode* getAllChans(struct ChanNode *last) {
+    if(last == NULL || last->next == NULL) {
+        int cindex;
+        if(last == NULL)
+            cindex = 0;
+        else
+            cindex = get_chanlist_entry(last->name[1]) + 1;
+        while(chanList[cindex] == NULL && cindex < CHANNEL_LIST_SIZE)
+            cindex++;
+        if(cindex >= CHANNEL_LIST_SIZE) return NULL;
+        return chanList[cindex];
+    } else {
+        return last->next;
+    }
+}
+
 struct ChanNode* getChanByName(const char *name) { //case insensitive
     int chanListIndex = get_chanlist_entry(name[1]);
     if(chanListIndex == -1 || chanList[chanListIndex] == NULL)
@@ -111,22 +132,25 @@ struct ChanNode* addChannel(const char *name) {
     struct ChanNode *chan = malloc(sizeof(*chan));
     if (!chan)
     {
-        perror("malloc() failed");
+        printf_log("main", LOG_ERROR, "%s:%d malloc() failed", __FILE__, __LINE__);
         return NULL;
     }
     strcpy(chan->name, name);
     chan->user = NULL;
     chan->bans = NULL;
+    chan->spam_settings = NULL;
     chan->usercount = 0;
-    chan->chanbot = NULL;
+    chan->botcount = 0;
     chan->topic[0] = 0;
     chan->flags = 0;
     /* mode lists */
     chan->modes = createModeNode(chan);
     chan->trigger = NULL;
     
+    SYNCHRONIZE(cache_sync);
     chan->next = chanList[chanListIndex];
     chanList[chanListIndex] = chan;
+    DESYNCHRONIZE(cache_sync);
     return chan;
 }
 
@@ -168,6 +192,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) {
@@ -191,9 +216,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) {
@@ -208,15 +235,14 @@ 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;
-        }
+        if(chanuser->user->flags & USERFLAG_ISBOT)
+            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
@@ -225,8 +251,10 @@ void checkChannelVisibility(struct ChanNode* chan) {
             //free the user (no more channels)
             delUser(chanuser->user, 1);
         }
-        free(chanuser);
+        freeChanUser(chanuser);
     }
     chan->user = NULL;
     delChannel(chan, 1);
+    DESYNCHRONIZE(cache_sync);
+    return 0;
 }