ircd_parser: Fix inconsistent declaration of yyerror().

[solanum.git] / include / channel.h

diff --git a/include/channel.h b/include/channel.h
index 66e5ba99eb4e44ddbca1f9668120cbefda437023..0f8bd314603173251207dbdd477a6ea6ef6d05e4 100644 (file)
--- a/include/channel.h
+++ b/include/channel.h
@@ -60,7 +60,7 @@ struct Channel
        rb_dlink_list members;  /* channel members */
        rb_dlink_list locmembers;       /* local channel members */
 
-rb_dlink_list invites;
+       rb_dlink_list invites;
        rb_dlink_list banlist;
        rb_dlink_list exceptlist;
        rb_dlink_list invexlist;
@@ -97,6 +97,7 @@ struct Ban
        char *banstr;
        char *who;
        time_t when;
+       char *forward;
        rb_dlink_node node;
 };
 
@@ -112,17 +113,7 @@ struct ChModeChange
        const char *arg;
        const char *id;
        int dir;
-       int caps;
-       int nocaps;
        int mems;
-       struct Client *client;
-};
-
-struct ChCapCombo
-{
-       int count;
-       int cap_yes;
-       int cap_no;
 };
 
 typedef void (*ChannelModeFunc)(struct Client *source_p, struct Channel *chptr,
@@ -168,14 +159,12 @@ typedef int (*ExtbanFunc)(const char *data, struct Client *client_p,
 #define MODE_INVITEONLY 0x0010
 #define MODE_NOPRIVMSGS 0x0020
 #define MODE_REGONLY   0x0040
-#define MODE_NOCOLOR   0x0080
 #define MODE_EXLIMIT   0x0100  /* exempt from list limits, +b/+e/+I/+q */
 #define MODE_PERMANENT  0x0200  /* permanant channel, +P */
 #define MODE_OPMODERATE 0x0400  /* send rejected messages to ops */
 #define MODE_FREEINVITE 0x0800  /* allow free use of /invite */
 #define MODE_FREETARGET 0x1000  /* can be forwarded to without authorization */
 #define MODE_DISFORWARD 0x2000  /* disable channel forwarding */
-#define MODE_NOCTCP     0x8000  /* Block CTCPs directed to this channel */
 
 #define CHFL_BAN        0x10000000     /* ban channel flag */
 #define CHFL_EXCEPTION  0x20000000     /* exception to ban channel flag */
@@ -210,19 +199,22 @@ void init_channels(void);
 
 struct Channel *allocate_channel(const char *chname);
 void free_channel(struct Channel *chptr);
-struct Ban *allocate_ban(const char *, const char *);
+struct Ban *allocate_ban(const char *, const char *, const char *);
 void free_ban(struct Ban *bptr);
 
 
 extern void destroy_channel(struct Channel *);
 
-extern int can_send(struct Channel *chptr, struct Client *who, 
+extern int can_send(struct Channel *chptr, struct Client *who,
                    struct membership *);
+extern int flood_attack_channel(int p_or_n, struct Client *source_p,
+                               struct Channel *chptr, char *chname);
 extern int is_banned(struct Channel *chptr, struct Client *who,
-                    struct membership *msptr, const char *, const char *);
+                   struct membership *msptr, const char *, const char *, const char **);
 extern int is_quieted(struct Channel *chptr, struct Client *who,
                     struct membership *msptr, const char *, const char *);
-extern int can_join(struct Client *source_p, struct Channel *chptr, char *key);
+extern int can_join(struct Client *source_p, struct Channel *chptr,
+                   const char *key, const char **forward);
 
 extern struct membership *find_channel_membership(struct Channel *, struct Client *);
 extern const char *find_channel_status(struct membership *msptr, int combine);
@@ -267,9 +259,10 @@ extern void set_channel_mlock(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,
-       rb_dlink_list * list, long mode_type);
+       const char *forward, rb_dlink_list * list, long mode_type);
 
-extern int del_id(struct Channel *chptr, const char *banid, rb_dlink_list * list, long mode_type);
+extern struct Ban * del_id(struct Channel *chptr, const char *banid, rb_dlink_list * list,
+       long mode_type);
 
 extern ExtbanFunc extban_table[256];
 
@@ -279,4 +272,6 @@ const char * get_extban_string(void);
 
 extern int get_channel_access(struct Client *source_p, struct membership *msptr);
 
+extern void send_channel_join(struct Channel *chptr, struct Client *client_p);
+
 #endif /* INCLUDED_channel_h */