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 1329 by michael, Sun Apr 1 12:02:12 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 125 | Line 121 | struct AccessItem
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 137 | 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;
142	–	struct EncCapability *cipher_preference;
142		#endif
143		void *regexuser;
144		void *regexhost;
#	Line 245 | Line 244 | struct CidrItem
244		#define CONF_FLAGS_NOMATCH_IP           0x00000020
245		#define CONF_FLAGS_EXEMPTKLINE          0x00000040
246		#define CONF_FLAGS_NOLIMIT              0x00000080
247	<	#define CONF_FLAGS_IDLE_LINED           0x00000100
247	>	/*                                      0x00000100 */
248		#define CONF_FLAGS_SPOOF_IP             0x00000200
249		#define CONF_FLAGS_SPOOF_NOTICE         0x00000400
250		#define CONF_FLAGS_REDIR                0x00000800
251		#define CONF_FLAGS_EXEMPTGLINE          0x00001000
252	<	#define CONF_FLAGS_RESTRICTED           0x00002000
252	>	/*                                      0x00002000 */
253		#define CONF_FLAGS_CAN_FLOOD            0x00100000
254		#define CONF_FLAGS_NEED_PASSWORD        0x00200000
255		/* server flags */
256		#define CONF_FLAGS_ALLOW_AUTO_CONN      0x00004000
257	<	#define CONF_FLAGS_LAZY_LINK            0x00008000
257	>	/*                                      0x00008000 */
258		#define CONF_FLAGS_ENCRYPTED            0x00010000
259	<	#define CONF_FLAGS_COMPRESSED           0x00020000
259	>	#define CONF_FLAGS_UNUSED1___           0x00020000
260		#define CONF_FLAGS_TEMPORARY            0x00040000
261	<	#define CONF_FLAGS_CRYPTLINK            0x00080000
261	>	#define CONF_FLAGS_UNUSED2___           0x00080000
262		#define CONF_FLAGS_BURST_AWAY           0x00400000
263		#define CONF_FLAGS_EXEMPTRESV           0x00800000
264		#define CONF_FLAGS_TOPICBURST           0x01000000
265	+	#define CONF_FLAGS_SSL                  0x02000000
266
267		/* Macros for struct AccessItem */
268		#define IsLimitIp(x)            ((x)->flags & CONF_FLAGS_LIMIT_IP)
#	Line 275 | Line 275 | struct CidrItem
275		#define IsConfExemptLimits(x)   ((x)->flags & CONF_FLAGS_NOLIMIT)
276		#define IsConfExemptGline(x)    ((x)->flags & CONF_FLAGS_EXEMPTGLINE)
277		#define IsConfExemptResv(x)     ((x)->flags & CONF_FLAGS_EXEMPTRESV)
278	–	#define IsConfIdlelined(x)      ((x)->flags & CONF_FLAGS_IDLE_LINED)
278		#define IsConfDoIdentd(x)       ((x)->flags & CONF_FLAGS_DO_IDENTD)
279		#define IsConfDoSpoofIp(x)      ((x)->flags & CONF_FLAGS_SPOOF_IP)
280		#define IsConfSpoofNotice(x)    ((x)->flags & CONF_FLAGS_SPOOF_NOTICE)
282	–	#define IsConfRestricted(x)     ((x)->flags & CONF_FLAGS_RESTRICTED)
281		#define IsConfEncrypted(x)      ((x)->flags & CONF_FLAGS_ENCRYPTED)
282		#define SetConfEncrypted(x)     ((x)->flags |= CONF_FLAGS_ENCRYPTED)
283		#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)
284		#define IsConfAllowAutoConn(x)  ((x)->flags & CONF_FLAGS_ALLOW_AUTO_CONN)
285		#define SetConfAllowAutoConn(x) ((x)->flags |= CONF_FLAGS_ALLOW_AUTO_CONN)
286		#define ClearConfAllowAutoConn(x) ((x)->flags &= ~CONF_FLAGS_ALLOW_AUTO_CONN)
#	Line 301 | Line 293 | struct CidrItem
293		#define IsConfTopicBurst(x)     ((x)->flags & CONF_FLAGS_TOPICBURST)
294		#define SetConfTopicBurst(x)    ((x)->flags |= CONF_FLAGS_TOPICBURST)
295		#define ClearConfTopicBurst(x)  ((x)->flags &= ~CONF_FLAGS_TOPICBURST)
296	+	#define IsConfSSL(x)      ((x)->flags & CONF_FLAGS_SSL)
297	+	#define SetConfSSL(x)     ((x)->flags |= CONF_FLAGS_SSL)
298	+	#define ClearConfSSL(x)   ((x)->flags &= ~CONF_FLAGS_SSL)
299
300		/* shared/cluster server entry types
301		* These defines are used for both shared and cluster.
302		*/
303		#define SHARED_KLINE            0x0001
304	<	#define SHARED_TKLINE           0x0002
305	<	#define SHARED_UNKLINE          0x0004
306	<	#define SHARED_XLINE            0x0008
307	<	#define SHARED_TXLINE           0x0010
308	<	#define SHARED_UNXLINE          0x0020
309	<	#define SHARED_RESV             0x0040
310	<	#define SHARED_TRESV            0x0080
311	<	#define SHARED_UNRESV           0x0100
312	<	#define SHARED_LOCOPS           0x0200
313	<	#define SHARED_ALL              (SHARED_KLINE | SHARED_TKLINE | SHARED_UNKLINE | \
314	<	SHARED_XLINE | SHARED_TXLINE | SHARED_UNXLINE | \
315	<	SHARED_RESV | SHARED_TRESV | SHARED_UNRESV |\
321	<	SHARED_LOCOPS)
304	>	#define SHARED_UNKLINE          0x0002
305	>	#define SHARED_XLINE            0x0004
306	>	#define SHARED_UNXLINE          0x0008
307	>	#define SHARED_RESV             0x0010
308	>	#define SHARED_UNRESV           0x0020
309	>	#define SHARED_LOCOPS           0x0040
310	>	#define SHARED_DLINE            0x0080
311	>	#define SHARED_UNDLINE          0x0100
312	>	#define SHARED_ALL              (SHARED_KLINE | SHARED_UNKLINE |\
313	>	SHARED_XLINE | SHARED_UNXLINE |\
314	>	SHARED_RESV | SHARED_UNRESV |\
315	>	SHARED_LOCOPS | SHARED_DLINE | SHARED_UNDLINE)
316
317		/* gline acl entry actions */
318		#define GDENY_BLOCK             0x1
#	Line 339 | Line 333 | struct config_file_entry
333
334		char *logpath;
335		char *operlog;
342	–
343	–	char *servlink_path;
336		char *egdpool_path;
337		char *service_name;
338
#	Line 348 | Line 340 | struct config_file_entry
340		MessageFile opermotd;
341		MessageFile linksfile;
342
351	–	unsigned char compression_level;
343		int gline_min_cidr;
344		int gline_min_cidr6;
345		int dots_in_ident;
#	Line 385 | Line 376 | struct config_file_entry
376		int pace_wait_simple;
377		int gline_time;
378		int gline_logging;
388	–	int idletime;
379		int oper_only_umodes;
380		int oper_umodes;
381		int max_targets;
#	Line 401 | Line 391 | struct config_file_entry
391		int ping_cookie;
392		int disable_auth;
393		int disable_remote;
404	–	#ifdef HAVE_LIBCRYPTO
405	–	struct EncCapability *default_cipher_preference;
406	–	#endif
394		};
395
396		struct config_channel_entry
#	Line 450 | Line 437 | struct server_info
437		RSA *rsa_private_key;
438		SSL_CTX *server_ctx;
439		SSL_CTX *client_ctx;
453	–	unsigned int tls_version;
440		#endif
441		int hub;
442		struct irc_ssaddr ip;
#	Line 472 | Line 458 | struct admin_info
458		struct logging_entry
459		{
460		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];
461		};
462
463		extern dlink_list gdeny_items;
#	Line 532 | Line 510 | extern char *oper_privs_as_string(const
510		extern void split_nuh(struct split_nuh_item *);
511		extern struct ConfItem *find_matching_name_conf(ConfType, const char *,
512		const char *, const char *, int);
513	<	extern struct ConfItem *find_exact_name_conf(ConfType, const char *,
513	>	extern struct ConfItem *find_exact_name_conf(ConfType, const struct Client *, const char *,
514		const char *, const char *);
515		extern void delete_conf_item(struct ConfItem *);
516		extern void report_confitem_types(struct Client *, ConfType, int);
517		extern void yyerror(const char *);
518		extern int conf_yy_fatal_error(const char *);
519	<	extern int conf_fbgets(char *, unsigned int, FBFILE *);
519	>	extern int conf_fbgets(char *, unsigned int, FILE *);
520		extern void write_conf_line(struct Client *, struct ConfItem *,
521		const char *, time_t);
522		extern int remove_conf_line(ConfType, struct Client *, const char *,
#	Line 551 | Line 529 | extern int conf_add_server(struct ConfIt
529		extern void conf_add_class_to_conf(struct ConfItem *, const char *);
530
531		/* XXX consider moving these into csvlib.h */
532	<	extern void parse_csv_file(FBFILE *, ConfType);
532	>	extern void parse_csv_file(FILE *, ConfType);
533
534		extern char *get_oper_name(const struct Client *);
535
#	Line 581 | Line 559 | extern int match_conf_password(const cha
559		extern void cluster_a_line(struct Client *,
560		const char *, int, int, const char *,...);
561		extern void rebuild_cidr_class(struct ConfItem *, struct ClassItem *);
584	–
585	–	/* XXX **/
586	–	extern int yylex(void);
587	–
562		#endif /* INCLUDED_s_conf_h */

Diff Legend

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