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 1309 by michael, Sun Mar 25 11:24:18 2012 UTC vs.
ircd-hybrid/trunk/include/conf.h (file contents), Revision 1858 by michael, Thu Apr 25 15:00:52 2013 UTC

#	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;
44	<
45	<	struct conf_parser_context
46	<	{
47	<	unsigned int boot;
48	<	unsigned int pass;
49	<	FBFILE *conf_file;
50	<	};
51	<
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	<	SERVICE_TYPE
76	<	} ConfType;
77	<
78	<	struct split_nuh_item
79	<	{
80	<	dlink_node node;
81	<
82	<	char *nuhmask;
83	<	char *nickptr;
84	<	char *userptr;
85	<	char *hostptr;
86	<
87	<	size_t nicksize;
88	<	size_t usersize;
89	<	size_t hostsize;
90	<	};
91	<
92	<	struct ConfItem
93	<	{
94	<	dlink_node node;      /* link into known ConfItems of this type */
95	<
96	<	char *name;           /* Primary key */
97	<	void *regexpname;
98	<	unsigned int flags;
99	<	ConfType type;
100	<	};
101	<
102	<	/*
103	<	* MatchItem - used for XLINE and ULINE types
104	<	*/
105	<	struct MatchItem
106	<	{
107	<	char *user;           /* Used for ULINE only */
108	<	char *host;           /* Used for ULINE only */
109	<	char *reason;
110	<	char *oper_reason;
111	<	int action;           /* used for uline */
112	<	int count;            /* How many times this matchitem has been matched */
113	<	int ref_count;        /* How many times is this matchitem in use */
114	<	int illegal;          /* Should it be deleted when possible? */
115	<	time_t           hold;     /* Hold action until this time (calendar time) */
116	<	};
117	<
118	<	struct AccessItem
119	<	{
120	<	dlink_node node;
121	<	unsigned int     dns_failed;
122	<	unsigned int     dns_pending;
123	<	unsigned int     status;   /* If CONF_ILLEGAL, delete when no clients */
124	<	unsigned int     flags;
125	<	unsigned int     modes;
126	<	unsigned int     port;
127	<	int              clients;  /* Number of *LOCAL* clients using this */
128	<	int              bits;
129	<	int              type;
130	<	struct irc_ssaddr my_ipnum; /* ip to bind to for outgoing connect */
131	<	struct irc_ssaddr ipnum;      /* ip to connect to */
132	<	char *           host;     /* host part of user@host */
133	<	char *           passwd;
134	<	char *           spasswd;  /* Password to send. */
135	<	char *           reason;
136	<	char *           oper_reason;
137	<	char *           user;     /* user part of user@host */
138	<	time_t           hold;     /* Hold action until this time (calendar time) */
139	<	struct ConfItem *class_ptr;  /* Class of connection */
140	<	int              aftype;
141	<	#ifdef HAVE_LIBCRYPTO
142	<	/* certs */
143	<	char *cipher_list;
144	<	char *           rsa_public_key_file;
145	<	RSA *            rsa_public_key;
146	<	#endif
147	<	void *regexuser;
148	<	void *regexhost;
149	<	};
150	<
151	<	struct ClassItem
152	<	{
153	<	dlink_list list_ipv4;         /* base of per cidr ipv4 client link list */
154	<	dlink_list list_ipv6;         /* base of per cidr ipv6 client link list */
155	<	unsigned int max_sendq;
156	<	int con_freq;
157	<	int ping_freq;
158	<	int ping_warning;
159	<	int max_total;
160	<	int max_local;
161	<	int max_global;
162	<	int max_ident;
163	<	int max_perip;
164	<	int curr_user_count;
165	<	int cidr_bitlen_ipv4;
166	<	int cidr_bitlen_ipv6;
167	<	int number_per_cidr;
168	<	int active;
169	<	};
170	<
171	<	struct CidrItem
172	<	{
173	<	dlink_node node;
174	<	struct irc_ssaddr mask;
175	<	int number_on_this_cidr;
176	<	};
177	<
178	<	#define ConFreq(x)      ((x)->con_freq)
179	<	#define PingFreq(x)     ((x)->ping_freq)
180	<	#define PingWarning(x)  ((x)->ping_warning)
181	<	#define MaxTotal(x)     ((x)->max_total)
182	<	#define MaxGlobal(x)    ((x)->max_global)
183	<	#define MaxLocal(x)     ((x)->max_local)
184	<	#define MaxIdent(x)     ((x)->max_ident)
185	<	#define MaxPerIp(x)     ((x)->max_perip)
186	<	#define MaxSendq(x)     ((x)->max_sendq)
187	<	#define CurrUserCount(x) ((x)->curr_user_count)
188	<	#define CidrBitlenIPV4(x)       ((x)->cidr_bitlen_ipv4)
189	<	#define CidrBitlenIPV6(x)       ((x)->cidr_bitlen_ipv6)
190	<	#define NumberPerCidr(x) ((x)->number_per_cidr)
191	<
192	<	#define ClassPtr(x)      ((x)->class_ptr)
193	<
194	<
195	<	#define CONF_ILLEGAL            0x80000000
196	<	#define CONF_RESERVED           0x00000001
197	<	#define CONF_CLIENT             0x00000002
198	<	#define CONF_SERVER             0x00000004
199	<	#define CONF_OPERATOR           0x00000008
200	<	#define CONF_KILL               0x00000010
201	<	#define CONF_KLINE              CONF_KILL
202	<	#define CONF_CLASS              0x00000020
203	<	#define CONF_LEAF               0x00000040
204	<	#define CONF_LISTEN_PORT        0x00000080
205	<	#define CONF_HUB                0x00000100
206	<	#define CONF_EXEMPTKLINE        0x00000200
207	<	#define CONF_NOLIMIT            0x00000400
208	<	#define CONF_DLINE              0x00000800
209	<	#define CONF_XLINE              0x00001000
210	<	#define CONF_ULINE              0x00002000
211	<	#define CONF_EXEMPTDLINE        0x00004000
212	<	#define CONF_GLINE              0x00008000
213	<	#define CONF_SERVICE            0x00010000
214	<
215	<	#define CONF_SERVER_MASK       CONF_SERVER
216	<	#define CONF_CLIENT_MASK       (CONF_CLIENT | CONF_OPERATOR | CONF_SERVER_MASK)
217	<
218	<	/* XXX temporary hack */
219	<	#define CONF_CRESV              0x80000001
220	<	#define CONF_NRESV              0x80000002
221	<
222	<	#define IsConfIllegal(x)        ((x)->status & CONF_ILLEGAL)
223	<	#define SetConfIllegal(x)       ((x)->status |= CONF_ILLEGAL)
224	<	#define IsConfServer(x)         ((x)->status == CONF_SERVER)
225	<	#define SetConfServer(x)        ((x)->status = CONF_SERVER)
226	<	#define IsConfOperator(x)       ((x)->status & CONF_OPERATOR)
227	<	#define IsConfHub(x)            ((x)->status == CONF_HUB)
228	<	#define SetConfHub(x)           ((x)->status = CONF_HUB)
229	<	#define IsConfLeaf(x)           ((x)->status == CONF_LEAF)
230	<	#define SetConfLeaf(x)          ((x)->status = CONF_LEAF)
231	<	#define IsConfHubOrLeaf(x)      ((x)->status & (CONF_HUB|CONF_LEAF))
232	<	#define IsConfKill(x)           ((x)->status == CONF_KILL)
233	<	#define IsConfClient(x)         ((x)->status & CONF_CLIENT)
234	<	#define IsConfTypeOfClient(x)   ((x)->status & CONF_CLIENT_MASK)
235	<	#define IsConfUline(x)          ((x)->status & CONF_ULINE)
236	<	#define IsConfXline(x)          ((x)->status & CONF_XLINE)
237	<	#define IsConfGline(x)          ((x)->status == CONF_GLINE)
238	<
239	<	/* AccessItem->flags */
240	<
241	<	/* Generic flags... */
242	<	/* access flags... */
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	<	/*                                      0x00000010 */
48	<	#define CONF_FLAGS_NOMATCH_IP           0x00000020
49	<	#define CONF_FLAGS_EXEMPTKLINE          0x00000040
50	<	#define CONF_FLAGS_NOLIMIT              0x00000080
51	<	/*                                      0x00000100 */
52	<	#define CONF_FLAGS_SPOOF_IP             0x00000200
53	<	#define CONF_FLAGS_SPOOF_NOTICE         0x00000400
54	<	#define CONF_FLAGS_REDIR                0x00000800
55	<	#define CONF_FLAGS_EXEMPTGLINE          0x00001000
56	<	/*                                      0x00002000 */
57	<	#define CONF_FLAGS_CAN_FLOOD            0x00100000
58	<	#define CONF_FLAGS_NEED_PASSWORD        0x00200000
59	<	/* server flags */
60	<	#define CONF_FLAGS_ALLOW_AUTO_CONN      0x00004000
61	<	/*                                      0x00008000 */
262	<	#define CONF_FLAGS_ENCRYPTED            0x00010000
263	<	#define CONF_FLAGS_UNUSED1___           0x00020000
264	<	#define CONF_FLAGS_TEMPORARY            0x00040000
265	<	#define CONF_FLAGS_UNUSED2___           0x00080000
266	<	#define CONF_FLAGS_BURST_AWAY           0x00400000
267	<	#define CONF_FLAGS_EXEMPTRESV           0x00800000
268	<	#define CONF_FLAGS_TOPICBURST           0x01000000
269	<	#define CONF_FLAGS_SSL                  0x02000000
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 AccessItem */
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)
#	Line 283 | Line 76 | struct CidrItem
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)
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)
82	>	#define SetConfAllowAutoConn(x) ((x)->flags |= CONF_FLAGS_ALLOW_AUTO_CONN)
83		#define ClearConfAllowAutoConn(x) ((x)->flags &= ~CONF_FLAGS_ALLOW_AUTO_CONN)
291	–	#define IsConfTemporary(x)      ((x)->flags & CONF_FLAGS_TEMPORARY)
292	–	#define SetConfTemporary(x)     ((x)->flags |= CONF_FLAGS_TEMPORARY)
84		#define IsConfRedir(x)          ((x)->flags & CONF_FLAGS_REDIR)
294	–	#define IsConfAwayBurst(x)      ((x)->flags & CONF_FLAGS_BURST_AWAY)
295	–	#define SetConfAwayBurst(x)     ((x)->flags |= CONF_FLAGS_BURST_AWAY)
296	–	#define ClearConfAwayBurst(x)   ((x)->flags &= ~CONF_FLAGS_BURST_AWAY)
297	–	#define IsConfTopicBurst(x)     ((x)->flags & CONF_FLAGS_TOPICBURST)
298	–	#define SetConfTopicBurst(x)    ((x)->flags |= CONF_FLAGS_TOPICBURST)
299	–	#define ClearConfTopicBurst(x)  ((x)->flags &= ~CONF_FLAGS_TOPICBURST)
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
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 |\
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	<	/* gline acl entry actions */
110	<	#define GDENY_BLOCK             0x1
111	<	#define GDENY_REJECT            0x2
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_RKLINE   = 1 <<  7,
120	>	CONF_RXLINE   = 1 <<  8,
121	>	CONF_XLINE    = 1 <<  9,
122	>	CONF_ULINE    = 1 << 10,
123	>	CONF_GLINE    = 1 << 11,
124	>	CONF_CRESV    = 1 << 12,
125	>	CONF_NRESV    = 1 << 13,
126	>	CONF_SERVICE  = 1 << 14,
127	>	CONF_OPER     = 1 << 15,
128	>	CONF_HUB      = 1 << 16, /* XXX There are no separate hub/leaf configs anymore. This is just for /stats h */
129	>	CONF_CLASS    = 1 << 17  /* XXX Same here; just for /stats Y|y */
130	>	};
131	>
132	>	struct conf_parser_context
133	>	{
134	>	unsigned int boot;
135	>	unsigned int pass;
136	>	FILE *conf_file;
137	>	};
138	>
139	>	struct split_nuh_item
140	>	{
141	>	dlink_node node;
142	>
143	>	char *nuhmask;
144	>	char *nickptr;
145	>	char *userptr;
146	>	char *hostptr;
147	>
148	>	size_t nicksize;
149	>	size_t usersize;
150	>	size_t hostsize;
151	>	};
152	>
153	>	struct MaskItem
154	>	{
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              *cipher_list;
183	>	void              *rsa_public_key;
184	>	void              *regexuser;
185	>	void              *regexhost;
186	>	};
187	>
188	>	struct exempt
189	>	{
190	>	dlink_node node;
191	>	char *name;
192	>	char *user;
193	>	char *host;
194	>	size_t len;
195	>	time_t when;
196	>	struct irc_ssaddr addr;
197	>	int bits;
198	>	int type;
199	>	int coid;
200	>	};
201	>
202	>	struct CidrItem
203	>	{
204	>	dlink_node node;
205	>	struct irc_ssaddr mask;
206	>	unsigned int number_on_this_cidr;
207	>	};
208
209		struct config_file_entry
210		{
211		const char *dpath;          /* DPATH if set from command line */
212		const char *configfile;
213		const char *klinefile;
214	+	const char *glinefile;
215		const char *xlinefile;
331	–	const char *rxlinefile;
332	–	const char *rklinefile;
216		const char *dlinefile;
217	<	const char *glinefile;
335	<	const char *cresvfile;
336	<	const char *nresvfile;
217	>	const char *resvfile;
218
338	–	char *logpath;
339	–	char *operlog;
219		char *egdpool_path;
220		char *service_name;
221
222		MessageFile motd;
344	–	MessageFile opermotd;
223		MessageFile linksfile;
224
225		int gline_min_cidr;
#	Line 356 | Line 234 | struct config_file_entry
234		int ts_max_delta;
235		int ts_warn_delta;
236		int anti_nick_flood;
359	–	int kline_with_reason;
237		int warn_no_nline;
238		int invisible_on_connect;
239		int stats_e_disabled;
#	Line 370 | Line 247 | struct config_file_entry
247		int oper_pass_resv;
248		int glines;
249		int hide_spoof_ips;
373	–	int burst_away;
374	–	int use_whois_actually;
250		int tkline_expire_notices;
251		int opers_bypass_callerid;
252		int ignore_bogus_ts;
378	–	char *kline_reason;
253		int pace_wait;
254		int pace_wait_simple;
255		int gline_time;
256	<	int gline_logging;
256	>	int gline_request_time;
257		int oper_only_umodes;
258		int oper_umodes;
259		int max_targets;
#	Line 388 | Line 262 | struct config_file_entry
262		int min_nonwildcard_simple;
263		int kill_chase_time_limit;
264		int default_floodcount;
391	–	int client_flood;
265		/* 0 == don't use throttle... */
266		int throttle_time;
267		int use_egd;
#	Line 400 | Line 273 | struct config_file_entry
273		struct config_channel_entry
274		{
275		int disable_fake_channels;
403	–	int restrict_channels;
404	–	int disable_local_channels;
405	–	int use_except;
406	–	int use_invex;
407	–	int use_knock;
276		int knock_delay;
277		int knock_delay_channel;
278		unsigned int max_bans;
279		unsigned int max_chans_per_user;
280	+	unsigned int max_chans_per_oper;
281		int no_create_on_split;
282		int no_join_on_split;
283		int quiet_on_ban;
415	–	int burst_topicwho;
284		int default_split_server_count;
285		int default_split_user_count;
286		};
#	Line 422 | Line 290 | struct config_server_hide
290		char *hidden_name;
291		int flatten_links;
292		int hide_servers;
293	+	int hide_services;
294		int links_delay;
295		int links_disabled;
296		int hidden;
428	–	int disable_hidden;
297		int hide_server_ips;
298		};
299
#	Line 436 | Line 304 | struct server_info
304		char *description;
305		char *network_name;
306		char *network_desc;
439	–	#ifdef HAVE_LIBCRYPTO
307		char *rsa_private_key_file;
308	<	RSA *rsa_private_key;
309	<	SSL_CTX *server_ctx;
310	<	SSL_CTX *client_ctx;
444	<	unsigned int tls_version;
445	<	#endif
308	>	void *rsa_private_key;
309	>	void *server_ctx;
310	>	void *client_ctx;
311		int hub;
312		struct irc_ssaddr ip;
313		struct irc_ssaddr ip6;
314		unsigned int max_clients;
315	+	unsigned int max_nick_length;
316	+	unsigned int max_topic_length;
317		int specific_ipv4_vhost;
318		int specific_ipv6_vhost;
319		struct sockaddr_in dns_host;
#	Line 463 | Line 330 | struct admin_info
330		struct logging_entry
331		{
332		unsigned int use_logging;
466	–	unsigned int timestamp;
333		};
334
469	–	extern dlink_list gdeny_items;
470	–	extern dlink_list class_items;
335		extern dlink_list server_items;
336		extern dlink_list cluster_items;
337	<	extern dlink_list hub_items;
337	>	extern dlink_list xconf_items;
338		extern dlink_list rxconf_items;
339		extern dlink_list rkconf_items;
476	–	extern dlink_list leaf_items;
340		extern dlink_list service_items;
341	<	extern dlink_list temporary_klines;
479	<	extern dlink_list temporary_dlines;
480	<	extern dlink_list temporary_glines;
481	<	extern dlink_list temporary_xlines;
482	<	extern dlink_list temporary_rxlines;
483	<	extern dlink_list temporary_rklines;
341	>	extern struct conf_parser_context conf_parser_ctx;
342		extern struct logging_entry ConfigLoggingEntry;
343		extern struct config_file_entry ConfigFileEntry;/* defined in ircd.c*/
344		extern struct config_channel_entry ConfigChannel;/* defined in channel.c*/
#	Line 490 | Line 348 | extern struct admin_info AdminInfo;
348		extern int valid_wild_card(struct Client *, int, int, ...);
349		/* End GLOBAL section */
350
493	–	extern unsigned int get_sendq(struct Client *);
494	–	extern const char *get_client_class(struct Client *);
495	–	extern int get_client_ping(struct Client *, int *);
496	–	extern void check_class(void);
497	–	extern void init_class(void);
498	–	extern struct ConfItem *find_class(const char *);
351		extern void init_ip_hash_table(void);
352		extern void count_ip_hash(unsigned int *, uint64_t *);
353		extern void remove_one_ip(struct irc_ssaddr *);
354	<	extern struct ConfItem *make_conf_item(ConfType type);
503	<	extern void free_access_item(struct AccessItem *);
354	>	extern struct MaskItem *conf_make(enum maskitem_type);
355		extern void read_conf_files(int);
356	<	extern int attach_conf(struct Client *, struct ConfItem *);
356	>	extern int attach_conf(struct Client *, struct MaskItem *);
357		extern int attach_connect_block(struct Client *, const char *, const char *);
358	+	extern int check_client(struct Client *);
359
508	–	extern int detach_conf(struct Client *, ConfType);
360
361	<	extern struct ConfItem *find_conf_name(dlink_list *, const char *, ConfType);
362	<	extern struct ConfItem *find_conf_exact(ConfType, const char *, const char *, const char *);
363	<	extern struct AccessItem *find_kill(struct Client *);
364	<	extern struct AccessItem *find_gline(struct Client *);
361	>	extern void detach_conf(struct Client *, enum maskitem_type);
362	>	extern struct MaskItem *find_conf_name(dlink_list *, const char *, enum maskitem_type);
363	>	extern struct MaskItem *find_kill(struct Client *);
364	>	extern struct MaskItem *find_gline(struct Client *);
365		extern int conf_connect_allowed(struct irc_ssaddr *, int);
366		extern char *oper_privs_as_string(const unsigned int);
367		extern void split_nuh(struct split_nuh_item *);
368	<	extern struct ConfItem *find_matching_name_conf(ConfType, const char *,
369	<	const char *, const char *, int);
370	<	extern struct ConfItem *find_exact_name_conf(ConfType, const struct Client *, const char *,
368	>	extern struct MaskItem *find_matching_name_conf(enum maskitem_type, const char *,
369	>	const char *, const char *, unsigned int);
370	>	extern struct MaskItem *find_exact_name_conf(enum maskitem_type, const struct Client *, const char *,
371		const char *, const char *);
372	<	extern void delete_conf_item(struct ConfItem *);
373	<	extern void report_confitem_types(struct Client *, ConfType, int);
372	>	extern void conf_free(struct MaskItem *);
373	>	extern void report_confitem_types(struct Client *, enum maskitem_type);
374		extern void yyerror(const char *);
375	<	extern int conf_yy_fatal_error(const char *);
525	<	extern int conf_fbgets(char *, unsigned int, FBFILE *);
526	<	extern void write_conf_line(struct Client *, struct ConfItem *,
527	<	const char *, time_t);
528	<	extern int remove_conf_line(ConfType, struct Client *, const char *,
529	<	const char *);
530	<	extern void add_temp_line(struct ConfItem *);
375	>	extern void conf_error_report(const char *);
376		extern void cleanup_tklines(void *);
532	–	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 *);
536	<
537	<	/* XXX consider moving these into csvlib.h */
538	<	extern void parse_csv_file(FBFILE *, ConfType);
378	>	extern void lookup_confhost(struct MaskItem *);
379	>	extern void conf_add_class_to_conf(struct MaskItem *, const char *);
380
381	<	extern char *get_oper_name(const struct Client *);
381	>	extern const char *get_oper_name(const struct Client *);
382
542	–	extern void *map_to_conf(struct ConfItem *);
543	–	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 */
546	–	#define NOUSERLOOKUP 0x2 /* Don't lookup the user@host on /rkline nick */
385		extern int parse_aline(const char *, struct Client *, int, char **,
386		int, char **, char **, time_t *, char **, char **);
387		extern int valid_comment(struct Client *, char *, int);
#	Line 552 | Line 390 | extern int valid_comment(struct Client *
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 *);
393	>	extern int match_conf_password(const char *, const struct MaskItem *);
394
395		#define NOT_AUTHORIZED    (-1)
396		#define I_LINE_FULL       (-2)
#	Line 564 | Line 402 | extern int match_conf_password(const cha
402
403		extern void cluster_a_line(struct Client *,
404		const char *, int, int, const char *,...);
567	–	extern void rebuild_cidr_class(struct ConfItem *, struct ClassItem *);
568	–
569	–	/* XXX **/
570	–	//extern int yylex(void);
571	–
405		#endif /* INCLUDED_s_conf_h */

Diff Legend

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