extern FILE *conf_fbfile_in;
extern char conf_line_in[256];
-struct ConfItem\r
-{\r
- unsigned int status; /* If CONF_ILLEGAL, delete when no clients */\r
- unsigned int flags;\r
- int clients; /* Number of *LOCAL* clients using this */\r
-\r
- union\r
- {\r
- char *name; /* IRC name, nick, server name, or original u@h */\r
- const char *oper;\r
- } info;\r
-\r
- char *host; /* host part of user@host */\r
- char *passwd; /* doubles as kline reason *ugh* */\r
- char *spasswd; /* Password to send. */\r
- char *user; /* user part of user@host */\r
- int port;\r
- time_t hold; /* Hold action until this time (calendar time) */\r
- struct Class *c_class; /* Class of connection */\r
- rb_patricia_node_t *pnode;\r
+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 */
+ 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) */
+ 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_RESV_NICK 0x0200
#define CONF_RESV (CONF_RESV_CHANNEL | CONF_RESV_NICK)
-#define CONF_GLINE 0x10000
#define CONF_DLINE 0x20000
#define CONF_EXEMPTDLINE 0x100000
/* aConfItem->flags */
/* Generic flags... */
-/* access flags... */
+#define CONF_FLAGS_TEMPORARY 0x00800000
+#define CONF_FLAGS_NEED_SSL 0x00000002
+/* auth{} flags... */
#define CONF_FLAGS_NO_TILDE 0x00000004
#define CONF_FLAGS_NEED_IDENTD 0x00000008
#define CONF_FLAGS_EXEMPTKLINE 0x00000040
#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
#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 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 *fname_foperlog;
char *fname_serverlog;
char *fname_killlog;
- char *fname_glinelog;
char *fname_klinelog;
char *fname_operspylog;
char *fname_ioerrorlog;
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 reject_ban_time;
int reject_after_count;
int reject_duration;
+ int throttle_count;
+ int throttle_duration;
int target_change;
int collision_fnc;
int default_umodes;
int global_snotices;
int operspy_dont_care_user_info;
- int max_unknown_ip;
};
struct config_channel_entry
int default_split_user_count;
int burst_topicwho;
int kick_on_split_riding;
+ int only_ascii_channels;
+ int resv_forcepart;
};
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 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 */
-rb_dlink_list service_list;
+extern rb_dlink_list service_list;
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 char *show_iline_prefix(struct Client *, struct ConfItem *, char *);
extern void get_printable_conf(struct ConfItem *,
char **, char **, char **, char **, int *, char **);
-void get_printable_kline(struct Client *, struct ConfItem *,\r
- const char **, const char **, const char **, const char **);
+extern void get_printable_kline(struct Client *, struct ConfItem *,
+ char **, char **, char **, char **);
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 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 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);