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 1302 by michael, Wed Mar 21 17:48:54 2012 UTC vs.
ircd-hybrid-8/include/conf.h (file contents), Revision 1549 by michael, Mon Oct 1 18:11:11 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,
74 –  GDENY_TYPE,
70    SERVICE_TYPE
71   } ConfType;
72  
# Line 127 | Line 122 | struct AccessItem
122    int              clients;  /* Number of *LOCAL* clients using this */
123    int              bits;
124    int              type;
125 <  struct irc_ssaddr my_ipnum; /* ip to bind to for outgoing connect */
126 <  struct irc_ssaddr ipnum;      /* ip to connect to */
125 >  struct irc_ssaddr bind;  /* ip to bind to for outgoing connect */
126 >  struct irc_ssaddr addr;  /* ip to connect to */
127    char *           host;     /* host part of user@host */
128    char *           passwd;
129    char *           spasswd;  /* Password to send. */
# Line 140 | Line 135 | struct AccessItem
135    int              aftype;
136   #ifdef HAVE_LIBCRYPTO
137    /* certs */
138 +  char *cipher_list;
139    char *           rsa_public_key_file;
140    RSA *            rsa_public_key;
141   #endif
142    void *regexuser;
143    void *regexhost;
144 +  dlink_list leaf_list;
145 +  dlink_list hub_list;
146   };
147  
148   struct ClassItem
# Line 152 | Line 150 | struct ClassItem
150    dlink_list list_ipv4;         /* base of per cidr ipv4 client link list */
151    dlink_list list_ipv6;         /* base of per cidr ipv6 client link list */
152    unsigned int max_sendq;
153 +  unsigned int max_recvq;
154    int con_freq;
155    int ping_freq;
156    int ping_warning;
# Line 174 | Line 173 | struct CidrItem
173    int number_on_this_cidr;
174   };
175  
177 – #define ConFreq(x)      ((x)->con_freq)
178 – #define PingFreq(x)     ((x)->ping_freq)
179 – #define PingWarning(x)  ((x)->ping_warning)
180 – #define MaxTotal(x)     ((x)->max_total)
181 – #define MaxGlobal(x)    ((x)->max_global)
182 – #define MaxLocal(x)     ((x)->max_local)
183 – #define MaxIdent(x)     ((x)->max_ident)
184 – #define MaxPerIp(x)     ((x)->max_perip)
185 – #define MaxSendq(x)     ((x)->max_sendq)
186 – #define CurrUserCount(x) ((x)->curr_user_count)
187 – #define CidrBitlenIPV4(x)       ((x)->cidr_bitlen_ipv4)
188 – #define CidrBitlenIPV6(x)       ((x)->cidr_bitlen_ipv6)
189 – #define NumberPerCidr(x) ((x)->number_per_cidr)
190 –
191 – #define ClassPtr(x)      ((x)->class_ptr)
192 –
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
200 < #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
208 < #define CONF_XLINE              0x00001000
209 < #define CONF_ULINE              0x00002000
210 < #define CONF_EXEMPTDLINE        0x00004000
211 < #define CONF_GLINE              0x00008000
212 < #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 223 | 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)
227 < #define SetConfHub(x)           ((x)->status = CONF_HUB)
228 < #define IsConfLeaf(x)           ((x)->status == CONF_LEAF)
229 < #define SetConfLeaf(x)          ((x)->status = CONF_LEAF)
230 < #define IsConfHubOrLeaf(x)      ((x)->status & (CONF_HUB|CONF_LEAF))
231 < #define IsConfKill(x)           ((x)->status == CONF_KILL)
203 > #define IsConfKill(x)           ((x)->status == CONF_KLINE)
204   #define IsConfClient(x)         ((x)->status & CONF_CLIENT)
233 – #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 243 | 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 < /*                                      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
255 < /*                                      0x00002000 */
256 < #define CONF_FLAGS_CAN_FLOOD            0x00100000
257 < #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 < /*                                      0x00008000 */
229 < #define CONF_FLAGS_ENCRYPTED            0x00010000
230 < #define CONF_FLAGS_UNUSED1___           0x00020000
231 < #define CONF_FLAGS_TEMPORARY            0x00040000
264 < #define CONF_FLAGS_UNUSED2___           0x00080000
265 < #define CONF_FLAGS_BURST_AWAY           0x00400000
266 < #define CONF_FLAGS_EXEMPTRESV           0x00800000
267 < #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_EXEMPTRESV           0x00010000
231 > #define CONF_FLAGS_SSL                  0x00020000
232  
233   /* Macros for struct AccessItem */
234   #define IsLimitIp(x)            ((x)->flags & CONF_FLAGS_LIMIT_IP)
# Line 289 | Line 253 | struct CidrItem
253   #define IsConfTemporary(x)      ((x)->flags & CONF_FLAGS_TEMPORARY)
254   #define SetConfTemporary(x)     ((x)->flags |= CONF_FLAGS_TEMPORARY)
255   #define IsConfRedir(x)          ((x)->flags & CONF_FLAGS_REDIR)
256 < #define IsConfAwayBurst(x)      ((x)->flags & CONF_FLAGS_BURST_AWAY)
257 < #define SetConfAwayBurst(x)     ((x)->flags |= CONF_FLAGS_BURST_AWAY)
258 < #define ClearConfAwayBurst(x)   ((x)->flags &= ~CONF_FLAGS_BURST_AWAY)
295 < #define IsConfTopicBurst(x)     ((x)->flags & CONF_FLAGS_TOPICBURST)
296 < #define SetConfTopicBurst(x)    ((x)->flags |= CONF_FLAGS_TOPICBURST)
297 < #define ClearConfTopicBurst(x)  ((x)->flags &= ~CONF_FLAGS_TOPICBURST)
256 > #define IsConfSSL(x)      ((x)->flags & CONF_FLAGS_SSL)
257 > #define SetConfSSL(x)     ((x)->flags |= CONF_FLAGS_SSL)
258 > #define ClearConfSSL(x)   ((x)->flags &= ~CONF_FLAGS_SSL)
259  
260   /* shared/cluster server entry types
261   * These defines are used for both shared and cluster.
# Line 313 | Line 274 | struct CidrItem
274                                   SHARED_RESV | SHARED_UNRESV |\
275                                   SHARED_LOCOPS | SHARED_DLINE | SHARED_UNDLINE)
276  
316 – /* gline acl entry actions */
317 – #define GDENY_BLOCK             0x1
318 – #define GDENY_REJECT            0x2
319 –
277   struct config_file_entry
278   {
279    const char *dpath;          /* DPATH if set from command line */
280    const char *configfile;
281    const char *klinefile;
282    const char *xlinefile;
326 –  const char *rxlinefile;
327 –  const char *rklinefile;
283    const char *dlinefile;
329 –  const char *glinefile;
284    const char *cresvfile;
285    const char *nresvfile;
286  
333 –  char *logpath;
334 –  char *operlog;
287    char *egdpool_path;
288    char *service_name;
289  
290    MessageFile motd;
339 –  MessageFile opermotd;
291    MessageFile linksfile;
292  
293    int gline_min_cidr;
# Line 351 | Line 302 | struct config_file_entry
302    int ts_max_delta;
303    int ts_warn_delta;
304    int anti_nick_flood;
354 –  int kline_with_reason;
305    int warn_no_nline;
306    int invisible_on_connect;
307    int stats_e_disabled;
# Line 365 | Line 315 | struct config_file_entry
315    int oper_pass_resv;
316    int glines;
317    int hide_spoof_ips;
368 –  int burst_away;
369 –  int use_whois_actually;
318    int tkline_expire_notices;
319    int opers_bypass_callerid;
320    int ignore_bogus_ts;
373 –  char *kline_reason;
321    int pace_wait;
322    int pace_wait_simple;
323    int gline_time;
324 <  int gline_logging;
324 >  int gline_request_time;
325    int oper_only_umodes;
326    int oper_umodes;
327    int max_targets;
# Line 383 | Line 330 | struct config_file_entry
330    int min_nonwildcard_simple;
331    int kill_chase_time_limit;
332    int default_floodcount;
386 –  int client_flood;
333    /* 0 == don't use throttle... */
334    int throttle_time;
335    int use_egd;
# Line 396 | Line 342 | struct config_channel_entry
342   {
343    int disable_fake_channels;
344    int restrict_channels;
399 –  int disable_local_channels;
400 –  int use_except;
401 –  int use_invex;
402 –  int use_knock;
345    int knock_delay;
346    int knock_delay_channel;
347    unsigned int max_bans;
348    unsigned int max_chans_per_user;
349 +  unsigned int max_chans_per_oper;
350    int no_create_on_split;
351    int no_join_on_split;
352    int quiet_on_ban;
410 –  int burst_topicwho;
353    int default_split_server_count;
354    int default_split_user_count;
355   };
# Line 420 | Line 362 | struct config_server_hide
362    int links_delay;
363    int links_disabled;
364    int hidden;
423 –  int disable_hidden;
365    int hide_server_ips;
366   };
367  
# Line 436 | Line 377 | struct server_info
377    RSA *rsa_private_key;
378    SSL_CTX *server_ctx;
379    SSL_CTX *client_ctx;
439 –  unsigned int tls_version;
380   #endif
381    int hub;
382    struct irc_ssaddr ip;
# Line 458 | Line 398 | struct admin_info
398   struct logging_entry
399   {
400    unsigned int use_logging;
461 –  unsigned int timestamp;
401   };
402  
464 – extern dlink_list gdeny_items;
403   extern dlink_list class_items;
404   extern dlink_list server_items;
405   extern dlink_list cluster_items;
# Line 470 | Line 408 | extern dlink_list rxconf_items;
408   extern dlink_list rkconf_items;
409   extern dlink_list leaf_items;
410   extern dlink_list service_items;
473 – extern dlink_list temporary_klines;
474 – extern dlink_list temporary_dlines;
475 – extern dlink_list temporary_glines;
411   extern dlink_list temporary_xlines;
477 – extern dlink_list temporary_rxlines;
478 – extern dlink_list temporary_rklines;
412   extern struct logging_entry ConfigLoggingEntry;
413   extern struct config_file_entry ConfigFileEntry;/* defined in ircd.c*/
414   extern struct config_channel_entry ConfigChannel;/* defined in channel.c*/
# Line 486 | Line 419 | extern int valid_wild_card(struct Client
419   /* End GLOBAL section */
420  
421   extern unsigned int get_sendq(struct Client *);
422 + extern unsigned int get_recvq(struct Client *);
423   extern const char *get_client_class(struct Client *);
424   extern int get_client_ping(struct Client *, int *);
425   extern void check_class(void);
# Line 514 | Line 448 | extern struct ConfItem *find_matching_na
448   extern struct ConfItem *find_exact_name_conf(ConfType, const struct Client *, const char *,
449                                               const char *, const char *);
450   extern void delete_conf_item(struct ConfItem *);
451 < extern void report_confitem_types(struct Client *, ConfType, int);
451 > extern void report_confitem_types(struct Client *, ConfType);
452   extern void yyerror(const char *);
519 – extern int conf_yy_fatal_error(const char *);
520 – extern int conf_fbgets(char *, unsigned int, FBFILE *);
453   extern void write_conf_line(struct Client *, struct ConfItem *,
454                              const char *, time_t);
455   extern int remove_conf_line(ConfType, struct Client *, const char *,
# Line 530 | Line 462 | extern int conf_add_server(struct ConfIt
462   extern void conf_add_class_to_conf(struct ConfItem *, const char *);
463  
464   /* XXX consider moving these into csvlib.h */
465 < extern void parse_csv_file(FBFILE *, ConfType);
466 <
467 < extern char *get_oper_name(const struct Client *);
465 > extern void parse_csv_file(FILE *, ConfType);
466 > extern int find_and_delete_temporary(const char *, const char *, int);
467 > extern const char *get_oper_name(const struct Client *);
468  
469   extern void *map_to_conf(struct ConfItem *);
470   extern struct ConfItem *unmap_conf_item(void *);
471   /* XXX should the parse_aline stuff go into another file ?? */
472   #define AWILD 0x1               /* check wild cards */
541 – #define NOUSERLOOKUP 0x2 /* Don't lookup the user@host on /rkline nick */
473   extern int parse_aline(const char *, struct Client *, int, char **,
474                         int, char **, char **, time_t *, char **, char **);
475   extern int valid_comment(struct Client *, char *, int);
# Line 560 | Line 491 | extern int match_conf_password(const cha
491   extern void cluster_a_line(struct Client *,
492                             const char *, int, int, const char *,...);
493   extern void rebuild_cidr_class(struct ConfItem *, struct ClassItem *);
563 –
564 – /* XXX **/
565 – //extern int yylex(void);
566 –
494   #endif /* INCLUDED_s_conf_h */

Diff Legend

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