ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/svn/ircd-hybrid/trunk/include/conf.h

Comparing:
ircd-hybrid/include/s_conf.h (file contents), Revision 30 by adx, Sun Oct 2 20:03:27 2005 UTC vs.
ircd-hybrid-8/include/conf.h (file contents), Revision 1432 by michael, Sat Jun 9 19:40:08 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 19 | Line 19
19		*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
20		*  USA
21		*
22	<	*  $Id: s_conf.h,v 7.335 2005/09/29 00:46:55 adx Exp $
22	>	*  $Id$
23		*/
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	<	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. */
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	>	dlink_list leaf_list;
146	>	dlink_list hub_list;
147		};
148
149		struct ClassItem
150		{
151	<	long max_sendq;
151	>	dlink_list list_ipv4;         /* base of per cidr ipv4 client link list */
152	>	dlink_list list_ipv6;         /* base of per cidr ipv6 client link list */
153	>	unsigned int max_sendq;
154		int con_freq;
155		int ping_freq;
156		int ping_warning;
#	Line 133 | Line 163 | struct ClassItem
163		int cidr_bitlen_ipv4;
164		int cidr_bitlen_ipv6;
165		int number_per_cidr;
166	<	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 */
166	>	int active;
167		};
168
169		struct CidrItem
170		{
171	+	dlink_node node;
172		struct irc_ssaddr mask;
173		int number_on_this_cidr;
144	–	dlink_node node;
174		};
175
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	–
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
170	<	#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
178	<	#define CONF_XLINE              0x00001000
179	<	#define CONF_ULINE              0x00002000
180	<	#define CONF_EXEMPTDLINE        0x00004000
181	<	#define CONF_GLINE              0x00008000
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 192 | 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)
196	<	#define SetConfHub(x)           ((x)->status = CONF_HUB)
197	<	#define IsConfLeaf(x)           ((x)->status == CONF_LEAF)
198	<	#define SetConfLeaf(x)          ((x)->status = CONF_LEAF)
199	<	#define IsConfHubOrLeaf(x)      ((x)->status & (CONF_HUB|CONF_LEAF))
200	<	#define IsConfKill(x)           ((x)->status == CONF_KILL)
203	>	#define IsConfKill(x)           ((x)->status == CONF_KLINE)
204		#define IsConfClient(x)         ((x)->status & CONF_CLIENT)
202	–	#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 212 | 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
224	<	#define CONF_FLAGS_RESTRICTED           0x00002000
225	<	#define CONF_FLAGS_CAN_FLOOD            0x00100000
226	<	#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
235	<	#define CONF_FLAGS_EXEMPTRESV           0x00800000
236	<	#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 246 | 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)
249	–	#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)
253	–	#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)
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)
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 275 | 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 |\
295	<	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 311 | Line 299 | struct config_file_entry
299		const char *cresvfile;
300		const char *nresvfile;
301
314	–	char *logpath;
315	–	char *operlog;
316	–
317	–	char *servlink_path;
302		char *egdpool_path;
303	+	char *service_name;
304
305		MessageFile motd;
306		MessageFile opermotd;
307		MessageFile linksfile;
308
324	–	unsigned char compression_level;
309		int gline_min_cidr;
310		int gline_min_cidr6;
327	–	int dot_in_ip6_addr;
311		int dots_in_ident;
312		int failed_oper_notice;
313		int anti_spam_exit_message_time;
314	<	int max_accept;
314	>	unsigned int max_accept;
315	>	unsigned int max_watch;
316		int max_nick_time;
317	<	int max_nick_changes;
317	>	unsigned int max_nick_changes;
318		int ts_max_delta;
319		int ts_warn_delta;
320		int anti_nick_flood;
321		int kline_with_reason;
322		int warn_no_nline;
323		int invisible_on_connect;
324	+	int stats_e_disabled;
325		int stats_o_oper_only;
326		int stats_k_oper_only;
327		int stats_i_oper_only;
#	Line 357 | Line 342 | struct config_file_entry
342		int pace_wait_simple;
343		int gline_time;
344		int gline_logging;
360	–	int idletime;
345		int oper_only_umodes;
346		int oper_umodes;
347		int max_targets;
#	Line 373 | Line 357 | struct config_file_entry
357		int ping_cookie;
358		int disable_auth;
359		int disable_remote;
376	–	#ifdef HAVE_LIBCRYPTO
377	–	struct EncCapability *default_cipher_preference;
378	–	#endif
360		};
361
362		struct config_channel_entry
363		{
364	+	int disable_fake_channels;
365		int restrict_channels;
366		int disable_local_channels;
367		int use_except;
#	Line 387 | Line 369 | struct config_channel_entry
369		int use_knock;
370		int knock_delay;
371		int knock_delay_channel;
390	–	int invite_ops_only;
372		unsigned int max_bans;
373		unsigned int max_chans_per_user;
374	+	unsigned int max_chans_per_oper;
375		int no_create_on_split;
376		int no_join_on_split;
377		int quiet_on_ban;
396	–	int burst_topicwho;
378		int default_split_server_count;
379		int default_split_user_count;
380		};
381
382		struct config_server_hide
383		{
384	+	char *hidden_name;
385		int flatten_links;
386		int hide_servers;
405	–	char *hidden_name;
387		int links_delay;
388		int links_disabled;
389		int hidden;
#	Line 412 | Line 393 | struct config_server_hide
393
394		struct server_info
395		{
396	+	char *sid;
397		char *name;
398		char *description;
399		char *network_name;
#	Line 419 | Line 401 | struct server_info
401		#ifdef HAVE_LIBCRYPTO
402		char *rsa_private_key_file;
403		RSA *rsa_private_key;
404	<	SSL_CTX *ctx;
404	>	SSL_CTX *server_ctx;
405	>	SSL_CTX *client_ctx;
406		#endif
424	–	char *sid;
407		int hub;
408		struct irc_ssaddr ip;
409		struct irc_ssaddr ip6;
410	<	int max_clients;
410	>	unsigned int max_clients;
411		int specific_ipv4_vhost;
412		int specific_ipv6_vhost;
413		struct sockaddr_in dns_host;
#	Line 442 | Line 424 | struct admin_info
424		struct logging_entry
425		{
426		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];
427		};
428
429	<	extern unsigned int scount;
456	<	extern int ypass;
429	>	extern dlink_list gdeny_items;
430		extern dlink_list class_items;
431		extern dlink_list server_items;
432		extern dlink_list cluster_items;
#	Line 461 | Line 434 | extern dlink_list hub_items;
434		extern dlink_list rxconf_items;
435		extern dlink_list rkconf_items;
436		extern dlink_list leaf_items;
437	<	extern dlink_list temporary_klines;
465	<	extern dlink_list temporary_dlines;
466	<	extern dlink_list temporary_glines;
437	>	extern dlink_list service_items;
438		extern dlink_list temporary_xlines;
468	–	extern dlink_list temporary_rxlines;
469	–	extern dlink_list temporary_rklines;
439		extern struct logging_entry ConfigLoggingEntry;
440		extern struct config_file_entry ConfigFileEntry;/* defined in ircd.c*/
441		extern struct config_channel_entry ConfigChannel;/* defined in channel.c*/
#	Line 476 | Line 445 | extern struct admin_info AdminInfo;
445		extern int valid_wild_card(struct Client *, int, int, ...);
446		/* End GLOBAL section */
447
448	<	extern unsigned long get_sendq(struct Client *);
448	>	extern unsigned int get_sendq(struct Client *);
449		extern const char *get_client_class(struct Client *);
450		extern int get_client_ping(struct Client *, int *);
451		extern void check_class(void);
452		extern void init_class(void);
453		extern struct ConfItem *find_class(const char *);
454		extern void init_ip_hash_table(void);
455	<	extern void count_ip_hash(int *, unsigned long *);
455	>	extern void count_ip_hash(unsigned int *, uint64_t *);
456		extern void remove_one_ip(struct irc_ssaddr *);
457		extern struct ConfItem *make_conf_item(ConfType type);
458		extern void free_access_item(struct AccessItem *);
#	Line 499 | Line 468 | extern struct AccessItem *find_kill(stru
468		extern struct AccessItem *find_gline(struct Client *);
469		extern int conf_connect_allowed(struct irc_ssaddr *, int);
470		extern char *oper_privs_as_string(const unsigned int);
471	<	extern void split_nuh(char *mask, char **nick, char **user, char **host);
471	>	extern void split_nuh(struct split_nuh_item *);
472		extern struct ConfItem *find_matching_name_conf(ConfType, const char *,
473		const char *, const char *, int);
474	<	extern struct ConfItem *find_exact_name_conf(ConfType, const char *,
474	>	extern struct ConfItem *find_exact_name_conf(ConfType, const struct Client *, const char *,
475		const char *, const char *);
476		extern void delete_conf_item(struct ConfItem *);
477	<	extern void report_confitem_types(struct Client *, ConfType, int);
477	>	extern void report_confitem_types(struct Client *, ConfType);
478		extern void yyerror(const char *);
510	–	extern int conf_yy_fatal_error(const char *);
511	–	extern int conf_fbgets(char *, unsigned int, FBFILE *);
479		extern void write_conf_line(struct Client *, struct ConfItem *,
480		const char *, time_t);
481		extern int remove_conf_line(ConfType, struct Client *, const char *,
#	Line 517 | Line 484 | extern void add_temp_line(struct ConfIte
484		extern void cleanup_tklines(void *);
485		extern const char *get_conf_name(ConfType);
486		extern int rehash(int);
487	<	extern int conf_add_server(struct ConfItem *, unsigned int, const char *);
487	>	extern int conf_add_server(struct ConfItem *, const char *);
488		extern void conf_add_class_to_conf(struct ConfItem *, const char *);
522	–	extern void conf_add_d_conf(struct AccessItem *);
489
490		/* XXX consider moving these into csvlib.h */
491	<	extern void parse_csv_file(FBFILE *, ConfType);
492	<
493	<	extern char *get_oper_name(const struct Client *);
491	>	extern void parse_csv_file(FILE *, ConfType);
492	>	extern int find_and_delete_temporary(const char *, const char *, int);
493	>	extern const char *get_oper_name(const struct Client *);
494
495		extern void *map_to_conf(struct ConfItem *);
496		extern struct ConfItem *unmap_conf_item(void *);
#	Line 535 | Line 501 | extern int parse_aline(const char *, str
501		int, char **, char **, time_t *, char **, char **);
502		extern int valid_comment(struct Client *, char *, int);
503
538	–	/* XXX */
539	–	extern int yylex(void);
504
505		#define TK_SECONDS 0
506		#define TK_MINUTES 1
507	<	extern time_t valid_tkline(char *, int);
507	>	extern time_t valid_tkline(const char *, int);
508		extern int match_conf_password(const char *, const struct AccessItem *);
509
510		#define NOT_AUTHORIZED    (-1)
511	<	#define IRCD_SOCKET_ERROR (-2)
512	<	#define I_LINE_FULL       (-3)
513	<	#define TOO_MANY          (-4)
514	<	#define BANNED_CLIENT     (-5)
551	<	#define TOO_FAST          (-6)
511	>	#define I_LINE_FULL       (-2)
512	>	#define TOO_MANY          (-3)
513	>	#define BANNED_CLIENT     (-4)
514	>	#define TOO_FAST          (-5)
515
516		#define CLEANUP_TKLINES_TIME 60
517
518		extern void cluster_a_line(struct Client *,
519		const char *, int, int, const char *,...);
520		extern void rebuild_cidr_class(struct ConfItem *, struct ClassItem *);
558	–
521		#endif /* INCLUDED_s_conf_h */

Comparing:
ircd-hybrid/include/s_conf.h (property svn:keywords), Revision 30 by adx, Sun Oct 2 20:03:27 2005 UTC vs.
ircd-hybrid-8/include/conf.h (property svn:keywords), Revision 1432 by michael, Sat Jun 9 19:40:08 2012 UTC

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

Diff Legend

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