ssl sync with http://hg.angelforce.ru/charybdis-old

[irc/rqf/shadowircd.git] / include / s_conf.h

diff --git a/include/s_conf.h b/include/s_conf.h
index 63f47b399a89c8b3d1cc557a0793f81967eee09b..da08740c84f00ad0418cc2bd0ab3c5a8c13f639a 100644 (file)
--- a/include/s_conf.h
+++ b/include/s_conf.h
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: s_conf.h 3257 2007-03-13 16:09:28Z jilles $
+ *  $Id: s_conf.h 3550 2007-08-09 06:47:26Z nenolod $
  */
 
 #ifndef INCLUDED_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,11 +69,10 @@ 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
-#define CONF_QUARANTINED_NICK   0x0001
 #define CONF_CLIENT             0x0002
 #define CONF_KILL               0x0040
 #define CONF_XLINE             0x0080
@@ -82,10 +80,6 @@ struct ConfItem
 #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
@@ -96,15 +90,10 @@ struct ConfItem
 
 /* Generic flags... */
 /* access flags... */
-#define CONF_FLAGS_DO_IDENTD            0x00000001
-#define CONF_FLAGS_LIMIT_IP             0x00000002
 #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
@@ -127,11 +116,8 @@ struct ConfItem
 
 
 /* Macros for struct ConfItem */
-#define IsLimitIp(x)            ((x)->flags & CONF_FLAGS_LIMIT_IP)
 #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)
@@ -140,8 +126,6 @@ struct ConfItem
 #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)
@@ -186,7 +170,6 @@ struct config_file_entry
 
        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;
@@ -221,7 +204,6 @@ struct config_file_entry
        int gline_time;
        int gline_min_cidr;
        int gline_min_cidr6;
-       int idletime;
        int hide_server;
        int hide_spoof_ips;
        int hide_error_messages;
@@ -250,6 +232,7 @@ struct config_file_entry
        int default_umodes;
        int global_snotices;
        int operspy_dont_care_user_info;
+       int max_unknown_ip;
 };
 
 struct config_channel_entry
@@ -275,7 +258,6 @@ struct config_server_hide
 {
        int flatten_links;
        int links_delay;
-       int links_disabled;
        int hidden;
        int disable_hidden;
 };
@@ -288,17 +270,20 @@ struct server_info
        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;\r
+       char *ssl_ca_cert;\r
+       char *ssl_cert;\r
+       char *ssl_dh_params;\r
+       int ssld_count;
 };
 
 struct admin_info
@@ -326,7 +311,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;
+rb_dlink_list service_list;
 
 typedef enum temp_list
 {
@@ -337,8 +322,8 @@ typedef enum temp_list
        LAST_TEMP_TYPE
 } temp_list;
 
-dlink_list temp_klines[LAST_TEMP_TYPE];
-dlink_list temp_dlines[LAST_TEMP_TYPE];
+rb_dlink_list temp_klines[LAST_TEMP_TYPE];
+rb_dlink_list temp_dlines[LAST_TEMP_TYPE];
 
 extern void init_s_conf(void);
 
@@ -352,8 +337,6 @@ extern int check_client(struct Client *client_p, struct Client *source_p, const
 
 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 *,
@@ -379,7 +362,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);