ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid/trunk/include/conf.h
(Generate patch)

Comparing ircd-hybrid/trunk/include/conf.h (file contents):
Revision 2196 by michael, Tue Jun 4 18:30:12 2013 UTC vs.
Revision 4325 by michael, Fri Aug 1 18:06:07 2014 UTC

# Line 1 | Line 1
1   /*
2 < *  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3 < *  conf.h: A header for the configuration functions.
2 > *  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3   *
4 < *  Copyright (C) 2005 by the past and present ircd coders, and others.
4 > *  Copyright (c) 1997-2014 ircd-hybrid development team
5   *
6   *  This program is free software; you can redistribute it and/or modify
7   *  it under the terms of the GNU General Public License as published by
# Line 18 | Line 17
17   *  along with this program; if not, write to the Free Software
18   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
19   *  USA
20 < *
21 < *  $Id$
20 > */
21 >
22 > /*! \file conf.h
23 > * \brief A header for the configuration functions.
24 > * \version $Id$
25   */
26  
27   #ifndef INCLUDED_s_conf_h
# Line 27 | Line 29
29   #include "config.h"
30   #include "ircd_defs.h"
31   #include "client.h"
30 – #include "hook.h"
32   #include "conf_class.h"
33  
34  
# Line 39 | Line 40
40   #define IsConfGline(x)          ((x)->type == CONF_GLINE)
41  
42   /* MaskItem->flags */
43 < #define CONF_FLAGS_DO_IDENTD            0x00000001
44 < #define CONF_FLAGS_LIMIT_IP             0x00000002
45 < #define CONF_FLAGS_NO_TILDE             0x00000004
46 < #define CONF_FLAGS_NEED_IDENTD          0x00000008
47 < #define CONF_FLAGS_NOMATCH_IP           0x00000010
48 < #define CONF_FLAGS_EXEMPTKLINE          0x00000020
49 < #define CONF_FLAGS_NOLIMIT              0x00000040
50 < #define CONF_FLAGS_SPOOF_IP             0x00000080
51 < #define CONF_FLAGS_SPOOF_NOTICE         0x00000100
52 < #define CONF_FLAGS_REDIR                0x00000200
53 < #define CONF_FLAGS_EXEMPTGLINE          0x00000400
54 < #define CONF_FLAGS_CAN_FLOOD            0x00000800
55 < #define CONF_FLAGS_NEED_PASSWORD        0x00001000
56 < #define CONF_FLAGS_ALLOW_AUTO_CONN      0x00002000
57 < #define CONF_FLAGS_ENCRYPTED            0x00004000
58 < #define CONF_FLAGS_IN_DATABASE          0x00008000
59 < #define CONF_FLAGS_EXEMPTRESV           0x00010000
59 < #define CONF_FLAGS_SSL                  0x00020000
60 < #define CONF_FLAGS_WEBIRC               0x00040000
43 > #define CONF_FLAGS_DO_IDENTD            0x00000001U
44 > #define CONF_FLAGS_NO_TILDE             0x00000004U
45 > #define CONF_FLAGS_NEED_IDENTD          0x00000008U
46 > #define CONF_FLAGS_EXEMPTKLINE          0x00000010U
47 > #define CONF_FLAGS_NOLIMIT              0x00000020U
48 > #define CONF_FLAGS_SPOOF_IP             0x00000040U
49 > #define CONF_FLAGS_SPOOF_NOTICE         0x00000080U
50 > #define CONF_FLAGS_REDIR                0x00000100U
51 > #define CONF_FLAGS_EXEMPTGLINE          0x00000200U
52 > #define CONF_FLAGS_CAN_FLOOD            0x00000400U
53 > #define CONF_FLAGS_NEED_PASSWORD        0x00000800U
54 > #define CONF_FLAGS_ALLOW_AUTO_CONN      0x00001000U
55 > #define CONF_FLAGS_ENCRYPTED            0x00002000U
56 > #define CONF_FLAGS_IN_DATABASE          0x00004000U
57 > #define CONF_FLAGS_EXEMPTRESV           0x00008000U
58 > #define CONF_FLAGS_SSL                  0x00010000U
59 > #define CONF_FLAGS_WEBIRC               0x00020000U
60  
61   /* Macros for struct MaskItem */
62   #define IsConfWebIRC(x)         ((x)->flags & CONF_FLAGS_WEBIRC)
64 – #define IsLimitIp(x)            ((x)->flags & CONF_FLAGS_LIMIT_IP)
63   #define IsNoTilde(x)            ((x)->flags & CONF_FLAGS_NO_TILDE)
64   #define IsConfCanFlood(x)       ((x)->flags & CONF_FLAGS_CAN_FLOOD)
65   #define IsNeedPassword(x)       ((x)->flags & CONF_FLAGS_NEED_PASSWORD)
66   #define IsNeedIdentd(x)         ((x)->flags & CONF_FLAGS_NEED_IDENTD)
69 – #define IsNoMatchIp(x)          ((x)->flags & CONF_FLAGS_NOMATCH_IP)
67   #define IsConfExemptKline(x)    ((x)->flags & CONF_FLAGS_EXEMPTKLINE)
68   #define IsConfExemptLimits(x)   ((x)->flags & CONF_FLAGS_NOLIMIT)
69   #define IsConfExemptGline(x)    ((x)->flags & CONF_FLAGS_EXEMPTGLINE)
# Line 74 | Line 71
71   #define IsConfDoIdentd(x)       ((x)->flags & CONF_FLAGS_DO_IDENTD)
72   #define IsConfDoSpoofIp(x)      ((x)->flags & CONF_FLAGS_SPOOF_IP)
73   #define IsConfSpoofNotice(x)    ((x)->flags & CONF_FLAGS_SPOOF_NOTICE)
77 – #define IsConfEncrypted(x)      ((x)->flags & CONF_FLAGS_ENCRYPTED)
78 – #define SetConfEncrypted(x)     ((x)->flags |= CONF_FLAGS_ENCRYPTED)
79 – #define ClearConfEncrypted(x)   ((x)->flags &= ~CONF_FLAGS_ENCRYPTED)
74   #define IsConfAllowAutoConn(x)  ((x)->flags & CONF_FLAGS_ALLOW_AUTO_CONN)
75   #define SetConfAllowAutoConn(x) ((x)->flags |= CONF_FLAGS_ALLOW_AUTO_CONN)
76   #define ClearConfAllowAutoConn(x) ((x)->flags &= ~CONF_FLAGS_ALLOW_AUTO_CONN)
77   #define IsConfRedir(x)          ((x)->flags & CONF_FLAGS_REDIR)
78   #define IsConfSSL(x)      ((x)->flags & CONF_FLAGS_SSL)
85 – #define SetConfSSL(x)     ((x)->flags |= CONF_FLAGS_SSL)
86 – #define ClearConfSSL(x)   ((x)->flags &= ~CONF_FLAGS_SSL)
79   #define IsConfDatabase(x)      ((x)->flags & CONF_FLAGS_IN_DATABASE)
80   #define SetConfDatabase(x)     ((x)->flags |= CONF_FLAGS_IN_DATABASE)
81  
82  
83 < /* shared/cluster server entry types
83 > /* shared/cluster server entry types
84   * These defines are used for both shared and cluster.
85   */
86 < #define SHARED_KLINE            0x0001
87 < #define SHARED_UNKLINE          0x0002
88 < #define SHARED_XLINE            0x0004
89 < #define SHARED_UNXLINE          0x0008
90 < #define SHARED_RESV             0x0010
91 < #define SHARED_UNRESV           0x0020
92 < #define SHARED_LOCOPS           0x0040
93 < #define SHARED_DLINE            0x0080
94 < #define SHARED_UNDLINE          0x0100
86 > #define SHARED_KLINE            0x00000001U
87 > #define SHARED_UNKLINE          0x00000002U
88 > #define SHARED_XLINE            0x00000004U
89 > #define SHARED_UNXLINE          0x00000008U
90 > #define SHARED_RESV             0x00000010U
91 > #define SHARED_UNRESV           0x00000020U
92 > #define SHARED_LOCOPS           0x00000040U
93 > #define SHARED_DLINE            0x00000080U
94 > #define SHARED_UNDLINE          0x00000100U
95   #define SHARED_ALL              (SHARED_KLINE | SHARED_UNKLINE |\
96                                   SHARED_XLINE | SHARED_UNXLINE |\
97                                   SHARED_RESV | SHARED_UNRESV |\
# Line 108 | Line 100
100  
101   enum maskitem_type
102   {
103 <  CONF_RESERVED = 1 <<  0, /* XXX */
104 <  CONF_CLIENT   = 1 <<  1,
105 <  CONF_SERVER   = 1 <<  2,
106 <  CONF_KLINE    = 1 <<  3,
107 <  CONF_DLINE    = 1 <<  4,
108 <  CONF_EXEMPT   = 1 <<  5,
109 <  CONF_CLUSTER  = 1 <<  6,
110 <  CONF_XLINE    = 1 <<  7,
111 <  CONF_ULINE    = 1 <<  8,
112 <  CONF_GLINE    = 1 <<  9,
113 <  CONF_CRESV    = 1 << 10,
114 <  CONF_NRESV    = 1 << 11,
115 <  CONF_SERVICE  = 1 << 12,
116 <  CONF_OPER     = 1 << 13,
117 < };
118 <
119 < struct conf_parser_context
120 < {
121 <  unsigned int boot;
122 <  unsigned int pass;
123 <  FILE *conf_file;
103 >  CONF_CLIENT   = 1 <<  0,
104 >  CONF_SERVER   = 1 <<  1,
105 >  CONF_KLINE    = 1 <<  2,
106 >  CONF_DLINE    = 1 <<  3,
107 >  CONF_EXEMPT   = 1 <<  4,
108 >  CONF_CLUSTER  = 1 <<  5,
109 >  CONF_XLINE    = 1 <<  6,
110 >  CONF_ULINE    = 1 <<  7,
111 >  CONF_GLINE    = 1 <<  8,
112 >  CONF_CRESV    = 1 <<  9,
113 >  CONF_NRESV    = 1 << 10,
114 >  CONF_SERVICE  = 1 << 11,
115 >  CONF_OPER     = 1 << 12
116 > };
117 >
118 > enum
119 > {
120 >  NOT_AUTHORIZED = -1,
121 >  I_LINE_FULL    = -2,
122 >  TOO_MANY       = -3,
123 >  BANNED_CLIENT  = -4,
124 >  TOO_FAST       = -5
125   };
126  
127   struct split_nuh_item
# Line 174 | Line 167 | struct MaskItem
167    char              *passwd;
168    char              *spasswd;  /* Password to send. */
169    char              *reason;
170 +  char              *certfp;
171    char              *cipher_list;
172    void              *rsa_public_key;
173   };
# Line 199 | Line 193 | struct CidrItem
193    unsigned int number_on_this_cidr;
194   };
195  
196 < struct config_file_entry
196 > struct
197 > {
198 >  unsigned int boot;
199 >  unsigned int pass;
200 >  FILE *conf_file;
201 > } conf_parser_ctx;
202 >
203 > struct
204   {
205    const char *dpath;          /* DPATH if set from command line */
206 +  const char *mpath;
207 +  const char *spath;
208    const char *configfile;
209    const char *klinefile;
210    const char *glinefile;
211    const char *xlinefile;
212    const char *dlinefile;
213    const char *resvfile;
211 –  char *mpath;
212 –  char *rpath;
214  
214 –  char *egdpool_path;
215    char *service_name;
216  
217 <  int gline_min_cidr;
218 <  int gline_min_cidr6;
219 <  int dots_in_ident;
220 <  int failed_oper_notice;
221 <  int anti_spam_exit_message_time;
217 >  unsigned int gline_min_cidr;
218 >  unsigned int gline_min_cidr6;
219 >  unsigned int dots_in_ident;
220 >  unsigned int failed_oper_notice;
221 >  unsigned int anti_spam_exit_message_time;
222    unsigned int max_accept;
223    unsigned int max_watch;
224 <  int max_nick_time;
224 >  unsigned int away_time;
225 >  unsigned int away_count;
226 >  unsigned int max_nick_time;
227    unsigned int max_nick_changes;
228 <  int ts_max_delta;
229 <  int ts_warn_delta;
230 <  int anti_nick_flood;
231 <  int warn_no_nline;
232 <  int invisible_on_connect;
233 <  int stats_e_disabled;
234 <  int stats_o_oper_only;
235 <  int stats_k_oper_only;
236 <  int stats_i_oper_only;
237 <  int stats_P_oper_only;
238 <  int short_motd;
239 <  int no_oper_flood;
240 <  int true_no_oper_flood;
241 <  int oper_pass_resv;
242 <  int glines;
243 <  int hide_spoof_ips;
244 <  int tkline_expire_notices;
245 <  int opers_bypass_callerid;
246 <  int ignore_bogus_ts;
247 <  int pace_wait;
248 <  int pace_wait_simple;
249 <  int gline_time;
250 <  int gline_request_time;
251 <  int oper_only_umodes;
252 <  int oper_umodes;
253 <  int max_targets;
254 <  int caller_id_wait;
255 <  int min_nonwildcard;
256 <  int min_nonwildcard_simple;
257 <  int kill_chase_time_limit;
258 <  int default_floodcount;
259 <  /* 0 == don't use throttle... */
260 <  int throttle_time;
261 <  int use_egd;
262 <  int ping_cookie;
263 <  int disable_auth;
264 < };
265 <
266 < struct config_channel_entry
267 < {
268 <  int disable_fake_channels;
269 <  int knock_delay;
270 <  int knock_delay_channel;
228 >  unsigned int ts_max_delta;
229 >  unsigned int ts_warn_delta;
230 >  unsigned int anti_nick_flood;
231 >  unsigned int warn_no_connect_block;
232 >  unsigned int invisible_on_connect;
233 >  unsigned int stats_e_disabled;
234 >  unsigned int stats_o_oper_only;
235 >  unsigned int stats_k_oper_only;
236 >  unsigned int stats_i_oper_only;
237 >  unsigned int stats_P_oper_only;
238 >  unsigned int stats_u_oper_only;
239 >  unsigned int short_motd;
240 >  unsigned int no_oper_flood;
241 >  unsigned int true_no_oper_flood;
242 >  unsigned int oper_pass_resv;
243 >  unsigned int glines;
244 >  unsigned int hide_spoof_ips;
245 >  unsigned int tkline_expire_notices;
246 >  unsigned int opers_bypass_callerid;
247 >  unsigned int ignore_bogus_ts;
248 >  unsigned int pace_wait;
249 >  unsigned int pace_wait_simple;
250 >  unsigned int gline_time;
251 >  unsigned int gline_request_time;
252 >  unsigned int oper_only_umodes;
253 >  unsigned int oper_umodes;
254 >  unsigned int max_targets;
255 >  unsigned int caller_id_wait;
256 >  unsigned int min_nonwildcard;
257 >  unsigned int min_nonwildcard_simple;
258 >  unsigned int kill_chase_time_limit;
259 >  unsigned int default_floodcount;
260 >  unsigned int throttle_count;
261 >  unsigned int throttle_time;
262 >  unsigned int ping_cookie;
263 >  unsigned int disable_auth;
264 >  unsigned int cycle_on_host_change;
265 > } ConfigFileEntry;
266 >
267 > struct
268 > {
269 >  unsigned int disable_fake_channels;
270 >  unsigned int invite_client_count;
271 >  unsigned int invite_client_time;
272 >  unsigned int knock_client_count;
273 >  unsigned int knock_client_time;
274 >  unsigned int knock_delay_channel;
275    unsigned int max_bans;
276 <  unsigned int max_chans_per_user;
277 <  unsigned int max_chans_per_oper;
278 <  int no_create_on_split;
279 <  int no_join_on_split;
280 <  int default_split_server_count;
281 <  int default_split_user_count;
276 < };
276 >  unsigned int max_channels;
277 >  unsigned int no_create_on_split;
278 >  unsigned int no_join_on_split;
279 >  unsigned int default_split_server_count;
280 >  unsigned int default_split_user_count;
281 > } ConfigChannel;
282  
283 < struct config_server_hide
283 > struct
284   {
285    char *hidden_name;
286 <  int flatten_links;
287 <  int disable_remote_commands;
288 <  int hide_servers;
289 <  int hide_services;
290 <  int links_delay;
291 <  int links_disabled;
292 <  int hidden;
293 <  int hide_server_ips;
294 < };
295 <
296 < struct server_info
297 < {
286 >  unsigned int flatten_links;
287 >  unsigned int disable_remote_commands;
288 >  unsigned int hide_servers;
289 >  unsigned int hide_services;
290 >  unsigned int links_delay;
291 >  unsigned int links_disabled;
292 >  unsigned int hidden;
293 >  unsigned int hide_server_ips;
294 > } ConfigServerHide;
295 >
296 > struct
297 > {
298 > #ifdef HAVE_LIBCRYPTO
299 >  const EVP_MD *message_digest_algorithm;
300 > #endif
301    char *sid;
302    char *name;
303    char *description;
# Line 299 | Line 307 | struct server_info
307    void *rsa_private_key;
308    void *server_ctx;
309    void *client_ctx;
310 <  int hub;
310 >  unsigned int hub;
311    struct irc_ssaddr ip;
312    struct irc_ssaddr ip6;
313    unsigned int max_clients;
314    unsigned int max_nick_length;
315    unsigned int max_topic_length;
316 <  int specific_ipv4_vhost;
317 <  int specific_ipv6_vhost;
316 >  unsigned int specific_ipv4_vhost;
317 >  unsigned int specific_ipv6_vhost;
318    struct sockaddr_in dns_host;
319 <  int can_use_v6;
320 < };
319 >  unsigned int can_use_v6;
320 > } ServerInfo;
321  
322 < struct admin_info
322 > struct
323   {
324    char *name;
325    char *description;
326    char *email;
327 < };
327 > } AdminInfo;
328  
329 < struct logging_entry
329 > struct
330   {
331    unsigned int use_logging;
332 < };
332 > } ConfigLoggingEntry;
333  
334   extern dlink_list flatten_links;
335   extern dlink_list server_items;
# Line 332 | Line 340 | extern dlink_list oconf_items;
340   extern dlink_list service_items;
341   extern dlink_list nresv_items;
342   extern dlink_list cresv_items;
343 < extern struct conf_parser_context conf_parser_ctx;
336 < extern struct logging_entry ConfigLoggingEntry;
337 < extern struct config_file_entry ConfigFileEntry;/* defined in ircd.c*/
338 < extern struct config_channel_entry ConfigChannel;/* defined in channel.c*/
339 < extern struct config_server_hide ConfigServerHide; /* defined in s_conf.c */
340 < extern struct server_info ServerInfo;       /* defined in ircd.c */
341 < extern struct admin_info AdminInfo;        /* defined in ircd.c */
343 >
344   extern int valid_wild_card_simple(const char *);
345   extern int valid_wild_card(struct Client *, int, int, ...);
346   /* End GLOBAL section */
347  
346 – extern void init_ip_hash_table(void);
347 – extern void count_ip_hash(unsigned int *, uint64_t *);
348 – extern void remove_one_ip(struct irc_ssaddr *);
348   extern struct MaskItem *conf_make(enum maskitem_type);
349   extern void read_conf_files(int);
350   extern int attach_conf(struct Client *, struct MaskItem *);
# Line 355 | Line 354 | extern int check_client(struct Client *)
354  
355   extern void detach_conf(struct Client *, enum maskitem_type);
356   extern struct MaskItem *find_conf_name(dlink_list *, const char *, enum maskitem_type);
358 – extern struct MaskItem *find_kill(struct Client *);
359 – extern struct MaskItem *find_gline(struct Client *);
357   extern int conf_connect_allowed(struct irc_ssaddr *, int);
358   extern char *oper_privs_as_string(const unsigned int);
359   extern void split_nuh(struct split_nuh_item *);
# Line 375 | Line 372 | extern void conf_add_class_to_conf(struc
372   extern const char *get_oper_name(const struct Client *);
373  
374   /* XXX should the parse_aline stuff go into another file ?? */
375 < #define AWILD 0x1               /* check wild cards */
375 > #define AWILD 0x1  /* check wild cards */
376   extern int parse_aline(const char *, struct Client *, int, char **,
377 <                       int, char **, char **, time_t *, char **, char **);
377 >                       int, char **, char **, time_t *, char **, char **);
378   extern int valid_comment(struct Client *, char *, int);
379  
380  
381   #define TK_SECONDS 0
382   #define TK_MINUTES 1
383 < extern time_t valid_tkline(const char *, int);
383 > extern time_t valid_tkline(const char *, const int);
384   extern int match_conf_password(const char *, const struct MaskItem *);
385  
389 – #define NOT_AUTHORIZED    (-1)
390 – #define I_LINE_FULL       (-2)
391 – #define TOO_MANY          (-3)
392 – #define BANNED_CLIENT     (-4)
393 – #define TOO_FAST          (-5)
394 –
386   #define CLEANUP_TKLINES_TIME 60
387  
388 < extern void cluster_a_line(struct Client *,
398 <                           const char *, int, int, const char *,...);
388 > extern void cluster_a_line(struct Client *, const char *, int, int, const char *,...);
389   #endif /* INCLUDED_s_conf_h */

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)