ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/svn/ircd-hybrid/trunk/src/conf.c

Comparing:
ircd-hybrid-7.2/src/s_conf.c (file contents), Revision 575 by michael, Mon May 1 11:41:09 2006 UTC vs.
ircd-hybrid/trunk/src/conf.c (file contents), Revision 3215 by michael, Tue Mar 25 19:23:15 2014 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  s_conf.c: Configuration file functions.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2002 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.c
23	>	* \brief Configuration file functions.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
28	+	#include "list.h"
29		#include "ircd_defs.h"
30	<	#include "tools.h"
28	<	#include "s_conf.h"
30	>	#include "conf.h"
31		#include "s_serv.h"
32		#include "resv.h"
31	–	#include "s_stats.h"
33		#include "channel.h"
34		#include "client.h"
34	–	#include "common.h"
35		#include "event.h"
36	–	#include "hash.h"
36		#include "hook.h"
37		#include "irc_string.h"
39	–	#include "sprintf_irc.h"
38		#include "s_bsd.h"
41	–	#include "irc_getnameinfo.h"
42	–	#include "irc_getaddrinfo.h"
39		#include "ircd.h"
44	–	#include "list.h"
40		#include "listener.h"
41		#include "hostmask.h"
42		#include "modules.h"
43		#include "numeric.h"
44		#include "fdlist.h"
45	<	#include "s_log.h"
45	>	#include "log.h"
46		#include "send.h"
47		#include "s_gline.h"
53	–	#include "fileio.h"
48		#include "memory.h"
49	+	#include "mempool.h"
50		#include "irc_res.h"
51		#include "userhost.h"
52		#include "s_user.h"
53		#include "channel_mode.h"
54	+	#include "parse.h"
55	+	#include "s_misc.h"
56	+	#include "conf_db.h"
57	+	#include "conf_class.h"
58	+	#include "motd.h"
59	+
60
61	<	struct Callback *client_check_cb = NULL;
61	>	struct config_channel_entry ConfigChannel;
62		struct config_server_hide ConfigServerHide;
63	+	struct config_file_entry ConfigFileEntry;
64	+	struct logging_entry ConfigLoggingEntry = { .use_logging = 1 };
65	+	struct server_info ServerInfo;
66	+	struct admin_info AdminInfo;
67
68		/* general conf items link list root, other than k lines etc. */
69	+	dlink_list service_items = { NULL, NULL, 0 };
70		dlink_list server_items  = { NULL, NULL, 0 };
71		dlink_list cluster_items = { NULL, NULL, 0 };
66	–	dlink_list hub_items     = { NULL, NULL, 0 };
67	–	dlink_list leaf_items    = { NULL, NULL, 0 };
72		dlink_list oconf_items   = { NULL, NULL, 0 };
73		dlink_list uconf_items   = { NULL, NULL, 0 };
74		dlink_list xconf_items   = { NULL, NULL, 0 };
71	–	dlink_list rxconf_items  = { NULL, NULL, 0 };
72	–	dlink_list rkconf_items  = { NULL, NULL, 0 };
75		dlink_list nresv_items   = { NULL, NULL, 0 };
76	<	dlink_list class_items   = { NULL, NULL, 0 };
75	<	dlink_list gdeny_items   = { NULL, NULL, 0 };
76	<
77	<	dlink_list temporary_klines  = { NULL, NULL, 0 };
78	<	dlink_list temporary_dlines  = { NULL, NULL, 0 };
79	<	dlink_list temporary_xlines  = { NULL, NULL, 0 };
80	<	dlink_list temporary_rklines = { NULL, NULL, 0 };
81	<	dlink_list temporary_glines  = { NULL, NULL, 0 };
82	<	dlink_list temporary_rxlines = { NULL, NULL, 0 };
83	<	dlink_list temporary_resv = { NULL, NULL, 0 };
76	>	dlink_list cresv_items = { NULL, NULL, 0 };
77
78		extern unsigned int lineno;
79		extern char linebuf[];
80		extern char conffilebuf[IRCD_BUFSIZE];
88	–	extern char yytext[];
81		extern int yyparse(); /* defined in y.tab.c */
82	<	unsigned int scount = 0; /* used by yyparse(), etc */
83	<	int ypass  = 1; /* used by yyparse()      */
82	>
83	>	struct conf_parser_context conf_parser_ctx = { 0, 0, NULL };
84
85		/* internally defined functions */
86	<	static void lookup_confhost(struct ConfItem *);
95	<	static void set_default_conf(void);
96	<	static void validate_conf(void);
97	<	static void read_conf(FBFILE *);
86	>	static void read_conf(FILE *);
87		static void clear_out_old_conf(void);
99	–	static void flush_deleted_I_P(void);
88		static void expire_tklines(dlink_list *);
89		static void garbage_collect_ip_entries(void);
90		static int hash_ip(struct irc_ssaddr *);
91	<	static int verify_access(struct Client *, const char *);
92	<	static int attach_iline(struct Client *, struct ConfItem *);
91	>	static int verify_access(struct Client *);
92	>	static int attach_iline(struct Client *, struct MaskItem *);
93		static struct ip_entry *find_or_add_ip(struct irc_ssaddr *);
94	<	static void parse_conf_file(int, int);
107	<	static dlink_list *map_to_list(ConfType);
108	<	static struct AccessItem *find_regexp_kline(const char *[]);
94	>	static dlink_list *map_to_list(enum maskitem_type);
95		static int find_user_host(struct Client *, char *, char *, char *, unsigned int);
96
111	–	/*
112	–	* bit_len
113	–	*/
114	–	static int cidr_limit_reached(int, struct irc_ssaddr *, struct ClassItem *);
115	–	static void remove_from_cidr_check(struct irc_ssaddr *, struct ClassItem *);
116	–	static void destroy_cidr_class(struct ClassItem *);
117	–
118	–	static void flags_to_ascii(unsigned int, const unsigned int[], char *, int);
119	–
120	–	FBFILE *conf_fbfile_in = NULL;
121	–
122	–	/* address of default class conf */
123	–	static struct ConfItem *class_default;
97
98		/* usually, with hash tables, you use a prime number...
99		* but in this case I am dealing with ip addresses,
#	Line 131 | Line 104 | static struct ConfItem *class_default;
104		struct ip_entry
105		{
106		struct irc_ssaddr ip;
107	<	int count;
107	>	unsigned int count;
108		time_t last_attempt;
109		struct ip_entry *next;
110		};
111
112		static struct ip_entry *ip_hash_table[IP_HASH_SIZE];
113	<	static BlockHeap *ip_entry_heap = NULL;
113	>	static mp_pool_t *ip_entry_pool = NULL;
114		static int ip_entries_count = 0;
115
116
144	–	inline void *
145	–	map_to_conf(struct ConfItem *aconf)
146	–	{
147	–	void *conf;
148	–	conf = (void *)((unsigned long)aconf +
149	–	(unsigned long)sizeof(struct ConfItem));
150	–	return(conf);
151	–	}
152	–
153	–	inline struct ConfItem *
154	–	unmap_conf_item(void *aconf)
155	–	{
156	–	struct ConfItem *conf;
157	–
158	–	conf = (struct ConfItem *)((unsigned long)aconf -
159	–	(unsigned long)sizeof(struct ConfItem));
160	–	return(conf);
161	–	}
162	–
117		/* conf_dns_callback()
118		*
119	<	* inputs       - pointer to struct AccessItem
119	>	* inputs       - pointer to struct MaskItem
120		*              - pointer to DNSReply reply
121		* output       - none
122		* side effects - called when resolver query finishes
#	Line 171 | Line 125 | unmap_conf_item(void *aconf)
125		* if successful save hp in the conf item it was called with
126		*/
127		static void
128	<	conf_dns_callback(void *vptr, struct DNSReply *reply)
128	>	conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name)
129		{
130	<	struct AccessItem *aconf = (struct AccessItem *)vptr;
177	<	struct ConfItem *conf;
130	>	struct MaskItem *conf = vptr;
131
132	<	MyFree(aconf->dns_query);
180	<	aconf->dns_query = NULL;
132	>	conf->dns_pending = 0;
133
134	<	if (reply != NULL)
135	<	memcpy(&aconf->ipnum, &reply->addr, sizeof(reply->addr));
136	<	else {
137	<	ilog(L_NOTICE, "Host not found: %s, ignoring connect{} block",
186	<	aconf->host);
187	<	conf = unmap_conf_item(aconf);
188	<	sendto_realops_flags(UMODE_ALL, L_ALL,
189	<	"Ignoring connect{} block for %s - host not found",
190	<	conf->name);
191	<	delete_conf_item(conf);
192	<	}
134	>	if (addr != NULL)
135	>	memcpy(&conf->addr, addr, sizeof(conf->addr));
136	>	else
137	>	conf->dns_failed = 1;
138		}
139
140		/* conf_dns_lookup()
#	Line 199 | Line 144 | conf_dns_callback(void *vptr, struct DNS
144		* allocate a dns_query and start ns lookup.
145		*/
146		static void
147	<	conf_dns_lookup(struct AccessItem *aconf)
147	>	conf_dns_lookup(struct MaskItem *conf)
148		{
149	<	if (aconf->dns_query == NULL)
149	>	if (!conf->dns_pending)
150		{
151	<	aconf->dns_query = MyMalloc(sizeof(struct DNSQuery));
152	<	aconf->dns_query->ptr = aconf;
208	<	aconf->dns_query->callback = conf_dns_callback;
209	<	gethost_byname(aconf->host, aconf->dns_query);
151	>	conf->dns_pending = 1;
152	>	gethost_byname(conf_dns_callback, conf, conf->host);
153		}
154		}
155
156	<	/* make_conf_item()
157	<	*
215	<	* inputs       - type of item
216	<	* output       - pointer to new conf entry
217	<	* side effects - none
218	<	*/
219	<	struct ConfItem *
220	<	make_conf_item(ConfType type)
156	>	struct MaskItem *
157	>	conf_make(enum maskitem_type type)
158		{
159	<	struct ConfItem *conf = NULL;
160	<	struct AccessItem *aconf = NULL;
224	<	struct ClassItem *aclass = NULL;
225	<	int status = 0;
226	<
227	<	switch (type)
228	<	{
229	<	case DLINE_TYPE:
230	<	case EXEMPTDLINE_TYPE:
231	<	case GLINE_TYPE:
232	<	case KLINE_TYPE:
233	<	case CLIENT_TYPE:
234	<	case OPER_TYPE:
235	<	case SERVER_TYPE:
236	<	conf = MyMalloc(sizeof(struct ConfItem) +
237	<	sizeof(struct AccessItem));
238	<	aconf = map_to_conf(conf);
239	<	aconf->aftype = AF_INET;
240	<
241	<	/* Yes, sigh. switch on type again */
242	<	switch (type)
243	<	{
244	<	case EXEMPTDLINE_TYPE:
245	<	status = CONF_EXEMPTDLINE;
246	<	break;
247	<
248	<	case DLINE_TYPE:
249	<	status = CONF_DLINE;
250	<	break;
251	<
252	<	case KLINE_TYPE:
253	<	status = CONF_KLINE;
254	<	break;
255	<
256	<	case GLINE_TYPE:
257	<	status = CONF_GLINE;
258	<	break;
159	>	struct MaskItem *conf = MyMalloc(sizeof(*conf));
160	>	dlink_list *list = NULL;
161
162	<	case CLIENT_TYPE:
163	<	status = CONF_CLIENT;
164	<	break;
263	<
264	<	case OPER_TYPE:
265	<	status = CONF_OPERATOR;
266	<	dlinkAdd(conf, &conf->node, &oconf_items);
267	<	break;
268	<
269	<	case SERVER_TYPE:
270	<	status = CONF_SERVER;
271	<	dlinkAdd(conf, &conf->node, &server_items);
272	<	break;
273	<
274	<	default:
275	<	break;
276	<	}
277	<	aconf->status = status;
278	<	break;
279	<
280	<	case LEAF_TYPE:
281	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
282	<	sizeof(struct MatchItem));
283	<	dlinkAdd(conf, &conf->node, &leaf_items);
284	<	break;
285	<
286	<	case HUB_TYPE:
287	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
288	<	sizeof(struct MatchItem));
289	<	dlinkAdd(conf, &conf->node, &hub_items);
290	<	break;
291	<
292	<	case ULINE_TYPE:
293	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
294	<	sizeof(struct MatchItem));
295	<	dlinkAdd(conf, &conf->node, &uconf_items);
296	<	break;
297	<
298	<	case GDENY_TYPE:
299	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
300	<	sizeof(struct AccessItem));
301	<	dlinkAdd(conf, &conf->node, &gdeny_items);
302	<	break;
303	<
304	<	case XLINE_TYPE:
305	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
306	<	sizeof(struct MatchItem));
307	<	dlinkAdd(conf, &conf->node, &xconf_items);
308	<	break;
309	<
310	<	case RXLINE_TYPE:
311	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
312	<	sizeof(struct MatchItem));
313	<	dlinkAdd(conf, &conf->node, &rxconf_items);
314	<	break;
162	>	conf->type   = type;
163	>	conf->active = 1;
164	>	conf->aftype = AF_INET;
165
166	<	case RKLINE_TYPE:
167	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
168	<	sizeof(struct AccessItem));
319	<	aconf = map_to_conf(conf);
320	<	aconf->status = CONF_KLINE;
321	<	dlinkAdd(conf, &conf->node, &rkconf_items);
322	<	break;
323	<
324	<	case CLUSTER_TYPE:
325	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem));
326	<	dlinkAdd(conf, &conf->node, &cluster_items);
327	<	break;
328	<
329	<	case CRESV_TYPE:
330	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
331	<	sizeof(struct ResvChannel));
332	<	break;
333	<
334	<	case NRESV_TYPE:
335	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
336	<	sizeof(struct MatchItem));
337	<	dlinkAdd(conf, &conf->node, &nresv_items);
338	<	break;
339	<
340	<	case CLASS_TYPE:
341	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
342	<	sizeof(struct ClassItem));
343	<	dlinkAdd(conf, &conf->node, &class_items);
344	<	aclass = (struct ClassItem *)map_to_conf(conf);
345	<	ConFreq(aclass)  = DEFAULT_CONNECTFREQUENCY;
346	<	PingFreq(aclass) = DEFAULT_PINGFREQUENCY;
347	<	MaxTotal(aclass) = MAXIMUM_LINKS_DEFAULT;
348	<	MaxSendq(aclass) = DEFAULT_SENDQ;
349	<	CurrUserCount(aclass) = 0;
350	<	break;
351	<
352	<	default:
353	<	conf = NULL;
354	<	break;
355	<	}
356	<
357	<	/* XXX Yes, this will core if default is hit. I want it to for now - db */
358	<	conf->type = type;
359	<
360	<	return(conf);
166	>	if ((list = map_to_list(type)))
167	>	dlinkAdd(conf, &conf->node, list);
168	>	return conf;
169		}
170
171		void
172	<	delete_conf_item(struct ConfItem *conf)
172	>	conf_free(struct MaskItem *conf)
173		{
174	<	dlink_node *m = NULL;
175	<	struct MatchItem *match_item;
176	<	struct AccessItem *aconf;
177	<	ConfType type = conf->type;
174	>	dlink_node *ptr = NULL, *ptr_next = NULL;
175	>	dlink_list *list = NULL;
176	>
177	>	if (conf->node.next)
178	>	if ((list = map_to_list(conf->type)))
179	>	dlinkDelete(&conf->node, list);
180
181		MyFree(conf->name);
372	–	conf->name = NULL;
182
183	<	switch(type)
184	<	{
185	<	case DLINE_TYPE:
186	<	case EXEMPTDLINE_TYPE:
187	<	case GLINE_TYPE:
188	<	case KLINE_TYPE:
189	<	case CLIENT_TYPE:
190	<	case OPER_TYPE:
191	<	case SERVER_TYPE:
192	<	aconf = map_to_conf(conf);
193	<
194	<	if (aconf->dns_query != NULL)
195	<	{
196	<	delete_resolver_queries(aconf->dns_query);
197	<	MyFree(aconf->dns_query);
389	<	}
390	<	if (aconf->passwd != NULL)
391	<	memset(aconf->passwd, 0, strlen(aconf->passwd));
392	<	if (aconf->spasswd != NULL)
393	<	memset(aconf->spasswd, 0, strlen(aconf->spasswd));
394	<	aconf->class_ptr = NULL;
395	<
396	<	MyFree(aconf->passwd);
397	<	MyFree(aconf->spasswd);
398	<	MyFree(aconf->reason);
399	<	MyFree(aconf->oper_reason);
400	<	MyFree(aconf->user);
401	<	MyFree(aconf->host);
402	<	MyFree(aconf->fakename);
183	>	if (conf->dns_pending)
184	>	delete_resolver_queries(conf);
185	>	if (conf->passwd != NULL)
186	>	memset(conf->passwd, 0, strlen(conf->passwd));
187	>	if (conf->spasswd != NULL)
188	>	memset(conf->spasswd, 0, strlen(conf->spasswd));
189	>
190	>	conf->class = NULL;
191	>
192	>	MyFree(conf->passwd);
193	>	MyFree(conf->spasswd);
194	>	MyFree(conf->reason);
195	>	MyFree(conf->certfp);
196	>	MyFree(conf->user);
197	>	MyFree(conf->host);
198		#ifdef HAVE_LIBCRYPTO
199	<	if (aconf->rsa_public_key)
405	<	RSA_free(aconf->rsa_public_key);
406	<	MyFree(aconf->rsa_public_key_file);
407	<	#endif
408	<
409	<	/* Yes, sigh. switch on type again */
410	<	switch(type)
411	<	{
412	<	case EXEMPTDLINE_TYPE:
413	<	case DLINE_TYPE:
414	<	case GLINE_TYPE:
415	<	case KLINE_TYPE:
416	<	case CLIENT_TYPE:
417	<	MyFree(conf);
418	<	break;
199	>	MyFree(conf->cipher_list);
200
201	<	case OPER_TYPE:
202	<	aconf = map_to_conf(conf);
203	<	if (!IsConfIllegal(aconf))
204	<	dlinkDelete(&conf->node, &oconf_items);
205	<	MyFree(conf);
206	<	break;
207	<
208	<	case SERVER_TYPE:
428	<	aconf = map_to_conf(conf);
429	<	if (!IsConfIllegal(aconf))
430	<	dlinkDelete(&conf->node, &server_items);
431	<	MyFree(conf);
432	<	break;
433	<
434	<	default:
435	<	break;
436	<	}
437	<	break;
438	<
439	<	case HUB_TYPE:
440	<	match_item = map_to_conf(conf);
441	<	MyFree(match_item->user);
442	<	MyFree(match_item->host);
443	<	MyFree(match_item->reason);
444	<	MyFree(match_item->oper_reason);
445	<	/* If marked illegal, its already been pulled off of the hub_items list */
446	<	if (!match_item->illegal)
447	<	dlinkDelete(&conf->node, &hub_items);
448	<	MyFree(conf);
449	<	break;
450	<
451	<	case LEAF_TYPE:
452	<	match_item = map_to_conf(conf);
453	<	MyFree(match_item->user);
454	<	MyFree(match_item->host);
455	<	MyFree(match_item->reason);
456	<	MyFree(match_item->oper_reason);
457	<	/* If marked illegal, its already been pulled off of the leaf_items list */
458	<	if (!match_item->illegal)
459	<	dlinkDelete(&conf->node, &leaf_items);
460	<	MyFree(conf);
461	<	break;
462	<
463	<	case ULINE_TYPE:
464	<	match_item = map_to_conf(conf);
465	<	MyFree(match_item->user);
466	<	MyFree(match_item->host);
467	<	MyFree(match_item->reason);
468	<	MyFree(match_item->oper_reason);
469	<	dlinkDelete(&conf->node, &uconf_items);
470	<	MyFree(conf);
471	<	break;
472	<
473	<	case XLINE_TYPE:
474	<	match_item = map_to_conf(conf);
475	<	MyFree(match_item->user);
476	<	MyFree(match_item->host);
477	<	MyFree(match_item->reason);
478	<	MyFree(match_item->oper_reason);
479	<	dlinkDelete(&conf->node, &xconf_items);
480	<	MyFree(conf);
481	<	break;
482	<
483	<	case RKLINE_TYPE:
484	<	aconf = map_to_conf(conf);
485	<	MyFree(aconf->regexuser);
486	<	MyFree(aconf->regexhost);
487	<	MyFree(aconf->user);
488	<	MyFree(aconf->host);
489	<	MyFree(aconf->reason);
490	<	MyFree(aconf->oper_reason);
491	<	dlinkDelete(&conf->node, &rkconf_items);
492	<	MyFree(conf);
493	<	break;
494	<
495	<	case RXLINE_TYPE:
496	<	MyFree(conf->regexpname);
497	<	match_item = map_to_conf(conf);
498	<	MyFree(match_item->user);
499	<	MyFree(match_item->host);
500	<	MyFree(match_item->reason);
501	<	MyFree(match_item->oper_reason);
502	<	dlinkDelete(&conf->node, &rxconf_items);
503	<	MyFree(conf);
504	<	break;
505	<
506	<	case NRESV_TYPE:
507	<	match_item = map_to_conf(conf);
508	<	MyFree(match_item->user);
509	<	MyFree(match_item->host);
510	<	MyFree(match_item->reason);
511	<	MyFree(match_item->oper_reason);
512	<	dlinkDelete(&conf->node, &nresv_items);
513	<
514	<	if (conf->flags & CONF_FLAGS_TEMPORARY)
515	<	if ((m = dlinkFindDelete(&temporary_resv, conf)) != NULL)
516	<	free_dlink_node(m);
517	<
518	<	MyFree(conf);
519	<	break;
520	<
521	<	case GDENY_TYPE:
522	<	aconf = map_to_conf(conf);
523	<	MyFree(aconf->user);
524	<	MyFree(aconf->host);
525	<	dlinkDelete(&conf->node, &gdeny_items);
526	<	MyFree(conf);
527	<	break;
528	<
529	<	case CLUSTER_TYPE:
530	<	dlinkDelete(&conf->node, &cluster_items);
531	<	MyFree(conf);
532	<	break;
533	<
534	<	case CRESV_TYPE:
535	<	if (conf->flags & CONF_FLAGS_TEMPORARY)
536	<	if ((m = dlinkFindDelete(&temporary_resv, conf)) != NULL)
537	<	free_dlink_node(m);
538	<
539	<	MyFree(conf);
540	<	break;
541	<
542	<	case CLASS_TYPE:
543	<	dlinkDelete(&conf->node, &class_items);
544	<	MyFree(conf);
545	<	break;
546	<
547	<	default:
548	<	break;
201	>	if (conf->rsa_public_key)
202	>	RSA_free(conf->rsa_public_key);
203	>	#endif
204	>	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->hub_list.head)
205	>	{
206	>	MyFree(ptr->data);
207	>	dlinkDelete(ptr, &conf->hub_list);
208	>	free_dlink_node(ptr);
209		}
550	–	}
551	–
552	–	/* free_access_item()
553	–	*
554	–	* inputs       - pointer to conf to free
555	–	* output       - none
556	–	* side effects - crucial password fields are zeroed, conf is freed
557	–	*/
558	–	void
559	–	free_access_item(struct AccessItem *aconf)
560	–	{
561	–	struct ConfItem *conf;
210
211	<	if (aconf == NULL)
564	<	return;
565	<	conf = unmap_conf_item(aconf);
566	<	delete_conf_item(conf);
567	<	}
568	<
569	<	static const unsigned int shared_bit_table[] =
570	<	{ 'K', 'k', 'U', 'X', 'x', 'Y', 'Q', 'q', 'R', 'L', 0};
571	<
572	<	/* report_confitem_types()
573	<	*
574	<	* inputs       - pointer to client requesting confitem report
575	<	*              - ConfType to report
576	<	* output       - none
577	<	* side effects -
578	<	*/
579	<	void
580	<	report_confitem_types(struct Client *source_p, ConfType type, int temp)
581	<	{
582	<	dlink_node *ptr = NULL;
583	<	struct ConfItem *conf = NULL;
584	<	struct AccessItem *aconf = NULL;
585	<	struct MatchItem *matchitem = NULL;
586	<	struct ClassItem *classitem = NULL;
587	<	char buf[12];
588	<	char *p = NULL;
589	<	const char *pfx = NULL;
590	<
591	<	switch (type)
211	>	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->leaf_list.head)
212		{
213	<	case GDENY_TYPE:
214	<	DLINK_FOREACH(ptr, gdeny_items.head)
215	<	{
216	<	conf = ptr->data;
597	<	aconf = map_to_conf(conf);
598	<
599	<	p = buf;
600	<
601	<	if (aconf->flags & GDENY_BLOCK)
602	<	*p++ = 'B';
603	<	else
604	<	*p++ = 'b';
605	<
606	<	if (aconf->flags & GDENY_REJECT)
607	<	*p++ = 'R';
608	<	else
609	<	*p++ = 'r';
610	<
611	<	*p = '\0';
612	<
613	<	sendto_one(source_p, ":%s %d %s V %s@%s %s %s",
614	<	me.name, RPL_STATSDEBUG, source_p->name,
615	<	aconf->user, aconf->host, conf->name, buf);
616	<	}
617	<	break;
618	<
619	<	case XLINE_TYPE:
620	<	DLINK_FOREACH(ptr, xconf_items.head)
621	<	{
622	<	conf = ptr->data;
623	<	matchitem = map_to_conf(conf);
624	<
625	<	sendto_one(source_p, form_str(RPL_STATSXLINE),
626	<	me.name, source_p->name,
627	<	matchitem->hold ? "x": "X", matchitem->count,
628	<	conf->name, matchitem->reason);
629	<	}
630	<	break;
631	<
632	<	case RXLINE_TYPE:
633	<	DLINK_FOREACH(ptr, rxconf_items.head)
634	<	{
635	<	conf = ptr->data;
636	<	matchitem = map_to_conf(conf);
637	<
638	<	sendto_one(source_p, form_str(RPL_STATSXLINE),
639	<	me.name, source_p->name,
640	<	matchitem->hold ? "xR": "XR", matchitem->count,
641	<	conf->name, matchitem->reason);
642	<	}
643	<	break;
644	<
645	<	case RKLINE_TYPE:
646	<	pfx = temp ? "Rk" : "RK";
647	<
648	<	DLINK_FOREACH(ptr, rkconf_items.head)
649	<	{
650	<	aconf = map_to_conf((conf = ptr->data));
651	<
652	<	if (temp && !(conf->flags & CONF_FLAGS_TEMPORARY))
653	<	continue;
654	<
655	<	sendto_one(source_p, form_str(RPL_STATSKLINE), me.name,
656	<	source_p->name, pfx, aconf->host, aconf->user,
657	<	aconf->reason, aconf->oper_reason ? aconf->oper_reason : "");
658	<	}
659	<	break;
660	<
661	<	case ULINE_TYPE:
662	<	DLINK_FOREACH(ptr, uconf_items.head)
663	<	{
664	<	conf = ptr->data;
665	<	matchitem = map_to_conf(conf);
666	<
667	<	p = buf;
668	<
669	<	/* some of these are redundant for the sake of
670	<	* consistency with cluster{} flags
671	<	*/
672	<	*p++ = 'c';
673	<	flags_to_ascii(matchitem->action, shared_bit_table, p, 0);
674	<
675	<	sendto_one(source_p, form_str(RPL_STATSULINE),
676	<	me.name, source_p->name, conf->name,
677	<	matchitem->user?matchitem->user: "*",
678	<	matchitem->host?matchitem->host: "*", buf);
679	<	}
680	<
681	<	DLINK_FOREACH(ptr, cluster_items.head)
682	<	{
683	<	conf = ptr->data;
684	<
685	<	p = buf;
686	<
687	<	*p++ = 'C';
688	<	flags_to_ascii(conf->flags, shared_bit_table, p, 0);
689	<
690	<	sendto_one(source_p, form_str(RPL_STATSULINE),
691	<	me.name, source_p->name, conf->name,
692	<	"*", "*", buf);
693	<	}
694	<
695	<	break;
696	<
697	<	case OPER_TYPE:
698	<	DLINK_FOREACH(ptr, oconf_items.head)
699	<	{
700	<	conf = ptr->data;
701	<	aconf = map_to_conf(conf);
702	<
703	<	/* Don't allow non opers to see oper privs */
704	<	if (IsOper(source_p))
705	<	sendto_one(source_p, form_str(RPL_STATSOLINE),
706	<	me.name, source_p->name, 'O', aconf->user, aconf->host,
707	<	conf->name, oper_privs_as_string(aconf->port),
708	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
709	<	else
710	<	sendto_one(source_p, form_str(RPL_STATSOLINE),
711	<	me.name, source_p->name, 'O', aconf->user, aconf->host,
712	<	conf->name, "0",
713	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
714	<	}
715	<	break;
716	<
717	<	case CLASS_TYPE:
718	<	DLINK_FOREACH(ptr, class_items.head)
719	<	{
720	<	conf = ptr->data;
721	<	classitem = map_to_conf(conf);
722	<	sendto_one(source_p, form_str(RPL_STATSYLINE),
723	<	me.name, source_p->name, 'Y',
724	<	conf->name, PingFreq(classitem),
725	<	ConFreq(classitem),
726	<	MaxTotal(classitem), MaxSendq(classitem));
727	<	}
728	<	break;
729	<
730	<	case CONF_TYPE:
731	<	case CLIENT_TYPE:
732	<	break;
733	<
734	<	case SERVER_TYPE:
735	<	DLINK_FOREACH(ptr, server_items.head)
736	<	{
737	<	p = buf;
738	<
739	<	conf = ptr->data;
740	<	aconf = map_to_conf(conf);
741	<
742	<	buf[0] = '\0';
743	<
744	<	if (IsConfAllowAutoConn(aconf))
745	<	*p++ = 'A';
746	<	if (IsConfCryptLink(aconf))
747	<	*p++ = 'C';
748	<	if (IsConfLazyLink(aconf))
749	<	*p++ = 'L';
750	<	if (aconf->fakename)
751	<	*p++ = 'M';
752	<	if (IsConfTopicBurst(aconf))
753	<	*p++ = 'T';
754	<	if (IsConfCompressed(aconf))
755	<	*p++ = 'Z';
756	<	if (buf[0] == '\0')
757	<	*p++ = '*';
758	<
759	<	*p = '\0';
760	<
761	<	/* Allow admins to see actual ips
762	<	* unless hide_server_ips is enabled
763	<	*/
764	<	if (!ConfigServerHide.hide_server_ips && IsAdmin(source_p))
765	<	sendto_one(source_p, form_str(RPL_STATSCLINE),
766	<	me.name, source_p->name, 'C', aconf->host,
767	<	buf, conf->name, aconf->port,
768	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
769	<	else
770	<	sendto_one(source_p, form_str(RPL_STATSCLINE),
771	<	me.name, source_p->name, 'C',
772	<	"*@127.0.0.1", buf, conf->name, aconf->port,
773	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
774	<	}
775	<	break;
776	<
777	<	case HUB_TYPE:
778	<	DLINK_FOREACH(ptr, hub_items.head)
779	<	{
780	<	conf = ptr->data;
781	<	matchitem = map_to_conf(conf);
782	<	sendto_one(source_p, form_str(RPL_STATSHLINE), me.name,
783	<	source_p->name, 'H', matchitem->host, conf->name, 0, "*");
784	<	}
785	<	break;
213	>	MyFree(ptr->data);
214	>	dlinkDelete(ptr, &conf->leaf_list);
215	>	free_dlink_node(ptr);
216	>	}
217
218	<	case LEAF_TYPE:
219	<	DLINK_FOREACH(ptr, leaf_items.head)
220	<	{
790	<	conf = ptr->data;
791	<	matchitem = map_to_conf(conf);
792	<	sendto_one(source_p, form_str(RPL_STATSLLINE), me.name,
793	<	source_p->name, 'L', matchitem->host, conf->name, 0, "*");
794	<	}
795	<	break;
218	>	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->exempt_list.head)
219	>	{
220	>	struct exempt *exptr = ptr->data;
221
222	<	case GLINE_TYPE:
223	<	case KLINE_TYPE:
224	<	case DLINE_TYPE:
225	<	case EXEMPTDLINE_TYPE:
226	<	case CRESV_TYPE:
802	<	case NRESV_TYPE:
803	<	case CLUSTER_TYPE:
804	<	break;
222	>	dlinkDelete(ptr, &conf->exempt_list);
223	>	MyFree(exptr->name);
224	>	MyFree(exptr->user);
225	>	MyFree(exptr->host);
226	>	MyFree(exptr);
227		}
228	+
229	+	MyFree(conf);
230		}
231
232		/* check_client()
#	Line 818 | Line 242 | report_confitem_types(struct Client *sou
242		*                Look for conf lines which have the same
243		*                status as the flags passed.
244		*/
245	<	static void *
246	<	check_client(va_list args)
245	>	int
246	>	check_client(struct Client *source_p)
247		{
824	–	struct Client *source_p = va_arg(args, struct Client *);
825	–	const char *username = va_arg(args, const char *);
248		int i;
249	<
250	<	/* I'm already in big trouble if source_p->localClient is NULL -db */
251	<	if ((i = verify_access(source_p, username)))
830	<	{
831	<	ilog(L_INFO, "Access denied: %s[%s]",
249	>
250	>	if ((i = verify_access(source_p)))
251	>	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
252		source_p->name, source_p->sockhost);
833	–	}
253
254		switch (i)
255		{
837	–	case IRCD_SOCKET_ERROR:
838	–	exit_client(source_p, &me, "Socket Error");
839	–	break;
840	–
256		case TOO_MANY:
257	<	sendto_realops_flags(UMODE_FULL, L_ALL,
257	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
258		"Too many on IP for %s (%s).",
259	<	get_client_name(source_p, SHOW_IP),
260	<	source_p->sockhost);
261	<	ilog(L_INFO,"Too many connections on IP from %s.",
262	<	get_client_name(source_p, SHOW_IP));
263	<	ServerStats->is_ref++;
264	<	exit_client(source_p, &me, "No more connections allowed on that IP");
259	>	get_client_name(source_p, SHOW_IP),
260	>	source_p->sockhost);
261	>	ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
262	>	get_client_name(source_p, SHOW_IP));
263	>	++ServerStats.is_ref;
264	>	exit_client(source_p, "No more connections allowed on that IP");
265		break;
266
267		case I_LINE_FULL:
268	<	sendto_realops_flags(UMODE_FULL, L_ALL,
269	<	"I-line is full for %s (%s).",
270	<	get_client_name(source_p, SHOW_IP),
271	<	source_p->sockhost);
272	<	ilog(L_INFO,"Too many connections from %s.",
273	<	get_client_name(source_p, SHOW_IP));
274	<	ServerStats->is_ref++;
275	<	exit_client(source_p, &me,
861	<	"No more connections allowed in your connection class");
268	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
269	>	"auth{} block is full for %s (%s).",
270	>	get_client_name(source_p, SHOW_IP),
271	>	source_p->sockhost);
272	>	ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
273	>	get_client_name(source_p, SHOW_IP));
274	>	++ServerStats.is_ref;
275	>	exit_client(source_p, "No more connections allowed in your connection class");
276		break;
277
278		case NOT_AUTHORIZED:
279	<	{
866	<	static char ipaddr[HOSTIPLEN];
867	<	ServerStats->is_ref++;
279	>	++ServerStats.is_ref;
280		/* jdc - lists server name & port connections are on */
281		/*       a purely cosmetical change */
282	<	irc_getnameinfo((struct sockaddr*)&source_p->localClient->ip,
283	<	source_p->localClient->ip.ss_len, ipaddr, HOSTIPLEN, NULL, 0,
284	<	NI_NUMERICHOST);
285	<	sendto_realops_flags(UMODE_UNAUTH, L_ALL,
286	<	"Unauthorized client connection from %s [%s] on [%s/%u].",
287	<	get_client_name(source_p, SHOW_IP),
288	<	ipaddr,
289	<	source_p->localClient->listener->name,
290	<	source_p->localClient->listener->port);
291	<	ilog(L_INFO,
292	<	"Unauthorized client connection from %s on [%s/%u].",
293	<	get_client_name(source_p, SHOW_IP),
294	<	source_p->localClient->listener->name,
883	<	source_p->localClient->listener->port);
884	<
885	<	/* XXX It is prolematical whether it is better to use the
886	<	* capture reject code here or rely on the connecting too fast code.
887	<	* - Dianora
888	<	*/
889	<	if(REJECT_HOLD_TIME > 0)
890	<	{
891	<	sendto_one(source_p, ":%s NOTICE %s :You are not authorized to use this server",
892	<	me.name, source_p->name);
893	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
894	<	SetCaptured(source_p);
895	<	}
896	<	else
897	<	exit_client(source_p, &me, "You are not authorized to use this server");
282	>	sendto_realops_flags(UMODE_UNAUTH, L_ALL, SEND_NOTICE,
283	>	"Unauthorized client connection from %s [%s] on [%s/%u].",
284	>	get_client_name(source_p, SHOW_IP),
285	>	source_p->sockhost,
286	>	source_p->localClient->listener->name,
287	>	source_p->localClient->listener->port);
288	>	ilog(LOG_TYPE_IRCD,
289	>	"Unauthorized client connection from %s on [%s/%u].",
290	>	get_client_name(source_p, SHOW_IP),
291	>	source_p->localClient->listener->name,
292	>	source_p->localClient->listener->port);
293	>
294	>	exit_client(source_p, "You are not authorized to use this server");
295		break;
296	<	}
900	<
296	>
297		case BANNED_CLIENT:
298	<	/*
299	<	* Don't exit them immediately, play with them a bit.
904	<	* - Dianora
905	<	*/
906	<	if (REJECT_HOLD_TIME > 0)
907	<	{
908	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
909	<	SetCaptured(source_p);
910	<	}
911	<	else
912	<	exit_client(source_p, &me, "Banned");
913	<	ServerStats->is_ref++;
298	>	exit_client(source_p, "Banned");
299	>	++ServerStats.is_ref;
300		break;
301
302		case 0:
#	Line 918 | Line 304 | check_client(va_list args)
304		break;
305		}
306
307	<	return (i < 0 ? NULL : source_p);
307	>	return (i < 0 ? 0 : 1);
308		}
309
310		/* verify_access()
311		*
312		* inputs       - pointer to client to verify
927	–	*              - pointer to proposed username
313		* output       - 0 if success -'ve if not
314		* side effect  - find the first (best) I line to attach.
315		*/
316		static int
317	<	verify_access(struct Client *client_p, const char *username)
317	>	verify_access(struct Client *client_p)
318		{
319	<	struct AccessItem *aconf = NULL, *rkconf = NULL;
320	<	struct ConfItem *conf = NULL;
936	<	char non_ident[USERLEN + 1] = { '~', '\0' };
937	<	const char *uhi[3];
319	>	struct MaskItem *conf = NULL;
320	>	char non_ident[USERLEN + 1] = "~";
321
322		if (IsGotId(client_p))
323		{
324	<	aconf = find_address_conf(client_p->host, client_p->username,
325	<	&client_p->localClient->ip,
326	<	client_p->localClient->aftype,
324	>	conf = find_address_conf(client_p->host, client_p->username,
325	>	&client_p->localClient->ip,
326	>	client_p->localClient->aftype,
327		client_p->localClient->passwd);
328		}
329		else
330		{
331	<	strlcpy(non_ident+1, username, sizeof(non_ident)-1);
332	<	aconf = find_address_conf(client_p->host,non_ident,
333	<	&client_p->localClient->ip,
334	<	client_p->localClient->aftype,
335	<	client_p->localClient->passwd);
331	>	strlcpy(non_ident + 1, client_p->username, sizeof(non_ident) - 1);
332	>	conf = find_address_conf(client_p->host,non_ident,
333	>	&client_p->localClient->ip,
334	>	client_p->localClient->aftype,
335	>	client_p->localClient->passwd);
336		}
337
338	<	uhi[0] = IsGotId(client_p) ? client_p->username : non_ident;
956	<	uhi[1] = client_p->host;
957	<	uhi[2] = client_p->sockhost;
958	<
959	<	rkconf = find_regexp_kline(uhi);
960	<
961	<	if (aconf != NULL)
338	>	if (conf)
339		{
340	<	if (IsConfClient(aconf) && !rkconf)
340	>	if (IsConfClient(conf))
341		{
342	<	conf = unmap_conf_item(aconf);
966	<
967	<	if (IsConfRedir(aconf))
342	>	if (IsConfRedir(conf))
343		{
344	<	sendto_one(client_p, form_str(RPL_REDIR),
345	<	me.name, client_p->name,
346	<	conf->name ? conf->name : "",
347	<	aconf->port);
973	<	return(NOT_AUTHORIZED);
344	>	sendto_one_numeric(client_p, &me, RPL_REDIR,
345	>	conf->name ? conf->name : "",
346	>	conf->port);
347	>	return NOT_AUTHORIZED;
348		}
349
350	<	if (IsConfDoIdentd(aconf))
351	<	SetNeedId(client_p);
350	>	if (IsConfDoIdentd(conf))
351	>	SetNeedId(client_p);
352
353		/* Thanks for spoof idea amm */
354	<	if (IsConfDoSpoofIp(aconf))
354	>	if (IsConfDoSpoofIp(conf))
355		{
356	<	conf = unmap_conf_item(aconf);
357	<
358	<	if (!ConfigFileEntry.hide_spoof_ips && IsConfSpoofNotice(aconf))
985	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "%s spoofing: %s as %s",
356	>	if (!ConfigFileEntry.hide_spoof_ips && IsConfSpoofNotice(conf))
357	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
358	>	"%s spoofing: %s as %s",
359		client_p->name, client_p->host, conf->name);
360		strlcpy(client_p->host, conf->name, sizeof(client_p->host));
361	<	SetIPSpoof(client_p);
361	>	AddFlag(client_p, FLAGS_IP_SPOOFING | FLAGS_AUTH_SPOOF);
362		}
363
364	<	return(attach_iline(client_p, conf));
364	>	return attach_iline(client_p, conf);
365		}
366	<	else if (rkconf || IsConfKill(aconf) || (ConfigFileEntry.glines && IsConfGline(aconf)))
366	>	else if (IsConfKill(conf) || (ConfigFileEntry.glines && IsConfGline(conf)))
367		{
368	<	/* XXX */
369	<	aconf = rkconf ? rkconf : aconf;
370	<	if (IsConfGline(aconf))
371	<	sendto_one(client_p, ":%s NOTICE %s :*** G-lined", me.name,
999	<	client_p->name);
1000	<	if (ConfigFileEntry.kline_with_reason)
1001	<	sendto_one(client_p, ":%s NOTICE %s :*** Banned %s",
1002	<	me.name, client_p->name, aconf->reason);
1003	<	return(BANNED_CLIENT);
368	>	if (IsConfGline(conf))
369	>	sendto_one_notice(client_p, &me, ":*** G-lined");
370	>	sendto_one_notice(client_p, &me, ":*** Banned: %s", conf->reason);
371	>	return BANNED_CLIENT;
372		}
373		}
374
375	<	return(NOT_AUTHORIZED);
375	>	return NOT_AUTHORIZED;
376		}
377
378		/* attach_iline()
#	Line 1015 | Line 383 | verify_access(struct Client *client_p, c
383		* side effects - do actual attach
384		*/
385		static int
386	<	attach_iline(struct Client *client_p, struct ConfItem *conf)
386	>	attach_iline(struct Client *client_p, struct MaskItem *conf)
387		{
388	<	struct AccessItem *aconf;
1021	<	struct ClassItem *aclass;
388	>	struct ClassItem *class = NULL;
389		struct ip_entry *ip_found;
390		int a_limit_reached = 0;
391	<	int local = 0, global = 0, ident = 0;
391	>	unsigned int local = 0, global = 0, ident = 0;
392	>
393	>	assert(conf->class);
394
395		ip_found = find_or_add_ip(&client_p->localClient->ip);
396		ip_found->count++;
397		SetIpHash(client_p);
398
399	<	aconf = (struct AccessItem *)map_to_conf(conf);
1031	<	if (aconf->class_ptr == NULL)
1032	<	return NOT_AUTHORIZED;  /* If class is missing, this is best */
1033	<
1034	<	aclass = (struct ClassItem *)map_to_conf(aconf->class_ptr);
399	>	class = conf->class;
400
401		count_user_host(client_p->username, client_p->host,
402		&global, &local, &ident);
#	Line 1040 | Line 405 | attach_iline(struct Client *client_p, st
405		* setting a_limit_reached if any limit is reached.
406		* - Dianora
407		*/
408	<	if (MaxTotal(aclass) != 0 && CurrUserCount(aclass) >= MaxTotal(aclass))
408	>	if (class->max_total != 0 && class->ref_count >= class->max_total)
409		a_limit_reached = 1;
410	<	else if (MaxPerIp(aclass) != 0 && ip_found->count >= MaxPerIp(aclass))
410	>	else if (class->max_perip != 0 && ip_found->count > class->max_perip)
411		a_limit_reached = 1;
412	<	else if (MaxLocal(aclass) != 0 && local >= MaxLocal(aclass))
412	>	else if (class->max_local != 0 && local >= class->max_local)
413		a_limit_reached = 1;
414	<	else if (MaxGlobal(aclass) != 0 && global >= MaxGlobal(aclass))
414	>	else if (class->max_global != 0 && global >= class->max_global)
415		a_limit_reached = 1;
416	<	else if (MaxIdent(aclass) != 0 && ident >= MaxIdent(aclass) &&
416	>	else if (class->max_ident != 0 && ident >= class->max_ident &&
417		client_p->username[0] != '~')
418		a_limit_reached = 1;
419
420		if (a_limit_reached)
421		{
422	<	if (!IsConfExemptLimits(aconf))
423	<	return TOO_MANY;  /* Already at maximum allowed */
422	>	if (!IsConfExemptLimits(conf))
423	>	return TOO_MANY;   /* Already at maximum allowed */
424
425	<	sendto_one(client_p,
426	<	":%s NOTICE %s :*** Your connection class is full, "
1062	<	"but you have exceed_limit = yes;", me.name, client_p->name);
425	>	sendto_one_notice(client_p, &me, ":*** Your connection class is full, "
426	>	"but you have exceed_limit = yes;");
427		}
428
429		return attach_conf(client_p, conf);
#	Line 1075 | Line 439 | attach_iline(struct Client *client_p, st
439		void
440		init_ip_hash_table(void)
441		{
442	<	ip_entry_heap = BlockHeapCreate("ip", sizeof(struct ip_entry),
1079	<	2 * hard_fdlimit);
442	>	ip_entry_pool = mp_pool_new(sizeof(struct ip_entry), MP_CHUNK_SIZE_IP_ENTRY);
443		memset(ip_hash_table, 0, sizeof(ip_hash_table));
444		}
445
#	Line 1125 | Line 488 | find_or_add_ip(struct irc_ssaddr *ip_in)
488		if (ip_entries_count >= 2 * hard_fdlimit)
489		garbage_collect_ip_entries();
490
491	<	newptr = BlockHeapAlloc(ip_entry_heap);
491	>	newptr = mp_pool_get(ip_entry_pool);
492	>	memset(newptr, 0, sizeof(*newptr));
493		ip_entries_count++;
494		memcpy(&newptr->ip, ip_in, sizeof(struct irc_ssaddr));
495
#	Line 1176 | Line 540 | remove_one_ip(struct irc_ssaddr *ip_in)
540		if (ptr->count > 0)
541		ptr->count--;
542		if (ptr->count == 0 &&
543	<	(CurrentTime-ptr->last_attempt) >= ConfigFileEntry.throttle_time)
543	>	(CurrentTime-ptr->last_attempt) >= ConfigFileEntry.throttle_time)
544		{
545		if (last_ptr != NULL)
546	<	last_ptr->next = ptr->next;
546	>	last_ptr->next = ptr->next;
547		else
548	<	ip_hash_table[hash_index] = ptr->next;
548	>	ip_hash_table[hash_index] = ptr->next;
549
550	<	BlockHeapFree(ip_entry_heap, ptr);
550	>	mp_pool_release(ptr);
551		ip_entries_count--;
552		return;
553		}
#	Line 1204 | Line 568 | hash_ip(struct irc_ssaddr *addr)
568		{
569		struct sockaddr_in *v4 = (struct sockaddr_in *)addr;
570		int hash;
571	<	u_int32_t ip;
571	>	uint32_t ip;
572
573		ip   = ntohl(v4->sin_addr.s_addr);
574		hash = ((ip >> 12) + ip) & (IP_HASH_SIZE-1);
#	Line 1215 | Line 579 | hash_ip(struct irc_ssaddr *addr)
579		{
580		int hash;
581		struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)addr;
582	<	u_int32_t *ip = (u_int32_t *)&v6->sin6_addr.s6_addr;
582	>	uint32_t *ip = (uint32_t *)&v6->sin6_addr.s6_addr;
583
584		hash  = ip[0] ^ ip[3];
585	<	hash ^= hash >> 16;
586	<	hash ^= hash >> 8;
585	>	hash ^= hash >> 16;
586	>	hash ^= hash >> 8;
587		hash  = hash & (IP_HASH_SIZE - 1);
588		return hash;
589		}
#	Line 1230 | Line 594 | hash_ip(struct irc_ssaddr *addr)
594
595		/* count_ip_hash()
596		*
597	<	* inputs        - pointer to counter of number of ips hashed
597	>	* inputs        - pointer to counter of number of ips hashed
598		*               - pointer to memory used for ip hash
599		* output        - returned via pointers input
600		* side effects  - NONE
#	Line 1239 | Line 603 | hash_ip(struct irc_ssaddr *addr)
603		* used in the hash.
604		*/
605		void
606	<	count_ip_hash(int *number_ips_stored, unsigned long *mem_ips_stored)
606	>	count_ip_hash(unsigned int *number_ips_stored, uint64_t *mem_ips_stored)
607		{
608		struct ip_entry *ptr;
609		int i;
#	Line 1286 | Line 650 | garbage_collect_ip_entries(void)
650		last_ptr->next = ptr->next;
651		else
652		ip_hash_table[i] = ptr->next;
653	<	BlockHeapFree(ip_entry_heap, ptr);
653	>	mp_pool_release(ptr);
654		ip_entries_count--;
655		}
656		else
#	Line 1303 | Line 667 | garbage_collect_ip_entries(void)
667		* side effects - Disassociate configuration from the client.
668		*                Also removes a class from the list if marked for deleting.
669		*/
670	<	int
671	<	detach_conf(struct Client *client_p, ConfType type)
670	>	void
671	>	detach_conf(struct Client *client_p, enum maskitem_type type)
672		{
673	<	dlink_node *ptr, *next_ptr;
1310	<	struct ConfItem *conf;
1311	<	struct ClassItem *aclass;
1312	<	struct AccessItem *aconf;
1313	<	struct ConfItem *aclass_conf;
1314	<	struct MatchItem *match_item;
673	>	dlink_node *ptr = NULL, *next_ptr = NULL;
674
675		DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->confs.head)
676		{
677	<	conf = ptr->data;
677	>	struct MaskItem *conf = ptr->data;
678
679	<	if (type == CONF_TYPE || conf->type == type)
680	<	{
681	<	dlinkDelete(ptr, &client_p->localClient->confs);
1323	<	free_dlink_node(ptr);
679	>	assert(conf->type & (CONF_CLIENT | CONF_OPER | CONF_SERVER));
680	>	assert(conf->ref_count > 0);
681	>	assert(conf->class->ref_count > 0);
682
683	<	switch (conf->type)
684	<	{
1327	<	case CLIENT_TYPE:
1328	<	case OPER_TYPE:
1329	<	case SERVER_TYPE:
1330	<	aconf = (struct AccessItem *)map_to_conf(conf);
1331	<	if ((aclass_conf = ClassPtr(aconf)) != NULL)
1332	<	{
1333	<	aclass = (struct ClassItem *)map_to_conf(aclass_conf);
1334	<
1335	<	if (conf->type == CLIENT_TYPE)
1336	<	remove_from_cidr_check(&client_p->localClient->ip, aclass);
683	>	if (!(conf->type & type))
684	>	continue;
685
686	<	if (CurrUserCount(aclass) > 0)
687	<	aclass->curr_user_count--;
1340	<	if (MaxTotal(aclass) < 0 && CurrUserCount(aclass) <= 0)
1341	<	delete_conf_item(aclass_conf);
1342	<	}
686	>	dlinkDelete(ptr, &client_p->localClient->confs);
687	>	free_dlink_node(ptr);
688
689	<	/* Please, no ioccc entries - Dianora */
690	<	if (aconf->clients > 0)
1346	<	--aconf->clients;
1347	<	if (aconf->clients == 0 && IsConfIllegal(aconf))
1348	<	delete_conf_item(conf);
1349	<	break;
1350	<	case LEAF_TYPE:
1351	<	case HUB_TYPE:
1352	<	match_item = (struct MatchItem *)map_to_conf(conf);
1353	<	if (match_item->ref_count == 0 && match_item->illegal)
1354	<	delete_conf_item(conf);
1355	<	break;
1356	<	default:
1357	<	break;
1358	<	}
689	>	if (conf->type == CONF_CLIENT)
690	>	remove_from_cidr_check(&client_p->localClient->ip, conf->class);
691
692	<	if (type != CONF_TYPE)
693	<	return 0;
692	>	if (--conf->class->ref_count == 0 && conf->class->active == 0)
693	>	{
694	>	class_free(conf->class);
695	>	conf->class = NULL;
696		}
1363	–	}
697
698	<	return -1;
698	>	if (--conf->ref_count == 0 && conf->active == 0)
699	>	conf_free(conf);
700	>	}
701		}
702
703		/* attach_conf()
#	Line 1376 | Line 711 | detach_conf(struct Client *client_p, Con
711		*                attachment if there was an old one...
712		*/
713		int
714	<	attach_conf(struct Client *client_p, struct ConfItem *conf)
714	>	attach_conf(struct Client *client_p, struct MaskItem *conf)
715		{
1381	–	struct AccessItem *aconf;
1382	–	struct MatchItem *match_item;
1383	–
716		if (dlinkFind(&client_p->localClient->confs, conf) != NULL)
717		return 1;
718
719	<	if (conf->type == CLIENT_TYPE ||
720	<	conf->type == SERVER_TYPE ||
721	<	conf->type == OPER_TYPE)
722	<	{
1391	<	aconf = (struct AccessItem *)map_to_conf(conf);
1392	<
1393	<	if (IsConfIllegal(aconf))
1394	<	return NOT_AUTHORIZED;
1395	<
1396	<	if (conf->type == CLIENT_TYPE)
1397	<	{
1398	<	struct ClassItem *aclass;
1399	<	aclass = (struct ClassItem *)map_to_conf(aconf->class_ptr);
1400	<
1401	<	if (cidr_limit_reached(IsConfExemptLimits(aconf),
1402	<	&client_p->localClient->ip, aclass))
1403	<	return TOO_MANY;  /* Already at maximum allowed */
719	>	if (conf->type == CONF_CLIENT)
720	>	if (cidr_limit_reached(IsConfExemptLimits(conf),
721	>	&client_p->localClient->ip, conf->class))
722	>	return TOO_MANY;    /* Already at maximum allowed */
723
724	<	CurrUserCount(aclass)++;
725	<	}
1407	<
1408	<	aconf->clients++;
1409	<	}
1410	<	else if (conf->type == HUB_TYPE || conf->type == LEAF_TYPE)
1411	<	{
1412	<	match_item = (struct MatchItem *)map_to_conf(conf);
1413	<	match_item->ref_count++;
1414	<	}
724	>	conf->class->ref_count++;
725	>	conf->ref_count++;
726
727		dlinkAdd(conf, make_dlink_node(), &client_p->localClient->confs);
728
#	Line 1431 | Line 742 | attach_connect_block(struct Client *clie
742		const char *host)
743		{
744		dlink_node *ptr;
745	<	struct ConfItem *conf;
1435	<	struct AccessItem *aconf;
745	>	struct MaskItem *conf = NULL;
746
747		assert(client_p != NULL);
748		assert(host != NULL);
#	Line 1443 | Line 753 | attach_connect_block(struct Client *clie
753		DLINK_FOREACH(ptr, server_items.head)
754		{
755		conf = ptr->data;
1446	–	aconf = (struct AccessItem *)map_to_conf(conf);
756
757	<	if (match(conf->name, name) == 0 || match(aconf->host, host) == 0)
757	>	if (match(conf->name, name) || match(conf->host, host))
758		continue;
759
760		attach_conf(client_p, conf);
#	Line 1455 | Line 764 | attach_connect_block(struct Client *clie
764		return 0;
765		}
766
1458	–	/* find_conf_exact()
1459	–	*
1460	–	* inputs       - type of ConfItem
1461	–	*              - pointer to name to find
1462	–	*              - pointer to username to find
1463	–	*              - pointer to host to find
1464	–	* output       - NULL or pointer to conf found
1465	–	* side effects - find a conf entry which matches the hostname
1466	–	*                and has the same name.
1467	–	*/
1468	–	struct ConfItem *
1469	–	find_conf_exact(ConfType type, const char *name, const char *user,
1470	–	const char *host)
1471	–	{
1472	–	dlink_node *ptr;
1473	–	dlink_list *list_p;
1474	–	struct ConfItem *conf = NULL;
1475	–	struct AccessItem *aconf;
1476	–
1477	–	/* Only valid for OPER_TYPE and ...? */
1478	–	list_p = map_to_list(type);
1479	–
1480	–	DLINK_FOREACH(ptr, (*list_p).head)
1481	–	{
1482	–	conf = ptr->data;
1483	–
1484	–	if (conf->name == NULL)
1485	–	continue;
1486	–	aconf = (struct AccessItem *)map_to_conf(conf);
1487	–	if (aconf->host == NULL)
1488	–	continue;
1489	–	if (irccmp(conf->name, name) != 0)
1490	–	continue;
1491	–
1492	–	/*
1493	–	** Accept if the *real* hostname (usually sockethost)
1494	–	** socket host) matches *either* host or name field
1495	–	** of the configuration.
1496	–	*/
1497	–	if (!match(aconf->host, host) || !match(aconf->user,user)
1498	–	|| irccmp(conf->name, name) )
1499	–	continue;
1500	–	if (type == OPER_TYPE)
1501	–	{
1502	–	struct ClassItem *aclass;
1503	–
1504	–	aclass = (struct ClassItem *)aconf->class_ptr;
1505	–	if (aconf->clients < MaxTotal(aclass))
1506	–	return conf;
1507	–	else
1508	–	continue;
1509	–	}
1510	–	else
1511	–	return conf;
1512	–	}
1513	–	return NULL;
1514	–	}
1515	–
767		/* find_conf_name()
768		*
769		* inputs       - pointer to conf link list to search
#	Line 1522 | Line 773 | find_conf_exact(ConfType type, const cha
773		* side effects - find a conf entry which matches the name
774		*                and has the given mask.
775		*/
776	<	struct ConfItem *
777	<	find_conf_name(dlink_list *list, const char *name, ConfType type)
776	>	struct MaskItem *
777	>	find_conf_name(dlink_list *list, const char *name, enum maskitem_type type)
778		{
779		dlink_node *ptr;
780	<	struct ConfItem* conf;
780	>	struct MaskItem* conf;
781
782		DLINK_FOREACH(ptr, list->head)
783		{
784		conf = ptr->data;
785	<
785	>
786		if (conf->type == type)
787		{
788		if (conf->name && (irccmp(conf->name, name) == 0 ||
789	<	match(conf->name, name)))
789	>	!match(conf->name, name)))
790		return conf;
791		}
792		}
#	Line 1550 | Line 801 | find_conf_name(dlink_list *list, const c
801		* side effects - none
802		*/
803		static dlink_list *
804	<	map_to_list(ConfType type)
804	>	map_to_list(enum maskitem_type type)
805		{
806		switch(type)
807		{
808	<	case RXLINE_TYPE:
1558	<	return(&rxconf_items);
1559	<	break;
1560	<	case XLINE_TYPE:
808	>	case CONF_XLINE:
809		return(&xconf_items);
810		break;
811	<	case ULINE_TYPE:
811	>	case CONF_ULINE:
812		return(&uconf_items);
813		break;
814	<	case NRESV_TYPE:
814	>	case CONF_NRESV:
815		return(&nresv_items);
816		break;
817	<	case OPER_TYPE:
817	>	case CONF_CRESV:
818	>	return(&cresv_items);
819	>	case CONF_OPER:
820		return(&oconf_items);
821		break;
822	<	case CLASS_TYPE:
1573	<	return(&class_items);
1574	<	break;
1575	<	case SERVER_TYPE:
822	>	case CONF_SERVER:
823		return(&server_items);
824		break;
825	<	case CLUSTER_TYPE:
825	>	case CONF_SERVICE:
826	>	return(&service_items);
827	>	break;
828	>	case CONF_CLUSTER:
829		return(&cluster_items);
830		break;
1581	–	case CONF_TYPE:
1582	–	case GLINE_TYPE:
1583	–	case KLINE_TYPE:
1584	–	case DLINE_TYPE:
1585	–	case CRESV_TYPE:
831		default:
832		return NULL;
833		}
#	Line 1594 | Line 839 | map_to_list(ConfType type)
839		*              - pointer to name string to find
840		*              - pointer to user
841		*              - pointer to host
842	<	*              - optional action to match on as well
843	<	* output       - NULL or pointer to found struct MatchItem
842	>	*              - optional flags to match on as well
843	>	* output       - NULL or pointer to found struct MaskItem
844		* side effects - looks for a match on name field
845		*/
846	<	struct ConfItem *
847	<	find_matching_name_conf(ConfType type, const char *name, const char *user,
848	<	const char *host, int action)
846	>	struct MaskItem *
847	>	find_matching_name_conf(enum maskitem_type type, const char *name, const char *user,
848	>	const char *host, unsigned int flags)
849		{
850		dlink_node *ptr=NULL;
851	<	struct ConfItem *conf=NULL;
1607	<	struct AccessItem *aconf=NULL;
1608	<	struct MatchItem *match_item=NULL;
851	>	struct MaskItem *conf=NULL;
852		dlink_list *list_p = map_to_list(type);
853
854		switch (type)
855		{
856	<	case RXLINE_TYPE:
857	<	DLINK_FOREACH(ptr, list_p->head)
858	<	{
859	<	conf = ptr->data;
1617	<	assert(conf->regexpname);
856	>	case CONF_SERVICE:
857	>	DLINK_FOREACH(ptr, list_p->head)
858	>	{
859	>	conf = ptr->data;
860
861	<	if (!ircd_pcre_exec(conf->regexpname, name))
862	<	return conf;
863	<	}
864	<	break;
861	>	if (EmptyString(conf->name))
862	>	continue;
863	>	if ((name != NULL) && !irccmp(name, conf->name))
864	>	return conf;
865	>	}
866	>	break;
867
868	<	case XLINE_TYPE:
869	<	case ULINE_TYPE:
870	<	case NRESV_TYPE:
868	>	case CONF_XLINE:
869	>	case CONF_ULINE:
870	>	case CONF_NRESV:
871	>	case CONF_CRESV:
872		DLINK_FOREACH(ptr, list_p->head)
873		{
874		conf = ptr->data;
875
1631	–	match_item = map_to_conf(conf);
876		if (EmptyString(conf->name))
877	<	continue;
878	<	if ((name != NULL) && match_esc(conf->name, name))
877	>	continue;
878	>	if ((name != NULL) && !match(conf->name, name))
879		{
880	<	if ((user == NULL && (host == NULL)))
881	<	return conf;
882	<	if ((match_item->action & action) != action)
880	>	if ((user == NULL && (host == NULL)))
881	>	return conf;
882	>	if ((conf->flags & flags) != flags)
883		continue;
884	<	if (EmptyString(match_item->user) || EmptyString(match_item->host))
885	<	return conf;
886	<	if (match(match_item->user, user) && match(match_item->host, host))
887	<	return conf;
884	>	if (EmptyString(conf->user) || EmptyString(conf->host))
885	>	return conf;
886	>	if (!match(conf->user, user) && !match(conf->host, host))
887	>	return conf;
888		}
889		}
890		break;
891
892	<	case SERVER_TYPE:
892	>	case CONF_SERVER:
893		DLINK_FOREACH(ptr, list_p->head)
894		{
895		conf = ptr->data;
1652	–	aconf = map_to_conf(conf);
896
897	<	if ((name != NULL) && match_esc(name, conf->name))
897	>	if ((name != NULL) && !match(name, conf->name))
898		return conf;
899	<	else if ((host != NULL) && match_esc(host, aconf->host))
899	>	else if ((host != NULL) && !match(host, conf->host))
900		return conf;
901		}
902		break;
903	<
903	>
904		default:
905		break;
906		}
#	Line 1670 | Line 913 | find_matching_name_conf(ConfType type, c
913		*              - pointer to name string to find
914		*              - pointer to user
915		*              - pointer to host
916	<	* output       - NULL or pointer to found struct MatchItem
916	>	* output       - NULL or pointer to found struct MaskItem
917		* side effects - looks for an exact match on name field
918		*/
919	<	struct ConfItem *
920	<	find_exact_name_conf(ConfType type, const char *name,
919	>	struct MaskItem *
920	>	find_exact_name_conf(enum maskitem_type type, const struct Client *who, const char *name,
921		const char *user, const char *host)
922		{
923		dlink_node *ptr = NULL;
924	<	struct AccessItem *aconf;
925	<	struct ConfItem *conf;
1683	<	struct MatchItem *match_item;
1684	<	dlink_list *list_p;
1685	<
1686	<	list_p = map_to_list(type);
924	>	struct MaskItem *conf;
925	>	dlink_list *list_p = map_to_list(type);
926
927		switch(type)
928		{
929	<	case RXLINE_TYPE:
930	<	case XLINE_TYPE:
931	<	case ULINE_TYPE:
932	<	case NRESV_TYPE:
929	>	case CONF_XLINE:
930	>	case CONF_ULINE:
931	>	case CONF_NRESV:
932	>	case CONF_CRESV:
933
934		DLINK_FOREACH(ptr, list_p->head)
935		{
936		conf = ptr->data;
937	<	match_item = (struct MatchItem *)map_to_conf(conf);
937	>
938		if (EmptyString(conf->name))
939	<	continue;
940	<
939	>	continue;
940	>
941		if (irccmp(conf->name, name) == 0)
942		{
943	<	if ((user == NULL && (host == NULL)))
944	<	return (conf);
945	<	if (EmptyString(match_item->user) || EmptyString(match_item->host))
946	<	return (conf);
947	<	if (match(match_item->user, user) && match(match_item->host, host))
948	<	return (conf);
943	>	if ((user == NULL && (host == NULL)))
944	>	return conf;
945	>	if (EmptyString(conf->user) || EmptyString(conf->host))
946	>	return conf;
947	>	if (!match(conf->user, user) && !match(conf->host, host))
948	>	return conf;
949		}
950		}
951		break;
952
953	<	case OPER_TYPE:
953	>	case CONF_OPER:
954		DLINK_FOREACH(ptr, list_p->head)
955		{
956		conf = ptr->data;
957	<	aconf = (struct AccessItem *)map_to_conf(conf);
957	>
958		if (EmptyString(conf->name))
959	<	continue;
960	<
961	<	if (irccmp(conf->name, name) == 0)
959	>	continue;
960	>
961	>	if (!irccmp(conf->name, name))
962		{
963	<	if ((user == NULL && (host == NULL)))
964	<	return (conf);
965	<	if (EmptyString(aconf->user) || EmptyString(aconf->host))
966	<	return (conf);
967	<	if (match(aconf->user, user) && match(aconf->host, host))
968	<	return (conf);
963	>	if (!who)
964	>	return conf;
965	>	if (EmptyString(conf->user) || EmptyString(conf->host))
966	>	return NULL;
967	>	if (!match(conf->user, who->username))
968	>	{
969	>	switch (conf->htype)
970	>	{
971	>	case HM_HOST:
972	>	if (!match(conf->host, who->host) || !match(conf->host, who->sockhost))
973	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
974	>	return conf;
975	>	break;
976	>	case HM_IPV4:
977	>	if (who->localClient->aftype == AF_INET)
978	>	if (match_ipv4(&who->localClient->ip, &conf->addr, conf->bits))
979	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
980	>	return conf;
981	>	break;
982	>	#ifdef IPV6
983	>	case HM_IPV6:
984	>	if (who->localClient->aftype == AF_INET6)
985	>	if (match_ipv6(&who->localClient->ip, &conf->addr, conf->bits))
986	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
987	>	return conf;
988	>	break;
989	>	#endif
990	>	default:
991	>	assert(0);
992	>	}
993	>	}
994		}
995		}
996	+
997		break;
998
999	<	case SERVER_TYPE:
999	>	case CONF_SERVER:
1000		DLINK_FOREACH(ptr, list_p->head)
1001		{
1002		conf = ptr->data;
1003	<	aconf = (struct AccessItem *)map_to_conf(conf);
1003	>
1004		if (EmptyString(conf->name))
1005	<	continue;
1006	<
1005	>	continue;
1006	>
1007		if (name == NULL)
1008		{
1009	<	if (EmptyString(aconf->host))
1010	<	continue;
1011	<	if (irccmp(aconf->host, host) == 0)
1012	<	return(conf);
1009	>	if (EmptyString(conf->host))
1010	>	continue;
1011	>	if (irccmp(conf->host, host) == 0)
1012	>	return conf;
1013		}
1014		else if (irccmp(conf->name, name) == 0)
1015	<	{
1751	<	return (conf);
1752	<	}
1015	>	return conf;
1016		}
1754	–	break;
1017
1756	–	case CLASS_TYPE:
1757	–	DLINK_FOREACH(ptr, list_p->head)
1758	–	{
1759	–	conf = ptr->data;
1760	–	if (EmptyString(conf->name))
1761	–	continue;
1762	–
1763	–	if (irccmp(conf->name, name) == 0)
1764	–	return (conf);
1765	–	}
1018		break;
1019
1020		default:
1021		break;
1022		}
1023	<	return(NULL);
1023	>
1024	>	return NULL;
1025		}
1026
1027		/* rehash()
#	Line 1781 | Line 1034 | int
1034		rehash(int sig)
1035		{
1036		if (sig != 0)
1037	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1038	<	"Got signal SIGHUP, reloading ircd.conf file");
1037	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1038	>	"Got signal SIGHUP, reloading configuration file(s)");
1039
1787	–	#ifndef _WIN32
1040		restart_resolver();
1041	<	#endif
1041	>
1042		/* don't close listeners until we know we can go ahead with the rehash */
1043
1044		/* Check to see if we magically got(or lost) IPv6 support */
#	Line 1797 | Line 1049 | rehash(int sig)
1049		if (ServerInfo.description != NULL)
1050		strlcpy(me.info, ServerInfo.description, sizeof(me.info));
1051
1800	–	#ifndef STATIC_MODULES
1052		load_conf_modules();
1802	–	#endif
1803	–
1804	–	flush_deleted_I_P();
1053
1054		rehashed_klines = 1;
1055
1056	<	if (ConfigLoggingEntry.use_logging)
1809	<	reopen_log(logFileName);
1810	<
1811	<	return(0);
1056	>	return 0;
1057		}
1058
1059		/* set_default_conf()
#	Line 1826 | Line 1071 | set_default_conf(void)
1071		/* verify init_class() ran, this should be an unnecessary check
1072		* but its not much work.
1073		*/
1074	<	assert(class_default == (struct ConfItem *) class_items.tail->data);
1074	>	assert(class_default == class_get_list()->tail->data);
1075
1076		#ifdef HAVE_LIBCRYPTO
1077		ServerInfo.rsa_private_key = NULL;
#	Line 1836 | Line 1081 | set_default_conf(void)
1081		/* ServerInfo.name is not rehashable */
1082		/* ServerInfo.name = ServerInfo.name; */
1083		ServerInfo.description = NULL;
1084	<	DupString(ServerInfo.network_name, NETWORK_NAME_DEFAULT);
1085	<	DupString(ServerInfo.network_desc, NETWORK_DESC_DEFAULT);
1084	>	ServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
1085	>	ServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
1086
1087		memset(&ServerInfo.ip, 0, sizeof(ServerInfo.ip));
1088		ServerInfo.specific_ipv4_vhost = 0;
#	Line 1845 | Line 1090 | set_default_conf(void)
1090		ServerInfo.specific_ipv6_vhost = 0;
1091
1092		ServerInfo.max_clients = MAXCLIENTS_MAX;
1093	<	/* Don't reset hub, as that will break lazylinks */
1094	<	/* ServerInfo.hub = NO; */
1093	>	ServerInfo.max_nick_length = 9;
1094	>	ServerInfo.max_topic_length = 80;
1095	>
1096	>	ServerInfo.hub = 0;
1097		ServerInfo.dns_host.sin_addr.s_addr = 0;
1098		ServerInfo.dns_host.sin_port = 0;
1099		AdminInfo.name = NULL;
1100		AdminInfo.email = NULL;
1101		AdminInfo.description = NULL;
1102
1103	<	set_log_level(L_NOTICE);
1103	>	log_del_all();
1104	>
1105		ConfigLoggingEntry.use_logging = 1;
1106	<	ConfigLoggingEntry.operlog[0] = '\0';
1107	<	ConfigLoggingEntry.userlog[0] = '\0';
1860	<	ConfigLoggingEntry.klinelog[0] = '\0';
1861	<	ConfigLoggingEntry.glinelog[0] = '\0';
1862	<	ConfigLoggingEntry.killlog[0] = '\0';
1863	<	ConfigLoggingEntry.operspylog[0] = '\0';
1864	<	ConfigLoggingEntry.ioerrlog[0] = '\0';
1865	<	ConfigLoggingEntry.failed_operlog[0] = '\0';
1866	<
1867	<	ConfigChannel.restrict_channels = NO;
1868	<	ConfigChannel.disable_local_channels = NO;
1869	<	ConfigChannel.use_invex = YES;
1870	<	ConfigChannel.use_except = YES;
1871	<	ConfigChannel.use_knock = YES;
1106	>
1107	>	ConfigChannel.disable_fake_channels = 0;
1108		ConfigChannel.knock_delay = 300;
1109		ConfigChannel.knock_delay_channel = 60;
1110	<	ConfigChannel.max_chans_per_user = 15;
1111	<	ConfigChannel.quiet_on_ban = YES;
1110	>	ConfigChannel.max_chans_per_user = 25;
1111	>	ConfigChannel.max_chans_per_oper = 50;
1112		ConfigChannel.max_bans = 25;
1113		ConfigChannel.default_split_user_count = 0;
1114		ConfigChannel.default_split_server_count = 0;
1115	<	ConfigChannel.no_join_on_split = NO;
1116	<	ConfigChannel.no_create_on_split = NO;
1881	<	ConfigChannel.burst_topicwho = YES;
1115	>	ConfigChannel.no_join_on_split = 0;
1116	>	ConfigChannel.no_create_on_split = 0;
1117
1118	<	ConfigServerHide.flatten_links = NO;
1118	>	ConfigServerHide.flatten_links = 0;
1119		ConfigServerHide.links_delay = 300;
1120	<	ConfigServerHide.hidden = NO;
1121	<	ConfigServerHide.disable_hidden = NO;
1122	<	ConfigServerHide.hide_servers = NO;
1123	<	DupString(ConfigServerHide.hidden_name, NETWORK_NAME_DEFAULT);
1124	<	ConfigServerHide.hide_server_ips = NO;
1125	<
1120	>	ConfigServerHide.hidden = 0;
1121	>	ConfigServerHide.hide_servers = 0;
1122	>	ConfigServerHide.hide_services = 0;
1123	>	ConfigServerHide.hidden_name = xstrdup(NETWORK_NAME_DEFAULT);
1124	>	ConfigServerHide.hide_server_ips = 0;
1125	>	ConfigServerHide.disable_remote_commands = 0;
1126	>
1127	>	ConfigFileEntry.service_name = xstrdup(SERVICE_NAME_DEFAULT);
1128	>	ConfigFileEntry.max_watch = WATCHSIZE_DEFAULT;
1129	>	ConfigFileEntry.cycle_on_host_change = 1;
1130	>	ConfigFileEntry.glines = 0;
1131	>	ConfigFileEntry.gline_time = 12 * 3600;
1132	>	ConfigFileEntry.gline_request_time = GLINE_REQUEST_EXPIRE_DEFAULT;
1133		ConfigFileEntry.gline_min_cidr = 16;
1134		ConfigFileEntry.gline_min_cidr6 = 48;
1135	<	ConfigFileEntry.invisible_on_connect = YES;
1136	<	ConfigFileEntry.burst_away = NO;
1137	<	ConfigFileEntry.use_whois_actually = YES;
1138	<	ConfigFileEntry.tkline_expire_notices = YES;
1139	<	ConfigFileEntry.hide_spoof_ips = YES;
1898	<	ConfigFileEntry.ignore_bogus_ts = NO;
1899	<	ConfigFileEntry.disable_auth = NO;
1900	<	ConfigFileEntry.disable_remote = NO;
1135	>	ConfigFileEntry.invisible_on_connect = 1;
1136	>	ConfigFileEntry.tkline_expire_notices = 1;
1137	>	ConfigFileEntry.hide_spoof_ips = 1;
1138	>	ConfigFileEntry.ignore_bogus_ts = 0;
1139	>	ConfigFileEntry.disable_auth = 0;
1140		ConfigFileEntry.kill_chase_time_limit = 90;
1141	<	ConfigFileEntry.default_floodcount = 8; /* XXX */
1142	<	ConfigFileEntry.failed_oper_notice = YES;
1143	<	ConfigFileEntry.dots_in_ident = 0;      /* XXX */
1905	<	ConfigFileEntry.dot_in_ip6_addr = YES;
1141	>	ConfigFileEntry.default_floodcount = 8;
1142	>	ConfigFileEntry.failed_oper_notice = 1;
1143	>	ConfigFileEntry.dots_in_ident = 0;
1144		ConfigFileEntry.min_nonwildcard = 4;
1145		ConfigFileEntry.min_nonwildcard_simple = 3;
1146		ConfigFileEntry.max_accept = 20;
1147	<	ConfigFileEntry.anti_nick_flood = NO;   /* XXX */
1147	>	ConfigFileEntry.anti_nick_flood = 0;
1148		ConfigFileEntry.max_nick_time = 20;
1149		ConfigFileEntry.max_nick_changes = 5;
1150	<	ConfigFileEntry.anti_spam_exit_message_time = 0;  /* XXX */
1150	>	ConfigFileEntry.anti_spam_exit_message_time = 0;
1151		ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
1152	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;  /* XXX */
1153	<	ConfigFileEntry.kline_with_reason = YES;
1154	<	ConfigFileEntry.kline_reason = NULL;
1917	<	ConfigFileEntry.warn_no_nline = YES;
1918	<	ConfigFileEntry.stats_o_oper_only = NO; /* XXX */
1152	>	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
1153	>	ConfigFileEntry.warn_no_nline = 1;
1154	>	ConfigFileEntry.stats_o_oper_only = 0;
1155		ConfigFileEntry.stats_k_oper_only = 1;  /* masked */
1156		ConfigFileEntry.stats_i_oper_only = 1;  /* masked */
1157	<	ConfigFileEntry.stats_P_oper_only = NO;
1157	>	ConfigFileEntry.stats_P_oper_only = 0;
1158	>	ConfigFileEntry.stats_u_oper_only = 0;
1159		ConfigFileEntry.caller_id_wait = 60;
1160	<	ConfigFileEntry.opers_bypass_callerid = NO;
1160	>	ConfigFileEntry.opers_bypass_callerid = 0;
1161		ConfigFileEntry.pace_wait = 10;
1162		ConfigFileEntry.pace_wait_simple = 1;
1163	<	ConfigFileEntry.short_motd = NO;
1164	<	ConfigFileEntry.ping_cookie = NO;
1165	<	ConfigFileEntry.no_oper_flood = NO;     /* XXX */
1166	<	ConfigFileEntry.true_no_oper_flood = NO;  /* XXX */
1167	<	ConfigFileEntry.oper_pass_resv = YES;
1931	<	ConfigFileEntry.glines = NO;            /* XXX */
1932	<	ConfigFileEntry.gline_time = 12 * 3600; /* XXX */
1933	<	ConfigFileEntry.idletime = 0;
1163	>	ConfigFileEntry.short_motd = 0;
1164	>	ConfigFileEntry.ping_cookie = 0;
1165	>	ConfigFileEntry.no_oper_flood = 0;
1166	>	ConfigFileEntry.true_no_oper_flood = 0;
1167	>	ConfigFileEntry.oper_pass_resv = 1;
1168		ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
1169	<	ConfigFileEntry.client_flood = CLIENT_FLOOD_DEFAULT;
1936	<	ConfigFileEntry.oper_only_umodes = UMODE_DEBUG;  /* XXX */
1169	>	ConfigFileEntry.oper_only_umodes = UMODE_DEBUG;
1170		ConfigFileEntry.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE |
1171	<	UMODE_OPERWALL | UMODE_WALLOP;        /* XXX */
1172	<	DupString(ConfigFileEntry.servlink_path, SLPATH);
1940	<	#ifdef HAVE_LIBCRYPTO
1941	<	/* jdc -- This is our default value for a cipher.  According to the
1942	<	*        CRYPTLINK document (doc/cryptlink.txt), BF/128 must be supported
1943	<	*        under all circumstances if cryptlinks are enabled.  So,
1944	<	*        this will be our default.
1945	<	*
1946	<	*        NOTE: I apologise for the hard-coded value of "1" (BF/128).
1947	<	*              This should be moved into a find_cipher() routine.
1948	<	*/
1949	<	ConfigFileEntry.default_cipher_preference = &CipherTable[1];
1950	<	#endif
1951	<	ConfigFileEntry.use_egd = NO;
1171	>	UMODE_OPERWALL | UMODE_WALLOP;
1172	>	ConfigFileEntry.use_egd = 0;
1173		ConfigFileEntry.egdpool_path = NULL;
1953	–	#ifdef HAVE_LIBZ
1954	–	ConfigFileEntry.compression_level = 0;
1955	–	#endif
1174		ConfigFileEntry.throttle_time = 10;
1175		}
1176
1177	<	/* read_conf()
1177	>	static void
1178	>	validate_conf(void)
1179	>	{
1180	>	if (ConfigFileEntry.ts_warn_delta < TS_WARN_DELTA_MIN)
1181	>	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
1182	>
1183	>	if (ConfigFileEntry.ts_max_delta < TS_MAX_DELTA_MIN)
1184	>	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
1185	>
1186	>	if (ServerInfo.network_name == NULL)
1187	>	ServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
1188	>
1189	>	if (ServerInfo.network_desc == NULL)
1190	>	ServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
1191	>
1192	>	if (ConfigFileEntry.service_name == NULL)
1193	>	ConfigFileEntry.service_name = xstrdup(SERVICE_NAME_DEFAULT);
1194	>
1195	>	ConfigFileEntry.max_watch = IRCD_MAX(ConfigFileEntry.max_watch, WATCHSIZE_MIN);
1196	>	}
1197	>
1198	>	/* read_conf()
1199		*
1200		* inputs       - file descriptor pointing to config file to use
1201		* output       - None
1202		* side effects - Read configuration file.
1203		*/
1204		static void
1205	<	read_conf(FBFILE *file)
1205	>	read_conf(FILE *file)
1206		{
1207	<	scount = lineno = 0;
1207	>	lineno = 0;
1208
1209		set_default_conf(); /* Set default values prior to conf parsing */
1210	<	ypass = 1;
1211	<	yyparse();          /* pick up the classes first */
1210	>	conf_parser_ctx.pass = 1;
1211	>	yyparse();          /* pick up the classes first */
1212
1213	<	fbrewind(file);
1213	>	rewind(file);
1214
1215	<	ypass = 2;
1215	>	conf_parser_ctx.pass = 2;
1216		yyparse();          /* Load the values from the conf */
1217		validate_conf();    /* Check to make sure some values are still okay. */
1218		/* Some global values are also loaded here. */
1219	<	check_class();      /* Make sure classes are valid */
1981	<	}
1982	<
1983	<	static void
1984	<	validate_conf(void)
1985	<	{
1986	<	if (ConfigFileEntry.ts_warn_delta < TS_WARN_DELTA_MIN)
1987	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
1988	<
1989	<	if (ConfigFileEntry.ts_max_delta < TS_MAX_DELTA_MIN)
1990	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
1991	<
1992	<	if (ConfigFileEntry.servlink_path == NULL)
1993	<	DupString(ConfigFileEntry.servlink_path, SLPATH);
1994	<
1995	<	if (ServerInfo.network_name == NULL)
1996	<	DupString(ServerInfo.network_name,NETWORK_NAME_DEFAULT);
1997	<
1998	<	if (ServerInfo.network_desc == NULL)
1999	<	DupString(ServerInfo.network_desc,NETWORK_DESC_DEFAULT);
2000	<
2001	<	if ((ConfigFileEntry.client_flood < CLIENT_FLOOD_MIN) ||
2002	<	(ConfigFileEntry.client_flood > CLIENT_FLOOD_MAX))
2003	<	ConfigFileEntry.client_flood = CLIENT_FLOOD_MAX;
1219	>	class_delete_marked();      /* Make sure classes are valid */
1220		}
1221
1222		/* lookup_confhost()
#	Line 2008 | Line 1224 | validate_conf(void)
1224		* start DNS lookups of all hostnames in the conf
1225		* line and convert an IP addresses in a.b.c.d number for to IP#s.
1226		*/
1227	<	static void
1228	<	lookup_confhost(struct ConfItem *conf)
1227	>	void
1228	>	lookup_confhost(struct MaskItem *conf)
1229		{
2014	–	struct AccessItem *aconf;
1230		struct addrinfo hints, *res;
1231
2017	–	aconf = map_to_conf(conf);
2018	–
2019	–	if (EmptyString(aconf->host) ||
2020	–	EmptyString(aconf->user))
2021	–	{
2022	–	ilog(L_ERROR, "Host/server name error: (%s) (%s)",
2023	–	aconf->host, conf->name);
2024	–	return;
2025	–	}
2026	–
2027	–	if (strchr(aconf->host, '*') ||
2028	–	strchr(aconf->host, '?'))
2029	–	return;
2030	–
1232		/* Do name lookup now on hostnames given and store the
1233		* ip numbers in conf structure.
1234		*/
#	Line 2039 | Line 1240 | lookup_confhost(struct ConfItem *conf)
1240		/* Get us ready for a bind() and don't bother doing dns lookup */
1241		hints.ai_flags = AI_PASSIVE | AI_NUMERICHOST;
1242
1243	<	if (irc_getaddrinfo(aconf->host, NULL, &hints, &res))
1243	>	if (getaddrinfo(conf->host, NULL, &hints, &res))
1244		{
1245	<	conf_dns_lookup(aconf);
1245	>	conf_dns_lookup(conf);
1246		return;
1247		}
1248
1249		assert(res != NULL);
1250
1251	<	memcpy(&aconf->ipnum, res->ai_addr, res->ai_addrlen);
1252	<	aconf->ipnum.ss_len = res->ai_addrlen;
1253	<	aconf->ipnum.ss.ss_family = res->ai_family;
1254	<	irc_freeaddrinfo(res);
1251	>	memcpy(&conf->addr, res->ai_addr, res->ai_addrlen);
1252	>	conf->addr.ss_len = res->ai_addrlen;
1253	>	conf->addr.ss.ss_family = res->ai_family;
1254	>
1255	>	freeaddrinfo(res);
1256		}
1257
1258		/* conf_connect_allowed()
#	Line 2064 | Line 1266 | int
1266		conf_connect_allowed(struct irc_ssaddr *addr, int aftype)
1267		{
1268		struct ip_entry *ip_found;
1269	<	struct AccessItem *aconf = find_dline_conf(addr, aftype);
1269	>	struct MaskItem *conf = find_dline_conf(addr, aftype);
1270
1271		/* DLINE exempt also gets you out of static limits/pacing... */
1272	<	if (aconf && (aconf->status & CONF_EXEMPTDLINE))
1272	>	if (conf && (conf->type == CONF_EXEMPT))
1273		return 0;
1274
1275	<	if (aconf != NULL)
1275	>	if (conf != NULL)
1276		return BANNED_CLIENT;
1277
1278		ip_found = find_or_add_ip(addr);
#	Line 2086 | Line 1288 | conf_connect_allowed(struct irc_ssaddr *
1288		return 0;
1289		}
1290
2089	–	static struct AccessItem *
2090	–	find_regexp_kline(const char *uhi[])
2091	–	{
2092	–	const dlink_node *ptr = NULL;
2093	–
2094	–	DLINK_FOREACH(ptr, rkconf_items.head)
2095	–	{
2096	–	struct AccessItem *aptr = map_to_conf(ptr->data);
2097	–
2098	–	assert(aptr->regexuser);
2099	–	assert(aptr->regexhost);
2100	–
2101	–	if (!ircd_pcre_exec(aptr->regexuser, uhi[0]) &&
2102	–	(!ircd_pcre_exec(aptr->regexhost, uhi[1]) ||
2103	–	!ircd_pcre_exec(aptr->regexhost, uhi[2])))
2104	–	return aptr;
2105	–	}
2106	–
2107	–	return NULL;
2108	–	}
2109	–
2110	–	/* find_kill()
2111	–	*
2112	–	* inputs       - pointer to client structure
2113	–	* output       - pointer to struct AccessItem if found
2114	–	* side effects - See if this user is klined already,
2115	–	*                and if so, return struct AccessItem pointer
2116	–	*/
2117	–	struct AccessItem *
2118	–	find_kill(struct Client *client_p)
2119	–	{
2120	–	struct AccessItem *aconf = NULL;
2121	–	const char *uhi[3];
2122	–
2123	–	uhi[0] = client_p->username;
2124	–	uhi[1] = client_p->host;
2125	–	uhi[2] = client_p->sockhost;
2126	–
2127	–	assert(client_p != NULL);
2128	–
2129	–	aconf = find_kline_conf(client_p->host, client_p->username,
2130	–	&client_p->localClient->ip,
2131	–	client_p->localClient->aftype);
2132	–	if (aconf == NULL)
2133	–	aconf = find_regexp_kline(uhi);
2134	–
2135	–	if (aconf && (aconf->status & CONF_KLINE))
2136	–	return aconf;
2137	–
2138	–	return NULL;
2139	–	}
2140	–
2141	–	struct AccessItem *
2142	–	find_gline(struct Client *client_p)
2143	–	{
2144	–	struct AccessItem *aconf;
2145	–
2146	–	assert(client_p != NULL);
2147	–
2148	–	aconf = find_gline_conf(client_p->host, client_p->username,
2149	–	&client_p->localClient->ip,
2150	–	client_p->localClient->aftype);
2151	–
2152	–	if (aconf && (aconf->status & CONF_GLINE))
2153	–	return aconf;
2154	–
2155	–	return NULL;
2156	–	}
2157	–
2158	–	/* add_temp_line()
2159	–	*
2160	–	* inputs        - pointer to struct ConfItem
2161	–	* output        - none
2162	–	* Side effects  - links in given struct ConfItem into
2163	–	*                 temporary *line link list
2164	–	*/
2165	–	void
2166	–	add_temp_line(struct ConfItem *conf)
2167	–	{
2168	–	struct AccessItem *aconf;
2169	–
2170	–	if (conf->type == DLINE_TYPE)
2171	–	{
2172	–	aconf = map_to_conf(conf);
2173	–	SetConfTemporary(aconf);
2174	–	dlinkAdd(conf, &conf->node, &temporary_dlines);
2175	–	MyFree(aconf->user);
2176	–	aconf->user = NULL;
2177	–	add_conf_by_address(CONF_DLINE, aconf);
2178	–	}
2179	–	else if (conf->type == KLINE_TYPE)
2180	–	{
2181	–	aconf = map_to_conf(conf);
2182	–	SetConfTemporary(aconf);
2183	–	dlinkAdd(conf, &conf->node, &temporary_klines);
2184	–	add_conf_by_address(CONF_KILL, aconf);
2185	–	}
2186	–	else if (conf->type == GLINE_TYPE)
2187	–	{
2188	–	aconf = map_to_conf(conf);
2189	–	SetConfTemporary(aconf);
2190	–	dlinkAdd(conf, &conf->node, &temporary_glines);
2191	–	add_conf_by_address(CONF_GLINE, aconf);
2192	–	}
2193	–	else if (conf->type == XLINE_TYPE)
2194	–	{
2195	–	conf->flags |= CONF_FLAGS_TEMPORARY;
2196	–	dlinkAdd(conf, make_dlink_node(), &temporary_xlines);
2197	–	}
2198	–	else if (conf->type == RXLINE_TYPE)
2199	–	{
2200	–	conf->flags |= CONF_FLAGS_TEMPORARY;
2201	–	dlinkAdd(conf, make_dlink_node(), &temporary_rxlines);
2202	–	}
2203	–	else if (conf->type == RKLINE_TYPE)
2204	–	{
2205	–	conf->flags |= CONF_FLAGS_TEMPORARY;
2206	–	dlinkAdd(conf, make_dlink_node(), &temporary_rklines);
2207	–	}
2208	–	else if ((conf->type == NRESV_TYPE) || (conf->type == CRESV_TYPE))
2209	–	{
2210	–	conf->flags |= CONF_FLAGS_TEMPORARY;
2211	–	dlinkAdd(conf, make_dlink_node(), &temporary_resv);
2212	–	}
2213	–	}
2214	–
1291		/* cleanup_tklines()
1292		*
1293		* inputs       - NONE
#	Line 2222 | Line 1298 | add_temp_line(struct ConfItem *conf)
1298		void
1299		cleanup_tklines(void *notused)
1300		{
1301	<	expire_tklines(&temporary_glines);
1302	<	expire_tklines(&temporary_klines);
1303	<	expire_tklines(&temporary_dlines);
1304	<	expire_tklines(&temporary_xlines);
2229	<	expire_tklines(&temporary_rxlines);
2230	<	expire_tklines(&temporary_rklines);
2231	<	expire_tklines(&temporary_resv);
1301	>	hostmask_expire_temporary();
1302	>	expire_tklines(&xconf_items);
1303	>	expire_tklines(&nresv_items);
1304	>	expire_tklines(&cresv_items);
1305		}
1306
1307		/* expire_tklines()
#	Line 2242 | Line 1315 | expire_tklines(dlink_list *tklist)
1315		{
1316		dlink_node *ptr;
1317		dlink_node *next_ptr;
1318	<	struct ConfItem *conf;
2246	<	struct MatchItem *xconf;
2247	<	struct MatchItem *nconf;
2248	<	struct AccessItem *aconf;
2249	<	struct ResvChannel *cconf;
1318	>	struct MaskItem *conf;
1319
1320		DLINK_FOREACH_SAFE(ptr, next_ptr, tklist->head)
1321		{
1322		conf = ptr->data;
2254	–	if (conf->type == GLINE_TYPE ||
2255	–	conf->type == KLINE_TYPE ||
2256	–	conf->type == DLINE_TYPE)
2257	–	{
2258	–	aconf = (struct AccessItem *)map_to_conf(conf);
2259	–	if (aconf->hold <= CurrentTime)
2260	–	{
2261	–	/* XXX - Do we want GLINE expiry notices?? */
2262	–	/* Alert opers that a TKline expired - Hwy */
2263	–	if (ConfigFileEntry.tkline_expire_notices)
2264	–	{
2265	–	if (aconf->status & CONF_KILL)
2266	–	{
2267	–	sendto_realops_flags(UMODE_ALL, L_ALL,
2268	–	"Temporary K-line for [%s@%s] expired",
2269	–	(aconf->user) ? aconf->user : "*",
2270	–	(aconf->host) ? aconf->host : "*");
2271	–	}
2272	–	else if (conf->type == DLINE_TYPE)
2273	–	{
2274	–	sendto_realops_flags(UMODE_ALL, L_ALL,
2275	–	"Temporary D-line for [%s] expired",
2276	–	(aconf->host) ? aconf->host : "*");
2277	–	}
2278	–	}
1323
1324	<	dlinkDelete(ptr, tklist);
1325	<	delete_one_address_conf(aconf->host, aconf);
1326	<	}
1327	<	}
2284	<	else if (conf->type == XLINE_TYPE ||
2285	<	conf->type == RXLINE_TYPE)
2286	<	{
2287	<	xconf = (struct MatchItem *)map_to_conf(conf);
2288	<	if (xconf->hold <= CurrentTime)
2289	<	{
2290	<	if (ConfigFileEntry.tkline_expire_notices)
2291	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2292	<	"Temporary X-line for [%s] %sexpired", conf->name,
2293	<	conf->type == RXLINE_TYPE ? "(REGEX) " : "");
2294	<	dlinkDelete(ptr, tklist);
2295	<	free_dlink_node(ptr);
2296	<	delete_conf_item(conf);
2297	<	}
2298	<	}
2299	<	else if (conf->type == RKLINE_TYPE)
1324	>	if (!conf->until || conf->until > CurrentTime)
1325	>	continue;
1326	>
1327	>	if (conf->type == CONF_XLINE)
1328		{
1329	<	aconf = map_to_conf(conf);
1330	<	if (aconf->hold <= CurrentTime)
1331	<	{
1332	<	if (ConfigFileEntry.tkline_expire_notices)
2305	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2306	<	"Temporary K-line for [%s@%s] (REGEX) expired",
2307	<	(aconf->user) ? aconf->user : "*",
2308	<	(aconf->host) ? aconf->host : "*");
2309	<	dlinkDelete(ptr, tklist);
2310	<	free_dlink_node(ptr);
2311	<	delete_conf_item(conf);
2312	<	}
1329	>	if (ConfigFileEntry.tkline_expire_notices)
1330	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1331	>	"Temporary X-line for [%s] expired", conf->name);
1332	>	conf_free(conf);
1333		}
1334	<	else if (conf->type == NRESV_TYPE)
1334	>	else if (conf->type == CONF_NRESV || conf->type == CONF_CRESV)
1335		{
1336	<	nconf = (struct MatchItem *)map_to_conf(conf);
1337	<	if (nconf->hold <= CurrentTime)
2318	<	{
2319	<	if (ConfigFileEntry.tkline_expire_notices)
2320	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1336	>	if (ConfigFileEntry.tkline_expire_notices)
1337	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1338		"Temporary RESV for [%s] expired", conf->name);
1339	<	dlinkDelete(ptr, tklist);
2323	<	free_dlink_node(ptr);
2324	<	delete_conf_item(conf);
2325	<	}
2326	<	}
2327	<	else if (conf->type == CRESV_TYPE)
2328	<	{
2329	<	cconf = (struct ResvChannel *)map_to_conf(conf);
2330	<	if (cconf->hold <= CurrentTime)
2331	<	{
2332	<	if (ConfigFileEntry.tkline_expire_notices)
2333	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2334	<	"Temporary RESV for [%s] expired", cconf->name);
2335	<	dlinkDelete(ptr, tklist);
2336	<	free_dlink_node(ptr);
2337	<	delete_conf_item(conf);
2338	<	}
1339	>	conf_free(conf);
1340		}
1341		}
1342		}
#	Line 2348 | Line 1349 | expire_tklines(dlink_list *tklist)
1349		*/
1350		static const struct oper_privs
1351		{
1352	<	const unsigned int oprivs;
2352	<	const unsigned int hidden;
1352	>	const unsigned int flag;
1353		const unsigned char c;
1354		} flag_list[] = {
1355	<	{ OPER_FLAG_ADMIN,       OPER_FLAG_HIDDEN_ADMIN,  'A' },
1356	<	{ OPER_FLAG_REMOTEBAN,   0,                       'B' },
1357	<	{ OPER_FLAG_DIE,         0,                       'D' },
1358	<	{ OPER_FLAG_GLINE,       0,                       'G' },
1359	<	{ OPER_FLAG_REHASH,      0,                       'H' },
1360	<	{ OPER_FLAG_K,           0,                       'K' },
1361	<	{ OPER_FLAG_OPERWALL,    0,                       'L' },
1362	<	{ OPER_FLAG_N,           0,                       'N' },
1363	<	{ OPER_FLAG_GLOBAL_KILL, 0,                       'O' },
1364	<	{ OPER_FLAG_REMOTE,      0,                       'R' },
1365	<	{ OPER_FLAG_OPER_SPY,    0,                       'S' },
1366	<	{ OPER_FLAG_UNKLINE,     0,                       'U' },
1367	<	{ OPER_FLAG_X,           0,                       'X' },
1368	<	{ 0, 0, '\0' }
1355	>	{ OPER_FLAG_ADMIN,          'A' },
1356	>	{ OPER_FLAG_REMOTEBAN,      'B' },
1357	>	{ OPER_FLAG_DIE,            'D' },
1358	>	{ OPER_FLAG_GLINE,          'G' },
1359	>	{ OPER_FLAG_REHASH,         'H' },
1360	>	{ OPER_FLAG_K,              'K' },
1361	>	{ OPER_FLAG_OPERWALL,       'L' },
1362	>	{ OPER_FLAG_KILL,           'N' },
1363	>	{ OPER_FLAG_KILL_REMOTE,    'O' },
1364	>	{ OPER_FLAG_CONNECT,        'P' },
1365	>	{ OPER_FLAG_CONNECT_REMOTE, 'Q' },
1366	>	{ OPER_FLAG_SQUIT,          'R' },
1367	>	{ OPER_FLAG_SQUIT_REMOTE,   'S' },
1368	>	{ OPER_FLAG_UNKLINE,        'U' },
1369	>	{ OPER_FLAG_XLINE,          'X' },
1370	>	{ 0, '\0' }
1371		};
1372
1373		char *
1374		oper_privs_as_string(const unsigned int port)
1375		{
1376	<	static char privs_out[16];
1376	>	static char privs_out[IRCD_BUFSIZE];
1377		char *privs_ptr = privs_out;
1378	<	unsigned int i = 0;
1378	>	const struct oper_privs *opriv = flag_list;
1379
1380	<	for (; flag_list[i].oprivs; ++i)
1380	>	for (; opriv->flag; ++opriv)
1381		{
1382	<	if ((port & flag_list[i].oprivs) &&
1383	<	(port & flag_list[i].hidden) == 0)
2382	<	*privs_ptr++ = flag_list[i].c;
1382	>	if (port & opriv->flag)
1383	>	*privs_ptr++ = opriv->c;
1384		else
1385	<	*privs_ptr++ = ToLowerTab[flag_list[i].c];
1385	>	*privs_ptr++ = ToLower(opriv->c);
1386		}
1387
1388		*privs_ptr = '\0';
#	Line 2395 | Line 1396 | oper_privs_as_string(const unsigned int
1396		*         "oper" is server name for remote opers
1397		* Side effects: None.
1398		*/
1399	<	char *
1399	>	const char *
1400		get_oper_name(const struct Client *client_p)
1401		{
1402	<	dlink_node *cnode;
2402	<	struct ConfItem *conf;
2403	<	struct AccessItem *aconf;
2404	<
1402	>	const dlink_node *cnode = NULL;
1403		/* +5 for !,@,{,} and null */
1404	<	static char buffer[NICKLEN+USERLEN+HOSTLEN+HOSTLEN+5];
1404	>	static char buffer[NICKLEN + USERLEN + HOSTLEN + HOSTLEN + 5];
1405
1406		if (MyConnect(client_p))
1407		{
1408	<	DLINK_FOREACH(cnode, client_p->localClient->confs.head)
1408	>	if ((cnode = client_p->localClient->confs.head))
1409		{
1410	<	conf = cnode->data;
2413	<	aconf = map_to_conf(conf);
1410	>	const struct MaskItem *conf = cnode->data;
1411
1412	<	if (IsConfOperator(aconf))
1412	>	if (IsConfOperator(conf))
1413		{
1414	<	ircsprintf(buffer, "%s!%s@%s{%s}", client_p->name,
1415	<	client_p->username, client_p->host,
1416	<	conf->name);
2420	<	return buffer;
1414	>	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1415	>	client_p->username, client_p->host, conf->name);
1416	>	return buffer;
1417		}
1418		}
1419
1420	<	/* Probably should assert here for now. If there is an oper out there
1420	>	/* Probably should assert here for now. If there is an oper out there
1421		* with no oper{} conf attached, it would be good for us to know...
1422		*/
1423		assert(0); /* Oper without oper conf! */
1424		}
1425
1426	<	ircsprintf(buffer, "%s!%s@%s{%s}", client_p->name,
1427	<	client_p->username, client_p->host, client_p->servptr->name);
1426	>	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1427	>	client_p->username, client_p->host, client_p->servptr->name);
1428		return buffer;
1429		}
1430
#	Line 2442 | Line 1438 | void
1438		read_conf_files(int cold)
1439		{
1440		const char *filename;
1441	<	char chanmodes[32];
1442	<	char chanlimit[32];
1441	>	char chanmodes[IRCD_BUFSIZE];
1442	>	char chanlimit[IRCD_BUFSIZE];
1443
1444	<	filename = get_conf_name(CONF_TYPE);
1444	>	conf_parser_ctx.boot = cold;
1445	>	filename = ConfigFileEntry.configfile;
1446
1447		/* We need to know the initial filename for the yyerror() to report
1448		FIXME: The full path is in conffilenamebuf first time since we
1449		dont know anything else
1450
1451	<	- Gozem 2002-07-21
1451	>	- Gozem 2002-07-21
1452		*/
1453		strlcpy(conffilebuf, filename, sizeof(conffilebuf));
1454
1455	<	if ((conf_fbfile_in = fbopen(filename, "r")) == NULL)
1455	>	if ((conf_parser_ctx.conf_file = fopen(filename, "r")) == NULL)
1456		{
1457		if (cold)
1458		{
1459	<	ilog(L_CRIT, "Unable to read configuration file '%s': %s",
1459	>	ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
1460		filename, strerror(errno));
1461		exit(-1);
1462		}
1463		else
1464		{
1465	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1466	<	"Unable to read configuration file '%s': %s",
1467	<	filename, strerror(errno));
1465	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1466	>	"Unable to read configuration file '%s': %s",
1467	>	filename, strerror(errno));
1468		return;
1469		}
1470		}
#	Line 2475 | Line 1472 | read_conf_files(int cold)
1472		if (!cold)
1473		clear_out_old_conf();
1474
1475	<	read_conf(conf_fbfile_in);
1476	<	fbclose(conf_fbfile_in);
1475	>	read_conf(conf_parser_ctx.conf_file);
1476	>	fclose(conf_parser_ctx.conf_file);
1477	>
1478	>	log_reopen_all();
1479
1480	+	add_isupport("NICKLEN", NULL, ServerInfo.max_nick_length);
1481		add_isupport("NETWORK", ServerInfo.network_name, -1);
1482	<	ircsprintf(chanmodes, "b%s%s:%d", ConfigChannel.use_except ? "e" : "",
1483	<	ConfigChannel.use_invex ? "I" : "", ConfigChannel.max_bans);
1482	>
1483	>	snprintf(chanmodes, sizeof(chanmodes), "beI:%d", ConfigChannel.max_bans);
1484		add_isupport("MAXLIST", chanmodes, -1);
1485		add_isupport("MAXTARGETS", NULL, ConfigFileEntry.max_targets);
1486	<	if (ConfigChannel.disable_local_channels)
1487	<	add_isupport("CHANTYPES", "#", -1);
1488	<	else
1489	<	add_isupport("CHANTYPES", "#&", -1);
2490	<	ircsprintf(chanlimit, "%s:%d", ConfigChannel.disable_local_channels ? "#" : "#&",
2491	<	ConfigChannel.max_chans_per_user);
1486	>	add_isupport("CHANTYPES", "#", -1);
1487	>
1488	>	snprintf(chanlimit, sizeof(chanlimit), "#:%d",
1489	>	ConfigChannel.max_chans_per_user);
1490		add_isupport("CHANLIMIT", chanlimit, -1);
1491	<	ircsprintf(chanmodes, "%s%s%s", ConfigChannel.use_except ? "e" : "",
2494	<	ConfigChannel.use_invex ? "I" : "", "b,k,l,imnpst");
1491	>	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,imnprstORS");
1492		add_isupport("CHANNELLEN", NULL, LOCAL_CHANNELLEN);
1493	<	if (ConfigChannel.use_except)
2497	<	add_isupport("EXCEPTS", "e", -1);
2498	<	if (ConfigChannel.use_invex)
2499	<	add_isupport("INVEX", "I", -1);
1493	>	add_isupport("TOPICLEN", NULL, ServerInfo.max_topic_length);
1494		add_isupport("CHANMODES", chanmodes, -1);
1495
1496		/*
#	Line 2504 | Line 1498 | read_conf_files(int cold)
1498		* on strlen(form_str(RPL_ISUPPORT))
1499		*/
1500		rebuild_isupport_message_line();
2507	–
2508	–	parse_conf_file(KLINE_TYPE, cold);
2509	–	parse_conf_file(RKLINE_TYPE, cold);
2510	–	parse_conf_file(DLINE_TYPE, cold);
2511	–	parse_conf_file(XLINE_TYPE, cold);
2512	–	parse_conf_file(RXLINE_TYPE, cold);
2513	–	parse_conf_file(NRESV_TYPE, cold);
2514	–	parse_conf_file(CRESV_TYPE, cold);
2515	–	}
2516	–
2517	–	/* parse_conf_file()
2518	–	*
2519	–	* inputs       - type of conf file to parse
2520	–	* output       - none
2521	–	* side effects - conf file for givenconf type is opened and read then parsed
2522	–	*/
2523	–	static void
2524	–	parse_conf_file(int type, int cold)
2525	–	{
2526	–	FBFILE *file = NULL;
2527	–	const char *filename = get_conf_name(type);
2528	–
2529	–	if ((file = fbopen(filename, "r")) == NULL)
2530	–	{
2531	–	if (cold)
2532	–	ilog(L_ERROR, "Unable to read configuration file '%s': %s",
2533	–	filename, strerror(errno));
2534	–	else
2535	–	sendto_realops_flags(UMODE_ALL, L_ALL,
2536	–	"Unable to read configuration file '%s': %s",
2537	–	filename, strerror(errno));
2538	–	}
2539	–	else
2540	–	{
2541	–	parse_csv_file(file, type);
2542	–	fbclose(file);
2543	–	}
1501		}
1502
1503		/* clear_out_old_conf()
#	Line 2553 | Line 1510 | static void
1510		clear_out_old_conf(void)
1511		{
1512		dlink_node *ptr = NULL, *next_ptr = NULL;
1513	<	struct ConfItem *conf;
2557	<	struct AccessItem *aconf;
2558	<	struct ClassItem *cltmp;
2559	<	struct MatchItem *match_item;
1513	>	struct MaskItem *conf;
1514		dlink_list *free_items [] = {
1515	<	&server_items,   &oconf_items,    &hub_items, &leaf_items,
1516	<	&uconf_items,   &xconf_items, &rxconf_items, &rkconf_items,
1517	<	&nresv_items, &cluster_items,  &gdeny_items, NULL
1515	>	&server_items,   &oconf_items,
1516	>	&uconf_items,   &xconf_items,
1517	>	&nresv_items, &cluster_items,  &service_items, &cresv_items, NULL
1518		};
1519
1520		dlink_list ** iterator = free_items; /* C is dumb */
#	Line 2568 | Line 1522 | clear_out_old_conf(void)
1522		/* We only need to free anything allocated by yyparse() here.
1523		* Resetting structs, etc, is taken care of by set_default_conf().
1524		*/
1525	<
1525	>
1526		for (; *iterator != NULL; iterator++)
1527		{
1528		DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
1529		{
1530		conf = ptr->data;
1531	+
1532	+	dlinkDelete(&conf->node, map_to_list(conf->type));
1533	+
1534		/* XXX This is less than pretty */
1535	<	if (conf->type == SERVER_TYPE)
2579	<	{
2580	<	aconf = (struct AccessItem *)map_to_conf(conf);
2581	<	if (aconf->clients != 0)
2582	<	{
2583	<	SetConfIllegal(aconf);
2584	<	dlinkDelete(&conf->node, &server_items);
2585	<	}
2586	<	else
2587	<	{
2588	<	delete_conf_item(conf);
2589	<	}
2590	<	}
2591	<	else if (conf->type == OPER_TYPE)
1535	>	if (conf->type == CONF_SERVER || conf->type == CONF_OPER)
1536		{
1537	<	aconf = (struct AccessItem *)map_to_conf(conf);
1538	<	if (aconf->clients != 0)
2595	<	{
2596	<	SetConfIllegal(aconf);
2597	<	dlinkDelete(&conf->node, &oconf_items);
2598	<	}
2599	<	else
2600	<	{
2601	<	delete_conf_item(conf);
2602	<	}
1537	>	if (!conf->ref_count)
1538	>	conf_free(conf);
1539		}
1540	<	else if (conf->type == CLIENT_TYPE)
1540	>	else if (conf->type == CONF_XLINE)
1541		{
1542	<	aconf = (struct AccessItem *)map_to_conf(conf);
1543	<	if (aconf->clients != 0)
2608	<	{
2609	<	SetConfIllegal(aconf);
2610	<	}
2611	<	else
2612	<	{
2613	<	delete_conf_item(conf);
2614	<	}
2615	<	}
2616	<	else if (conf->type == XLINE_TYPE  ||
2617	<	conf->type == RXLINE_TYPE ||
2618	<	conf->type == RKLINE_TYPE)
2619	<	{
2620	<	/* temporary (r)xlines are also on
2621	<	* the (r)xconf items list */
2622	<	if (conf->flags & CONF_FLAGS_TEMPORARY)
2623	<	continue;
2624	<
2625	<	delete_conf_item(conf);
1542	>	if (!conf->until)
1543	>	conf_free(conf);
1544		}
1545		else
1546	<	{
2629	<	if ((conf->type == LEAF_TYPE) || (conf->type == HUB_TYPE))
2630	<	{
2631	<	match_item = (struct MatchItem *)map_to_conf(conf);
2632	<	if ((match_item->ref_count <= 0))
2633	<	delete_conf_item(conf);
2634	<	else
2635	<	{
2636	<	match_item->illegal = 1;
2637	<	dlinkDelete(&conf->node, *iterator);
2638	<	}
2639	<	}
2640	<	else
2641	<	delete_conf_item(conf);
2642	<	}
1546	>	conf_free(conf);
1547		}
1548		}
1549
1550	<	/* don't delete the class table, rather mark all entries
1551	<	* for deletion. The table is cleaned up by check_class. - avalon
1550	>	motd_clear();
1551	>
1552	>	/*
1553	>	* don't delete the class table, rather mark all entries
1554	>	* for deletion. The table is cleaned up by class_delete_marked. - avalon
1555		*/
1556	<	DLINK_FOREACH(ptr, class_items.head)
2650	<	{
2651	<	conf = ptr->data;
2652	<	cltmp = (struct ClassItem *)map_to_conf(conf);
2653	<	if (ptr != class_items.tail)  /* never mark the "default" class */
2654	<	MaxTotal(cltmp) = -1;
2655	<	}
1556	>	class_mark_for_deletion();
1557
1558		clear_out_address_conf();
1559
1560		/* clean out module paths */
2660	–	#ifndef STATIC_MODULES
1561		mod_clear_paths();
2662	–	#endif
1562
1563		/* clean out ServerInfo */
1564		MyFree(ServerInfo.description);
#	Line 2679 | Line 1578 | clear_out_old_conf(void)
1578
1579		MyFree(ServerInfo.rsa_private_key_file);
1580		ServerInfo.rsa_private_key_file = NULL;
2682	–	#endif
1581
1582	<	/* clean out old resvs from the conf */
1583	<	clear_conf_resv();
1582	>	if (ServerInfo.server_ctx)
1583	>	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2|
1584	>	SSL_OP_NO_SSLv3|
1585	>	SSL_OP_NO_TLSv1);
1586	>	if (ServerInfo.client_ctx)
1587	>	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv2|
1588	>	SSL_OP_NO_SSLv3|
1589	>	SSL_OP_NO_TLSv1);
1590	>	#endif
1591
1592		/* clean out AdminInfo */
1593		MyFree(AdminInfo.name);
#	Line 2692 | Line 1597 | clear_out_old_conf(void)
1597		MyFree(AdminInfo.description);
1598		AdminInfo.description = NULL;
1599
2695	–	/* operator{} and class{} blocks are freed above */
1600		/* clean out listeners */
1601		close_listeners();
1602
2699	–	/* auth{}, quarantine{}, shared{}, connect{}, kill{}, deny{},
2700	–	* exempt{} and gecos{} blocks are freed above too
2701	–	*/
2702	–
1603		/* clean out general */
1604	<	MyFree(ConfigFileEntry.servlink_path);
1605	<	ConfigFileEntry.servlink_path = NULL;
2706	<	#ifdef HAVE_LIBCRYPTO
2707	<	ConfigFileEntry.default_cipher_preference = NULL;
2708	<	#endif /* HAVE_LIBCRYPTO */
2709	<	delete_isupport("INVEX");
2710	<	delete_isupport("EXCEPTS");
2711	<	}
2712	<
2713	<	/* flush_deleted_I_P()
2714	<	*
2715	<	* inputs       - none
2716	<	* output       - none
2717	<	* side effects - This function removes I/P conf items
2718	<	*/
2719	<	static void
2720	<	flush_deleted_I_P(void)
2721	<	{
2722	<	dlink_node *ptr;
2723	<	dlink_node *next_ptr;
2724	<	struct ConfItem *conf;
2725	<	struct AccessItem *aconf;
2726	<	dlink_list * free_items [] = {
2727	<	&server_items, &oconf_items, NULL
2728	<	};
2729	<	dlink_list ** iterator = free_items; /* C is dumb */
2730	<
2731	<	/* flush out deleted I and P lines
2732	<	* although still in use.
2733	<	*/
2734	<	for (; *iterator != NULL; iterator++)
2735	<	{
2736	<	DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
2737	<	{
2738	<	conf = ptr->data;
2739	<	aconf = (struct AccessItem *)map_to_conf(conf);
2740	<
2741	<	if (IsConfIllegal(aconf))
2742	<	{
2743	<	dlinkDelete(ptr, *iterator);
2744	<
2745	<	if (aconf->clients == 0)
2746	<	delete_conf_item(conf);
2747	<	}
2748	<	}
2749	<	}
2750	<	}
2751	<
2752	<	/* get_conf_name()
2753	<	*
2754	<	* inputs       - type of conf file to return name of file for
2755	<	* output       - pointer to filename for type of conf
2756	<	* side effects - none
2757	<	*/
2758	<	const char *
2759	<	get_conf_name(ConfType type)
2760	<	{
2761	<	switch (type)
2762	<	{
2763	<	case CONF_TYPE:
2764	<	return ConfigFileEntry.configfile;
2765	<	break;
2766	<	case KLINE_TYPE:
2767	<	return ConfigFileEntry.klinefile;
2768	<	break;
2769	<	case RKLINE_TYPE:
2770	<	return ConfigFileEntry.rklinefile;
2771	<	break;
2772	<	case DLINE_TYPE:
2773	<	return ConfigFileEntry.dlinefile;
2774	<	break;
2775	<	case XLINE_TYPE:
2776	<	return ConfigFileEntry.xlinefile;
2777	<	break;
2778	<	case RXLINE_TYPE:
2779	<	return ConfigFileEntry.rxlinefile;
2780	<	break;
2781	<	case CRESV_TYPE:
2782	<	return ConfigFileEntry.cresvfile;
2783	<	break;
2784	<	case NRESV_TYPE:
2785	<	return ConfigFileEntry.nresvfile;
2786	<	break;
2787	<	case GLINE_TYPE:
2788	<	return ConfigFileEntry.glinefile;
2789	<	break;
2790	<
2791	<	default:
2792	<	return NULL;  /* This should NEVER HAPPEN since we call this function
2793	<	only with the above values, this will cause us to core
2794	<	at some point if this happens so we know where it was */
2795	<	}
2796	<	}
2797	<
2798	<	#define BAD_PING (-1)
2799	<
2800	<	/* get_conf_ping()
2801	<	*
2802	<	* inputs       - pointer to struct AccessItem
2803	<	*              - pointer to a variable that receives ping warning time
2804	<	* output       - ping frequency
2805	<	* side effects - NONE
2806	<	*/
2807	<	static int
2808	<	get_conf_ping(struct ConfItem *conf, int *pingwarn)
2809	<	{
2810	<	struct ClassItem *aclass;
2811	<	struct AccessItem *aconf;
2812	<
2813	<	if (conf != NULL)
2814	<	{
2815	<	aconf = (struct AccessItem *)map_to_conf(conf);
2816	<	if (aconf->class_ptr != NULL)
2817	<	{
2818	<	aclass = (struct ClassItem *)map_to_conf(aconf->class_ptr);
2819	<	*pingwarn = PingWarning(aclass);
2820	<	return PingFreq(aclass);
2821	<	}
2822	<	}
2823	<
2824	<	return BAD_PING;
2825	<	}
2826	<
2827	<	/* get_client_class()
2828	<	*
2829	<	* inputs       - pointer to client struct
2830	<	* output       - pointer to name of class
2831	<	* side effects - NONE
2832	<	*/
2833	<	const char *
2834	<	get_client_class(struct Client *target_p)
2835	<	{
2836	<	dlink_node *ptr;
2837	<	struct ConfItem *conf;
2838	<	struct AccessItem *aconf;
2839	<
2840	<	if (target_p != NULL && !IsMe(target_p) &&
2841	<	target_p->localClient->confs.head != NULL)
2842	<	{
2843	<	DLINK_FOREACH(ptr, target_p->localClient->confs.head)
2844	<	{
2845	<	conf = ptr->data;
2846	<
2847	<	if (conf->type == CLIENT_TYPE || conf->type == SERVER_TYPE ||
2848	<	conf->type == OPER_TYPE)
2849	<	{
2850	<	aconf = (struct AccessItem *) map_to_conf(conf);
2851	<	if (aconf->class_ptr != NULL)
2852	<	return aconf->class_ptr->name;
2853	<	}
2854	<	}
2855	<	}
2856	<
2857	<	return "default";
2858	<	}
2859	<
2860	<	/* get_client_ping()
2861	<	*
2862	<	* inputs       - pointer to client struct
2863	<	*              - pointer to a variable that receives ping warning time
2864	<	* output       - ping frequency
2865	<	* side effects - NONE
2866	<	*/
2867	<	int
2868	<	get_client_ping(struct Client *target_p, int *pingwarn)
2869	<	{
2870	<	int ping;
2871	<	struct ConfItem *conf;
2872	<	dlink_node *nlink;
2873	<
2874	<	if (target_p->localClient->confs.head != NULL)
2875	<	DLINK_FOREACH(nlink, target_p->localClient->confs.head)
2876	<	{
2877	<	conf = nlink->data;
2878	<
2879	<	if ((conf->type == CLIENT_TYPE) || (conf->type == SERVER_TYPE) ||
2880	<	(conf->type == OPER_TYPE))
2881	<	{
2882	<	ping = get_conf_ping(conf, pingwarn);
2883	<	if (ping > 0)
2884	<	return ping;
2885	<	}
2886	<	}
2887	<
2888	<	*pingwarn = 0;
2889	<	return DEFAULT_PINGFREQUENCY;
2890	<	}
2891	<
2892	<	/* find_class()
2893	<	*
2894	<	* inputs       - string name of class
2895	<	* output       - corresponding Class pointer
2896	<	* side effects - NONE
2897	<	*/
2898	<	struct ConfItem *
2899	<	find_class(const char *classname)
2900	<	{
2901	<	struct ConfItem *conf;
2902	<
2903	<	if ((conf = find_exact_name_conf(CLASS_TYPE, classname, NULL, NULL)) != NULL)
2904	<	return(conf);
2905	<
2906	<	return class_default;
2907	<	}
2908	<
2909	<	/* check_class()
2910	<	*
2911	<	* inputs       - NONE
2912	<	* output       - NONE
2913	<	* side effects -
2914	<	*/
2915	<	void
2916	<	check_class(void)
2917	<	{
2918	<	dlink_node *ptr;
2919	<	dlink_node *next_ptr;
2920	<	struct ConfItem *conf;
2921	<	struct ClassItem *aclass;
2922	<
2923	<	DLINK_FOREACH_SAFE(ptr, next_ptr, class_items.head)
2924	<	{
2925	<	conf = ptr->data;
2926	<	aclass = (struct ClassItem *)map_to_conf(conf);
2927	<
2928	<	if (MaxTotal(aclass) < 0)
2929	<	{
2930	<	destroy_cidr_class(aclass);
2931	<	if (CurrUserCount(aclass) > 0)
2932	<	dlinkDelete(&conf->node, &class_items);
2933	<	else
2934	<	delete_conf_item(conf);
2935	<	}
2936	<	}
2937	<	}
2938	<
2939	<	/* init_class()
2940	<	*
2941	<	* inputs       - NONE
2942	<	* output       - NONE
2943	<	* side effects -
2944	<	*/
2945	<	void
2946	<	init_class(void)
2947	<	{
2948	<	struct ClassItem *aclass;
2949	<
2950	<	class_default = make_conf_item(CLASS_TYPE);
2951	<	aclass = (struct ClassItem *)map_to_conf(class_default);
2952	<	DupString(class_default->name, "default");
2953	<	ConFreq(aclass)  = DEFAULT_CONNECTFREQUENCY;
2954	<	PingFreq(aclass) = DEFAULT_PINGFREQUENCY;
2955	<	MaxTotal(aclass) = MAXIMUM_LINKS_DEFAULT;
2956	<	MaxSendq(aclass) = DEFAULT_SENDQ;
2957	<
2958	<	client_check_cb = register_callback("check_client", check_client);
2959	<	}
2960	<
2961	<	/* get_sendq()
2962	<	*
2963	<	* inputs       - pointer to client
2964	<	* output       - sendq for this client as found from its class
2965	<	* side effects - NONE
2966	<	*/
2967	<	unsigned long
2968	<	get_sendq(struct Client *client_p)
2969	<	{
2970	<	unsigned long sendq = DEFAULT_SENDQ;
2971	<	dlink_node *ptr;
2972	<	struct ConfItem *conf;
2973	<	struct ConfItem *class_conf;
2974	<	struct ClassItem *aclass;
2975	<	struct AccessItem *aconf;
2976	<
2977	<	if (client_p && !IsMe(client_p) && (client_p->localClient->confs.head))
2978	<	{
2979	<	DLINK_FOREACH(ptr, client_p->localClient->confs.head)
2980	<	{
2981	<	conf = ptr->data;
2982	<	if ((conf->type == SERVER_TYPE) || (conf->type == OPER_TYPE)
2983	<	|| (conf->type == CLIENT_TYPE))
2984	<	{
2985	<	aconf = (struct AccessItem *)map_to_conf(conf);
2986	<	if ((class_conf = aconf->class_ptr) == NULL)
2987	<	continue;
2988	<	aclass = (struct ClassItem *)map_to_conf(class_conf);
2989	<	sendq = MaxSendq(aclass);
2990	<	return sendq;
2991	<	}
2992	<	}
2993	<	}
2994	<	/* XXX return a default?
2995	<	* if here, then there wasn't an attached conf with a sendq
2996	<	* that is very bad -Dianora
2997	<	*/
2998	<	return DEFAULT_SENDQ;
1604	>	MyFree(ConfigFileEntry.service_name);
1605	>	ConfigFileEntry.service_name = NULL;
1606		}
1607
1608		/* conf_add_class_to_conf()
1609		*
1610		* inputs       - pointer to config item
1611		* output       - NONE
1612	<	* side effects - Add a class pointer to a conf
1612	>	* side effects - Add a class pointer to a conf
1613		*/
1614		void
1615	<	conf_add_class_to_conf(struct ConfItem *conf, const char *class_name)
1615	>	conf_add_class_to_conf(struct MaskItem *conf, const char *class_name)
1616		{
1617	<	struct AccessItem *aconf;
3011	<	struct ClassItem *aclass;
3012	<
3013	<	aconf = (struct AccessItem *)map_to_conf(conf);
3014	<
3015	<	if (class_name == NULL)
1617	>	if (class_name == NULL)
1618		{
1619	<	aconf->class_ptr = class_default;
3018	<	if (conf->type == CLIENT_TYPE)
3019	<	sendto_realops_flags(UMODE_ALL, L_ALL,
3020	<	"Warning *** Defaulting to default class for %s@%s",
3021	<	aconf->user, aconf->host);
3022	<	else
3023	<	sendto_realops_flags(UMODE_ALL, L_ALL,
3024	<	"Warning *** Defaulting to default class for %s",
3025	<	conf->name);
3026	<	}
3027	<	else
3028	<	{
3029	<	aconf->class_ptr = find_class(class_name);
3030	<	}
1619	>	conf->class = class_default;
1620
1621	<	if (aconf->class_ptr == NULL)
1622	<	{
1623	<	if (conf->type == CLIENT_TYPE)
1624	<	sendto_realops_flags(UMODE_ALL, L_ALL,
3036	<	"Warning *** Defaulting to default class for %s@%s",
3037	<	aconf->user, aconf->host);
1621	>	if (conf->type == CONF_CLIENT)
1622	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1623	>	"Warning *** Defaulting to default class for %s@%s",
1624	>	conf->user, conf->host);
1625		else
1626	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1627	<	"Warning *** Defaulting to default class for %s",
1628	<	conf->name);
3042	<	aconf->class_ptr = class_default;
1626	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1627	>	"Warning *** Defaulting to default class for %s",
1628	>	conf->name);
1629		}
1630		else
1631	<	{
3046	<	aclass = (struct ClassItem *)map_to_conf(aconf->class_ptr);
3047	<	if (MaxTotal(aclass) < 0)
3048	<	{
3049	<	aconf->class_ptr = class_default;
3050	<	}
3051	<	}
3052	<	}
3053	<
3054	<	#define MAXCONFLINKS 150
3055	<
3056	<	/* conf_add_server()
3057	<	*
3058	<	* inputs       - pointer to config item
3059	<	*              - pointer to link count already on this conf
3060	<	* output       - NONE
3061	<	* side effects - Add a connect block
3062	<	*/
3063	<	int
3064	<	conf_add_server(struct ConfItem *conf, unsigned int lcount, const char *class_name)
3065	<	{
3066	<	struct AccessItem *aconf;
3067	<	char *orig_host;
1631	>	conf->class = class_find(class_name, 1);
1632
1633	<	aconf = map_to_conf(conf);
3070	<
3071	<	conf_add_class_to_conf(conf, class_name);
3072	<
3073	<	if (lcount > MAXCONFLINKS || !aconf->host || !conf->name)
3074	<	{
3075	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Bad connect block");
3076	<	ilog(L_WARN, "Bad connect block");
3077	<	return -1;
3078	<	}
3079	<
3080	<	if (EmptyString(aconf->passwd) && !IsConfCryptLink(aconf))
1633	>	if (conf->class == NULL)
1634		{
1635	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Bad connect block, name %s",
1636	<	conf->name);
1637	<	ilog(L_WARN, "Bad connect block, host %s", conf->name);
1638	<	return -1;
1639	<	}
1640	<
1641	<	orig_host = aconf->host;
1642	<	split_nuh(orig_host, NULL, &aconf->user, &aconf->host);
1643	<	MyFree(orig_host);
3091	<	lookup_confhost(conf);
3092	<
3093	<	return 0;
3094	<	}
3095	<
3096	<	/* conf_add_d_conf()
3097	<	*
3098	<	* inputs       - pointer to config item
3099	<	* output       - NONE
3100	<	* side effects - Add a d/D line
3101	<	*/
3102	<	void
3103	<	conf_add_d_conf(struct AccessItem *aconf)
3104	<	{
3105	<	if (aconf->host == NULL)
3106	<	return;
3107	<
3108	<	aconf->user = NULL;
3109	<
3110	<	/* XXX - Should 'd' ever be in the old conf? For new conf we don't
3111	<	*       need this anyway, so I will disable it for now... -A1kmm
3112	<	*/
3113	<	if (parse_netmask(aconf->host, NULL, NULL) == HM_HOST)
3114	<	{
3115	<	ilog(L_WARN, "Invalid Dline %s ignored", aconf->host);
3116	<	free_access_item(aconf);
3117	<	}
3118	<	else
3119	<	{
3120	<	/* XXX ensure user is NULL */
3121	<	MyFree(aconf->user);
3122	<	aconf->user = NULL;
3123	<	add_conf_by_address(CONF_DLINE, aconf);
1635	>	if (conf->type == CONF_CLIENT)
1636	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1637	>	"Warning *** Defaulting to default class for %s@%s",
1638	>	conf->user, conf->host);
1639	>	else
1640	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1641	>	"Warning *** Defaulting to default class for %s",
1642	>	conf->name);
1643	>	conf->class = class_default;
1644		}
1645		}
1646
#	Line 3135 | Line 1655 | yyerror(const char *msg)
1655		{
1656		char newlinebuf[IRCD_BUFSIZE];
1657
1658	<	if (ypass != 1)
1658	>	if (conf_parser_ctx.pass != 1)
1659		return;
1660
1661		strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1662	<	sendto_realops_flags(UMODE_ALL, L_ALL, "\"%s\", line %u: %s: %s",
1662	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1663	>	"\"%s\", line %u: %s: %s",
1664		conffilebuf, lineno + 1, msg, newlinebuf);
1665	<	ilog(L_WARN, "\"%s\", line %u: %s: %s",
1665	>	ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1666		conffilebuf, lineno + 1, msg, newlinebuf);
1667		}
1668
1669	<	int
1670	<	conf_fbgets(char *lbuf, unsigned int max_size, FBFILE *fb)
1669	>	void
1670	>	conf_error_report(const char *msg)
1671		{
1672	<	if (fbgets(lbuf, max_size, fb) == NULL)
3152	<	return 0;
3153	<
3154	<	return strlen(lbuf);
3155	<	}
1672	>	char newlinebuf[IRCD_BUFSIZE];
1673
1674	<	int
1675	<	conf_yy_fatal_error(const char *msg)
1676	<	{
1677	<	return 0;
1674	>	strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1675	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1676	>	"\"%s\", line %u: %s: %s",
1677	>	conffilebuf, lineno + 1, msg, newlinebuf);
1678	>	ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1679	>	conffilebuf, lineno + 1, msg, newlinebuf);
1680		}
1681
1682		/*
1683		* valid_tkline()
1684	<	*
1684	>	*
1685		* inputs       - pointer to ascii string to check
1686		*              - whether the specified time is in seconds or minutes
1687		* output       - -1 not enough parameters
#	Line 3171 | Line 1690 | conf_yy_fatal_error(const char *msg)
1690		* Originally written by Dianora (Diane, db@db.net)
1691		*/
1692		time_t
1693	<	valid_tkline(char *p, int minutes)
1693	>	valid_tkline(const char *data, const int minutes)
1694		{
1695	+	const unsigned char *p = (const unsigned char *)data;
1696	+	unsigned char tmpch = '\0';
1697		time_t result = 0;
1698
1699	<	while (*p)
1699	>	while ((tmpch = *p++))
1700		{
1701	<	if (IsDigit(*p))
3181	<	{
3182	<	result *= 10;
3183	<	result += ((*p) & 0xF);
3184	<	p++;
3185	<	}
3186	<	else
1701	>	if (!IsDigit(tmpch))
1702		return 0;
1703	+
1704	+	result *= 10;
1705	+	result += (tmpch & 0xF);
1706		}
1707
1708	<	/* in the degenerate case where oper does a /quote kline 0 user@host :reason
1708	>	/*
1709	>	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1710		* i.e. they specifically use 0, I am going to return 1 instead
1711		* as a return value of non-zero is used to flag it as a temporary kline
1712		*/
3194	–
1713		if (result == 0)
1714		result = 1;
1715
1716	<	/*
1716	>	/*
1717		* If the incoming time is in seconds convert it to minutes for the purpose
1718		* of this calculation
1719		*/
1720		if (!minutes)
1721	<	result = result / (time_t)60;
1721	>	result = result / 60;
1722
1723		if (result > MAX_TDKLINE_TIME)
1724		result = MAX_TDKLINE_TIME;
1725
1726	<	result = result * (time_t)60;  /* turn it into seconds */
1726	>	result = result * 60;  /* turn it into seconds */
1727
1728		return result;
1729		}
1730
1731	+	/* valid_wild_card_simple()
1732	+	*
1733	+	* inputs       - data to check for sufficient non-wildcard characters
1734	+	* outputs      - 1 if valid, else 0
1735	+	* side effects - none
1736	+	*/
1737	+	int
1738	+	valid_wild_card_simple(const char *data)
1739	+	{
1740	+	const unsigned char *p = (const unsigned char *)data;
1741	+	unsigned char tmpch = '\0';
1742	+	int nonwild = 0;
1743	+
1744	+	while ((tmpch = *p++))
1745	+	{
1746	+	if (tmpch == '\\')
1747	+	{
1748	+	++p;
1749	+	if (++nonwild >= ConfigFileEntry.min_nonwildcard_simple)
1750	+	return 1;
1751	+	}
1752	+	else if (!IsMWildChar(tmpch))
1753	+	{
1754	+	if (++nonwild >= ConfigFileEntry.min_nonwildcard_simple)
1755	+	return 1;
1756	+	}
1757	+	}
1758	+
1759	+	return 0;
1760	+	}
1761	+
1762		/* valid_wild_card()
1763		*
1764		* input        - pointer to client
#	Line 3221 | Line 1770 | valid_tkline(char *p, int minutes)
1770		int
1771		valid_wild_card(struct Client *source_p, int warn, int count, ...)
1772		{
3224	–	char *p;
1773		char tmpch;
1774		int nonwild = 0;
1775		va_list args;
#	Line 3242 | Line 1790 | valid_wild_card(struct Client *source_p,
1790
1791		while (count--)
1792		{
1793	<	p = va_arg(args, char *);
1793	>	const char *p = va_arg(args, const char *);
1794		if (p == NULL)
1795		continue;
1796
#	Line 3255 | Line 1803 | valid_wild_card(struct Client *source_p,
1803		* break - no point in searching further.
1804		*/
1805		if (++nonwild >= ConfigFileEntry.min_nonwildcard)
1806	+	{
1807	+	va_end(args);
1808		return 1;
1809	+	}
1810		}
1811		}
1812		}
1813
1814		if (warn)
1815	<	sendto_one(source_p, ":%s NOTICE %s :Please include at least %d non-wildcard characters with the mask",
1816	<	me.name, source_p->name, ConfigFileEntry.min_nonwildcard);
1815	>	sendto_one_notice(source_p, &me,
1816	>	":Please include at least %d non-wildcard characters with the mask",
1817	>	ConfigFileEntry.min_nonwildcard);
1818	>	va_end(args);
1819		return 0;
1820		}
1821
#	Line 3276 | Line 1829 | valid_wild_card(struct Client *source_p,
1829		*              - parse_flags bit map of things to test
1830		*              - pointer to user or string to parse into
1831		*              - pointer to host or NULL to parse into if non NULL
1832	<	*              - pointer to optional tkline time or NULL
1832	>	*              - pointer to optional tkline time or NULL
1833		*              - pointer to target_server to parse into if non NULL
1834		*              - pointer to reason to parse into
1835		*
#	Line 3292 | Line 1845 | valid_wild_card(struct Client *source_p,
1845		*                if target_server is NULL and an "ON" is found error
1846		*                is reported.
1847		*                if reason pointer is NULL ignore pointer,
1848	<	*                this allows usee of parse_a_line in unkline etc.
1848	>	*                this allows use of parse_a_line in unkline etc.
1849		*
1850		* - Dianora
1851		*/
1852		int
1853		parse_aline(const char *cmd, struct Client *source_p,
1854	<	int parc, char **parv,
1855	<	int parse_flags, char **up_p, char **h_p, time_t *tkline_time,
1856	<	char **target_server, char **reason)
1854	>	int parc, char **parv,
1855	>	int parse_flags, char **up_p, char **h_p, time_t *tkline_time,
1856	>	char **target_server, char **reason)
1857		{
1858		int found_tkline_time=0;
1859		static char def_reason[] = "No Reason";
#	Line 3321 | Line 1874 | parse_aline(const char *cmd, struct Clie
1874		*tkline_time = found_tkline_time;
1875		else
1876		{
1877	<	sendto_one(source_p, ":%s NOTICE %s :temp_line not supported by %s",
3325	<	me.name, source_p->name, cmd);
1877	>	sendto_one_notice(source_p, &me, ":temp_line not supported by %s", cmd);
1878		return -1;
1879		}
1880		}
1881
1882		if (parc == 0)
1883		{
1884	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
3333	<	me.name, source_p->name, cmd);
1884	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1885		return -1;
1886		}
1887
#	Line 3344 | Line 1895 | parse_aline(const char *cmd, struct Clie
1895		*up_p = user;
1896		*h_p = host;
1897		}
1898	<
1898	>
1899		parc--;
1900		parv++;
1901
#	Line 3357 | Line 1908 | parse_aline(const char *cmd, struct Clie
1908
1909		if (target_server == NULL)
1910		{
1911	<	sendto_one(source_p, ":%s NOTICE %s :ON server not supported by %s",
1912	<	me.name, source_p->name, cmd);
3362	<	return -1;
1911	>	sendto_one_notice(source_p, &me, ":ON server not supported by %s", cmd);
1912	>	return -1;
1913		}
1914
1915	<	if (!IsOperRemoteBan(source_p))
1915	>	if (!HasOFlag(source_p, OPER_FLAG_REMOTEBAN))
1916		{
1917	<	sendto_one(source_p, form_str(ERR_NOPRIVS),
3368	<	me.name, source_p->name, "remoteban");
1917	>	sendto_one_numeric(source_p, &me, ERR_NOPRIVS, "remoteban");
1918		return -1;
1919		}
1920
1921		if (parc == 0 || EmptyString(*parv))
1922		{
1923	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1924	<	me.name, source_p->name, cmd);
3376	<	return -1;
1923	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1924	>	return -1;
1925		}
1926
1927		*target_server = *parv;
#	Line 3386 | Line 1934 | parse_aline(const char *cmd, struct Clie
1934		* caller probably NULL'd it first, but no harm to do it again -db
1935		*/
1936		if (target_server != NULL)
1937	<	*target_server = NULL;
1937	>	*target_server = NULL;
1938		}
1939		}
1940
#	Line 3394 | Line 1942 | parse_aline(const char *cmd, struct Clie
1942		{
1943		if (strchr(user, '!') != NULL)
1944		{
1945	<	sendto_one(source_p, ":%s NOTICE %s :Invalid character '!' in kline",
3398	<	me.name, source_p->name);
1945	>	sendto_one_notice(source_p, &me, ":Invalid character '!' in kline");
1946		return -1;
1947		}
1948
1949	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, YES, 2, *up_p, *h_p))
1949	>	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 2, *up_p, *h_p))
1950		return -1;
1951		}
1952		else
1953	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, YES, 1, *up_p))
1953	>	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 1, *up_p))
1954		return -1;
1955
1956		if (reason != NULL)
1957		{
1958	<	if (parc != 0)
1958	>	if (parc != 0 && !EmptyString(*parv))
1959		{
1960		*reason = *parv;
1961	<	if (!valid_comment(source_p, *reason, YES))
1962	<	return -1;
1961	>	if (!valid_comment(source_p, *reason, 1))
1962	>	return -1;
1963		}
1964		else
1965		*reason = def_reason;
#	Line 3447 | Line 1994 | find_user_host(struct Client *source_p,
1994		{
1995		/* Explicit user@host mask given */
1996
1997	<	if(hostp != NULL)                            /* I'm a little user@host */
1997	>	if (hostp != NULL)                            /* I'm a little user@host */
1998		{
1999		*(hostp++) = '\0';                       /* short and squat */
2000		if (*user_host_or_nick)
2001	<	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
2001	>	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
2002		else
2003	<	strcpy(luser, "*");
2003	>	strcpy(luser, "*");
2004	>
2005		if (*hostp)
2006	<	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
2006	>	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
2007		else
2008	<	strcpy(lhost, "*");
2008	>	strcpy(lhost, "*");
2009		}
2010		else
2011		{
2012		luser[0] = '*';             /* no @ found, assume its *@somehost */
2013	<	luser[1] = '\0';
2013	>	luser[1] = '\0';
2014		strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
2015		}
2016	<
2016	>
2017		return 1;
2018		}
2019	<	else if (!(flags & NOUSERLOOKUP))
2019	>	else
2020		{
2021		/* Try to find user@host mask from nick */
2022		/* Okay to use source_p as the first param, because source_p == client_p */
2023	<	if ((target_p =
2024	<	find_chasing(source_p, source_p, user_host_or_nick, NULL)) == NULL)
2023	>	if ((target_p =
2024	>	find_chasing(source_p, user_host_or_nick)) == NULL)
2025		return 0;
2026
2027		if (IsExemptKline(target_p))
2028		{
2029		if (!IsServer(source_p))
2030	<	sendto_one(source_p,
3483	<	":%s NOTICE %s :%s is E-lined",
3484	<	me.name, source_p->name, target_p->name);
2030	>	sendto_one_notice(source_p, &me, ":%s is E-lined", target_p->name);
2031		return 0;
2032		}
2033
#	Line 3516 | Line 2062 | find_user_host(struct Client *source_p,
2062		int
2063		valid_comment(struct Client *source_p, char *comment, int warn)
2064		{
3519	–	if (strchr(comment, '"'))
3520	–	{
3521	–	if (warn)
3522	–	sendto_one(source_p, ":%s NOTICE %s :Invalid character '\"' in comment",
3523	–	me.name, source_p->name);
3524	–	return 0;
3525	–	}
3526	–
2065		if (strlen(comment) > REASONLEN)
2066		comment[REASONLEN-1] = '\0';
2067
#	Line 3538 | Line 2076 | valid_comment(struct Client *source_p, c
2076		* side effects - none
2077		*/
2078		int
2079	<	match_conf_password(const char *password, const struct AccessItem *aconf)
2079	>	match_conf_password(const char *password, const struct MaskItem *conf)
2080		{
2081		const char *encr = NULL;
2082
2083	<	if (password == NULL || aconf->passwd == NULL)
2083	>	if (EmptyString(password) || EmptyString(conf->passwd))
2084		return 0;
2085
2086	<	if (aconf->flags & CONF_FLAGS_ENCRYPTED)
2087	<	{
3550	<	/* use first two chars of the password they send in as salt */
3551	<	/* If the password in the conf is MD5, and ircd is linked
3552	<	* to scrypt on FreeBSD, or the standard crypt library on
3553	<	* glibc Linux, then this code will work fine on generating
3554	<	* the proper encrypted hash for comparison.
3555	<	*/
3556	<	if (*aconf->passwd)
3557	<	encr = crypt(password, aconf->passwd);
3558	<	else
3559	<	encr = "";
3560	<	}
2086	>	if (conf->flags & CONF_FLAGS_ENCRYPTED)
2087	>	encr = crypt(password, conf->passwd);
2088		else
2089		encr = password;
2090
2091	<	return !strcmp(encr, aconf->passwd);
2091	>	return !strcmp(encr, conf->passwd);
2092		}
2093
2094		/*
#	Line 3570 | Line 2097 | match_conf_password(const char *password
2097		* inputs       - client sending the cluster
2098		*              - command name "KLINE" "XLINE" etc.
2099		*              - capab -- CAP_KLN etc. from s_serv.h
2100	<	*              - cluster type -- CLUSTER_KLINE etc. from s_conf.h
2100	>	*              - cluster type -- CLUSTER_KLINE etc. from conf.h
2101		*              - pattern and args to send along
2102		* output       - none
2103		* side effects - Take source_p send the pattern with args given
#	Line 3578 | Line 2105 | match_conf_password(const char *password
2105		*/
2106		void
2107		cluster_a_line(struct Client *source_p, const char *command,
2108	<	int capab, int cluster_type, const char *pattern, ...)
2108	>	int capab, int cluster_type, const char *pattern, ...)
2109		{
2110		va_list args;
2111		char buffer[IRCD_BUFSIZE];
2112	<	struct ConfItem *conf;
3586	<	dlink_node *ptr;
2112	>	const dlink_node *ptr = NULL;
2113
2114		va_start(args, pattern);
2115		vsnprintf(buffer, sizeof(buffer), pattern, args);
#	Line 3591 | Line 2117 | cluster_a_line(struct Client *source_p,
2117
2118		DLINK_FOREACH(ptr, cluster_items.head)
2119		{
2120	<	conf = ptr->data;
2120	>	const struct MaskItem *conf = ptr->data;
2121
2122		if (conf->flags & cluster_type)
3597	–	{
2123		sendto_match_servs(source_p, conf->name, CAP_CLUSTER|capab,
2124	<	"%s %s %s", command, conf->name, buffer);
3600	<	}
2124	>	"%s %s %s", command, conf->name, buffer);
2125		}
2126		}
2127
#	Line 3629 | Line 2153 | cluster_a_line(struct Client *source_p,
2153		* @                            *       *       *
2154		* !                            *       *       *
2155		*/
3632	–
2156		void
2157	<	split_nuh(char *mask, char **nick, char **user, char **host)
2157	>	split_nuh(struct split_nuh_item *const iptr)
2158		{
2159		char *p = NULL, *q = NULL;
2160
2161	<	if ((p = strchr(mask, '!')) != NULL)
2161	>	if (iptr->nickptr)
2162	>	strlcpy(iptr->nickptr, "*", iptr->nicksize);
2163	>	if (iptr->userptr)
2164	>	strlcpy(iptr->userptr, "*", iptr->usersize);
2165	>	if (iptr->hostptr)
2166	>	strlcpy(iptr->hostptr, "*", iptr->hostsize);
2167	>
2168	>	if ((p = strchr(iptr->nuhmask, '!')))
2169		{
2170		*p = '\0';
3641	–	if (nick != NULL)
3642	–	{
3643	–	if (*mask != '\0')
3644	–	*nick = xstrldup(mask, NICKLEN);
3645	–	else
3646	–	DupString(*nick, "*");
3647	–	}
2171
2172	<	if ((q = strchr(++p, '@')) != NULL)
2172	>	if (iptr->nickptr && *iptr->nuhmask != '\0')
2173	>	strlcpy(iptr->nickptr, iptr->nuhmask, iptr->nicksize);
2174	>
2175	>	if ((q = strchr(++p, '@')))
2176		{
2177	<	*q = '\0';
2177	>	*q++ = '\0';
2178
2179		if (*p != '\0')
2180	<	*user = xstrldup(p, USERLEN+1);
3655	<	else
3656	<	DupString(*user, "*");
2180	>	strlcpy(iptr->userptr, p, iptr->usersize);
2181
2182	<	if (*++q != '\0')
2183	<	*host = xstrldup(q, HOSTLEN+1);
3660	<	else
3661	<	DupString(*host, "*");
2182	>	if (*q != '\0')
2183	>	strlcpy(iptr->hostptr, q, iptr->hostsize);
2184		}
2185		else
2186		{
2187		if (*p != '\0')
2188	<	*user = xstrldup(p, USERLEN+1);
3667	<	else
3668	<	DupString(*user, "*");
3669	<
3670	<	DupString(*host, "*");
2188	>	strlcpy(iptr->userptr, p, iptr->usersize);
2189		}
2190		}
2191	<	else  /* No ! found so lets look for a user@host */
2191	>	else
2192		{
2193	<	if ((p = strchr(mask, '@')) != NULL)        /* if found a @ */
2193	>	/* No ! found so lets look for a user@host */
2194	>	if ((p = strchr(iptr->nuhmask, '@')))
2195		{
2196	<	if (nick != NULL)
2197	<	DupString(*nick, "*");
3679	<	*p = '\0';
2196	>	/* if found a @ */
2197	>	*p++ = '\0';
2198
2199	<	if (*mask != '\0')
2200	<	*user = xstrldup(mask, USERLEN+1);
3683	<	else
3684	<	DupString(*user, "*");
2199	>	if (*iptr->nuhmask != '\0')
2200	>	strlcpy(iptr->userptr, iptr->nuhmask, iptr->usersize);
2201
2202	<	if (*++p != '\0')
2203	<	*host = xstrldup(p, HOSTLEN+1);
3688	<	else
3689	<	DupString(*host, "*");
2202	>	if (*p != '\0')
2203	>	strlcpy(iptr->hostptr, p, iptr->hostsize);
2204		}
2205	<	else                                        /* no @ found */
2205	>	else
2206		{
2207	<	if (nick != NULL)
2208	<	{
2209	<	if (strpbrk(mask, ".:"))
3696	<	{
3697	<	DupString(*nick, "*");
3698	<	*host = xstrldup(mask, HOSTLEN+1);
3699	<	}
3700	<	else
3701	<	{
3702	<	*nick = xstrldup(mask, NICKLEN);
3703	<	DupString(*host, "*");
3704	<	}
3705	<
3706	<	DupString(*user, "*");
3707	<	}
2207	>	/* no @ found */
2208	>	if (!iptr->nickptr || strpbrk(iptr->nuhmask, ".:"))
2209	>	strlcpy(iptr->hostptr, iptr->nuhmask, iptr->hostsize);
2210		else
2211	<	{
3710	<	DupString(*user, "*");
3711	<	*host = xstrldup(mask, HOSTLEN+1);
3712	<	}
3713	<	}
3714	<	}
3715	<	}
3716	<
3717	<	/*
3718	<	* flags_to_ascii
3719	<	*
3720	<	* inputs       - flags is a bitmask
3721	<	*              - pointer to table of ascii letters corresponding
3722	<	*                to each bit
3723	<	*              - flag 1 for convert ToLower if bit missing
3724	<	*                0 if ignore.
3725	<	* output       - none
3726	<	* side effects - string pointed to by p has bitmap chars written to it
3727	<	*/
3728	<	static void
3729	<	flags_to_ascii(unsigned int flags, const unsigned int bit_table[], char *p,
3730	<	int lowerit)
3731	<	{
3732	<	unsigned int mask = 1;
3733	<	int i = 0;
3734	<
3735	<	for (mask = 1; (mask != 0) && (bit_table[i] != 0); mask <<= 1, i++)
3736	<	{
3737	<	if (flags & mask)
3738	<	*p++ = bit_table[i];
3739	<	else if(lowerit)
3740	<	*p++ = ToLower(bit_table[i]);
3741	<	}
3742	<	*p = '\0';
3743	<	}
3744	<
3745	<	/*
3746	<	* cidr_limit_reached
3747	<	*
3748	<	* inputs       - int flag allowing over_rule of limits
3749	<	*              - pointer to the ip to be added
3750	<	*              - pointer to the class
3751	<	* output       - non zero if limit reached
3752	<	*                0 if limit not reached
3753	<	* side effects -
3754	<	*/
3755	<	static int
3756	<	cidr_limit_reached(int over_rule,
3757	<	struct irc_ssaddr *ip, struct ClassItem *aclass)
3758	<	{
3759	<	dlink_node *ptr = NULL;
3760	<	struct CidrItem *cidr;
3761	<
3762	<	if (NumberPerCidr(aclass) <= 0)
3763	<	return 0;
3764	<
3765	<	if (ip->ss.ss_family == AF_INET)
3766	<	{
3767	<	if (CidrBitlenIPV4(aclass) <= 0)
3768	<	return 0;
3769	<
3770	<	DLINK_FOREACH(ptr, aclass->list_ipv4.head)
3771	<	{
3772	<	cidr = ptr->data;
3773	<	if (match_ipv4(ip, &cidr->mask, CidrBitlenIPV4(aclass)))
3774	<	{
3775	<	if (!over_rule && (cidr->number_on_this_cidr >= NumberPerCidr(aclass)))
3776	<	return -1;
3777	<	cidr->number_on_this_cidr++;
3778	<	return 0;
3779	<	}
3780	<	}
3781	<	cidr = MyMalloc(sizeof(struct CidrItem));
3782	<	cidr->number_on_this_cidr = 1;
3783	<	cidr->mask = *ip;
3784	<	mask_addr(&cidr->mask, CidrBitlenIPV4(aclass));
3785	<	dlinkAdd(cidr, &cidr->node, &aclass->list_ipv4);
3786	<	}
3787	<	#ifdef IPV6
3788	<	else if (CidrBitlenIPV6(aclass) > 0)
3789	<	{
3790	<	DLINK_FOREACH(ptr, aclass->list_ipv6.head)
3791	<	{
3792	<	cidr = ptr->data;
3793	<	if (match_ipv6(ip, &cidr->mask, CidrBitlenIPV6(aclass)))
3794	<	{
3795	<	if (!over_rule && (cidr->number_on_this_cidr >= NumberPerCidr(aclass)))
3796	<	return -1;
3797	<	cidr->number_on_this_cidr++;
3798	<	return 0;
3799	<	}
2211	>	strlcpy(iptr->nickptr, iptr->nuhmask, iptr->nicksize);
2212		}
3801	–	cidr = MyMalloc(sizeof(struct CidrItem));
3802	–	cidr->number_on_this_cidr = 1;
3803	–	cidr->mask = *ip;
3804	–	mask_addr(&cidr->mask, CidrBitlenIPV6(aclass));
3805	–	dlinkAdd(cidr, &cidr->node, &aclass->list_ipv6);
2213		}
3807	–	#endif
3808	–	return 0;
3809	–	}
3810	–
3811	–	/*
3812	–	* remove_from_cidr_check
3813	–	*
3814	–	* inputs       - pointer to the ip to be removed
3815	–	*              - pointer to the class
3816	–	* output       - NONE
3817	–	* side effects -
3818	–	*/
3819	–	static void
3820	–	remove_from_cidr_check(struct irc_ssaddr *ip, struct ClassItem *aclass)
3821	–	{
3822	–	dlink_node *ptr = NULL;
3823	–	dlink_node *next_ptr = NULL;
3824	–	struct CidrItem *cidr;
3825	–
3826	–	if (NumberPerCidr(aclass) == 0)
3827	–	return;
3828	–
3829	–	if (ip->ss.ss_family == AF_INET)
3830	–	{
3831	–	if (CidrBitlenIPV4(aclass) <= 0)
3832	–	return;
3833	–
3834	–	DLINK_FOREACH_SAFE(ptr, next_ptr, aclass->list_ipv4.head)
3835	–	{
3836	–	cidr = ptr->data;
3837	–	if (match_ipv4(ip, &cidr->mask, CidrBitlenIPV4(aclass)))
3838	–	{
3839	–	cidr->number_on_this_cidr--;
3840	–	if (cidr->number_on_this_cidr == 0)
3841	–	{
3842	–	dlinkDelete(ptr, &aclass->list_ipv4);
3843	–	MyFree(cidr);
3844	–	return;
3845	–	}
3846	–	}
3847	–	}
3848	–	}
3849	–	#ifdef IPV6
3850	–	else if (CidrBitlenIPV6(aclass) > 0)
3851	–	{
3852	–	DLINK_FOREACH_SAFE(ptr, next_ptr, aclass->list_ipv6.head)
3853	–	{
3854	–	cidr = ptr->data;
3855	–	if (match_ipv6(ip, &cidr->mask, CidrBitlenIPV6(aclass)))
3856	–	{
3857	–	cidr->number_on_this_cidr--;
3858	–	if (cidr->number_on_this_cidr == 0)
3859	–	{
3860	–	dlinkDelete(ptr, &aclass->list_ipv6);
3861	–	MyFree(cidr);
3862	–	return;
3863	–	}
3864	–	}
3865	–	}
3866	–	}
3867	–	#endif
3868	–	}
3869	–
3870	–	static void
3871	–	rebuild_cidr_list(int aftype, struct ConfItem *oldcl, struct ClassItem *newcl,
3872	–	dlink_list *old_list, dlink_list *new_list, int changed)
3873	–	{
3874	–	dlink_node *ptr;
3875	–	struct Client *client_p;
3876	–	struct ConfItem *conf;
3877	–	struct AccessItem *aconf;
3878	–
3879	–	if (!changed)
3880	–	{
3881	–	*new_list = *old_list;
3882	–	old_list->head = old_list->tail = NULL;
3883	–	old_list->length = 0;
3884	–	return;
3885	–	}
3886	–
3887	–	DLINK_FOREACH(ptr, local_client_list.head)
3888	–	{
3889	–	client_p = ptr->data;
3890	–	if (client_p->localClient->aftype != aftype)
3891	–	continue;
3892	–	if (dlink_list_length(&client_p->localClient->confs) == 0)
3893	–	continue;
3894	–
3895	–	conf = client_p->localClient->confs.tail->data;
3896	–	if (conf->type == CLIENT_TYPE)
3897	–	{
3898	–	aconf = map_to_conf(conf);
3899	–	if (aconf->class_ptr == oldcl)
3900	–	cidr_limit_reached(1, &client_p->localClient->ip, newcl);
3901	–	}
3902	–	}
3903	–	}
3904	–
3905	–	/*
3906	–	* rebuild_cidr_class
3907	–	*
3908	–	* inputs       - pointer to old conf
3909	–	*              - pointer to new_class
3910	–	* output       - none
3911	–	* side effects - rebuilds the class link list of cidr blocks
3912	–	*/
3913	–	void
3914	–	rebuild_cidr_class(struct ConfItem *conf, struct ClassItem *new_class)
3915	–	{
3916	–	struct ClassItem *old_class = map_to_conf(conf);
3917	–
3918	–	if (NumberPerCidr(old_class) > 0 && NumberPerCidr(new_class) > 0)
3919	–	{
3920	–	if (CidrBitlenIPV4(old_class) > 0 && CidrBitlenIPV4(new_class) > 0)
3921	–	rebuild_cidr_list(AF_INET, conf, new_class,
3922	–	&old_class->list_ipv4, &new_class->list_ipv4,
3923	–	CidrBitlenIPV4(old_class) != CidrBitlenIPV4(new_class));
3924	–
3925	–	#ifdef IPV6
3926	–	if (CidrBitlenIPV6(old_class) > 0 && CidrBitlenIPV6(new_class) > 0)
3927	–	rebuild_cidr_list(AF_INET6, conf, new_class,
3928	–	&old_class->list_ipv6, &new_class->list_ipv6,
3929	–	CidrBitlenIPV6(old_class) != CidrBitlenIPV6(new_class));
3930	–	#endif
3931	–	}
3932	–
3933	–	destroy_cidr_class(old_class);
3934	–	}
3935	–
3936	–	/*
3937	–	* destroy_cidr_list
3938	–	*
3939	–	* inputs       - pointer to class dlink list of cidr blocks
3940	–	* output       - none
3941	–	* side effects - completely destroys the class link list of cidr blocks
3942	–	*/
3943	–	static void
3944	–	destroy_cidr_list(dlink_list *list)
3945	–	{
3946	–	dlink_node *ptr = NULL;
3947	–	dlink_node *next_ptr = NULL;
3948	–	struct CidrItem *cidr;
3949	–
3950	–	DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
3951	–	{
3952	–	cidr = ptr->data;
3953	–	dlinkDelete(ptr, list);
3954	–	MyFree(cidr);
3955	–	}
3956	–	}
3957	–
3958	–	/*
3959	–	* destroy_cidr_class
3960	–	*
3961	–	* inputs       - pointer to class
3962	–	* output       - none
3963	–	* side effects - completely destroys the class link list of cidr blocks
3964	–	*/
3965	–	static void
3966	–	destroy_cidr_class(struct ClassItem *aclass)
3967	–	{
3968	–	destroy_cidr_list(&aclass->list_ipv4);
3969	–	destroy_cidr_list(&aclass->list_ipv6);
2214		}

Diff Legend

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