Mention effect of /accept on umode +R.

[irc/rqf/shadowircd.git] / include / channel.h

diff --git a/include/channel.h b/include/channel.h
index c743c55ed16ea186726562d6756862272f50b5bc..b4da1b6edaeabe353cf979295f693e56317df4c1 100644 (file)
--- a/include/channel.h
+++ b/include/channel.h
@@ -26,8 +26,6 @@
 
 #ifndef INCLUDED_channel_h
 #define INCLUDED_channel_h
-#include "config.h"            /* config settings */
-#include "ircd_defs.h"         /* buffer sizes */
 
 #define MODEBUFLEN      200
 
@@ -51,22 +49,21 @@ struct Mode
 /* channel structure */
 struct Channel
 {
-       dlink_node node;
+       rb_dlink_node node;
        struct Mode mode;
        char *topic;
        char *topic_info;
        time_t topic_time;
-       time_t users_last;      /* when last user was in channel */
        time_t last_knock;      /* don't allow knock to flood */
 
-       dlink_list members;     /* channel members */
-       dlink_list locmembers;  /* local channel members */
+       rb_dlink_list members;  /* channel members */
+       rb_dlink_list locmembers;       /* local channel members */
 
-       dlink_list invites;
-       dlink_list banlist;
-       dlink_list exceptlist;
-       dlink_list invexlist;
-       dlink_list quietlist;
+       rb_dlink_list invites;
+       rb_dlink_list banlist;
+       rb_dlink_list exceptlist;
+       rb_dlink_list invexlist;
+       rb_dlink_list quietlist;
 
        time_t first_received_message_time;     /* channel flood control */
        int received_number_of_privmsgs;
@@ -82,9 +79,9 @@ struct Channel
 
 struct membership
 {
-       dlink_node channode;
-       dlink_node locchannode;
-       dlink_node usernode;
+       rb_dlink_node channode;
+       rb_dlink_node locchannode;
+       rb_dlink_node usernode;
 
        struct Channel *chptr;
        struct Client *client_p;
@@ -99,7 +96,13 @@ struct Ban
        char *banstr;
        char *who;
        time_t when;
-       dlink_node node;
+       rb_dlink_node node;
+};
+
+struct mode_letter
+{
+       int mode;
+       char letter;
 };
 
 struct ChModeChange
@@ -141,7 +144,6 @@ typedef int (*ExtbanFunc)(const char *data, struct Client *client_p,
 #define CHFL_PEON              0x0000  /* normal member of channel */
 #define CHFL_CHANOP            0x0001  /* Channel operator */
 #define CHFL_VOICE             0x0002  /* the power to speak */
-#define CHFL_DEOPPED           0x0004  /* deopped on sjoin, bounce modes */
 #define CHFL_BANNED            0x0008  /* cached as banned */
 #define CHFL_QUIETED           0x0010  /* cached as being +q victim */
 #define ONLY_SERVERS           0x0020
@@ -152,7 +154,6 @@ typedef int (*ExtbanFunc)(const char *data, struct Client *client_p,
 #define is_chanop(x)   ((x) && (x)->flags & CHFL_CHANOP)
 #define is_voiced(x)   ((x) && (x)->flags & CHFL_VOICE)
 #define is_chanop_voiced(x) ((x) && (x)->flags & (CHFL_CHANOP|CHFL_VOICE))
-#define is_deop(x)     ((x) && (x)->flags & CHFL_DEOPPED)
 #define can_send_banned(x) ((x) && (x)->flags & (CHFL_BANNED|CHFL_QUIETED))
 
 /* channel modes ONLY */
@@ -199,7 +200,7 @@ typedef int (*ExtbanFunc)(const char *data, struct Client *client_p,
 #define EXTBAN_NOMATCH  0  /* valid mask, no match */
 #define EXTBAN_MATCH    1  /* matches */
 
-extern dlink_list global_channel_list;
+extern rb_dlink_list global_channel_list;
 void init_channels(void);
 
 struct Channel *allocate_channel(const char *chname);
@@ -225,7 +226,7 @@ extern void remove_user_from_channel(struct membership *);
 extern void remove_user_from_channels(struct Client *);
 extern void invalidate_bancache_user(struct Client *);
 
-extern void free_channel_list(dlink_list *);
+extern void free_channel_list(rb_dlink_list *);
 
 extern int check_channel_name(const char *name);
 
@@ -257,9 +258,9 @@ extern void set_channel_mode(struct Client *client_p, struct Client *source_p,
 extern struct ChannelMode chmode_table[256];
 
 extern int add_id(struct Client *source_p, struct Channel *chptr, const char *banid,
-       dlink_list * list, long mode_type);
+       rb_dlink_list * list, long mode_type);
 
-extern int del_id(struct Channel *chptr, const char *banid, dlink_list * list, long mode_type);
+extern int del_id(struct Channel *chptr, const char *banid, rb_dlink_list * list, long mode_type);
 
 extern ExtbanFunc extban_table[256];