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 56 by michael, Mon Oct 3 11:33:30 2005 UTC vs.
ircd-hybrid-8/include/conf.h (file contents), Revision 1353 by michael, Sun Apr 15 18:35: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 24 | Line 24
24  
25   #ifndef INCLUDED_s_conf_h
26   #define INCLUDED_s_conf_h
27 < #include "setup.h"
27 > #include "config.h"
28   #ifdef HAVE_LIBCRYPTO
29   #include <openssl/rsa.h>
30   #endif
31 – #include "fileio.h"             /* FBFILE */
31   #include "ircd_defs.h"
32   #include "motd.h"               /* MessageFile */
33   #include "client.h"
34   #include "hook.h"
35 < #include "pcre.h"
35 >
36  
37   struct Client;
39 – struct DNSReply;
40 – struct hostent;
38  
42 – extern FBFILE *conf_fbfile_in;
39   extern struct Callback *client_check_cb;
40  
41 + struct conf_parser_context
42 + {
43 +  unsigned int boot;
44 +  unsigned int pass;
45 +  FILE *conf_file;
46 + };
47 +
48 + extern struct conf_parser_context conf_parser_ctx;
49 +
50   typedef enum
51   {  
52    CONF_TYPE,
# Line 62 | Line 67 | typedef enum
67    GLINE_TYPE,
68    CRESV_TYPE,    
69    NRESV_TYPE,
70 <  GDENY_TYPE
70 >  GDENY_TYPE,
71 >  SERVICE_TYPE
72   } ConfType;
73  
74 + struct split_nuh_item
75 + {
76 +  dlink_node node;
77 +
78 +  char *nuhmask;
79 +  char *nickptr;
80 +  char *userptr;
81 +  char *hostptr;
82 +
83 +  size_t nicksize;
84 +  size_t usersize;
85 +  size_t hostsize;
86 + };
87 +
88   struct ConfItem
89   {
90 +  dlink_node node;      /* link into known ConfItems of this type */
91 +
92    char *name;           /* Primary key */
93 <  pcre *regexpname;
72 <  dlink_node node;      /* link into known ConfItems of this type */
93 >  void *regexpname;
94    unsigned int flags;
95    ConfType type;
96   };
# Line 93 | Line 114 | struct MatchItem
114   struct AccessItem
115   {
116    dlink_node node;
117 +  unsigned int     dns_failed;
118 +  unsigned int     dns_pending;
119    unsigned int     status;   /* If CONF_ILLEGAL, delete when no clients */
120    unsigned int     flags;
121    unsigned int     modes;
122 +  unsigned int     port;
123    int              clients;  /* Number of *LOCAL* clients using this */
124 +  int              bits;
125 +  int              type;
126    struct irc_ssaddr my_ipnum; /* ip to bind to for outgoing connect */
127    struct irc_ssaddr ipnum;      /* ip to connect to */
128    char *           host;     /* host part of user@host */
# Line 105 | Line 131 | struct AccessItem
131    char *           reason;
132    char *           oper_reason;
133    char *           user;     /* user part of user@host */
108 –  int              port;
109 –  char *           fakename;   /* Mask name */
134    time_t           hold;     /* Hold action until this time (calendar time) */
135    struct ConfItem *class_ptr;  /* Class of connection */
112 –  struct DNSQuery* dns_query;
136    int              aftype;
137   #ifdef HAVE_LIBCRYPTO
138 +  /* certs */
139 +  char *cipher_list;
140    char *           rsa_public_key_file;
141    RSA *            rsa_public_key;
117 –  struct EncCapability *cipher_preference;
142   #endif
143 <  pcre *regexuser;
144 <  pcre *regexhost;
143 >  void *regexuser;
144 >  void *regexhost;
145   };
146  
147   struct ClassItem
148   {
149 <  long max_sendq;
149 >  dlink_list list_ipv4;         /* base of per cidr ipv4 client link list */
150 >  dlink_list list_ipv6;         /* base of per cidr ipv6 client link list */
151 >  unsigned int max_sendq;
152    int con_freq;
153    int ping_freq;
154    int ping_warning;
# Line 135 | Line 161 | struct ClassItem
161    int cidr_bitlen_ipv4;
162    int cidr_bitlen_ipv6;
163    int number_per_cidr;
164 <  dlink_list list_ipv4;         /* base of per cidr ipv4 client link list */
139 <  dlink_list list_ipv6;         /* base of per cidr ipv6 client link list */
164 >  int active;
165   };
166  
167   struct CidrItem
168   {
169 +  dlink_node node;
170    struct irc_ssaddr mask;
171    int number_on_this_cidr;
146 –  dlink_node node;
172   };
173  
174   #define ConFreq(x)      ((x)->con_freq)
# Line 181 | Line 206 | struct CidrItem
206   #define CONF_ULINE              0x00002000
207   #define CONF_EXEMPTDLINE        0x00004000
208   #define CONF_GLINE              0x00008000
209 + #define CONF_SERVICE            0x00010000
210  
211   #define CONF_SERVER_MASK       CONF_SERVER
212   #define CONF_CLIENT_MASK       (CONF_CLIENT | CONF_OPERATOR | CONF_SERVER_MASK)
# Line 214 | Line 240 | struct CidrItem
240   #define CONF_FLAGS_LIMIT_IP             0x00000002
241   #define CONF_FLAGS_NO_TILDE             0x00000004
242   #define CONF_FLAGS_NEED_IDENTD          0x00000008
243 < /*                                      0x00000010 */
244 < #define CONF_FLAGS_NOMATCH_IP           0x00000020
245 < #define CONF_FLAGS_EXEMPTKLINE          0x00000040
246 < #define CONF_FLAGS_NOLIMIT              0x00000080
247 < #define CONF_FLAGS_IDLE_LINED           0x00000100
248 < #define CONF_FLAGS_SPOOF_IP             0x00000200
249 < #define CONF_FLAGS_SPOOF_NOTICE         0x00000400
250 < #define CONF_FLAGS_REDIR                0x00000800
251 < #define CONF_FLAGS_EXEMPTGLINE          0x00001000
226 < #define CONF_FLAGS_RESTRICTED           0x00002000
227 < #define CONF_FLAGS_CAN_FLOOD            0x00100000
228 < #define CONF_FLAGS_NEED_PASSWORD        0x00200000
243 > #define CONF_FLAGS_NOMATCH_IP           0x00000010
244 > #define CONF_FLAGS_EXEMPTKLINE          0x00000020
245 > #define CONF_FLAGS_NOLIMIT              0x00000040
246 > #define CONF_FLAGS_SPOOF_IP             0x00000080
247 > #define CONF_FLAGS_SPOOF_NOTICE         0x00000100
248 > #define CONF_FLAGS_REDIR                0x00000200
249 > #define CONF_FLAGS_EXEMPTGLINE          0x00000400
250 > #define CONF_FLAGS_CAN_FLOOD            0x00000800
251 > #define CONF_FLAGS_NEED_PASSWORD        0x00001000
252   /* server flags */
253 < #define CONF_FLAGS_ALLOW_AUTO_CONN      0x00004000
254 < #define CONF_FLAGS_LAZY_LINK            0x00008000
255 < #define CONF_FLAGS_ENCRYPTED            0x00010000
256 < #define CONF_FLAGS_COMPRESSED           0x00020000
257 < #define CONF_FLAGS_TEMPORARY            0x00040000
258 < #define CONF_FLAGS_CRYPTLINK            0x00080000
259 < #define CONF_FLAGS_BURST_AWAY           0x00400000
237 < #define CONF_FLAGS_EXEMPTRESV           0x00800000
238 < #define CONF_FLAGS_TOPICBURST           0x01000000
253 > #define CONF_FLAGS_ALLOW_AUTO_CONN      0x00002000
254 > #define CONF_FLAGS_ENCRYPTED            0x00004000
255 > #define CONF_FLAGS_TEMPORARY            0x00008000
256 > #define CONF_FLAGS_BURST_AWAY           0x00010000
257 > #define CONF_FLAGS_EXEMPTRESV           0x00020000
258 > #define CONF_FLAGS_TOPICBURST           0x00040000
259 > #define CONF_FLAGS_SSL                  0x00080000
260  
261   /* Macros for struct AccessItem */
262   #define IsLimitIp(x)            ((x)->flags & CONF_FLAGS_LIMIT_IP)
# Line 248 | Line 269 | struct CidrItem
269   #define IsConfExemptLimits(x)   ((x)->flags & CONF_FLAGS_NOLIMIT)
270   #define IsConfExemptGline(x)    ((x)->flags & CONF_FLAGS_EXEMPTGLINE)
271   #define IsConfExemptResv(x)     ((x)->flags & CONF_FLAGS_EXEMPTRESV)
251 – #define IsConfIdlelined(x)      ((x)->flags & CONF_FLAGS_IDLE_LINED)
272   #define IsConfDoIdentd(x)       ((x)->flags & CONF_FLAGS_DO_IDENTD)
273   #define IsConfDoSpoofIp(x)      ((x)->flags & CONF_FLAGS_SPOOF_IP)
274   #define IsConfSpoofNotice(x)    ((x)->flags & CONF_FLAGS_SPOOF_NOTICE)
255 – #define IsConfRestricted(x)     ((x)->flags & CONF_FLAGS_RESTRICTED)
275   #define IsConfEncrypted(x)      ((x)->flags & CONF_FLAGS_ENCRYPTED)
276   #define SetConfEncrypted(x)     ((x)->flags |= CONF_FLAGS_ENCRYPTED)
277   #define ClearConfEncrypted(x)   ((x)->flags &= ~CONF_FLAGS_ENCRYPTED)
259 – #define IsConfCompressed(x)     ((x)->flags & CONF_FLAGS_COMPRESSED)
260 – #define SetConfCompressed(x)    ((x)->flags |= CONF_FLAGS_COMPRESSED)
261 – #define ClearConfCompressed(x)  ((x)->flags &= ~CONF_FLAGS_COMPRESSED)
262 – #define IsConfCryptLink(x)      ((x)->flags & CONF_FLAGS_CRYPTLINK)
263 – #define SetConfCryptLink(x)     ((x)->flags |= CONF_FLAGS_CRYPTLINK)
264 – #define ClearConfCryptLink(x)   ((x)->flags &= ~CONF_FLAGS_CRYPTLINK)
265 – #define IsConfLazyLink(x)       ((x)->flags & CONF_FLAGS_LAZY_LINK)
266 – #define SetConfLazyLink(x)      ((x)->flags = CONF_FLAGS_LAZY_LINK)
267 – #define ClearConfLazyLink(x)    ((x)->flags &= ~CONF_FLAGS_LAZY_LINK)
278   #define IsConfAllowAutoConn(x)  ((x)->flags & CONF_FLAGS_ALLOW_AUTO_CONN)
279   #define SetConfAllowAutoConn(x) ((x)->flags |= CONF_FLAGS_ALLOW_AUTO_CONN)
280   #define ClearConfAllowAutoConn(x) ((x)->flags &= ~CONF_FLAGS_ALLOW_AUTO_CONN)
# Line 277 | Line 287 | struct CidrItem
287   #define IsConfTopicBurst(x)     ((x)->flags & CONF_FLAGS_TOPICBURST)
288   #define SetConfTopicBurst(x)    ((x)->flags |= CONF_FLAGS_TOPICBURST)
289   #define ClearConfTopicBurst(x)  ((x)->flags &= ~CONF_FLAGS_TOPICBURST)
290 + #define IsConfSSL(x)      ((x)->flags & CONF_FLAGS_SSL)
291 + #define SetConfSSL(x)     ((x)->flags |= CONF_FLAGS_SSL)
292 + #define ClearConfSSL(x)   ((x)->flags &= ~CONF_FLAGS_SSL)
293  
294   /* shared/cluster server entry types
295   * These defines are used for both shared and cluster.
296   */
297   #define SHARED_KLINE            0x0001
298 < #define SHARED_TKLINE           0x0002
299 < #define SHARED_UNKLINE          0x0004
300 < #define SHARED_XLINE            0x0008
301 < #define SHARED_TXLINE           0x0010
302 < #define SHARED_UNXLINE          0x0020
303 < #define SHARED_RESV             0x0040
304 < #define SHARED_TRESV            0x0080
305 < #define SHARED_UNRESV           0x0100
306 < #define SHARED_LOCOPS           0x0200
307 < #define SHARED_ALL              (SHARED_KLINE | SHARED_TKLINE | SHARED_UNKLINE | \
308 <                                 SHARED_XLINE | SHARED_TXLINE | SHARED_UNXLINE | \
309 <                                 SHARED_RESV | SHARED_TRESV | SHARED_UNRESV |\
297 <                                 SHARED_LOCOPS)
298 > #define SHARED_UNKLINE          0x0002
299 > #define SHARED_XLINE            0x0004
300 > #define SHARED_UNXLINE          0x0008
301 > #define SHARED_RESV             0x0010
302 > #define SHARED_UNRESV           0x0020
303 > #define SHARED_LOCOPS           0x0040
304 > #define SHARED_DLINE            0x0080
305 > #define SHARED_UNDLINE          0x0100
306 > #define SHARED_ALL              (SHARED_KLINE | SHARED_UNKLINE |\
307 >                                 SHARED_XLINE | SHARED_UNXLINE |\
308 >                                 SHARED_RESV | SHARED_UNRESV |\
309 >                                 SHARED_LOCOPS | SHARED_DLINE | SHARED_UNDLINE)
310  
311   /* gline acl entry actions */
312   #define GDENY_BLOCK             0x1
# Line 315 | Line 327 | struct config_file_entry
327  
328    char *logpath;
329    char *operlog;
318 –
319 –  char *servlink_path;
330    char *egdpool_path;
331 +  char *service_name;
332  
333    MessageFile motd;
334    MessageFile opermotd;
335    MessageFile linksfile;
336  
326 –  unsigned char compression_level;
337    int gline_min_cidr;
338    int gline_min_cidr6;
329 –  int dot_in_ip6_addr;
339    int dots_in_ident;
340    int failed_oper_notice;
341    int anti_spam_exit_message_time;
342 <  int max_accept;
342 >  unsigned int max_accept;
343 >  unsigned int max_watch;
344    int max_nick_time;
345 <  int max_nick_changes;
345 >  unsigned int max_nick_changes;
346    int ts_max_delta;
347    int ts_warn_delta;
348    int anti_nick_flood;
349    int kline_with_reason;
350    int warn_no_nline;
351    int invisible_on_connect;
352 +  int stats_e_disabled;
353    int stats_o_oper_only;
354    int stats_k_oper_only;
355    int stats_i_oper_only;
# Line 359 | Line 370 | struct config_file_entry
370    int pace_wait_simple;
371    int gline_time;
372    int gline_logging;
362 –  int idletime;
373    int oper_only_umodes;
374    int oper_umodes;
375    int max_targets;
# Line 375 | Line 385 | struct config_file_entry
385    int ping_cookie;
386    int disable_auth;
387    int disable_remote;
378 – #ifdef HAVE_LIBCRYPTO
379 –  struct EncCapability *default_cipher_preference;
380 – #endif
388   };
389  
390   struct config_channel_entry
391   {
392 +  int disable_fake_channels;
393    int restrict_channels;
394    int disable_local_channels;
395    int use_except;
# Line 389 | Line 397 | struct config_channel_entry
397    int use_knock;
398    int knock_delay;
399    int knock_delay_channel;
392 –  int invite_ops_only;
400    unsigned int max_bans;
401    unsigned int max_chans_per_user;
402    int no_create_on_split;
# Line 402 | Line 409 | struct config_channel_entry
409  
410   struct config_server_hide
411   {
412 +  char *hidden_name;
413    int flatten_links;
414    int hide_servers;
407 –  char *hidden_name;
415    int links_delay;
416    int links_disabled;
417    int hidden;
# Line 414 | Line 421 | struct config_server_hide
421  
422   struct server_info
423   {
424 +  char *sid;
425    char *name;
426    char *description;
427    char *network_name;
# Line 421 | Line 429 | struct server_info
429   #ifdef HAVE_LIBCRYPTO
430    char *rsa_private_key_file;
431    RSA *rsa_private_key;
432 <  SSL_CTX *ctx;
432 >  SSL_CTX *server_ctx;
433 >  SSL_CTX *client_ctx;
434   #endif
426 –  char *sid;
435    int hub;
436    struct irc_ssaddr ip;
437    struct irc_ssaddr ip6;
438 <  int max_clients;
438 >  unsigned int max_clients;
439    int specific_ipv4_vhost;
440    int specific_ipv6_vhost;
441    struct sockaddr_in dns_host;
# Line 444 | Line 452 | struct admin_info
452   struct logging_entry
453   {
454    unsigned int use_logging;
447 –  char operlog[PATH_MAX + 1];
448 –  char userlog[PATH_MAX + 1];
449 –  char glinelog[PATH_MAX + 1];
450 –  char ioerrlog[PATH_MAX + 1];
451 –  char klinelog[PATH_MAX + 1];
452 –  char killlog[PATH_MAX + 1];
453 –  char operspylog[PATH_MAX + 1];
454 –  char failed_operlog[PATH_MAX + 1];
455   };
456  
457 < extern unsigned int scount;
458 < extern int ypass;
457 > extern dlink_list gdeny_items;
458   extern dlink_list class_items;
459   extern dlink_list server_items;
460   extern dlink_list cluster_items;
# Line 463 | Line 462 | extern dlink_list hub_items;
462   extern dlink_list rxconf_items;
463   extern dlink_list rkconf_items;
464   extern dlink_list leaf_items;
465 + extern dlink_list service_items;
466   extern dlink_list temporary_klines;
467   extern dlink_list temporary_dlines;
468   extern dlink_list temporary_glines;
# Line 478 | Line 478 | extern struct admin_info AdminInfo;
478   extern int valid_wild_card(struct Client *, int, int, ...);
479   /* End GLOBAL section */
480  
481 < extern unsigned long get_sendq(struct Client *);
481 > extern unsigned int get_sendq(struct Client *);
482   extern const char *get_client_class(struct Client *);
483   extern int get_client_ping(struct Client *, int *);
484   extern void check_class(void);
485   extern void init_class(void);
486   extern struct ConfItem *find_class(const char *);
487   extern void init_ip_hash_table(void);
488 < extern void count_ip_hash(int *, unsigned long *);
488 > extern void count_ip_hash(unsigned int *, uint64_t *);
489   extern void remove_one_ip(struct irc_ssaddr *);
490   extern struct ConfItem *make_conf_item(ConfType type);
491   extern void free_access_item(struct AccessItem *);
# Line 501 | Line 501 | extern struct AccessItem *find_kill(stru
501   extern struct AccessItem *find_gline(struct Client *);
502   extern int conf_connect_allowed(struct irc_ssaddr *, int);
503   extern char *oper_privs_as_string(const unsigned int);
504 < extern void split_nuh(char *mask, char **nick, char **user, char **host);
504 > extern void split_nuh(struct split_nuh_item *);
505   extern struct ConfItem *find_matching_name_conf(ConfType, const char *,
506                                                  const char *, const char *, int);
507 < extern struct ConfItem *find_exact_name_conf(ConfType, const char *,
507 > extern struct ConfItem *find_exact_name_conf(ConfType, const struct Client *, const char *,
508                                               const char *, const char *);
509   extern void delete_conf_item(struct ConfItem *);
510   extern void report_confitem_types(struct Client *, ConfType, int);
511   extern void yyerror(const char *);
512 – extern int conf_yy_fatal_error(const char *);
513 – extern int conf_fbgets(char *, unsigned int, FBFILE *);
512   extern void write_conf_line(struct Client *, struct ConfItem *,
513                              const char *, time_t);
514   extern int remove_conf_line(ConfType, struct Client *, const char *,
# Line 519 | Line 517 | extern void add_temp_line(struct ConfIte
517   extern void cleanup_tklines(void *);
518   extern const char *get_conf_name(ConfType);
519   extern int rehash(int);
520 < extern int conf_add_server(struct ConfItem *, unsigned int, const char *);
520 > extern int conf_add_server(struct ConfItem *, const char *);
521   extern void conf_add_class_to_conf(struct ConfItem *, const char *);
524 – extern void conf_add_d_conf(struct AccessItem *);
522  
523   /* XXX consider moving these into csvlib.h */
524 < extern void parse_csv_file(FBFILE *, ConfType);
524 > extern void parse_csv_file(FILE *, ConfType);
525  
526   extern char *get_oper_name(const struct Client *);
527  
# Line 537 | Line 534 | extern int parse_aline(const char *, str
534                         int, char **, char **, time_t *, char **, char **);
535   extern int valid_comment(struct Client *, char *, int);
536  
540 – /* XXX */
541 – extern int yylex(void);
537  
538   #define TK_SECONDS 0
539   #define TK_MINUTES 1
540 < extern time_t valid_tkline(char *, int);
540 > extern time_t valid_tkline(const char *, int);
541   extern int match_conf_password(const char *, const struct AccessItem *);
542  
543   #define NOT_AUTHORIZED    (-1)
544 < #define IRCD_SOCKET_ERROR (-2)
545 < #define I_LINE_FULL       (-3)
546 < #define TOO_MANY          (-4)
547 < #define BANNED_CLIENT     (-5)
553 < #define TOO_FAST          (-6)
544 > #define I_LINE_FULL       (-2)
545 > #define TOO_MANY          (-3)
546 > #define BANNED_CLIENT     (-4)
547 > #define TOO_FAST          (-5)
548  
549   #define CLEANUP_TKLINES_TIME 60
550  
551   extern void cluster_a_line(struct Client *,
552                             const char *, int, int, const char *,...);
553   extern void rebuild_cidr_class(struct ConfItem *, struct ClassItem *);
560 –
554   #endif /* INCLUDED_s_conf_h */

Diff Legend

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