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/include/s_conf.h (file contents), Revision 1155 by michael, Tue Aug 9 20:27:45 2011 UTC vs.
ircd-hybrid-8/include/conf.h (file contents), Revision 1389 by michael, Tue May 1 13:08:29 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 71 | 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 124 | 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 136 | 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;
141 –  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 171 | Line 173 | struct CidrItem
173    int number_on_this_cidr;
174   };
175  
174 – #define ConFreq(x)      ((x)->con_freq)
175 – #define PingFreq(x)     ((x)->ping_freq)
176 – #define PingWarning(x)  ((x)->ping_warning)
177 – #define MaxTotal(x)     ((x)->max_total)
178 – #define MaxGlobal(x)    ((x)->max_global)
179 – #define MaxLocal(x)     ((x)->max_local)
180 – #define MaxIdent(x)     ((x)->max_ident)
181 – #define MaxPerIp(x)     ((x)->max_perip)
182 – #define MaxSendq(x)     ((x)->max_sendq)
183 – #define CurrUserCount(x) ((x)->curr_user_count)
184 – #define CidrBitlenIPV4(x)       ((x)->cidr_bitlen_ipv4)
185 – #define CidrBitlenIPV6(x)       ((x)->cidr_bitlen_ipv6)
186 – #define NumberPerCidr(x) ((x)->number_per_cidr)
187 –
188 – #define ClassPtr(x)      ((x)->class_ptr)
189 –
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
197 < #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
190 < #define CONF_XLINE              0x00001000
191 < #define CONF_ULINE              0x00002000
207 < #define CONF_EXEMPTDLINE        0x00004000
208 < #define CONF_GLINE              0x00008000
184 > #define CONF_LISTEN_PORT        0x00000040
185 > #define CONF_EXEMPTKLINE        0x00000080
186 > #define CONF_DLINE              0x00000100
187 > #define CONF_XLINE              0x00000200
188 > #define CONF_ULINE              0x00000400
189 > #define CONF_EXEMPTDLINE        0x00000800
190 > #define CONF_GLINE              0x00001000
191 > #define CONF_SERVICE            0x00002000
192  
193   #define CONF_SERVER_MASK       CONF_SERVER
194   #define CONF_CLIENT_MASK       (CONF_CLIENT | CONF_OPERATOR | CONF_SERVER_MASK)
# Line 219 | Line 202 | struct CidrItem
202   #define IsConfServer(x)         ((x)->status == CONF_SERVER)
203   #define SetConfServer(x)        ((x)->status = CONF_SERVER)
204   #define IsConfOperator(x)       ((x)->status & CONF_OPERATOR)
205 < #define IsConfHub(x)            ((x)->status == CONF_HUB)
223 < #define SetConfHub(x)           ((x)->status = CONF_HUB)
224 < #define IsConfLeaf(x)           ((x)->status == CONF_LEAF)
225 < #define SetConfLeaf(x)          ((x)->status = CONF_LEAF)
226 < #define IsConfHubOrLeaf(x)      ((x)->status & (CONF_HUB|CONF_LEAF))
227 < #define IsConfKill(x)           ((x)->status == CONF_KILL)
205 > #define IsConfKill(x)           ((x)->status == CONF_KLINE)
206   #define IsConfClient(x)         ((x)->status & CONF_CLIENT)
207   #define IsConfTypeOfClient(x)   ((x)->status & CONF_CLIENT_MASK)
208   #define IsConfUline(x)          ((x)->status & CONF_ULINE)
# Line 239 | Line 217 | struct CidrItem
217   #define CONF_FLAGS_LIMIT_IP             0x00000002
218   #define CONF_FLAGS_NO_TILDE             0x00000004
219   #define CONF_FLAGS_NEED_IDENTD          0x00000008
220 < /*                                      0x00000010 */
221 < #define CONF_FLAGS_NOMATCH_IP           0x00000020
222 < #define CONF_FLAGS_EXEMPTKLINE          0x00000040
223 < #define CONF_FLAGS_NOLIMIT              0x00000080
224 < #define CONF_FLAGS_IDLE_LINED           0x00000100
225 < #define CONF_FLAGS_SPOOF_IP             0x00000200
226 < #define CONF_FLAGS_SPOOF_NOTICE         0x00000400
227 < #define CONF_FLAGS_REDIR                0x00000800
228 < #define CONF_FLAGS_EXEMPTGLINE          0x00001000
251 < #define CONF_FLAGS_RESTRICTED           0x00002000
252 < #define CONF_FLAGS_CAN_FLOOD            0x00100000
253 < #define CONF_FLAGS_NEED_PASSWORD        0x00200000
220 > #define CONF_FLAGS_NOMATCH_IP           0x00000010
221 > #define CONF_FLAGS_EXEMPTKLINE          0x00000020
222 > #define CONF_FLAGS_NOLIMIT              0x00000040
223 > #define CONF_FLAGS_SPOOF_IP             0x00000080
224 > #define CONF_FLAGS_SPOOF_NOTICE         0x00000100
225 > #define CONF_FLAGS_REDIR                0x00000200
226 > #define CONF_FLAGS_EXEMPTGLINE          0x00000400
227 > #define CONF_FLAGS_CAN_FLOOD            0x00000800
228 > #define CONF_FLAGS_NEED_PASSWORD        0x00001000
229   /* server flags */
230 < #define CONF_FLAGS_ALLOW_AUTO_CONN      0x00004000
231 < #define CONF_FLAGS_LAZY_LINK            0x00008000
232 < #define CONF_FLAGS_ENCRYPTED            0x00010000
233 < #define CONF_FLAGS_COMPRESSED           0x00020000
234 < #define CONF_FLAGS_TEMPORARY            0x00040000
235 < #define CONF_FLAGS_CRYPTLINK            0x00080000
236 < #define CONF_FLAGS_BURST_AWAY           0x00400000
262 < #define CONF_FLAGS_EXEMPTRESV           0x00800000
263 < #define CONF_FLAGS_TOPICBURST           0x01000000
230 > #define CONF_FLAGS_ALLOW_AUTO_CONN      0x00002000
231 > #define CONF_FLAGS_ENCRYPTED            0x00004000
232 > #define CONF_FLAGS_TEMPORARY            0x00008000
233 > #define CONF_FLAGS_BURST_AWAY           0x00010000
234 > #define CONF_FLAGS_EXEMPTRESV           0x00020000
235 > #define CONF_FLAGS_TOPICBURST           0x00040000
236 > #define CONF_FLAGS_SSL                  0x00080000
237  
238   /* Macros for struct AccessItem */
239   #define IsLimitIp(x)            ((x)->flags & CONF_FLAGS_LIMIT_IP)
# Line 273 | Line 246 | struct CidrItem
246   #define IsConfExemptLimits(x)   ((x)->flags & CONF_FLAGS_NOLIMIT)
247   #define IsConfExemptGline(x)    ((x)->flags & CONF_FLAGS_EXEMPTGLINE)
248   #define IsConfExemptResv(x)     ((x)->flags & CONF_FLAGS_EXEMPTRESV)
276 – #define IsConfIdlelined(x)      ((x)->flags & CONF_FLAGS_IDLE_LINED)
249   #define IsConfDoIdentd(x)       ((x)->flags & CONF_FLAGS_DO_IDENTD)
250   #define IsConfDoSpoofIp(x)      ((x)->flags & CONF_FLAGS_SPOOF_IP)
251   #define IsConfSpoofNotice(x)    ((x)->flags & CONF_FLAGS_SPOOF_NOTICE)
280 – #define IsConfRestricted(x)     ((x)->flags & CONF_FLAGS_RESTRICTED)
252   #define IsConfEncrypted(x)      ((x)->flags & CONF_FLAGS_ENCRYPTED)
253   #define SetConfEncrypted(x)     ((x)->flags |= CONF_FLAGS_ENCRYPTED)
254   #define ClearConfEncrypted(x)   ((x)->flags &= ~CONF_FLAGS_ENCRYPTED)
284 – #define IsConfCompressed(x)     ((x)->flags & CONF_FLAGS_COMPRESSED)
285 – #define SetConfCompressed(x)    ((x)->flags |= CONF_FLAGS_COMPRESSED)
286 – #define ClearConfCompressed(x)  ((x)->flags &= ~CONF_FLAGS_COMPRESSED)
287 – #define IsConfCryptLink(x)      ((x)->flags & CONF_FLAGS_CRYPTLINK)
288 – #define SetConfCryptLink(x)     ((x)->flags |= CONF_FLAGS_CRYPTLINK)
289 – #define ClearConfCryptLink(x)   ((x)->flags &= ~CONF_FLAGS_CRYPTLINK)
255   #define IsConfAllowAutoConn(x)  ((x)->flags & CONF_FLAGS_ALLOW_AUTO_CONN)
256   #define SetConfAllowAutoConn(x) ((x)->flags |= CONF_FLAGS_ALLOW_AUTO_CONN)
257   #define ClearConfAllowAutoConn(x) ((x)->flags &= ~CONF_FLAGS_ALLOW_AUTO_CONN)
# Line 299 | Line 264 | struct CidrItem
264   #define IsConfTopicBurst(x)     ((x)->flags & CONF_FLAGS_TOPICBURST)
265   #define SetConfTopicBurst(x)    ((x)->flags |= CONF_FLAGS_TOPICBURST)
266   #define ClearConfTopicBurst(x)  ((x)->flags &= ~CONF_FLAGS_TOPICBURST)
267 + #define IsConfSSL(x)      ((x)->flags & CONF_FLAGS_SSL)
268 + #define SetConfSSL(x)     ((x)->flags |= CONF_FLAGS_SSL)
269 + #define ClearConfSSL(x)   ((x)->flags &= ~CONF_FLAGS_SSL)
270  
271   /* shared/cluster server entry types
272   * These defines are used for both shared and cluster.
273   */
274   #define SHARED_KLINE            0x0001
275 < #define SHARED_TKLINE           0x0002
276 < #define SHARED_UNKLINE          0x0004
277 < #define SHARED_XLINE            0x0008
278 < #define SHARED_TXLINE           0x0010
279 < #define SHARED_UNXLINE          0x0020
280 < #define SHARED_RESV             0x0040
281 < #define SHARED_TRESV            0x0080
282 < #define SHARED_UNRESV           0x0100
283 < #define SHARED_LOCOPS           0x0200
284 < #define SHARED_ALL              (SHARED_KLINE | SHARED_TKLINE | SHARED_UNKLINE | \
285 <                                 SHARED_XLINE | SHARED_TXLINE | SHARED_UNXLINE | \
286 <                                 SHARED_RESV | SHARED_TRESV | SHARED_UNRESV |\
319 <                                 SHARED_LOCOPS)
275 > #define SHARED_UNKLINE          0x0002
276 > #define SHARED_XLINE            0x0004
277 > #define SHARED_UNXLINE          0x0008
278 > #define SHARED_RESV             0x0010
279 > #define SHARED_UNRESV           0x0020
280 > #define SHARED_LOCOPS           0x0040
281 > #define SHARED_DLINE            0x0080
282 > #define SHARED_UNDLINE          0x0100
283 > #define SHARED_ALL              (SHARED_KLINE | SHARED_UNKLINE |\
284 >                                 SHARED_XLINE | SHARED_UNXLINE |\
285 >                                 SHARED_RESV | SHARED_UNRESV |\
286 >                                 SHARED_LOCOPS | SHARED_DLINE | SHARED_UNDLINE)
287  
288   /* gline acl entry actions */
289   #define GDENY_BLOCK             0x1
# Line 335 | Line 302 | struct config_file_entry
302    const char *cresvfile;
303    const char *nresvfile;
304  
338 –  char *logpath;
339 –  char *operlog;
340 –
341 –  char *servlink_path;
305    char *egdpool_path;
306 +  char *service_name;
307  
308    MessageFile motd;
309    MessageFile opermotd;
310    MessageFile linksfile;
311  
348 –  unsigned char compression_level;
312    int gline_min_cidr;
313    int gline_min_cidr6;
314    int dots_in_ident;
# Line 382 | Line 345 | struct config_file_entry
345    int pace_wait_simple;
346    int gline_time;
347    int gline_logging;
385 –  int idletime;
348    int oper_only_umodes;
349    int oper_umodes;
350    int max_targets;
# Line 398 | Line 360 | struct config_file_entry
360    int ping_cookie;
361    int disable_auth;
362    int disable_remote;
401 – #ifdef HAVE_LIBCRYPTO
402 –  struct EncCapability *default_cipher_preference;
403 – #endif
363   };
364  
365   struct config_channel_entry
# Line 447 | Line 406 | struct server_info
406    RSA *rsa_private_key;
407    SSL_CTX *server_ctx;
408    SSL_CTX *client_ctx;
450 –  unsigned int tls_version;
409   #endif
410    int hub;
411    struct irc_ssaddr ip;
# Line 469 | Line 427 | struct admin_info
427   struct logging_entry
428   {
429    unsigned int use_logging;
472 –  char operlog[PATH_MAX + 1];
473 –  char userlog[PATH_MAX + 1];
474 –  char glinelog[PATH_MAX + 1];
475 –  char ioerrlog[PATH_MAX + 1];
476 –  char klinelog[PATH_MAX + 1];
477 –  char killlog[PATH_MAX + 1];
478 –  char operspylog[PATH_MAX + 1];
479 –  char failed_operlog[PATH_MAX + 1];
430   };
431  
432   extern dlink_list gdeny_items;
# Line 487 | Line 437 | extern dlink_list hub_items;
437   extern dlink_list rxconf_items;
438   extern dlink_list rkconf_items;
439   extern dlink_list leaf_items;
440 < extern dlink_list temporary_klines;
491 < extern dlink_list temporary_dlines;
492 < extern dlink_list temporary_glines;
440 > extern dlink_list service_items;
441   extern dlink_list temporary_xlines;
494 – extern dlink_list temporary_rxlines;
495 – extern dlink_list temporary_rklines;
442   extern struct logging_entry ConfigLoggingEntry;
443   extern struct config_file_entry ConfigFileEntry;/* defined in ircd.c*/
444   extern struct config_channel_entry ConfigChannel;/* defined in channel.c*/
# Line 528 | Line 474 | extern char *oper_privs_as_string(const
474   extern void split_nuh(struct split_nuh_item *);
475   extern struct ConfItem *find_matching_name_conf(ConfType, const char *,
476                                                  const char *, const char *, int);
477 < extern struct ConfItem *find_exact_name_conf(ConfType, const char *,
477 > extern struct ConfItem *find_exact_name_conf(ConfType, const struct Client *, const char *,
478                                               const char *, const char *);
479   extern void delete_conf_item(struct ConfItem *);
480 < extern void report_confitem_types(struct Client *, ConfType, int);
480 > extern void report_confitem_types(struct Client *, ConfType);
481   extern void yyerror(const char *);
536 – extern int conf_yy_fatal_error(const char *);
537 – extern int conf_fbgets(char *, unsigned int, FBFILE *);
482   extern void write_conf_line(struct Client *, struct ConfItem *,
483                              const char *, time_t);
484   extern int remove_conf_line(ConfType, struct Client *, const char *,
# Line 547 | Line 491 | extern int conf_add_server(struct ConfIt
491   extern void conf_add_class_to_conf(struct ConfItem *, const char *);
492  
493   /* XXX consider moving these into csvlib.h */
494 < extern void parse_csv_file(FBFILE *, ConfType);
495 <
496 < extern char *get_oper_name(const struct Client *);
494 > extern void parse_csv_file(FILE *, ConfType);
495 > extern int find_and_delete_temporary(const char *, const char *, int);
496 > extern const char *get_oper_name(const struct Client *);
497  
498   extern void *map_to_conf(struct ConfItem *);
499   extern struct ConfItem *unmap_conf_item(void *);
# Line 577 | Line 521 | extern int match_conf_password(const cha
521   extern void cluster_a_line(struct Client *,
522                             const char *, int, int, const char *,...);
523   extern void rebuild_cidr_class(struct ConfItem *, struct ClassItem *);
580 –
581 – /* XXX **/
582 – extern int yylex(void);
583 –
524   #endif /* INCLUDED_s_conf_h */

Diff Legend

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