X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2FChanNode.c;h=55f1302720f0684fb2bdc6cb7fab4ac8518d3ea7;hb=c575e458c6257e75b97884847143b20965a5dfda;hp=011b997550deb86c16aa0c58e4d149cd6cbdf54b;hpb=95fed4deda0319bee515e44ceec0c77061a2c04e;p=NeonServV5.git

diff --git a/src/ChanNode.c b/src/ChanNode.c
index 011b997..55f1302 100644
--- a/src/ChanNode.c
+++ b/src/ChanNode.c
@@ -1,4 +1,4 @@
-/* ChanNode.c - NeonServ v5.0
+/* ChanNode.c - NeonServ v5.2
  * Copyright (C) 2011  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -20,6 +20,7 @@
 #include "BanNode.h"
 #include "modcmd.h"
 #include "ModeNode.h"
+#include "bot_NeonSpam.h"
 
 static struct ChanNode **chanList;
 
@@ -47,7 +48,7 @@ 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);
         }
@@ -92,6 +93,21 @@ 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)
@@ -117,6 +133,7 @@ struct ChanNode* addChannel(const char *name) {
     strcpy(chan->name, name);
     chan->user = NULL;
     chan->bans = NULL;
+    chan->spam_settings = NULL;
     chan->usercount = 0;
     chan->chanbot = NULL;
     chan->topic[0] = 0;
@@ -205,6 +222,8 @@ void freeChanNode(struct ChanNode* chan) {
     freeModeNode(chan->modes);
     if(chan->bans)
         removeChannelBans(chan);
+    if(chan->spam_settings)
+        freeNeonSpamSettings(chan->spam_settings);
     free(chan);
 }
 
@@ -225,7 +244,7 @@ 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);