* 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
#include "ircd_defs.h"
#include "class.h"
#include "client.h"
-#include "common.h"
struct Client;
struct DNSReply;
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 */
};
-#define CONF_ILLEGAL 0x80000000
-#define CONF_CLIENT 0x0002
-#define CONF_KILL 0x0040
+#define CONF_ILLEGAL 0x80000000
+#define CONF_CLIENT 0x0002
+#define CONF_KILL 0x0040
#define CONF_XLINE 0x0080
#define CONF_RESV_CHANNEL 0x0100
#define CONF_RESV_NICK 0x0200
#define CONF_RESV (CONF_RESV_CHANNEL | CONF_RESV_NICK)
-#define CONF_GLINE 0x10000
-#define CONF_DLINE 0x20000
-#define CONF_EXEMPTDLINE 0x100000
+#define CONF_DLINE 0x020000
+#define CONF_EXEMPTDLINE 0x100000
#define IsIllegal(x) ((x)->status & CONF_ILLEGAL)
/* aConfItem->flags */
/* Generic flags... */
-/* access flags... */
-#define CONF_FLAGS_NO_TILDE 0x00000004
-#define CONF_FLAGS_NEED_IDENTD 0x00000008
-#define CONF_FLAGS_EXEMPTKLINE 0x00000040
-#define CONF_FLAGS_NOLIMIT 0x00000080
-#define CONF_FLAGS_SPOOF_IP 0x00000200
+#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
+#define CONF_FLAGS_EXEMPTKLINE 0x00000040
+#define CONF_FLAGS_NOLIMIT 0x00000080
+#define CONF_FLAGS_SPOOF_IP 0x00000200
#define CONF_FLAGS_SPOOF_NOTICE 0x00000400
-#define CONF_FLAGS_REDIR 0x00000800
-#define CONF_FLAGS_EXEMPTGLINE 0x00001000
+#define CONF_FLAGS_REDIR 0x00000800
#define CONF_FLAGS_EXEMPTRESV 0x00002000 /* exempt from resvs */
-#define CONF_FLAGS_EXEMPTFLOOD 0x00004000
+#define CONF_FLAGS_EXEMPTFLOOD 0x00004000
#define CONF_FLAGS_EXEMPTSPAMBOT 0x00008000
#define CONF_FLAGS_EXEMPTSHIDE 0x00010000
#define CONF_FLAGS_EXEMPTJUPE 0x00020000 /* exempt from resv generating warnings */
#define CONF_FLAGS_NEED_SASL 0x00040000
-/* server flags */
-#define CONF_FLAGS_ALLOW_AUTO_CONN 0x00080000
-#define CONF_FLAGS_LAZY_LINK 0x00100000
-#define CONF_FLAGS_ENCRYPTED 0x00200000
-#define CONF_FLAGS_COMPRESSED 0x00400000
-#define CONF_FLAGS_TEMPORARY 0x00800000
-#define CONF_FLAGS_TB 0x01000000
-#define CONF_FLAGS_VHOSTED 0x02000000
+#define CONF_FLAGS_EXTEND_CHANS 0x00080000
+#define CONF_FLAGS_ENCRYPTED 0x00200000
#define CONF_FLAGS_EXEMPTDNSBL 0x04000000
+#define CONF_FLAGS_EXEMPTPROXY 0x08000000
+#define CONF_FLAGS_ALLOW_SCTP 0x10000000
/* 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)
#define IsConfExemptLimits(x) ((x)->flags & CONF_FLAGS_NOLIMIT)
-#define IsConfExemptGline(x) ((x)->flags & CONF_FLAGS_EXEMPTGLINE)
#define IsConfExemptFlood(x) ((x)->flags & CONF_FLAGS_EXEMPTFLOOD)
#define IsConfExemptSpambot(x) ((x)->flags & CONF_FLAGS_EXEMPTSPAMBOT)
#define IsConfExemptShide(x) ((x)->flags & CONF_FLAGS_EXEMPTSHIDE)
#define IsConfDoSpoofIp(x) ((x)->flags & CONF_FLAGS_SPOOF_IP)
#define IsConfSpoofNotice(x) ((x)->flags & CONF_FLAGS_SPOOF_NOTICE)
#define IsConfEncrypted(x) ((x)->flags & CONF_FLAGS_ENCRYPTED)
-#define IsConfCompressed(x) ((x)->flags & CONF_FLAGS_COMPRESSED)
-#define IsConfVhosted(x) ((x)->flags & CONF_FLAGS_VHOSTED)
-#define IsConfTburst(x) ((x)->flags & CONF_FLAGS_TB)
#define IsNeedSasl(x) ((x)->flags & CONF_FLAGS_NEED_SASL)
#define IsConfExemptDNSBL(x) ((x)->flags & CONF_FLAGS_EXEMPTDNSBL)
+#define IsConfExemptProxy(x) ((x)->flags & CONF_FLAGS_EXEMPTPROXY)
+#define IsConfExtendChans(x) ((x)->flags & CONF_FLAGS_EXTEND_CHANS)
+#define IsConfSSLNeeded(x) ((x)->flags & CONF_FLAGS_NEED_SSL)
+#define IsConfAllowSCTP(x) ((x)->flags & CONF_FLAGS_ALLOW_SCTP)
/* flag definitions for opers now in client.h */
{
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 *servlink_path;
- char *egdpool_path;
char *default_operstring;
char *default_adminstring;
char *identifyservice;
char *identifycommand;
-
+
+ char *sasl_service;
+
char *fname_userlog;
char *fname_fuserlog;
char *fname_operlog;
char *fname_foperlog;
char *fname_serverlog;
char *fname_killlog;
- char *fname_glinelog;
char *fname_klinelog;
char *fname_operspylog;
char *fname_ioerrorlog;
int ts_warn_delta;
int dline_with_reason;
int kline_with_reason;
- int kline_delay;
int warn_no_nline;
int nick_delay;
int non_redundant_klines;
int pace_wait_simple;
int short_motd;
int no_oper_flood;
- int glines;
- int gline_time;
- int gline_min_cidr;
- int gline_min_cidr6;
int hide_server;
int hide_spoof_ips;
int hide_error_messages;
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;
int reject_ban_time;
int reject_after_count;
int reject_duration;
+ int throttle_count;
+ 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 max_unknown_ip;
+ 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;
+ int hide_opers;
+
+ char *drain_reason;
};
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
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;
-#ifdef RB_IPV6
- struct sockaddr_in6 ip6;
-#endif
- int specific_ipv4_vhost;
-#ifdef RB_IPV6
- int specific_ipv6_vhost;
-#endif
-
+ struct rb_sockaddr_storage bind4;
+ struct rb_sockaddr_storage bind6;
int default_max_clients;
+ char *ssl_private_key;
+ char *ssl_ca_cert;
+ char *ssl_cert;
+ char *ssl_dh_params;
+ char *ssl_cipher_list;
+ int ssld_count;
+ int wsockd_count;
};
struct admin_info
char *name;
char *target;
int flags; /* reserved for later use */
- int hits;
};
/* All variables are GLOBAL */
-extern int specific_ipv4_vhost; /* used in s_bsd.c */
-extern int specific_ipv6_vhost;
extern struct config_file_entry ConfigFileEntry; /* defined in ircd.c */
extern struct config_channel_entry ConfigChannel; /* defined in channel.c */
extern struct config_server_hide ConfigServerHide; /* defined in s_conf.c */
extern struct admin_info AdminInfo; /* defined in ircd.c */
/* End GLOBAL section */
-rb_dlink_list service_list;
+extern rb_dlink_list service_list;
+
+extern rb_dlink_list prop_bans;
typedef enum temp_list
{
LAST_TEMP_TYPE
} temp_list;
-rb_dlink_list temp_klines[LAST_TEMP_TYPE];
-rb_dlink_list temp_dlines[LAST_TEMP_TYPE];
+extern rb_dlink_list temp_klines[LAST_TEMP_TYPE];
+extern rb_dlink_list temp_dlines[LAST_TEMP_TYPE];
extern void init_s_conf(void);
extern struct ConfItem *make_conf(void);
extern void free_conf(struct ConfItem *);
-extern void read_conf_files(int cold);
+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(bool cold);
extern int attach_conf(struct Client *, struct ConfItem *);
extern int check_client(struct Client *client_p, struct Client *source_p, const char *);
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 **);
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);
+extern bool rehash(bool);
+extern void rehash_bans(void);
extern int conf_add_server(struct ConfItem *, int);
extern void conf_add_class_to_conf(struct ConfItem *);
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);
extern unsigned long cidr_to_bitmask[];
-extern char conffilebuf[IRCD_BUFSIZE + 1];
+extern char conffilebuf[BUFSIZE + 1];
extern int lineno;
#define NOT_AUTHORISED (-1)
-#define SOCKET_ERROR (-2)
+#define I_SOCKET_ERROR (-2)
#define I_LINE_FULL (-3)
#define BANNED_CLIENT (-4)
#define TOO_MANY_LOCAL (-6)