X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/5c68d54336e4bd0fab3aecabe186315573225772..881acf00c65cfc75a4a3df3d6144c99b4f403671:/include/s_conf.h diff --git a/include/s_conf.h b/include/s_conf.h index b556ff08..0bcd76c3 100644 --- a/include/s_conf.h +++ b/include/s_conf.h @@ -20,8 +20,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * USA - * - * $Id: s_conf.h 3550 2007-08-09 06:47:26Z nenolod $ */ #ifndef INCLUDED_s_conf_h @@ -56,17 +54,22 @@ extern char conf_line_in[256]; struct ConfItem { - struct ConfItem *next; /* list node pointer */ unsigned int status; /* If CONF_ILLEGAL, delete when no clients */ unsigned int flags; int clients; /* Number of *LOCAL* clients using this */ - char *name; /* IRC name, nick, server name, or original u@h */ + union + { + char *name; /* IRC name, nick, server name, or original u@h */ + const char *oper; + } info; char *host; /* host part of user@host */ char *passwd; /* doubles as kline reason *ugh* */ char *spasswd; /* Password to send. */ char *user; /* user part of user@host */ int port; time_t hold; /* Hold action until this time (calendar time) */ + time_t created; /* Creation time (for klines etc) */ + time_t lifetime; /* Propagated lines: remember until this time */ char *className; /* Name of class */ struct Class *c_class; /* Class of connection */ rb_patricia_node_t *pnode; /* Our patricia node */ @@ -89,6 +92,8 @@ struct ConfItem /* Generic flags... */ #define CONF_FLAGS_TEMPORARY 0x00800000 +#define CONF_FLAGS_NEED_SSL 0x00000002 +#define CONF_FLAGS_MYOPER 0x00080000 /* need to rewrite info.oper on burst */ /* auth{} flags... */ #define CONF_FLAGS_NO_TILDE 0x00000004 #define CONF_FLAGS_NEED_IDENTD 0x00000008 @@ -103,11 +108,15 @@ struct ConfItem #define CONF_FLAGS_EXEMPTSHIDE 0x00010000 #define CONF_FLAGS_EXEMPTJUPE 0x00020000 /* exempt from resv generating warnings */ #define CONF_FLAGS_NEED_SASL 0x00040000 +#define CONF_FLAGS_EXTEND_CHANS 0x00080000 #define CONF_FLAGS_ENCRYPTED 0x00200000 #define CONF_FLAGS_EXEMPTDNSBL 0x04000000 /* Macros for struct ConfItem */ +#define IsConfBan(x) ((x)->status & (CONF_KILL|CONF_XLINE|CONF_DLINE|\ + CONF_RESV_CHANNEL|CONF_RESV_NICK)) + #define IsNoTilde(x) ((x)->flags & CONF_FLAGS_NO_TILDE) #define IsNeedIdentd(x) ((x)->flags & CONF_FLAGS_NEED_IDENTD) #define IsConfExemptKline(x) ((x)->flags & CONF_FLAGS_EXEMPTKLINE) @@ -122,6 +131,8 @@ struct ConfItem #define IsConfEncrypted(x) ((x)->flags & CONF_FLAGS_ENCRYPTED) #define IsNeedSasl(x) ((x)->flags & CONF_FLAGS_NEED_SASL) #define IsConfExemptDNSBL(x) ((x)->flags & CONF_FLAGS_EXEMPTDNSBL) +#define IsConfExtendChans(x) ((x)->flags & CONF_FLAGS_EXTEND_CHANS) +#define IsConfSSLNeeded(x) ((x)->flags & CONF_FLAGS_NEED_SSL) /* flag definitions for opers now in client.h */ @@ -129,12 +140,6 @@ struct config_file_entry { const char *dpath; /* DPATH if set from command line */ const char *configfile; - const char *klinefile; - const char *dlinefile; - const char *xlinefile; - const char *resvfile; - - char *egdpool_path; char *default_operstring; char *default_adminstring; @@ -143,7 +148,9 @@ struct config_file_entry char *identifyservice; char *identifycommand; - + + char *sasl_service; + char *fname_userlog; char *fname_fuserlog; char *fname_operlog; @@ -198,8 +205,7 @@ struct config_file_entry int min_nonwildcard; int min_nonwildcard_simple; int default_floodcount; - int client_flood; - int use_egd; + int default_ident_timeout; int ping_cookie; int tkline_expire_notices; int use_whois_actually; @@ -213,28 +219,51 @@ struct config_file_entry int throttle_duration; int target_change; int collision_fnc; + int resv_fnc; int default_umodes; int global_snotices; int operspy_dont_care_user_info; + int use_propagated_bans; + int max_ratelimit_tokens; + int away_interval; + + int client_flood_max_lines; + int client_flood_burst_rate; + int client_flood_burst_max; + int client_flood_message_time; + int client_flood_message_num; + + unsigned int nicklen; + int certfp_method; + + int hide_opers_in_whois; }; struct config_channel_entry { int use_except; int use_invex; - int use_knock; int use_forward; + int use_knock; int knock_delay; int knock_delay_channel; int max_bans; int max_bans_large; int max_chans_per_user; + int max_chans_per_user_large; int no_create_on_split; int no_join_on_split; int default_split_server_count; int default_split_user_count; int burst_topicwho; int kick_on_split_riding; + int only_ascii_channels; + int resv_forcepart; + int channel_target_change; + int disable_local_channels; + unsigned int autochanmodes; + int displayed_usercount; + int strip_topic_colors; }; struct config_server_hide @@ -248,10 +277,9 @@ struct config_server_hide struct server_info { char *name; - char sid[3]; + char sid[4]; char *description; char *network_name; - char *network_desc; int hub; struct sockaddr_in ip; int default_max_clients; @@ -266,6 +294,7 @@ struct server_info char *ssl_ca_cert; char *ssl_cert; char *ssl_dh_params; + char *ssl_cipher_list; int ssld_count; }; @@ -296,6 +325,8 @@ extern struct admin_info AdminInfo; /* defined in ircd.c */ extern rb_dlink_list service_list; +extern rb_dlink_list prop_bans; + typedef enum temp_list { TEMP_MIN, @@ -313,6 +344,10 @@ extern void init_s_conf(void); extern struct ConfItem *make_conf(void); extern void free_conf(struct ConfItem *); +extern rb_dlink_node *find_prop_ban(unsigned int status, const char *user, const char *host); +extern void deactivate_conf(struct ConfItem *, rb_dlink_node *, time_t); +extern void replace_old_ban(struct ConfItem *); + extern void read_conf_files(int cold); extern int attach_conf(struct Client *, struct ConfItem *); @@ -323,7 +358,8 @@ extern int detach_conf(struct Client *); extern struct ConfItem *find_tkline(const char *, const char *, struct sockaddr *); extern char *show_iline_prefix(struct Client *, struct ConfItem *, char *); extern void get_printable_conf(struct ConfItem *, - char **, char **, char **, char **, int *, char **); + char **, char **, const char **, char **, int *, char **); +extern char *get_user_ban_reason(struct ConfItem *aconf); extern void get_printable_kline(struct Client *, struct ConfItem *, char **, char **, char **, char **); @@ -331,23 +367,12 @@ extern void yyerror(const char *); extern int conf_yy_fatal_error(const char *); extern int conf_fgets(char *, int, FILE *); -typedef enum -{ - CONF_TYPE, - KLINE_TYPE, - DLINE_TYPE, - RESV_TYPE -} -KlineType; - -extern void write_confitem(KlineType, struct Client *, char *, char *, - const char *, const char *, const char *, int); +extern int valid_wild_card(const char *, const char *); extern void add_temp_kline(struct ConfItem *); extern void add_temp_dline(struct ConfItem *); extern void report_temp_klines(struct Client *); extern void show_temp_klines(struct Client *, rb_dlink_list *); -extern const char *get_conf_name(KlineType); extern int rehash(int); extern void rehash_bans(int); @@ -358,14 +383,6 @@ extern void conf_add_class(struct ConfItem *, int); extern void conf_add_d_conf(struct ConfItem *); extern void flush_expired_ips(void *); - -/* XXX consider moving these into kdparse.h */ -extern void parse_k_file(FILE * fb); -extern void parse_d_file(FILE * fb); -extern void parse_x_file(FILE * fb); -extern void parse_resv_file(FILE *); -extern char *getfield(char *newline); - extern char *get_oper_name(struct Client *client_p); extern int yylex(void);