Merge branch 'development'

[NeonServV5.git] / src / ChanNode.h

diff --git a/src/ChanNode.h b/src/ChanNode.h
index 13cea48e8ae57a31c046573041a269ed755cf7c5..fe3a4de80962a3c09600e284626389a296903021 100644 (file)
--- a/src/ChanNode.h
+++ b/src/ChanNode.h
@@ -1,4 +1,4 @@
-/* ChanNode.h - NeonServ v5.3
+/* ChanNode.h - NeonServ v5.6
  * Copyright (C) 2011-2012  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -22,10 +22,7 @@ struct ChanUser;
 struct trigger_cache;
 struct ModeNode;
 struct NeonSpamSettings;
-
-#ifdef HAVE_THREADS
-extern pthread_mutex_t cache_sync;
-#endif
+struct timeq_entry;
 
 #define CHANFLAG_RECEIVED_USERLIST  0x01
 #define CHANFLAG_REQUESTED_CHANINFO 0x02
@@ -33,37 +30,41 @@ extern pthread_mutex_t cache_sync;
 #define CHANFLAG_HAVE_INVISIBLES    0x08
 #define CHANFLAG_REJOINING          0x10
 
+#define CHANFLAG_SCRIPTFLAG1        0x80 /* used by neonserv_cmd_search */
+
 struct ChanNode {
     char name[CHANNELLEN+1];
     char topic[TOPICLEN+1];
     struct ChanUser *user;
     unsigned int usercount;
+    unsigned int botcount;
     unsigned char flags;
     struct ModeNode *modes;
     struct BanNode *bans;
     
-    struct UserNode *chanbot;
     struct trigger_cache *trigger;
     int channel_id;
     
     struct NeonSpamSettings *spam_settings;
        
-    void *rejoin_array;
+    void *rejoin_bots;
+    struct timeq_entry *rejoin_timeout;
     
     struct ChanNode *next;
 };
 
+#ifndef DND_FUNCTIONS
 void init_ChanNode();
 void free_ChanNode();
-int is_valid_chan(const char *name);
-struct ChanNode* getAllChans(struct ChanNode *last);
-struct ChanNode* getChanByName(const char *name);
+/* MODULAR ACCESSIBLE */ int is_valid_chan(const char *name);
+/* MODULAR ACCESSIBLE */ struct ChanNode* getAllChans(struct ChanNode *last);
+/* MODULAR ACCESSIBLE */ struct ChanNode* getChanByName(const char *name);
 struct ChanNode* addChannel(const char *chan);
-int getChannelCount();
-int getChanUserCount();
-int getChanBanCount();
+/* MODULAR ACCESSIBLE */ int getChannelCount();
+/* MODULAR ACCESSIBLE */ int getChanUserCount();
+/* MODULAR ACCESSIBLE */ int getChanBanCount();
 void delChannel(struct ChanNode* chan, int freeChan);
 void freeChanNode(struct ChanNode* chan);
 int checkChannelVisibility(struct ChanNode* chan);
-
+#endif
 #endif
\ No newline at end of file