added some code & compiler information to cmd_netinfo

[NeonServV5.git] / ChanNode.c

diff --git a/ChanNode.c b/ChanNode.c
index 7313bf347d1515c612d247a9a23b662d3d2dbae9..6869a954fb7e9833ae82971a4a74c9a6e05b84e6 100644 (file)
--- a/ChanNode.c
+++ b/ChanNode.c
@@ -1,6 +1,7 @@
 #include "ChanNode.h"
 #include "ChanUser.h"
 #include "UserNode.h"
+#include "BanNode.h"
 #include "modcmd.h"
 
 static struct ChanNode **chanList;
@@ -59,7 +60,8 @@ void init_ChanNode() {
      ---------------------------
      = 47
     */
-    chanList = calloc(47, sizeof(*chanList));
+    #define CHANNEL_LIST_SIZE 47
+    chanList = calloc(CHANNEL_LIST_SIZE, sizeof(*chanList));
     unsigned int *mode, flag = 1;
     modes_with_strarg = 0;
     modes_with_intarg = 0;
@@ -82,7 +84,7 @@ void free_ChanNode() {
     int i;
     struct ChanNode *chan, *next;
     struct ChanUser *chanuser, *next_chanuser;
-    for(i = 0; i < 47; i++) {
+    for(i = 0; i < CHANNEL_LIST_SIZE; i++) {
         for(chan = chanList[i]; chan; chan = next) {
             next = chan->next;
             for(chanuser = getChannelUsers(chan, NULL); chanuser; chanuser = next_chanuser) {
@@ -172,6 +174,28 @@ struct ChanNode* addChannel(const char *name) {
     return chan;
 }
 
+int getChannelCount() {
+    int i, count = 0;
+    struct ChanNode *chan;
+    for(i = 0; i < CHANNEL_LIST_SIZE; i++) {
+        for(chan = chanList[i]; chan; chan = chan->next) {
+            count++;
+        }
+    }
+    return count;
+}
+
+int getChanUserCount() {
+    int i, count = 0;
+    struct ChanNode *chan;
+    for(i = 0; i < CHANNEL_LIST_SIZE; i++) {
+        for(chan = chanList[i]; chan; chan = chan->next) {
+            count += chan->usercount;
+        }
+    }
+    return count;
+}
+
 void delChannel(struct ChanNode* chan, int freeChan) {
     int chanListIndex = get_chanlist_entry(chan->name[1]);
     if(chanListIndex == -1) return;
@@ -216,6 +240,8 @@ void freeChanNode(struct ChanNode* chan) {
     }
     free(chan->mode_str_args);
     free(chan->mode_int_args);
+    if(chan->bans)
+        removeChannelBans(chan);
     free(chan);
 }