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 1155 by michael, Tue Aug 9 20:27:45 2011 UTC vs.
ircd-hybrid/trunk/include/conf.h (file contents), Revision 2116 by michael, Sun May 26 11:44:01 2013 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 25 | Line 25
25		#ifndef INCLUDED_s_conf_h
26		#define INCLUDED_s_conf_h
27		#include "config.h"
28	–	#ifdef HAVE_LIBCRYPTO
29	–	#include <openssl/rsa.h>
30	–	#endif
31	–	#include "fileio.h"             /* FBFILE */
28		#include "ircd_defs.h"
29		#include "motd.h"               /* MessageFile */
30		#include "client.h"
31		#include "hook.h"
32	+	#include "conf_class.h"
33
34
35	<	#define CONF_SERVER_INFO_TLS_VERSION_SSLV3 0x1
39	<	#define CONF_SERVER_INFO_TLS_VERSION_TLSV1 0x2
35	>	#define CONF_NOREASON "<No reason supplied>"
36
37	<	struct Client;
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	<	extern struct Callback *client_check_cb;
42	>	/* MaskItem->flags */
43	>	#define CONF_FLAGS_DO_IDENTD            0x00000001
44	>	#define CONF_FLAGS_LIMIT_IP             0x00000002
45	>	#define CONF_FLAGS_NO_TILDE             0x00000004
46	>	#define CONF_FLAGS_NEED_IDENTD          0x00000008
47	>	#define CONF_FLAGS_NOMATCH_IP           0x00000010
48	>	#define CONF_FLAGS_EXEMPTKLINE          0x00000020
49	>	#define CONF_FLAGS_NOLIMIT              0x00000040
50	>	#define CONF_FLAGS_SPOOF_IP             0x00000080
51	>	#define CONF_FLAGS_SPOOF_NOTICE         0x00000100
52	>	#define CONF_FLAGS_REDIR                0x00000200
53	>	#define CONF_FLAGS_EXEMPTGLINE          0x00000400
54	>	#define CONF_FLAGS_CAN_FLOOD            0x00000800
55	>	#define CONF_FLAGS_NEED_PASSWORD        0x00001000
56	>	#define CONF_FLAGS_ALLOW_AUTO_CONN      0x00002000
57	>	#define CONF_FLAGS_ENCRYPTED            0x00004000
58	>	#define CONF_FLAGS_IN_DATABASE          0x00008000
59	>	#define CONF_FLAGS_EXEMPTRESV           0x00010000
60	>	#define CONF_FLAGS_SSL                  0x00020000
61	>	#define CONF_FLAGS_WEBIRC               0x00040000
62	>
63	>	/* Macros for struct MaskItem */
64	>	#define IsConfWebIRC(x)         ((x)->flags & CONF_FLAGS_WEBIRC)
65	>	#define IsLimitIp(x)            ((x)->flags & CONF_FLAGS_LIMIT_IP)
66	>	#define IsNoTilde(x)            ((x)->flags & CONF_FLAGS_NO_TILDE)
67	>	#define IsConfCanFlood(x)       ((x)->flags & CONF_FLAGS_CAN_FLOOD)
68	>	#define IsNeedPassword(x)       ((x)->flags & CONF_FLAGS_NEED_PASSWORD)
69	>	#define IsNeedIdentd(x)         ((x)->flags & CONF_FLAGS_NEED_IDENTD)
70	>	#define IsNoMatchIp(x)          ((x)->flags & CONF_FLAGS_NOMATCH_IP)
71	>	#define IsConfExemptKline(x)    ((x)->flags & CONF_FLAGS_EXEMPTKLINE)
72	>	#define IsConfExemptLimits(x)   ((x)->flags & CONF_FLAGS_NOLIMIT)
73	>	#define IsConfExemptGline(x)    ((x)->flags & CONF_FLAGS_EXEMPTGLINE)
74	>	#define IsConfExemptResv(x)     ((x)->flags & CONF_FLAGS_EXEMPTRESV)
75	>	#define IsConfDoIdentd(x)       ((x)->flags & CONF_FLAGS_DO_IDENTD)
76	>	#define IsConfDoSpoofIp(x)      ((x)->flags & CONF_FLAGS_SPOOF_IP)
77	>	#define IsConfSpoofNotice(x)    ((x)->flags & CONF_FLAGS_SPOOF_NOTICE)
78	>	#define IsConfEncrypted(x)      ((x)->flags & CONF_FLAGS_ENCRYPTED)
79	>	#define SetConfEncrypted(x)     ((x)->flags |= CONF_FLAGS_ENCRYPTED)
80	>	#define ClearConfEncrypted(x)   ((x)->flags &= ~CONF_FLAGS_ENCRYPTED)
81	>	#define IsConfAllowAutoConn(x)  ((x)->flags & CONF_FLAGS_ALLOW_AUTO_CONN)
82	>	#define SetConfAllowAutoConn(x) ((x)->flags |= CONF_FLAGS_ALLOW_AUTO_CONN)
83	>	#define ClearConfAllowAutoConn(x) ((x)->flags &= ~CONF_FLAGS_ALLOW_AUTO_CONN)
84	>	#define IsConfRedir(x)          ((x)->flags & CONF_FLAGS_REDIR)
85	>	#define IsConfSSL(x)      ((x)->flags & CONF_FLAGS_SSL)
86	>	#define SetConfSSL(x)     ((x)->flags |= CONF_FLAGS_SSL)
87	>	#define ClearConfSSL(x)   ((x)->flags &= ~CONF_FLAGS_SSL)
88	>	#define IsConfDatabase(x)      ((x)->flags & CONF_FLAGS_IN_DATABASE)
89	>	#define SetConfDatabase(x)     ((x)->flags |= CONF_FLAGS_IN_DATABASE)
90	>
91	>
92	>	/* shared/cluster server entry types
93	>	* These defines are used for both shared and cluster.
94	>	*/
95	>	#define SHARED_KLINE            0x0001
96	>	#define SHARED_UNKLINE          0x0002
97	>	#define SHARED_XLINE            0x0004
98	>	#define SHARED_UNXLINE          0x0008
99	>	#define SHARED_RESV             0x0010
100	>	#define SHARED_UNRESV           0x0020
101	>	#define SHARED_LOCOPS           0x0040
102	>	#define SHARED_DLINE            0x0080
103	>	#define SHARED_UNDLINE          0x0100
104	>	#define SHARED_ALL              (SHARED_KLINE | SHARED_UNKLINE |\
105	>	SHARED_XLINE | SHARED_UNXLINE |\
106	>	SHARED_RESV | SHARED_UNRESV |\
107	>	SHARED_LOCOPS | SHARED_DLINE | SHARED_UNDLINE)
108	>
109	>
110	>	enum maskitem_type
111	>	{
112	>	CONF_RESERVED = 1 <<  0, /* XXX */
113	>	CONF_CLIENT   = 1 <<  1,
114	>	CONF_SERVER   = 1 <<  2,
115	>	CONF_KLINE    = 1 <<  3,
116	>	CONF_DLINE    = 1 <<  4,
117	>	CONF_EXEMPT   = 1 <<  5,
118	>	CONF_CLUSTER  = 1 <<  6,
119	>	CONF_XLINE    = 1 <<  7,
120	>	CONF_ULINE    = 1 <<  8,
121	>	CONF_GLINE    = 1 <<  9,
122	>	CONF_CRESV    = 1 << 10,
123	>	CONF_NRESV    = 1 << 11,
124	>	CONF_SERVICE  = 1 << 12,
125	>	CONF_OPER     = 1 << 13,
126	>	CONF_HUB      = 1 << 14, /* XXX There are no separate hub/leaf configs anymore. This is just for /stats h */
127	>	};
128
129		struct conf_parser_context
130		{
131		unsigned int boot;
132		unsigned int pass;
133	<	FBFILE *conf_file;
133	>	FILE *conf_file;
134		};
135
52	–	extern struct conf_parser_context conf_parser_ctx;
53	–
54	–	typedef enum
55	–	{
56	–	CONF_TYPE,
57	–	CLASS_TYPE,
58	–	OPER_TYPE,
59	–	CLIENT_TYPE,
60	–	SERVER_TYPE,
61	–	HUB_TYPE,
62	–	LEAF_TYPE,
63	–	KLINE_TYPE,
64	–	DLINE_TYPE,
65	–	EXEMPTDLINE_TYPE,
66	–	CLUSTER_TYPE,
67	–	RKLINE_TYPE,
68	–	RXLINE_TYPE,
69	–	XLINE_TYPE,
70	–	ULINE_TYPE,
71	–	GLINE_TYPE,
72	–	CRESV_TYPE,
73	–	NRESV_TYPE,
74	–	GDENY_TYPE
75	–	} ConfType;
76	–
136		struct split_nuh_item
137		{
138		dlink_node node;
#	Line 88 | Line 147 | struct split_nuh_item
147		size_t hostsize;
148		};
149
150	<	struct ConfItem
92	<	{
93	<	dlink_node node;      /* link into known ConfItems of this type */
94	<
95	<	char *name;           /* Primary key */
96	<	void *regexpname;
97	<	unsigned int flags;
98	<	ConfType type;
99	<	};
100	<
101	<	/*
102	<	* MatchItem - used for XLINE and ULINE types
103	<	*/
104	<	struct MatchItem
150	>	struct MaskItem
151		{
152	<	char *user;           /* Used for ULINE only */
153	<	char *host;           /* Used for ULINE only */
154	<	char *reason;
155	<	char *oper_reason;
156	<	int action;           /* used for uline */
157	<	int count;            /* How many times this matchitem has been matched */
158	<	int ref_count;        /* How many times is this matchitem in use */
159	<	int illegal;          /* Should it be deleted when possible? */
160	<	time_t           hold;     /* Hold action until this time (calendar time) */
152	>	dlink_node         node;
153	>	dlink_list         leaf_list;
154	>	dlink_list         hub_list;
155	>	dlink_list         exempt_list;
156	>	enum maskitem_type type;
157	>	unsigned int       dns_failed;
158	>	unsigned int       dns_pending;
159	>	unsigned int       flags;
160	>	unsigned int       modes;
161	>	unsigned int       port;
162	>	unsigned int       count;
163	>	unsigned int       aftype;
164	>	unsigned int       active;
165	>	unsigned int       htype;
166	>	unsigned int       ref_count;  /* Number of *LOCAL* clients using this */
167	>	int                bits;
168	>	time_t             until;     /* Hold action until this time (calendar time) */
169	>	time_t             setat;
170	>	struct irc_ssaddr  bind;  /* ip to bind to for outgoing connect */
171	>	struct irc_ssaddr  addr;  /* ip to connect to */
172	>	struct ClassItem  *class;  /* Class of connection */
173	>	char              *name;
174	>	char              *user;     /* user part of user@host */
175	>	char              *host;     /* host part of user@host */
176	>	char              *passwd;
177	>	char              *spasswd;  /* Password to send. */
178	>	char              *reason;
179	>	char              *cipher_list;
180	>	void              *rsa_public_key;
181		};
182
183	<	struct AccessItem
183	>	struct exempt
184		{
185		dlink_node node;
186	<	unsigned int     dns_failed;
187	<	unsigned int     dns_pending;
188	<	unsigned int     status;   /* If CONF_ILLEGAL, delete when no clients */
189	<	unsigned int     flags;
190	<	unsigned int     modes;
191	<	unsigned int     port;
192	<	int              clients;  /* Number of *LOCAL* clients using this */
193	<	struct irc_ssaddr my_ipnum; /* ip to bind to for outgoing connect */
194	<	struct irc_ssaddr ipnum;      /* ip to connect to */
129	<	char *           host;     /* host part of user@host */
130	<	char *           passwd;
131	<	char *           spasswd;  /* Password to send. */
132	<	char *           reason;
133	<	char *           oper_reason;
134	<	char *           user;     /* user part of user@host */
135	<	time_t           hold;     /* Hold action until this time (calendar time) */
136	<	struct ConfItem *class_ptr;  /* Class of connection */
137	<	int              aftype;
138	<	#ifdef HAVE_LIBCRYPTO
139	<	char *           rsa_public_key_file;
140	<	RSA *            rsa_public_key;
141	<	struct EncCapability *cipher_preference;
142	<	#endif
143	<	void *regexuser;
144	<	void *regexhost;
145	<	};
146	<
147	<	struct ClassItem
148	<	{
149	<	dlink_list list_ipv4;         /* base of per cidr ipv4 client link list */
150	<	dlink_list list_ipv6;         /* base of per cidr ipv6 client link list */
151	<	unsigned int max_sendq;
152	<	int con_freq;
153	<	int ping_freq;
154	<	int ping_warning;
155	<	int max_total;
156	<	int max_local;
157	<	int max_global;
158	<	int max_ident;
159	<	int max_perip;
160	<	int curr_user_count;
161	<	int cidr_bitlen_ipv4;
162	<	int cidr_bitlen_ipv6;
163	<	int number_per_cidr;
164	<	int active;
186	>	char *name;
187	>	char *user;
188	>	char *host;
189	>	size_t len;
190	>	time_t when;
191	>	struct irc_ssaddr addr;
192	>	int bits;
193	>	int type;
194	>	int coid;
195		};
196
197		struct CidrItem
198		{
199		dlink_node node;
200		struct irc_ssaddr mask;
201	<	int number_on_this_cidr;
201	>	unsigned int number_on_this_cidr;
202		};
203
174	–	#define ConFreq(x)      ((x)->con_freq)
175	–	#define PingFreq(x)     ((x)->ping_freq)
176	–	#define PingWarning(x)  ((x)->ping_warning)
177	–	#define MaxTotal(x)     ((x)->max_total)
178	–	#define MaxGlobal(x)    ((x)->max_global)
179	–	#define MaxLocal(x)     ((x)->max_local)
180	–	#define MaxIdent(x)     ((x)->max_ident)
181	–	#define MaxPerIp(x)     ((x)->max_perip)
182	–	#define MaxSendq(x)     ((x)->max_sendq)
183	–	#define CurrUserCount(x) ((x)->curr_user_count)
184	–	#define CidrBitlenIPV4(x)       ((x)->cidr_bitlen_ipv4)
185	–	#define CidrBitlenIPV6(x)       ((x)->cidr_bitlen_ipv6)
186	–	#define NumberPerCidr(x) ((x)->number_per_cidr)
187	–
188	–	#define ClassPtr(x)      ((x)->class_ptr)
189	–
190	–
191	–	#define CONF_ILLEGAL            0x80000000
192	–	#define CONF_RESERVED           0x00000001
193	–	#define CONF_CLIENT             0x00000002
194	–	#define CONF_SERVER             0x00000004
195	–	#define CONF_OPERATOR           0x00000008
196	–	#define CONF_KILL               0x00000010
197	–	#define CONF_KLINE              CONF_KILL
198	–	#define CONF_CLASS              0x00000020
199	–	#define CONF_LEAF               0x00000040
200	–	#define CONF_LISTEN_PORT        0x00000080
201	–	#define CONF_HUB                0x00000100
202	–	#define CONF_EXEMPTKLINE        0x00000200
203	–	#define CONF_NOLIMIT            0x00000400
204	–	#define CONF_DLINE              0x00000800
205	–	#define CONF_XLINE              0x00001000
206	–	#define CONF_ULINE              0x00002000
207	–	#define CONF_EXEMPTDLINE        0x00004000
208	–	#define CONF_GLINE              0x00008000
209	–
210	–	#define CONF_SERVER_MASK       CONF_SERVER
211	–	#define CONF_CLIENT_MASK       (CONF_CLIENT | CONF_OPERATOR | CONF_SERVER_MASK)
212	–
213	–	/* XXX temporary hack */
214	–	#define CONF_CRESV              0x80000001
215	–	#define CONF_NRESV              0x80000002
216	–
217	–	#define IsConfIllegal(x)        ((x)->status & CONF_ILLEGAL)
218	–	#define SetConfIllegal(x)       ((x)->status |= CONF_ILLEGAL)
219	–	#define IsConfServer(x)         ((x)->status == CONF_SERVER)
220	–	#define SetConfServer(x)        ((x)->status = CONF_SERVER)
221	–	#define IsConfOperator(x)       ((x)->status & CONF_OPERATOR)
222	–	#define IsConfHub(x)            ((x)->status == CONF_HUB)
223	–	#define SetConfHub(x)           ((x)->status = CONF_HUB)
224	–	#define IsConfLeaf(x)           ((x)->status == CONF_LEAF)
225	–	#define SetConfLeaf(x)          ((x)->status = CONF_LEAF)
226	–	#define IsConfHubOrLeaf(x)      ((x)->status & (CONF_HUB|CONF_LEAF))
227	–	#define IsConfKill(x)           ((x)->status == CONF_KILL)
228	–	#define IsConfClient(x)         ((x)->status & CONF_CLIENT)
229	–	#define IsConfTypeOfClient(x)   ((x)->status & CONF_CLIENT_MASK)
230	–	#define IsConfUline(x)          ((x)->status & CONF_ULINE)
231	–	#define IsConfXline(x)          ((x)->status & CONF_XLINE)
232	–	#define IsConfGline(x)          ((x)->status == CONF_GLINE)
233	–
234	–	/* AccessItem->flags */
235	–
236	–	/* Generic flags... */
237	–	/* access flags... */
238	–	#define CONF_FLAGS_DO_IDENTD            0x00000001
239	–	#define CONF_FLAGS_LIMIT_IP             0x00000002
240	–	#define CONF_FLAGS_NO_TILDE             0x00000004
241	–	#define CONF_FLAGS_NEED_IDENTD          0x00000008
242	–	/*                                      0x00000010 */
243	–	#define CONF_FLAGS_NOMATCH_IP           0x00000020
244	–	#define CONF_FLAGS_EXEMPTKLINE          0x00000040
245	–	#define CONF_FLAGS_NOLIMIT              0x00000080
246	–	#define CONF_FLAGS_IDLE_LINED           0x00000100
247	–	#define CONF_FLAGS_SPOOF_IP             0x00000200
248	–	#define CONF_FLAGS_SPOOF_NOTICE         0x00000400
249	–	#define CONF_FLAGS_REDIR                0x00000800
250	–	#define CONF_FLAGS_EXEMPTGLINE          0x00001000
251	–	#define CONF_FLAGS_RESTRICTED           0x00002000
252	–	#define CONF_FLAGS_CAN_FLOOD            0x00100000
253	–	#define CONF_FLAGS_NEED_PASSWORD        0x00200000
254	–	/* server flags */
255	–	#define CONF_FLAGS_ALLOW_AUTO_CONN      0x00004000
256	–	#define CONF_FLAGS_LAZY_LINK            0x00008000
257	–	#define CONF_FLAGS_ENCRYPTED            0x00010000
258	–	#define CONF_FLAGS_COMPRESSED           0x00020000
259	–	#define CONF_FLAGS_TEMPORARY            0x00040000
260	–	#define CONF_FLAGS_CRYPTLINK            0x00080000
261	–	#define CONF_FLAGS_BURST_AWAY           0x00400000
262	–	#define CONF_FLAGS_EXEMPTRESV           0x00800000
263	–	#define CONF_FLAGS_TOPICBURST           0x01000000
264	–
265	–	/* Macros for struct AccessItem */
266	–	#define IsLimitIp(x)            ((x)->flags & CONF_FLAGS_LIMIT_IP)
267	–	#define IsNoTilde(x)            ((x)->flags & CONF_FLAGS_NO_TILDE)
268	–	#define IsConfCanFlood(x)       ((x)->flags & CONF_FLAGS_CAN_FLOOD)
269	–	#define IsNeedPassword(x)       ((x)->flags & CONF_FLAGS_NEED_PASSWORD)
270	–	#define IsNeedIdentd(x)         ((x)->flags & CONF_FLAGS_NEED_IDENTD)
271	–	#define IsNoMatchIp(x)          ((x)->flags & CONF_FLAGS_NOMATCH_IP)
272	–	#define IsConfExemptKline(x)    ((x)->flags & CONF_FLAGS_EXEMPTKLINE)
273	–	#define IsConfExemptLimits(x)   ((x)->flags & CONF_FLAGS_NOLIMIT)
274	–	#define IsConfExemptGline(x)    ((x)->flags & CONF_FLAGS_EXEMPTGLINE)
275	–	#define IsConfExemptResv(x)     ((x)->flags & CONF_FLAGS_EXEMPTRESV)
276	–	#define IsConfIdlelined(x)      ((x)->flags & CONF_FLAGS_IDLE_LINED)
277	–	#define IsConfDoIdentd(x)       ((x)->flags & CONF_FLAGS_DO_IDENTD)
278	–	#define IsConfDoSpoofIp(x)      ((x)->flags & CONF_FLAGS_SPOOF_IP)
279	–	#define IsConfSpoofNotice(x)    ((x)->flags & CONF_FLAGS_SPOOF_NOTICE)
280	–	#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)
284	–	#define IsConfCompressed(x)     ((x)->flags & CONF_FLAGS_COMPRESSED)
285	–	#define SetConfCompressed(x)    ((x)->flags |= CONF_FLAGS_COMPRESSED)
286	–	#define ClearConfCompressed(x)  ((x)->flags &= ~CONF_FLAGS_COMPRESSED)
287	–	#define IsConfCryptLink(x)      ((x)->flags & CONF_FLAGS_CRYPTLINK)
288	–	#define SetConfCryptLink(x)     ((x)->flags |= CONF_FLAGS_CRYPTLINK)
289	–	#define ClearConfCryptLink(x)   ((x)->flags &= ~CONF_FLAGS_CRYPTLINK)
290	–	#define IsConfAllowAutoConn(x)  ((x)->flags & CONF_FLAGS_ALLOW_AUTO_CONN)
291	–	#define SetConfAllowAutoConn(x) ((x)->flags |= CONF_FLAGS_ALLOW_AUTO_CONN)
292	–	#define ClearConfAllowAutoConn(x) ((x)->flags &= ~CONF_FLAGS_ALLOW_AUTO_CONN)
293	–	#define IsConfTemporary(x)      ((x)->flags & CONF_FLAGS_TEMPORARY)
294	–	#define SetConfTemporary(x)     ((x)->flags |= CONF_FLAGS_TEMPORARY)
295	–	#define IsConfRedir(x)          ((x)->flags & CONF_FLAGS_REDIR)
296	–	#define IsConfAwayBurst(x)      ((x)->flags & CONF_FLAGS_BURST_AWAY)
297	–	#define SetConfAwayBurst(x)     ((x)->flags |= CONF_FLAGS_BURST_AWAY)
298	–	#define ClearConfAwayBurst(x)   ((x)->flags &= ~CONF_FLAGS_BURST_AWAY)
299	–	#define IsConfTopicBurst(x)     ((x)->flags & CONF_FLAGS_TOPICBURST)
300	–	#define SetConfTopicBurst(x)    ((x)->flags |= CONF_FLAGS_TOPICBURST)
301	–	#define ClearConfTopicBurst(x)  ((x)->flags &= ~CONF_FLAGS_TOPICBURST)
302	–
303	–	/* shared/cluster server entry types
304	–	* These defines are used for both shared and cluster.
305	–	*/
306	–	#define SHARED_KLINE            0x0001
307	–	#define SHARED_TKLINE           0x0002
308	–	#define SHARED_UNKLINE          0x0004
309	–	#define SHARED_XLINE            0x0008
310	–	#define SHARED_TXLINE           0x0010
311	–	#define SHARED_UNXLINE          0x0020
312	–	#define SHARED_RESV             0x0040
313	–	#define SHARED_TRESV            0x0080
314	–	#define SHARED_UNRESV           0x0100
315	–	#define SHARED_LOCOPS           0x0200
316	–	#define SHARED_ALL              (SHARED_KLINE | SHARED_TKLINE | SHARED_UNKLINE | \
317	–	SHARED_XLINE | SHARED_TXLINE | SHARED_UNXLINE | \
318	–	SHARED_RESV | SHARED_TRESV | SHARED_UNRESV |\
319	–	SHARED_LOCOPS)
320	–
321	–	/* gline acl entry actions */
322	–	#define GDENY_BLOCK             0x1
323	–	#define GDENY_REJECT            0x2
324	–
204		struct config_file_entry
205		{
206		const char *dpath;          /* DPATH if set from command line */
207		const char *configfile;
208		const char *klinefile;
209	+	const char *glinefile;
210		const char *xlinefile;
331	–	const char *rxlinefile;
332	–	const char *rklinefile;
211		const char *dlinefile;
212	<	const char *glinefile;
335	<	const char *cresvfile;
336	<	const char *nresvfile;
337	<
338	<	char *logpath;
339	<	char *operlog;
212	>	const char *resvfile;
213
341	–	char *servlink_path;
214		char *egdpool_path;
215	+	char *service_name;
216
217		MessageFile motd;
345	–	MessageFile opermotd;
218		MessageFile linksfile;
219
348	–	unsigned char compression_level;
220		int gline_min_cidr;
221		int gline_min_cidr6;
222		int dots_in_ident;
#	Line 358 | Line 229 | struct config_file_entry
229		int ts_max_delta;
230		int ts_warn_delta;
231		int anti_nick_flood;
361	–	int kline_with_reason;
232		int warn_no_nline;
233		int invisible_on_connect;
234		int stats_e_disabled;
#	Line 372 | Line 242 | struct config_file_entry
242		int oper_pass_resv;
243		int glines;
244		int hide_spoof_ips;
375	–	int burst_away;
376	–	int use_whois_actually;
245		int tkline_expire_notices;
246		int opers_bypass_callerid;
247		int ignore_bogus_ts;
380	–	char *kline_reason;
248		int pace_wait;
249		int pace_wait_simple;
250		int gline_time;
251	<	int gline_logging;
385	<	int idletime;
251	>	int gline_request_time;
252		int oper_only_umodes;
253		int oper_umodes;
254		int max_targets;
#	Line 391 | Line 257 | struct config_file_entry
257		int min_nonwildcard_simple;
258		int kill_chase_time_limit;
259		int default_floodcount;
394	–	int client_flood;
260		/* 0 == don't use throttle... */
261		int throttle_time;
262		int use_egd;
263		int ping_cookie;
264		int disable_auth;
265		int disable_remote;
401	–	#ifdef HAVE_LIBCRYPTO
402	–	struct EncCapability *default_cipher_preference;
403	–	#endif
266		};
267
268		struct config_channel_entry
269		{
270		int disable_fake_channels;
409	–	int restrict_channels;
410	–	int disable_local_channels;
411	–	int use_except;
412	–	int use_invex;
413	–	int use_knock;
271		int knock_delay;
272		int knock_delay_channel;
273		unsigned int max_bans;
274		unsigned int max_chans_per_user;
275	+	unsigned int max_chans_per_oper;
276		int no_create_on_split;
277		int no_join_on_split;
420	–	int quiet_on_ban;
421	–	int burst_topicwho;
278		int default_split_server_count;
279		int default_split_user_count;
280		};
#	Line 428 | Line 284 | struct config_server_hide
284		char *hidden_name;
285		int flatten_links;
286		int hide_servers;
287	+	int hide_services;
288		int links_delay;
289		int links_disabled;
290		int hidden;
434	–	int disable_hidden;
291		int hide_server_ips;
292		};
293
#	Line 442 | Line 298 | struct server_info
298		char *description;
299		char *network_name;
300		char *network_desc;
445	–	#ifdef HAVE_LIBCRYPTO
301		char *rsa_private_key_file;
302	<	RSA *rsa_private_key;
303	<	SSL_CTX *server_ctx;
304	<	SSL_CTX *client_ctx;
450	<	unsigned int tls_version;
451	<	#endif
302	>	void *rsa_private_key;
303	>	void *server_ctx;
304	>	void *client_ctx;
305		int hub;
306		struct irc_ssaddr ip;
307		struct irc_ssaddr ip6;
308		unsigned int max_clients;
309	+	unsigned int max_nick_length;
310	+	unsigned int max_topic_length;
311		int specific_ipv4_vhost;
312		int specific_ipv6_vhost;
313		struct sockaddr_in dns_host;
#	Line 469 | Line 324 | struct admin_info
324		struct logging_entry
325		{
326		unsigned int use_logging;
472	–	char operlog[PATH_MAX + 1];
473	–	char userlog[PATH_MAX + 1];
474	–	char glinelog[PATH_MAX + 1];
475	–	char ioerrlog[PATH_MAX + 1];
476	–	char klinelog[PATH_MAX + 1];
477	–	char killlog[PATH_MAX + 1];
478	–	char operspylog[PATH_MAX + 1];
479	–	char failed_operlog[PATH_MAX + 1];
327		};
328
482	–	extern dlink_list gdeny_items;
483	–	extern dlink_list class_items;
329		extern dlink_list server_items;
330		extern dlink_list cluster_items;
331	<	extern dlink_list hub_items;
332	<	extern dlink_list rxconf_items;
333	<	extern dlink_list rkconf_items;
334	<	extern dlink_list leaf_items;
335	<	extern dlink_list temporary_klines;
491	<	extern dlink_list temporary_dlines;
492	<	extern dlink_list temporary_glines;
493	<	extern dlink_list temporary_xlines;
494	<	extern dlink_list temporary_rxlines;
495	<	extern dlink_list temporary_rklines;
331	>	extern dlink_list xconf_items;
332	>	extern dlink_list uconf_items;
333	>	extern dlink_list oconf_items;
334	>	extern dlink_list service_items;
335	>	extern struct conf_parser_context conf_parser_ctx;
336		extern struct logging_entry ConfigLoggingEntry;
337		extern struct config_file_entry ConfigFileEntry;/* defined in ircd.c*/
338		extern struct config_channel_entry ConfigChannel;/* defined in channel.c*/
#	Line 502 | Line 342 | extern struct admin_info AdminInfo;
342		extern int valid_wild_card(struct Client *, int, int, ...);
343		/* End GLOBAL section */
344
505	–	extern unsigned int get_sendq(struct Client *);
506	–	extern const char *get_client_class(struct Client *);
507	–	extern int get_client_ping(struct Client *, int *);
508	–	extern void check_class(void);
509	–	extern void init_class(void);
510	–	extern struct ConfItem *find_class(const char *);
345		extern void init_ip_hash_table(void);
346		extern void count_ip_hash(unsigned int *, uint64_t *);
347		extern void remove_one_ip(struct irc_ssaddr *);
348	<	extern struct ConfItem *make_conf_item(ConfType type);
515	<	extern void free_access_item(struct AccessItem *);
348	>	extern struct MaskItem *conf_make(enum maskitem_type);
349		extern void read_conf_files(int);
350	<	extern int attach_conf(struct Client *, struct ConfItem *);
350	>	extern int attach_conf(struct Client *, struct MaskItem *);
351		extern int attach_connect_block(struct Client *, const char *, const char *);
352	+	extern int check_client(struct Client *);
353
520	–	extern int detach_conf(struct Client *, ConfType);
354
355	<	extern struct ConfItem *find_conf_name(dlink_list *, const char *, ConfType);
356	<	extern struct ConfItem *find_conf_exact(ConfType, const char *, const char *, const char *);
357	<	extern struct AccessItem *find_kill(struct Client *);
358	<	extern struct AccessItem *find_gline(struct Client *);
355	>	extern void detach_conf(struct Client *, enum maskitem_type);
356	>	extern struct MaskItem *find_conf_name(dlink_list *, const char *, enum maskitem_type);
357	>	extern struct MaskItem *find_kill(struct Client *);
358	>	extern struct MaskItem *find_gline(struct Client *);
359		extern int conf_connect_allowed(struct irc_ssaddr *, int);
360		extern char *oper_privs_as_string(const unsigned int);
361		extern void split_nuh(struct split_nuh_item *);
362	<	extern struct ConfItem *find_matching_name_conf(ConfType, const char *,
363	<	const char *, const char *, int);
364	<	extern struct ConfItem *find_exact_name_conf(ConfType, const char *,
362	>	extern struct MaskItem *find_matching_name_conf(enum maskitem_type, const char *,
363	>	const char *, const char *, unsigned int);
364	>	extern struct MaskItem *find_exact_name_conf(enum maskitem_type, const struct Client *, const char *,
365		const char *, const char *);
366	<	extern void delete_conf_item(struct ConfItem *);
534	<	extern void report_confitem_types(struct Client *, ConfType, int);
366	>	extern void conf_free(struct MaskItem *);
367		extern void yyerror(const char *);
368	<	extern int conf_yy_fatal_error(const char *);
537	<	extern int conf_fbgets(char *, unsigned int, FBFILE *);
538	<	extern void write_conf_line(struct Client *, struct ConfItem *,
539	<	const char *, time_t);
540	<	extern int remove_conf_line(ConfType, struct Client *, const char *,
541	<	const char *);
542	<	extern void add_temp_line(struct ConfItem *);
368	>	extern void conf_error_report(const char *);
369		extern void cleanup_tklines(void *);
544	–	extern const char *get_conf_name(ConfType);
370		extern int rehash(int);
371	<	extern int conf_add_server(struct ConfItem *, const char *);
372	<	extern void conf_add_class_to_conf(struct ConfItem *, const char *);
548	<
549	<	/* XXX consider moving these into csvlib.h */
550	<	extern void parse_csv_file(FBFILE *, ConfType);
371	>	extern void lookup_confhost(struct MaskItem *);
372	>	extern void conf_add_class_to_conf(struct MaskItem *, const char *);
373
374	<	extern char *get_oper_name(const struct Client *);
374	>	extern const char *get_oper_name(const struct Client *);
375
554	–	extern void *map_to_conf(struct ConfItem *);
555	–	extern struct ConfItem *unmap_conf_item(void *);
376		/* XXX should the parse_aline stuff go into another file ?? */
377		#define AWILD 0x1               /* check wild cards */
558	–	#define NOUSERLOOKUP 0x2 /* Don't lookup the user@host on /rkline nick */
378		extern int parse_aline(const char *, struct Client *, int, char **,
379		int, char **, char **, time_t *, char **, char **);
380		extern int valid_comment(struct Client *, char *, int);
#	Line 564 | Line 383 | extern int valid_comment(struct Client *
383		#define TK_SECONDS 0
384		#define TK_MINUTES 1
385		extern time_t valid_tkline(const char *, int);
386	<	extern int match_conf_password(const char *, const struct AccessItem *);
386	>	extern int match_conf_password(const char *, const struct MaskItem *);
387
388		#define NOT_AUTHORIZED    (-1)
389		#define I_LINE_FULL       (-2)
#	Line 576 | Line 395 | extern int match_conf_password(const cha
395
396		extern void cluster_a_line(struct Client *,
397		const char *, int, int, const char *,...);
579	–	extern void rebuild_cidr_class(struct ConfItem *, struct ClassItem *);
580	–
581	–	/* XXX **/
582	–	extern int yylex(void);
583	–
398		#endif /* INCLUDED_s_conf_h */

Diff Legend

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