um_callerid: Only people can have common channels

[solanum.git] / include / s_conf.h

diff --git a/include/s_conf.h b/include/s_conf.h
index 9744eb928050650684dc4c9bff6bfe88ac6b6744..4d4b6b40fef0c4a6f7b57d7e041fdb8ee72c3567 100644 (file)
--- a/include/s_conf.h
+++ b/include/s_conf.h
@@ -1,5 +1,5 @@
 /*
- *  charybdis: Advanced, scalable Internet Relay Chat.
+ *  solanum: Advanced, scalable Internet Relay Chat.
  *  s_conf.h: A header for the configuration functions.
  *
  *  Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
@@ -72,6 +72,7 @@ struct ConfItem
        char *className;        /* Name of class */
        struct Class *c_class;  /* Class of connection */
        rb_patricia_node_t *pnode;      /* Our patricia node */
+       int umodes, umodes_mask;        /* Override umodes specified by mask */
 };
 
 #define CONF_ILLEGAL           0x80000000
@@ -84,6 +85,7 @@ struct ConfItem
 
 #define CONF_DLINE             0x020000
 #define CONF_EXEMPTDLINE       0x100000
+#define CONF_SECURE            0x200000
 
 #define IsIllegal(x)    ((x)->status & CONF_ILLEGAL)
 
@@ -112,6 +114,7 @@ struct ConfItem
 #define CONF_FLAGS_EXEMPTDNSBL         0x04000000
 #define CONF_FLAGS_EXEMPTPROXY         0x08000000
 #define CONF_FLAGS_ALLOW_SCTP          0x10000000
+#define CONF_FLAGS_KLINE_SPOOF         0x20000000
 
 
 /* Macros for struct ConfItem */
@@ -136,6 +139,13 @@ struct ConfItem
 #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)
+#define IsConfKlineSpoof(x)    ((x)->flags & CONF_FLAGS_KLINE_SPOOF)
+
+enum stats_l_oper_only {
+       STATS_L_OPER_ONLY_NO,
+       STATS_L_OPER_ONLY_SELF,
+       STATS_L_OPER_ONLY_YES,
+};
 
 /* flag definitions for opers now in client.h */
 
@@ -178,15 +188,16 @@ struct config_file_entry
        int ts_warn_delta;
        int dline_with_reason;
        int kline_with_reason;
+       int hide_tkdline_duration;
        int warn_no_nline;
        int nick_delay;
        int non_redundant_klines;
        int stats_e_disabled;
        int stats_c_oper_only;
        int stats_y_oper_only;
-       int stats_h_oper_only;
        int stats_o_oper_only;
        int stats_k_oper_only;
+       enum stats_l_oper_only stats_l_oper_only;
        int stats_i_oper_only;
        int stats_P_oper_only;
        int map_oper_only;
@@ -212,6 +223,7 @@ struct config_file_entry
        int tkline_expire_notices;
        int use_whois_actually;
        int disable_auth;
+       int post_registration_delay;
        int connect_timeout;
        int burst_away;
        int reject_ban_time;
@@ -228,6 +240,10 @@ struct config_file_entry
        int use_propagated_bans;
        int max_ratelimit_tokens;
        int away_interval;
+       int tls_ciphers_oper_only;
+       int oper_secure_only;
+
+       char **hidden_caps;
 
        int client_flood_max_lines;
        int client_flood_burst_rate;
@@ -239,6 +255,9 @@ struct config_file_entry
        int certfp_method;
 
        int hide_opers_in_whois;
+       int hide_opers;
+
+       char *drain_reason;
 };
 
 struct config_channel_entry
@@ -266,6 +285,8 @@ struct config_channel_entry
        unsigned int autochanmodes;
        int displayed_usercount;
        int strip_topic_colors;
+       int opmod_send_statusmsg;
+       int ip_bans_through_vhost;
 };
 
 struct config_server_hide
@@ -282,7 +303,6 @@ struct server_info
        char sid[4];
        char *description;
        char *network_name;
-       int hub;
        struct rb_sockaddr_storage bind4;
        struct rb_sockaddr_storage bind6;
        int default_max_clients;
@@ -319,7 +339,7 @@ extern struct admin_info AdminInfo; /* defined in ircd.c */
 
 extern rb_dlink_list service_list;
 
-extern rb_dlink_list prop_bans;
+extern rb_dictionary *prop_bans_dict;
 
 typedef enum temp_list
 {
@@ -338,8 +358,11 @@ 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 struct ConfItem *find_prop_ban(unsigned int status, const char *user, const char *host);
+extern void add_prop_ban(struct ConfItem *);
+extern void remove_prop_ban(struct ConfItem *);
+extern bool lookup_prop_ban(struct ConfItem *);
+extern void deactivate_conf(struct ConfItem *, time_t);
 extern void replace_old_ban(struct ConfItem *);
 
 extern void read_conf_files(bool cold);
@@ -347,6 +370,7 @@ 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 void deref_conf(struct ConfItem *);
 extern int detach_conf(struct Client *);
 
 extern struct ConfItem *find_tkline(const char *, const char *, struct sockaddr *);
@@ -377,7 +401,7 @@ extern void conf_add_class(struct ConfItem *, int);
 extern void conf_add_d_conf(struct ConfItem *);
 extern void flush_expired_ips(void *);
 
-extern char *get_oper_name(struct Client *client_p);
+extern const char *get_oper_name(struct Client *client_p);
 
 extern int yylex(void);