X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/2a719c44c00ae6e25c3a826f3b8ff3ac935e57d2..2b3c7c29c334c3ebb6a2da2176d89a65f5ad9ffa:/include/channel.h diff --git a/include/channel.h b/include/channel.h index 3363fb7..db18116 100644 --- 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,15 +79,16 @@ 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; unsigned int flags; unsigned long bants; + unsigned long override_ts; }; #define BANLEN 195 @@ -99,7 +97,7 @@ struct Ban char *banstr; char *who; time_t when; - dlink_node node; + rb_dlink_node node; }; struct mode_letter @@ -117,6 +115,7 @@ struct ChModeChange int caps; int nocaps; int mems; + int override; struct Client *client; }; @@ -147,7 +146,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 @@ -158,7 +156,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 */ @@ -176,6 +173,13 @@ typedef int (*ExtbanFunc)(const char *data, struct Client *client_p, #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_NOOPERKICK 0x4000 /* disallow kicking opers aka immune */ +#define MODE_NOCTCP 0x8000 /* Block CTCPs directed to this channel */ +#define MODE_NONOTICE 0x16000 /* Block notices directed to this channel */ +#define MODE_NOACTION 0x32000 /* Block CTCP ACTION directed to this channel */ +#define MODE_NOKICK 0x64000 /* Disable /kick on this channel */ +#define MODE_NONICK 0x128000 /* Disable /nick for anyone on this channel */ +#define MODE_NOCAPS 0x256000 /* Block messages in all capital letters */ #define CHFL_BAN 0x10000000 /* ban channel flag */ #define CHFL_EXCEPTION 0x20000000 /* exception to ban channel flag */ @@ -194,6 +198,8 @@ typedef int (*ExtbanFunc)(const char *data, struct Client *client_p, /* channel visible */ #define ShowChannel(v,c) (PubChannel(c) || IsMember((v),(c))) +/* user visible in channel */ +#define ShowInChannel(v,t,c) ((PubChannel(c) && !IsInvisible(t)) || IsMember((v),(c))) #define IsMember(who, chan) ((who && who->user && \ find_channel_membership(chan, who)) ? 1 : 0) @@ -205,7 +211,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); @@ -231,7 +237,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); @@ -244,6 +250,8 @@ const char *channel_modes(struct Channel *chptr, struct Client *who); extern struct Channel *find_bannickchange_channel(struct Client *client_p); +extern struct Channel *find_nonickchange_channel(struct Client *client_p); + extern void check_spambot_warning(struct Client *source_p, const char *name); extern void check_splitmode(void *); @@ -260,14 +268,12 @@ extern void send_cap_mode_changes(struct Client *client_p, struct Client *source extern void set_channel_mode(struct Client *client_p, struct Client *source_p, struct Channel *chptr, struct membership *msptr, int parc, const char *parv[]); -extern const struct mode_letter chmode_flags[]; - 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]; @@ -275,5 +281,9 @@ extern int match_extban(const char *banstr, struct Client *client_p, struct Chan extern int valid_extban(const char *banstr, struct Client *client_p, struct Channel *chptr, long mode_type); const char * get_extban_string(void); +extern struct Channel * check_forward(struct Client *source_p, struct Channel *chptr, char *key); +extern void user_join(struct Client * client_p, struct Client * source_p, const char * channels, const char * keys); +extern void do_join_0(struct Client *client_p, struct Client *source_p); +extern int check_channel_name_loc(struct Client *source_p, const char *name); #endif /* INCLUDED_channel_h */