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 31 by knight, Sun Oct 2 20:34:05 2005 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 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 < typedef enum {  
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,
53    CLASS_TYPE,
54    OPER_TYPE,
# Line 61 | 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;
71 <  dlink_node node;      /* link into known ConfItems of this type */
93 >  void *regexpname;
94    unsigned int flags;
95    ConfType type;
96   };
# Line 92 | 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 103 | Line 131 | struct AccessItem
131    char *           reason;
132    char *           oper_reason;
133    char *           user;     /* user part of user@host */
106 –  int              port;
107 –  char *           fakename;   /* Mask name */
134    time_t           hold;     /* Hold action until this time (calendar time) */
135    struct ConfItem *class_ptr;  /* Class of connection */
110 –  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;
115 –  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 133 | 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 */
137 <  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;
144 –  dlink_node node;
172   };
173  
147 – #define ConFreq(x)      ((x)->con_freq)
148 – #define PingFreq(x)     ((x)->ping_freq)
149 – #define PingWarning(x)  ((x)->ping_warning)
150 – #define MaxTotal(x)     ((x)->max_total)
151 – #define MaxGlobal(x)    ((x)->max_global)
152 – #define MaxLocal(x)     ((x)->max_local)
153 – #define MaxIdent(x)     ((x)->max_ident)
154 – #define MaxPerIp(x)     ((x)->max_perip)
155 – #define MaxSendq(x)     ((x)->max_sendq)
156 – #define CurrUserCount(x) ((x)->curr_user_count)
157 – #define CidrBitlenIPV4(x)       ((x)->cidr_bitlen_ipv4)
158 – #define CidrBitlenIPV6(x)       ((x)->cidr_bitlen_ipv6)
159 – #define NumberPerCidr(x) ((x)->number_per_cidr)
160 –
161 – #define ClassPtr(x)      ((x)->class_ptr)
162 –
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
170 < #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 179 | 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 197 | 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 212 | 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
224 < #define CONF_FLAGS_RESTRICTED           0x00002000
225 < #define CONF_FLAGS_CAN_FLOOD            0x00100000
226 < #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
235 < #define CONF_FLAGS_EXEMPTRESV           0x00800000
236 < #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 246 | 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)
249 – #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)
253 – #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)
257 – #define IsConfCompressed(x)     ((x)->flags & CONF_FLAGS_COMPRESSED)
258 – #define SetConfCompressed(x)    ((x)->flags |= CONF_FLAGS_COMPRESSED)
259 – #define ClearConfCompressed(x)  ((x)->flags &= ~CONF_FLAGS_COMPRESSED)
260 – #define IsConfCryptLink(x)      ((x)->flags & CONF_FLAGS_CRYPTLINK)
261 – #define SetConfCryptLink(x)     ((x)->flags |= CONF_FLAGS_CRYPTLINK)
262 – #define ClearConfCryptLink(x)   ((x)->flags &= ~CONF_FLAGS_CRYPTLINK)
263 – #define IsConfLazyLink(x)       ((x)->flags & CONF_FLAGS_LAZY_LINK)
264 – #define SetConfLazyLink(x)      ((x)->flags = CONF_FLAGS_LAZY_LINK)
265 – #define ClearConfLazyLink(x)    ((x)->flags &= ~CONF_FLAGS_LAZY_LINK)
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 275 | 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 |\
295 <                                 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 311 | Line 308 | struct config_file_entry
308    const char *cresvfile;
309    const char *nresvfile;
310  
314 –  char *logpath;
315 –  char *operlog;
316 –
317 –  char *servlink_path;
311    char *egdpool_path;
312 +  char *service_name;
313  
314    MessageFile motd;
315    MessageFile opermotd;
316    MessageFile linksfile;
317  
324 –  unsigned char compression_level;
318    int gline_min_cidr;
319    int gline_min_cidr6;
327 –  int dot_in_ip6_addr;
320    int dots_in_ident;
321    int failed_oper_notice;
322    int anti_spam_exit_message_time;
323 <  int max_accept;
323 >  unsigned int max_accept;
324 >  unsigned int max_watch;
325    int max_nick_time;
326 <  int max_nick_changes;
326 >  unsigned int max_nick_changes;
327    int ts_max_delta;
328    int ts_warn_delta;
329    int anti_nick_flood;
330    int kline_with_reason;
331    int warn_no_nline;
332    int invisible_on_connect;
333 +  int stats_e_disabled;
334    int stats_o_oper_only;
335    int stats_k_oper_only;
336    int stats_i_oper_only;
# Line 357 | Line 351 | struct config_file_entry
351    int pace_wait_simple;
352    int gline_time;
353    int gline_logging;
360 –  int idletime;
354    int oper_only_umodes;
355    int oper_umodes;
356    int max_targets;
# Line 373 | Line 366 | struct config_file_entry
366    int ping_cookie;
367    int disable_auth;
368    int disable_remote;
376 – #ifdef HAVE_LIBCRYPTO
377 –  struct EncCapability *default_cipher_preference;
378 – #endif
369   };
370  
371   struct config_channel_entry
372   {
373 +  int disable_fake_channels;
374    int restrict_channels;
375    int disable_local_channels;
376    int use_except;
# Line 387 | Line 378 | struct config_channel_entry
378    int use_knock;
379    int knock_delay;
380    int knock_delay_channel;
390 –  int invite_ops_only;
381    unsigned int max_bans;
382    unsigned int max_chans_per_user;
383    int no_create_on_split;
# Line 400 | 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;
405 –  char *hidden_name;
396    int links_delay;
397    int links_disabled;
398    int hidden;
# Line 412 | 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 419 | Line 410 | struct server_info
410   #ifdef HAVE_LIBCRYPTO
411    char *rsa_private_key_file;
412    RSA *rsa_private_key;
413 <  SSL_CTX *ctx;
413 >  SSL_CTX *server_ctx;
414 >  SSL_CTX *client_ctx;
415   #endif
424 –  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 442 | Line 433 | struct admin_info
433   struct logging_entry
434   {
435    unsigned int use_logging;
445 –  char operlog[PATH_MAX + 1];
446 –  char userlog[PATH_MAX + 1];
447 –  char glinelog[PATH_MAX + 1];
448 –  char ioerrlog[PATH_MAX + 1];
449 –  char klinelog[PATH_MAX + 1];
450 –  char killlog[PATH_MAX + 1];
451 –  char operspylog[PATH_MAX + 1];
452 –  char failed_operlog[PATH_MAX + 1];
436   };
437  
438 < extern unsigned int scount;
456 < extern int ypass;
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 461 | 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;
465 < extern dlink_list temporary_dlines;
466 < extern dlink_list temporary_glines;
446 > extern dlink_list service_items;
447   extern dlink_list temporary_xlines;
468 – extern dlink_list temporary_rxlines;
469 – 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 476 | Line 454 | extern struct admin_info AdminInfo;
454   extern int valid_wild_card(struct Client *, int, int, ...);
455   /* End GLOBAL section */
456  
457 < extern unsigned long get_sendq(struct Client *);
457 > extern unsigned int get_sendq(struct Client *);
458   extern const char *get_client_class(struct Client *);
459   extern int get_client_ping(struct Client *, int *);
460   extern void check_class(void);
461   extern void init_class(void);
462   extern struct ConfItem *find_class(const char *);
463   extern void init_ip_hash_table(void);
464 < extern void count_ip_hash(int *, unsigned long *);
464 > extern void count_ip_hash(unsigned int *, uint64_t *);
465   extern void remove_one_ip(struct irc_ssaddr *);
466   extern struct ConfItem *make_conf_item(ConfType type);
467   extern void free_access_item(struct AccessItem *);
# Line 499 | Line 477 | extern struct AccessItem *find_kill(stru
477   extern struct AccessItem *find_gline(struct Client *);
478   extern int conf_connect_allowed(struct irc_ssaddr *, int);
479   extern char *oper_privs_as_string(const unsigned int);
480 < extern void split_nuh(char *mask, char **nick, char **user, char **host);
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 *);
510 – extern int conf_yy_fatal_error(const char *);
511 – 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 517 | Line 493 | extern void add_temp_line(struct ConfIte
493   extern void cleanup_tklines(void *);
494   extern const char *get_conf_name(ConfType);
495   extern int rehash(int);
496 < extern int conf_add_server(struct ConfItem *, unsigned int, const char *);
496 > extern int conf_add_server(struct ConfItem *, const char *);
497   extern void conf_add_class_to_conf(struct ConfItem *, const char *);
522 – extern void conf_add_d_conf(struct AccessItem *);
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 535 | Line 510 | extern int parse_aline(const char *, str
510                         int, char **, char **, time_t *, char **, char **);
511   extern int valid_comment(struct Client *, char *, int);
512  
538 – /* XXX */
539 – extern int yylex(void);
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)
520 < #define IRCD_SOCKET_ERROR (-2)
521 < #define I_LINE_FULL       (-3)
522 < #define TOO_MANY          (-4)
523 < #define BANNED_CLIENT     (-5)
551 < #define TOO_FAST          (-6)
520 > #define I_LINE_FULL       (-2)
521 > #define TOO_MANY          (-3)
522 > #define BANNED_CLIENT     (-4)
523 > #define TOO_FAST          (-5)
524  
525   #define CLEANUP_TKLINES_TIME 60
526  
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 *);
558 –
530   #endif /* INCLUDED_s_conf_h */

Comparing:
ircd-hybrid/include/s_conf.h (property svn:keywords), Revision 31 by knight, Sun Oct 2 20:34:05 2005 UTC vs.
ircd-hybrid-8/include/conf.h (property svn:keywords), Revision 1379 by michael, Mon Apr 30 19:49:57 2012 UTC

# Line 1 | Line 1
1 < "Id Revision"
1 > Id Revision

Diff Legend

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