ViewVC Help

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

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

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 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 125 | Line 120 | struct AccessItem
120		unsigned int     modes;
121		unsigned int     port;
122		int              clients;  /* Number of *LOCAL* clients using this */
123	<	struct irc_ssaddr my_ipnum; /* ip to bind to for outgoing connect */
124	<	struct irc_ssaddr ipnum;      /* ip to connect to */
123	>	int              bits;
124	>	int              type;
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 137 | Line 134 | struct AccessItem
134		struct ConfItem *class_ptr;  /* Class of connection */
135		int              aftype;
136		#ifdef HAVE_LIBCRYPTO
137	+	/* certs */
138	+	char *cipher_list;
139		char *           rsa_public_key_file;
140		RSA *            rsa_public_key;
142	–	struct EncCapability *cipher_preference;
141		#endif
142		void *regexuser;
143		void *regexhost;
144	+	dlink_list leaf_list;
145	+	dlink_list hub_list;
146		};
147
148		struct ClassItem
#	Line 150 | 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 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
262	<	#define CONF_FLAGS_CRYPTLINK            0x00080000
263	<	#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_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 275 | Line 241 | struct CidrItem
241		#define IsConfExemptLimits(x)   ((x)->flags & CONF_FLAGS_NOLIMIT)
242		#define IsConfExemptGline(x)    ((x)->flags & CONF_FLAGS_EXEMPTGLINE)
243		#define IsConfExemptResv(x)     ((x)->flags & CONF_FLAGS_EXEMPTRESV)
278	–	#define IsConfIdlelined(x)      ((x)->flags & CONF_FLAGS_IDLE_LINED)
244		#define IsConfDoIdentd(x)       ((x)->flags & CONF_FLAGS_DO_IDENTD)
245		#define IsConfDoSpoofIp(x)      ((x)->flags & CONF_FLAGS_SPOOF_IP)
246		#define IsConfSpoofNotice(x)    ((x)->flags & CONF_FLAGS_SPOOF_NOTICE)
282	–	#define IsConfRestricted(x)     ((x)->flags & CONF_FLAGS_RESTRICTED)
247		#define IsConfEncrypted(x)      ((x)->flags & CONF_FLAGS_ENCRYPTED)
248		#define SetConfEncrypted(x)     ((x)->flags |= CONF_FLAGS_ENCRYPTED)
249		#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)
250		#define IsConfAllowAutoConn(x)  ((x)->flags & CONF_FLAGS_ALLOW_AUTO_CONN)
251		#define SetConfAllowAutoConn(x) ((x)->flags |= CONF_FLAGS_ALLOW_AUTO_CONN)
252		#define ClearConfAllowAutoConn(x) ((x)->flags &= ~CONF_FLAGS_ALLOW_AUTO_CONN)
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)
301	<	#define IsConfTopicBurst(x)     ((x)->flags & CONF_FLAGS_TOPICBURST)
302	<	#define SetConfTopicBurst(x)    ((x)->flags |= CONF_FLAGS_TOPICBURST)
303	<	#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.
262		*/
263		#define SHARED_KLINE            0x0001
264	<	#define SHARED_TKLINE           0x0002
265	<	#define SHARED_UNKLINE          0x0004
266	<	#define SHARED_XLINE            0x0008
267	<	#define SHARED_TXLINE           0x0010
268	<	#define SHARED_UNXLINE          0x0020
269	<	#define SHARED_RESV             0x0040
270	<	#define SHARED_TRESV            0x0080
271	<	#define SHARED_UNRESV           0x0100
272	<	#define SHARED_LOCOPS           0x0200
273	<	#define SHARED_ALL              (SHARED_KLINE | SHARED_TKLINE | SHARED_UNKLINE | \
274	<	SHARED_XLINE | SHARED_TXLINE | SHARED_UNXLINE | \
275	<	SHARED_RESV | SHARED_TRESV | SHARED_UNRESV |\
321	<	SHARED_LOCOPS)
322	<
323	<	/* gline acl entry actions */
324	<	#define GDENY_BLOCK             0x1
325	<	#define GDENY_REJECT            0x2
264	>	#define SHARED_UNKLINE          0x0002
265	>	#define SHARED_XLINE            0x0004
266	>	#define SHARED_UNXLINE          0x0008
267	>	#define SHARED_RESV             0x0010
268	>	#define SHARED_UNRESV           0x0020
269	>	#define SHARED_LOCOPS           0x0040
270	>	#define SHARED_DLINE            0x0080
271	>	#define SHARED_UNDLINE          0x0100
272	>	#define SHARED_ALL              (SHARED_KLINE | SHARED_UNKLINE |\
273	>	SHARED_XLINE | SHARED_UNXLINE |\
274	>	SHARED_RESV | SHARED_UNRESV |\
275	>	SHARED_LOCOPS | SHARED_DLINE | SHARED_UNDLINE)
276
277		struct config_file_entry
278		{
#	Line 330 | Line 280 | struct config_file_entry
280		const char *configfile;
281		const char *klinefile;
282		const char *xlinefile;
333	–	const char *rxlinefile;
334	–	const char *rklinefile;
283		const char *dlinefile;
336	–	const char *glinefile;
284		const char *cresvfile;
285		const char *nresvfile;
286
340	–	char *logpath;
341	–	char *operlog;
342	–
343	–	char *servlink_path;
287		char *egdpool_path;
288		char *service_name;
289
290		MessageFile motd;
348	–	MessageFile opermotd;
291		MessageFile linksfile;
292
351	–	unsigned char compression_level;
293		int gline_min_cidr;
294		int gline_min_cidr6;
295		int dots_in_ident;
#	Line 361 | Line 302 | struct config_file_entry
302		int ts_max_delta;
303		int ts_warn_delta;
304		int anti_nick_flood;
364	–	int kline_with_reason;
305		int warn_no_nline;
306		int invisible_on_connect;
307		int stats_e_disabled;
#	Line 375 | Line 315 | struct config_file_entry
315		int oper_pass_resv;
316		int glines;
317		int hide_spoof_ips;
378	–	int burst_away;
379	–	int use_whois_actually;
318		int tkline_expire_notices;
319		int opers_bypass_callerid;
320		int ignore_bogus_ts;
383	–	char *kline_reason;
321		int pace_wait;
322		int pace_wait_simple;
323		int gline_time;
324	<	int gline_logging;
388	<	int idletime;
324	>	int gline_request_time;
325		int oper_only_umodes;
326		int oper_umodes;
327		int max_targets;
#	Line 394 | Line 330 | struct config_file_entry
330		int min_nonwildcard_simple;
331		int kill_chase_time_limit;
332		int default_floodcount;
397	–	int client_flood;
333		/* 0 == don't use throttle... */
334		int throttle_time;
335		int use_egd;
336		int ping_cookie;
337		int disable_auth;
338		int disable_remote;
404	–	#ifdef HAVE_LIBCRYPTO
405	–	struct EncCapability *default_cipher_preference;
406	–	#endif
339		};
340
341		struct config_channel_entry
342		{
343		int disable_fake_channels;
344		int restrict_channels;
413	–	int disable_local_channels;
414	–	int use_except;
415	–	int use_invex;
416	–	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;
424	–	int burst_topicwho;
353		int default_split_server_count;
354		int default_split_user_count;
355		};
#	Line 434 | Line 362 | struct config_server_hide
362		int links_delay;
363		int links_disabled;
364		int hidden;
437	–	int disable_hidden;
365		int hide_server_ips;
366		};
367
#	Line 450 | Line 377 | struct server_info
377		RSA *rsa_private_key;
378		SSL_CTX *server_ctx;
379		SSL_CTX *client_ctx;
453	–	unsigned int tls_version;
380		#endif
381		int hub;
382		struct irc_ssaddr ip;
#	Line 472 | Line 398 | struct admin_info
398		struct logging_entry
399		{
400		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];
401		};
402
485	–	extern dlink_list gdeny_items;
403		extern dlink_list class_items;
404		extern dlink_list server_items;
405		extern dlink_list cluster_items;
#	Line 491 | 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;
494	–	extern dlink_list temporary_klines;
495	–	extern dlink_list temporary_dlines;
496	–	extern dlink_list temporary_glines;
411		extern dlink_list temporary_xlines;
498	–	extern dlink_list temporary_rxlines;
499	–	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 507 | 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 532 | Line 445 | extern char *oper_privs_as_string(const
445		extern void split_nuh(struct split_nuh_item *);
446		extern struct ConfItem *find_matching_name_conf(ConfType, const char *,
447		const char *, const char *, int);
448	<	extern struct ConfItem *find_exact_name_conf(ConfType, const char *,
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 *);
540	–	extern int conf_yy_fatal_error(const char *);
541	–	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 551 | 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 */
562	–	#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 581 | 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 *);
584	–
585	–	/* XXX **/
586	–	extern int yylex(void);
587	–
494		#endif /* INCLUDED_s_conf_h */

Diff Legend

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