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 1549 by michael, Mon Oct 1 18:11:11 2012 UTC vs.
ircd-hybrid/trunk/include/conf.h (file contents), Revision 3473 by michael, Sun May 4 15:40:26 2014 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  conf.h: A header for the configuration functions.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2005 by the past and present ircd coders, and others.
4	>	*  Copyright (c) 1997-2014 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 18 | Line 17
17		*  along with this program; if not, write to the Free Software
18		*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
19		*  USA
20	<	*
21	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file conf.h
23	>	* \brief A header for the configuration functions.
24	>	* \version $Id$
25		*/
26
27		#ifndef INCLUDED_s_conf_h
28		#define INCLUDED_s_conf_h
29		#include "config.h"
28	–	#ifdef HAVE_LIBCRYPTO
29	–	#include <openssl/rsa.h>
30	–	#endif
30		#include "ircd_defs.h"
32	–	#include "motd.h"               /* MessageFile */
31		#include "client.h"
32	<	#include "hook.h"
32	>	#include "conf_class.h"
33	>
34	>
35	>	#define CONF_NOREASON "<No reason supplied>"
36	>
37	>	#define IsConfOperator(x)       ((x)->type == CONF_OPER)
38	>	#define IsConfKill(x)           ((x)->type == CONF_KLINE)
39	>	#define IsConfClient(x)         ((x)->type == CONF_CLIENT)
40	>	#define IsConfGline(x)          ((x)->type == CONF_GLINE)
41	>
42	>	/* MaskItem->flags */
43	>	#define CONF_FLAGS_DO_IDENTD            0x00000001
44	>	#define CONF_FLAGS_NO_TILDE             0x00000004
45	>	#define CONF_FLAGS_NEED_IDENTD          0x00000008
46	>	#define CONF_FLAGS_EXEMPTKLINE          0x00000010
47	>	#define CONF_FLAGS_NOLIMIT              0x00000020
48	>	#define CONF_FLAGS_SPOOF_IP             0x00000040
49	>	#define CONF_FLAGS_SPOOF_NOTICE         0x00000080
50	>	#define CONF_FLAGS_REDIR                0x00000100
51	>	#define CONF_FLAGS_EXEMPTGLINE          0x00000200
52	>	#define CONF_FLAGS_CAN_FLOOD            0x00000400
53	>	#define CONF_FLAGS_NEED_PASSWORD        0x00000800
54	>	#define CONF_FLAGS_ALLOW_AUTO_CONN      0x00001000
55	>	#define CONF_FLAGS_ENCRYPTED            0x00002000
56	>	#define CONF_FLAGS_IN_DATABASE          0x00004000
57	>	#define CONF_FLAGS_EXEMPTRESV           0x00008000
58	>	#define CONF_FLAGS_SSL                  0x00010000
59	>	#define CONF_FLAGS_WEBIRC               0x00020000
60	>
61	>	/* Macros for struct MaskItem */
62	>	#define IsConfWebIRC(x)         ((x)->flags & CONF_FLAGS_WEBIRC)
63	>	#define IsNoTilde(x)            ((x)->flags & CONF_FLAGS_NO_TILDE)
64	>	#define IsConfCanFlood(x)       ((x)->flags & CONF_FLAGS_CAN_FLOOD)
65	>	#define IsNeedPassword(x)       ((x)->flags & CONF_FLAGS_NEED_PASSWORD)
66	>	#define IsNeedIdentd(x)         ((x)->flags & CONF_FLAGS_NEED_IDENTD)
67	>	#define IsConfExemptKline(x)    ((x)->flags & CONF_FLAGS_EXEMPTKLINE)
68	>	#define IsConfExemptLimits(x)   ((x)->flags & CONF_FLAGS_NOLIMIT)
69	>	#define IsConfExemptGline(x)    ((x)->flags & CONF_FLAGS_EXEMPTGLINE)
70	>	#define IsConfExemptResv(x)     ((x)->flags & CONF_FLAGS_EXEMPTRESV)
71	>	#define IsConfDoIdentd(x)       ((x)->flags & CONF_FLAGS_DO_IDENTD)
72	>	#define IsConfDoSpoofIp(x)      ((x)->flags & CONF_FLAGS_SPOOF_IP)
73	>	#define IsConfSpoofNotice(x)    ((x)->flags & CONF_FLAGS_SPOOF_NOTICE)
74	>	#define IsConfEncrypted(x)      ((x)->flags & CONF_FLAGS_ENCRYPTED)
75	>	#define SetConfEncrypted(x)     ((x)->flags |= CONF_FLAGS_ENCRYPTED)
76	>	#define ClearConfEncrypted(x)   ((x)->flags &= ~CONF_FLAGS_ENCRYPTED)
77	>	#define IsConfAllowAutoConn(x)  ((x)->flags & CONF_FLAGS_ALLOW_AUTO_CONN)
78	>	#define SetConfAllowAutoConn(x) ((x)->flags |= CONF_FLAGS_ALLOW_AUTO_CONN)
79	>	#define ClearConfAllowAutoConn(x) ((x)->flags &= ~CONF_FLAGS_ALLOW_AUTO_CONN)
80	>	#define IsConfRedir(x)          ((x)->flags & CONF_FLAGS_REDIR)
81	>	#define IsConfSSL(x)      ((x)->flags & CONF_FLAGS_SSL)
82	>	#define SetConfSSL(x)     ((x)->flags |= CONF_FLAGS_SSL)
83	>	#define ClearConfSSL(x)   ((x)->flags &= ~CONF_FLAGS_SSL)
84	>	#define IsConfDatabase(x)      ((x)->flags & CONF_FLAGS_IN_DATABASE)
85	>	#define SetConfDatabase(x)     ((x)->flags |= CONF_FLAGS_IN_DATABASE)
86
87
88	<	struct Client;
88	>	/* shared/cluster server entry types
89	>	* These defines are used for both shared and cluster.
90	>	*/
91	>	#define SHARED_KLINE            0x0001
92	>	#define SHARED_UNKLINE          0x0002
93	>	#define SHARED_XLINE            0x0004
94	>	#define SHARED_UNXLINE          0x0008
95	>	#define SHARED_RESV             0x0010
96	>	#define SHARED_UNRESV           0x0020
97	>	#define SHARED_LOCOPS           0x0040
98	>	#define SHARED_DLINE            0x0080
99	>	#define SHARED_UNDLINE          0x0100
100	>	#define SHARED_ALL              (SHARED_KLINE | SHARED_UNKLINE |\
101	>	SHARED_XLINE | SHARED_UNXLINE |\
102	>	SHARED_RESV | SHARED_UNRESV |\
103	>	SHARED_LOCOPS | SHARED_DLINE | SHARED_UNDLINE)
104
105	<	extern struct Callback *client_check_cb;
105	>
106	>	enum maskitem_type
107	>	{
108	>	CONF_CLIENT   = 1 <<  0,
109	>	CONF_SERVER   = 1 <<  1,
110	>	CONF_KLINE    = 1 <<  2,
111	>	CONF_DLINE    = 1 <<  3,
112	>	CONF_EXEMPT   = 1 <<  4,
113	>	CONF_CLUSTER  = 1 <<  5,
114	>	CONF_XLINE    = 1 <<  6,
115	>	CONF_ULINE    = 1 <<  7,
116	>	CONF_GLINE    = 1 <<  8,
117	>	CONF_CRESV    = 1 <<  9,
118	>	CONF_NRESV    = 1 << 10,
119	>	CONF_SERVICE  = 1 << 11,
120	>	CONF_OPER     = 1 << 12,
121	>	};
122	>
123	>	enum
124	>	{
125	>	NOT_AUTHORIZED = -1,
126	>	I_LINE_FULL    = -2,
127	>	TOO_MANY       = -3,
128	>	BANNED_CLIENT  = -4,
129	>	TOO_FAST       = -5
130	>	};
131
132		struct conf_parser_context
133		{
#	Line 45 | Line 136 | struct conf_parser_context
136		FILE *conf_file;
137		};
138
48	–	extern struct conf_parser_context conf_parser_ctx;
49	–
50	–	typedef enum
51	–	{
52	–	CONF_TYPE,
53	–	CLASS_TYPE,
54	–	OPER_TYPE,
55	–	CLIENT_TYPE,
56	–	SERVER_TYPE,
57	–	HUB_TYPE,
58	–	LEAF_TYPE,
59	–	KLINE_TYPE,
60	–	DLINE_TYPE,
61	–	EXEMPTDLINE_TYPE,
62	–	CLUSTER_TYPE,
63	–	RKLINE_TYPE,
64	–	RXLINE_TYPE,
65	–	XLINE_TYPE,
66	–	ULINE_TYPE,
67	–	GLINE_TYPE,
68	–	CRESV_TYPE,
69	–	NRESV_TYPE,
70	–	SERVICE_TYPE
71	–	} ConfType;
72	–
139		struct split_nuh_item
140		{
141		dlink_node node;
#	Line 84 | Line 150 | struct split_nuh_item
150		size_t hostsize;
151		};
152
153	<	struct ConfItem
88	<	{
89	<	dlink_node node;      /* link into known ConfItems of this type */
90	<
91	<	char *name;           /* Primary key */
92	<	void *regexpname;
93	<	unsigned int flags;
94	<	ConfType type;
95	<	};
96	<
97	<	/*
98	<	* MatchItem - used for XLINE and ULINE types
99	<	*/
100	<	struct MatchItem
153	>	struct MaskItem
154		{
155	<	char *user;           /* Used for ULINE only */
156	<	char *host;           /* Used for ULINE only */
157	<	char *reason;
158	<	char *oper_reason;
159	<	int action;           /* used for uline */
160	<	int count;            /* How many times this matchitem has been matched */
161	<	int ref_count;        /* How many times is this matchitem in use */
162	<	int illegal;          /* Should it be deleted when possible? */
163	<	time_t           hold;     /* Hold action until this time (calendar time) */
155	>	dlink_node         node;
156	>	dlink_list         leaf_list;
157	>	dlink_list         hub_list;
158	>	dlink_list         exempt_list;
159	>	enum maskitem_type type;
160	>	unsigned int       dns_failed;
161	>	unsigned int       dns_pending;
162	>	unsigned int       flags;
163	>	unsigned int       modes;
164	>	unsigned int       port;
165	>	unsigned int       count;
166	>	unsigned int       aftype;
167	>	unsigned int       active;
168	>	unsigned int       htype;
169	>	unsigned int       ref_count;  /* Number of *LOCAL* clients using this */
170	>	int                bits;
171	>	time_t             until;     /* Hold action until this time (calendar time) */
172	>	time_t             setat;
173	>	struct irc_ssaddr  bind;  /* ip to bind to for outgoing connect */
174	>	struct irc_ssaddr  addr;  /* ip to connect to */
175	>	struct ClassItem  *class;  /* Class of connection */
176	>	char              *name;
177	>	char              *user;     /* user part of user@host */
178	>	char              *host;     /* host part of user@host */
179	>	char              *passwd;
180	>	char              *spasswd;  /* Password to send. */
181	>	char              *reason;
182	>	char              *certfp;
183	>	char              *cipher_list;
184	>	void              *rsa_public_key;
185		};
186
187	<	struct AccessItem
187	>	struct exempt
188		{
189		dlink_node node;
190	<	unsigned int     dns_failed;
191	<	unsigned int     dns_pending;
192	<	unsigned int     status;   /* If CONF_ILLEGAL, delete when no clients */
193	<	unsigned int     flags;
194	<	unsigned int     modes;
195	<	unsigned int     port;
196	<	int              clients;  /* Number of *LOCAL* clients using this */
197	<	int              bits;
198	<	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. */
130	<	char *           reason;
131	<	char *           oper_reason;
132	<	char *           user;     /* user part of user@host */
133	<	time_t           hold;     /* Hold action until this time (calendar time) */
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;
141	<	#endif
142	<	void *regexuser;
143	<	void *regexhost;
144	<	dlink_list leaf_list;
145	<	dlink_list hub_list;
146	<	};
147	<
148	<	struct ClassItem
149	<	{
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;
157	<	int max_total;
158	<	int max_local;
159	<	int max_global;
160	<	int max_ident;
161	<	int max_perip;
162	<	int curr_user_count;
163	<	int cidr_bitlen_ipv4;
164	<	int cidr_bitlen_ipv6;
165	<	int number_per_cidr;
166	<	int active;
190	>	char *name;
191	>	char *user;
192	>	char *host;
193	>	size_t len;
194	>	time_t when;
195	>	struct irc_ssaddr addr;
196	>	int bits;
197	>	int type;
198	>	int coid;
199		};
200
201		struct CidrItem
202		{
203		dlink_node node;
204		struct irc_ssaddr mask;
205	<	int number_on_this_cidr;
205	>	unsigned int number_on_this_cidr;
206		};
207
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_KLINE              0x00000010
183	–	#define CONF_CLASS              0x00000020
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)
193	–
194	–	/* XXX temporary hack */
195	–	#define CONF_CRESV              0x80000001
196	–	#define CONF_NRESV              0x80000002
197	–
198	–	#define IsConfIllegal(x)        ((x)->status & CONF_ILLEGAL)
199	–	#define SetConfIllegal(x)       ((x)->status |= CONF_ILLEGAL)
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 IsConfKill(x)           ((x)->status == CONF_KLINE)
204	–	#define IsConfClient(x)         ((x)->status & CONF_CLIENT)
205	–	#define IsConfUline(x)          ((x)->status & CONF_ULINE)
206	–	#define IsConfXline(x)          ((x)->status & CONF_XLINE)
207	–	#define IsConfGline(x)          ((x)->status == CONF_GLINE)
208	–
209	–	/* AccessItem->flags */
210	–
211	–	/* Generic flags... */
212	–	/* access flags... */
213	–	#define CONF_FLAGS_DO_IDENTD            0x00000001
214	–	#define CONF_FLAGS_LIMIT_IP             0x00000002
215	–	#define CONF_FLAGS_NO_TILDE             0x00000004
216	–	#define CONF_FLAGS_NEED_IDENTD          0x00000008
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      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)
235	–	#define IsNoTilde(x)            ((x)->flags & CONF_FLAGS_NO_TILDE)
236	–	#define IsConfCanFlood(x)       ((x)->flags & CONF_FLAGS_CAN_FLOOD)
237	–	#define IsNeedPassword(x)       ((x)->flags & CONF_FLAGS_NEED_PASSWORD)
238	–	#define IsNeedIdentd(x)         ((x)->flags & CONF_FLAGS_NEED_IDENTD)
239	–	#define IsNoMatchIp(x)          ((x)->flags & CONF_FLAGS_NOMATCH_IP)
240	–	#define IsConfExemptKline(x)    ((x)->flags & CONF_FLAGS_EXEMPTKLINE)
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)
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)
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)
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 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_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	–
208		struct config_file_entry
209		{
210		const char *dpath;          /* DPATH if set from command line */
211	+	const char *mpath;
212	+	const char *spath;
213		const char *configfile;
214		const char *klinefile;
215	+	const char *glinefile;
216		const char *xlinefile;
217		const char *dlinefile;
218	<	const char *cresvfile;
285	<	const char *nresvfile;
218	>	const char *resvfile;
219
220		char *egdpool_path;
221		char *service_name;
222
290	–	MessageFile motd;
291	–	MessageFile linksfile;
292	–
223		int gline_min_cidr;
224		int gline_min_cidr6;
225		int dots_in_ident;
#	Line 302 | Line 232 | struct config_file_entry
232		int ts_max_delta;
233		int ts_warn_delta;
234		int anti_nick_flood;
235	<	int warn_no_nline;
235	>	int warn_no_connect_block;
236		int invisible_on_connect;
237		int stats_e_disabled;
238		int stats_o_oper_only;
239		int stats_k_oper_only;
240		int stats_i_oper_only;
241		int stats_P_oper_only;
242	+	int stats_u_oper_only;
243		int short_motd;
244		int no_oper_flood;
245		int true_no_oper_flood;
#	Line 324 | Line 255 | struct config_file_entry
255		int gline_request_time;
256		int oper_only_umodes;
257		int oper_umodes;
258	<	int max_targets;
258	>	unsigned int max_targets;
259		int caller_id_wait;
260		int min_nonwildcard;
261		int min_nonwildcard_simple;
#	Line 335 | Line 266 | struct config_file_entry
266		int use_egd;
267		int ping_cookie;
268		int disable_auth;
269	<	int disable_remote;
269	>	int cycle_on_host_change;
270		};
271
272		struct config_channel_entry
273		{
274		int disable_fake_channels;
344	–	int restrict_channels;
275		int knock_delay;
276		int knock_delay_channel;
277		unsigned int max_bans;
#	Line 349 | Line 279 | struct config_channel_entry
279		unsigned int max_chans_per_oper;
280		int no_create_on_split;
281		int no_join_on_split;
352	–	int quiet_on_ban;
282		int default_split_server_count;
283		int default_split_user_count;
284		};
#	Line 358 | Line 287 | struct config_server_hide
287		{
288		char *hidden_name;
289		int flatten_links;
290	+	int disable_remote_commands;
291		int hide_servers;
292	+	int hide_services;
293		int links_delay;
294		int links_disabled;
295		int hidden;
#	Line 372 | Line 303 | struct server_info
303		char *description;
304		char *network_name;
305		char *network_desc;
375	–	#ifdef HAVE_LIBCRYPTO
306		char *rsa_private_key_file;
307	<	RSA *rsa_private_key;
308	<	SSL_CTX *server_ctx;
309	<	SSL_CTX *client_ctx;
380	<	#endif
307	>	void *rsa_private_key;
308	>	void *server_ctx;
309	>	void *client_ctx;
310		int hub;
311		struct irc_ssaddr ip;
312		struct irc_ssaddr ip6;
313		unsigned int max_clients;
314	+	unsigned int max_nick_length;
315	+	unsigned int max_topic_length;
316		int specific_ipv4_vhost;
317		int specific_ipv6_vhost;
318		struct sockaddr_in dns_host;
#	Line 400 | Line 331 | struct logging_entry
331		unsigned int use_logging;
332		};
333
334	<	extern dlink_list class_items;
334	>	extern dlink_list flatten_links;
335		extern dlink_list server_items;
336		extern dlink_list cluster_items;
337	<	extern dlink_list hub_items;
338	<	extern dlink_list rxconf_items;
339	<	extern dlink_list rkconf_items;
409	<	extern dlink_list leaf_items;
337	>	extern dlink_list xconf_items;
338	>	extern dlink_list uconf_items;
339	>	extern dlink_list oconf_items;
340		extern dlink_list service_items;
341	<	extern dlink_list temporary_xlines;
341	>	extern dlink_list nresv_items;
342	>	extern dlink_list cresv_items;
343	>	extern struct conf_parser_context conf_parser_ctx;
344		extern struct logging_entry ConfigLoggingEntry;
345		extern struct config_file_entry ConfigFileEntry;/* defined in ircd.c*/
346		extern struct config_channel_entry ConfigChannel;/* defined in channel.c*/
347		extern struct config_server_hide ConfigServerHide; /* defined in s_conf.c */
348		extern struct server_info ServerInfo;       /* defined in ircd.c */
349		extern struct admin_info AdminInfo;        /* defined in ircd.c */
350	+	extern int valid_wild_card_simple(const char *);
351		extern int valid_wild_card(struct Client *, int, int, ...);
352		/* End GLOBAL section */
353
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);
426	–	extern void init_class(void);
427	–	extern struct ConfItem *find_class(const char *);
354		extern void init_ip_hash_table(void);
355		extern void count_ip_hash(unsigned int *, uint64_t *);
356		extern void remove_one_ip(struct irc_ssaddr *);
357	<	extern struct ConfItem *make_conf_item(ConfType type);
432	<	extern void free_access_item(struct AccessItem *);
357	>	extern struct MaskItem *conf_make(enum maskitem_type);
358		extern void read_conf_files(int);
359	<	extern int attach_conf(struct Client *, struct ConfItem *);
359	>	extern int attach_conf(struct Client *, struct MaskItem *);
360		extern int attach_connect_block(struct Client *, const char *, const char *);
361	+	extern int check_client(struct Client *);
362
437	–	extern int detach_conf(struct Client *, ConfType);
363
364	<	extern struct ConfItem *find_conf_name(dlink_list *, const char *, ConfType);
365	<	extern struct ConfItem *find_conf_exact(ConfType, const char *, const char *, const char *);
441	<	extern struct AccessItem *find_kill(struct Client *);
442	<	extern struct AccessItem *find_gline(struct Client *);
364	>	extern void detach_conf(struct Client *, enum maskitem_type);
365	>	extern struct MaskItem *find_conf_name(dlink_list *, const char *, enum maskitem_type);
366		extern int conf_connect_allowed(struct irc_ssaddr *, int);
367		extern char *oper_privs_as_string(const unsigned int);
368		extern void split_nuh(struct split_nuh_item *);
369	<	extern struct ConfItem *find_matching_name_conf(ConfType, const char *,
370	<	const char *, const char *, int);
371	<	extern struct ConfItem *find_exact_name_conf(ConfType, const struct Client *, const char *,
369	>	extern struct MaskItem *find_matching_name_conf(enum maskitem_type, const char *,
370	>	const char *, const char *, unsigned int);
371	>	extern struct MaskItem *find_exact_name_conf(enum maskitem_type, const struct Client *, const char *,
372		const char *, const char *);
373	<	extern void delete_conf_item(struct ConfItem *);
451	<	extern void report_confitem_types(struct Client *, ConfType);
373	>	extern void conf_free(struct MaskItem *);
374		extern void yyerror(const char *);
375	<	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 *,
456	<	const char *);
457	<	extern void add_temp_line(struct ConfItem *);
375	>	extern void conf_error_report(const char *);
376		extern void cleanup_tklines(void *);
459	–	extern const char *get_conf_name(ConfType);
377		extern int rehash(int);
378	<	extern int conf_add_server(struct ConfItem *, const char *);
379	<	extern void conf_add_class_to_conf(struct ConfItem *, const char *);
378	>	extern void lookup_confhost(struct MaskItem *);
379	>	extern void conf_add_class_to_conf(struct MaskItem *, const char *);
380
464	–	/* XXX consider moving these into csvlib.h */
465	–	extern void parse_csv_file(FILE *, ConfType);
466	–	extern int find_and_delete_temporary(const char *, const char *, int);
381		extern const char *get_oper_name(const struct Client *);
382
469	–	extern void *map_to_conf(struct ConfItem *);
470	–	extern struct ConfItem *unmap_conf_item(void *);
383		/* XXX should the parse_aline stuff go into another file ?? */
384	<	#define AWILD 0x1               /* check wild cards */
384	>	#define AWILD 0x1  /* check wild cards */
385		extern int parse_aline(const char *, struct Client *, int, char **,
386	<	int, char **, char **, time_t *, char **, char **);
386	>	int, char **, char **, time_t *, char **, char **);
387		extern int valid_comment(struct Client *, char *, int);
388
389
390		#define TK_SECONDS 0
391		#define TK_MINUTES 1
392	<	extern time_t valid_tkline(const char *, int);
393	<	extern int match_conf_password(const char *, const struct AccessItem *);
482	<
483	<	#define NOT_AUTHORIZED    (-1)
484	<	#define I_LINE_FULL       (-2)
485	<	#define TOO_MANY          (-3)
486	<	#define BANNED_CLIENT     (-4)
487	<	#define TOO_FAST          (-5)
392	>	extern time_t valid_tkline(const char *, const int);
393	>	extern int match_conf_password(const char *, const struct MaskItem *);
394
395		#define CLEANUP_TKLINES_TIME 60
396
397	<	extern void cluster_a_line(struct Client *,
492	<	const char *, int, int, const char *,...);
493	<	extern void rebuild_cidr_class(struct ConfItem *, struct ClassItem *);
397	>	extern void cluster_a_line(struct Client *, const char *, int, int, const char *,...);
398		#endif /* INCLUDED_s_conf_h */

Diff Legend

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