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 3109 by michael, Thu Mar 6 19:25:12 2014 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  conf.c: Configuration file functions.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2002 by the past and present ircd coders, and others.
4	>	*  Copyright (c) 1997-2014 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 18 | Line 17
17		*  along with this program; if not, write to the Free Software
18		*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
19		*  USA
20	<	*
21	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file conf.c
23	>	* \brief Configuration file functions.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
28		#include "list.h"
29		#include "ircd_defs.h"
28	–	#include "balloc.h"
30		#include "conf.h"
31		#include "s_serv.h"
32		#include "resv.h"
#	Line 45 | Line 46
46		#include "send.h"
47		#include "s_gline.h"
48		#include "memory.h"
49	+	#include "mempool.h"
50		#include "irc_res.h"
51		#include "userhost.h"
52		#include "s_user.h"
53		#include "channel_mode.h"
54		#include "parse.h"
55		#include "s_misc.h"
56	+	#include "conf_db.h"
57	+	#include "conf_class.h"
58	+	#include "motd.h"
59
60	<	struct Callback *client_check_cb = NULL;
60	>
61	>	struct config_channel_entry ConfigChannel;
62		struct config_server_hide ConfigServerHide;
63	+	struct config_file_entry ConfigFileEntry;
64	+	struct logging_entry ConfigLoggingEntry = { .use_logging = 1 };
65	+	struct server_info ServerInfo;
66	+	struct admin_info AdminInfo;
67
68		/* general conf items link list root, other than k lines etc. */
69		dlink_list service_items = { NULL, NULL, 0 };
#	Line 62 | Line 72 | dlink_list cluster_items = { NULL, NULL,
72		dlink_list oconf_items   = { NULL, NULL, 0 };
73		dlink_list uconf_items   = { NULL, NULL, 0 };
74		dlink_list xconf_items   = { NULL, NULL, 0 };
65	–	dlink_list rxconf_items  = { NULL, NULL, 0 };
66	–	dlink_list rkconf_items  = { NULL, NULL, 0 };
75		dlink_list nresv_items   = { NULL, NULL, 0 };
76	<	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 };
76	>	dlink_list cresv_items = { NULL, NULL, 0 };
77
78		extern unsigned int lineno;
79		extern char linebuf[];
#	Line 81 | Line 85 | struct conf_parser_context conf_parser_c
85		/* internally defined functions */
86		static void read_conf(FILE *);
87		static void clear_out_old_conf(void);
84	–	static void flush_deleted_I_P(void);
88		static void expire_tklines(dlink_list *);
89		static void garbage_collect_ip_entries(void);
90		static int hash_ip(struct irc_ssaddr *);
91	<	static int verify_access(struct Client *, const char *);
92	<	static int attach_iline(struct Client *, struct ConfItem *);
91	>	static int verify_access(struct Client *);
92	>	static int attach_iline(struct Client *, struct MaskItem *);
93		static struct ip_entry *find_or_add_ip(struct irc_ssaddr *);
94	<	static void parse_conf_file(int, int);
92	<	static dlink_list *map_to_list(ConfType);
93	<	static struct AccessItem *find_regexp_kline(const char *[]);
94	>	static dlink_list *map_to_list(enum maskitem_type);
95		static int find_user_host(struct Client *, char *, char *, char *, unsigned int);
96
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;
97
98		/* usually, with hash tables, you use a prime number...
99		* but in this case I am dealing with ip addresses,
#	Line 114 | Line 104 | static struct ConfItem *class_default;
104		struct ip_entry
105		{
106		struct irc_ssaddr ip;
107	<	int count;
107	>	unsigned int count;
108		time_t last_attempt;
109		struct ip_entry *next;
110		};
111
112		static struct ip_entry *ip_hash_table[IP_HASH_SIZE];
113	<	static BlockHeap *ip_entry_heap = NULL;
113	>	static mp_pool_t *ip_entry_pool = NULL;
114		static int ip_entries_count = 0;
115
116
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	–
117		/* conf_dns_callback()
118		*
119	<	* inputs       - pointer to struct AccessItem
119	>	* inputs       - pointer to struct MaskItem
120		*              - pointer to DNSReply reply
121		* output       - none
122		* side effects - called when resolver query finishes
#	Line 156 | Line 127 | unmap_conf_item(void *aconf)
127		static void
128		conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name)
129		{
130	<	struct AccessItem *aconf = vptr;
130	>	struct MaskItem *conf = vptr;
131
132	<	aconf->dns_pending = 0;
132	>	conf->dns_pending = 0;
133
134		if (addr != NULL)
135	<	memcpy(&aconf->addr, addr, sizeof(aconf->addr));
135	>	memcpy(&conf->addr, addr, sizeof(conf->addr));
136		else
137	<	aconf->dns_failed = 1;
137	>	conf->dns_failed = 1;
138		}
139
140		/* conf_dns_lookup()
#	Line 173 | Line 144 | conf_dns_callback(void *vptr, const stru
144		* allocate a dns_query and start ns lookup.
145		*/
146		static void
147	<	conf_dns_lookup(struct AccessItem *aconf)
147	>	conf_dns_lookup(struct MaskItem *conf)
148		{
149	<	if (!aconf->dns_pending)
149	>	if (!conf->dns_pending)
150		{
151	<	aconf->dns_pending = 1;
152	<	gethost_byname(conf_dns_callback, aconf, aconf->host);
151	>	conf->dns_pending = 1;
152	>	gethost_byname(conf_dns_callback, conf, conf->host);
153		}
154		}
155
156	<	/* make_conf_item()
157	<	*
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)
156	>	struct MaskItem *
157	>	conf_make(enum maskitem_type type)
158		{
159	<	struct ConfItem *conf = NULL;
160	<	struct AccessItem *aconf = NULL;
196	<	struct ClassItem *aclass = NULL;
197	<	int status = 0;
198	<
199	<	switch (type)
200	<	{
201	<	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;
159	>	struct MaskItem *conf = MyMalloc(sizeof(*conf));
160	>	dlink_list *list = NULL;
161
162	<	case XLINE_TYPE:
163	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
164	<	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;
162	>	conf->type   = type;
163	>	conf->active = 1;
164	>	conf->aftype = AF_INET;
165
166	+	if ((list = map_to_list(type)))
167	+	dlinkAdd(conf, &conf->node, list);
168		return conf;
169		}
170
171		void
172	<	delete_conf_item(struct ConfItem *conf)
172	>	conf_free(struct MaskItem *conf)
173		{
174	<	dlink_node *m = NULL, *m_next = NULL;
175	<	struct MatchItem *match_item;
176	<	struct AccessItem *aconf;
177	<	ConfType type = conf->type;
174	>	dlink_node *ptr = NULL, *ptr_next = NULL;
175	>	dlink_list *list = NULL;
176	>
177	>	if (conf->node.next)
178	>	if ((list = map_to_list(conf->type)))
179	>	dlinkDelete(&conf->node, list);
180
181		MyFree(conf->name);
340	–	conf->name = NULL;
182
183	<	switch(type)
184	<	{
185	<	case DLINE_TYPE:
186	<	case EXEMPTDLINE_TYPE:
187	<	case GLINE_TYPE:
188	<	case KLINE_TYPE:
189	<	case CLIENT_TYPE:
190	<	case OPER_TYPE:
191	<	case SERVER_TYPE:
192	<	aconf = map_to_conf(conf);
193	<
194	<	if (aconf->dns_pending)
195	<	delete_resolver_queries(aconf);
196	<	if (aconf->passwd != NULL)
197	<	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);
183	>	if (conf->dns_pending)
184	>	delete_resolver_queries(conf);
185	>	if (conf->passwd != NULL)
186	>	memset(conf->passwd, 0, strlen(conf->passwd));
187	>	if (conf->spasswd != NULL)
188	>	memset(conf->spasswd, 0, strlen(conf->spasswd));
189	>
190	>	conf->class = NULL;
191	>
192	>	MyFree(conf->passwd);
193	>	MyFree(conf->spasswd);
194	>	MyFree(conf->reason);
195	>	MyFree(conf->certfp);
196	>	MyFree(conf->user);
197	>	MyFree(conf->host);
198		#ifdef HAVE_LIBCRYPTO
199	<	if (aconf->rsa_public_key)
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;
199	>	MyFree(conf->cipher_list);
200
201	<	case OPER_TYPE:
202	<	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;
416	<
417	<	case ULINE_TYPE:
418	<	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;
201	>	if (conf->rsa_public_key)
202	>	RSA_free(conf->rsa_public_key);
203		#endif
204	<	case NRESV_TYPE:
205	<	match_item = map_to_conf(conf);
206	<	MyFree(match_item->user);
207	<	MyFree(match_item->host);
208	<	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;
204	>	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->hub_list.head)
205	>	{
206	>	MyFree(ptr->data);
207	>	dlinkDelete(ptr, &conf->hub_list);
208	>	free_dlink_node(ptr);
209		}
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;
210
211	<	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;
548	<
549	<	switch (type)
211	>	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->leaf_list.head)
212		{
213	<	case GDENY_TYPE:
214	<	DLINK_FOREACH(ptr, gdeny_items.head)
215	<	{
216	<	conf = ptr->data;
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);
213	>	MyFree(ptr->data);
214	>	dlinkDelete(ptr, &conf->leaf_list);
215	>	free_dlink_node(ptr);
216	>	}
217
218	<	DLINK_FOREACH(dptr, aconf->leaf_list.head)
219	<	sendto_one(source_p, form_str(RPL_STATSLLINE), me.name,
220	<	source_p->name, 'L', dptr->data, conf->name, 0, "*");
758	<	}
759	<	break;
218	>	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->exempt_list.head)
219	>	{
220	>	struct exempt *exptr = ptr->data;
221
222	<	case GLINE_TYPE:
223	<	case KLINE_TYPE:
224	<	case DLINE_TYPE:
225	<	case EXEMPTDLINE_TYPE:
226	<	case CRESV_TYPE:
766	<	case NRESV_TYPE:
767	<	case CLUSTER_TYPE:
768	<	default:
769	<	break;
222	>	dlinkDelete(ptr, &conf->exempt_list);
223	>	MyFree(exptr->name);
224	>	MyFree(exptr->user);
225	>	MyFree(exptr->host);
226	>	MyFree(exptr);
227		}
228	+
229	+	MyFree(conf);
230		}
231
232		/* check_client()
#	Line 783 | Line 242 | report_confitem_types(struct Client *sou
242		*                Look for conf lines which have the same
243		*                status as the flags passed.
244		*/
245	<	static void *
246	<	check_client(va_list args)
245	>	int
246	>	check_client(struct Client *source_p)
247		{
789	–	struct Client *source_p = va_arg(args, struct Client *);
790	–	const char *username = va_arg(args, const char *);
248		int i;
249	<
250	<	/* I'm already in big trouble if source_p->localClient is NULL -db */
251	<	if ((i = verify_access(source_p, username)))
795	<	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
249	>
250	>	if ((i = verify_access(source_p)))
251	>	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
252		source_p->name, source_p->sockhost);
253
254		switch (i)
255		{
256		case TOO_MANY:
257	<	sendto_realops_flags(UMODE_FULL, L_ALL,
257	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
258		"Too many on IP for %s (%s).",
259	<	get_client_name(source_p, SHOW_IP),
260	<	source_p->sockhost);
259	>	get_client_name(source_p, SHOW_IP),
260	>	source_p->sockhost);
261		ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
262	<	get_client_name(source_p, SHOW_IP));
262	>	get_client_name(source_p, SHOW_IP));
263		++ServerStats.is_ref;
264		exit_client(source_p, &me, "No more connections allowed on that IP");
265		break;
266
267		case I_LINE_FULL:
268	<	sendto_realops_flags(UMODE_FULL, L_ALL,
269	<	"I-line is full for %s (%s).",
270	<	get_client_name(source_p, SHOW_IP),
271	<	source_p->sockhost);
268	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
269	>	"auth{} block is full for %s (%s).",
270	>	get_client_name(source_p, SHOW_IP),
271	>	source_p->sockhost);
272		ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
273	<	get_client_name(source_p, SHOW_IP));
273	>	get_client_name(source_p, SHOW_IP));
274		++ServerStats.is_ref;
275	<	exit_client(source_p, &me,
276	<	"No more connections allowed in your connection class");
275	>	exit_client(source_p, &me,
276	>	"No more connections allowed in your connection class");
277		break;
278
279		case NOT_AUTHORIZED:
280		++ServerStats.is_ref;
281		/* jdc - lists server name & port connections are on */
282		/*       a purely cosmetical change */
283	<	sendto_realops_flags(UMODE_UNAUTH, L_ALL,
284	<	"Unauthorized client connection from %s [%s] on [%s/%u].",
285	<	get_client_name(source_p, SHOW_IP),
286	<	source_p->sockhost,
287	<	source_p->localClient->listener->name,
288	<	source_p->localClient->listener->port);
283	>	sendto_realops_flags(UMODE_UNAUTH, L_ALL, SEND_NOTICE,
284	>	"Unauthorized client connection from %s [%s] on [%s/%u].",
285	>	get_client_name(source_p, SHOW_IP),
286	>	source_p->sockhost,
287	>	source_p->localClient->listener->name,
288	>	source_p->localClient->listener->port);
289		ilog(LOG_TYPE_IRCD,
290	<	"Unauthorized client connection from %s on [%s/%u].",
291	<	get_client_name(source_p, SHOW_IP),
292	<	source_p->localClient->listener->name,
293	<	source_p->localClient->listener->port);
294	<
295	<	/* 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");
290	>	"Unauthorized client connection from %s on [%s/%u].",
291	>	get_client_name(source_p, SHOW_IP),
292	>	source_p->localClient->listener->name,
293	>	source_p->localClient->listener->port);
294	>
295	>	exit_client(source_p, &me, "You are not authorized to use this server");
296		break;
297
298		case BANNED_CLIENT:
299	<	/*
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");
299	>	exit_client(source_p, &me, "Banned");
300		++ServerStats.is_ref;
301		break;
302
#	Line 871 | Line 305 | check_client(va_list args)
305		break;
306		}
307
308	<	return (i < 0 ? NULL : source_p);
308	>	return (i < 0 ? 0 : 1);
309		}
310
311		/* verify_access()
312		*
313		* inputs       - pointer to client to verify
880	–	*              - pointer to proposed username
314		* output       - 0 if success -'ve if not
315		* side effect  - find the first (best) I line to attach.
316		*/
317		static int
318	<	verify_access(struct Client *client_p, const char *username)
318	>	verify_access(struct Client *client_p)
319		{
320	<	struct AccessItem *aconf = NULL, *rkconf = NULL;
888	<	struct ConfItem *conf = NULL;
320	>	struct MaskItem *conf = NULL;
321		char non_ident[USERLEN + 1] = { '~', '\0' };
890	–	const char *uhi[3];
322
323		if (IsGotId(client_p))
324		{
325	<	aconf = find_address_conf(client_p->host, client_p->username,
326	<	&client_p->localClient->ip,
327	<	client_p->localClient->aftype,
325	>	conf = find_address_conf(client_p->host, client_p->username,
326	>	&client_p->localClient->ip,
327	>	client_p->localClient->aftype,
328		client_p->localClient->passwd);
329		}
330		else
331		{
332	<	strlcpy(non_ident+1, username, sizeof(non_ident)-1);
333	<	aconf = find_address_conf(client_p->host,non_ident,
334	<	&client_p->localClient->ip,
335	<	client_p->localClient->aftype,
336	<	client_p->localClient->passwd);
332	>	strlcpy(non_ident + 1, client_p->username, sizeof(non_ident) - 1);
333	>	conf = find_address_conf(client_p->host,non_ident,
334	>	&client_p->localClient->ip,
335	>	client_p->localClient->aftype,
336	>	client_p->localClient->passwd);
337		}
338
339	<	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)
339	>	if (conf != NULL)
340		{
341	<	if (IsConfClient(aconf) && !rkconf)
341	>	if (IsConfClient(conf))
342		{
343	<	conf = unmap_conf_item(aconf);
919	<
920	<	if (IsConfRedir(aconf))
343	>	if (IsConfRedir(conf))
344		{
345	<	sendto_one(client_p, form_str(RPL_REDIR),
346	<	me.name, client_p->name,
347	<	conf->name ? conf->name : "",
348	<	aconf->port);
926	<	return(NOT_AUTHORIZED);
345	>	sendto_one_numeric(client_p, &me, RPL_REDIR,
346	>	conf->name ? conf->name : "",
347	>	conf->port);
348	>	return NOT_AUTHORIZED;
349		}
350
351	<	if (IsConfDoIdentd(aconf))
352	<	SetNeedId(client_p);
351	>	if (IsConfDoIdentd(conf))
352	>	SetNeedId(client_p);
353
354		/* Thanks for spoof idea amm */
355	<	if (IsConfDoSpoofIp(aconf))
355	>	if (IsConfDoSpoofIp(conf))
356		{
357	<	conf = unmap_conf_item(aconf);
358	<
359	<	if (!ConfigFileEntry.hide_spoof_ips && IsConfSpoofNotice(aconf))
938	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "%s spoofing: %s as %s",
357	>	if (!ConfigFileEntry.hide_spoof_ips && IsConfSpoofNotice(conf))
358	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
359	>	"%s spoofing: %s as %s",
360		client_p->name, client_p->host, conf->name);
361		strlcpy(client_p->host, conf->name, sizeof(client_p->host));
362	<	SetIPSpoof(client_p);
362	>	AddFlag(client_p, FLAGS_IP_SPOOFING | FLAGS_AUTH_SPOOF);
363		}
364
365	<	return(attach_iline(client_p, conf));
365	>	return attach_iline(client_p, conf);
366		}
367	<	else if (rkconf || IsConfKill(aconf) || (ConfigFileEntry.glines && IsConfGline(aconf)))
367	>	else if (IsConfKill(conf) || (ConfigFileEntry.glines && IsConfGline(conf)))
368		{
369	<	/* XXX */
949	<	aconf = rkconf ? rkconf : aconf;
950	<	if (IsConfGline(aconf))
369	>	if (IsConfGline(conf))
370		sendto_one(client_p, ":%s NOTICE %s :*** G-lined", me.name,
371		client_p->name);
372	<	if (ConfigFileEntry.kline_with_reason)
373	<	sendto_one(client_p, ":%s NOTICE %s :*** Banned %s",
374	<	me.name, client_p->name, aconf->reason);
956	<	return(BANNED_CLIENT);
372	>	sendto_one(client_p, ":%s NOTICE %s :*** Banned: %s",
373	>	me.name, client_p->name, conf->reason);
374	>	return BANNED_CLIENT;
375		}
376		}
377
378	<	return(NOT_AUTHORIZED);
378	>	return NOT_AUTHORIZED;
379		}
380
381		/* attach_iline()
#	Line 968 | Line 386 | verify_access(struct Client *client_p, c
386		* side effects - do actual attach
387		*/
388		static int
389	<	attach_iline(struct Client *client_p, struct ConfItem *conf)
389	>	attach_iline(struct Client *client_p, struct MaskItem *conf)
390		{
391	<	struct AccessItem *aconf;
974	<	struct ClassItem *aclass;
391	>	struct ClassItem *class = NULL;
392		struct ip_entry *ip_found;
393		int a_limit_reached = 0;
394	<	int local = 0, global = 0, ident = 0;
394	>	unsigned int local = 0, global = 0, ident = 0;
395	>
396	>	assert(conf->class);
397
398		ip_found = find_or_add_ip(&client_p->localClient->ip);
399		ip_found->count++;
400		SetIpHash(client_p);
401
402	<	aconf = map_to_conf(conf);
984	<	if (aconf->class_ptr == NULL)
985	<	return NOT_AUTHORIZED;  /* If class is missing, this is best */
986	<
987	<	aclass = map_to_conf(aconf->class_ptr);
402	>	class = conf->class;
403
404		count_user_host(client_p->username, client_p->host,
405		&global, &local, &ident);
#	Line 993 | Line 408 | attach_iline(struct Client *client_p, st
408		* setting a_limit_reached if any limit is reached.
409		* - Dianora
410		*/
411	<	if (aclass->max_total != 0 && aclass->curr_user_count >= aclass->max_total)
411	>	if (class->max_total != 0 && class->ref_count >= class->max_total)
412		a_limit_reached = 1;
413	<	else if (aclass->max_perip != 0 && ip_found->count > aclass->max_perip)
413	>	else if (class->max_perip != 0 && ip_found->count > class->max_perip)
414		a_limit_reached = 1;
415	<	else if (aclass->max_local != 0 && local >= aclass->max_local)
415	>	else if (class->max_local != 0 && local >= class->max_local)
416		a_limit_reached = 1;
417	<	else if (aclass->max_global != 0 && global >= aclass->max_global)
417	>	else if (class->max_global != 0 && global >= class->max_global)
418		a_limit_reached = 1;
419	<	else if (aclass->max_ident != 0 && ident >= aclass->max_ident &&
419	>	else if (class->max_ident != 0 && ident >= class->max_ident &&
420		client_p->username[0] != '~')
421		a_limit_reached = 1;
422
423		if (a_limit_reached)
424		{
425	<	if (!IsConfExemptLimits(aconf))
425	>	if (!IsConfExemptLimits(conf))
426		return TOO_MANY;   /* Already at maximum allowed */
427
428		sendto_one(client_p,
#	Line 1028 | Line 443 | attach_iline(struct Client *client_p, st
443		void
444		init_ip_hash_table(void)
445		{
446	<	ip_entry_heap = BlockHeapCreate("ip", sizeof(struct ip_entry),
1032	<	2 * hard_fdlimit);
446	>	ip_entry_pool = mp_pool_new(sizeof(struct ip_entry), MP_CHUNK_SIZE_IP_ENTRY);
447		memset(ip_hash_table, 0, sizeof(ip_hash_table));
448		}
449
#	Line 1078 | Line 492 | find_or_add_ip(struct irc_ssaddr *ip_in)
492		if (ip_entries_count >= 2 * hard_fdlimit)
493		garbage_collect_ip_entries();
494
495	<	newptr = BlockHeapAlloc(ip_entry_heap);
495	>	newptr = mp_pool_get(ip_entry_pool);
496	>	memset(newptr, 0, sizeof(*newptr));
497		ip_entries_count++;
498		memcpy(&newptr->ip, ip_in, sizeof(struct irc_ssaddr));
499
#	Line 1129 | Line 544 | remove_one_ip(struct irc_ssaddr *ip_in)
544		if (ptr->count > 0)
545		ptr->count--;
546		if (ptr->count == 0 &&
547	<	(CurrentTime-ptr->last_attempt) >= ConfigFileEntry.throttle_time)
547	>	(CurrentTime-ptr->last_attempt) >= ConfigFileEntry.throttle_time)
548		{
549		if (last_ptr != NULL)
550	<	last_ptr->next = ptr->next;
550	>	last_ptr->next = ptr->next;
551		else
552	<	ip_hash_table[hash_index] = ptr->next;
552	>	ip_hash_table[hash_index] = ptr->next;
553
554	<	BlockHeapFree(ip_entry_heap, ptr);
554	>	mp_pool_release(ptr);
555		ip_entries_count--;
556		return;
557		}
#	Line 1171 | Line 586 | hash_ip(struct irc_ssaddr *addr)
586		uint32_t *ip = (uint32_t *)&v6->sin6_addr.s6_addr;
587
588		hash  = ip[0] ^ ip[3];
589	<	hash ^= hash >> 16;
590	<	hash ^= hash >> 8;
589	>	hash ^= hash >> 16;
590	>	hash ^= hash >> 8;
591		hash  = hash & (IP_HASH_SIZE - 1);
592		return hash;
593		}
#	Line 1183 | Line 598 | hash_ip(struct irc_ssaddr *addr)
598
599		/* count_ip_hash()
600		*
601	<	* inputs        - pointer to counter of number of ips hashed
601	>	* inputs        - pointer to counter of number of ips hashed
602		*               - pointer to memory used for ip hash
603		* output        - returned via pointers input
604		* side effects  - NONE
#	Line 1239 | Line 654 | garbage_collect_ip_entries(void)
654		last_ptr->next = ptr->next;
655		else
656		ip_hash_table[i] = ptr->next;
657	<	BlockHeapFree(ip_entry_heap, ptr);
657	>	mp_pool_release(ptr);
658		ip_entries_count--;
659		}
660		else
#	Line 1256 | Line 671 | garbage_collect_ip_entries(void)
671		* side effects - Disassociate configuration from the client.
672		*                Also removes a class from the list if marked for deleting.
673		*/
674	<	int
675	<	detach_conf(struct Client *client_p, ConfType type)
674	>	void
675	>	detach_conf(struct Client *client_p, enum maskitem_type type)
676		{
677	<	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;
677	>	dlink_node *ptr = NULL, *next_ptr = NULL;
678
679		DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->confs.head)
680		{
681	<	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);
1284	<
1285	<	assert(aconf->clients > 0);
681	>	struct MaskItem *conf = ptr->data;
682
683	<	if ((aclass_conf = aconf->class_ptr) != NULL)
684	<	{
685	<	aclass = map_to_conf(aclass_conf);
1290	<
1291	<	assert(aclass->curr_user_count > 0);
683	>	assert(conf->type & (CONF_CLIENT | CONF_OPER | CONF_SERVER));
684	>	assert(conf->ref_count > 0);
685	>	assert(conf->class->ref_count > 0);
686
687	<	if (conf->type == CLIENT_TYPE)
688	<	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	<	}
687	>	if (!(conf->type & type))
688	>	continue;
689
690	<	if (--aconf->clients == 0 && IsConfIllegal(aconf))
691	<	delete_conf_item(conf);
690	>	dlinkDelete(ptr, &client_p->localClient->confs);
691	>	free_dlink_node(ptr);
692
693	<	break;
694	<	default:
1304	<	break;
1305	<	}
693	>	if (conf->type == CONF_CLIENT)
694	>	remove_from_cidr_check(&client_p->localClient->ip, conf->class);
695
696	<	if (type != CONF_TYPE)
697	<	return 0;
696	>	if (--conf->class->ref_count == 0 && conf->class->active == 0)
697	>	{
698	>	class_free(conf->class);
699	>	conf->class = NULL;
700		}
1310	–	}
701
702	<	return -1;
702	>	if (--conf->ref_count == 0 && conf->active == 0)
703	>	conf_free(conf);
704	>	}
705		}
706
707		/* attach_conf()
#	Line 1323 | Line 715 | detach_conf(struct Client *client_p, Con
715		*                attachment if there was an old one...
716		*/
717		int
718	<	attach_conf(struct Client *client_p, struct ConfItem *conf)
718	>	attach_conf(struct Client *client_p, struct MaskItem *conf)
719		{
720		if (dlinkFind(&client_p->localClient->confs, conf) != NULL)
721		return 1;
722
723	<	if (conf->type == CLIENT_TYPE ||
724	<	conf->type == SERVER_TYPE ||
725	<	conf->type == OPER_TYPE)
726	<	{
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 */
723	>	if (conf->type == CONF_CLIENT)
724	>	if (cidr_limit_reached(IsConfExemptLimits(conf),
725	>	&client_p->localClient->ip, conf->class))
726	>	return TOO_MANY;    /* Already at maximum allowed */
727
728	<	aclass->curr_user_count++;
729	<	aconf->clients++;
1348	<	}
728	>	conf->class->ref_count++;
729	>	conf->ref_count++;
730
731		dlinkAdd(conf, make_dlink_node(), &client_p->localClient->confs);
732
#	Line 1365 | Line 746 | attach_connect_block(struct Client *clie
746		const char *host)
747		{
748		dlink_node *ptr;
749	<	struct ConfItem *conf;
1369	<	struct AccessItem *aconf;
749	>	struct MaskItem *conf = NULL;
750
751		assert(client_p != NULL);
752		assert(host != NULL);
#	Line 1377 | Line 757 | attach_connect_block(struct Client *clie
757		DLINK_FOREACH(ptr, server_items.head)
758		{
759		conf = ptr->data;
1380	–	aconf = map_to_conf(conf);
760
761	<	if (match(conf->name, name) == 0 || match(aconf->host, host) == 0)
761	>	if (match(conf->name, name) || match(conf->host, host))
762		continue;
763
764		attach_conf(client_p, conf);
#	Line 1389 | Line 768 | attach_connect_block(struct Client *clie
768		return 0;
769		}
770
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	–
771		/* find_conf_name()
772		*
773		* inputs       - pointer to conf link list to search
#	Line 1453 | Line 777 | find_conf_exact(ConfType type, const cha
777		* side effects - find a conf entry which matches the name
778		*                and has the given mask.
779		*/
780	<	struct ConfItem *
781	<	find_conf_name(dlink_list *list, const char *name, ConfType type)
780	>	struct MaskItem *
781	>	find_conf_name(dlink_list *list, const char *name, enum maskitem_type type)
782		{
783		dlink_node *ptr;
784	<	struct ConfItem* conf;
784	>	struct MaskItem* conf;
785
786		DLINK_FOREACH(ptr, list->head)
787		{
788		conf = ptr->data;
789	<
789	>
790		if (conf->type == type)
791		{
792		if (conf->name && (irccmp(conf->name, name) == 0 ||
793	<	match(conf->name, name)))
793	>	!match(conf->name, name)))
794		return conf;
795		}
796		}
#	Line 1481 | Line 805 | find_conf_name(dlink_list *list, const c
805		* side effects - none
806		*/
807		static dlink_list *
808	<	map_to_list(ConfType type)
808	>	map_to_list(enum maskitem_type type)
809		{
810		switch(type)
811		{
812	<	case RXLINE_TYPE:
1489	<	return(&rxconf_items);
1490	<	break;
1491	<	case XLINE_TYPE:
812	>	case CONF_XLINE:
813		return(&xconf_items);
814		break;
815	<	case ULINE_TYPE:
815	>	case CONF_ULINE:
816		return(&uconf_items);
817		break;
818	<	case NRESV_TYPE:
818	>	case CONF_NRESV:
819		return(&nresv_items);
820		break;
821	<	case OPER_TYPE:
821	>	case CONF_CRESV:
822	>	return(&cresv_items);
823	>	case CONF_OPER:
824		return(&oconf_items);
825		break;
826	<	case CLASS_TYPE:
1504	<	return(&class_items);
1505	<	break;
1506	<	case SERVER_TYPE:
826	>	case CONF_SERVER:
827		return(&server_items);
828		break;
829	<	case SERVICE_TYPE:
829	>	case CONF_SERVICE:
830		return(&service_items);
831		break;
832	<	case CLUSTER_TYPE:
832	>	case CONF_CLUSTER:
833		return(&cluster_items);
834		break;
1515	–	case CONF_TYPE:
1516	–	case GLINE_TYPE:
1517	–	case KLINE_TYPE:
1518	–	case DLINE_TYPE:
1519	–	case CRESV_TYPE:
835		default:
836		return NULL;
837		}
#	Line 1528 | Line 843 | map_to_list(ConfType type)
843		*              - pointer to name string to find
844		*              - pointer to user
845		*              - pointer to host
846	<	*              - optional action to match on as well
847	<	* output       - NULL or pointer to found struct MatchItem
846	>	*              - optional flags to match on as well
847	>	* output       - NULL or pointer to found struct MaskItem
848		* side effects - looks for a match on name field
849		*/
850	<	struct ConfItem *
851	<	find_matching_name_conf(ConfType type, const char *name, const char *user,
852	<	const char *host, int action)
850	>	struct MaskItem *
851	>	find_matching_name_conf(enum maskitem_type type, const char *name, const char *user,
852	>	const char *host, unsigned int flags)
853		{
854		dlink_node *ptr=NULL;
855	<	struct ConfItem *conf=NULL;
1541	<	struct AccessItem *aconf=NULL;
1542	<	struct MatchItem *match_item=NULL;
855	>	struct MaskItem *conf=NULL;
856		dlink_list *list_p = map_to_list(type);
857
858		switch (type)
859		{
860	<	#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:
860	>	case CONF_SERVICE:
861		DLINK_FOREACH(ptr, list_p->head)
862		{
863		conf = ptr->data;
#	Line 1568 | Line 869 | find_matching_name_conf(ConfType type, c
869		}
870		break;
871
872	<	case XLINE_TYPE:
873	<	case ULINE_TYPE:
874	<	case NRESV_TYPE:
872	>	case CONF_XLINE:
873	>	case CONF_ULINE:
874	>	case CONF_NRESV:
875	>	case CONF_CRESV:
876		DLINK_FOREACH(ptr, list_p->head)
877		{
878		conf = ptr->data;
879
1578	–	match_item = map_to_conf(conf);
880		if (EmptyString(conf->name))
881	<	continue;
882	<	if ((name != NULL) && match_esc(conf->name, name))
881	>	continue;
882	>	if ((name != NULL) && !match(conf->name, name))
883		{
884	<	if ((user == NULL && (host == NULL)))
885	<	return conf;
886	<	if ((match_item->action & action) != action)
884	>	if ((user == NULL && (host == NULL)))
885	>	return conf;
886	>	if ((conf->flags & flags) != flags)
887		continue;
888	<	if (EmptyString(match_item->user) || EmptyString(match_item->host))
889	<	return conf;
890	<	if (match(match_item->user, user) && match(match_item->host, host))
891	<	return conf;
888	>	if (EmptyString(conf->user) || EmptyString(conf->host))
889	>	return conf;
890	>	if (!match(conf->user, user) && !match(conf->host, host))
891	>	return conf;
892		}
893		}
894		break;
895
896	<	case SERVER_TYPE:
896	>	case CONF_SERVER:
897		DLINK_FOREACH(ptr, list_p->head)
898		{
899		conf = ptr->data;
1599	–	aconf = map_to_conf(conf);
900
901	<	if ((name != NULL) && match_esc(name, conf->name))
901	>	if ((name != NULL) && !match(name, conf->name))
902		return conf;
903	<	else if ((host != NULL) && match_esc(host, aconf->host))
903	>	else if ((host != NULL) && !match(host, conf->host))
904		return conf;
905		}
906		break;
907	<
907	>
908		default:
909		break;
910		}
#	Line 1617 | Line 917 | find_matching_name_conf(ConfType type, c
917		*              - pointer to name string to find
918		*              - pointer to user
919		*              - pointer to host
920	<	* output       - NULL or pointer to found struct MatchItem
920	>	* output       - NULL or pointer to found struct MaskItem
921		* side effects - looks for an exact match on name field
922		*/
923	<	struct ConfItem *
924	<	find_exact_name_conf(ConfType type, const struct Client *who, const char *name,
923	>	struct MaskItem *
924	>	find_exact_name_conf(enum maskitem_type type, const struct Client *who, const char *name,
925		const char *user, const char *host)
926		{
927		dlink_node *ptr = NULL;
928	<	struct AccessItem *aconf;
929	<	struct ConfItem *conf;
1630	<	struct MatchItem *match_item;
1631	<	dlink_list *list_p;
1632	<
1633	<	list_p = map_to_list(type);
928	>	struct MaskItem *conf;
929	>	dlink_list *list_p = map_to_list(type);
930
931		switch(type)
932		{
933	<	case RXLINE_TYPE:
934	<	case XLINE_TYPE:
935	<	case ULINE_TYPE:
936	<	case NRESV_TYPE:
933	>	case CONF_XLINE:
934	>	case CONF_ULINE:
935	>	case CONF_NRESV:
936	>	case CONF_CRESV:
937
938		DLINK_FOREACH(ptr, list_p->head)
939		{
940		conf = ptr->data;
941	<	match_item = (struct MatchItem *)map_to_conf(conf);
941	>
942		if (EmptyString(conf->name))
943	<	continue;
944	<
943	>	continue;
944	>
945		if (irccmp(conf->name, name) == 0)
946		{
947	<	if ((user == NULL && (host == NULL)))
948	<	return (conf);
949	<	if (EmptyString(match_item->user) || EmptyString(match_item->host))
950	<	return (conf);
951	<	if (match(match_item->user, user) && match(match_item->host, host))
952	<	return (conf);
947	>	if ((user == NULL && (host == NULL)))
948	>	return conf;
949	>	if (EmptyString(conf->user) || EmptyString(conf->host))
950	>	return conf;
951	>	if (!match(conf->user, user) && !match(conf->host, host))
952	>	return conf;
953		}
954		}
955		break;
956
957	<	case OPER_TYPE:
957	>	case CONF_OPER:
958		DLINK_FOREACH(ptr, list_p->head)
959		{
960		conf = ptr->data;
1665	–	aconf = map_to_conf(conf);
961
962		if (EmptyString(conf->name))
963		continue;
#	Line 1671 | Line 966 | find_exact_name_conf(ConfType type, cons
966		{
967		if (!who)
968		return conf;
969	<	if (EmptyString(aconf->user) || EmptyString(aconf->host))
970	<	return conf;
971	<	if (match(aconf->user, who->username))
969	>	if (EmptyString(conf->user) || EmptyString(conf->host))
970	>	return NULL;
971	>	if (!match(conf->user, who->username))
972		{
973	<	switch (aconf->type)
973	>	switch (conf->htype)
974		{
975		case HM_HOST:
976	<	if (match(aconf->host, who->host) || match(aconf->host, who->sockhost))
977	<	return conf;
976	>	if (!match(conf->host, who->host) || !match(conf->host, who->sockhost))
977	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
978	>	return conf;
979		break;
980		case HM_IPV4:
981		if (who->localClient->aftype == AF_INET)
982	<	if (match_ipv4(&who->localClient->ip, &aconf->addr, aconf->bits))
983	<	return conf;
982	>	if (match_ipv4(&who->localClient->ip, &conf->addr, conf->bits))
983	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
984	>	return conf;
985		break;
986		#ifdef IPV6
987		case HM_IPV6:
988		if (who->localClient->aftype == AF_INET6)
989	<	if (match_ipv6(&who->localClient->ip, &aconf->addr, aconf->bits))
990	<	return conf;
989	>	if (match_ipv6(&who->localClient->ip, &conf->addr, conf->bits))
990	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
991	>	return conf;
992		break;
993		#endif
994		default:
#	Line 1702 | Line 1000 | find_exact_name_conf(ConfType type, cons
1000
1001		break;
1002
1003	<	case SERVER_TYPE:
1003	>	case CONF_SERVER:
1004		DLINK_FOREACH(ptr, list_p->head)
1005		{
1006		conf = ptr->data;
1007	<	aconf = (struct AccessItem *)map_to_conf(conf);
1007	>
1008		if (EmptyString(conf->name))
1009	<	continue;
1010	<
1009	>	continue;
1010	>
1011		if (name == NULL)
1012		{
1013	<	if (EmptyString(aconf->host))
1014	<	continue;
1015	<	if (irccmp(aconf->host, host) == 0)
1016	<	return(conf);
1013	>	if (EmptyString(conf->host))
1014	>	continue;
1015	>	if (irccmp(conf->host, host) == 0)
1016	>	return conf;
1017		}
1018		else if (irccmp(conf->name, name) == 0)
1019	<	{
1722	<	return (conf);
1723	<	}
1019	>	return conf;
1020		}
1725	–	break;
1021
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	–	}
1022		break;
1023
1024		default:
1025		break;
1026		}
1027	<	return(NULL);
1027	>
1028	>	return NULL;
1029		}
1030
1031		/* rehash()
#	Line 1752 | Line 1038 | int
1038		rehash(int sig)
1039		{
1040		if (sig != 0)
1041	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1042	<	"Got signal SIGHUP, reloading ircd.conf file");
1041	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1042	>	"Got signal SIGHUP, reloading configuration file(s)");
1043
1044		restart_resolver();
1045
#	Line 1769 | Line 1055 | rehash(int sig)
1055
1056		load_conf_modules();
1057
1772	–	flush_deleted_I_P();
1773	–
1058		rehashed_klines = 1;
1775	–	/* XXX */
1776	–	if (ConfigLoggingEntry.use_logging)
1777	–	log_close_all();
1059
1060	<	return(0);
1060	>	return 0;
1061		}
1062
1063		/* set_default_conf()
#	Line 1794 | Line 1075 | set_default_conf(void)
1075		/* verify init_class() ran, this should be an unnecessary check
1076		* but its not much work.
1077		*/
1078	<	assert(class_default == (struct ConfItem *) class_items.tail->data);
1078	>	assert(class_default == class_get_list()->tail->data);
1079
1080		#ifdef HAVE_LIBCRYPTO
1081		ServerInfo.rsa_private_key = NULL;
#	Line 1804 | Line 1085 | set_default_conf(void)
1085		/* ServerInfo.name is not rehashable */
1086		/* ServerInfo.name = ServerInfo.name; */
1087		ServerInfo.description = NULL;
1088	<	DupString(ServerInfo.network_name, NETWORK_NAME_DEFAULT);
1089	<	DupString(ServerInfo.network_desc, NETWORK_DESC_DEFAULT);
1088	>	ServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
1089	>	ServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
1090
1091		memset(&ServerInfo.ip, 0, sizeof(ServerInfo.ip));
1092		ServerInfo.specific_ipv4_vhost = 0;
#	Line 1813 | Line 1094 | set_default_conf(void)
1094		ServerInfo.specific_ipv6_vhost = 0;
1095
1096		ServerInfo.max_clients = MAXCLIENTS_MAX;
1097	+	ServerInfo.max_nick_length = 9;
1098	+	ServerInfo.max_topic_length = 80;
1099
1100		ServerInfo.hub = 0;
1101		ServerInfo.dns_host.sin_addr.s_addr = 0;
#	Line 1821 | Line 1104 | set_default_conf(void)
1104		AdminInfo.email = NULL;
1105		AdminInfo.description = NULL;
1106
1107	<	log_close_all();
1107	>	log_del_all();
1108
1109		ConfigLoggingEntry.use_logging = 1;
1110
1111		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;
1112		ConfigChannel.knock_delay = 300;
1113		ConfigChannel.knock_delay_channel = 60;
1114	<	ConfigChannel.max_chans_per_user = 15;
1115	<	ConfigChannel.quiet_on_ban = 1;
1114	>	ConfigChannel.max_chans_per_user = 25;
1115	>	ConfigChannel.max_chans_per_oper = 50;
1116		ConfigChannel.max_bans = 25;
1117		ConfigChannel.default_split_user_count = 0;
1118		ConfigChannel.default_split_server_count = 0;
1119		ConfigChannel.no_join_on_split = 0;
1120		ConfigChannel.no_create_on_split = 0;
1843	–	ConfigChannel.burst_topicwho = 1;
1121
1122		ConfigServerHide.flatten_links = 0;
1123		ConfigServerHide.links_delay = 300;
1124		ConfigServerHide.hidden = 0;
1848	–	ConfigServerHide.disable_hidden = 0;
1125		ConfigServerHide.hide_servers = 0;
1126	<	DupString(ConfigServerHide.hidden_name, NETWORK_NAME_DEFAULT);
1126	>	ConfigServerHide.hide_services = 0;
1127	>	ConfigServerHide.hidden_name = xstrdup(NETWORK_NAME_DEFAULT);
1128		ConfigServerHide.hide_server_ips = 0;
1129	+	ConfigServerHide.disable_remote_commands = 0;
1130
1131	<
1854	<	DupString(ConfigFileEntry.service_name, SERVICE_NAME_DEFAULT);
1131	>	ConfigFileEntry.service_name = xstrdup(SERVICE_NAME_DEFAULT);
1132		ConfigFileEntry.max_watch = WATCHSIZE_DEFAULT;
1133	+	ConfigFileEntry.cycle_on_host_change = 1;
1134	+	ConfigFileEntry.glines = 0;
1135	+	ConfigFileEntry.gline_time = 12 * 3600;
1136	+	ConfigFileEntry.gline_request_time = GLINE_REQUEST_EXPIRE_DEFAULT;
1137		ConfigFileEntry.gline_min_cidr = 16;
1138		ConfigFileEntry.gline_min_cidr6 = 48;
1139		ConfigFileEntry.invisible_on_connect = 1;
1859	–	ConfigFileEntry.burst_away = 0;
1860	–	ConfigFileEntry.use_whois_actually = 1;
1140		ConfigFileEntry.tkline_expire_notices = 1;
1141		ConfigFileEntry.hide_spoof_ips = 1;
1142		ConfigFileEntry.ignore_bogus_ts = 0;
1143		ConfigFileEntry.disable_auth = 0;
1865	–	ConfigFileEntry.disable_remote = 0;
1144		ConfigFileEntry.kill_chase_time_limit = 90;
1145		ConfigFileEntry.default_floodcount = 8;
1146		ConfigFileEntry.failed_oper_notice = 1;
#	Line 1876 | Line 1154 | set_default_conf(void)
1154		ConfigFileEntry.anti_spam_exit_message_time = 0;
1155		ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
1156		ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
1879	–	ConfigFileEntry.kline_with_reason = 1;
1880	–	ConfigFileEntry.kline_reason = NULL;
1157		ConfigFileEntry.warn_no_nline = 1;
1158		ConfigFileEntry.stats_o_oper_only = 0;
1159		ConfigFileEntry.stats_k_oper_only = 1;  /* masked */
1160		ConfigFileEntry.stats_i_oper_only = 1;  /* masked */
1161		ConfigFileEntry.stats_P_oper_only = 0;
1162	+	ConfigFileEntry.stats_u_oper_only = 0;
1163		ConfigFileEntry.caller_id_wait = 60;
1164		ConfigFileEntry.opers_bypass_callerid = 0;
1165		ConfigFileEntry.pace_wait = 10;
#	Line 1892 | Line 1169 | set_default_conf(void)
1169		ConfigFileEntry.no_oper_flood = 0;
1170		ConfigFileEntry.true_no_oper_flood = 0;
1171		ConfigFileEntry.oper_pass_resv = 1;
1895	–	ConfigFileEntry.glines = 0;
1896	–	ConfigFileEntry.gline_time = 12 * 3600;
1172		ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
1898	–	ConfigFileEntry.client_flood = CLIENT_FLOOD_DEFAULT;
1173		ConfigFileEntry.oper_only_umodes = UMODE_DEBUG;
1174		ConfigFileEntry.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE |
1175		UMODE_OPERWALL | UMODE_WALLOP;
#	Line 1914 | Line 1188 | validate_conf(void)
1188		ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
1189
1190		if (ServerInfo.network_name == NULL)
1191	<	DupString(ServerInfo.network_name,NETWORK_NAME_DEFAULT);
1191	>	ServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
1192
1193		if (ServerInfo.network_desc == NULL)
1194	<	DupString(ServerInfo.network_desc,NETWORK_DESC_DEFAULT);
1194	>	ServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
1195
1196		if (ConfigFileEntry.service_name == NULL)
1197	<	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;
1197	>	ConfigFileEntry.service_name = xstrdup(SERVICE_NAME_DEFAULT);
1198
1199		ConfigFileEntry.max_watch = IRCD_MAX(ConfigFileEntry.max_watch, WATCHSIZE_MIN);
1200		}
1201
1202	<	/* read_conf()
1202	>	/* read_conf()
1203		*
1204		* inputs       - file descriptor pointing to config file to use
1205		* output       - None
#	Line 1942 | Line 1212 | read_conf(FILE *file)
1212
1213		set_default_conf(); /* Set default values prior to conf parsing */
1214		conf_parser_ctx.pass = 1;
1215	<	yyparse();          /* pick up the classes first */
1215	>	yyparse();          /* pick up the classes first */
1216
1217		rewind(file);
1218
#	Line 1950 | Line 1220 | read_conf(FILE *file)
1220		yyparse();          /* Load the values from the conf */
1221		validate_conf();    /* Check to make sure some values are still okay. */
1222		/* Some global values are also loaded here. */
1223	<	check_class();      /* Make sure classes are valid */
1223	>	class_delete_marked();      /* Make sure classes are valid */
1224		}
1225
1226		/* lookup_confhost()
#	Line 1958 | Line 1228 | read_conf(FILE *file)
1228		* start DNS lookups of all hostnames in the conf
1229		* line and convert an IP addresses in a.b.c.d number for to IP#s.
1230		*/
1231	<	static void
1232	<	lookup_confhost(struct ConfItem *conf)
1231	>	void
1232	>	lookup_confhost(struct MaskItem *conf)
1233		{
1964	–	struct AccessItem *aconf;
1234		struct addrinfo hints, *res;
1235
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	–
1236		/* Do name lookup now on hostnames given and store the
1237		* ip numbers in conf structure.
1238		*/
#	Line 1989 | Line 1244 | lookup_confhost(struct ConfItem *conf)
1244		/* Get us ready for a bind() and don't bother doing dns lookup */
1245		hints.ai_flags = AI_PASSIVE | AI_NUMERICHOST;
1246
1247	<	if (getaddrinfo(aconf->host, NULL, &hints, &res))
1247	>	if (getaddrinfo(conf->host, NULL, &hints, &res))
1248		{
1249	<	conf_dns_lookup(aconf);
1249	>	conf_dns_lookup(conf);
1250		return;
1251		}
1252
1253		assert(res != NULL);
1254
1255	<	memcpy(&aconf->addr, res->ai_addr, res->ai_addrlen);
1256	<	aconf->addr.ss_len = res->ai_addrlen;
1257	<	aconf->addr.ss.ss_family = res->ai_family;
1255	>	memcpy(&conf->addr, res->ai_addr, res->ai_addrlen);
1256	>	conf->addr.ss_len = res->ai_addrlen;
1257	>	conf->addr.ss.ss_family = res->ai_family;
1258	>
1259		freeaddrinfo(res);
1260		}
1261
#	Line 2014 | Line 1270 | int
1270		conf_connect_allowed(struct irc_ssaddr *addr, int aftype)
1271		{
1272		struct ip_entry *ip_found;
1273	<	struct AccessItem *aconf = find_dline_conf(addr, aftype);
1273	>	struct MaskItem *conf = find_dline_conf(addr, aftype);
1274
1275		/* DLINE exempt also gets you out of static limits/pacing... */
1276	<	if (aconf && (aconf->status & CONF_EXEMPTDLINE))
1276	>	if (conf && (conf->type == CONF_EXEMPT))
1277		return 0;
1278
1279	<	if (aconf != NULL)
1279	>	if (conf != NULL)
1280		return BANNED_CLIENT;
1281
1282		ip_found = find_or_add_ip(addr);
#	Line 2036 | Line 1292 | conf_connect_allowed(struct irc_ssaddr *
1292		return 0;
1293		}
1294
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	–
2061	–	/* find_kill()
2062	–	*
2063	–	* inputs       - pointer to client structure
2064	–	* output       - pointer to struct AccessItem if found
2065	–	* side effects - See if this user is klined already,
2066	–	*                and if so, return struct AccessItem pointer
2067	–	*/
2068	–	struct AccessItem *
2069	–	find_kill(struct Client *client_p)
2070	–	{
2071	–	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;
2077	–
2078	–	assert(client_p != NULL);
2079	–
2080	–	aconf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
2081	–	CONF_KLINE, client_p->localClient->aftype,
2082	–	client_p->username, NULL, 1);
2083	–	if (aconf == NULL)
2084	–	aconf = find_regexp_kline(uhi);
2085	–
2086	–	return aconf;
2087	–	}
2088	–
2089	–	struct AccessItem *
2090	–	find_gline(struct Client *client_p)
2091	–	{
2092	–	struct AccessItem *aconf;
2093	–
2094	–	assert(client_p != NULL);
2095	–
2096	–	aconf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
2097	–	CONF_GLINE, client_p->localClient->aftype,
2098	–	client_p->username, NULL, 1);
2099	–	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	–	}
2122	–	}
2123	–
1295		/* cleanup_tklines()
1296		*
1297		* inputs       - NONE
#	Line 2132 | Line 1303 | void
1303		cleanup_tklines(void *notused)
1304		{
1305		hostmask_expire_temporary();
1306	<	expire_tklines(&temporary_xlines);
1307	<	expire_tklines(&temporary_resv);
1306	>	expire_tklines(&xconf_items);
1307	>	expire_tklines(&nresv_items);
1308	>	expire_tklines(&cresv_items);
1309		}
1310
1311		/* expire_tklines()
#	Line 2147 | Line 1319 | expire_tklines(dlink_list *tklist)
1319		{
1320		dlink_node *ptr;
1321		dlink_node *next_ptr;
1322	<	struct ConfItem *conf;
2151	<	struct MatchItem *xconf;
2152	<	struct MatchItem *nconf;
2153	<	struct ResvChannel *cconf;
1322	>	struct MaskItem *conf;
1323
1324		DLINK_FOREACH_SAFE(ptr, next_ptr, tklist->head)
1325		{
1326		conf = ptr->data;
1327
1328	<	if (conf->type == XLINE_TYPE)
1328	>	if (!conf->until || conf->until > CurrentTime)
1329	>	continue;
1330	>
1331	>	if (conf->type == CONF_XLINE)
1332		{
1333	<	xconf = (struct MatchItem *)map_to_conf(conf);
1334	<	if (xconf->hold <= CurrentTime)
1335	<	{
1336	<	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	<	}
1333	>	if (ConfigFileEntry.tkline_expire_notices)
1334	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1335	>	"Temporary X-line for [%s] expired", conf->name);
1336	>	conf_free(conf);
1337		}
1338	<	else if (conf->type == NRESV_TYPE)
1338	>	else if (conf->type == CONF_NRESV || conf->type == CONF_CRESV)
1339		{
1340	<	nconf = (struct MatchItem *)map_to_conf(conf);
1341	<	if (nconf->hold <= CurrentTime)
2176	<	{
2177	<	if (ConfigFileEntry.tkline_expire_notices)
2178	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1340	>	if (ConfigFileEntry.tkline_expire_notices)
1341	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1342		"Temporary RESV for [%s] expired", conf->name);
1343	<	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	<	}
1343	>	conf_free(conf);
1344		}
1345		}
1346		}
#	Line 2204 | Line 1353 | expire_tklines(dlink_list *tklist)
1353		*/
1354		static const struct oper_privs
1355		{
1356	<	const unsigned int oprivs;
1356	>	const unsigned int flag;
1357		const unsigned char c;
1358		} flag_list[] = {
1359	<	{ OPER_FLAG_ADMIN,       'A' },
1360	<	{ OPER_FLAG_REMOTEBAN,   'B' },
1361	<	{ OPER_FLAG_DIE,         'D' },
1362	<	{ OPER_FLAG_GLINE,       'G' },
1363	<	{ OPER_FLAG_REHASH,      'H' },
1364	<	{ OPER_FLAG_K,           'K' },
1365	<	{ OPER_FLAG_OPERWALL,    'L' },
1366	<	{ OPER_FLAG_N,           'N' },
1367	<	{ OPER_FLAG_GLOBAL_KILL, 'O' },
1368	<	{ OPER_FLAG_REMOTE,      'R' },
1369	<	{ OPER_FLAG_OPER_SPY,    'S' },
1370	<	{ OPER_FLAG_UNKLINE,     'U' },
1371	<	{ OPER_FLAG_X,           'X' },
1359	>	{ OPER_FLAG_ADMIN,          'A' },
1360	>	{ OPER_FLAG_REMOTEBAN,      'B' },
1361	>	{ OPER_FLAG_DIE,            'D' },
1362	>	{ OPER_FLAG_GLINE,          'G' },
1363	>	{ OPER_FLAG_REHASH,         'H' },
1364	>	{ OPER_FLAG_K,              'K' },
1365	>	{ OPER_FLAG_OPERWALL,       'L' },
1366	>	{ OPER_FLAG_KILL,           'N' },
1367	>	{ OPER_FLAG_KILL_REMOTE,    'O' },
1368	>	{ OPER_FLAG_CONNECT,        'P' },
1369	>	{ OPER_FLAG_CONNECT_REMOTE, 'Q' },
1370	>	{ OPER_FLAG_SQUIT,          'R' },
1371	>	{ OPER_FLAG_SQUIT_REMOTE,   'S' },
1372	>	{ OPER_FLAG_UNKLINE,        'U' },
1373	>	{ OPER_FLAG_XLINE,          'X' },
1374		{ 0, '\0' }
1375		};
1376
1377		char *
1378		oper_privs_as_string(const unsigned int port)
1379		{
1380	<	static char privs_out[16];
1380	>	static char privs_out[IRCD_BUFSIZE];
1381		char *privs_ptr = privs_out;
1382	<	unsigned int i = 0;
1382	>	const struct oper_privs *opriv = flag_list;
1383
1384	<	for (; flag_list[i].oprivs; ++i)
1384	>	for (; opriv->flag; ++opriv)
1385		{
1386	<	if (port & flag_list[i].oprivs)
1387	<	*privs_ptr++ = flag_list[i].c;
1386	>	if (port & opriv->flag)
1387	>	*privs_ptr++ = opriv->c;
1388		else
1389	<	*privs_ptr++ = ToLowerTab[flag_list[i].c];
1389	>	*privs_ptr++ = ToLower(opriv->c);
1390		}
1391
1392		*privs_ptr = '\0';
#	Line 2252 | Line 1403 | oper_privs_as_string(const unsigned int
1403		const char *
1404		get_oper_name(const struct Client *client_p)
1405		{
1406	<	dlink_node *cnode = NULL;
1406	>	const dlink_node *cnode = NULL;
1407		/* +5 for !,@,{,} and null */
1408		static char buffer[NICKLEN + USERLEN + HOSTLEN + HOSTLEN + 5];
1409
#	Line 2260 | Line 1411 | get_oper_name(const struct Client *clien
1411		{
1412		if ((cnode = client_p->localClient->confs.head))
1413		{
1414	<	struct ConfItem *conf = cnode->data;
2264	<	const struct AccessItem *aconf = map_to_conf(conf);
1414	>	const struct MaskItem *conf = cnode->data;
1415
1416	<	if (IsConfOperator(aconf))
1416	>	if (IsConfOperator(conf))
1417		{
1418	<	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1418	>	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1419		client_p->username, client_p->host, conf->name);
1420	<	return buffer;
1420	>	return buffer;
1421		}
1422		}
1423
1424	<	/* Probably should assert here for now. If there is an oper out there
1424	>	/* Probably should assert here for now. If there is an oper out there
1425		* with no oper{} conf attached, it would be good for us to know...
1426		*/
1427		assert(0); /* Oper without oper conf! */
1428		}
1429
1430		snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1431	<	client_p->username, client_p->host, client_p->servptr->name);
1431	>	client_p->username, client_p->host, client_p->servptr->name);
1432		return buffer;
1433		}
1434
#	Line 2292 | Line 1442 | void
1442		read_conf_files(int cold)
1443		{
1444		const char *filename;
1445	<	char chanmodes[32];
1446	<	char chanlimit[32];
1445	>	char chanmodes[IRCD_BUFSIZE];
1446	>	char chanlimit[IRCD_BUFSIZE];
1447
1448		conf_parser_ctx.boot = cold;
1449	<	filename = get_conf_name(CONF_TYPE);
1449	>	filename = ConfigFileEntry.configfile;
1450
1451		/* We need to know the initial filename for the yyerror() to report
1452		FIXME: The full path is in conffilenamebuf first time since we
1453		dont know anything else
1454
1455	<	- Gozem 2002-07-21
1455	>	- Gozem 2002-07-21
1456		*/
1457		strlcpy(conffilebuf, filename, sizeof(conffilebuf));
1458
#	Line 2316 | Line 1466 | read_conf_files(int cold)
1466		}
1467		else
1468		{
1469	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1470	<	"Unable to read configuration file '%s': %s",
1471	<	filename, strerror(errno));
1469	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1470	>	"Unable to read configuration file '%s': %s",
1471	>	filename, strerror(errno));
1472		return;
1473		}
1474		}
#	Line 2329 | Line 1479 | read_conf_files(int cold)
1479		read_conf(conf_parser_ctx.conf_file);
1480		fclose(conf_parser_ctx.conf_file);
1481
1482	+	log_reopen_all();
1483	+
1484	+	add_isupport("NICKLEN", NULL, ServerInfo.max_nick_length);
1485		add_isupport("NETWORK", ServerInfo.network_name, -1);
1486	<	snprintf(chanmodes, sizeof(chanmodes), "b%s%s:%d",
1487	<	ConfigChannel.use_except ? "e" : "",
2335	<	ConfigChannel.use_invex ? "I" : "", ConfigChannel.max_bans);
1486	>
1487	>	snprintf(chanmodes, sizeof(chanmodes), "beI:%d", ConfigChannel.max_bans);
1488		add_isupport("MAXLIST", chanmodes, -1);
1489		add_isupport("MAXTARGETS", NULL, ConfigFileEntry.max_targets);
1490	+	add_isupport("CHANTYPES", "#", -1);
1491
1492	<	if (ConfigChannel.disable_local_channels)
1493	<	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);
1492	>	snprintf(chanlimit, sizeof(chanlimit), "#:%d",
1493	>	ConfigChannel.max_chans_per_user);
1494		add_isupport("CHANLIMIT", chanlimit, -1);
1495	<	snprintf(chanmodes, sizeof(chanmodes), "%s%s%s",
2349	<	ConfigChannel.use_except ? "e" : "",
2350	<	ConfigChannel.use_invex ? "I" : "", "b,k,l,imnprstORS");
1495	>	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,imnprstORS");
1496		add_isupport("CHANNELLEN", NULL, LOCAL_CHANNELLEN);
1497	<
2353	<	if (ConfigChannel.use_except)
2354	<	add_isupport("EXCEPTS", "e", -1);
2355	<	if (ConfigChannel.use_invex)
2356	<	add_isupport("INVEX", "I", -1);
1497	>	add_isupport("TOPICLEN", NULL, ServerInfo.max_topic_length);
1498		add_isupport("CHANMODES", chanmodes, -1);
1499
1500		/*
#	Line 2361 | Line 1502 | read_conf_files(int cold)
1502		* on strlen(form_str(RPL_ISUPPORT))
1503		*/
1504		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	–	}
1505		}
1506
1507		/* clear_out_old_conf()
#	Line 2412 | Line 1514 | static void
1514		clear_out_old_conf(void)
1515		{
1516		dlink_node *ptr = NULL, *next_ptr = NULL;
1517	<	struct ConfItem *conf;
2416	<	struct AccessItem *aconf;
2417	<	struct ClassItem *cltmp;
2418	<	struct MatchItem *match_item;
1517	>	struct MaskItem *conf;
1518		dlink_list *free_items [] = {
1519		&server_items,   &oconf_items,
1520	<	&uconf_items,   &xconf_items, &rxconf_items, &rkconf_items,
1521	<	&nresv_items, &cluster_items,  &gdeny_items, &service_items, NULL
1520	>	&uconf_items,   &xconf_items,
1521	>	&nresv_items, &cluster_items,  &service_items, &cresv_items, NULL
1522		};
1523
1524		dlink_list ** iterator = free_items; /* C is dumb */
#	Line 2427 | Line 1526 | clear_out_old_conf(void)
1526		/* We only need to free anything allocated by yyparse() here.
1527		* Resetting structs, etc, is taken care of by set_default_conf().
1528		*/
1529	<
1529	>
1530		for (; *iterator != NULL; iterator++)
1531		{
1532		DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
1533		{
1534		conf = ptr->data;
2436	–	/* XXX This is less than pretty */
2437	–	if (conf->type == SERVER_TYPE)
2438	–	{
2439	–	aconf = map_to_conf(conf);
1535
1536	<	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);
1536	>	dlinkDelete(&conf->node, map_to_list(conf->type));
1537
1538	<	if (aconf->clients != 0)
1539	<	{
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)
1538	>	/* XXX This is less than pretty */
1539	>	if (conf->type == CONF_SERVER || conf->type == CONF_OPER)
1540		{
1541	<	/* temporary (r)xlines are also on
1542	<	* the (r)xconf items list */
2471	<	if (conf->flags & CONF_FLAGS_TEMPORARY)
2472	<	continue;
2473	<
2474	<	delete_conf_item(conf);
1541	>	if (!conf->ref_count)
1542	>	conf_free(conf);
1543		}
1544	<	else
1544	>	else if (conf->type == CONF_XLINE)
1545		{
1546	<	delete_conf_item(conf);
1546	>	if (!conf->until)
1547	>	conf_free(conf);
1548		}
1549	+	else
1550	+	conf_free(conf);
1551		}
1552		}
1553
1554	+	motd_clear();
1555	+
1556		/*
1557		* don't delete the class table, rather mark all entries
1558	<	* for deletion. The table is cleaned up by check_class. - avalon
1558	>	* for deletion. The table is cleaned up by class_delete_marked. - avalon
1559		*/
1560	<	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	<	}
1560	>	class_mark_for_deletion();
1561
1562		clear_out_address_conf();
1563
#	Line 2526 | Line 1593 | clear_out_old_conf(void)
1593		SSL_OP_NO_TLSv1);
1594		#endif
1595
2529	–	/* clean out old resvs from the conf */
2530	–	clear_conf_resv();
2531	–
1596		/* clean out AdminInfo */
1597		MyFree(AdminInfo.name);
1598		AdminInfo.name = NULL;
#	Line 2537 | Line 1601 | clear_out_old_conf(void)
1601		MyFree(AdminInfo.description);
1602		AdminInfo.description = NULL;
1603
2540	–	/* operator{} and class{} blocks are freed above */
1604		/* clean out listeners */
1605		close_listeners();
1606
2544	–	/* auth{}, quarantine{}, shared{}, connect{}, kill{}, deny{},
2545	–	* exempt{} and gecos{} blocks are freed above too
2546	–	*/
2547	–
1607		/* clean out general */
1608		MyFree(ConfigFileEntry.service_name);
1609		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;
1610		}
1611
1612		/* conf_add_class_to_conf()
1613		*
1614		* inputs       - pointer to config item
1615		* output       - NONE
1616	<	* side effects - Add a class pointer to a conf
1616	>	* side effects - Add a class pointer to a conf
1617		*/
1618		void
1619	<	conf_add_class_to_conf(struct ConfItem *conf, const char *class_name)
1619	>	conf_add_class_to_conf(struct MaskItem *conf, const char *class_name)
1620		{
1621	<	struct AccessItem *aconf = map_to_conf(conf);
2843	<	struct ClassItem *class = NULL;
2844	<
2845	<	if (class_name == NULL)
1621	>	if (class_name == NULL)
1622		{
1623	<	aconf->class_ptr = class_default;
1623	>	conf->class = class_default;
1624
1625	<	if (conf->type == CLIENT_TYPE)
1626	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1627	<	"Warning *** Defaulting to default class for %s@%s",
1628	<	aconf->user, aconf->host);
1625	>	if (conf->type == CONF_CLIENT)
1626	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1627	>	"Warning *** Defaulting to default class for %s@%s",
1628	>	conf->user, conf->host);
1629		else
1630	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1631	<	"Warning *** Defaulting to default class for %s",
1632	<	conf->name);
1630	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1631	>	"Warning *** Defaulting to default class for %s",
1632	>	conf->name);
1633		}
1634		else
1635	<	aconf->class_ptr = find_class(class_name);
2860	<
2861	<	if (aconf->class_ptr)
2862	<	class = map_to_conf(aconf->class_ptr);
1635	>	conf->class = class_find(class_name, 1);
1636
1637	<	if (aconf->class_ptr == NULL || !class->active)
1637	>	if (conf->class == NULL)
1638		{
1639	<	if (conf->type == CLIENT_TYPE)
1640	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1641	<	"Warning *** Defaulting to default class for %s@%s",
1642	<	aconf->user, aconf->host);
1639	>	if (conf->type == CONF_CLIENT)
1640	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1641	>	"Warning *** Defaulting to default class for %s@%s",
1642	>	conf->user, conf->host);
1643		else
1644	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1645	<	"Warning *** Defaulting to default class for %s",
1646	<	conf->name);
1647	<	aconf->class_ptr = class_default;
1644	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1645	>	"Warning *** Defaulting to default class for %s",
1646	>	conf->name);
1647	>	conf->class = class_default;
1648		}
1649		}
1650
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;
2905	–	}
2906	–
2907	–	lookup_confhost(conf);
2908	–
2909	–	return 0;
2910	–	}
2911	–
1651		/* yyerror()
1652		*
1653		* inputs       - message from parser
#	Line 2924 | Line 1663 | yyerror(const char *msg)
1663		return;
1664
1665		strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1666	<	sendto_realops_flags(UMODE_ALL, L_ALL, "\"%s\", line %u: %s: %s",
1666	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1667	>	"\"%s\", line %u: %s: %s",
1668	>	conffilebuf, lineno + 1, msg, newlinebuf);
1669	>	ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1670	>	conffilebuf, lineno + 1, msg, newlinebuf);
1671	>	}
1672	>
1673	>	void
1674	>	conf_error_report(const char *msg)
1675	>	{
1676	>	char newlinebuf[IRCD_BUFSIZE];
1677	>
1678	>	strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1679	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1680	>	"\"%s\", line %u: %s: %s",
1681		conffilebuf, lineno + 1, msg, newlinebuf);
1682		ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1683		conffilebuf, lineno + 1, msg, newlinebuf);
#	Line 2932 | Line 1685 | yyerror(const char *msg)
1685
1686		/*
1687		* valid_tkline()
1688	<	*
1688	>	*
1689		* inputs       - pointer to ascii string to check
1690		*              - whether the specified time is in seconds or minutes
1691		* output       - -1 not enough parameters
#	Line 2941 | Line 1694 | yyerror(const char *msg)
1694		* Originally written by Dianora (Diane, db@db.net)
1695		*/
1696		time_t
1697	<	valid_tkline(const char *p, int minutes)
1697	>	valid_tkline(const char *data, const int minutes)
1698		{
1699	+	const unsigned char *p = (const unsigned char *)data;
1700	+	unsigned char tmpch = '\0';
1701		time_t result = 0;
1702
1703	<	for (; *p; ++p)
1703	>	while ((tmpch = *p++))
1704		{
1705	<	if (!IsDigit(*p))
1705	>	if (!IsDigit(tmpch))
1706		return 0;
1707
1708		result *= 10;
1709	<	result += ((*p) & 0xF);
1709	>	result += (tmpch & 0xF);
1710		}
1711
1712		/*
1713	<	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1713	>	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1714		* i.e. they specifically use 0, I am going to return 1 instead
1715		* as a return value of non-zero is used to flag it as a temporary kline
1716		*/
1717		if (result == 0)
1718		result = 1;
1719
1720	<	/*
1720	>	/*
1721		* If the incoming time is in seconds convert it to minutes for the purpose
1722		* of this calculation
1723		*/
1724		if (!minutes)
1725	<	result = result / (time_t)60;
1725	>	result = result / 60;
1726
1727		if (result > MAX_TDKLINE_TIME)
1728		result = MAX_TDKLINE_TIME;
1729
1730	<	result = result * (time_t)60;  /* turn it into seconds */
1730	>	result = result * 60;  /* turn it into seconds */
1731
1732		return result;
1733		}
1734
1735	+	/* valid_wild_card_simple()
1736	+	*
1737	+	* inputs       - data to check for sufficient non-wildcard characters
1738	+	* outputs      - 1 if valid, else 0
1739	+	* side effects - none
1740	+	*/
1741	+	int
1742	+	valid_wild_card_simple(const char *data)
1743	+	{
1744	+	const unsigned char *p = (const unsigned char *)data;
1745	+	unsigned char tmpch = '\0';
1746	+	int nonwild = 0;
1747	+
1748	+	while ((tmpch = *p++))
1749	+	{
1750	+	if (tmpch == '\\')
1751	+	{
1752	+	++p;
1753	+	if (++nonwild >= ConfigFileEntry.min_nonwildcard_simple)
1754	+	return 1;
1755	+	}
1756	+	else if (!IsMWildChar(tmpch))
1757	+	{
1758	+	if (++nonwild >= ConfigFileEntry.min_nonwildcard_simple)
1759	+	return 1;
1760	+	}
1761	+	}
1762	+
1763	+	return 0;
1764	+	}
1765	+
1766		/* valid_wild_card()
1767		*
1768		* input        - pointer to client
#	Line 2988 | Line 1774 | valid_tkline(const char *p, int minutes)
1774		int
1775		valid_wild_card(struct Client *source_p, int warn, int count, ...)
1776		{
2991	–	char *p;
1777		char tmpch;
1778		int nonwild = 0;
1779		va_list args;
#	Line 3009 | Line 1794 | valid_wild_card(struct Client *source_p,
1794
1795		while (count--)
1796		{
1797	<	p = va_arg(args, char *);
1797	>	const char *p = va_arg(args, const char *);
1798		if (p == NULL)
1799		continue;
1800
#	Line 3022 | Line 1807 | valid_wild_card(struct Client *source_p,
1807		* break - no point in searching further.
1808		*/
1809		if (++nonwild >= ConfigFileEntry.min_nonwildcard)
1810	+	{
1811	+	va_end(args);
1812		return 1;
1813	+	}
1814		}
1815		}
1816		}
#	Line 3030 | Line 1818 | valid_wild_card(struct Client *source_p,
1818		if (warn)
1819		sendto_one(source_p, ":%s NOTICE %s :Please include at least %d non-wildcard characters with the mask",
1820		me.name, source_p->name, ConfigFileEntry.min_nonwildcard);
1821	+	va_end(args);
1822		return 0;
1823		}
1824
#	Line 3043 | Line 1832 | valid_wild_card(struct Client *source_p,
1832		*              - parse_flags bit map of things to test
1833		*              - pointer to user or string to parse into
1834		*              - pointer to host or NULL to parse into if non NULL
1835	<	*              - pointer to optional tkline time or NULL
1835	>	*              - pointer to optional tkline time or NULL
1836		*              - pointer to target_server to parse into if non NULL
1837		*              - pointer to reason to parse into
1838		*
#	Line 3065 | Line 1854 | valid_wild_card(struct Client *source_p,
1854		*/
1855		int
1856		parse_aline(const char *cmd, struct Client *source_p,
1857	<	int parc, char **parv,
1858	<	int parse_flags, char **up_p, char **h_p, time_t *tkline_time,
1859	<	char **target_server, char **reason)
1857	>	int parc, char **parv,
1858	>	int parse_flags, char **up_p, char **h_p, time_t *tkline_time,
1859	>	char **target_server, char **reason)
1860		{
1861		int found_tkline_time=0;
1862		static char def_reason[] = "No Reason";
#	Line 3089 | Line 1878 | parse_aline(const char *cmd, struct Clie
1878		else
1879		{
1880		sendto_one(source_p, ":%s NOTICE %s :temp_line not supported by %s",
1881	<	me.name, source_p->name, cmd);
1881	>	me.name, source_p->name, cmd);
1882		return -1;
1883		}
1884		}
1885
1886		if (parc == 0)
1887		{
1888	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
3100	<	me.name, source_p->name, cmd);
1888	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1889		return -1;
1890		}
1891
#	Line 3111 | Line 1899 | parse_aline(const char *cmd, struct Clie
1899		*up_p = user;
1900		*h_p = host;
1901		}
1902	<
1902	>
1903		parc--;
1904		parv++;
1905
#	Line 3124 | Line 1912 | parse_aline(const char *cmd, struct Clie
1912
1913		if (target_server == NULL)
1914		{
1915	<	sendto_one(source_p, ":%s NOTICE %s :ON server not supported by %s",
1916	<	me.name, source_p->name, cmd);
1917	<	return -1;
1915	>	sendto_one(source_p, ":%s NOTICE %s :ON server not supported by %s",
1916	>	me.name, source_p->name, cmd);
1917	>	return -1;
1918		}
1919
1920		if (!HasOFlag(source_p, OPER_FLAG_REMOTEBAN))
1921		{
1922	<	sendto_one(source_p, form_str(ERR_NOPRIVS),
3135	<	me.name, source_p->name, "remoteban");
1922	>	sendto_one_numeric(source_p, &me, ERR_NOPRIVS, "remoteban");
1923		return -1;
1924		}
1925
1926		if (parc == 0 || EmptyString(*parv))
1927		{
1928	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1929	<	me.name, source_p->name, cmd);
3143	<	return -1;
1928	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1929	>	return -1;
1930		}
1931
1932		*target_server = *parv;
#	Line 3153 | Line 1939 | parse_aline(const char *cmd, struct Clie
1939		* caller probably NULL'd it first, but no harm to do it again -db
1940		*/
1941		if (target_server != NULL)
1942	<	*target_server = NULL;
1942	>	*target_server = NULL;
1943		}
1944		}
1945
#	Line 3179 | Line 1965 | parse_aline(const char *cmd, struct Clie
1965		{
1966		*reason = *parv;
1967		if (!valid_comment(source_p, *reason, 1))
1968	<	return -1;
1968	>	return -1;
1969		}
1970		else
1971		*reason = def_reason;
#	Line 3218 | Line 2004 | find_user_host(struct Client *source_p,
2004		{
2005		*(hostp++) = '\0';                       /* short and squat */
2006		if (*user_host_or_nick)
2007	<	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
2007	>	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
2008		else
2009	<	strcpy(luser, "*");
2009	>	strcpy(luser, "*");
2010	>
2011		if (*hostp)
2012	<	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
2012	>	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
2013		else
2014	<	strcpy(lhost, "*");
2014	>	strcpy(lhost, "*");
2015		}
2016		else
2017		{
2018		luser[0] = '*';             /* no @ found, assume its *@somehost */
2019	<	luser[1] = '\0';
2019	>	luser[1] = '\0';
2020		strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
2021		}
2022	<
2022	>
2023		return 1;
2024		}
2025	<	else if (!(flags & NOUSERLOOKUP))
2025	>	else
2026		{
2027		/* Try to find user@host mask from nick */
2028		/* Okay to use source_p as the first param, because source_p == client_p */
2029	<	if ((target_p =
2030	<	find_chasing(source_p, source_p, user_host_or_nick, NULL)) == NULL)
2029	>	if ((target_p =
2030	>	find_chasing(source_p, user_host_or_nick, NULL)) == NULL)
2031		return 0;
2032
2033		if (IsExemptKline(target_p))
2034		{
2035		if (!IsServer(source_p))
2036	<	sendto_one(source_p,
2037	<	":%s NOTICE %s :%s is E-lined",
2038	<	me.name, source_p->name, target_p->name);
2036	>	sendto_one(source_p,
2037	>	":%s NOTICE %s :%s is E-lined",
2038	>	me.name, source_p->name, target_p->name);
2039		return 0;
2040		}
2041
#	Line 3283 | Line 2070 | find_user_host(struct Client *source_p,
2070		int
2071		valid_comment(struct Client *source_p, char *comment, int warn)
2072		{
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	–
2073		if (strlen(comment) > REASONLEN)
2074		comment[REASONLEN-1] = '\0';
2075
#	Line 3305 | Line 2084 | valid_comment(struct Client *source_p, c
2084		* side effects - none
2085		*/
2086		int
2087	<	match_conf_password(const char *password, const struct AccessItem *aconf)
2087	>	match_conf_password(const char *password, const struct MaskItem *conf)
2088		{
2089		const char *encr = NULL;
2090
2091	<	if (EmptyString(password) || EmptyString(aconf->passwd))
2091	>	if (EmptyString(password) || EmptyString(conf->passwd))
2092		return 0;
2093
2094	<	if (aconf->flags & CONF_FLAGS_ENCRYPTED)
2095	<	encr = crypt(password, aconf->passwd);
2094	>	if (conf->flags & CONF_FLAGS_ENCRYPTED)
2095	>	encr = crypt(password, conf->passwd);
2096		else
2097		encr = password;
2098
2099	<	return !strcmp(encr, aconf->passwd);
2099	>	return !strcmp(encr, conf->passwd);
2100		}
2101
2102		/*
#	Line 3346 | Line 2125 | cluster_a_line(struct Client *source_p,
2125
2126		DLINK_FOREACH(ptr, cluster_items.head)
2127		{
2128	<	const struct ConfItem *conf = ptr->data;
2128	>	const struct MaskItem *conf = ptr->data;
2129
2130		if (conf->flags & cluster_type)
2131		sendto_match_servs(source_p, conf->name, CAP_CLUSTER|capab,
2132	<	"%s %s %s", command, conf->name, buffer);
2132	>	"%s %s %s", command, conf->name, buffer);
2133		}
2134		}
2135
#	Line 3401 | Line 2180 | split_nuh(struct split_nuh_item *const i
2180		if (iptr->nickptr && *iptr->nuhmask != '\0')
2181		strlcpy(iptr->nickptr, iptr->nuhmask, iptr->nicksize);
2182
2183	<	if ((q = strchr(++p, '@'))) {
2183	>	if ((q = strchr(++p, '@')))
2184	>	{
2185		*q++ = '\0';
2186
2187		if (*p != '\0')
#	Line 3440 | Line 2220 | split_nuh(struct split_nuh_item *const i
2220		}
2221		}
2222		}
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)