added .gitignore

[NeonServV5.git] / ChanNode.c

diff --git a/ChanNode.c b/ChanNode.c
index 0d2733aae2348a7bf9ba4e972318a0d07c3b4949..47e06635179c723ebd9a4f137f1e7924b0061f67 100644 (file)
--- a/ChanNode.c
+++ b/ChanNode.c
@@ -1,6 +1,7 @@
 #include "ChanNode.h"
 #include "ChanUser.h"
 #include "UserNode.h"
+#include "modcmd.h"
 
 static struct ChanNode **chanList;
 static int modes_with_strarg, modes_with_intarg;
@@ -76,6 +77,24 @@ void init_ChanNode() {
     }
 }
 
+void free_ChanNode() {
+    //kamikaze free all channels and chanusers
+    int i;
+    struct ChanNode *chan, *next;
+    struct ChanUser *chanuser, *next_chanuser;
+    for(i = 0; i < 47; i++) {
+        for(chan = chanList[i]; chan; chan = next) {
+            next = chan->next;
+            for(chanuser = getChannelUsers(chan, NULL); chanuser; chanuser = next_chanuser) {
+                next_chanuser = getChannelUsers(chan, chanuser);
+                free(chanuser);
+            }
+            freeChanNode(chan);
+        }
+    }
+    free(chanList);
+}
+
 int is_valid_chan(const char *name) {
     unsigned int ii;
     if (*name !='#')
@@ -142,6 +161,7 @@ struct ChanNode* addChannel(const char *name) {
     chan->flags = 0;
     /* mode lists */
     chan->modes = 0;
+    chan->trigger = NULL;
     chan->mode_str_args = calloc(modes_with_strarg, sizeof(char*));
     chan->mode_int_args = calloc(modes_with_intarg, sizeof(int));
     
@@ -184,6 +204,14 @@ void freeChanNode(struct ChanNode* chan) {
         if(chan->mode_str_args[i])
             free(chan->mode_str_args[i]);
     }
+    if(chan->trigger) {
+        struct trigger_cache *trigger, *next_trigger;
+        for(trigger = chan->trigger; trigger; trigger = next_trigger) {
+            next_trigger = trigger;
+            free(trigger->trigger);
+            free(trigger);
+        }
+    }
     free(chan->mode_str_args);
     free(chan->mode_int_args);
     free(chan);
@@ -274,19 +302,19 @@ void parseModes(struct ChanNode* chan, char *modeStr, char **argv, int argc) {
             //special mode ;)
             switch(modeStr[i]) {
                 case 'o':
-                    parseModesUserPriv(chan, CHANUSERFLAG_OPPED, add, argv[argc]);
+                    parseModesUserPriv(chan, CHANUSERFLAG_OPPED, add, argv[argpos]);
                     break;
                 case 'v':
-                    parseModesUserPriv(chan, CHANUSERFLAG_VOICED, add, argv[argc]);
+                    parseModesUserPriv(chan, CHANUSERFLAG_VOICED, add, argv[argpos]);
                     break;
                 case 'b':
-                    parseModesBan(chan, add, argv[argc]);
+                    parseModesBan(chan, add, argv[argpos]);
                     break;
                 default:
                     //we have an unknown TYPE_A mode???
                     break;
             }
-            argc++;
+            argpos++;
             continue;
         }
         if(add) {
@@ -295,11 +323,11 @@ void parseModes(struct ChanNode* chan, char *modeStr, char **argv, int argc) {
                 if(MODE_VALUE == CHANNEL_MODE_VALUE_STRING) {
                     if(chan->mode_str_args[MODE_VALUE_INDEX])
                         free(chan->mode_str_args[MODE_VALUE_INDEX]);
-                    chan->mode_str_args[MODE_VALUE_INDEX] = strdup(argv[argc++]);
+                    chan->mode_str_args[MODE_VALUE_INDEX] = strdup(argv[argpos++]);
                 } else if(MODE_VALUE == CHANNEL_MODE_VALUE_INTEGER)
-                    chan->mode_int_args[MODE_VALUE_INDEX] = atoi(argv[argc++]);
+                    chan->mode_int_args[MODE_VALUE_INDEX] = atoi(argv[argpos++]);
                 else
-                    argc++; //we simply don't know what to do with the argument...
+                    argpos++; //we simply don't know what to do with the argument...
             }
             chan->modes |= modeOpt[0];
         } else {
@@ -311,7 +339,7 @@ void parseModes(struct ChanNode* chan, char *modeStr, char **argv, int argc) {
                     chan->mode_str_args[MODE_VALUE_INDEX] = NULL;
                 } else if(MODE_VALUE == CHANNEL_MODE_VALUE_INTEGER)
                     chan->mode_int_args[MODE_VALUE_INDEX] = 0;
-                argc++; //we don't need the argument when unsetting a mode...
+                argpos++; //we don't need the argument when unsetting a mode...
             }
         }
     }