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/conf.h (file contents):
Revision 1324 by michael, Fri Mar 30 21:40:38 2012 UTC vs.
Revision 1364 by michael, Sun Apr 22 19:28:21 2012 UTC

#	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 244 | Line 240 | struct CidrItem
240		#define CONF_FLAGS_LIMIT_IP             0x00000002
241		#define CONF_FLAGS_NO_TILDE             0x00000004
242		#define CONF_FLAGS_NEED_IDENTD          0x00000008
243	<	/*                                      0x00000010 */
244	<	#define CONF_FLAGS_NOMATCH_IP           0x00000020
245	<	#define CONF_FLAGS_EXEMPTKLINE          0x00000040
246	<	#define CONF_FLAGS_NOLIMIT              0x00000080
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
256	<	/*                                      0x00002000 */
257	<	#define CONF_FLAGS_CAN_FLOOD            0x00100000
258	<	#define CONF_FLAGS_NEED_PASSWORD        0x00200000
243	>	#define CONF_FLAGS_NOMATCH_IP           0x00000010
244	>	#define CONF_FLAGS_EXEMPTKLINE          0x00000020
245	>	#define CONF_FLAGS_NOLIMIT              0x00000040
246	>	#define CONF_FLAGS_SPOOF_IP             0x00000080
247	>	#define CONF_FLAGS_SPOOF_NOTICE         0x00000100
248	>	#define CONF_FLAGS_REDIR                0x00000200
249	>	#define CONF_FLAGS_EXEMPTGLINE          0x00000400
250	>	#define CONF_FLAGS_CAN_FLOOD            0x00000800
251	>	#define CONF_FLAGS_NEED_PASSWORD        0x00001000
252		/* server flags */
253	<	#define CONF_FLAGS_ALLOW_AUTO_CONN      0x00004000
254	<	/*                                      0x00008000 */
255	<	#define CONF_FLAGS_ENCRYPTED            0x00010000
256	<	#define CONF_FLAGS_UNUSED1___           0x00020000
257	<	#define CONF_FLAGS_TEMPORARY            0x00040000
258	<	#define CONF_FLAGS_UNUSED2___           0x00080000
259	<	#define CONF_FLAGS_BURST_AWAY           0x00400000
267	<	#define CONF_FLAGS_EXEMPTRESV           0x00800000
268	<	#define CONF_FLAGS_TOPICBURST           0x01000000
269	<	#define CONF_FLAGS_SSL                  0x02000000
253	>	#define CONF_FLAGS_ALLOW_AUTO_CONN      0x00002000
254	>	#define CONF_FLAGS_ENCRYPTED            0x00004000
255	>	#define CONF_FLAGS_TEMPORARY            0x00008000
256	>	#define CONF_FLAGS_BURST_AWAY           0x00010000
257	>	#define CONF_FLAGS_EXEMPTRESV           0x00020000
258	>	#define CONF_FLAGS_TOPICBURST           0x00040000
259	>	#define CONF_FLAGS_SSL                  0x00080000
260
261		/* Macros for struct AccessItem */
262		#define IsLimitIp(x)            ((x)->flags & CONF_FLAGS_LIMIT_IP)
#	Line 519 | Line 509 | extern struct ConfItem *find_exact_name_
509		extern void delete_conf_item(struct ConfItem *);
510		extern void report_confitem_types(struct Client *, ConfType, int);
511		extern void yyerror(const char *);
522	–	extern int conf_yy_fatal_error(const char *);
523	–	extern int conf_fbgets(char *, unsigned int, FBFILE *);
512		extern void write_conf_line(struct Client *, struct ConfItem *,
513		const char *, time_t);
514		extern int remove_conf_line(ConfType, struct Client *, const char *,
#	Line 533 | Line 521 | extern int conf_add_server(struct ConfIt
521		extern void conf_add_class_to_conf(struct ConfItem *, const char *);
522
523		/* XXX consider moving these into csvlib.h */
524	<	extern void parse_csv_file(FBFILE *, ConfType);
524	>	extern void parse_csv_file(FILE *, ConfType);
525
526	<	extern char *get_oper_name(const struct Client *);
526	>	extern const char *get_oper_name(const struct Client *);
527
528		extern void *map_to_conf(struct ConfItem *);
529		extern struct ConfItem *unmap_conf_item(void *);
#	Line 563 | Line 551 | extern int match_conf_password(const cha
551		extern void cluster_a_line(struct Client *,
552		const char *, int, int, const char *,...);
553		extern void rebuild_cidr_class(struct ConfItem *, struct ClassItem *);
566	–
567	–	/* XXX **/
568	–	//extern int yylex(void);
569	–
554		#endif /* INCLUDED_s_conf_h */

Diff Legend

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