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-8/include/s_conf.h (file contents), Revision 1157 by michael, Tue Aug 9 22:03:59 2011 UTC vs.
ircd-hybrid-8/include/conf.h (file contents), Revision 1446 by michael, Mon Jun 25 20:05:12 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"
35  
36  
38 – #define CONF_SERVER_INFO_TLS_VERSION_SSLV3 0x1
39 – #define CONF_SERVER_INFO_TLS_VERSION_TLSV1 0x2
40 –
37   struct Client;
38  
39   extern struct Callback *client_check_cb;
# Line 46 | 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 125 | Line 121 | struct AccessItem
121    unsigned int     modes;
122    unsigned int     port;
123    int              clients;  /* Number of *LOCAL* clients using this */
124 <  struct irc_ssaddr my_ipnum; /* ip to bind to for outgoing connect */
125 <  struct irc_ssaddr ipnum;      /* ip to connect to */
124 >  int              bits;
125 >  int              type;
126 >  struct irc_ssaddr bind;  /* ip to bind to for outgoing connect */
127 >  struct irc_ssaddr addr;  /* ip to connect to */
128    char *           host;     /* host part of user@host */
129    char *           passwd;
130    char *           spasswd;  /* Password to send. */
# Line 137 | Line 135 | struct AccessItem
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    void *regexuser;
144    void *regexhost;
145 +  dlink_list leaf_list;
146 +  dlink_list hub_list;
147   };
148  
149   struct ClassItem
# Line 172 | Line 173 | struct CidrItem
173    int number_on_this_cidr;
174   };
175  
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 –
176  
177   #define CONF_ILLEGAL            0x80000000
178   #define CONF_RESERVED           0x00000001
179   #define CONF_CLIENT             0x00000002
180   #define CONF_SERVER             0x00000004
181   #define CONF_OPERATOR           0x00000008
182 < #define CONF_KILL               0x00000010
198 < #define CONF_KLINE              CONF_KILL
182 > #define CONF_KLINE              0x00000010
183   #define CONF_CLASS              0x00000020
184 < #define CONF_LEAF               0x00000040
185 < #define CONF_LISTEN_PORT        0x00000080
186 < #define CONF_HUB                0x00000100
187 < #define CONF_EXEMPTKLINE        0x00000200
188 < #define CONF_NOLIMIT            0x00000400
189 < #define CONF_DLINE              0x00000800
206 < #define CONF_XLINE              0x00001000
207 < #define CONF_ULINE              0x00002000
208 < #define CONF_EXEMPTDLINE        0x00004000
209 < #define CONF_GLINE              0x00008000
210 < #define CONF_SERVICE            0x00010000
184 > #define CONF_DLINE              0x00000040
185 > #define CONF_XLINE              0x00000080
186 > #define CONF_ULINE              0x00000100
187 > #define CONF_EXEMPTDLINE        0x00000200
188 > #define CONF_GLINE              0x00000400
189 > #define CONF_SERVICE            0x00000800
190  
191   #define CONF_SERVER_MASK       CONF_SERVER
192   #define CONF_CLIENT_MASK       (CONF_CLIENT | CONF_OPERATOR | CONF_SERVER_MASK)
# Line 221 | Line 200 | struct CidrItem
200   #define IsConfServer(x)         ((x)->status == CONF_SERVER)
201   #define SetConfServer(x)        ((x)->status = CONF_SERVER)
202   #define IsConfOperator(x)       ((x)->status & CONF_OPERATOR)
203 < #define IsConfHub(x)            ((x)->status == CONF_HUB)
225 < #define SetConfHub(x)           ((x)->status = CONF_HUB)
226 < #define IsConfLeaf(x)           ((x)->status == CONF_LEAF)
227 < #define SetConfLeaf(x)          ((x)->status = CONF_LEAF)
228 < #define IsConfHubOrLeaf(x)      ((x)->status & (CONF_HUB|CONF_LEAF))
229 < #define IsConfKill(x)           ((x)->status == CONF_KILL)
203 > #define IsConfKill(x)           ((x)->status == CONF_KLINE)
204   #define IsConfClient(x)         ((x)->status & CONF_CLIENT)
231 – #define IsConfTypeOfClient(x)   ((x)->status & CONF_CLIENT_MASK)
205   #define IsConfUline(x)          ((x)->status & CONF_ULINE)
206   #define IsConfXline(x)          ((x)->status & CONF_XLINE)
207   #define IsConfGline(x)          ((x)->status == CONF_GLINE)
# Line 241 | Line 214 | struct CidrItem
214   #define CONF_FLAGS_LIMIT_IP             0x00000002
215   #define CONF_FLAGS_NO_TILDE             0x00000004
216   #define CONF_FLAGS_NEED_IDENTD          0x00000008
217 < /*                                      0x00000010 */
218 < #define CONF_FLAGS_NOMATCH_IP           0x00000020
219 < #define CONF_FLAGS_EXEMPTKLINE          0x00000040
220 < #define CONF_FLAGS_NOLIMIT              0x00000080
221 < #define CONF_FLAGS_IDLE_LINED           0x00000100
222 < #define CONF_FLAGS_SPOOF_IP             0x00000200
223 < #define CONF_FLAGS_SPOOF_NOTICE         0x00000400
224 < #define CONF_FLAGS_REDIR                0x00000800
225 < #define CONF_FLAGS_EXEMPTGLINE          0x00001000
253 < #define CONF_FLAGS_RESTRICTED           0x00002000
254 < #define CONF_FLAGS_CAN_FLOOD            0x00100000
255 < #define CONF_FLAGS_NEED_PASSWORD        0x00200000
217 > #define CONF_FLAGS_NOMATCH_IP           0x00000010
218 > #define CONF_FLAGS_EXEMPTKLINE          0x00000020
219 > #define CONF_FLAGS_NOLIMIT              0x00000040
220 > #define CONF_FLAGS_SPOOF_IP             0x00000080
221 > #define CONF_FLAGS_SPOOF_NOTICE         0x00000100
222 > #define CONF_FLAGS_REDIR                0x00000200
223 > #define CONF_FLAGS_EXEMPTGLINE          0x00000400
224 > #define CONF_FLAGS_CAN_FLOOD            0x00000800
225 > #define CONF_FLAGS_NEED_PASSWORD        0x00001000
226   /* server flags */
227 < #define CONF_FLAGS_ALLOW_AUTO_CONN      0x00004000
228 < #define CONF_FLAGS_LAZY_LINK            0x00008000
229 < #define CONF_FLAGS_ENCRYPTED            0x00010000
230 < #define CONF_FLAGS_COMPRESSED           0x00020000
231 < #define CONF_FLAGS_TEMPORARY            0x00040000
232 < #define CONF_FLAGS_CRYPTLINK            0x00080000
233 < #define CONF_FLAGS_BURST_AWAY           0x00400000
264 < #define CONF_FLAGS_EXEMPTRESV           0x00800000
265 < #define CONF_FLAGS_TOPICBURST           0x01000000
227 > #define CONF_FLAGS_ALLOW_AUTO_CONN      0x00002000
228 > #define CONF_FLAGS_ENCRYPTED            0x00004000
229 > #define CONF_FLAGS_TEMPORARY            0x00008000
230 > #define CONF_FLAGS_BURST_AWAY           0x00010000
231 > #define CONF_FLAGS_EXEMPTRESV           0x00020000
232 > #define CONF_FLAGS_TOPICBURST           0x00040000
233 > #define CONF_FLAGS_SSL                  0x00080000
234  
235   /* Macros for struct AccessItem */
236   #define IsLimitIp(x)            ((x)->flags & CONF_FLAGS_LIMIT_IP)
# Line 275 | Line 243 | struct CidrItem
243   #define IsConfExemptLimits(x)   ((x)->flags & CONF_FLAGS_NOLIMIT)
244   #define IsConfExemptGline(x)    ((x)->flags & CONF_FLAGS_EXEMPTGLINE)
245   #define IsConfExemptResv(x)     ((x)->flags & CONF_FLAGS_EXEMPTRESV)
278 – #define IsConfIdlelined(x)      ((x)->flags & CONF_FLAGS_IDLE_LINED)
246   #define IsConfDoIdentd(x)       ((x)->flags & CONF_FLAGS_DO_IDENTD)
247   #define IsConfDoSpoofIp(x)      ((x)->flags & CONF_FLAGS_SPOOF_IP)
248   #define IsConfSpoofNotice(x)    ((x)->flags & CONF_FLAGS_SPOOF_NOTICE)
282 – #define IsConfRestricted(x)     ((x)->flags & CONF_FLAGS_RESTRICTED)
249   #define IsConfEncrypted(x)      ((x)->flags & CONF_FLAGS_ENCRYPTED)
250   #define SetConfEncrypted(x)     ((x)->flags |= CONF_FLAGS_ENCRYPTED)
251   #define ClearConfEncrypted(x)   ((x)->flags &= ~CONF_FLAGS_ENCRYPTED)
286 – #define IsConfCompressed(x)     ((x)->flags & CONF_FLAGS_COMPRESSED)
287 – #define SetConfCompressed(x)    ((x)->flags |= CONF_FLAGS_COMPRESSED)
288 – #define ClearConfCompressed(x)  ((x)->flags &= ~CONF_FLAGS_COMPRESSED)
289 – #define IsConfCryptLink(x)      ((x)->flags & CONF_FLAGS_CRYPTLINK)
290 – #define SetConfCryptLink(x)     ((x)->flags |= CONF_FLAGS_CRYPTLINK)
291 – #define ClearConfCryptLink(x)   ((x)->flags &= ~CONF_FLAGS_CRYPTLINK)
252   #define IsConfAllowAutoConn(x)  ((x)->flags & CONF_FLAGS_ALLOW_AUTO_CONN)
253   #define SetConfAllowAutoConn(x) ((x)->flags |= CONF_FLAGS_ALLOW_AUTO_CONN)
254   #define ClearConfAllowAutoConn(x) ((x)->flags &= ~CONF_FLAGS_ALLOW_AUTO_CONN)
# Line 301 | Line 261 | struct CidrItem
261   #define IsConfTopicBurst(x)     ((x)->flags & CONF_FLAGS_TOPICBURST)
262   #define SetConfTopicBurst(x)    ((x)->flags |= CONF_FLAGS_TOPICBURST)
263   #define ClearConfTopicBurst(x)  ((x)->flags &= ~CONF_FLAGS_TOPICBURST)
264 + #define IsConfSSL(x)      ((x)->flags & CONF_FLAGS_SSL)
265 + #define SetConfSSL(x)     ((x)->flags |= CONF_FLAGS_SSL)
266 + #define ClearConfSSL(x)   ((x)->flags &= ~CONF_FLAGS_SSL)
267  
268   /* shared/cluster server entry types
269   * These defines are used for both shared and cluster.
270   */
271   #define SHARED_KLINE            0x0001
272 < #define SHARED_TKLINE           0x0002
273 < #define SHARED_UNKLINE          0x0004
274 < #define SHARED_XLINE            0x0008
275 < #define SHARED_TXLINE           0x0010
276 < #define SHARED_UNXLINE          0x0020
277 < #define SHARED_RESV             0x0040
278 < #define SHARED_TRESV            0x0080
279 < #define SHARED_UNRESV           0x0100
280 < #define SHARED_LOCOPS           0x0200
281 < #define SHARED_ALL              (SHARED_KLINE | SHARED_TKLINE | SHARED_UNKLINE | \
282 <                                 SHARED_XLINE | SHARED_TXLINE | SHARED_UNXLINE | \
283 <                                 SHARED_RESV | SHARED_TRESV | SHARED_UNRESV |\
321 <                                 SHARED_LOCOPS)
272 > #define SHARED_UNKLINE          0x0002
273 > #define SHARED_XLINE            0x0004
274 > #define SHARED_UNXLINE          0x0008
275 > #define SHARED_RESV             0x0010
276 > #define SHARED_UNRESV           0x0020
277 > #define SHARED_LOCOPS           0x0040
278 > #define SHARED_DLINE            0x0080
279 > #define SHARED_UNDLINE          0x0100
280 > #define SHARED_ALL              (SHARED_KLINE | SHARED_UNKLINE |\
281 >                                 SHARED_XLINE | SHARED_UNXLINE |\
282 >                                 SHARED_RESV | SHARED_UNRESV |\
283 >                                 SHARED_LOCOPS | SHARED_DLINE | SHARED_UNDLINE)
284  
285   /* gline acl entry actions */
286   #define GDENY_BLOCK             0x1
# Line 337 | Line 299 | struct config_file_entry
299    const char *cresvfile;
300    const char *nresvfile;
301  
340 –  char *logpath;
341 –  char *operlog;
342 –
343 –  char *servlink_path;
302    char *egdpool_path;
303    char *service_name;
304  
305    MessageFile motd;
348 –  MessageFile opermotd;
306    MessageFile linksfile;
307  
351 –  unsigned char compression_level;
308    int gline_min_cidr;
309    int gline_min_cidr6;
310    int dots_in_ident;
# Line 385 | Line 341 | struct config_file_entry
341    int pace_wait_simple;
342    int gline_time;
343    int gline_logging;
388 –  int idletime;
344    int oper_only_umodes;
345    int oper_umodes;
346    int max_targets;
# Line 401 | Line 356 | struct config_file_entry
356    int ping_cookie;
357    int disable_auth;
358    int disable_remote;
404 – #ifdef HAVE_LIBCRYPTO
405 –  struct EncCapability *default_cipher_preference;
406 – #endif
359   };
360  
361   struct config_channel_entry
# Line 418 | Line 370 | struct config_channel_entry
370    int knock_delay_channel;
371    unsigned int max_bans;
372    unsigned int max_chans_per_user;
373 +  unsigned int max_chans_per_oper;
374    int no_create_on_split;
375    int no_join_on_split;
376    int quiet_on_ban;
424 –  int burst_topicwho;
377    int default_split_server_count;
378    int default_split_user_count;
379   };
# Line 450 | Line 402 | struct server_info
402    RSA *rsa_private_key;
403    SSL_CTX *server_ctx;
404    SSL_CTX *client_ctx;
453 –  unsigned int tls_version;
405   #endif
406    int hub;
407    struct irc_ssaddr ip;
# Line 472 | Line 423 | struct admin_info
423   struct logging_entry
424   {
425    unsigned int use_logging;
475 –  char operlog[PATH_MAX + 1];
476 –  char userlog[PATH_MAX + 1];
477 –  char glinelog[PATH_MAX + 1];
478 –  char ioerrlog[PATH_MAX + 1];
479 –  char klinelog[PATH_MAX + 1];
480 –  char killlog[PATH_MAX + 1];
481 –  char operspylog[PATH_MAX + 1];
482 –  char failed_operlog[PATH_MAX + 1];
426   };
427  
428   extern dlink_list gdeny_items;
# Line 491 | Line 434 | extern dlink_list rxconf_items;
434   extern dlink_list rkconf_items;
435   extern dlink_list leaf_items;
436   extern dlink_list service_items;
494 – extern dlink_list temporary_klines;
495 – extern dlink_list temporary_dlines;
496 – extern dlink_list temporary_glines;
437   extern dlink_list temporary_xlines;
498 – extern dlink_list temporary_rxlines;
499 – extern dlink_list temporary_rklines;
438   extern struct logging_entry ConfigLoggingEntry;
439   extern struct config_file_entry ConfigFileEntry;/* defined in ircd.c*/
440   extern struct config_channel_entry ConfigChannel;/* defined in channel.c*/
# Line 532 | Line 470 | extern char *oper_privs_as_string(const
470   extern void split_nuh(struct split_nuh_item *);
471   extern struct ConfItem *find_matching_name_conf(ConfType, const char *,
472                                                  const char *, const char *, int);
473 < extern struct ConfItem *find_exact_name_conf(ConfType, const char *,
473 > extern struct ConfItem *find_exact_name_conf(ConfType, const struct Client *, const char *,
474                                               const char *, const char *);
475   extern void delete_conf_item(struct ConfItem *);
476 < extern void report_confitem_types(struct Client *, ConfType, int);
476 > extern void report_confitem_types(struct Client *, ConfType);
477   extern void yyerror(const char *);
540 – extern int conf_yy_fatal_error(const char *);
541 – extern int conf_fbgets(char *, unsigned int, FBFILE *);
478   extern void write_conf_line(struct Client *, struct ConfItem *,
479                              const char *, time_t);
480   extern int remove_conf_line(ConfType, struct Client *, const char *,
# Line 551 | Line 487 | extern int conf_add_server(struct ConfIt
487   extern void conf_add_class_to_conf(struct ConfItem *, const char *);
488  
489   /* XXX consider moving these into csvlib.h */
490 < extern void parse_csv_file(FBFILE *, ConfType);
491 <
492 < extern char *get_oper_name(const struct Client *);
490 > extern void parse_csv_file(FILE *, ConfType);
491 > extern int find_and_delete_temporary(const char *, const char *, int);
492 > extern const char *get_oper_name(const struct Client *);
493  
494   extern void *map_to_conf(struct ConfItem *);
495   extern struct ConfItem *unmap_conf_item(void *);
# Line 581 | Line 517 | extern int match_conf_password(const cha
517   extern void cluster_a_line(struct Client *,
518                             const char *, int, int, const char *,...);
519   extern void rebuild_cidr_class(struct ConfItem *, struct ClassItem *);
584 –
585 – /* XXX **/
586 – extern int yylex(void);
587 –
520   #endif /* INCLUDED_s_conf_h */

Diff Legend

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