X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/e54995b1508e6f5916045b29358fc906dd0f42d4..40d5d119e57ec78928f7f15a7bd2ac46c7b0b151:/include/s_conf.h diff --git a/include/s_conf.h b/include/s_conf.h index 6881536..815703e 100644 --- a/include/s_conf.h +++ b/include/s_conf.h @@ -36,7 +36,6 @@ #include "class.h" #include "client.h" #include "common.h" -#include "patricia.h" struct Client; struct DNSReply; @@ -47,7 +46,7 @@ struct hostent; struct ip_value { - struct irc_sockaddr_storage ip; + struct rb_sockaddr_storage ip; int ip_mask; int type; }; @@ -70,7 +69,7 @@ struct ConfItem time_t hold; /* Hold action until this time (calendar 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 @@ -81,7 +80,6 @@ struct ConfItem #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 @@ -90,7 +88,9 @@ struct ConfItem /* 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 @@ -98,21 +98,13 @@ struct ConfItem #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 @@ -121,7 +113,6 @@ struct ConfItem #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) @@ -130,11 +121,9 @@ struct ConfItem #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 */ @@ -147,7 +136,6 @@ struct config_file_entry const char *xlinefile; const char *resvfile; - char *servlink_path; char *egdpool_path; char *default_operstring; @@ -164,7 +152,6 @@ struct config_file_entry char *fname_foperlog; char *fname_serverlog; char *fname_killlog; - char *fname_glinelog; char *fname_klinelog; char *fname_operspylog; char *fname_ioerrorlog; @@ -201,10 +188,6 @@ struct config_file_entry 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; @@ -228,12 +211,13 @@ struct config_file_entry 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 @@ -266,21 +250,25 @@ 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 @@ -308,7 +296,7 @@ extern struct server_info ServerInfo; /* defined in ircd.c */ extern struct admin_info AdminInfo; /* defined in ircd.c */ /* End GLOBAL section */ -dlink_list service_list; +extern rb_dlink_list service_list; typedef enum temp_list { @@ -319,8 +307,8 @@ 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); @@ -359,7 +347,7 @@ extern void write_confitem(KlineType, struct Client *, char *, 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);