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 1005 by michael, Mon Aug 31 23:07:43 2009 UTC vs.
ircd-hybrid-8/include/conf.h (file contents), Revision 1379 by michael, Mon Apr 30 19:49:57 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 28 | Line 28
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"
36 – #include "pcre.h"
35  
36  
39 – #define CONF_SERVER_INFO_TLS_VERSION_SSLV3 0x1
40 – #define CONF_SERVER_INFO_TLS_VERSION_TLSV1 0x2
41 –
37   struct Client;
38  
39   extern struct Callback *client_check_cb;
# Line 47 | Line 42 | struct conf_parser_context
42   {
43    unsigned int boot;
44    unsigned int pass;
45 <  FBFILE *conf_file;
45 >  FILE *conf_file;
46   };
47  
48   extern struct conf_parser_context conf_parser_ctx;
# Line 72 | 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
# Line 91 | Line 87 | struct split_nuh_item
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;
96 <  dlink_node node;      /* link into known ConfItems of this type */
93 >  void *regexpname;
94    unsigned int flags;
95    ConfType type;
96   };
# Line 122 | Line 119 | struct AccessItem
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 131 | Line 131 | struct AccessItem
131    char *           reason;
132    char *           oper_reason;
133    char *           user;     /* user part of user@host */
134 –  int              port;
135 –  char *           fakename;   /* Mask name */
134    time_t           hold;     /* Hold action until this time (calendar time) */
135    struct ConfItem *class_ptr;  /* Class of connection */
136    int              aftype;
137   #ifdef HAVE_LIBCRYPTO
138 +  /* certs */
139 +  char *cipher_list;
140    char *           rsa_public_key_file;
141    RSA *            rsa_public_key;
142 –  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 +  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;
# Line 160 | Line 161 | struct ClassItem
161    int cidr_bitlen_ipv4;
162    int cidr_bitlen_ipv6;
163    int number_per_cidr;
163 –  dlink_list list_ipv4;         /* base of per cidr ipv4 client link list */
164 –  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;
172 –  dlink_node node;
172   };
173  
175 – #define ConFreq(x)      ((x)->con_freq)
176 – #define PingFreq(x)     ((x)->ping_freq)
177 – #define PingWarning(x)  ((x)->ping_warning)
178 – #define MaxTotal(x)     ((x)->max_total)
179 – #define MaxGlobal(x)    ((x)->max_global)
180 – #define MaxLocal(x)     ((x)->max_local)
181 – #define MaxIdent(x)     ((x)->max_ident)
182 – #define MaxPerIp(x)     ((x)->max_perip)
183 – #define MaxSendq(x)     ((x)->max_sendq)
184 – #define CurrUserCount(x) ((x)->curr_user_count)
185 – #define CidrBitlenIPV4(x)       ((x)->cidr_bitlen_ipv4)
186 – #define CidrBitlenIPV6(x)       ((x)->cidr_bitlen_ipv6)
187 – #define NumberPerCidr(x) ((x)->number_per_cidr)
188 –
189 – #define ClassPtr(x)      ((x)->class_ptr)
190 –
174  
175   #define CONF_ILLEGAL            0x80000000
176   #define CONF_RESERVED           0x00000001
177   #define CONF_CLIENT             0x00000002
178   #define CONF_SERVER             0x00000004
179   #define CONF_OPERATOR           0x00000008
180 < #define CONF_KILL               0x00000010
198 < #define CONF_KLINE              CONF_KILL
180 > #define CONF_KLINE              0x00000010
181   #define CONF_CLASS              0x00000020
182   #define CONF_LEAF               0x00000040
183   #define CONF_LISTEN_PORT        0x00000080
# Line 207 | Line 189 | struct CidrItem
189   #define CONF_ULINE              0x00002000
190   #define CONF_EXEMPTDLINE        0x00004000
191   #define CONF_GLINE              0x00008000
192 + #define CONF_SERVICE            0x00010000
193  
194   #define CONF_SERVER_MASK       CONF_SERVER
195   #define CONF_CLIENT_MASK       (CONF_CLIENT | CONF_OPERATOR | CONF_SERVER_MASK)
# Line 225 | Line 208 | struct CidrItem
208   #define IsConfLeaf(x)           ((x)->status == CONF_LEAF)
209   #define SetConfLeaf(x)          ((x)->status = CONF_LEAF)
210   #define IsConfHubOrLeaf(x)      ((x)->status & (CONF_HUB|CONF_LEAF))
211 < #define IsConfKill(x)           ((x)->status == CONF_KILL)
211 > #define IsConfKill(x)           ((x)->status == CONF_KLINE)
212   #define IsConfClient(x)         ((x)->status & CONF_CLIENT)
213   #define IsConfTypeOfClient(x)   ((x)->status & CONF_CLIENT_MASK)
214   #define IsConfUline(x)          ((x)->status & CONF_ULINE)
# Line 240 | Line 223 | struct CidrItem
223   #define CONF_FLAGS_LIMIT_IP             0x00000002
224   #define CONF_FLAGS_NO_TILDE             0x00000004
225   #define CONF_FLAGS_NEED_IDENTD          0x00000008
226 < /*                                      0x00000010 */
227 < #define CONF_FLAGS_NOMATCH_IP           0x00000020
228 < #define CONF_FLAGS_EXEMPTKLINE          0x00000040
229 < #define CONF_FLAGS_NOLIMIT              0x00000080
230 < #define CONF_FLAGS_IDLE_LINED           0x00000100
231 < #define CONF_FLAGS_SPOOF_IP             0x00000200
232 < #define CONF_FLAGS_SPOOF_NOTICE         0x00000400
233 < #define CONF_FLAGS_REDIR                0x00000800
234 < #define CONF_FLAGS_EXEMPTGLINE          0x00001000
252 < #define CONF_FLAGS_RESTRICTED           0x00002000
253 < #define CONF_FLAGS_CAN_FLOOD            0x00100000
254 < #define CONF_FLAGS_NEED_PASSWORD        0x00200000
226 > #define CONF_FLAGS_NOMATCH_IP           0x00000010
227 > #define CONF_FLAGS_EXEMPTKLINE          0x00000020
228 > #define CONF_FLAGS_NOLIMIT              0x00000040
229 > #define CONF_FLAGS_SPOOF_IP             0x00000080
230 > #define CONF_FLAGS_SPOOF_NOTICE         0x00000100
231 > #define CONF_FLAGS_REDIR                0x00000200
232 > #define CONF_FLAGS_EXEMPTGLINE          0x00000400
233 > #define CONF_FLAGS_CAN_FLOOD            0x00000800
234 > #define CONF_FLAGS_NEED_PASSWORD        0x00001000
235   /* server flags */
236 < #define CONF_FLAGS_ALLOW_AUTO_CONN      0x00004000
237 < #define CONF_FLAGS_LAZY_LINK            0x00008000
238 < #define CONF_FLAGS_ENCRYPTED            0x00010000
239 < #define CONF_FLAGS_COMPRESSED           0x00020000
240 < #define CONF_FLAGS_TEMPORARY            0x00040000
241 < #define CONF_FLAGS_CRYPTLINK            0x00080000
242 < #define CONF_FLAGS_BURST_AWAY           0x00400000
263 < #define CONF_FLAGS_EXEMPTRESV           0x00800000
264 < #define CONF_FLAGS_TOPICBURST           0x01000000
236 > #define CONF_FLAGS_ALLOW_AUTO_CONN      0x00002000
237 > #define CONF_FLAGS_ENCRYPTED            0x00004000
238 > #define CONF_FLAGS_TEMPORARY            0x00008000
239 > #define CONF_FLAGS_BURST_AWAY           0x00010000
240 > #define CONF_FLAGS_EXEMPTRESV           0x00020000
241 > #define CONF_FLAGS_TOPICBURST           0x00040000
242 > #define CONF_FLAGS_SSL                  0x00080000
243  
244   /* Macros for struct AccessItem */
245   #define IsLimitIp(x)            ((x)->flags & CONF_FLAGS_LIMIT_IP)
# Line 274 | Line 252 | struct CidrItem
252   #define IsConfExemptLimits(x)   ((x)->flags & CONF_FLAGS_NOLIMIT)
253   #define IsConfExemptGline(x)    ((x)->flags & CONF_FLAGS_EXEMPTGLINE)
254   #define IsConfExemptResv(x)     ((x)->flags & CONF_FLAGS_EXEMPTRESV)
277 – #define IsConfIdlelined(x)      ((x)->flags & CONF_FLAGS_IDLE_LINED)
255   #define IsConfDoIdentd(x)       ((x)->flags & CONF_FLAGS_DO_IDENTD)
256   #define IsConfDoSpoofIp(x)      ((x)->flags & CONF_FLAGS_SPOOF_IP)
257   #define IsConfSpoofNotice(x)    ((x)->flags & CONF_FLAGS_SPOOF_NOTICE)
281 – #define IsConfRestricted(x)     ((x)->flags & CONF_FLAGS_RESTRICTED)
258   #define IsConfEncrypted(x)      ((x)->flags & CONF_FLAGS_ENCRYPTED)
259   #define SetConfEncrypted(x)     ((x)->flags |= CONF_FLAGS_ENCRYPTED)
260   #define ClearConfEncrypted(x)   ((x)->flags &= ~CONF_FLAGS_ENCRYPTED)
285 – #define IsConfCompressed(x)     ((x)->flags & CONF_FLAGS_COMPRESSED)
286 – #define SetConfCompressed(x)    ((x)->flags |= CONF_FLAGS_COMPRESSED)
287 – #define ClearConfCompressed(x)  ((x)->flags &= ~CONF_FLAGS_COMPRESSED)
288 – #define IsConfCryptLink(x)      ((x)->flags & CONF_FLAGS_CRYPTLINK)
289 – #define SetConfCryptLink(x)     ((x)->flags |= CONF_FLAGS_CRYPTLINK)
290 – #define ClearConfCryptLink(x)   ((x)->flags &= ~CONF_FLAGS_CRYPTLINK)
261   #define IsConfAllowAutoConn(x)  ((x)->flags & CONF_FLAGS_ALLOW_AUTO_CONN)
262   #define SetConfAllowAutoConn(x) ((x)->flags |= CONF_FLAGS_ALLOW_AUTO_CONN)
263   #define ClearConfAllowAutoConn(x) ((x)->flags &= ~CONF_FLAGS_ALLOW_AUTO_CONN)
# Line 300 | Line 270 | struct CidrItem
270   #define IsConfTopicBurst(x)     ((x)->flags & CONF_FLAGS_TOPICBURST)
271   #define SetConfTopicBurst(x)    ((x)->flags |= CONF_FLAGS_TOPICBURST)
272   #define ClearConfTopicBurst(x)  ((x)->flags &= ~CONF_FLAGS_TOPICBURST)
273 + #define IsConfSSL(x)      ((x)->flags & CONF_FLAGS_SSL)
274 + #define SetConfSSL(x)     ((x)->flags |= CONF_FLAGS_SSL)
275 + #define ClearConfSSL(x)   ((x)->flags &= ~CONF_FLAGS_SSL)
276  
277   /* shared/cluster server entry types
278   * These defines are used for both shared and cluster.
279   */
280   #define SHARED_KLINE            0x0001
281 < #define SHARED_TKLINE           0x0002
282 < #define SHARED_UNKLINE          0x0004
283 < #define SHARED_XLINE            0x0008
284 < #define SHARED_TXLINE           0x0010
285 < #define SHARED_UNXLINE          0x0020
286 < #define SHARED_RESV             0x0040
287 < #define SHARED_TRESV            0x0080
288 < #define SHARED_UNRESV           0x0100
289 < #define SHARED_LOCOPS           0x0200
290 < #define SHARED_ALL              (SHARED_KLINE | SHARED_TKLINE | SHARED_UNKLINE | \
291 <                                 SHARED_XLINE | SHARED_TXLINE | SHARED_UNXLINE | \
292 <                                 SHARED_RESV | SHARED_TRESV | SHARED_UNRESV |\
320 <                                 SHARED_LOCOPS)
281 > #define SHARED_UNKLINE          0x0002
282 > #define SHARED_XLINE            0x0004
283 > #define SHARED_UNXLINE          0x0008
284 > #define SHARED_RESV             0x0010
285 > #define SHARED_UNRESV           0x0020
286 > #define SHARED_LOCOPS           0x0040
287 > #define SHARED_DLINE            0x0080
288 > #define SHARED_UNDLINE          0x0100
289 > #define SHARED_ALL              (SHARED_KLINE | SHARED_UNKLINE |\
290 >                                 SHARED_XLINE | SHARED_UNXLINE |\
291 >                                 SHARED_RESV | SHARED_UNRESV |\
292 >                                 SHARED_LOCOPS | SHARED_DLINE | SHARED_UNDLINE)
293  
294   /* gline acl entry actions */
295   #define GDENY_BLOCK             0x1
# Line 336 | Line 308 | struct config_file_entry
308    const char *cresvfile;
309    const char *nresvfile;
310  
339 –  char *logpath;
340 –  char *operlog;
341 –
342 –  char *servlink_path;
311    char *egdpool_path;
312 +  char *service_name;
313  
314    MessageFile motd;
315    MessageFile opermotd;
316    MessageFile linksfile;
317  
349 –  unsigned char compression_level;
318    int gline_min_cidr;
319    int gline_min_cidr6;
352 –  int dot_in_ip6_addr;
320    int dots_in_ident;
321    int failed_oper_notice;
322    int anti_spam_exit_message_time;
# Line 384 | Line 351 | struct config_file_entry
351    int pace_wait_simple;
352    int gline_time;
353    int gline_logging;
387 –  int idletime;
354    int oper_only_umodes;
355    int oper_umodes;
356    int max_targets;
# Line 400 | Line 366 | struct config_file_entry
366    int ping_cookie;
367    int disable_auth;
368    int disable_remote;
403 – #ifdef HAVE_LIBCRYPTO
404 –  struct EncCapability *default_cipher_preference;
405 – #endif
369   };
370  
371   struct config_channel_entry
# Line 427 | Line 390 | struct config_channel_entry
390  
391   struct config_server_hide
392   {
393 +  char *hidden_name;
394    int flatten_links;
395    int hide_servers;
432 –  char *hidden_name;
396    int links_delay;
397    int links_disabled;
398    int hidden;
# Line 439 | Line 402 | struct config_server_hide
402  
403   struct server_info
404   {
405 +  char *sid;
406    char *name;
407    char *description;
408    char *network_name;
# Line 448 | Line 412 | struct server_info
412    RSA *rsa_private_key;
413    SSL_CTX *server_ctx;
414    SSL_CTX *client_ctx;
451 –  unsigned int tls_version;
415   #endif
453 –  char *sid;
416    int hub;
417    struct irc_ssaddr ip;
418    struct irc_ssaddr ip6;
419 <  int max_clients;
419 >  unsigned int max_clients;
420    int specific_ipv4_vhost;
421    int specific_ipv6_vhost;
422    struct sockaddr_in dns_host;
# Line 471 | Line 433 | struct admin_info
433   struct logging_entry
434   {
435    unsigned int use_logging;
474 –  char operlog[PATH_MAX + 1];
475 –  char userlog[PATH_MAX + 1];
476 –  char glinelog[PATH_MAX + 1];
477 –  char ioerrlog[PATH_MAX + 1];
478 –  char klinelog[PATH_MAX + 1];
479 –  char killlog[PATH_MAX + 1];
480 –  char operspylog[PATH_MAX + 1];
481 –  char failed_operlog[PATH_MAX + 1];
436   };
437  
438 + extern dlink_list gdeny_items;
439   extern dlink_list class_items;
440   extern dlink_list server_items;
441   extern dlink_list cluster_items;
# Line 488 | Line 443 | extern dlink_list hub_items;
443   extern dlink_list rxconf_items;
444   extern dlink_list rkconf_items;
445   extern dlink_list leaf_items;
446 < extern dlink_list temporary_klines;
492 < extern dlink_list temporary_dlines;
493 < extern dlink_list temporary_glines;
446 > extern dlink_list service_items;
447   extern dlink_list temporary_xlines;
495 – extern dlink_list temporary_rxlines;
496 – extern dlink_list temporary_rklines;
448   extern struct logging_entry ConfigLoggingEntry;
449   extern struct config_file_entry ConfigFileEntry;/* defined in ircd.c*/
450   extern struct config_channel_entry ConfigChannel;/* defined in channel.c*/
# Line 529 | Line 480 | extern char *oper_privs_as_string(const
480   extern void split_nuh(struct split_nuh_item *);
481   extern struct ConfItem *find_matching_name_conf(ConfType, const char *,
482                                                  const char *, const char *, int);
483 < extern struct ConfItem *find_exact_name_conf(ConfType, const char *,
483 > extern struct ConfItem *find_exact_name_conf(ConfType, const struct Client *, const char *,
484                                               const char *, const char *);
485   extern void delete_conf_item(struct ConfItem *);
486 < extern void report_confitem_types(struct Client *, ConfType, int);
486 > extern void report_confitem_types(struct Client *, ConfType);
487   extern void yyerror(const char *);
537 – extern int conf_yy_fatal_error(const char *);
538 – extern int conf_fbgets(char *, unsigned int, FBFILE *);
488   extern void write_conf_line(struct Client *, struct ConfItem *,
489                              const char *, time_t);
490   extern int remove_conf_line(ConfType, struct Client *, const char *,
# Line 548 | Line 497 | extern int conf_add_server(struct ConfIt
497   extern void conf_add_class_to_conf(struct ConfItem *, const char *);
498  
499   /* XXX consider moving these into csvlib.h */
500 < extern void parse_csv_file(FBFILE *, ConfType);
501 <
502 < extern char *get_oper_name(const struct Client *);
500 > extern void parse_csv_file(FILE *, ConfType);
501 > extern int find_and_delete_temporary(const char *, const char *, int);
502 > extern const char *get_oper_name(const struct Client *);
503  
504   extern void *map_to_conf(struct ConfItem *);
505   extern struct ConfItem *unmap_conf_item(void *);
# Line 564 | Line 513 | extern int valid_comment(struct Client *
513  
514   #define TK_SECONDS 0
515   #define TK_MINUTES 1
516 < extern time_t valid_tkline(char *, int);
516 > extern time_t valid_tkline(const char *, int);
517   extern int match_conf_password(const char *, const struct AccessItem *);
518  
519   #define NOT_AUTHORIZED    (-1)
# Line 578 | Line 527 | extern int match_conf_password(const cha
527   extern void cluster_a_line(struct Client *,
528                             const char *, int, int, const char *,...);
529   extern void rebuild_cidr_class(struct ConfItem *, struct ClassItem *);
581 –
582 – /* XXX **/
583 – extern int yylex(void);
584 –
530   #endif /* INCLUDED_s_conf_h */

Diff Legend

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