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-7.2/include/s_conf.h (file contents), Revision 948 by michael, Tue Jul 21 17:34:06 2009 UTC vs.
ircd-hybrid-8/include/conf.h (file contents), Revision 1317 by michael, Tue Mar 27 17:30:55 2012 UTC

# Line 1 | Line 1
1   /*
2   *  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3 < *  s_conf.h: A header for the configuration functions.
3 > *  conf.h: A header for the configuration functions.
4   *
5   *  Copyright (C) 2005 by the past and present ircd coders, and others.
6   *
# Line 33 | Line 33
33   #include "motd.h"               /* MessageFile */
34   #include "client.h"
35   #include "hook.h"
36 < #include "pcre.h"
36 >
37 >
38 > #define CONF_SERVER_INFO_TLS_VERSION_SSLV3 0x1
39 > #define CONF_SERVER_INFO_TLS_VERSION_TLSV1 0x2
40  
41   struct Client;
39 – struct DNSReply;
40 – struct hostent;
42  
42 – extern FBFILE *conf_fbfile_in;
43   extern struct Callback *client_check_cb;
44  
45 + struct conf_parser_context
46 + {
47 +  unsigned int boot;
48 +  unsigned int pass;
49 +  FBFILE *conf_file;
50 + };
51 +
52 + extern struct conf_parser_context conf_parser_ctx;
53 +
54   typedef enum
55   {  
56    CONF_TYPE,
# Line 62 | Line 71 | typedef enum
71    GLINE_TYPE,
72    CRESV_TYPE,    
73    NRESV_TYPE,
74 <  GDENY_TYPE
74 >  GDENY_TYPE,
75 >  SERVICE_TYPE
76   } ConfType;
77  
78   struct split_nuh_item
# Line 81 | Line 91 | struct split_nuh_item
91  
92   struct ConfItem
93   {
94 +  dlink_node node;      /* link into known ConfItems of this type */
95 +
96    char *name;           /* Primary key */
97 <  pcre *regexpname;
86 <  dlink_node node;      /* link into known ConfItems of this type */
97 >  void *regexpname;
98    unsigned int flags;
99    ConfType type;
100   };
# Line 107 | Line 118 | struct MatchItem
118   struct AccessItem
119   {
120    dlink_node node;
121 +  unsigned int     dns_failed;
122 +  unsigned int     dns_pending;
123    unsigned int     status;   /* If CONF_ILLEGAL, delete when no clients */
124    unsigned int     flags;
125    unsigned int     modes;
126 +  unsigned int     port;
127    int              clients;  /* Number of *LOCAL* clients using this */
128 +  int              bits;
129 +  int              type;
130    struct irc_ssaddr my_ipnum; /* ip to bind to for outgoing connect */
131    struct irc_ssaddr ipnum;      /* ip to connect to */
132    char *           host;     /* host part of user@host */
# Line 119 | Line 135 | struct AccessItem
135    char *           reason;
136    char *           oper_reason;
137    char *           user;     /* user part of user@host */
122 –  int              port;
123 –  char *           fakename;   /* Mask name */
138    time_t           hold;     /* Hold action until this time (calendar time) */
139    struct ConfItem *class_ptr;  /* Class of connection */
126 –  struct DNSQuery* dns_query;
140    int              aftype;
141   #ifdef HAVE_LIBCRYPTO
142 +  /* certs */
143 +  char *cipher_list;
144    char *           rsa_public_key_file;
145    RSA *            rsa_public_key;
131 –  struct EncCapability *cipher_preference;
146   #endif
147 <  pcre *regexuser;
148 <  pcre *regexhost;
147 >  void *regexuser;
148 >  void *regexhost;
149   };
150  
151   struct ClassItem
152   {
153 <  unsigned max_sendq;
153 >  dlink_list list_ipv4;         /* base of per cidr ipv4 client link list */
154 >  dlink_list list_ipv6;         /* base of per cidr ipv6 client link list */
155 >  unsigned int max_sendq;
156    int con_freq;
157    int ping_freq;
158    int ping_warning;
# Line 149 | Line 165 | struct ClassItem
165    int cidr_bitlen_ipv4;
166    int cidr_bitlen_ipv6;
167    int number_per_cidr;
152 –  dlink_list list_ipv4;         /* base of per cidr ipv4 client link list */
153 –  dlink_list list_ipv6;         /* base of per cidr ipv6 client link list */
168    int active;
169   };
170  
171   struct CidrItem
172   {
173 +  dlink_node node;
174    struct irc_ssaddr mask;
175    int number_on_this_cidr;
161 –  dlink_node node;
176   };
177  
178   #define ConFreq(x)      ((x)->con_freq)
# Line 196 | Line 210 | struct CidrItem
210   #define CONF_ULINE              0x00002000
211   #define CONF_EXEMPTDLINE        0x00004000
212   #define CONF_GLINE              0x00008000
213 + #define CONF_SERVICE            0x00010000
214  
215   #define CONF_SERVER_MASK       CONF_SERVER
216   #define CONF_CLIENT_MASK       (CONF_CLIENT | CONF_OPERATOR | CONF_SERVER_MASK)
# Line 233 | Line 248 | struct CidrItem
248   #define CONF_FLAGS_NOMATCH_IP           0x00000020
249   #define CONF_FLAGS_EXEMPTKLINE          0x00000040
250   #define CONF_FLAGS_NOLIMIT              0x00000080
251 < #define CONF_FLAGS_IDLE_LINED           0x00000100
251 > /*                                      0x00000100 */
252   #define CONF_FLAGS_SPOOF_IP             0x00000200
253   #define CONF_FLAGS_SPOOF_NOTICE         0x00000400
254   #define CONF_FLAGS_REDIR                0x00000800
255   #define CONF_FLAGS_EXEMPTGLINE          0x00001000
256 < #define CONF_FLAGS_RESTRICTED           0x00002000
256 > /*                                      0x00002000 */
257   #define CONF_FLAGS_CAN_FLOOD            0x00100000
258   #define CONF_FLAGS_NEED_PASSWORD        0x00200000
259   /* server flags */
260   #define CONF_FLAGS_ALLOW_AUTO_CONN      0x00004000
261 < #define CONF_FLAGS_LAZY_LINK            0x00008000
261 > /*                                      0x00008000 */
262   #define CONF_FLAGS_ENCRYPTED            0x00010000
263 < #define CONF_FLAGS_COMPRESSED           0x00020000
263 > #define CONF_FLAGS_UNUSED1___           0x00020000
264   #define CONF_FLAGS_TEMPORARY            0x00040000
265 < #define CONF_FLAGS_CRYPTLINK            0x00080000
265 > #define CONF_FLAGS_UNUSED2___           0x00080000
266   #define CONF_FLAGS_BURST_AWAY           0x00400000
267   #define CONF_FLAGS_EXEMPTRESV           0x00800000
268   #define CONF_FLAGS_TOPICBURST           0x01000000
269 + #define CONF_FLAGS_SSL                  0x02000000
270  
271   /* Macros for struct AccessItem */
272   #define IsLimitIp(x)            ((x)->flags & CONF_FLAGS_LIMIT_IP)
# Line 263 | Line 279 | struct CidrItem
279   #define IsConfExemptLimits(x)   ((x)->flags & CONF_FLAGS_NOLIMIT)
280   #define IsConfExemptGline(x)    ((x)->flags & CONF_FLAGS_EXEMPTGLINE)
281   #define IsConfExemptResv(x)     ((x)->flags & CONF_FLAGS_EXEMPTRESV)
266 – #define IsConfIdlelined(x)      ((x)->flags & CONF_FLAGS_IDLE_LINED)
282   #define IsConfDoIdentd(x)       ((x)->flags & CONF_FLAGS_DO_IDENTD)
283   #define IsConfDoSpoofIp(x)      ((x)->flags & CONF_FLAGS_SPOOF_IP)
284   #define IsConfSpoofNotice(x)    ((x)->flags & CONF_FLAGS_SPOOF_NOTICE)
270 – #define IsConfRestricted(x)     ((x)->flags & CONF_FLAGS_RESTRICTED)
285   #define IsConfEncrypted(x)      ((x)->flags & CONF_FLAGS_ENCRYPTED)
286   #define SetConfEncrypted(x)     ((x)->flags |= CONF_FLAGS_ENCRYPTED)
287   #define ClearConfEncrypted(x)   ((x)->flags &= ~CONF_FLAGS_ENCRYPTED)
274 – #define IsConfCompressed(x)     ((x)->flags & CONF_FLAGS_COMPRESSED)
275 – #define SetConfCompressed(x)    ((x)->flags |= CONF_FLAGS_COMPRESSED)
276 – #define ClearConfCompressed(x)  ((x)->flags &= ~CONF_FLAGS_COMPRESSED)
277 – #define IsConfCryptLink(x)      ((x)->flags & CONF_FLAGS_CRYPTLINK)
278 – #define SetConfCryptLink(x)     ((x)->flags |= CONF_FLAGS_CRYPTLINK)
279 – #define ClearConfCryptLink(x)   ((x)->flags &= ~CONF_FLAGS_CRYPTLINK)
288   #define IsConfAllowAutoConn(x)  ((x)->flags & CONF_FLAGS_ALLOW_AUTO_CONN)
289   #define SetConfAllowAutoConn(x) ((x)->flags |= CONF_FLAGS_ALLOW_AUTO_CONN)
290   #define ClearConfAllowAutoConn(x) ((x)->flags &= ~CONF_FLAGS_ALLOW_AUTO_CONN)
# Line 289 | Line 297 | struct CidrItem
297   #define IsConfTopicBurst(x)     ((x)->flags & CONF_FLAGS_TOPICBURST)
298   #define SetConfTopicBurst(x)    ((x)->flags |= CONF_FLAGS_TOPICBURST)
299   #define ClearConfTopicBurst(x)  ((x)->flags &= ~CONF_FLAGS_TOPICBURST)
300 + #define IsConfSSL(x)      ((x)->flags & CONF_FLAGS_SSL)
301 + #define SetConfSSL(x)     ((x)->flags |= CONF_FLAGS_SSL)
302 + #define ClearConfSSL(x)   ((x)->flags &= ~CONF_FLAGS_SSL)
303  
304   /* shared/cluster server entry types
305   * These defines are used for both shared and cluster.
306   */
307   #define SHARED_KLINE            0x0001
308 < #define SHARED_TKLINE           0x0002
309 < #define SHARED_UNKLINE          0x0004
310 < #define SHARED_XLINE            0x0008
311 < #define SHARED_TXLINE           0x0010
312 < #define SHARED_UNXLINE          0x0020
313 < #define SHARED_RESV             0x0040
314 < #define SHARED_TRESV            0x0080
315 < #define SHARED_UNRESV           0x0100
316 < #define SHARED_LOCOPS           0x0200
317 < #define SHARED_ALL              (SHARED_KLINE | SHARED_TKLINE | SHARED_UNKLINE | \
318 <                                 SHARED_XLINE | SHARED_TXLINE | SHARED_UNXLINE | \
319 <                                 SHARED_RESV | SHARED_TRESV | SHARED_UNRESV |\
309 <                                 SHARED_LOCOPS)
308 > #define SHARED_UNKLINE          0x0002
309 > #define SHARED_XLINE            0x0004
310 > #define SHARED_UNXLINE          0x0008
311 > #define SHARED_RESV             0x0010
312 > #define SHARED_UNRESV           0x0020
313 > #define SHARED_LOCOPS           0x0040
314 > #define SHARED_DLINE            0x0080
315 > #define SHARED_UNDLINE          0x0100
316 > #define SHARED_ALL              (SHARED_KLINE | SHARED_UNKLINE |\
317 >                                 SHARED_XLINE | SHARED_UNXLINE |\
318 >                                 SHARED_RESV | SHARED_UNRESV |\
319 >                                 SHARED_LOCOPS | SHARED_DLINE | SHARED_UNDLINE)
320  
321   /* gline acl entry actions */
322   #define GDENY_BLOCK             0x1
# Line 327 | Line 337 | struct config_file_entry
337  
338    char *logpath;
339    char *operlog;
330 –
331 –  char *servlink_path;
340    char *egdpool_path;
341 +  char *service_name;
342  
343    MessageFile motd;
344    MessageFile opermotd;
345    MessageFile linksfile;
346  
338 –  unsigned char compression_level;
339 –  int max_watch;
347    int gline_min_cidr;
348    int gline_min_cidr6;
342 –  int dot_in_ip6_addr;
349    int dots_in_ident;
350    int failed_oper_notice;
351    int anti_spam_exit_message_time;
352 <  int max_accept;
352 >  unsigned int max_accept;
353 >  unsigned int max_watch;
354    int max_nick_time;
355 <  int max_nick_changes;
355 >  unsigned int max_nick_changes;
356    int ts_max_delta;
357    int ts_warn_delta;
358    int anti_nick_flood;
# Line 373 | Line 380 | struct config_file_entry
380    int pace_wait_simple;
381    int gline_time;
382    int gline_logging;
376 –  int idletime;
383    int oper_only_umodes;
384    int oper_umodes;
385    int max_targets;
# Line 389 | Line 395 | struct config_file_entry
395    int ping_cookie;
396    int disable_auth;
397    int disable_remote;
392 – #ifdef HAVE_LIBCRYPTO
393 –  struct EncCapability *default_cipher_preference;
394 – #endif
398   };
399  
400   struct config_channel_entry
# Line 416 | Line 419 | struct config_channel_entry
419  
420   struct config_server_hide
421   {
422 +  char *hidden_name;
423    int flatten_links;
424    int hide_servers;
421 –  char *hidden_name;
425    int links_delay;
426    int links_disabled;
427    int hidden;
# Line 428 | Line 431 | struct config_server_hide
431  
432   struct server_info
433   {
434 +  char *sid;
435    char *name;
436    char *description;
437    char *network_name;
# Line 435 | Line 439 | struct server_info
439   #ifdef HAVE_LIBCRYPTO
440    char *rsa_private_key_file;
441    RSA *rsa_private_key;
442 <  SSL_CTX *ctx;
442 >  SSL_CTX *server_ctx;
443 >  SSL_CTX *client_ctx;
444   #endif
440 –  char *sid;
445    int hub;
446    struct irc_ssaddr ip;
447    struct irc_ssaddr ip6;
448 <  int max_clients;
448 >  unsigned int max_clients;
449    int specific_ipv4_vhost;
450    int specific_ipv6_vhost;
451    struct sockaddr_in dns_host;
# Line 458 | Line 462 | struct admin_info
462   struct logging_entry
463   {
464    unsigned int use_logging;
465 <  char operlog[PATH_MAX + 1];
462 <  char userlog[PATH_MAX + 1];
463 <  char glinelog[PATH_MAX + 1];
464 <  char ioerrlog[PATH_MAX + 1];
465 <  char klinelog[PATH_MAX + 1];
466 <  char killlog[PATH_MAX + 1];
467 <  char operspylog[PATH_MAX + 1];
468 <  char failed_operlog[PATH_MAX + 1];
465 >  unsigned int timestamp;
466   };
467  
468 < extern int ypass;
468 > extern dlink_list gdeny_items;
469   extern dlink_list class_items;
470   extern dlink_list server_items;
471   extern dlink_list cluster_items;
# Line 476 | Line 473 | extern dlink_list hub_items;
473   extern dlink_list rxconf_items;
474   extern dlink_list rkconf_items;
475   extern dlink_list leaf_items;
476 + extern dlink_list service_items;
477   extern dlink_list temporary_klines;
478   extern dlink_list temporary_dlines;
479   extern dlink_list temporary_glines;
# Line 517 | Line 515 | extern char *oper_privs_as_string(const
515   extern void split_nuh(struct split_nuh_item *);
516   extern struct ConfItem *find_matching_name_conf(ConfType, const char *,
517                                                  const char *, const char *, int);
518 < extern struct ConfItem *find_exact_name_conf(ConfType, const char *,
518 > extern struct ConfItem *find_exact_name_conf(ConfType, const struct Client *, const char *,
519                                               const char *, const char *);
520   extern void delete_conf_item(struct ConfItem *);
521   extern void report_confitem_types(struct Client *, ConfType, int);
# Line 534 | Line 532 | extern const char *get_conf_name(ConfTyp
532   extern int rehash(int);
533   extern int conf_add_server(struct ConfItem *, const char *);
534   extern void conf_add_class_to_conf(struct ConfItem *, const char *);
537 – extern void conf_add_d_conf(struct AccessItem *);
535  
536   /* XXX consider moving these into csvlib.h */
537   extern void parse_csv_file(FBFILE *, ConfType);
# Line 553 | Line 550 | extern int valid_comment(struct Client *
550  
551   #define TK_SECONDS 0
552   #define TK_MINUTES 1
553 < extern time_t valid_tkline(char *, int);
553 > extern time_t valid_tkline(const char *, int);
554   extern int match_conf_password(const char *, const struct AccessItem *);
555  
556   #define NOT_AUTHORIZED    (-1)
# Line 569 | Line 566 | extern void cluster_a_line(struct Client
566   extern void rebuild_cidr_class(struct ConfItem *, struct ClassItem *);
567  
568   /* XXX **/
569 < extern int yylex(void);
569 > //extern int yylex(void);
570  
571   #endif /* INCLUDED_s_conf_h */

Diff Legend

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