ViewVC Help

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

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

Comparing:
ircd-hybrid-8/src/conf.c (file contents), Revision 1393 by michael, Wed May 2 19:17:37 2012 UTC vs.
ircd-hybrid/trunk/src/conf.c (file contents), Revision 2175 by michael, Mon Jun 3 23:45:39 2013 UTC

#	Line 25 | Line 25
25		#include "stdinc.h"
26		#include "list.h"
27		#include "ircd_defs.h"
28	–	#include "balloc.h"
28		#include "conf.h"
29		#include "s_serv.h"
30		#include "resv.h"
#	Line 45 | Line 44
44		#include "send.h"
45		#include "s_gline.h"
46		#include "memory.h"
47	+	#include "mempool.h"
48		#include "irc_res.h"
49		#include "userhost.h"
50		#include "s_user.h"
51		#include "channel_mode.h"
52		#include "parse.h"
53		#include "s_misc.h"
54	+	#include "conf_db.h"
55	+	#include "conf_class.h"
56	+	#include "motd.h"
57
55	–	struct Callback *client_check_cb = NULL;
58		struct config_server_hide ConfigServerHide;
59
60		/* general conf items link list root, other than k lines etc. */
#	Line 62 | Line 64 | dlink_list cluster_items = { NULL, NULL,
64		dlink_list oconf_items   = { NULL, NULL, 0 };
65		dlink_list uconf_items   = { NULL, NULL, 0 };
66		dlink_list xconf_items   = { NULL, NULL, 0 };
65	–	dlink_list rxconf_items  = { NULL, NULL, 0 };
66	–	dlink_list rkconf_items  = { NULL, NULL, 0 };
67		dlink_list nresv_items   = { NULL, NULL, 0 };
68	<	dlink_list class_items   = { NULL, NULL, 0 };
69	<	dlink_list gdeny_items   = { NULL, NULL, 0 };
70	<
71	<	dlink_list temporary_xlines  = { NULL, NULL, 0 };
72	<	dlink_list temporary_resv = { NULL, NULL, 0 };
68	>	dlink_list cresv_items = { NULL, NULL, 0 };
69
70		extern unsigned int lineno;
71		extern char linebuf[];
#	Line 81 | Line 77 | struct conf_parser_context conf_parser_c
77		/* internally defined functions */
78		static void read_conf(FILE *);
79		static void clear_out_old_conf(void);
84	–	static void flush_deleted_I_P(void);
80		static void expire_tklines(dlink_list *);
81		static void garbage_collect_ip_entries(void);
82		static int hash_ip(struct irc_ssaddr *);
83	<	static int verify_access(struct Client *, const char *);
84	<	static int attach_iline(struct Client *, struct ConfItem *);
83	>	static int verify_access(struct Client *);
84	>	static int attach_iline(struct Client *, struct MaskItem *);
85		static struct ip_entry *find_or_add_ip(struct irc_ssaddr *);
86	<	static void parse_conf_file(int, int);
92	<	static dlink_list *map_to_list(ConfType);
93	<	static struct AccessItem *find_regexp_kline(const char *[]);
86	>	static dlink_list *map_to_list(enum maskitem_type);
87		static int find_user_host(struct Client *, char *, char *, char *, unsigned int);
88
96	–	/*
97	–	* bit_len
98	–	*/
99	–	static int cidr_limit_reached(int, struct irc_ssaddr *, struct ClassItem *);
100	–	static void remove_from_cidr_check(struct irc_ssaddr *, struct ClassItem *);
101	–	static void destroy_cidr_class(struct ClassItem *);
102	–
103	–	static void flags_to_ascii(unsigned int, const unsigned int[], char *, int);
104	–
105	–	/* address of default class conf */
106	–	static struct ConfItem *class_default;
89
90		/* usually, with hash tables, you use a prime number...
91		* but in this case I am dealing with ip addresses,
#	Line 114 | Line 96 | static struct ConfItem *class_default;
96		struct ip_entry
97		{
98		struct irc_ssaddr ip;
99	<	int count;
99	>	unsigned int count;
100		time_t last_attempt;
101		struct ip_entry *next;
102		};
103
104		static struct ip_entry *ip_hash_table[IP_HASH_SIZE];
105	<	static BlockHeap *ip_entry_heap = NULL;
105	>	static mp_pool_t *ip_entry_pool = NULL;
106		static int ip_entries_count = 0;
107
108
127	–	void *
128	–	map_to_conf(struct ConfItem *aconf)
129	–	{
130	–	void *conf;
131	–	conf = (void *)((uintptr_t)aconf +
132	–	(uintptr_t)sizeof(struct ConfItem));
133	–	return(conf);
134	–	}
135	–
136	–	struct ConfItem *
137	–	unmap_conf_item(void *aconf)
138	–	{
139	–	struct ConfItem *conf;
140	–
141	–	conf = (struct ConfItem *)((uintptr_t)aconf -
142	–	(uintptr_t)sizeof(struct ConfItem));
143	–	return(conf);
144	–	}
145	–
109		/* conf_dns_callback()
110		*
111	<	* inputs       - pointer to struct AccessItem
111	>	* inputs       - pointer to struct MaskItem
112		*              - pointer to DNSReply reply
113		* output       - none
114		* side effects - called when resolver query finishes
#	Line 156 | Line 119 | unmap_conf_item(void *aconf)
119		static void
120		conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name)
121		{
122	<	struct AccessItem *aconf = vptr;
122	>	struct MaskItem *conf = vptr;
123
124	<	aconf->dns_pending = 0;
124	>	conf->dns_pending = 0;
125
126		if (addr != NULL)
127	<	memcpy(&aconf->addr, addr, sizeof(aconf->addr));
127	>	memcpy(&conf->addr, addr, sizeof(conf->addr));
128		else
129	<	aconf->dns_failed = 1;
129	>	conf->dns_failed = 1;
130		}
131
132		/* conf_dns_lookup()
#	Line 173 | Line 136 | conf_dns_callback(void *vptr, const stru
136		* allocate a dns_query and start ns lookup.
137		*/
138		static void
139	<	conf_dns_lookup(struct AccessItem *aconf)
139	>	conf_dns_lookup(struct MaskItem *conf)
140		{
141	<	if (!aconf->dns_pending)
141	>	if (!conf->dns_pending)
142		{
143	<	aconf->dns_pending = 1;
144	<	gethost_byname(conf_dns_callback, aconf, aconf->host);
143	>	conf->dns_pending = 1;
144	>	gethost_byname(conf_dns_callback, conf, conf->host);
145		}
146		}
147
148	<	/* make_conf_item()
149	<	*
187	<	* inputs       - type of item
188	<	* output       - pointer to new conf entry
189	<	* side effects - none
190	<	*/
191	<	struct ConfItem *
192	<	make_conf_item(ConfType type)
148	>	struct MaskItem *
149	>	conf_make(enum maskitem_type type)
150		{
151	<	struct ConfItem *conf = NULL;
152	<	struct AccessItem *aconf = NULL;
196	<	struct ClassItem *aclass = NULL;
197	<	int status = 0;
151	>	struct MaskItem *conf = MyMalloc(sizeof(*conf));
152	>	dlink_list *list = NULL;
153
154	<	switch (type)
155	<	{
156	<	case DLINE_TYPE:
202	<	case EXEMPTDLINE_TYPE:
203	<	case GLINE_TYPE:
204	<	case KLINE_TYPE:
205	<	case CLIENT_TYPE:
206	<	case OPER_TYPE:
207	<	case SERVER_TYPE:
208	<	conf = MyMalloc(sizeof(struct ConfItem) +
209	<	sizeof(struct AccessItem));
210	<	aconf = map_to_conf(conf);
211	<	aconf->aftype = AF_INET;
212	<
213	<	/* Yes, sigh. switch on type again */
214	<	switch (type)
215	<	{
216	<	case EXEMPTDLINE_TYPE:
217	<	status = CONF_EXEMPTDLINE;
218	<	break;
219	<
220	<	case DLINE_TYPE:
221	<	status = CONF_DLINE;
222	<	break;
223	<
224	<	case KLINE_TYPE:
225	<	status = CONF_KLINE;
226	<	break;
227	<
228	<	case GLINE_TYPE:
229	<	status = CONF_GLINE;
230	<	break;
231	<
232	<	case CLIENT_TYPE:
233	<	status = CONF_CLIENT;
234	<	break;
235	<
236	<	case OPER_TYPE:
237	<	status = CONF_OPERATOR;
238	<	dlinkAdd(conf, &conf->node, &oconf_items);
239	<	break;
240	<
241	<	case SERVER_TYPE:
242	<	status = CONF_SERVER;
243	<	dlinkAdd(conf, &conf->node, &server_items);
244	<	break;
245	<
246	<	default:
247	<	break;
248	<	}
249	<	aconf->status = status;
250	<	break;
251	<
252	<	case ULINE_TYPE:
253	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
254	<	sizeof(struct MatchItem));
255	<	dlinkAdd(conf, &conf->node, &uconf_items);
256	<	break;
257	<
258	<	case GDENY_TYPE:
259	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
260	<	sizeof(struct AccessItem));
261	<	dlinkAdd(conf, &conf->node, &gdeny_items);
262	<	break;
263	<
264	<	case XLINE_TYPE:
265	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
266	<	sizeof(struct MatchItem));
267	<	dlinkAdd(conf, &conf->node, &xconf_items);
268	<	break;
269	<	#ifdef HAVE_LIBPCRE
270	<	case RXLINE_TYPE:
271	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
272	<	sizeof(struct MatchItem));
273	<	dlinkAdd(conf, &conf->node, &rxconf_items);
274	<	break;
275	<
276	<	case RKLINE_TYPE:
277	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
278	<	sizeof(struct AccessItem));
279	<	aconf = map_to_conf(conf);
280	<	aconf->status = CONF_KLINE;
281	<	dlinkAdd(conf, &conf->node, &rkconf_items);
282	<	break;
283	<	#endif
284	<	case CLUSTER_TYPE:
285	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem));
286	<	dlinkAdd(conf, &conf->node, &cluster_items);
287	<	break;
288	<
289	<	case CRESV_TYPE:
290	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
291	<	sizeof(struct ResvChannel));
292	<	break;
293	<
294	<	case NRESV_TYPE:
295	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
296	<	sizeof(struct MatchItem));
297	<	dlinkAdd(conf, &conf->node, &nresv_items);
298	<	break;
299	<
300	<	case SERVICE_TYPE:
301	<	status = CONF_SERVICE;
302	<	conf = MyMalloc(sizeof(struct ConfItem));
303	<	dlinkAdd(conf, &conf->node, &service_items);
304	<	break;
305	<
306	<	case CLASS_TYPE:
307	<	conf = MyMalloc(sizeof(struct ConfItem) +
308	<	sizeof(struct ClassItem));
309	<	dlinkAdd(conf, &conf->node, &class_items);
310	<
311	<	aclass = map_to_conf(conf);
312	<	aclass->active = 1;
313	<	aclass->con_freq = DEFAULT_CONNECTFREQUENCY;
314	<	aclass->ping_freq = DEFAULT_PINGFREQUENCY;
315	<	aclass->max_total = MAXIMUM_LINKS_DEFAULT;
316	<	aclass->max_sendq = DEFAULT_SENDQ;
317	<
318	<	break;
319	<
320	<	default:
321	<	conf = NULL;
322	<	break;
323	<	}
324	<
325	<	/* XXX Yes, this will core if default is hit. I want it to for now - db */
326	<	conf->type = type;
154	>	conf->type   = type;
155	>	conf->active = 1;
156	>	conf->aftype = AF_INET;
157
158	+	if ((list = map_to_list(type)))
159	+	dlinkAdd(conf, &conf->node, list);
160		return conf;
161		}
162
163		void
164	<	delete_conf_item(struct ConfItem *conf)
164	>	conf_free(struct MaskItem *conf)
165		{
166	<	dlink_node *m = NULL, *m_next = NULL;
167	<	struct MatchItem *match_item;
168	<	struct AccessItem *aconf;
169	<	ConfType type = conf->type;
166	>	dlink_node *ptr = NULL, *ptr_next = NULL;
167	>	dlink_list *list = NULL;
168	>
169	>	if (conf->node.next)
170	>	if ((list = map_to_list(conf->type)))
171	>	dlinkDelete(&conf->node, list);
172
173		MyFree(conf->name);
340	–	conf->name = NULL;
174
175	<	switch(type)
176	<	{
177	<	case DLINE_TYPE:
178	<	case EXEMPTDLINE_TYPE:
179	<	case GLINE_TYPE:
180	<	case KLINE_TYPE:
181	<	case CLIENT_TYPE:
182	<	case OPER_TYPE:
183	<	case SERVER_TYPE:
184	<	aconf = map_to_conf(conf);
185	<
186	<	if (aconf->dns_pending)
187	<	delete_resolver_queries(aconf);
188	<	if (aconf->passwd != NULL)
356	<	memset(aconf->passwd, 0, strlen(aconf->passwd));
357	<	if (aconf->spasswd != NULL)
358	<	memset(aconf->spasswd, 0, strlen(aconf->spasswd));
359	<	aconf->class_ptr = NULL;
360	<
361	<	MyFree(aconf->passwd);
362	<	MyFree(aconf->spasswd);
363	<	MyFree(aconf->reason);
364	<	MyFree(aconf->oper_reason);
365	<	MyFree(aconf->user);
366	<	MyFree(aconf->host);
367	<	MyFree(aconf->cipher_list);
175	>	if (conf->dns_pending)
176	>	delete_resolver_queries(conf);
177	>	if (conf->passwd != NULL)
178	>	memset(conf->passwd, 0, strlen(conf->passwd));
179	>	if (conf->spasswd != NULL)
180	>	memset(conf->spasswd, 0, strlen(conf->spasswd));
181	>
182	>	conf->class = NULL;
183	>
184	>	MyFree(conf->passwd);
185	>	MyFree(conf->spasswd);
186	>	MyFree(conf->reason);
187	>	MyFree(conf->user);
188	>	MyFree(conf->host);
189		#ifdef HAVE_LIBCRYPTO
190	<	if (aconf->rsa_public_key)
370	<	RSA_free(aconf->rsa_public_key);
371	<	MyFree(aconf->rsa_public_key_file);
372	<	#endif
373	<
374	<	/* Yes, sigh. switch on type again */
375	<	switch(type)
376	<	{
377	<	case EXEMPTDLINE_TYPE:
378	<	case DLINE_TYPE:
379	<	case GLINE_TYPE:
380	<	case KLINE_TYPE:
381	<	case CLIENT_TYPE:
382	<	MyFree(conf);
383	<	break;
384	<
385	<	case OPER_TYPE:
386	<	aconf = map_to_conf(conf);
387	<	if (!IsConfIllegal(aconf))
388	<	dlinkDelete(&conf->node, &oconf_items);
389	<	MyFree(conf);
390	<	break;
391	<
392	<	case SERVER_TYPE:
393	<	aconf = map_to_conf(conf);
394	<
395	<	DLINK_FOREACH_SAFE(m, m_next, aconf->hub_list.head)
396	<	{
397	<	MyFree(m->data);
398	<	free_dlink_node(m);
399	<	}
400	<
401	<	DLINK_FOREACH_SAFE(m, m_next, aconf->leaf_list.head)
402	<	{
403	<	MyFree(m->data);
404	<	free_dlink_node(m);
405	<	}
406	<
407	<	if (!IsConfIllegal(aconf))
408	<	dlinkDelete(&conf->node, &server_items);
409	<	MyFree(conf);
410	<	break;
411	<
412	<	default:
413	<	break;
414	<	}
415	<	break;
190	>	MyFree(conf->cipher_list);
191
192	<	case ULINE_TYPE:
193	<	match_item = map_to_conf(conf);
419	<	MyFree(match_item->user);
420	<	MyFree(match_item->host);
421	<	MyFree(match_item->reason);
422	<	MyFree(match_item->oper_reason);
423	<	dlinkDelete(&conf->node, &uconf_items);
424	<	MyFree(conf);
425	<	break;
426	<
427	<	case XLINE_TYPE:
428	<	match_item = map_to_conf(conf);
429	<	MyFree(match_item->user);
430	<	MyFree(match_item->host);
431	<	MyFree(match_item->reason);
432	<	MyFree(match_item->oper_reason);
433	<	dlinkDelete(&conf->node, &xconf_items);
434	<	MyFree(conf);
435	<	break;
436	<	#ifdef HAVE_LIBPCRE
437	<	case RKLINE_TYPE:
438	<	aconf = map_to_conf(conf);
439	<	MyFree(aconf->regexuser);
440	<	MyFree(aconf->regexhost);
441	<	MyFree(aconf->user);
442	<	MyFree(aconf->host);
443	<	MyFree(aconf->reason);
444	<	MyFree(aconf->oper_reason);
445	<	dlinkDelete(&conf->node, &rkconf_items);
446	<	MyFree(conf);
447	<	break;
448	<
449	<	case RXLINE_TYPE:
450	<	MyFree(conf->regexpname);
451	<	match_item = map_to_conf(conf);
452	<	MyFree(match_item->user);
453	<	MyFree(match_item->host);
454	<	MyFree(match_item->reason);
455	<	MyFree(match_item->oper_reason);
456	<	dlinkDelete(&conf->node, &rxconf_items);
457	<	MyFree(conf);
458	<	break;
192	>	if (conf->rsa_public_key)
193	>	RSA_free(conf->rsa_public_key);
194		#endif
195	<	case NRESV_TYPE:
196	<	match_item = map_to_conf(conf);
197	<	MyFree(match_item->user);
198	<	MyFree(match_item->host);
464	<	MyFree(match_item->reason);
465	<	MyFree(match_item->oper_reason);
466	<	dlinkDelete(&conf->node, &nresv_items);
467	<
468	<	if (conf->flags & CONF_FLAGS_TEMPORARY)
469	<	if ((m = dlinkFindDelete(&temporary_resv, conf)) != NULL)
470	<	free_dlink_node(m);
471	<
472	<	MyFree(conf);
473	<	break;
474	<
475	<	case GDENY_TYPE:
476	<	aconf = map_to_conf(conf);
477	<	MyFree(aconf->user);
478	<	MyFree(aconf->host);
479	<	dlinkDelete(&conf->node, &gdeny_items);
480	<	MyFree(conf);
481	<	break;
482	<
483	<	case CLUSTER_TYPE:
484	<	dlinkDelete(&conf->node, &cluster_items);
485	<	MyFree(conf);
486	<	break;
487	<
488	<	case CRESV_TYPE:
489	<	if (conf->flags & CONF_FLAGS_TEMPORARY)
490	<	if ((m = dlinkFindDelete(&temporary_resv, conf)) != NULL)
491	<	free_dlink_node(m);
492	<
493	<	MyFree(conf);
494	<	break;
495	<
496	<	case CLASS_TYPE:
497	<	dlinkDelete(&conf->node, &class_items);
498	<	MyFree(conf);
499	<	break;
500	<
501	<	case SERVICE_TYPE:
502	<	dlinkDelete(&conf->node, &service_items);
503	<	MyFree(conf);
504	<	break;
505	<
506	<	default:
507	<	break;
195	>	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->hub_list.head)
196	>	{
197	>	MyFree(ptr->data);
198	>	free_dlink_node(ptr);
199		}
509	–	}
510	–
511	–	/* free_access_item()
512	–	*
513	–	* inputs       - pointer to conf to free
514	–	* output       - none
515	–	* side effects - crucial password fields are zeroed, conf is freed
516	–	*/
517	–	void
518	–	free_access_item(struct AccessItem *aconf)
519	–	{
520	–	struct ConfItem *conf;
521	–
522	–	if (aconf == NULL)
523	–	return;
524	–	conf = unmap_conf_item(aconf);
525	–	delete_conf_item(conf);
526	–	}
527	–
528	–	static const unsigned int shared_bit_table[] =
529	–	{ 'K', 'k', 'U', 'X', 'x', 'Y', 'Q', 'q', 'R', 'L', 0};
530	–
531	–	/* report_confitem_types()
532	–	*
533	–	* inputs       - pointer to client requesting confitem report
534	–	*              - ConfType to report
535	–	* output       - none
536	–	* side effects -
537	–	*/
538	–	void
539	–	report_confitem_types(struct Client *source_p, ConfType type)
540	–	{
541	–	dlink_node *ptr = NULL, *dptr = NULL;
542	–	struct ConfItem *conf = NULL;
543	–	struct AccessItem *aconf = NULL;
544	–	struct MatchItem *matchitem = NULL;
545	–	struct ClassItem *classitem = NULL;
546	–	char buf[12];
547	–	char *p = NULL;
200
201	<	switch (type)
201	>	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->leaf_list.head)
202		{
203	<	case GDENY_TYPE:
204	<	DLINK_FOREACH(ptr, gdeny_items.head)
205	<	{
554	<	conf = ptr->data;
555	<	aconf = map_to_conf(conf);
556	<
557	<	p = buf;
558	<
559	<	if (aconf->flags & GDENY_BLOCK)
560	<	*p++ = 'B';
561	<	else
562	<	*p++ = 'b';
563	<
564	<	if (aconf->flags & GDENY_REJECT)
565	<	*p++ = 'R';
566	<	else
567	<	*p++ = 'r';
568	<
569	<	*p = '\0';
570	<
571	<	sendto_one(source_p, ":%s %d %s V %s@%s %s %s",
572	<	me.name, RPL_STATSDEBUG, source_p->name,
573	<	aconf->user, aconf->host, conf->name, buf);
574	<	}
575	<	break;
576	<
577	<	case XLINE_TYPE:
578	<	DLINK_FOREACH(ptr, xconf_items.head)
579	<	{
580	<	conf = ptr->data;
581	<	matchitem = map_to_conf(conf);
582	<
583	<	sendto_one(source_p, form_str(RPL_STATSXLINE),
584	<	me.name, source_p->name,
585	<	matchitem->hold ? "x": "X", matchitem->count,
586	<	conf->name, matchitem->reason);
587	<	}
588	<	break;
589	<
590	<	#ifdef HAVE_LIBPCRE
591	<	case RXLINE_TYPE:
592	<	DLINK_FOREACH(ptr, rxconf_items.head)
593	<	{
594	<	conf = ptr->data;
595	<	matchitem = map_to_conf(conf);
596	<
597	<	sendto_one(source_p, form_str(RPL_STATSXLINE),
598	<	me.name, source_p->name,
599	<	"XR", matchitem->count,
600	<	conf->name, matchitem->reason);
601	<	}
602	<	break;
603	<
604	<	case RKLINE_TYPE:
605	<	DLINK_FOREACH(ptr, rkconf_items.head)
606	<	{
607	<	aconf = map_to_conf((conf = ptr->data));
608	<
609	<	sendto_one(source_p, form_str(RPL_STATSKLINE), me.name,
610	<	source_p->name, "KR", aconf->host, aconf->user,
611	<	aconf->reason, aconf->oper_reason ? aconf->oper_reason : "");
612	<	}
613	<	break;
614	<	#endif
615	<
616	<	case ULINE_TYPE:
617	<	DLINK_FOREACH(ptr, uconf_items.head)
618	<	{
619	<	conf = ptr->data;
620	<	matchitem = map_to_conf(conf);
621	<
622	<	p = buf;
623	<
624	<	/* some of these are redundant for the sake of
625	<	* consistency with cluster{} flags
626	<	*/
627	<	*p++ = 'c';
628	<	flags_to_ascii(matchitem->action, shared_bit_table, p, 0);
629	<
630	<	sendto_one(source_p, form_str(RPL_STATSULINE),
631	<	me.name, source_p->name, conf->name,
632	<	matchitem->user?matchitem->user: "*",
633	<	matchitem->host?matchitem->host: "*", buf);
634	<	}
635	<
636	<	DLINK_FOREACH(ptr, cluster_items.head)
637	<	{
638	<	conf = ptr->data;
639	<
640	<	p = buf;
641	<
642	<	*p++ = 'C';
643	<	flags_to_ascii(conf->flags, shared_bit_table, p, 0);
644	<
645	<	sendto_one(source_p, form_str(RPL_STATSULINE),
646	<	me.name, source_p->name, conf->name,
647	<	"*", "*", buf);
648	<	}
649	<
650	<	break;
651	<
652	<	case OPER_TYPE:
653	<	DLINK_FOREACH(ptr, oconf_items.head)
654	<	{
655	<	conf = ptr->data;
656	<	aconf = map_to_conf(conf);
657	<
658	<	/* Don't allow non opers to see oper privs */
659	<	if (HasUMode(source_p, UMODE_OPER))
660	<	sendto_one(source_p, form_str(RPL_STATSOLINE),
661	<	me.name, source_p->name, 'O', aconf->user, aconf->host,
662	<	conf->name, oper_privs_as_string(aconf->port),
663	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
664	<	else
665	<	sendto_one(source_p, form_str(RPL_STATSOLINE),
666	<	me.name, source_p->name, 'O', aconf->user, aconf->host,
667	<	conf->name, "0",
668	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
669	<	}
670	<	break;
671	<
672	<	case CLASS_TYPE:
673	<	DLINK_FOREACH(ptr, class_items.head)
674	<	{
675	<	conf = ptr->data;
676	<	classitem = map_to_conf(conf);
677	<	sendto_one(source_p, form_str(RPL_STATSYLINE),
678	<	me.name, source_p->name, 'Y',
679	<	conf->name, classitem->ping_freq,
680	<	classitem->con_freq,
681	<	classitem->max_total, classitem->max_sendq,
682	<	classitem->curr_user_count,
683	<	classitem->active ? "active" : "disabled");
684	<	}
685	<	break;
686	<
687	<	case CONF_TYPE:
688	<	case CLIENT_TYPE:
689	<	break;
690	<
691	<	case SERVICE_TYPE:
692	<	DLINK_FOREACH(ptr, service_items.head)
693	<	{
694	<	conf = ptr->data;
695	<	sendto_one(source_p, form_str(RPL_STATSSERVICE),
696	<	me.name, source_p->name, 'S', "*", conf->name, 0, 0);
697	<	}
698	<	break;
699	<
700	<	case SERVER_TYPE:
701	<	DLINK_FOREACH(ptr, server_items.head)
702	<	{
703	<	p = buf;
704	<
705	<	conf = ptr->data;
706	<	aconf = map_to_conf(conf);
707	<
708	<	buf[0] = '\0';
709	<
710	<	if (IsConfAllowAutoConn(aconf))
711	<	*p++ = 'A';
712	<	if (IsConfSSL(aconf))
713	<	*p++ = 'S';
714	<	if (IsConfTopicBurst(aconf))
715	<	*p++ = 'T';
716	<	if (buf[0] == '\0')
717	<	*p++ = '*';
718	<
719	<	*p = '\0';
720	<
721	<	/*
722	<	* Allow admins to see actual ips unless hide_server_ips is enabled
723	<	*/
724	<	if (!ConfigServerHide.hide_server_ips && HasUMode(source_p, UMODE_ADMIN))
725	<	sendto_one(source_p, form_str(RPL_STATSCLINE),
726	<	me.name, source_p->name, 'C', aconf->host,
727	<	buf, conf->name, aconf->port,
728	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
729	<	else
730	<	sendto_one(source_p, form_str(RPL_STATSCLINE),
731	<	me.name, source_p->name, 'C',
732	<	"*@127.0.0.1", buf, conf->name, aconf->port,
733	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
734	<	}
735	<	break;
736	<
737	<	case HUB_TYPE:
738	<	DLINK_FOREACH(ptr, server_items.head)
739	<	{
740	<	conf = ptr->data;
741	<	aconf = map_to_conf(conf);
742	<
743	<	DLINK_FOREACH(dptr, aconf->hub_list.head)
744	<	sendto_one(source_p, form_str(RPL_STATSHLINE), me.name,
745	<	source_p->name, 'H', dptr->data, conf->name, 0, "*");
746	<	}
747	<	break;
748	<
749	<	case LEAF_TYPE:
750	<	DLINK_FOREACH(ptr, server_items.head)
751	<	{
752	<	conf = ptr->data;
753	<	aconf = map_to_conf(conf);
203	>	MyFree(ptr->data);
204	>	free_dlink_node(ptr);
205	>	}
206
207	<	DLINK_FOREACH(dptr, aconf->leaf_list.head)
208	<	sendto_one(source_p, form_str(RPL_STATSLLINE), me.name,
209	<	source_p->name, 'L', dptr->data, conf->name, 0, "*");
758	<	}
759	<	break;
207	>	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->exempt_list.head)
208	>	{
209	>	struct exempt *exptr = ptr->data;
210
211	<	case GLINE_TYPE:
212	<	case KLINE_TYPE:
213	<	case DLINE_TYPE:
214	<	case EXEMPTDLINE_TYPE:
765	<	case CRESV_TYPE:
766	<	case NRESV_TYPE:
767	<	case CLUSTER_TYPE:
768	<	default:
769	<	break;
211	>	MyFree(exptr->name);
212	>	MyFree(exptr->user);
213	>	MyFree(exptr->host);
214	>	MyFree(exptr);
215		}
216	+
217	+	MyFree(conf);
218		}
219
220		/* check_client()
#	Line 783 | Line 230 | report_confitem_types(struct Client *sou
230		*                Look for conf lines which have the same
231		*                status as the flags passed.
232		*/
233	<	static void *
234	<	check_client(va_list args)
233	>	int
234	>	check_client(struct Client *source_p)
235		{
789	–	struct Client *source_p = va_arg(args, struct Client *);
790	–	const char *username = va_arg(args, const char *);
236		int i;
237
238	<	/* I'm already in big trouble if source_p->localClient is NULL -db */
794	<	if ((i = verify_access(source_p, username)))
238	>	if ((i = verify_access(source_p)))
239		ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
240		source_p->name, source_p->sockhost);
241
242		switch (i)
243		{
244		case TOO_MANY:
245	<	sendto_realops_flags(UMODE_FULL, L_ALL,
245	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
246		"Too many on IP for %s (%s).",
247		get_client_name(source_p, SHOW_IP),
248		source_p->sockhost);
#	Line 809 | Line 253 | check_client(va_list args)
253		break;
254
255		case I_LINE_FULL:
256	<	sendto_realops_flags(UMODE_FULL, L_ALL,
257	<	"I-line is full for %s (%s).",
256	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
257	>	"auth{} block is full for %s (%s).",
258		get_client_name(source_p, SHOW_IP),
259		source_p->sockhost);
260		ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
#	Line 824 | Line 268 | check_client(va_list args)
268		++ServerStats.is_ref;
269		/* jdc - lists server name & port connections are on */
270		/*       a purely cosmetical change */
271	<	sendto_realops_flags(UMODE_UNAUTH, L_ALL,
271	>	sendto_realops_flags(UMODE_UNAUTH, L_ALL, SEND_NOTICE,
272		"Unauthorized client connection from %s [%s] on [%s/%u].",
273		get_client_name(source_p, SHOW_IP),
274		source_p->sockhost,
#	Line 836 | Line 280 | check_client(va_list args)
280		source_p->localClient->listener->name,
281		source_p->localClient->listener->port);
282
283	<	/* XXX It is prolematical whether it is better to use the
840	<	* capture reject code here or rely on the connecting too fast code.
841	<	* - Dianora
842	<	*/
843	<	if (REJECT_HOLD_TIME > 0)
844	<	{
845	<	sendto_one(source_p, ":%s NOTICE %s :You are not authorized to use this server",
846	<	me.name, source_p->name);
847	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
848	<	SetCaptured(source_p);
849	<	}
850	<	else
851	<	exit_client(source_p, &me, "You are not authorized to use this server");
283	>	exit_client(source_p, &me, "You are not authorized to use this server");
284		break;
285
286		case BANNED_CLIENT:
287	<	/*
856	<	* Don't exit them immediately, play with them a bit.
857	<	* - Dianora
858	<	*/
859	<	if (REJECT_HOLD_TIME > 0)
860	<	{
861	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
862	<	SetCaptured(source_p);
863	<	}
864	<	else
865	<	exit_client(source_p, &me, "Banned");
287	>	exit_client(source_p, &me, "Banned");
288		++ServerStats.is_ref;
289		break;
290
#	Line 871 | Line 293 | check_client(va_list args)
293		break;
294		}
295
296	<	return (i < 0 ? NULL : source_p);
296	>	return (i < 0 ? 0 : 1);
297		}
298
299		/* verify_access()
300		*
301		* inputs       - pointer to client to verify
880	–	*              - pointer to proposed username
302		* output       - 0 if success -'ve if not
303		* side effect  - find the first (best) I line to attach.
304		*/
305		static int
306	<	verify_access(struct Client *client_p, const char *username)
306	>	verify_access(struct Client *client_p)
307		{
308	<	struct AccessItem *aconf = NULL, *rkconf = NULL;
888	<	struct ConfItem *conf = NULL;
308	>	struct MaskItem *conf = NULL;
309		char non_ident[USERLEN + 1] = { '~', '\0' };
890	–	const char *uhi[3];
310
311		if (IsGotId(client_p))
312		{
313	<	aconf = find_address_conf(client_p->host, client_p->username,
313	>	conf = find_address_conf(client_p->host, client_p->username,
314		&client_p->localClient->ip,
315		client_p->localClient->aftype,
316		client_p->localClient->passwd);
317		}
318		else
319		{
320	<	strlcpy(non_ident+1, username, sizeof(non_ident)-1);
321	<	aconf = find_address_conf(client_p->host,non_ident,
320	>	strlcpy(non_ident+1, client_p->username, sizeof(non_ident)-1);
321	>	conf = find_address_conf(client_p->host,non_ident,
322		&client_p->localClient->ip,
323		client_p->localClient->aftype,
324		client_p->localClient->passwd);
325		}
326
327	<	uhi[0] = IsGotId(client_p) ? client_p->username : non_ident;
909	<	uhi[1] = client_p->host;
910	<	uhi[2] = client_p->sockhost;
911	<
912	<	rkconf = find_regexp_kline(uhi);
913	<
914	<	if (aconf != NULL)
327	>	if (conf != NULL)
328		{
329	<	if (IsConfClient(aconf) && !rkconf)
329	>	if (IsConfClient(conf))
330		{
331	<	conf = unmap_conf_item(aconf);
919	<
920	<	if (IsConfRedir(aconf))
331	>	if (IsConfRedir(conf))
332		{
333		sendto_one(client_p, form_str(RPL_REDIR),
334		me.name, client_p->name,
335		conf->name ? conf->name : "",
336	<	aconf->port);
336	>	conf->port);
337		return(NOT_AUTHORIZED);
338		}
339
340	<	if (IsConfDoIdentd(aconf))
340	>	if (IsConfDoIdentd(conf))
341		SetNeedId(client_p);
342
343		/* Thanks for spoof idea amm */
344	<	if (IsConfDoSpoofIp(aconf))
344	>	if (IsConfDoSpoofIp(conf))
345		{
346	<	conf = unmap_conf_item(aconf);
347	<
348	<	if (!ConfigFileEntry.hide_spoof_ips && IsConfSpoofNotice(aconf))
938	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "%s spoofing: %s as %s",
346	>	if (!ConfigFileEntry.hide_spoof_ips && IsConfSpoofNotice(conf))
347	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
348	>	"%s spoofing: %s as %s",
349		client_p->name, client_p->host, conf->name);
350		strlcpy(client_p->host, conf->name, sizeof(client_p->host));
351	<	SetIPSpoof(client_p);
351	>	AddFlag(client_p, FLAGS_IP_SPOOFING | FLAGS_AUTH_SPOOF);
352		}
353
354		return(attach_iline(client_p, conf));
355		}
356	<	else if (rkconf || IsConfKill(aconf) || (ConfigFileEntry.glines && IsConfGline(aconf)))
356	>	else if (IsConfKill(conf) || (ConfigFileEntry.glines && IsConfGline(conf)))
357		{
358	<	/* XXX */
949	<	aconf = rkconf ? rkconf : aconf;
950	<	if (IsConfGline(aconf))
358	>	if (IsConfGline(conf))
359		sendto_one(client_p, ":%s NOTICE %s :*** G-lined", me.name,
360		client_p->name);
361	<	if (ConfigFileEntry.kline_with_reason)
362	<	sendto_one(client_p, ":%s NOTICE %s :*** Banned %s",
955	<	me.name, client_p->name, aconf->reason);
361	>	sendto_one(client_p, ":%s NOTICE %s :*** Banned: %s",
362	>	me.name, client_p->name, conf->reason);
363		return(BANNED_CLIENT);
364		}
365		}
#	Line 968 | Line 375 | verify_access(struct Client *client_p, c
375		* side effects - do actual attach
376		*/
377		static int
378	<	attach_iline(struct Client *client_p, struct ConfItem *conf)
378	>	attach_iline(struct Client *client_p, struct MaskItem *conf)
379		{
380	<	struct AccessItem *aconf;
974	<	struct ClassItem *aclass;
380	>	struct ClassItem *class = NULL;
381		struct ip_entry *ip_found;
382		int a_limit_reached = 0;
383	<	int local = 0, global = 0, ident = 0;
383	>	unsigned int local = 0, global = 0, ident = 0;
384
385		ip_found = find_or_add_ip(&client_p->localClient->ip);
386		ip_found->count++;
387		SetIpHash(client_p);
388
389	<	aconf = map_to_conf(conf);
984	<	if (aconf->class_ptr == NULL)
389	>	if (conf->class == NULL)
390		return NOT_AUTHORIZED;  /* If class is missing, this is best */
391
392	<	aclass = map_to_conf(aconf->class_ptr);
392	>	class = conf->class;
393
394		count_user_host(client_p->username, client_p->host,
395		&global, &local, &ident);
#	Line 993 | Line 398 | attach_iline(struct Client *client_p, st
398		* setting a_limit_reached if any limit is reached.
399		* - Dianora
400		*/
401	<	if (aclass->max_total != 0 && aclass->curr_user_count >= aclass->max_total)
401	>	if (class->max_total != 0 && class->ref_count >= class->max_total)
402		a_limit_reached = 1;
403	<	else if (aclass->max_perip != 0 && ip_found->count > aclass->max_perip)
403	>	else if (class->max_perip != 0 && ip_found->count > class->max_perip)
404		a_limit_reached = 1;
405	<	else if (aclass->max_local != 0 && local >= aclass->max_local)
405	>	else if (class->max_local != 0 && local >= class->max_local)
406		a_limit_reached = 1;
407	<	else if (aclass->max_global != 0 && global >= aclass->max_global)
407	>	else if (class->max_global != 0 && global >= class->max_global)
408		a_limit_reached = 1;
409	<	else if (aclass->max_ident != 0 && ident >= aclass->max_ident &&
409	>	else if (class->max_ident != 0 && ident >= class->max_ident &&
410		client_p->username[0] != '~')
411		a_limit_reached = 1;
412
413		if (a_limit_reached)
414		{
415	<	if (!IsConfExemptLimits(aconf))
415	>	if (!IsConfExemptLimits(conf))
416		return TOO_MANY;   /* Already at maximum allowed */
417
418		sendto_one(client_p,
#	Line 1028 | Line 433 | attach_iline(struct Client *client_p, st
433		void
434		init_ip_hash_table(void)
435		{
436	<	ip_entry_heap = BlockHeapCreate("ip", sizeof(struct ip_entry),
1032	<	2 * hard_fdlimit);
436	>	ip_entry_pool = mp_pool_new(sizeof(struct ip_entry), MP_CHUNK_SIZE_IP_ENTRY);
437		memset(ip_hash_table, 0, sizeof(ip_hash_table));
438		}
439
#	Line 1078 | Line 482 | find_or_add_ip(struct irc_ssaddr *ip_in)
482		if (ip_entries_count >= 2 * hard_fdlimit)
483		garbage_collect_ip_entries();
484
485	<	newptr = BlockHeapAlloc(ip_entry_heap);
485	>	newptr = mp_pool_get(ip_entry_pool);
486	>	memset(newptr, 0, sizeof(*newptr));
487		ip_entries_count++;
488		memcpy(&newptr->ip, ip_in, sizeof(struct irc_ssaddr));
489
#	Line 1136 | Line 541 | remove_one_ip(struct irc_ssaddr *ip_in)
541		else
542		ip_hash_table[hash_index] = ptr->next;
543
544	<	BlockHeapFree(ip_entry_heap, ptr);
544	>	mp_pool_release(ptr);
545		ip_entries_count--;
546		return;
547		}
#	Line 1239 | Line 644 | garbage_collect_ip_entries(void)
644		last_ptr->next = ptr->next;
645		else
646		ip_hash_table[i] = ptr->next;
647	<	BlockHeapFree(ip_entry_heap, ptr);
647	>	mp_pool_release(ptr);
648		ip_entries_count--;
649		}
650		else
#	Line 1256 | Line 661 | garbage_collect_ip_entries(void)
661		* side effects - Disassociate configuration from the client.
662		*                Also removes a class from the list if marked for deleting.
663		*/
664	<	int
665	<	detach_conf(struct Client *client_p, ConfType type)
664	>	void
665	>	detach_conf(struct Client *client_p, enum maskitem_type type)
666		{
667	<	dlink_node *ptr, *next_ptr;
1263	<	struct ConfItem *conf;
1264	<	struct ClassItem *aclass;
1265	<	struct AccessItem *aconf;
1266	<	struct ConfItem *aclass_conf;
1267	<	struct MatchItem *match_item;
667	>	dlink_node *ptr = NULL, *next_ptr = NULL;
668
669		DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->confs.head)
670		{
671	<	conf = ptr->data;
1272	<
1273	<	if (type == CONF_TYPE || conf->type == type)
1274	<	{
1275	<	dlinkDelete(ptr, &client_p->localClient->confs);
1276	<	free_dlink_node(ptr);
1277	<
1278	<	switch (conf->type)
1279	<	{
1280	<	case CLIENT_TYPE:
1281	<	case OPER_TYPE:
1282	<	case SERVER_TYPE:
1283	<	aconf = map_to_conf(conf);
671	>	struct MaskItem *conf = ptr->data;
672
673	<	assert(aconf->clients > 0);
673	>	assert(conf->type & (CONF_CLIENT | CONF_OPER | CONF_SERVER));
674	>	assert(conf->ref_count > 0);
675	>	assert(conf->class->ref_count > 0);
676
677	<	if ((aclass_conf = aconf->class_ptr) != NULL)
678	<	{
1289	<	aclass = map_to_conf(aclass_conf);
1290	<
1291	<	assert(aclass->curr_user_count > 0);
1292	<
1293	<	if (conf->type == CLIENT_TYPE)
1294	<	remove_from_cidr_check(&client_p->localClient->ip, aclass);
1295	<	if (--aclass->curr_user_count == 0 && aclass->active == 0)
1296	<	delete_conf_item(aclass_conf);
1297	<	}
677	>	if (!(conf->type & type))
678	>	continue;
679
680	<	if (--aconf->clients == 0 && IsConfIllegal(aconf))
681	<	delete_conf_item(conf);
680	>	dlinkDelete(ptr, &client_p->localClient->confs);
681	>	free_dlink_node(ptr);
682
683	<	break;
684	<	default:
1304	<	break;
1305	<	}
683	>	if (conf->type == CONF_CLIENT)
684	>	remove_from_cidr_check(&client_p->localClient->ip, conf->class);
685
686	<	if (type != CONF_TYPE)
687	<	return 0;
686	>	if (--conf->class->ref_count == 0 && conf->class->active == 0)
687	>	{
688	>	class_free(conf->class);
689	>	conf->class = NULL;
690		}
1310	–	}
691
692	<	return -1;
692	>	if (--conf->ref_count == 0 && conf->active == 0)
693	>	conf_free(conf);
694	>	}
695		}
696
697		/* attach_conf()
#	Line 1323 | Line 705 | detach_conf(struct Client *client_p, Con
705		*                attachment if there was an old one...
706		*/
707		int
708	<	attach_conf(struct Client *client_p, struct ConfItem *conf)
708	>	attach_conf(struct Client *client_p, struct MaskItem *conf)
709		{
710		if (dlinkFind(&client_p->localClient->confs, conf) != NULL)
711		return 1;
712
713	<	if (conf->type == CLIENT_TYPE ||
714	<	conf->type == SERVER_TYPE ||
715	<	conf->type == OPER_TYPE)
716	<	{
1335	<	struct AccessItem *aconf = map_to_conf(conf);
1336	<	struct ClassItem *aclass = map_to_conf(aconf->class_ptr);
1337	<
1338	<	if (IsConfIllegal(aconf))
1339	<	return NOT_AUTHORIZED;
1340	<
1341	<	if (conf->type == CLIENT_TYPE)
1342	<	if (cidr_limit_reached(IsConfExemptLimits(aconf),
1343	<	&client_p->localClient->ip, aclass))
1344	<	return TOO_MANY;    /* Already at maximum allowed */
713	>	if (conf->type == CONF_CLIENT)
714	>	if (cidr_limit_reached(IsConfExemptLimits(conf),
715	>	&client_p->localClient->ip, conf->class))
716	>	return TOO_MANY;    /* Already at maximum allowed */
717
718	<	aclass->curr_user_count++;
719	<	aconf->clients++;
1348	<	}
718	>	conf->class->ref_count++;
719	>	conf->ref_count++;
720
721		dlinkAdd(conf, make_dlink_node(), &client_p->localClient->confs);
722
#	Line 1365 | Line 736 | attach_connect_block(struct Client *clie
736		const char *host)
737		{
738		dlink_node *ptr;
739	<	struct ConfItem *conf;
1369	<	struct AccessItem *aconf;
739	>	struct MaskItem *conf = NULL;
740
741		assert(client_p != NULL);
742		assert(host != NULL);
#	Line 1377 | Line 747 | attach_connect_block(struct Client *clie
747		DLINK_FOREACH(ptr, server_items.head)
748		{
749		conf = ptr->data;
1380	–	aconf = map_to_conf(conf);
750
751	<	if (match(conf->name, name) == 0 || match(aconf->host, host) == 0)
751	>	if (match(conf->name, name) || match(conf->host, host))
752		continue;
753
754		attach_conf(client_p, conf);
#	Line 1389 | Line 758 | attach_connect_block(struct Client *clie
758		return 0;
759		}
760
1392	–	/* find_conf_exact()
1393	–	*
1394	–	* inputs       - type of ConfItem
1395	–	*              - pointer to name to find
1396	–	*              - pointer to username to find
1397	–	*              - pointer to host to find
1398	–	* output       - NULL or pointer to conf found
1399	–	* side effects - find a conf entry which matches the hostname
1400	–	*                and has the same name.
1401	–	*/
1402	–	struct ConfItem *
1403	–	find_conf_exact(ConfType type, const char *name, const char *user,
1404	–	const char *host)
1405	–	{
1406	–	dlink_node *ptr;
1407	–	dlink_list *list_p;
1408	–	struct ConfItem *conf = NULL;
1409	–	struct AccessItem *aconf;
1410	–
1411	–	/* Only valid for OPER_TYPE and ...? */
1412	–	list_p = map_to_list(type);
1413	–
1414	–	DLINK_FOREACH(ptr, (*list_p).head)
1415	–	{
1416	–	conf = ptr->data;
1417	–
1418	–	if (conf->name == NULL)
1419	–	continue;
1420	–	aconf = map_to_conf(conf);
1421	–	if (aconf->host == NULL)
1422	–	continue;
1423	–	if (irccmp(conf->name, name) != 0)
1424	–	continue;
1425	–
1426	–	/*
1427	–	** Accept if the *real* hostname (usually sockethost)
1428	–	** socket host) matches *either* host or name field
1429	–	** of the configuration.
1430	–	*/
1431	–	if (!match(aconf->host, host) || !match(aconf->user, user))
1432	–	continue;
1433	–	if (type == OPER_TYPE)
1434	–	{
1435	–	struct ClassItem *aclass = map_to_conf(aconf->class_ptr);
1436	–
1437	–	if (aconf->clients >= aclass->max_total)
1438	–	continue;
1439	–	}
1440	–
1441	–	return conf;
1442	–	}
1443	–
1444	–	return NULL;
1445	–	}
1446	–
761		/* find_conf_name()
762		*
763		* inputs       - pointer to conf link list to search
#	Line 1453 | Line 767 | find_conf_exact(ConfType type, const cha
767		* side effects - find a conf entry which matches the name
768		*                and has the given mask.
769		*/
770	<	struct ConfItem *
771	<	find_conf_name(dlink_list *list, const char *name, ConfType type)
770	>	struct MaskItem *
771	>	find_conf_name(dlink_list *list, const char *name, enum maskitem_type type)
772		{
773		dlink_node *ptr;
774	<	struct ConfItem* conf;
774	>	struct MaskItem* conf;
775
776		DLINK_FOREACH(ptr, list->head)
777		{
#	Line 1466 | Line 780 | find_conf_name(dlink_list *list, const c
780		if (conf->type == type)
781		{
782		if (conf->name && (irccmp(conf->name, name) == 0 ||
783	<	match(conf->name, name)))
783	>	!match(conf->name, name)))
784		return conf;
785		}
786		}
#	Line 1481 | Line 795 | find_conf_name(dlink_list *list, const c
795		* side effects - none
796		*/
797		static dlink_list *
798	<	map_to_list(ConfType type)
798	>	map_to_list(enum maskitem_type type)
799		{
800		switch(type)
801		{
802	<	case RXLINE_TYPE:
1489	<	return(&rxconf_items);
1490	<	break;
1491	<	case XLINE_TYPE:
802	>	case CONF_XLINE:
803		return(&xconf_items);
804		break;
805	<	case ULINE_TYPE:
805	>	case CONF_ULINE:
806		return(&uconf_items);
807		break;
808	<	case NRESV_TYPE:
808	>	case CONF_NRESV:
809		return(&nresv_items);
810		break;
811	<	case OPER_TYPE:
811	>	case CONF_CRESV:
812	>	return(&cresv_items);
813	>	case CONF_OPER:
814		return(&oconf_items);
815		break;
816	<	case CLASS_TYPE:
1504	<	return(&class_items);
1505	<	break;
1506	<	case SERVER_TYPE:
816	>	case CONF_SERVER:
817		return(&server_items);
818		break;
819	<	case SERVICE_TYPE:
819	>	case CONF_SERVICE:
820		return(&service_items);
821		break;
822	<	case CLUSTER_TYPE:
822	>	case CONF_CLUSTER:
823		return(&cluster_items);
824		break;
1515	–	case CONF_TYPE:
1516	–	case GLINE_TYPE:
1517	–	case KLINE_TYPE:
1518	–	case DLINE_TYPE:
1519	–	case CRESV_TYPE:
825		default:
826		return NULL;
827		}
#	Line 1528 | Line 833 | map_to_list(ConfType type)
833		*              - pointer to name string to find
834		*              - pointer to user
835		*              - pointer to host
836	<	*              - optional action to match on as well
837	<	* output       - NULL or pointer to found struct MatchItem
836	>	*              - optional flags to match on as well
837	>	* output       - NULL or pointer to found struct MaskItem
838		* side effects - looks for a match on name field
839		*/
840	<	struct ConfItem *
841	<	find_matching_name_conf(ConfType type, const char *name, const char *user,
842	<	const char *host, int action)
840	>	struct MaskItem *
841	>	find_matching_name_conf(enum maskitem_type type, const char *name, const char *user,
842	>	const char *host, unsigned int flags)
843		{
844		dlink_node *ptr=NULL;
845	<	struct ConfItem *conf=NULL;
1541	<	struct AccessItem *aconf=NULL;
1542	<	struct MatchItem *match_item=NULL;
845	>	struct MaskItem *conf=NULL;
846		dlink_list *list_p = map_to_list(type);
847
848		switch (type)
849		{
850	<	#ifdef HAVE_LIBPCRE
1548	<	case RXLINE_TYPE:
1549	<	DLINK_FOREACH(ptr, list_p->head)
1550	<	{
1551	<	conf = ptr->data;
1552	<	assert(conf->regexpname);
1553	<
1554	<	if (!ircd_pcre_exec(conf->regexpname, name))
1555	<	return conf;
1556	<	}
1557	<	break;
1558	<	#endif
1559	<	case SERVICE_TYPE:
850	>	case CONF_SERVICE:
851		DLINK_FOREACH(ptr, list_p->head)
852		{
853		conf = ptr->data;
#	Line 1568 | Line 859 | find_matching_name_conf(ConfType type, c
859		}
860		break;
861
862	<	case XLINE_TYPE:
863	<	case ULINE_TYPE:
864	<	case NRESV_TYPE:
862	>	case CONF_XLINE:
863	>	case CONF_ULINE:
864	>	case CONF_NRESV:
865	>	case CONF_CRESV:
866		DLINK_FOREACH(ptr, list_p->head)
867		{
868		conf = ptr->data;
869
1578	–	match_item = map_to_conf(conf);
870		if (EmptyString(conf->name))
871		continue;
872	<	if ((name != NULL) && match_esc(conf->name, name))
872	>	if ((name != NULL) && !match(conf->name, name))
873		{
874		if ((user == NULL && (host == NULL)))
875		return conf;
876	<	if ((match_item->action & action) != action)
876	>	if ((conf->flags & flags) != flags)
877		continue;
878	<	if (EmptyString(match_item->user) || EmptyString(match_item->host))
878	>	if (EmptyString(conf->user) || EmptyString(conf->host))
879		return conf;
880	<	if (match(match_item->user, user) && match(match_item->host, host))
880	>	if (!match(conf->user, user) && !match(conf->host, host))
881		return conf;
882		}
883		}
884		break;
885
886	<	case SERVER_TYPE:
886	>	case CONF_SERVER:
887		DLINK_FOREACH(ptr, list_p->head)
888		{
889		conf = ptr->data;
1599	–	aconf = map_to_conf(conf);
890
891	<	if ((name != NULL) && match_esc(name, conf->name))
891	>	if ((name != NULL) && !match(name, conf->name))
892		return conf;
893	<	else if ((host != NULL) && match_esc(host, aconf->host))
893	>	else if ((host != NULL) && !match(host, conf->host))
894		return conf;
895		}
896		break;
#	Line 1617 | Line 907 | find_matching_name_conf(ConfType type, c
907		*              - pointer to name string to find
908		*              - pointer to user
909		*              - pointer to host
910	<	* output       - NULL or pointer to found struct MatchItem
910	>	* output       - NULL or pointer to found struct MaskItem
911		* side effects - looks for an exact match on name field
912		*/
913	<	struct ConfItem *
914	<	find_exact_name_conf(ConfType type, const struct Client *who, const char *name,
913	>	struct MaskItem *
914	>	find_exact_name_conf(enum maskitem_type type, const struct Client *who, const char *name,
915		const char *user, const char *host)
916		{
917		dlink_node *ptr = NULL;
918	<	struct AccessItem *aconf;
919	<	struct ConfItem *conf;
1630	<	struct MatchItem *match_item;
1631	<	dlink_list *list_p;
1632	<
1633	<	list_p = map_to_list(type);
918	>	struct MaskItem *conf;
919	>	dlink_list *list_p = map_to_list(type);
920
921		switch(type)
922		{
923	<	case RXLINE_TYPE:
924	<	case XLINE_TYPE:
925	<	case ULINE_TYPE:
926	<	case NRESV_TYPE:
923	>	case CONF_XLINE:
924	>	case CONF_ULINE:
925	>	case CONF_NRESV:
926	>	case CONF_CRESV:
927
928		DLINK_FOREACH(ptr, list_p->head)
929		{
930		conf = ptr->data;
931	<	match_item = (struct MatchItem *)map_to_conf(conf);
931	>
932		if (EmptyString(conf->name))
933		continue;
934
#	Line 1650 | Line 936 | find_exact_name_conf(ConfType type, cons
936		{
937		if ((user == NULL && (host == NULL)))
938		return (conf);
939	<	if (EmptyString(match_item->user) || EmptyString(match_item->host))
939	>	if (EmptyString(conf->user) || EmptyString(conf->host))
940		return (conf);
941	<	if (match(match_item->user, user) && match(match_item->host, host))
941	>	if (!match(conf->user, user) && !match(conf->host, host))
942		return (conf);
943		}
944		}
945		break;
946
947	<	case OPER_TYPE:
947	>	case CONF_OPER:
948		DLINK_FOREACH(ptr, list_p->head)
949		{
950		conf = ptr->data;
1665	–	aconf = map_to_conf(conf);
951
952		if (EmptyString(conf->name))
953		continue;
#	Line 1671 | Line 956 | find_exact_name_conf(ConfType type, cons
956		{
957		if (!who)
958		return conf;
959	<	if (EmptyString(aconf->user) || EmptyString(aconf->host))
960	<	return conf;
961	<	if (match(aconf->user, who->username))
959	>	if (EmptyString(conf->user) || EmptyString(conf->host))
960	>	return NULL;
961	>	if (!match(conf->user, who->username))
962		{
963	<	switch (aconf->type)
963	>	switch (conf->htype)
964		{
965		case HM_HOST:
966	<	if (match(aconf->host, who->host) || match(aconf->host, who->sockhost))
967	<	return conf;
966	>	if (!match(conf->host, who->host) || !match(conf->host, who->sockhost))
967	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
968	>	return conf;
969		break;
970		case HM_IPV4:
971		if (who->localClient->aftype == AF_INET)
972	<	if (match_ipv4(&who->localClient->ip, &aconf->addr, aconf->bits))
973	<	return conf;
972	>	if (match_ipv4(&who->localClient->ip, &conf->addr, conf->bits))
973	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
974	>	return conf;
975		break;
976		#ifdef IPV6
977		case HM_IPV6:
978		if (who->localClient->aftype == AF_INET6)
979	<	if (match_ipv6(&who->localClient->ip, &aconf->addr, aconf->bits))
980	<	return conf;
979	>	if (match_ipv6(&who->localClient->ip, &conf->addr, conf->bits))
980	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
981	>	return conf;
982		break;
983		#endif
984		default:
#	Line 1702 | Line 990 | find_exact_name_conf(ConfType type, cons
990
991		break;
992
993	<	case SERVER_TYPE:
993	>	case CONF_SERVER:
994		DLINK_FOREACH(ptr, list_p->head)
995		{
996		conf = ptr->data;
997	<	aconf = (struct AccessItem *)map_to_conf(conf);
997	>
998		if (EmptyString(conf->name))
999		continue;
1000
1001		if (name == NULL)
1002		{
1003	<	if (EmptyString(aconf->host))
1003	>	if (EmptyString(conf->host))
1004		continue;
1005	<	if (irccmp(aconf->host, host) == 0)
1005	>	if (irccmp(conf->host, host) == 0)
1006		return(conf);
1007		}
1008		else if (irccmp(conf->name, name) == 0)
#	Line 1724 | Line 1012 | find_exact_name_conf(ConfType type, cons
1012		}
1013		break;
1014
1727	–	case CLASS_TYPE:
1728	–	DLINK_FOREACH(ptr, list_p->head)
1729	–	{
1730	–	conf = ptr->data;
1731	–	if (EmptyString(conf->name))
1732	–	continue;
1733	–
1734	–	if (irccmp(conf->name, name) == 0)
1735	–	return (conf);
1736	–	}
1737	–	break;
1738	–
1015		default:
1016		break;
1017		}
#	Line 1752 | Line 1028 | int
1028		rehash(int sig)
1029		{
1030		if (sig != 0)
1031	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1031	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1032		"Got signal SIGHUP, reloading ircd.conf file");
1033
1034		restart_resolver();
#	Line 1769 | Line 1045 | rehash(int sig)
1045
1046		load_conf_modules();
1047
1772	–	flush_deleted_I_P();
1773	–
1048		rehashed_klines = 1;
1775	–	/* XXX */
1776	–	if (ConfigLoggingEntry.use_logging)
1777	–	log_close_all();
1049
1050	<	return(0);
1050	>	return 0;
1051		}
1052
1053		/* set_default_conf()
#	Line 1794 | Line 1065 | set_default_conf(void)
1065		/* verify init_class() ran, this should be an unnecessary check
1066		* but its not much work.
1067		*/
1068	<	assert(class_default == (struct ConfItem *) class_items.tail->data);
1068	>	assert(class_default == class_get_list()->tail->data);
1069
1070		#ifdef HAVE_LIBCRYPTO
1071		ServerInfo.rsa_private_key = NULL;
#	Line 1804 | Line 1075 | set_default_conf(void)
1075		/* ServerInfo.name is not rehashable */
1076		/* ServerInfo.name = ServerInfo.name; */
1077		ServerInfo.description = NULL;
1078	<	DupString(ServerInfo.network_name, NETWORK_NAME_DEFAULT);
1079	<	DupString(ServerInfo.network_desc, NETWORK_DESC_DEFAULT);
1078	>	ServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
1079	>	ServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
1080
1081		memset(&ServerInfo.ip, 0, sizeof(ServerInfo.ip));
1082		ServerInfo.specific_ipv4_vhost = 0;
#	Line 1813 | Line 1084 | set_default_conf(void)
1084		ServerInfo.specific_ipv6_vhost = 0;
1085
1086		ServerInfo.max_clients = MAXCLIENTS_MAX;
1087	+	ServerInfo.max_nick_length = 9;
1088	+	ServerInfo.max_topic_length = 80;
1089
1090		ServerInfo.hub = 0;
1091		ServerInfo.dns_host.sin_addr.s_addr = 0;
#	Line 1821 | Line 1094 | set_default_conf(void)
1094		AdminInfo.email = NULL;
1095		AdminInfo.description = NULL;
1096
1097	<	log_close_all();
1097	>	log_del_all();
1098
1099		ConfigLoggingEntry.use_logging = 1;
1100
1101		ConfigChannel.disable_fake_channels = 0;
1829	–	ConfigChannel.restrict_channels = 0;
1830	–	ConfigChannel.disable_local_channels = 0;
1831	–	ConfigChannel.use_invex = 1;
1832	–	ConfigChannel.use_except = 1;
1833	–	ConfigChannel.use_knock = 1;
1102		ConfigChannel.knock_delay = 300;
1103		ConfigChannel.knock_delay_channel = 60;
1104	<	ConfigChannel.max_chans_per_user = 15;
1105	<	ConfigChannel.quiet_on_ban = 1;
1104	>	ConfigChannel.max_chans_per_user = 25;
1105	>	ConfigChannel.max_chans_per_oper = 50;
1106		ConfigChannel.max_bans = 25;
1107		ConfigChannel.default_split_user_count = 0;
1108		ConfigChannel.default_split_server_count = 0;
1109		ConfigChannel.no_join_on_split = 0;
1110		ConfigChannel.no_create_on_split = 0;
1843	–	ConfigChannel.burst_topicwho = 1;
1111
1112		ConfigServerHide.flatten_links = 0;
1113		ConfigServerHide.links_delay = 300;
1114		ConfigServerHide.hidden = 0;
1848	–	ConfigServerHide.disable_hidden = 0;
1115		ConfigServerHide.hide_servers = 0;
1116	<	DupString(ConfigServerHide.hidden_name, NETWORK_NAME_DEFAULT);
1116	>	ConfigServerHide.hide_services = 0;
1117	>	ConfigServerHide.hidden_name = xstrdup(NETWORK_NAME_DEFAULT);
1118		ConfigServerHide.hide_server_ips = 0;
1119
1120
1121	<	DupString(ConfigFileEntry.service_name, SERVICE_NAME_DEFAULT);
1121	>	ConfigFileEntry.service_name = xstrdup(SERVICE_NAME_DEFAULT);
1122		ConfigFileEntry.max_watch = WATCHSIZE_DEFAULT;
1123	+	ConfigFileEntry.glines = 0;
1124	+	ConfigFileEntry.gline_time = 12 * 3600;
1125	+	ConfigFileEntry.gline_request_time = GLINE_REQUEST_EXPIRE_DEFAULT;
1126		ConfigFileEntry.gline_min_cidr = 16;
1127		ConfigFileEntry.gline_min_cidr6 = 48;
1128		ConfigFileEntry.invisible_on_connect = 1;
1859	–	ConfigFileEntry.burst_away = 0;
1860	–	ConfigFileEntry.use_whois_actually = 1;
1129		ConfigFileEntry.tkline_expire_notices = 1;
1130		ConfigFileEntry.hide_spoof_ips = 1;
1131		ConfigFileEntry.ignore_bogus_ts = 0;
#	Line 1876 | Line 1144 | set_default_conf(void)
1144		ConfigFileEntry.anti_spam_exit_message_time = 0;
1145		ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
1146		ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
1879	–	ConfigFileEntry.kline_with_reason = 1;
1880	–	ConfigFileEntry.kline_reason = NULL;
1147		ConfigFileEntry.warn_no_nline = 1;
1148		ConfigFileEntry.stats_o_oper_only = 0;
1149		ConfigFileEntry.stats_k_oper_only = 1;  /* masked */
#	Line 1892 | Line 1158 | set_default_conf(void)
1158		ConfigFileEntry.no_oper_flood = 0;
1159		ConfigFileEntry.true_no_oper_flood = 0;
1160		ConfigFileEntry.oper_pass_resv = 1;
1895	–	ConfigFileEntry.glines = 0;
1896	–	ConfigFileEntry.gline_time = 12 * 3600;
1161		ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
1898	–	ConfigFileEntry.client_flood = CLIENT_FLOOD_DEFAULT;
1162		ConfigFileEntry.oper_only_umodes = UMODE_DEBUG;
1163		ConfigFileEntry.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE |
1164		UMODE_OPERWALL | UMODE_WALLOP;
#	Line 1914 | Line 1177 | validate_conf(void)
1177		ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
1178
1179		if (ServerInfo.network_name == NULL)
1180	<	DupString(ServerInfo.network_name,NETWORK_NAME_DEFAULT);
1180	>	ServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
1181
1182		if (ServerInfo.network_desc == NULL)
1183	<	DupString(ServerInfo.network_desc,NETWORK_DESC_DEFAULT);
1183	>	ServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
1184
1185		if (ConfigFileEntry.service_name == NULL)
1186	<	DupString(ConfigFileEntry.service_name, SERVICE_NAME_DEFAULT);
1924	<
1925	<	if ((ConfigFileEntry.client_flood < CLIENT_FLOOD_MIN) ||
1926	<	(ConfigFileEntry.client_flood > CLIENT_FLOOD_MAX))
1927	<	ConfigFileEntry.client_flood = CLIENT_FLOOD_MAX;
1186	>	ConfigFileEntry.service_name = xstrdup(SERVICE_NAME_DEFAULT);
1187
1188		ConfigFileEntry.max_watch = IRCD_MAX(ConfigFileEntry.max_watch, WATCHSIZE_MIN);
1189		}
#	Line 1950 | Line 1209 | read_conf(FILE *file)
1209		yyparse();          /* Load the values from the conf */
1210		validate_conf();    /* Check to make sure some values are still okay. */
1211		/* Some global values are also loaded here. */
1212	<	check_class();      /* Make sure classes are valid */
1212	>	class_delete_marked();      /* Make sure classes are valid */
1213		}
1214
1215		/* lookup_confhost()
#	Line 1958 | Line 1217 | read_conf(FILE *file)
1217		* start DNS lookups of all hostnames in the conf
1218		* line and convert an IP addresses in a.b.c.d number for to IP#s.
1219		*/
1220	<	static void
1221	<	lookup_confhost(struct ConfItem *conf)
1220	>	void
1221	>	lookup_confhost(struct MaskItem *conf)
1222		{
1964	–	struct AccessItem *aconf;
1223		struct addrinfo hints, *res;
1224
1967	–	aconf = map_to_conf(conf);
1968	–
1969	–	if (EmptyString(aconf->host) ||
1970	–	EmptyString(aconf->user))
1971	–	{
1972	–	ilog(LOG_TYPE_IRCD, "Host/server name error: (%s) (%s)",
1973	–	aconf->host, conf->name);
1974	–	return;
1975	–	}
1976	–
1977	–	if (strchr(aconf->host, '*') ||
1978	–	strchr(aconf->host, '?'))
1979	–	return;
1980	–
1225		/* Do name lookup now on hostnames given and store the
1226		* ip numbers in conf structure.
1227		*/
#	Line 1989 | Line 1233 | lookup_confhost(struct ConfItem *conf)
1233		/* Get us ready for a bind() and don't bother doing dns lookup */
1234		hints.ai_flags = AI_PASSIVE | AI_NUMERICHOST;
1235
1236	<	if (getaddrinfo(aconf->host, NULL, &hints, &res))
1236	>	if (getaddrinfo(conf->host, NULL, &hints, &res))
1237		{
1238	<	conf_dns_lookup(aconf);
1238	>	conf_dns_lookup(conf);
1239		return;
1240		}
1241
1242		assert(res != NULL);
1243
1244	<	memcpy(&aconf->addr, res->ai_addr, res->ai_addrlen);
1245	<	aconf->addr.ss_len = res->ai_addrlen;
1246	<	aconf->addr.ss.ss_family = res->ai_family;
1244	>	memcpy(&conf->addr, res->ai_addr, res->ai_addrlen);
1245	>	conf->addr.ss_len = res->ai_addrlen;
1246	>	conf->addr.ss.ss_family = res->ai_family;
1247	>
1248		freeaddrinfo(res);
1249		}
1250
#	Line 2014 | Line 1259 | int
1259		conf_connect_allowed(struct irc_ssaddr *addr, int aftype)
1260		{
1261		struct ip_entry *ip_found;
1262	<	struct AccessItem *aconf = find_dline_conf(addr, aftype);
1262	>	struct MaskItem *conf = find_dline_conf(addr, aftype);
1263
1264		/* DLINE exempt also gets you out of static limits/pacing... */
1265	<	if (aconf && (aconf->status & CONF_EXEMPTDLINE))
1265	>	if (conf && (conf->type == CONF_EXEMPT))
1266		return 0;
1267
1268	<	if (aconf != NULL)
1268	>	if (conf != NULL)
1269		return BANNED_CLIENT;
1270
1271		ip_found = find_or_add_ip(addr);
#	Line 2036 | Line 1281 | conf_connect_allowed(struct irc_ssaddr *
1281		return 0;
1282		}
1283
2039	–	static struct AccessItem *
2040	–	find_regexp_kline(const char *uhi[])
2041	–	{
2042	–	#ifdef HAVE_LIBPCRE
2043	–	const dlink_node *ptr = NULL;
2044	–
2045	–	DLINK_FOREACH(ptr, rkconf_items.head)
2046	–	{
2047	–	struct AccessItem *aptr = map_to_conf(ptr->data);
2048	–
2049	–	assert(aptr->regexuser);
2050	–	assert(aptr->regexhost);
2051	–
2052	–	if (!ircd_pcre_exec(aptr->regexuser, uhi[0]) &&
2053	–	(!ircd_pcre_exec(aptr->regexhost, uhi[1]) ||
2054	–	!ircd_pcre_exec(aptr->regexhost, uhi[2])))
2055	–	return aptr;
2056	–	}
2057	–	#endif
2058	–	return NULL;
2059	–	}
2060	–
1284		/* find_kill()
1285		*
1286		* inputs       - pointer to client structure
1287	<	* output       - pointer to struct AccessItem if found
1287	>	* output       - pointer to struct MaskItem if found
1288		* side effects - See if this user is klined already,
1289	<	*                and if so, return struct AccessItem pointer
1289	>	*                and if so, return struct MaskItem pointer
1290		*/
1291	<	struct AccessItem *
1291	>	struct MaskItem *
1292		find_kill(struct Client *client_p)
1293		{
1294	<	struct AccessItem *aconf = NULL;
2072	<	const char *uhi[3];
2073	<
2074	<	uhi[0] = client_p->username;
2075	<	uhi[1] = client_p->host;
2076	<	uhi[2] = client_p->sockhost;
1294	>	struct MaskItem *conf = NULL;
1295
1296		assert(client_p != NULL);
1297
1298	<	aconf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
1299	<	CONF_KLINE, client_p->localClient->aftype,
1300	<	client_p->username, NULL, 1);
1301	<	if (aconf == NULL)
2084	<	aconf = find_regexp_kline(uhi);
2085	<
2086	<	return aconf;
1298	>	conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
1299	>	CONF_KLINE, client_p->localClient->aftype,
1300	>	client_p->username, NULL, 1);
1301	>	return conf;
1302		}
1303
1304	<	struct AccessItem *
1304	>	struct MaskItem *
1305		find_gline(struct Client *client_p)
1306		{
1307	<	struct AccessItem *aconf;
1307	>	struct MaskItem *conf;
1308
1309		assert(client_p != NULL);
1310
1311	<	aconf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
1312	<	CONF_GLINE, client_p->localClient->aftype,
1313	<	client_p->username, NULL, 1);
1314	<	return aconf;
2100	<	}
2101	<
2102	<	/* add_temp_line()
2103	<	*
2104	<	* inputs        - pointer to struct ConfItem
2105	<	* output        - none
2106	<	* Side effects  - links in given struct ConfItem into
2107	<	*                 temporary *line link list
2108	<	*/
2109	<	void
2110	<	add_temp_line(struct ConfItem *conf)
2111	<	{
2112	<	if (conf->type == XLINE_TYPE)
2113	<	{
2114	<	conf->flags |= CONF_FLAGS_TEMPORARY;
2115	<	dlinkAdd(conf, make_dlink_node(), &temporary_xlines);
2116	<	}
2117	<	else if ((conf->type == NRESV_TYPE) || (conf->type == CRESV_TYPE))
2118	<	{
2119	<	conf->flags |= CONF_FLAGS_TEMPORARY;
2120	<	dlinkAdd(conf, make_dlink_node(), &temporary_resv);
2121	<	}
1311	>	conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
1312	>	CONF_GLINE, client_p->localClient->aftype,
1313	>	client_p->username, NULL, 1);
1314	>	return conf;
1315		}
1316
1317		/* cleanup_tklines()
#	Line 2132 | Line 1325 | void
1325		cleanup_tklines(void *notused)
1326		{
1327		hostmask_expire_temporary();
1328	<	expire_tklines(&temporary_xlines);
1329	<	expire_tklines(&temporary_resv);
1328	>	expire_tklines(&xconf_items);
1329	>	expire_tklines(&nresv_items);
1330	>	expire_tklines(&cresv_items);
1331		}
1332
1333		/* expire_tklines()
#	Line 2147 | Line 1341 | expire_tklines(dlink_list *tklist)
1341		{
1342		dlink_node *ptr;
1343		dlink_node *next_ptr;
1344	<	struct ConfItem *conf;
2151	<	struct MatchItem *xconf;
2152	<	struct MatchItem *nconf;
2153	<	struct ResvChannel *cconf;
1344	>	struct MaskItem *conf;
1345
1346		DLINK_FOREACH_SAFE(ptr, next_ptr, tklist->head)
1347		{
1348		conf = ptr->data;
1349
1350	<	if (conf->type == XLINE_TYPE)
1350	>	if (!conf->until || conf->until > CurrentTime)
1351	>	continue;
1352	>
1353	>	if (conf->type == CONF_XLINE)
1354		{
1355	<	xconf = (struct MatchItem *)map_to_conf(conf);
1356	<	if (xconf->hold <= CurrentTime)
1357	<	{
1358	<	if (ConfigFileEntry.tkline_expire_notices)
2165	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2166	<	"Temporary X-line for [%s] sexpired", conf->name);
2167	<	dlinkDelete(ptr, tklist);
2168	<	free_dlink_node(ptr);
2169	<	delete_conf_item(conf);
2170	<	}
1355	>	if (ConfigFileEntry.tkline_expire_notices)
1356	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1357	>	"Temporary X-line for [%s] expired", conf->name);
1358	>	conf_free(conf);
1359		}
1360	<	else if (conf->type == NRESV_TYPE)
1360	>	else if (conf->type == CONF_NRESV || conf->type == CONF_CRESV)
1361		{
1362	<	nconf = (struct MatchItem *)map_to_conf(conf);
1363	<	if (nconf->hold <= CurrentTime)
2176	<	{
2177	<	if (ConfigFileEntry.tkline_expire_notices)
2178	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1362	>	if (ConfigFileEntry.tkline_expire_notices)
1363	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1364		"Temporary RESV for [%s] expired", conf->name);
1365	<	dlinkDelete(ptr, tklist);
2181	<	free_dlink_node(ptr);
2182	<	delete_conf_item(conf);
2183	<	}
2184	<	}
2185	<	else if (conf->type == CRESV_TYPE)
2186	<	{
2187	<	cconf = (struct ResvChannel *)map_to_conf(conf);
2188	<	if (cconf->hold <= CurrentTime)
2189	<	{
2190	<	if (ConfigFileEntry.tkline_expire_notices)
2191	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2192	<	"Temporary RESV for [%s] expired", cconf->name);
2193	<	delete_channel_resv(cconf);
2194	<	}
1365	>	conf_free(conf);
1366		}
1367		}
1368		}
#	Line 2204 | Line 1375 | expire_tklines(dlink_list *tklist)
1375		*/
1376		static const struct oper_privs
1377		{
1378	<	const unsigned int oprivs;
1378	>	const unsigned int flag;
1379		const unsigned char c;
1380		} flag_list[] = {
1381	<	{ OPER_FLAG_ADMIN,       'A' },
1382	<	{ OPER_FLAG_REMOTEBAN,   'B' },
1383	<	{ OPER_FLAG_DIE,         'D' },
1384	<	{ OPER_FLAG_GLINE,       'G' },
1385	<	{ OPER_FLAG_REHASH,      'H' },
1386	<	{ OPER_FLAG_K,           'K' },
1387	<	{ OPER_FLAG_OPERWALL,    'L' },
1388	<	{ OPER_FLAG_N,           'N' },
1389	<	{ OPER_FLAG_GLOBAL_KILL, 'O' },
1390	<	{ OPER_FLAG_REMOTE,      'R' },
1391	<	{ OPER_FLAG_OPER_SPY,    'S' },
1392	<	{ OPER_FLAG_UNKLINE,     'U' },
1393	<	{ OPER_FLAG_X,           'X' },
1381	>	{ OPER_FLAG_ADMIN,          'A' },
1382	>	{ OPER_FLAG_REMOTEBAN,      'B' },
1383	>	{ OPER_FLAG_DIE,            'D' },
1384	>	{ OPER_FLAG_GLINE,          'G' },
1385	>	{ OPER_FLAG_REHASH,         'H' },
1386	>	{ OPER_FLAG_K,              'K' },
1387	>	{ OPER_FLAG_OPERWALL,       'L' },
1388	>	{ OPER_FLAG_KILL,           'N' },
1389	>	{ OPER_FLAG_KILL_REMOTE,    'O' },
1390	>	{ OPER_FLAG_CONNECT,        'P' },
1391	>	{ OPER_FLAG_CONNECT_REMOTE, 'Q' },
1392	>	{ OPER_FLAG_SQUIT,          'R' },
1393	>	{ OPER_FLAG_SQUIT_REMOTE,   'S' },
1394	>	{ OPER_FLAG_UNKLINE,        'U' },
1395	>	{ OPER_FLAG_X,              'X' },
1396		{ 0, '\0' }
1397		};
1398
#	Line 2228 | Line 1401 | oper_privs_as_string(const unsigned int
1401		{
1402		static char privs_out[16];
1403		char *privs_ptr = privs_out;
1404	<	unsigned int i = 0;
1404	>	const struct oper_privs *opriv = flag_list;
1405
1406	<	for (; flag_list[i].oprivs; ++i)
1406	>	for (; opriv->flag; ++opriv)
1407		{
1408	<	if (port & flag_list[i].oprivs)
1409	<	*privs_ptr++ = flag_list[i].c;
1408	>	if (port & opriv->flag)
1409	>	*privs_ptr++ = opriv->c;
1410		else
1411	<	*privs_ptr++ = ToLowerTab[flag_list[i].c];
1411	>	*privs_ptr++ = ToLower(opriv->c);
1412		}
1413
1414		*privs_ptr = '\0';
#	Line 2260 | Line 1433 | get_oper_name(const struct Client *clien
1433		{
1434		if ((cnode = client_p->localClient->confs.head))
1435		{
1436	<	struct ConfItem *conf = cnode->data;
2264	<	const struct AccessItem *aconf = map_to_conf(conf);
1436	>	struct MaskItem *conf = cnode->data;
1437
1438	<	if (IsConfOperator(aconf))
1438	>	if (IsConfOperator(conf))
1439		{
1440		snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1441		client_p->username, client_p->host, conf->name);
#	Line 2296 | Line 1468 | read_conf_files(int cold)
1468		char chanlimit[32];
1469
1470		conf_parser_ctx.boot = cold;
1471	<	filename = get_conf_name(CONF_TYPE);
1471	>	filename = ConfigFileEntry.configfile;
1472
1473		/* We need to know the initial filename for the yyerror() to report
1474		FIXME: The full path is in conffilenamebuf first time since we
#	Line 2316 | Line 1488 | read_conf_files(int cold)
1488		}
1489		else
1490		{
1491	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1491	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1492		"Unable to read configuration file '%s': %s",
1493		filename, strerror(errno));
1494		return;
#	Line 2329 | Line 1501 | read_conf_files(int cold)
1501		read_conf(conf_parser_ctx.conf_file);
1502		fclose(conf_parser_ctx.conf_file);
1503
1504	+	log_reopen_all();
1505	+
1506	+	add_isupport("NICKLEN", NULL, ServerInfo.max_nick_length);
1507		add_isupport("NETWORK", ServerInfo.network_name, -1);
1508	<	snprintf(chanmodes, sizeof(chanmodes), "b%s%s:%d",
1509	<	ConfigChannel.use_except ? "e" : "",
2335	<	ConfigChannel.use_invex ? "I" : "", ConfigChannel.max_bans);
1508	>
1509	>	snprintf(chanmodes, sizeof(chanmodes), "beI:%d", ConfigChannel.max_bans);
1510		add_isupport("MAXLIST", chanmodes, -1);
1511		add_isupport("MAXTARGETS", NULL, ConfigFileEntry.max_targets);
1512	+	add_isupport("CHANTYPES", "#", -1);
1513
1514	<	if (ConfigChannel.disable_local_channels)
1515	<	add_isupport("CHANTYPES", "#", -1);
2341	<	else
2342	<	add_isupport("CHANTYPES", "#&", -1);
2343	<
2344	<	snprintf(chanlimit, sizeof(chanlimit), "%s:%d",
2345	<	ConfigChannel.disable_local_channels ? "#" : "#&",
2346	<	ConfigChannel.max_chans_per_user);
1514	>	snprintf(chanlimit, sizeof(chanlimit), "#:%d",
1515	>	ConfigChannel.max_chans_per_user);
1516		add_isupport("CHANLIMIT", chanlimit, -1);
1517	<	snprintf(chanmodes, sizeof(chanmodes), "%s%s%s",
2349	<	ConfigChannel.use_except ? "e" : "",
2350	<	ConfigChannel.use_invex ? "I" : "", "b,k,l,imnprstORS");
1517	>	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,imnprstORS");
1518		add_isupport("CHANNELLEN", NULL, LOCAL_CHANNELLEN);
1519	<
2353	<	if (ConfigChannel.use_except)
2354	<	add_isupport("EXCEPTS", "e", -1);
2355	<	if (ConfigChannel.use_invex)
2356	<	add_isupport("INVEX", "I", -1);
1519	>	add_isupport("TOPICLEN", NULL, ServerInfo.max_topic_length);
1520		add_isupport("CHANMODES", chanmodes, -1);
1521
1522		/*
#	Line 2361 | Line 1524 | read_conf_files(int cold)
1524		* on strlen(form_str(RPL_ISUPPORT))
1525		*/
1526		rebuild_isupport_message_line();
2364	–
2365	–	#ifdef HAVE_LIBPCRE
2366	–	parse_conf_file(RKLINE_TYPE, cold);
2367	–	parse_conf_file(RXLINE_TYPE, cold);
2368	–	#endif
2369	–	parse_conf_file(KLINE_TYPE, cold);
2370	–	parse_conf_file(DLINE_TYPE, cold);
2371	–	parse_conf_file(XLINE_TYPE, cold);
2372	–	parse_conf_file(NRESV_TYPE, cold);
2373	–	parse_conf_file(CRESV_TYPE, cold);
2374	–	}
2375	–
2376	–	/* parse_conf_file()
2377	–	*
2378	–	* inputs       - type of conf file to parse
2379	–	* output       - none
2380	–	* side effects - conf file for givenconf type is opened and read then parsed
2381	–	*/
2382	–	static void
2383	–	parse_conf_file(int type, int cold)
2384	–	{
2385	–	FILE *file = NULL;
2386	–	const char *filename = get_conf_name(type);
2387	–
2388	–	if ((file = fopen(filename, "r")) == NULL)
2389	–	{
2390	–	if (cold)
2391	–	ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
2392	–	filename, strerror(errno));
2393	–	else
2394	–	sendto_realops_flags(UMODE_ALL, L_ALL,
2395	–	"Unable to read configuration file '%s': %s",
2396	–	filename, strerror(errno));
2397	–	}
2398	–	else
2399	–	{
2400	–	parse_csv_file(file, type);
2401	–	fclose(file);
2402	–	}
1527		}
1528
1529		/* clear_out_old_conf()
#	Line 2412 | Line 1536 | static void
1536		clear_out_old_conf(void)
1537		{
1538		dlink_node *ptr = NULL, *next_ptr = NULL;
1539	<	struct ConfItem *conf;
2416	<	struct AccessItem *aconf;
2417	<	struct ClassItem *cltmp;
2418	<	struct MatchItem *match_item;
1539	>	struct MaskItem *conf;
1540		dlink_list *free_items [] = {
1541		&server_items,   &oconf_items,
1542	<	&uconf_items,   &xconf_items, &rxconf_items, &rkconf_items,
1543	<	&nresv_items, &cluster_items,  &gdeny_items, &service_items, NULL
1542	>	&uconf_items,   &xconf_items,
1543	>	&nresv_items, &cluster_items,  &service_items, &cresv_items, NULL
1544		};
1545
1546		dlink_list ** iterator = free_items; /* C is dumb */
#	Line 2433 | Line 1554 | clear_out_old_conf(void)
1554		DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
1555		{
1556		conf = ptr->data;
2436	–	/* XXX This is less than pretty */
2437	–	if (conf->type == SERVER_TYPE)
2438	–	{
2439	–	aconf = map_to_conf(conf);
1557
1558	<	if (aconf->clients != 0)
2442	<	{
2443	<	SetConfIllegal(aconf);
2444	<	dlinkDelete(&conf->node, &server_items);
2445	<	}
2446	<	else
2447	<	{
2448	<	delete_conf_item(conf);
2449	<	}
2450	<	}
2451	<	else if (conf->type == OPER_TYPE)
2452	<	{
2453	<	aconf = map_to_conf(conf);
1558	>	dlinkDelete(&conf->node, map_to_list(conf->type));
1559
1560	<	if (aconf->clients != 0)
1561	<	{
2457	<	SetConfIllegal(aconf);
2458	<	dlinkDelete(&conf->node, &oconf_items);
2459	<	}
2460	<	else
2461	<	{
2462	<	delete_conf_item(conf);
2463	<	}
2464	<	}
2465	<	else if (conf->type == XLINE_TYPE  ||
2466	<	conf->type == RXLINE_TYPE ||
2467	<	conf->type == RKLINE_TYPE)
1560	>	/* XXX This is less than pretty */
1561	>	if (conf->type == CONF_SERVER || conf->type == CONF_OPER)
1562		{
1563	<	/* temporary (r)xlines are also on
1564	<	* the (r)xconf items list */
2471	<	if (conf->flags & CONF_FLAGS_TEMPORARY)
2472	<	continue;
2473	<
2474	<	delete_conf_item(conf);
1563	>	if (!conf->ref_count)
1564	>	conf_free(conf);
1565		}
1566	<	else
1566	>	else if (conf->type == CONF_XLINE)
1567		{
1568	<	delete_conf_item(conf);
1568	>	if (!conf->until)
1569	>	conf_free(conf);
1570		}
1571	+	else
1572	+	conf_free(conf);
1573		}
1574		}
1575
1576	+	motd_clear();
1577	+
1578		/*
1579		* don't delete the class table, rather mark all entries
1580	<	* for deletion. The table is cleaned up by check_class. - avalon
1580	>	* for deletion. The table is cleaned up by class_delete_marked. - avalon
1581		*/
1582	<	DLINK_FOREACH(ptr, class_items.head)
2488	<	{
2489	<	cltmp = map_to_conf(ptr->data);
2490	<
2491	<	if (ptr != class_items.tail)  /* never mark the "default" class */
2492	<	cltmp->active = 0;
2493	<	}
1582	>	class_mark_for_deletion();
1583
1584		clear_out_address_conf();
1585
#	Line 2526 | Line 1615 | clear_out_old_conf(void)
1615		SSL_OP_NO_TLSv1);
1616		#endif
1617
2529	–	/* clean out old resvs from the conf */
2530	–	clear_conf_resv();
2531	–
1618		/* clean out AdminInfo */
1619		MyFree(AdminInfo.name);
1620		AdminInfo.name = NULL;
#	Line 2537 | Line 1623 | clear_out_old_conf(void)
1623		MyFree(AdminInfo.description);
1624		AdminInfo.description = NULL;
1625
2540	–	/* operator{} and class{} blocks are freed above */
1626		/* clean out listeners */
1627		close_listeners();
1628
2544	–	/* auth{}, quarantine{}, shared{}, connect{}, kill{}, deny{},
2545	–	* exempt{} and gecos{} blocks are freed above too
2546	–	*/
2547	–
1629		/* clean out general */
1630		MyFree(ConfigFileEntry.service_name);
1631		ConfigFileEntry.service_name = NULL;
2551	–
2552	–	delete_isupport("INVEX");
2553	–	delete_isupport("EXCEPTS");
2554	–	}
2555	–
2556	–	/* flush_deleted_I_P()
2557	–	*
2558	–	* inputs       - none
2559	–	* output       - none
2560	–	* side effects - This function removes I/P conf items
2561	–	*/
2562	–	static void
2563	–	flush_deleted_I_P(void)
2564	–	{
2565	–	dlink_node *ptr;
2566	–	dlink_node *next_ptr;
2567	–	struct ConfItem *conf;
2568	–	struct AccessItem *aconf;
2569	–	dlink_list * free_items [] = {
2570	–	&server_items, &oconf_items, NULL
2571	–	};
2572	–	dlink_list ** iterator = free_items; /* C is dumb */
2573	–
2574	–	/* flush out deleted I and P lines
2575	–	* although still in use.
2576	–	*/
2577	–	for (; *iterator != NULL; iterator++)
2578	–	{
2579	–	DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
2580	–	{
2581	–	conf = ptr->data;
2582	–	aconf = (struct AccessItem *)map_to_conf(conf);
2583	–
2584	–	if (IsConfIllegal(aconf))
2585	–	{
2586	–	dlinkDelete(ptr, *iterator);
2587	–
2588	–	if (aconf->clients == 0)
2589	–	delete_conf_item(conf);
2590	–	}
2591	–	}
2592	–	}
2593	–	}
2594	–
2595	–	/* get_conf_name()
2596	–	*
2597	–	* inputs       - type of conf file to return name of file for
2598	–	* output       - pointer to filename for type of conf
2599	–	* side effects - none
2600	–	*/
2601	–	const char *
2602	–	get_conf_name(ConfType type)
2603	–	{
2604	–	switch (type)
2605	–	{
2606	–	case CONF_TYPE:
2607	–	return ConfigFileEntry.configfile;
2608	–	break;
2609	–	case KLINE_TYPE:
2610	–	return ConfigFileEntry.klinefile;
2611	–	break;
2612	–	case RKLINE_TYPE:
2613	–	return ConfigFileEntry.rklinefile;
2614	–	break;
2615	–	case DLINE_TYPE:
2616	–	return ConfigFileEntry.dlinefile;
2617	–	break;
2618	–	case XLINE_TYPE:
2619	–	return ConfigFileEntry.xlinefile;
2620	–	break;
2621	–	case RXLINE_TYPE:
2622	–	return ConfigFileEntry.rxlinefile;
2623	–	break;
2624	–	case CRESV_TYPE:
2625	–	return ConfigFileEntry.cresvfile;
2626	–	break;
2627	–	case NRESV_TYPE:
2628	–	return ConfigFileEntry.nresvfile;
2629	–	break;
2630	–	case GLINE_TYPE:
2631	–	return ConfigFileEntry.glinefile;
2632	–	break;
2633	–
2634	–	default:
2635	–	return NULL;  /* This should NEVER HAPPEN since we call this function
2636	–	only with the above values, this will cause us to core
2637	–	at some point if this happens so we know where it was */
2638	–	}
2639	–	}
2640	–
2641	–	#define BAD_PING (-1)
2642	–
2643	–	/* get_conf_ping()
2644	–	*
2645	–	* inputs       - pointer to struct AccessItem
2646	–	*              - pointer to a variable that receives ping warning time
2647	–	* output       - ping frequency
2648	–	* side effects - NONE
2649	–	*/
2650	–	static int
2651	–	get_conf_ping(struct ConfItem *conf, int *pingwarn)
2652	–	{
2653	–	struct ClassItem *aclass;
2654	–	struct AccessItem *aconf;
2655	–
2656	–	if (conf != NULL)
2657	–	{
2658	–	aconf = (struct AccessItem *)map_to_conf(conf);
2659	–	if (aconf->class_ptr != NULL)
2660	–	{
2661	–	aclass = (struct ClassItem *)map_to_conf(aconf->class_ptr);
2662	–	*pingwarn = aclass->ping_warning;
2663	–	return aclass->ping_freq;
2664	–	}
2665	–	}
2666	–
2667	–	return BAD_PING;
2668	–	}
2669	–
2670	–	/* get_client_class()
2671	–	*
2672	–	* inputs       - pointer to client struct
2673	–	* output       - pointer to name of class
2674	–	* side effects - NONE
2675	–	*/
2676	–	const char *
2677	–	get_client_class(struct Client *target_p)
2678	–	{
2679	–	dlink_node *cnode = NULL;
2680	–	struct AccessItem *aconf = NULL;
2681	–
2682	–	assert(!IsMe(target_p));
2683	–
2684	–	if ((cnode = target_p->localClient->confs.head))
2685	–	{
2686	–	struct ConfItem *conf = cnode->data;
2687	–
2688	–	assert((conf->type == CLIENT_TYPE) || (conf->type == SERVER_TYPE) ||
2689	–	(conf->type == OPER_TYPE));
2690	–
2691	–	aconf = map_to_conf(conf);
2692	–	if (aconf->class_ptr != NULL)
2693	–	return aconf->class_ptr->name;
2694	–	}
2695	–
2696	–	return "default";
2697	–	}
2698	–
2699	–	/* get_client_ping()
2700	–	*
2701	–	* inputs       - pointer to client struct
2702	–	*              - pointer to a variable that receives ping warning time
2703	–	* output       - ping frequency
2704	–	* side effects - NONE
2705	–	*/
2706	–	int
2707	–	get_client_ping(struct Client *target_p, int *pingwarn)
2708	–	{
2709	–	int ping = 0;
2710	–	dlink_node *cnode = NULL;
2711	–
2712	–	if ((cnode = target_p->localClient->confs.head))
2713	–	{
2714	–	struct ConfItem *conf = cnode->data;
2715	–
2716	–	assert((conf->type == CLIENT_TYPE) || (conf->type == SERVER_TYPE) ||
2717	–	(conf->type == OPER_TYPE));
2718	–
2719	–	ping = get_conf_ping(conf, pingwarn);
2720	–	if (ping > 0)
2721	–	return ping;
2722	–	}
2723	–
2724	–	*pingwarn = 0;
2725	–	return DEFAULT_PINGFREQUENCY;
2726	–	}
2727	–
2728	–	/* find_class()
2729	–	*
2730	–	* inputs       - string name of class
2731	–	* output       - corresponding Class pointer
2732	–	* side effects - NONE
2733	–	*/
2734	–	struct ConfItem *
2735	–	find_class(const char *classname)
2736	–	{
2737	–	struct ConfItem *conf;
2738	–
2739	–	if ((conf = find_exact_name_conf(CLASS_TYPE, NULL, classname, NULL, NULL)) != NULL)
2740	–	return conf;
2741	–
2742	–	return class_default;
2743	–	}
2744	–
2745	–	/* check_class()
2746	–	*
2747	–	* inputs       - NONE
2748	–	* output       - NONE
2749	–	* side effects -
2750	–	*/
2751	–	void
2752	–	check_class(void)
2753	–	{
2754	–	dlink_node *ptr = NULL, *next_ptr = NULL;
2755	–
2756	–	DLINK_FOREACH_SAFE(ptr, next_ptr, class_items.head)
2757	–	{
2758	–	struct ClassItem *aclass = map_to_conf(ptr->data);
2759	–
2760	–	if (!aclass->active && !aclass->curr_user_count)
2761	–	{
2762	–	destroy_cidr_class(aclass);
2763	–	delete_conf_item(ptr->data);
2764	–	}
2765	–	}
2766	–	}
2767	–
2768	–	/* init_class()
2769	–	*
2770	–	* inputs       - NONE
2771	–	* output       - NONE
2772	–	* side effects -
2773	–	*/
2774	–	void
2775	–	init_class(void)
2776	–	{
2777	–	struct ClassItem *aclass;
2778	–
2779	–	class_default = make_conf_item(CLASS_TYPE);
2780	–
2781	–	aclass = map_to_conf(class_default);
2782	–	aclass->active = 1;
2783	–	DupString(class_default->name, "default");
2784	–	aclass->con_freq  = DEFAULT_CONNECTFREQUENCY;
2785	–	aclass->ping_freq = DEFAULT_PINGFREQUENCY;
2786	–	aclass->max_total = MAXIMUM_LINKS_DEFAULT;
2787	–	aclass->max_sendq = DEFAULT_SENDQ;
2788	–
2789	–	client_check_cb = register_callback("check_client", check_client);
2790	–	}
2791	–
2792	–	/* get_sendq()
2793	–	*
2794	–	* inputs       - pointer to client
2795	–	* output       - sendq for this client as found from its class
2796	–	* side effects - NONE
2797	–	*/
2798	–	unsigned int
2799	–	get_sendq(struct Client *client_p)
2800	–	{
2801	–	unsigned int sendq = DEFAULT_SENDQ;
2802	–	dlink_node *cnode;
2803	–	struct ConfItem *class_conf;
2804	–	struct ClassItem *aclass;
2805	–	struct AccessItem *aconf;
2806	–
2807	–	assert(!IsMe(client_p));
2808	–
2809	–	if ((cnode = client_p->localClient->confs.head))
2810	–	{
2811	–	struct ConfItem *conf = cnode->data;
2812	–
2813	–	assert((conf->type == CLIENT_TYPE) || (conf->type == SERVER_TYPE) ||
2814	–	(conf->type == OPER_TYPE));
2815	–
2816	–	aconf = map_to_conf(conf);
2817	–
2818	–	if ((class_conf = aconf->class_ptr) == NULL)
2819	–	return DEFAULT_SENDQ; /* TBV: shouldn't be possible at all */
2820	–
2821	–	aclass = map_to_conf(class_conf);
2822	–	sendq = aclass->max_sendq;
2823	–	return sendq;
2824	–	}
2825	–
2826	–	/* XXX return a default?
2827	–	* if here, then there wasn't an attached conf with a sendq
2828	–	* that is very bad -Dianora
2829	–	*/
2830	–	return DEFAULT_SENDQ;
1632		}
1633
1634		/* conf_add_class_to_conf()
#	Line 2837 | Line 1638 | get_sendq(struct Client *client_p)
1638		* side effects - Add a class pointer to a conf
1639		*/
1640		void
1641	<	conf_add_class_to_conf(struct ConfItem *conf, const char *class_name)
1641	>	conf_add_class_to_conf(struct MaskItem *conf, const char *class_name)
1642		{
2842	–	struct AccessItem *aconf = map_to_conf(conf);
2843	–	struct ClassItem *class = NULL;
2844	–
1643		if (class_name == NULL)
1644		{
1645	<	aconf->class_ptr = class_default;
1645	>	conf->class = class_default;
1646
1647	<	if (conf->type == CLIENT_TYPE)
1648	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1647	>	if (conf->type == CONF_CLIENT)
1648	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1649		"Warning *** Defaulting to default class for %s@%s",
1650	<	aconf->user, aconf->host);
1650	>	conf->user, conf->host);
1651		else
1652	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1652	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1653		"Warning *** Defaulting to default class for %s",
1654		conf->name);
1655		}
1656		else
1657	<	aconf->class_ptr = find_class(class_name);
2860	<
2861	<	if (aconf->class_ptr)
2862	<	class = map_to_conf(aconf->class_ptr);
1657	>	conf->class = class_find(class_name, 1);
1658
1659	<	if (aconf->class_ptr == NULL || !class->active)
1659	>	if (conf->class == NULL)
1660		{
1661	<	if (conf->type == CLIENT_TYPE)
1662	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1661	>	if (conf->type == CONF_CLIENT)
1662	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1663		"Warning *** Defaulting to default class for %s@%s",
1664	<	aconf->user, aconf->host);
1664	>	conf->user, conf->host);
1665		else
1666	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1666	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1667		"Warning *** Defaulting to default class for %s",
1668		conf->name);
1669	<	aconf->class_ptr = class_default;
2875	<	}
2876	<	}
2877	<
2878	<	/* conf_add_server()
2879	<	*
2880	<	* inputs       - pointer to config item
2881	<	*              - pointer to link count already on this conf
2882	<	* output       - NONE
2883	<	* side effects - Add a connect block
2884	<	*/
2885	<	int
2886	<	conf_add_server(struct ConfItem *conf, const char *class_name)
2887	<	{
2888	<	struct AccessItem *aconf = map_to_conf(conf);
2889	<
2890	<	conf_add_class_to_conf(conf, class_name);
2891	<
2892	<	if (!aconf->host || !conf->name)
2893	<	{
2894	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Bad connect block");
2895	<	ilog(LOG_TYPE_IRCD, "Bad connect block");
2896	<	return -1;
2897	<	}
2898	<
2899	<	if (EmptyString(aconf->passwd))
2900	<	{
2901	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Bad connect block, name %s",
2902	<	conf->name);
2903	<	ilog(LOG_TYPE_IRCD, "Bad connect block, host %s", conf->name);
2904	<	return -1;
1669	>	conf->class = class_default;
1670		}
2906	–
2907	–	lookup_confhost(conf);
2908	–
2909	–	return 0;
1671		}
1672
1673		/* yyerror()
#	Line 2924 | Line 1685 | yyerror(const char *msg)
1685		return;
1686
1687		strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1688	<	sendto_realops_flags(UMODE_ALL, L_ALL, "\"%s\", line %u: %s: %s",
1688	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1689	>	"\"%s\", line %u: %s: %s",
1690	>	conffilebuf, lineno + 1, msg, newlinebuf);
1691	>	ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1692	>	conffilebuf, lineno + 1, msg, newlinebuf);
1693	>	}
1694	>
1695	>	void
1696	>	conf_error_report(const char *msg)
1697	>	{
1698	>	char newlinebuf[IRCD_BUFSIZE];
1699	>
1700	>	strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1701	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1702	>	"\"%s\", line %u: %s: %s",
1703		conffilebuf, lineno + 1, msg, newlinebuf);
1704		ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1705		conffilebuf, lineno + 1, msg, newlinebuf);
#	Line 2977 | Line 1752 | valid_tkline(const char *p, int minutes)
1752		return result;
1753		}
1754
1755	+	/* valid_wild_card_simple()
1756	+	*
1757	+	* inputs       - data to check for sufficient non-wildcard characters
1758	+	* outputs      - 1 if valid, else 0
1759	+	* side effects - none
1760	+	*/
1761	+	int
1762	+	valid_wild_card_simple(const char *data)
1763	+	{
1764	+	const unsigned char *p = (const unsigned char *)data;
1765	+	unsigned char tmpch = '\0';
1766	+	int nonwild = 0;
1767	+
1768	+	while ((tmpch = *p++))
1769	+	{
1770	+	if (tmpch == '\\')
1771	+	{
1772	+	++p;
1773	+	if (++nonwild >= ConfigFileEntry.min_nonwildcard_simple)
1774	+	return 1;
1775	+	}
1776	+	else if (!IsMWildChar(tmpch))
1777	+	{
1778	+	if (++nonwild >= ConfigFileEntry.min_nonwildcard_simple)
1779	+	return 1;
1780	+	}
1781	+	}
1782	+
1783	+	return 0;
1784	+	}
1785	+
1786		/* valid_wild_card()
1787		*
1788		* input        - pointer to client
#	Line 2988 | Line 1794 | valid_tkline(const char *p, int minutes)
1794		int
1795		valid_wild_card(struct Client *source_p, int warn, int count, ...)
1796		{
2991	–	char *p;
1797		char tmpch;
1798		int nonwild = 0;
1799		va_list args;
#	Line 3009 | Line 1814 | valid_wild_card(struct Client *source_p,
1814
1815		while (count--)
1816		{
1817	<	p = va_arg(args, char *);
1817	>	const char *p = va_arg(args, const char *);
1818		if (p == NULL)
1819		continue;
1820
#	Line 3235 | Line 2040 | find_user_host(struct Client *source_p,
2040
2041		return 1;
2042		}
2043	<	else if (!(flags & NOUSERLOOKUP))
2043	>	else
2044		{
2045		/* Try to find user@host mask from nick */
2046		/* Okay to use source_p as the first param, because source_p == client_p */
#	Line 3283 | Line 2088 | find_user_host(struct Client *source_p,
2088		int
2089		valid_comment(struct Client *source_p, char *comment, int warn)
2090		{
3286	–	if (strchr(comment, '"'))
3287	–	{
3288	–	if (warn)
3289	–	sendto_one(source_p, ":%s NOTICE %s :Invalid character '\"' in comment",
3290	–	me.name, source_p->name);
3291	–	return 0;
3292	–	}
3293	–
2091		if (strlen(comment) > REASONLEN)
2092		comment[REASONLEN-1] = '\0';
2093
#	Line 3305 | Line 2102 | valid_comment(struct Client *source_p, c
2102		* side effects - none
2103		*/
2104		int
2105	<	match_conf_password(const char *password, const struct AccessItem *aconf)
2105	>	match_conf_password(const char *password, const struct MaskItem *conf)
2106		{
2107		const char *encr = NULL;
2108
2109	<	if (EmptyString(password) || EmptyString(aconf->passwd))
2109	>	if (EmptyString(password) || EmptyString(conf->passwd))
2110		return 0;
2111
2112	<	if (aconf->flags & CONF_FLAGS_ENCRYPTED)
2113	<	encr = crypt(password, aconf->passwd);
2112	>	if (conf->flags & CONF_FLAGS_ENCRYPTED)
2113	>	encr = crypt(password, conf->passwd);
2114		else
2115		encr = password;
2116
2117	<	return !strcmp(encr, aconf->passwd);
2117	>	return !strcmp(encr, conf->passwd);
2118		}
2119
2120		/*
#	Line 3346 | Line 2143 | cluster_a_line(struct Client *source_p,
2143
2144		DLINK_FOREACH(ptr, cluster_items.head)
2145		{
2146	<	const struct ConfItem *conf = ptr->data;
2146	>	const struct MaskItem *conf = ptr->data;
2147
2148		if (conf->flags & cluster_type)
2149		sendto_match_servs(source_p, conf->name, CAP_CLUSTER|capab,
#	Line 3440 | Line 2237 | split_nuh(struct split_nuh_item *const i
2237		}
2238		}
2239		}
3443	–
3444	–	/*
3445	–	* flags_to_ascii
3446	–	*
3447	–	* inputs       - flags is a bitmask
3448	–	*              - pointer to table of ascii letters corresponding
3449	–	*                to each bit
3450	–	*              - flag 1 for convert ToLower if bit missing
3451	–	*                0 if ignore.
3452	–	* output       - none
3453	–	* side effects - string pointed to by p has bitmap chars written to it
3454	–	*/
3455	–	static void
3456	–	flags_to_ascii(unsigned int flags, const unsigned int bit_table[], char *p,
3457	–	int lowerit)
3458	–	{
3459	–	unsigned int mask = 1;
3460	–	int i = 0;
3461	–
3462	–	for (mask = 1; (mask != 0) && (bit_table[i] != 0); mask <<= 1, i++)
3463	–	{
3464	–	if (flags & mask)
3465	–	*p++ = bit_table[i];
3466	–	else if (lowerit)
3467	–	*p++ = ToLower(bit_table[i]);
3468	–	}
3469	–	*p = '\0';
3470	–	}
3471	–
3472	–	/*
3473	–	* cidr_limit_reached
3474	–	*
3475	–	* inputs       - int flag allowing over_rule of limits
3476	–	*              - pointer to the ip to be added
3477	–	*              - pointer to the class
3478	–	* output       - non zero if limit reached
3479	–	*                0 if limit not reached
3480	–	* side effects -
3481	–	*/
3482	–	static int
3483	–	cidr_limit_reached(int over_rule,
3484	–	struct irc_ssaddr *ip, struct ClassItem *aclass)
3485	–	{
3486	–	dlink_node *ptr = NULL;
3487	–	struct CidrItem *cidr;
3488	–
3489	–	if (aclass->number_per_cidr <= 0)
3490	–	return 0;
3491	–
3492	–	if (ip->ss.ss_family == AF_INET)
3493	–	{
3494	–	if (aclass->cidr_bitlen_ipv4 <= 0)
3495	–	return 0;
3496	–
3497	–	DLINK_FOREACH(ptr, aclass->list_ipv4.head)
3498	–	{
3499	–	cidr = ptr->data;
3500	–	if (match_ipv4(ip, &cidr->mask, aclass->cidr_bitlen_ipv4))
3501	–	{
3502	–	if (!over_rule && (cidr->number_on_this_cidr >= aclass->number_per_cidr))
3503	–	return -1;
3504	–	cidr->number_on_this_cidr++;
3505	–	return 0;
3506	–	}
3507	–	}
3508	–	cidr = MyMalloc(sizeof(struct CidrItem));
3509	–	cidr->number_on_this_cidr = 1;
3510	–	cidr->mask = *ip;
3511	–	mask_addr(&cidr->mask, aclass->cidr_bitlen_ipv4);
3512	–	dlinkAdd(cidr, &cidr->node, &aclass->list_ipv4);
3513	–	}
3514	–	#ifdef IPV6
3515	–	else if (aclass->cidr_bitlen_ipv6 > 0)
3516	–	{
3517	–	DLINK_FOREACH(ptr, aclass->list_ipv6.head)
3518	–	{
3519	–	cidr = ptr->data;
3520	–	if (match_ipv6(ip, &cidr->mask, aclass->cidr_bitlen_ipv6))
3521	–	{
3522	–	if (!over_rule && (cidr->number_on_this_cidr >= aclass->number_per_cidr))
3523	–	return -1;
3524	–	cidr->number_on_this_cidr++;
3525	–	return 0;
3526	–	}
3527	–	}
3528	–	cidr = MyMalloc(sizeof(struct CidrItem));
3529	–	cidr->number_on_this_cidr = 1;
3530	–	cidr->mask = *ip;
3531	–	mask_addr(&cidr->mask, aclass->cidr_bitlen_ipv6);
3532	–	dlinkAdd(cidr, &cidr->node, &aclass->list_ipv6);
3533	–	}
3534	–	#endif
3535	–	return 0;
3536	–	}
3537	–
3538	–	/*
3539	–	* remove_from_cidr_check
3540	–	*
3541	–	* inputs       - pointer to the ip to be removed
3542	–	*              - pointer to the class
3543	–	* output       - NONE
3544	–	* side effects -
3545	–	*/
3546	–	static void
3547	–	remove_from_cidr_check(struct irc_ssaddr *ip, struct ClassItem *aclass)
3548	–	{
3549	–	dlink_node *ptr = NULL;
3550	–	dlink_node *next_ptr = NULL;
3551	–	struct CidrItem *cidr;
3552	–
3553	–	if (aclass->number_per_cidr == 0)
3554	–	return;
3555	–
3556	–	if (ip->ss.ss_family == AF_INET)
3557	–	{
3558	–	if (aclass->cidr_bitlen_ipv4 <= 0)
3559	–	return;
3560	–
3561	–	DLINK_FOREACH_SAFE(ptr, next_ptr, aclass->list_ipv4.head)
3562	–	{
3563	–	cidr = ptr->data;
3564	–	if (match_ipv4(ip, &cidr->mask, aclass->cidr_bitlen_ipv4))
3565	–	{
3566	–	cidr->number_on_this_cidr--;
3567	–	if (cidr->number_on_this_cidr == 0)
3568	–	{
3569	–	dlinkDelete(ptr, &aclass->list_ipv4);
3570	–	MyFree(cidr);
3571	–	return;
3572	–	}
3573	–	}
3574	–	}
3575	–	}
3576	–	#ifdef IPV6
3577	–	else if (aclass->cidr_bitlen_ipv6 > 0)
3578	–	{
3579	–	DLINK_FOREACH_SAFE(ptr, next_ptr, aclass->list_ipv6.head)
3580	–	{
3581	–	cidr = ptr->data;
3582	–	if (match_ipv6(ip, &cidr->mask, aclass->cidr_bitlen_ipv6))
3583	–	{
3584	–	cidr->number_on_this_cidr--;
3585	–	if (cidr->number_on_this_cidr == 0)
3586	–	{
3587	–	dlinkDelete(ptr, &aclass->list_ipv6);
3588	–	MyFree(cidr);
3589	–	return;
3590	–	}
3591	–	}
3592	–	}
3593	–	}
3594	–	#endif
3595	–	}
3596	–
3597	–	static void
3598	–	rebuild_cidr_list(int aftype, struct ConfItem *oldcl, struct ClassItem *newcl,
3599	–	dlink_list *old_list, dlink_list *new_list, int changed)
3600	–	{
3601	–	dlink_node *ptr;
3602	–	struct Client *client_p;
3603	–	struct ConfItem *conf;
3604	–	struct AccessItem *aconf;
3605	–
3606	–	if (!changed)
3607	–	{
3608	–	*new_list = *old_list;
3609	–	old_list->head = old_list->tail = NULL;
3610	–	old_list->length = 0;
3611	–	return;
3612	–	}
3613	–
3614	–	DLINK_FOREACH(ptr, local_client_list.head)
3615	–	{
3616	–	client_p = ptr->data;
3617	–	if (client_p->localClient->aftype != aftype)
3618	–	continue;
3619	–	if (dlink_list_length(&client_p->localClient->confs) == 0)
3620	–	continue;
3621	–
3622	–	conf = client_p->localClient->confs.tail->data;
3623	–	if (conf->type == CLIENT_TYPE)
3624	–	{
3625	–	aconf = map_to_conf(conf);
3626	–	if (aconf->class_ptr == oldcl)
3627	–	cidr_limit_reached(1, &client_p->localClient->ip, newcl);
3628	–	}
3629	–	}
3630	–	}
3631	–
3632	–	/*
3633	–	* rebuild_cidr_class
3634	–	*
3635	–	* inputs       - pointer to old conf
3636	–	*              - pointer to new_class
3637	–	* output       - none
3638	–	* side effects - rebuilds the class link list of cidr blocks
3639	–	*/
3640	–	void
3641	–	rebuild_cidr_class(struct ConfItem *conf, struct ClassItem *new_class)
3642	–	{
3643	–	struct ClassItem *old_class = map_to_conf(conf);
3644	–
3645	–	if (old_class->number_per_cidr > 0 && new_class->number_per_cidr > 0)
3646	–	{
3647	–	if (old_class->cidr_bitlen_ipv4 > 0 && new_class->cidr_bitlen_ipv4 > 0)
3648	–	rebuild_cidr_list(AF_INET, conf, new_class,
3649	–	&old_class->list_ipv4, &new_class->list_ipv4,
3650	–	old_class->cidr_bitlen_ipv4 != new_class->cidr_bitlen_ipv4);
3651	–
3652	–	#ifdef IPV6
3653	–	if (old_class->cidr_bitlen_ipv6 > 0 && new_class->cidr_bitlen_ipv6 > 0)
3654	–	rebuild_cidr_list(AF_INET6, conf, new_class,
3655	–	&old_class->list_ipv6, &new_class->list_ipv6,
3656	–	old_class->cidr_bitlen_ipv6 != new_class->cidr_bitlen_ipv6);
3657	–	#endif
3658	–	}
3659	–
3660	–	destroy_cidr_class(old_class);
3661	–	}
3662	–
3663	–	/*
3664	–	* destroy_cidr_list
3665	–	*
3666	–	* inputs       - pointer to class dlink list of cidr blocks
3667	–	* output       - none
3668	–	* side effects - completely destroys the class link list of cidr blocks
3669	–	*/
3670	–	static void
3671	–	destroy_cidr_list(dlink_list *list)
3672	–	{
3673	–	dlink_node *ptr = NULL, *next_ptr = NULL;
3674	–
3675	–	DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
3676	–	{
3677	–	dlinkDelete(ptr, list);
3678	–	MyFree(ptr->data);
3679	–	}
3680	–	}
3681	–
3682	–	/*
3683	–	* destroy_cidr_class
3684	–	*
3685	–	* inputs       - pointer to class
3686	–	* output       - none
3687	–	* side effects - completely destroys the class link list of cidr blocks
3688	–	*/
3689	–	static void
3690	–	destroy_cidr_class(struct ClassItem *aclass)
3691	–	{
3692	–	destroy_cidr_list(&aclass->list_ipv4);
3693	–	destroy_cidr_list(&aclass->list_ipv6);
3694	–	}

Diff Legend

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