* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
- * $Id: s_conf.h 3251 2007-03-05 18:58:38Z nenolod $
+ * $Id: s_conf.h 3550 2007-08-09 06:47:26Z nenolod $
*/
#ifndef INCLUDED_s_conf_h
#include "class.h"
#include "client.h"
#include "common.h"
-#include "patricia.h"
struct Client;
struct DNSReply;
struct ip_value
{
- struct irc_sockaddr_storage ip;
+ struct rb_sockaddr_storage ip;
int ip_mask;
int type;
};
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 */
- patricia_node_t *pnode; /* Our patricia node */
+ rb_patricia_node_t *pnode; /* Our patricia node */
};
#define CONF_ILLEGAL 0x80000000
-#define CONF_QUARANTINED_NICK 0x0001
#define CONF_CLIENT 0x0002
#define CONF_KILL 0x0040
#define CONF_XLINE 0x0080
#define CONF_RESV_NICK 0x0200
#define CONF_RESV (CONF_RESV_CHANNEL | CONF_RESV_NICK)
-#define CONF_CLASS 0x0400
-#define CONF_LISTEN_PORT 0x1000
-#define CONF_EXEMPTKLINE 0x4000
-#define CONF_NOLIMIT 0x8000
-#define CONF_GLINE 0x10000
#define CONF_DLINE 0x20000
#define CONF_EXEMPTDLINE 0x100000
/* aConfItem->flags */
/* Generic flags... */
-/* access flags... */
-#define CONF_FLAGS_DO_IDENTD 0x00000001
-#define CONF_FLAGS_LIMIT_IP 0x00000002
+#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_PASS_IDENTD 0x00000010
-#define CONF_FLAGS_NOMATCH_IP 0x00000020
#define CONF_FLAGS_EXEMPTKLINE 0x00000040
#define CONF_FLAGS_NOLIMIT 0x00000080
-#define CONF_FLAGS_IDLE_LINED 0x00000100
#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_EXEMPTRESV 0x00002000 /* exempt from resvs */
#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_EXEMPTDNSBL 0x04000000
/* Macros for struct ConfItem */
-#define IsLimitIp(x) ((x)->flags & CONF_FLAGS_LIMIT_IP)
+#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 IsPassIdentd(x) ((x)->flags & CONF_FLAGS_PASS_IDENTD)
-#define IsNoMatchIp(x) ((x)->flags & CONF_FLAGS_NOMATCH_IP)
#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 IsConfExemptJupe(x) ((x)->flags & CONF_FLAGS_EXEMPTJUPE)
#define IsConfExemptResv(x) ((x)->flags & CONF_FLAGS_EXEMPTRESV)
-#define IsConfIdlelined(x) ((x)->flags & CONF_FLAGS_IDLE_LINED)
-#define IsConfDoIdentd(x) ((x)->flags & CONF_FLAGS_DO_IDENTD)
#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 IsConfSSLNeeded(x) ((x)->flags & CONF_FLAGS_NEED_SSL)
/* 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;
unsigned char compression_level;
int disable_fake_channels;
- int dot_in_ip6_addr;
int dots_in_ident;
int failed_oper_notice;
int anti_nick_flood;
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 idletime;
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 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;
};
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 default_split_server_count;
int default_split_user_count;
int burst_topicwho;
- int invite_ops_only;
int kick_on_split_riding;
+ int only_ascii_channels;
+ int resv_forcepart;
+ int channel_target_change;
+ int disable_local_channels;
};
struct config_server_hide
{
int flatten_links;
int links_delay;
- int links_disabled;
int hidden;
int disable_hidden;
};
struct server_info
{
char *name;
- char sid[3];
+ char sid[4];
char *description;
char *network_name;
- char *network_desc;
int hub;
- int use_ts6;
struct sockaddr_in ip;
-#ifdef IPV6
+ int default_max_clients;
+#ifdef RB_IPV6
struct sockaddr_in6 ip6;
#endif
int specific_ipv4_vhost;
-#ifdef IPV6
+#ifdef RB_IPV6
int specific_ipv6_vhost;
#endif
-
- int max_clients;
+ char *ssl_private_key;
+ char *ssl_ca_cert;
+ char *ssl_cert;
+ char *ssl_dh_params;
+ int ssld_count;
};
struct admin_info
extern struct admin_info AdminInfo; /* defined in ircd.c */
/* End GLOBAL section */
-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;
-dlink_list temp_klines[LAST_TEMP_TYPE];
-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 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 *);
extern int detach_conf(struct Client *);
-extern struct ConfItem *conf_connect_allowed(struct sockaddr *addr, int);
-
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 *, dlink_list *);
+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 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);