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 1401 by michael, Tue May 8 18:58:13 2012 UTC vs.
ircd-hybrid/trunk/src/conf.c (file contents), Revision 3215 by michael, Tue Mar 25 19:23:15 2014 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  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;
263	<
264	<	case XLINE_TYPE:
265	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
266	<	sizeof(struct MatchItem));
267	<	dlinkAdd(conf, &conf->node, &xconf_items);
268	<	break;
269	<	#ifdef HAVE_LIBPCRE
270	<	case RXLINE_TYPE:
271	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
272	<	sizeof(struct MatchItem));
273	<	dlinkAdd(conf, &conf->node, &rxconf_items);
274	<	break;
275	<
276	<	case RKLINE_TYPE:
277	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
278	<	sizeof(struct AccessItem));
279	<	aconf = map_to_conf(conf);
280	<	aconf->status = CONF_KLINE;
281	<	dlinkAdd(conf, &conf->node, &rkconf_items);
282	<	break;
283	<	#endif
284	<	case CLUSTER_TYPE:
285	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem));
286	<	dlinkAdd(conf, &conf->node, &cluster_items);
287	<	break;
288	<
289	<	case CRESV_TYPE:
290	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
291	<	sizeof(struct ResvChannel));
292	<	break;
293	<
294	<	case NRESV_TYPE:
295	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
296	<	sizeof(struct MatchItem));
297	<	dlinkAdd(conf, &conf->node, &nresv_items);
298	<	break;
299	<
300	<	case SERVICE_TYPE:
301	<	status = CONF_SERVICE;
302	<	conf = MyMalloc(sizeof(struct ConfItem));
303	<	dlinkAdd(conf, &conf->node, &service_items);
304	<	break;
305	<
306	<	case CLASS_TYPE:
307	<	conf = MyMalloc(sizeof(struct ConfItem) +
308	<	sizeof(struct ClassItem));
309	<	dlinkAdd(conf, &conf->node, &class_items);
310	<
311	<	aclass = map_to_conf(conf);
312	<	aclass->active = 1;
313	<	aclass->con_freq = DEFAULT_CONNECTFREQUENCY;
314	<	aclass->ping_freq = DEFAULT_PINGFREQUENCY;
315	<	aclass->max_total = MAXIMUM_LINKS_DEFAULT;
316	<	aclass->max_sendq = DEFAULT_SENDQ;
159	>	struct MaskItem *conf = MyMalloc(sizeof(*conf));
160	>	dlink_list *list = NULL;
161
162	<	break;
163	<
164	<	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
199	>	MyFree(conf->cipher_list);
200
201	<	/* Yes, sigh. switch on type again */
202	<	switch(type)
376	<	{
377	<	case EXEMPTDLINE_TYPE:
378	<	case DLINE_TYPE:
379	<	case GLINE_TYPE:
380	<	case KLINE_TYPE:
381	<	case CLIENT_TYPE:
382	<	MyFree(conf);
383	<	break;
384	<
385	<	case OPER_TYPE:
386	<	aconf = map_to_conf(conf);
387	<	if (!IsConfIllegal(aconf))
388	<	dlinkDelete(&conf->node, &oconf_items);
389	<	MyFree(conf);
390	<	break;
391	<
392	<	case SERVER_TYPE:
393	<	aconf = map_to_conf(conf);
394	<
395	<	DLINK_FOREACH_SAFE(m, m_next, aconf->hub_list.head)
396	<	{
397	<	MyFree(m->data);
398	<	free_dlink_node(m);
399	<	}
400	<
401	<	DLINK_FOREACH_SAFE(m, m_next, aconf->leaf_list.head)
402	<	{
403	<	MyFree(m->data);
404	<	free_dlink_node(m);
405	<	}
406	<
407	<	if (!IsConfIllegal(aconf))
408	<	dlinkDelete(&conf->node, &server_items);
409	<	MyFree(conf);
410	<	break;
411	<
412	<	default:
413	<	break;
414	<	}
415	<	break;
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");
264	>	exit_client(source_p, "No more connections allowed on that IP");
265		break;
266
267		case I_LINE_FULL:
268	<	sendto_realops_flags(UMODE_FULL, L_ALL,
269	<	"I-line is full for %s (%s).",
270	<	get_client_name(source_p, SHOW_IP),
271	<	source_p->sockhost);
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,
820	<	"No more connections allowed in your connection class");
275	>	exit_client(source_p, "No more connections allowed in your connection class");
276		break;
277
278		case NOT_AUTHORIZED:
279		++ServerStats.is_ref;
280		/* jdc - lists server name & port connections are on */
281		/*       a purely cosmetical change */
282	<	sendto_realops_flags(UMODE_UNAUTH, L_ALL,
283	<	"Unauthorized client connection from %s [%s] on [%s/%u].",
284	<	get_client_name(source_p, SHOW_IP),
285	<	source_p->sockhost,
286	<	source_p->localClient->listener->name,
287	<	source_p->localClient->listener->port);
282	>	sendto_realops_flags(UMODE_UNAUTH, L_ALL, SEND_NOTICE,
283	>	"Unauthorized client connection from %s [%s] on [%s/%u].",
284	>	get_client_name(source_p, SHOW_IP),
285	>	source_p->sockhost,
286	>	source_p->localClient->listener->name,
287	>	source_p->localClient->listener->port);
288		ilog(LOG_TYPE_IRCD,
289	<	"Unauthorized client connection from %s on [%s/%u].",
290	<	get_client_name(source_p, SHOW_IP),
291	<	source_p->localClient->listener->name,
292	<	source_p->localClient->listener->port);
293	<
294	<	/* 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");
289	>	"Unauthorized client connection from %s on [%s/%u].",
290	>	get_client_name(source_p, SHOW_IP),
291	>	source_p->localClient->listener->name,
292	>	source_p->localClient->listener->port);
293	>
294	>	exit_client(source_p, "You are not authorized to use this server");
295		break;
296
297		case BANNED_CLIENT:
298	<	/*
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");
298	>	exit_client(source_p, "Banned");
299		++ServerStats.is_ref;
300		break;
301
#	Line 871 | Line 304 | check_client(va_list args)
304		break;
305		}
306
307	<	return (i < 0 ? NULL : source_p);
307	>	return (i < 0 ? 0 : 1);
308		}
309
310		/* verify_access()
311		*
312		* inputs       - pointer to client to verify
880	–	*              - pointer to proposed username
313		* output       - 0 if success -'ve if not
314		* side effect  - find the first (best) I line to attach.
315		*/
316		static int
317	<	verify_access(struct Client *client_p, const char *username)
317	>	verify_access(struct Client *client_p)
318		{
319	<	struct AccessItem *aconf = NULL, *rkconf = NULL;
320	<	struct ConfItem *conf = NULL;
889	<	char non_ident[USERLEN + 1] = { '~', '\0' };
890	<	const char *uhi[3];
319	>	struct MaskItem *conf = NULL;
320	>	char non_ident[USERLEN + 1] = "~";
321
322		if (IsGotId(client_p))
323		{
324	<	aconf = find_address_conf(client_p->host, client_p->username,
325	<	&client_p->localClient->ip,
326	<	client_p->localClient->aftype,
324	>	conf = find_address_conf(client_p->host, client_p->username,
325	>	&client_p->localClient->ip,
326	>	client_p->localClient->aftype,
327		client_p->localClient->passwd);
328		}
329		else
330		{
331	<	strlcpy(non_ident+1, username, sizeof(non_ident)-1);
332	<	aconf = find_address_conf(client_p->host,non_ident,
333	<	&client_p->localClient->ip,
334	<	client_p->localClient->aftype,
335	<	client_p->localClient->passwd);
331	>	strlcpy(non_ident + 1, client_p->username, sizeof(non_ident) - 1);
332	>	conf = find_address_conf(client_p->host,non_ident,
333	>	&client_p->localClient->ip,
334	>	client_p->localClient->aftype,
335	>	client_p->localClient->passwd);
336		}
337
338	<	uhi[0] = IsGotId(client_p) ? client_p->username : non_ident;
909	<	uhi[1] = client_p->host;
910	<	uhi[2] = client_p->sockhost;
911	<
912	<	rkconf = find_regexp_kline(uhi);
913	<
914	<	if (aconf != NULL)
338	>	if (conf)
339		{
340	<	if (IsConfClient(aconf) && !rkconf)
340	>	if (IsConfClient(conf))
341		{
342	<	conf = unmap_conf_item(aconf);
919	<
920	<	if (IsConfRedir(aconf))
342	>	if (IsConfRedir(conf))
343		{
344	<	sendto_one(client_p, form_str(RPL_REDIR),
345	<	me.name, client_p->name,
346	<	conf->name ? conf->name : "",
347	<	aconf->port);
926	<	return(NOT_AUTHORIZED);
344	>	sendto_one_numeric(client_p, &me, RPL_REDIR,
345	>	conf->name ? conf->name : "",
346	>	conf->port);
347	>	return NOT_AUTHORIZED;
348		}
349
350	<	if (IsConfDoIdentd(aconf))
351	<	SetNeedId(client_p);
350	>	if (IsConfDoIdentd(conf))
351	>	SetNeedId(client_p);
352
353		/* Thanks for spoof idea amm */
354	<	if (IsConfDoSpoofIp(aconf))
354	>	if (IsConfDoSpoofIp(conf))
355		{
356	<	conf = unmap_conf_item(aconf);
357	<
358	<	if (!ConfigFileEntry.hide_spoof_ips && IsConfSpoofNotice(aconf))
938	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "%s spoofing: %s as %s",
356	>	if (!ConfigFileEntry.hide_spoof_ips && IsConfSpoofNotice(conf))
357	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
358	>	"%s spoofing: %s as %s",
359		client_p->name, client_p->host, conf->name);
360		strlcpy(client_p->host, conf->name, sizeof(client_p->host));
361	<	SetIPSpoof(client_p);
361	>	AddFlag(client_p, FLAGS_IP_SPOOFING | FLAGS_AUTH_SPOOF);
362		}
363
364	<	return(attach_iline(client_p, conf));
364	>	return attach_iline(client_p, conf);
365		}
366	<	else if (rkconf || IsConfKill(aconf) || (ConfigFileEntry.glines && IsConfGline(aconf)))
366	>	else if (IsConfKill(conf) || (ConfigFileEntry.glines && IsConfGline(conf)))
367		{
368	<	/* XXX */
369	<	aconf = rkconf ? rkconf : aconf;
370	<	if (IsConfGline(aconf))
371	<	sendto_one(client_p, ":%s NOTICE %s :*** G-lined", me.name,
952	<	client_p->name);
953	<	if (ConfigFileEntry.kline_with_reason)
954	<	sendto_one(client_p, ":%s NOTICE %s :*** Banned %s",
955	<	me.name, client_p->name, aconf->reason);
956	<	return(BANNED_CLIENT);
368	>	if (IsConfGline(conf))
369	>	sendto_one_notice(client_p, &me, ":*** G-lined");
370	>	sendto_one_notice(client_p, &me, ":*** Banned: %s", conf->reason);
371	>	return BANNED_CLIENT;
372		}
373		}
374
375	<	return(NOT_AUTHORIZED);
375	>	return NOT_AUTHORIZED;
376		}
377
378		/* attach_iline()
#	Line 968 | Line 383 | verify_access(struct Client *client_p, c
383		* side effects - do actual attach
384		*/
385		static int
386	<	attach_iline(struct Client *client_p, struct ConfItem *conf)
386	>	attach_iline(struct Client *client_p, struct MaskItem *conf)
387		{
388	<	struct AccessItem *aconf;
974	<	struct ClassItem *aclass;
388	>	struct ClassItem *class = NULL;
389		struct ip_entry *ip_found;
390		int a_limit_reached = 0;
391	<	int local = 0, global = 0, ident = 0;
391	>	unsigned int local = 0, global = 0, ident = 0;
392	>
393	>	assert(conf->class);
394
395		ip_found = find_or_add_ip(&client_p->localClient->ip);
396		ip_found->count++;
397		SetIpHash(client_p);
398
399	<	aconf = 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);
399	>	class = conf->class;
400
401		count_user_host(client_p->username, client_p->host,
402		&global, &local, &ident);
#	Line 993 | Line 405 | attach_iline(struct Client *client_p, st
405		* setting a_limit_reached if any limit is reached.
406		* - Dianora
407		*/
408	<	if (aclass->max_total != 0 && aclass->curr_user_count >= aclass->max_total)
408	>	if (class->max_total != 0 && class->ref_count >= class->max_total)
409		a_limit_reached = 1;
410	<	else if (aclass->max_perip != 0 && ip_found->count > aclass->max_perip)
410	>	else if (class->max_perip != 0 && ip_found->count > class->max_perip)
411		a_limit_reached = 1;
412	<	else if (aclass->max_local != 0 && local >= aclass->max_local)
412	>	else if (class->max_local != 0 && local >= class->max_local)
413		a_limit_reached = 1;
414	<	else if (aclass->max_global != 0 && global >= aclass->max_global)
414	>	else if (class->max_global != 0 && global >= class->max_global)
415		a_limit_reached = 1;
416	<	else if (aclass->max_ident != 0 && ident >= aclass->max_ident &&
416	>	else if (class->max_ident != 0 && ident >= class->max_ident &&
417		client_p->username[0] != '~')
418		a_limit_reached = 1;
419
420		if (a_limit_reached)
421		{
422	<	if (!IsConfExemptLimits(aconf))
422	>	if (!IsConfExemptLimits(conf))
423		return TOO_MANY;   /* Already at maximum allowed */
424
425	<	sendto_one(client_p,
426	<	":%s NOTICE %s :*** Your connection class is full, "
1015	<	"but you have exceed_limit = yes;", me.name, client_p->name);
425	>	sendto_one_notice(client_p, &me, ":*** Your connection class is full, "
426	>	"but you have exceed_limit = yes;");
427		}
428
429		return attach_conf(client_p, conf);
#	Line 1028 | Line 439 | attach_iline(struct Client *client_p, st
439		void
440		init_ip_hash_table(void)
441		{
442	<	ip_entry_heap = BlockHeapCreate("ip", sizeof(struct ip_entry),
1032	<	2 * hard_fdlimit);
442	>	ip_entry_pool = mp_pool_new(sizeof(struct ip_entry), MP_CHUNK_SIZE_IP_ENTRY);
443		memset(ip_hash_table, 0, sizeof(ip_hash_table));
444		}
445
#	Line 1078 | Line 488 | find_or_add_ip(struct irc_ssaddr *ip_in)
488		if (ip_entries_count >= 2 * hard_fdlimit)
489		garbage_collect_ip_entries();
490
491	<	newptr = BlockHeapAlloc(ip_entry_heap);
491	>	newptr = mp_pool_get(ip_entry_pool);
492	>	memset(newptr, 0, sizeof(*newptr));
493		ip_entries_count++;
494		memcpy(&newptr->ip, ip_in, sizeof(struct irc_ssaddr));
495
#	Line 1129 | Line 540 | remove_one_ip(struct irc_ssaddr *ip_in)
540		if (ptr->count > 0)
541		ptr->count--;
542		if (ptr->count == 0 &&
543	<	(CurrentTime-ptr->last_attempt) >= ConfigFileEntry.throttle_time)
543	>	(CurrentTime-ptr->last_attempt) >= ConfigFileEntry.throttle_time)
544		{
545		if (last_ptr != NULL)
546	<	last_ptr->next = ptr->next;
546	>	last_ptr->next = ptr->next;
547		else
548	<	ip_hash_table[hash_index] = ptr->next;
548	>	ip_hash_table[hash_index] = ptr->next;
549
550	<	BlockHeapFree(ip_entry_heap, ptr);
550	>	mp_pool_release(ptr);
551		ip_entries_count--;
552		return;
553		}
#	Line 1171 | Line 582 | hash_ip(struct irc_ssaddr *addr)
582		uint32_t *ip = (uint32_t *)&v6->sin6_addr.s6_addr;
583
584		hash  = ip[0] ^ ip[3];
585	<	hash ^= hash >> 16;
586	<	hash ^= hash >> 8;
585	>	hash ^= hash >> 16;
586	>	hash ^= hash >> 8;
587		hash  = hash & (IP_HASH_SIZE - 1);
588		return hash;
589		}
#	Line 1183 | Line 594 | hash_ip(struct irc_ssaddr *addr)
594
595		/* count_ip_hash()
596		*
597	<	* inputs        - pointer to counter of number of ips hashed
597	>	* inputs        - pointer to counter of number of ips hashed
598		*               - pointer to memory used for ip hash
599		* output        - returned via pointers input
600		* side effects  - NONE
#	Line 1239 | Line 650 | garbage_collect_ip_entries(void)
650		last_ptr->next = ptr->next;
651		else
652		ip_hash_table[i] = ptr->next;
653	<	BlockHeapFree(ip_entry_heap, ptr);
653	>	mp_pool_release(ptr);
654		ip_entries_count--;
655		}
656		else
#	Line 1256 | Line 667 | garbage_collect_ip_entries(void)
667		* side effects - Disassociate configuration from the client.
668		*                Also removes a class from the list if marked for deleting.
669		*/
670	<	int
671	<	detach_conf(struct Client *client_p, ConfType type)
670	>	void
671	>	detach_conf(struct Client *client_p, enum maskitem_type type)
672		{
673	<	dlink_node *ptr, *next_ptr;
1263	<	struct ConfItem *conf;
1264	<	struct ClassItem *aclass;
1265	<	struct AccessItem *aconf;
1266	<	struct ConfItem *aclass_conf;
1267	<	struct MatchItem *match_item;
673	>	dlink_node *ptr = NULL, *next_ptr = NULL;
674
675		DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->confs.head)
676		{
677	<	conf = ptr->data;
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);
677	>	struct MaskItem *conf = ptr->data;
678
679	<	if ((aclass_conf = aconf->class_ptr) != NULL)
680	<	{
681	<	aclass = map_to_conf(aclass_conf);
1290	<
1291	<	assert(aclass->curr_user_count > 0);
679	>	assert(conf->type & (CONF_CLIENT | CONF_OPER | CONF_SERVER));
680	>	assert(conf->ref_count > 0);
681	>	assert(conf->class->ref_count > 0);
682
683	<	if (conf->type == CLIENT_TYPE)
684	<	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	<	}
683	>	if (!(conf->type & type))
684	>	continue;
685
686	<	if (--aconf->clients == 0 && IsConfIllegal(aconf))
687	<	delete_conf_item(conf);
686	>	dlinkDelete(ptr, &client_p->localClient->confs);
687	>	free_dlink_node(ptr);
688
689	<	break;
690	<	default:
1304	<	break;
1305	<	}
689	>	if (conf->type == CONF_CLIENT)
690	>	remove_from_cidr_check(&client_p->localClient->ip, conf->class);
691
692	<	if (type != CONF_TYPE)
693	<	return 0;
692	>	if (--conf->class->ref_count == 0 && conf->class->active == 0)
693	>	{
694	>	class_free(conf->class);
695	>	conf->class = NULL;
696		}
1310	–	}
697
698	<	return -1;
698	>	if (--conf->ref_count == 0 && conf->active == 0)
699	>	conf_free(conf);
700	>	}
701		}
702
703		/* attach_conf()
#	Line 1323 | Line 711 | detach_conf(struct Client *client_p, Con
711		*                attachment if there was an old one...
712		*/
713		int
714	<	attach_conf(struct Client *client_p, struct ConfItem *conf)
714	>	attach_conf(struct Client *client_p, struct MaskItem *conf)
715		{
1328	–	struct AccessItem *aconf = map_to_conf(conf);
1329	–	struct ClassItem *aclass = map_to_conf(aconf->class_ptr);
1330	–
716		if (dlinkFind(&client_p->localClient->confs, conf) != NULL)
717		return 1;
718
719	<	if (IsConfIllegal(aconf)) /* TBV: can't happen */
720	<	return NOT_AUTHORIZED;
721	<
1337	<	if (conf->type == CLIENT_TYPE)
1338	<	if (cidr_limit_reached(IsConfExemptLimits(aconf),
1339	<	&client_p->localClient->ip, aclass))
719	>	if (conf->type == CONF_CLIENT)
720	>	if (cidr_limit_reached(IsConfExemptLimits(conf),
721	>	&client_p->localClient->ip, conf->class))
722		return TOO_MANY;    /* Already at maximum allowed */
723
724	<	aclass->curr_user_count++;
725	<	aconf->clients++;
724	>	conf->class->ref_count++;
725	>	conf->ref_count++;
726
727		dlinkAdd(conf, make_dlink_node(), &client_p->localClient->confs);
728
#	Line 1360 | Line 742 | attach_connect_block(struct Client *clie
742		const char *host)
743		{
744		dlink_node *ptr;
745	<	struct ConfItem *conf;
1364	<	struct AccessItem *aconf;
745	>	struct MaskItem *conf = NULL;
746
747		assert(client_p != NULL);
748		assert(host != NULL);
#	Line 1372 | Line 753 | attach_connect_block(struct Client *clie
753		DLINK_FOREACH(ptr, server_items.head)
754		{
755		conf = ptr->data;
1375	–	aconf = map_to_conf(conf);
756
757	<	if (match(conf->name, name) == 0 || match(aconf->host, host) == 0)
757	>	if (match(conf->name, name) || match(conf->host, host))
758		continue;
759
760		attach_conf(client_p, conf);
#	Line 1384 | Line 764 | attach_connect_block(struct Client *clie
764		return 0;
765		}
766
1387	–	/* find_conf_exact()
1388	–	*
1389	–	* inputs       - type of ConfItem
1390	–	*              - pointer to name to find
1391	–	*              - pointer to username to find
1392	–	*              - pointer to host to find
1393	–	* output       - NULL or pointer to conf found
1394	–	* side effects - find a conf entry which matches the hostname
1395	–	*                and has the same name.
1396	–	*/
1397	–	struct ConfItem *
1398	–	find_conf_exact(ConfType type, const char *name, const char *user,
1399	–	const char *host)
1400	–	{
1401	–	dlink_node *ptr;
1402	–	dlink_list *list_p;
1403	–	struct ConfItem *conf = NULL;
1404	–	struct AccessItem *aconf;
1405	–
1406	–	/* Only valid for OPER_TYPE and ...? */
1407	–	list_p = map_to_list(type);
1408	–
1409	–	DLINK_FOREACH(ptr, (*list_p).head)
1410	–	{
1411	–	conf = ptr->data;
1412	–
1413	–	if (conf->name == NULL)
1414	–	continue;
1415	–	aconf = map_to_conf(conf);
1416	–	if (aconf->host == NULL)
1417	–	continue;
1418	–	if (irccmp(conf->name, name) != 0)
1419	–	continue;
1420	–
1421	–	/*
1422	–	** Accept if the *real* hostname (usually sockethost)
1423	–	** socket host) matches *either* host or name field
1424	–	** of the configuration.
1425	–	*/
1426	–	if (!match(aconf->host, host) || !match(aconf->user, user))
1427	–	continue;
1428	–	if (type == OPER_TYPE)
1429	–	{
1430	–	struct ClassItem *aclass = map_to_conf(aconf->class_ptr);
1431	–
1432	–	if (aconf->clients >= aclass->max_total)
1433	–	continue;
1434	–	}
1435	–
1436	–	return conf;
1437	–	}
1438	–
1439	–	return NULL;
1440	–	}
1441	–
767		/* find_conf_name()
768		*
769		* inputs       - pointer to conf link list to search
#	Line 1448 | Line 773 | find_conf_exact(ConfType type, const cha
773		* side effects - find a conf entry which matches the name
774		*                and has the given mask.
775		*/
776	<	struct ConfItem *
777	<	find_conf_name(dlink_list *list, const char *name, ConfType type)
776	>	struct MaskItem *
777	>	find_conf_name(dlink_list *list, const char *name, enum maskitem_type type)
778		{
779		dlink_node *ptr;
780	<	struct ConfItem* conf;
780	>	struct MaskItem* conf;
781
782		DLINK_FOREACH(ptr, list->head)
783		{
784		conf = ptr->data;
785	<
785	>
786		if (conf->type == type)
787		{
788		if (conf->name && (irccmp(conf->name, name) == 0 ||
789	<	match(conf->name, name)))
789	>	!match(conf->name, name)))
790		return conf;
791		}
792		}
#	Line 1476 | Line 801 | find_conf_name(dlink_list *list, const c
801		* side effects - none
802		*/
803		static dlink_list *
804	<	map_to_list(ConfType type)
804	>	map_to_list(enum maskitem_type type)
805		{
806		switch(type)
807		{
808	<	case RXLINE_TYPE:
1484	<	return(&rxconf_items);
1485	<	break;
1486	<	case XLINE_TYPE:
808	>	case CONF_XLINE:
809		return(&xconf_items);
810		break;
811	<	case ULINE_TYPE:
811	>	case CONF_ULINE:
812		return(&uconf_items);
813		break;
814	<	case NRESV_TYPE:
814	>	case CONF_NRESV:
815		return(&nresv_items);
816		break;
817	<	case OPER_TYPE:
817	>	case CONF_CRESV:
818	>	return(&cresv_items);
819	>	case CONF_OPER:
820		return(&oconf_items);
821		break;
822	<	case CLASS_TYPE:
1499	<	return(&class_items);
1500	<	break;
1501	<	case SERVER_TYPE:
822	>	case CONF_SERVER:
823		return(&server_items);
824		break;
825	<	case SERVICE_TYPE:
825	>	case CONF_SERVICE:
826		return(&service_items);
827		break;
828	<	case CLUSTER_TYPE:
828	>	case CONF_CLUSTER:
829		return(&cluster_items);
830		break;
1510	–	case CONF_TYPE:
1511	–	case GLINE_TYPE:
1512	–	case KLINE_TYPE:
1513	–	case DLINE_TYPE:
1514	–	case CRESV_TYPE:
831		default:
832		return NULL;
833		}
#	Line 1523 | Line 839 | map_to_list(ConfType type)
839		*              - pointer to name string to find
840		*              - pointer to user
841		*              - pointer to host
842	<	*              - optional action to match on as well
843	<	* output       - NULL or pointer to found struct MatchItem
842	>	*              - optional flags to match on as well
843	>	* output       - NULL or pointer to found struct MaskItem
844		* side effects - looks for a match on name field
845		*/
846	<	struct ConfItem *
847	<	find_matching_name_conf(ConfType type, const char *name, const char *user,
848	<	const char *host, int action)
846	>	struct MaskItem *
847	>	find_matching_name_conf(enum maskitem_type type, const char *name, const char *user,
848	>	const char *host, unsigned int flags)
849		{
850		dlink_node *ptr=NULL;
851	<	struct ConfItem *conf=NULL;
1536	<	struct AccessItem *aconf=NULL;
1537	<	struct MatchItem *match_item=NULL;
851	>	struct MaskItem *conf=NULL;
852		dlink_list *list_p = map_to_list(type);
853
854		switch (type)
855		{
856	<	#ifdef HAVE_LIBPCRE
1543	<	case RXLINE_TYPE:
1544	<	DLINK_FOREACH(ptr, list_p->head)
1545	<	{
1546	<	conf = ptr->data;
1547	<	assert(conf->regexpname);
1548	<
1549	<	if (!ircd_pcre_exec(conf->regexpname, name))
1550	<	return conf;
1551	<	}
1552	<	break;
1553	<	#endif
1554	<	case SERVICE_TYPE:
856	>	case CONF_SERVICE:
857		DLINK_FOREACH(ptr, list_p->head)
858		{
859		conf = ptr->data;
#	Line 1563 | Line 865 | find_matching_name_conf(ConfType type, c
865		}
866		break;
867
868	<	case XLINE_TYPE:
869	<	case ULINE_TYPE:
870	<	case NRESV_TYPE:
868	>	case CONF_XLINE:
869	>	case CONF_ULINE:
870	>	case CONF_NRESV:
871	>	case CONF_CRESV:
872		DLINK_FOREACH(ptr, list_p->head)
873		{
874		conf = ptr->data;
875
1573	–	match_item = map_to_conf(conf);
876		if (EmptyString(conf->name))
877	<	continue;
878	<	if ((name != NULL) && match_esc(conf->name, name))
877	>	continue;
878	>	if ((name != NULL) && !match(conf->name, name))
879		{
880	<	if ((user == NULL && (host == NULL)))
881	<	return conf;
882	<	if ((match_item->action & action) != action)
880	>	if ((user == NULL && (host == NULL)))
881	>	return conf;
882	>	if ((conf->flags & flags) != flags)
883		continue;
884	<	if (EmptyString(match_item->user) || EmptyString(match_item->host))
885	<	return conf;
886	<	if (match(match_item->user, user) && match(match_item->host, host))
887	<	return conf;
884	>	if (EmptyString(conf->user) || EmptyString(conf->host))
885	>	return conf;
886	>	if (!match(conf->user, user) && !match(conf->host, host))
887	>	return conf;
888		}
889		}
890		break;
891
892	<	case SERVER_TYPE:
892	>	case CONF_SERVER:
893		DLINK_FOREACH(ptr, list_p->head)
894		{
895		conf = ptr->data;
1594	–	aconf = map_to_conf(conf);
896
897	<	if ((name != NULL) && match_esc(name, conf->name))
897	>	if ((name != NULL) && !match(name, conf->name))
898		return conf;
899	<	else if ((host != NULL) && match_esc(host, aconf->host))
899	>	else if ((host != NULL) && !match(host, conf->host))
900		return conf;
901		}
902		break;
903	<
903	>
904		default:
905		break;
906		}
#	Line 1612 | Line 913 | find_matching_name_conf(ConfType type, c
913		*              - pointer to name string to find
914		*              - pointer to user
915		*              - pointer to host
916	<	* output       - NULL or pointer to found struct MatchItem
916	>	* output       - NULL or pointer to found struct MaskItem
917		* side effects - looks for an exact match on name field
918		*/
919	<	struct ConfItem *
920	<	find_exact_name_conf(ConfType type, const struct Client *who, const char *name,
919	>	struct MaskItem *
920	>	find_exact_name_conf(enum maskitem_type type, const struct Client *who, const char *name,
921		const char *user, const char *host)
922		{
923		dlink_node *ptr = NULL;
924	<	struct AccessItem *aconf;
925	<	struct ConfItem *conf;
1625	<	struct MatchItem *match_item;
1626	<	dlink_list *list_p;
1627	<
1628	<	list_p = map_to_list(type);
924	>	struct MaskItem *conf;
925	>	dlink_list *list_p = map_to_list(type);
926
927		switch(type)
928		{
929	<	case RXLINE_TYPE:
930	<	case XLINE_TYPE:
931	<	case ULINE_TYPE:
932	<	case NRESV_TYPE:
929	>	case CONF_XLINE:
930	>	case CONF_ULINE:
931	>	case CONF_NRESV:
932	>	case CONF_CRESV:
933
934		DLINK_FOREACH(ptr, list_p->head)
935		{
936		conf = ptr->data;
937	<	match_item = (struct MatchItem *)map_to_conf(conf);
937	>
938		if (EmptyString(conf->name))
939	<	continue;
940	<
939	>	continue;
940	>
941		if (irccmp(conf->name, name) == 0)
942		{
943	<	if ((user == NULL && (host == NULL)))
944	<	return (conf);
945	<	if (EmptyString(match_item->user) || EmptyString(match_item->host))
946	<	return (conf);
947	<	if (match(match_item->user, user) && match(match_item->host, host))
948	<	return (conf);
943	>	if ((user == NULL && (host == NULL)))
944	>	return conf;
945	>	if (EmptyString(conf->user) || EmptyString(conf->host))
946	>	return conf;
947	>	if (!match(conf->user, user) && !match(conf->host, host))
948	>	return conf;
949		}
950		}
951		break;
952
953	<	case OPER_TYPE:
953	>	case CONF_OPER:
954		DLINK_FOREACH(ptr, list_p->head)
955		{
956		conf = ptr->data;
1660	–	aconf = map_to_conf(conf);
957
958		if (EmptyString(conf->name))
959		continue;
#	Line 1666 | Line 962 | find_exact_name_conf(ConfType type, cons
962		{
963		if (!who)
964		return conf;
965	<	if (EmptyString(aconf->user) || EmptyString(aconf->host))
966	<	return conf;
967	<	if (match(aconf->user, who->username))
965	>	if (EmptyString(conf->user) || EmptyString(conf->host))
966	>	return NULL;
967	>	if (!match(conf->user, who->username))
968		{
969	<	switch (aconf->type)
969	>	switch (conf->htype)
970		{
971		case HM_HOST:
972	<	if (match(aconf->host, who->host) || match(aconf->host, who->sockhost))
973	<	return conf;
972	>	if (!match(conf->host, who->host) || !match(conf->host, who->sockhost))
973	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
974	>	return conf;
975		break;
976		case HM_IPV4:
977		if (who->localClient->aftype == AF_INET)
978	<	if (match_ipv4(&who->localClient->ip, &aconf->addr, aconf->bits))
979	<	return conf;
978	>	if (match_ipv4(&who->localClient->ip, &conf->addr, conf->bits))
979	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
980	>	return conf;
981		break;
982		#ifdef IPV6
983		case HM_IPV6:
984		if (who->localClient->aftype == AF_INET6)
985	<	if (match_ipv6(&who->localClient->ip, &aconf->addr, aconf->bits))
986	<	return conf;
985	>	if (match_ipv6(&who->localClient->ip, &conf->addr, conf->bits))
986	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
987	>	return conf;
988		break;
989		#endif
990		default:
#	Line 1697 | Line 996 | find_exact_name_conf(ConfType type, cons
996
997		break;
998
999	<	case SERVER_TYPE:
999	>	case CONF_SERVER:
1000		DLINK_FOREACH(ptr, list_p->head)
1001		{
1002		conf = ptr->data;
1003	<	aconf = (struct AccessItem *)map_to_conf(conf);
1003	>
1004		if (EmptyString(conf->name))
1005	<	continue;
1006	<
1005	>	continue;
1006	>
1007		if (name == NULL)
1008		{
1009	<	if (EmptyString(aconf->host))
1010	<	continue;
1011	<	if (irccmp(aconf->host, host) == 0)
1012	<	return(conf);
1009	>	if (EmptyString(conf->host))
1010	>	continue;
1011	>	if (irccmp(conf->host, host) == 0)
1012	>	return conf;
1013		}
1014		else if (irccmp(conf->name, name) == 0)
1015	<	{
1717	<	return (conf);
1718	<	}
1015	>	return conf;
1016		}
1720	–	break;
1017
1722	–	case CLASS_TYPE:
1723	–	DLINK_FOREACH(ptr, list_p->head)
1724	–	{
1725	–	conf = ptr->data;
1726	–	if (EmptyString(conf->name))
1727	–	continue;
1728	–
1729	–	if (irccmp(conf->name, name) == 0)
1730	–	return (conf);
1731	–	}
1018		break;
1019
1020		default:
1021		break;
1022		}
1023	<	return(NULL);
1023	>
1024	>	return NULL;
1025		}
1026
1027		/* rehash()
#	Line 1747 | Line 1034 | int
1034		rehash(int sig)
1035		{
1036		if (sig != 0)
1037	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1038	<	"Got signal SIGHUP, reloading ircd.conf file");
1037	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1038	>	"Got signal SIGHUP, reloading configuration file(s)");
1039
1040		restart_resolver();
1041
#	Line 1764 | Line 1051 | rehash(int sig)
1051
1052		load_conf_modules();
1053
1767	–	flush_deleted_I_P();
1768	–
1054		rehashed_klines = 1;
1770	–	/* XXX */
1771	–	if (ConfigLoggingEntry.use_logging)
1772	–	log_close_all();
1055
1056	<	return(0);
1056	>	return 0;
1057		}
1058
1059		/* set_default_conf()
#	Line 1789 | Line 1071 | set_default_conf(void)
1071		/* verify init_class() ran, this should be an unnecessary check
1072		* but its not much work.
1073		*/
1074	<	assert(class_default == (struct ConfItem *) class_items.tail->data);
1074	>	assert(class_default == class_get_list()->tail->data);
1075
1076		#ifdef HAVE_LIBCRYPTO
1077		ServerInfo.rsa_private_key = NULL;
#	Line 1799 | Line 1081 | set_default_conf(void)
1081		/* ServerInfo.name is not rehashable */
1082		/* ServerInfo.name = ServerInfo.name; */
1083		ServerInfo.description = NULL;
1084	<	DupString(ServerInfo.network_name, NETWORK_NAME_DEFAULT);
1085	<	DupString(ServerInfo.network_desc, NETWORK_DESC_DEFAULT);
1084	>	ServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
1085	>	ServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
1086
1087		memset(&ServerInfo.ip, 0, sizeof(ServerInfo.ip));
1088		ServerInfo.specific_ipv4_vhost = 0;
#	Line 1808 | Line 1090 | set_default_conf(void)
1090		ServerInfo.specific_ipv6_vhost = 0;
1091
1092		ServerInfo.max_clients = MAXCLIENTS_MAX;
1093	+	ServerInfo.max_nick_length = 9;
1094	+	ServerInfo.max_topic_length = 80;
1095
1096		ServerInfo.hub = 0;
1097		ServerInfo.dns_host.sin_addr.s_addr = 0;
#	Line 1816 | Line 1100 | set_default_conf(void)
1100		AdminInfo.email = NULL;
1101		AdminInfo.description = NULL;
1102
1103	<	log_close_all();
1103	>	log_del_all();
1104
1105		ConfigLoggingEntry.use_logging = 1;
1106
1107		ConfigChannel.disable_fake_channels = 0;
1824	–	ConfigChannel.restrict_channels = 0;
1825	–	ConfigChannel.disable_local_channels = 0;
1826	–	ConfigChannel.use_invex = 1;
1827	–	ConfigChannel.use_except = 1;
1828	–	ConfigChannel.use_knock = 1;
1108		ConfigChannel.knock_delay = 300;
1109		ConfigChannel.knock_delay_channel = 60;
1110	<	ConfigChannel.max_chans_per_user = 15;
1111	<	ConfigChannel.quiet_on_ban = 1;
1110	>	ConfigChannel.max_chans_per_user = 25;
1111	>	ConfigChannel.max_chans_per_oper = 50;
1112		ConfigChannel.max_bans = 25;
1113		ConfigChannel.default_split_user_count = 0;
1114		ConfigChannel.default_split_server_count = 0;
#	Line 1839 | Line 1118 | set_default_conf(void)
1118		ConfigServerHide.flatten_links = 0;
1119		ConfigServerHide.links_delay = 300;
1120		ConfigServerHide.hidden = 0;
1842	–	ConfigServerHide.disable_hidden = 0;
1121		ConfigServerHide.hide_servers = 0;
1122	<	DupString(ConfigServerHide.hidden_name, NETWORK_NAME_DEFAULT);
1122	>	ConfigServerHide.hide_services = 0;
1123	>	ConfigServerHide.hidden_name = xstrdup(NETWORK_NAME_DEFAULT);
1124		ConfigServerHide.hide_server_ips = 0;
1125	+	ConfigServerHide.disable_remote_commands = 0;
1126
1127	<
1848	<	DupString(ConfigFileEntry.service_name, SERVICE_NAME_DEFAULT);
1127	>	ConfigFileEntry.service_name = xstrdup(SERVICE_NAME_DEFAULT);
1128		ConfigFileEntry.max_watch = WATCHSIZE_DEFAULT;
1129	+	ConfigFileEntry.cycle_on_host_change = 1;
1130	+	ConfigFileEntry.glines = 0;
1131	+	ConfigFileEntry.gline_time = 12 * 3600;
1132	+	ConfigFileEntry.gline_request_time = GLINE_REQUEST_EXPIRE_DEFAULT;
1133		ConfigFileEntry.gline_min_cidr = 16;
1134		ConfigFileEntry.gline_min_cidr6 = 48;
1135		ConfigFileEntry.invisible_on_connect = 1;
1853	–	ConfigFileEntry.burst_away = 0;
1854	–	ConfigFileEntry.use_whois_actually = 1;
1136		ConfigFileEntry.tkline_expire_notices = 1;
1137		ConfigFileEntry.hide_spoof_ips = 1;
1138		ConfigFileEntry.ignore_bogus_ts = 0;
1139		ConfigFileEntry.disable_auth = 0;
1859	–	ConfigFileEntry.disable_remote = 0;
1140		ConfigFileEntry.kill_chase_time_limit = 90;
1141		ConfigFileEntry.default_floodcount = 8;
1142		ConfigFileEntry.failed_oper_notice = 1;
#	Line 1870 | Line 1150 | set_default_conf(void)
1150		ConfigFileEntry.anti_spam_exit_message_time = 0;
1151		ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
1152		ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
1873	–	ConfigFileEntry.kline_with_reason = 1;
1874	–	ConfigFileEntry.kline_reason = NULL;
1153		ConfigFileEntry.warn_no_nline = 1;
1154		ConfigFileEntry.stats_o_oper_only = 0;
1155		ConfigFileEntry.stats_k_oper_only = 1;  /* masked */
1156		ConfigFileEntry.stats_i_oper_only = 1;  /* masked */
1157		ConfigFileEntry.stats_P_oper_only = 0;
1158	+	ConfigFileEntry.stats_u_oper_only = 0;
1159		ConfigFileEntry.caller_id_wait = 60;
1160		ConfigFileEntry.opers_bypass_callerid = 0;
1161		ConfigFileEntry.pace_wait = 10;
#	Line 1886 | Line 1165 | set_default_conf(void)
1165		ConfigFileEntry.no_oper_flood = 0;
1166		ConfigFileEntry.true_no_oper_flood = 0;
1167		ConfigFileEntry.oper_pass_resv = 1;
1889	–	ConfigFileEntry.glines = 0;
1890	–	ConfigFileEntry.gline_time = 12 * 3600;
1168		ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
1892	–	ConfigFileEntry.client_flood = CLIENT_FLOOD_DEFAULT;
1169		ConfigFileEntry.oper_only_umodes = UMODE_DEBUG;
1170		ConfigFileEntry.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE |
1171		UMODE_OPERWALL | UMODE_WALLOP;
#	Line 1908 | Line 1184 | validate_conf(void)
1184		ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
1185
1186		if (ServerInfo.network_name == NULL)
1187	<	DupString(ServerInfo.network_name,NETWORK_NAME_DEFAULT);
1187	>	ServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
1188
1189		if (ServerInfo.network_desc == NULL)
1190	<	DupString(ServerInfo.network_desc,NETWORK_DESC_DEFAULT);
1190	>	ServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
1191
1192		if (ConfigFileEntry.service_name == NULL)
1193	<	DupString(ConfigFileEntry.service_name, SERVICE_NAME_DEFAULT);
1918	<
1919	<	if ((ConfigFileEntry.client_flood < CLIENT_FLOOD_MIN) ||
1920	<	(ConfigFileEntry.client_flood > CLIENT_FLOOD_MAX))
1921	<	ConfigFileEntry.client_flood = CLIENT_FLOOD_MAX;
1193	>	ConfigFileEntry.service_name = xstrdup(SERVICE_NAME_DEFAULT);
1194
1195		ConfigFileEntry.max_watch = IRCD_MAX(ConfigFileEntry.max_watch, WATCHSIZE_MIN);
1196		}
1197
1198	<	/* read_conf()
1198	>	/* read_conf()
1199		*
1200		* inputs       - file descriptor pointing to config file to use
1201		* output       - None
#	Line 1936 | Line 1208 | read_conf(FILE *file)
1208
1209		set_default_conf(); /* Set default values prior to conf parsing */
1210		conf_parser_ctx.pass = 1;
1211	<	yyparse();          /* pick up the classes first */
1211	>	yyparse();          /* pick up the classes first */
1212
1213		rewind(file);
1214
#	Line 1944 | Line 1216 | read_conf(FILE *file)
1216		yyparse();          /* Load the values from the conf */
1217		validate_conf();    /* Check to make sure some values are still okay. */
1218		/* Some global values are also loaded here. */
1219	<	check_class();      /* Make sure classes are valid */
1219	>	class_delete_marked();      /* Make sure classes are valid */
1220		}
1221
1222		/* lookup_confhost()
#	Line 1952 | Line 1224 | read_conf(FILE *file)
1224		* start DNS lookups of all hostnames in the conf
1225		* line and convert an IP addresses in a.b.c.d number for to IP#s.
1226		*/
1227	<	static void
1228	<	lookup_confhost(struct ConfItem *conf)
1227	>	void
1228	>	lookup_confhost(struct MaskItem *conf)
1229		{
1958	–	struct AccessItem *aconf;
1230		struct addrinfo hints, *res;
1231
1961	–	aconf = map_to_conf(conf);
1962	–
1963	–	if (EmptyString(aconf->host) ||
1964	–	EmptyString(aconf->user))
1965	–	{
1966	–	ilog(LOG_TYPE_IRCD, "Host/server name error: (%s) (%s)",
1967	–	aconf->host, conf->name);
1968	–	return;
1969	–	}
1970	–
1971	–	if (strchr(aconf->host, '*') ||
1972	–	strchr(aconf->host, '?'))
1973	–	return;
1974	–
1232		/* Do name lookup now on hostnames given and store the
1233		* ip numbers in conf structure.
1234		*/
#	Line 1983 | Line 1240 | lookup_confhost(struct ConfItem *conf)
1240		/* Get us ready for a bind() and don't bother doing dns lookup */
1241		hints.ai_flags = AI_PASSIVE | AI_NUMERICHOST;
1242
1243	<	if (getaddrinfo(aconf->host, NULL, &hints, &res))
1243	>	if (getaddrinfo(conf->host, NULL, &hints, &res))
1244		{
1245	<	conf_dns_lookup(aconf);
1245	>	conf_dns_lookup(conf);
1246		return;
1247		}
1248
1249		assert(res != NULL);
1250
1251	<	memcpy(&aconf->addr, res->ai_addr, res->ai_addrlen);
1252	<	aconf->addr.ss_len = res->ai_addrlen;
1253	<	aconf->addr.ss.ss_family = res->ai_family;
1251	>	memcpy(&conf->addr, res->ai_addr, res->ai_addrlen);
1252	>	conf->addr.ss_len = res->ai_addrlen;
1253	>	conf->addr.ss.ss_family = res->ai_family;
1254	>
1255		freeaddrinfo(res);
1256		}
1257
#	Line 2008 | Line 1266 | int
1266		conf_connect_allowed(struct irc_ssaddr *addr, int aftype)
1267		{
1268		struct ip_entry *ip_found;
1269	<	struct AccessItem *aconf = find_dline_conf(addr, aftype);
1269	>	struct MaskItem *conf = find_dline_conf(addr, aftype);
1270
1271		/* DLINE exempt also gets you out of static limits/pacing... */
1272	<	if (aconf && (aconf->status & CONF_EXEMPTDLINE))
1272	>	if (conf && (conf->type == CONF_EXEMPT))
1273		return 0;
1274
1275	<	if (aconf != NULL)
1275	>	if (conf != NULL)
1276		return BANNED_CLIENT;
1277
1278		ip_found = find_or_add_ip(addr);
#	Line 2030 | Line 1288 | conf_connect_allowed(struct irc_ssaddr *
1288		return 0;
1289		}
1290
2033	–	static struct AccessItem *
2034	–	find_regexp_kline(const char *uhi[])
2035	–	{
2036	–	#ifdef HAVE_LIBPCRE
2037	–	const dlink_node *ptr = NULL;
2038	–
2039	–	DLINK_FOREACH(ptr, rkconf_items.head)
2040	–	{
2041	–	struct AccessItem *aptr = map_to_conf(ptr->data);
2042	–
2043	–	assert(aptr->regexuser);
2044	–	assert(aptr->regexhost);
2045	–
2046	–	if (!ircd_pcre_exec(aptr->regexuser, uhi[0]) &&
2047	–	(!ircd_pcre_exec(aptr->regexhost, uhi[1]) ||
2048	–	!ircd_pcre_exec(aptr->regexhost, uhi[2])))
2049	–	return aptr;
2050	–	}
2051	–	#endif
2052	–	return NULL;
2053	–	}
2054	–
2055	–	/* find_kill()
2056	–	*
2057	–	* inputs       - pointer to client structure
2058	–	* output       - pointer to struct AccessItem if found
2059	–	* side effects - See if this user is klined already,
2060	–	*                and if so, return struct AccessItem pointer
2061	–	*/
2062	–	struct AccessItem *
2063	–	find_kill(struct Client *client_p)
2064	–	{
2065	–	struct AccessItem *aconf = NULL;
2066	–	const char *uhi[3];
2067	–
2068	–	uhi[0] = client_p->username;
2069	–	uhi[1] = client_p->host;
2070	–	uhi[2] = client_p->sockhost;
2071	–
2072	–	assert(client_p != NULL);
2073	–
2074	–	aconf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
2075	–	CONF_KLINE, client_p->localClient->aftype,
2076	–	client_p->username, NULL, 1);
2077	–	if (aconf == NULL)
2078	–	aconf = find_regexp_kline(uhi);
2079	–
2080	–	return aconf;
2081	–	}
2082	–
2083	–	struct AccessItem *
2084	–	find_gline(struct Client *client_p)
2085	–	{
2086	–	struct AccessItem *aconf;
2087	–
2088	–	assert(client_p != NULL);
2089	–
2090	–	aconf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
2091	–	CONF_GLINE, client_p->localClient->aftype,
2092	–	client_p->username, NULL, 1);
2093	–	return aconf;
2094	–	}
2095	–
2096	–	/* add_temp_line()
2097	–	*
2098	–	* inputs        - pointer to struct ConfItem
2099	–	* output        - none
2100	–	* Side effects  - links in given struct ConfItem into
2101	–	*                 temporary *line link list
2102	–	*/
2103	–	void
2104	–	add_temp_line(struct ConfItem *conf)
2105	–	{
2106	–	if (conf->type == XLINE_TYPE)
2107	–	{
2108	–	conf->flags |= CONF_FLAGS_TEMPORARY;
2109	–	dlinkAdd(conf, make_dlink_node(), &temporary_xlines);
2110	–	}
2111	–	else if ((conf->type == NRESV_TYPE) || (conf->type == CRESV_TYPE))
2112	–	{
2113	–	conf->flags |= CONF_FLAGS_TEMPORARY;
2114	–	dlinkAdd(conf, make_dlink_node(), &temporary_resv);
2115	–	}
2116	–	}
2117	–
1291		/* cleanup_tklines()
1292		*
1293		* inputs       - NONE
#	Line 2126 | Line 1299 | void
1299		cleanup_tklines(void *notused)
1300		{
1301		hostmask_expire_temporary();
1302	<	expire_tklines(&temporary_xlines);
1303	<	expire_tklines(&temporary_resv);
1302	>	expire_tklines(&xconf_items);
1303	>	expire_tklines(&nresv_items);
1304	>	expire_tklines(&cresv_items);
1305		}
1306
1307		/* expire_tklines()
#	Line 2141 | Line 1315 | expire_tklines(dlink_list *tklist)
1315		{
1316		dlink_node *ptr;
1317		dlink_node *next_ptr;
1318	<	struct ConfItem *conf;
2145	<	struct MatchItem *xconf;
2146	<	struct MatchItem *nconf;
2147	<	struct ResvChannel *cconf;
1318	>	struct MaskItem *conf;
1319
1320		DLINK_FOREACH_SAFE(ptr, next_ptr, tklist->head)
1321		{
1322		conf = ptr->data;
1323
1324	<	if (conf->type == XLINE_TYPE)
1324	>	if (!conf->until || conf->until > CurrentTime)
1325	>	continue;
1326	>
1327	>	if (conf->type == CONF_XLINE)
1328		{
1329	<	xconf = (struct MatchItem *)map_to_conf(conf);
1330	<	if (xconf->hold <= CurrentTime)
1331	<	{
1332	<	if (ConfigFileEntry.tkline_expire_notices)
2159	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2160	<	"Temporary X-line for [%s] sexpired", conf->name);
2161	<	dlinkDelete(ptr, tklist);
2162	<	free_dlink_node(ptr);
2163	<	delete_conf_item(conf);
2164	<	}
1329	>	if (ConfigFileEntry.tkline_expire_notices)
1330	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1331	>	"Temporary X-line for [%s] expired", conf->name);
1332	>	conf_free(conf);
1333		}
1334	<	else if (conf->type == NRESV_TYPE)
1334	>	else if (conf->type == CONF_NRESV || conf->type == CONF_CRESV)
1335		{
1336	<	nconf = (struct MatchItem *)map_to_conf(conf);
1337	<	if (nconf->hold <= CurrentTime)
2170	<	{
2171	<	if (ConfigFileEntry.tkline_expire_notices)
2172	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1336	>	if (ConfigFileEntry.tkline_expire_notices)
1337	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1338		"Temporary RESV for [%s] expired", conf->name);
1339	<	dlinkDelete(ptr, tklist);
2175	<	free_dlink_node(ptr);
2176	<	delete_conf_item(conf);
2177	<	}
2178	<	}
2179	<	else if (conf->type == CRESV_TYPE)
2180	<	{
2181	<	cconf = (struct ResvChannel *)map_to_conf(conf);
2182	<	if (cconf->hold <= CurrentTime)
2183	<	{
2184	<	if (ConfigFileEntry.tkline_expire_notices)
2185	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2186	<	"Temporary RESV for [%s] expired", cconf->name);
2187	<	delete_channel_resv(cconf);
2188	<	}
1339	>	conf_free(conf);
1340		}
1341		}
1342		}
#	Line 2198 | Line 1349 | expire_tklines(dlink_list *tklist)
1349		*/
1350		static const struct oper_privs
1351		{
1352	<	const unsigned int oprivs;
1352	>	const unsigned int flag;
1353		const unsigned char c;
1354		} flag_list[] = {
1355	<	{ OPER_FLAG_ADMIN,       'A' },
1356	<	{ OPER_FLAG_REMOTEBAN,   'B' },
1357	<	{ OPER_FLAG_DIE,         'D' },
1358	<	{ OPER_FLAG_GLINE,       'G' },
1359	<	{ OPER_FLAG_REHASH,      'H' },
1360	<	{ OPER_FLAG_K,           'K' },
1361	<	{ OPER_FLAG_OPERWALL,    'L' },
1362	<	{ OPER_FLAG_N,           'N' },
1363	<	{ OPER_FLAG_GLOBAL_KILL, 'O' },
1364	<	{ OPER_FLAG_REMOTE,      'R' },
1365	<	{ OPER_FLAG_OPER_SPY,    'S' },
1366	<	{ OPER_FLAG_UNKLINE,     'U' },
1367	<	{ OPER_FLAG_X,           'X' },
1355	>	{ OPER_FLAG_ADMIN,          'A' },
1356	>	{ OPER_FLAG_REMOTEBAN,      'B' },
1357	>	{ OPER_FLAG_DIE,            'D' },
1358	>	{ OPER_FLAG_GLINE,          'G' },
1359	>	{ OPER_FLAG_REHASH,         'H' },
1360	>	{ OPER_FLAG_K,              'K' },
1361	>	{ OPER_FLAG_OPERWALL,       'L' },
1362	>	{ OPER_FLAG_KILL,           'N' },
1363	>	{ OPER_FLAG_KILL_REMOTE,    'O' },
1364	>	{ OPER_FLAG_CONNECT,        'P' },
1365	>	{ OPER_FLAG_CONNECT_REMOTE, 'Q' },
1366	>	{ OPER_FLAG_SQUIT,          'R' },
1367	>	{ OPER_FLAG_SQUIT_REMOTE,   'S' },
1368	>	{ OPER_FLAG_UNKLINE,        'U' },
1369	>	{ OPER_FLAG_XLINE,          'X' },
1370		{ 0, '\0' }
1371		};
1372
1373		char *
1374		oper_privs_as_string(const unsigned int port)
1375		{
1376	<	static char privs_out[16];
1376	>	static char privs_out[IRCD_BUFSIZE];
1377		char *privs_ptr = privs_out;
1378	<	unsigned int i = 0;
1378	>	const struct oper_privs *opriv = flag_list;
1379
1380	<	for (; flag_list[i].oprivs; ++i)
1380	>	for (; opriv->flag; ++opriv)
1381		{
1382	<	if (port & flag_list[i].oprivs)
1383	<	*privs_ptr++ = flag_list[i].c;
1382	>	if (port & opriv->flag)
1383	>	*privs_ptr++ = opriv->c;
1384		else
1385	<	*privs_ptr++ = ToLowerTab[flag_list[i].c];
1385	>	*privs_ptr++ = ToLower(opriv->c);
1386		}
1387
1388		*privs_ptr = '\0';
#	Line 2246 | Line 1399 | oper_privs_as_string(const unsigned int
1399		const char *
1400		get_oper_name(const struct Client *client_p)
1401		{
1402	<	dlink_node *cnode = NULL;
1402	>	const dlink_node *cnode = NULL;
1403		/* +5 for !,@,{,} and null */
1404		static char buffer[NICKLEN + USERLEN + HOSTLEN + HOSTLEN + 5];
1405
#	Line 2254 | Line 1407 | get_oper_name(const struct Client *clien
1407		{
1408		if ((cnode = client_p->localClient->confs.head))
1409		{
1410	<	struct ConfItem *conf = cnode->data;
2258	<	const struct AccessItem *aconf = map_to_conf(conf);
1410	>	const struct MaskItem *conf = cnode->data;
1411
1412	<	if (IsConfOperator(aconf))
1412	>	if (IsConfOperator(conf))
1413		{
1414	<	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1414	>	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1415		client_p->username, client_p->host, conf->name);
1416	<	return buffer;
1416	>	return buffer;
1417		}
1418		}
1419
1420	<	/* Probably should assert here for now. If there is an oper out there
1420	>	/* Probably should assert here for now. If there is an oper out there
1421		* with no oper{} conf attached, it would be good for us to know...
1422		*/
1423		assert(0); /* Oper without oper conf! */
1424		}
1425
1426		snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1427	<	client_p->username, client_p->host, client_p->servptr->name);
1427	>	client_p->username, client_p->host, client_p->servptr->name);
1428		return buffer;
1429		}
1430
#	Line 2286 | Line 1438 | void
1438		read_conf_files(int cold)
1439		{
1440		const char *filename;
1441	<	char chanmodes[32];
1442	<	char chanlimit[32];
1441	>	char chanmodes[IRCD_BUFSIZE];
1442	>	char chanlimit[IRCD_BUFSIZE];
1443
1444		conf_parser_ctx.boot = cold;
1445	<	filename = get_conf_name(CONF_TYPE);
1445	>	filename = ConfigFileEntry.configfile;
1446
1447		/* We need to know the initial filename for the yyerror() to report
1448		FIXME: The full path is in conffilenamebuf first time since we
1449		dont know anything else
1450
1451	<	- Gozem 2002-07-21
1451	>	- Gozem 2002-07-21
1452		*/
1453		strlcpy(conffilebuf, filename, sizeof(conffilebuf));
1454
#	Line 2310 | Line 1462 | read_conf_files(int cold)
1462		}
1463		else
1464		{
1465	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1466	<	"Unable to read configuration file '%s': %s",
1467	<	filename, strerror(errno));
1465	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1466	>	"Unable to read configuration file '%s': %s",
1467	>	filename, strerror(errno));
1468		return;
1469		}
1470		}
#	Line 2323 | Line 1475 | read_conf_files(int cold)
1475		read_conf(conf_parser_ctx.conf_file);
1476		fclose(conf_parser_ctx.conf_file);
1477
1478	+	log_reopen_all();
1479	+
1480	+	add_isupport("NICKLEN", NULL, ServerInfo.max_nick_length);
1481		add_isupport("NETWORK", ServerInfo.network_name, -1);
1482	<	snprintf(chanmodes, sizeof(chanmodes), "b%s%s:%d",
1483	<	ConfigChannel.use_except ? "e" : "",
2329	<	ConfigChannel.use_invex ? "I" : "", ConfigChannel.max_bans);
1482	>
1483	>	snprintf(chanmodes, sizeof(chanmodes), "beI:%d", ConfigChannel.max_bans);
1484		add_isupport("MAXLIST", chanmodes, -1);
1485		add_isupport("MAXTARGETS", NULL, ConfigFileEntry.max_targets);
1486	+	add_isupport("CHANTYPES", "#", -1);
1487
1488	<	if (ConfigChannel.disable_local_channels)
1489	<	add_isupport("CHANTYPES", "#", -1);
2335	<	else
2336	<	add_isupport("CHANTYPES", "#&", -1);
2337	<
2338	<	snprintf(chanlimit, sizeof(chanlimit), "%s:%d",
2339	<	ConfigChannel.disable_local_channels ? "#" : "#&",
2340	<	ConfigChannel.max_chans_per_user);
1488	>	snprintf(chanlimit, sizeof(chanlimit), "#:%d",
1489	>	ConfigChannel.max_chans_per_user);
1490		add_isupport("CHANLIMIT", chanlimit, -1);
1491	<	snprintf(chanmodes, sizeof(chanmodes), "%s%s%s",
2343	<	ConfigChannel.use_except ? "e" : "",
2344	<	ConfigChannel.use_invex ? "I" : "", "b,k,l,imnprstORS");
1491	>	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,imnprstORS");
1492		add_isupport("CHANNELLEN", NULL, LOCAL_CHANNELLEN);
1493	<
2347	<	if (ConfigChannel.use_except)
2348	<	add_isupport("EXCEPTS", "e", -1);
2349	<	if (ConfigChannel.use_invex)
2350	<	add_isupport("INVEX", "I", -1);
1493	>	add_isupport("TOPICLEN", NULL, ServerInfo.max_topic_length);
1494		add_isupport("CHANMODES", chanmodes, -1);
1495
1496		/*
#	Line 2355 | Line 1498 | read_conf_files(int cold)
1498		* on strlen(form_str(RPL_ISUPPORT))
1499		*/
1500		rebuild_isupport_message_line();
2358	–
2359	–	#ifdef HAVE_LIBPCRE
2360	–	parse_conf_file(RKLINE_TYPE, cold);
2361	–	parse_conf_file(RXLINE_TYPE, cold);
2362	–	#endif
2363	–	parse_conf_file(KLINE_TYPE, cold);
2364	–	parse_conf_file(DLINE_TYPE, cold);
2365	–	parse_conf_file(XLINE_TYPE, cold);
2366	–	parse_conf_file(NRESV_TYPE, cold);
2367	–	parse_conf_file(CRESV_TYPE, cold);
2368	–	}
2369	–
2370	–	/* parse_conf_file()
2371	–	*
2372	–	* inputs       - type of conf file to parse
2373	–	* output       - none
2374	–	* side effects - conf file for givenconf type is opened and read then parsed
2375	–	*/
2376	–	static void
2377	–	parse_conf_file(int type, int cold)
2378	–	{
2379	–	FILE *file = NULL;
2380	–	const char *filename = get_conf_name(type);
2381	–
2382	–	if ((file = fopen(filename, "r")) == NULL)
2383	–	{
2384	–	if (cold)
2385	–	ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
2386	–	filename, strerror(errno));
2387	–	else
2388	–	sendto_realops_flags(UMODE_ALL, L_ALL,
2389	–	"Unable to read configuration file '%s': %s",
2390	–	filename, strerror(errno));
2391	–	}
2392	–	else
2393	–	{
2394	–	parse_csv_file(file, type);
2395	–	fclose(file);
2396	–	}
1501		}
1502
1503		/* clear_out_old_conf()
#	Line 2406 | Line 1510 | static void
1510		clear_out_old_conf(void)
1511		{
1512		dlink_node *ptr = NULL, *next_ptr = NULL;
1513	<	struct ConfItem *conf;
2410	<	struct AccessItem *aconf;
2411	<	struct ClassItem *cltmp;
2412	<	struct MatchItem *match_item;
1513	>	struct MaskItem *conf;
1514		dlink_list *free_items [] = {
1515		&server_items,   &oconf_items,
1516	<	&uconf_items,   &xconf_items, &rxconf_items, &rkconf_items,
1517	<	&nresv_items, &cluster_items,  &gdeny_items, &service_items, NULL
1516	>	&uconf_items,   &xconf_items,
1517	>	&nresv_items, &cluster_items,  &service_items, &cresv_items, NULL
1518		};
1519
1520		dlink_list ** iterator = free_items; /* C is dumb */
#	Line 2421 | Line 1522 | clear_out_old_conf(void)
1522		/* We only need to free anything allocated by yyparse() here.
1523		* Resetting structs, etc, is taken care of by set_default_conf().
1524		*/
1525	<
1525	>
1526		for (; *iterator != NULL; iterator++)
1527		{
1528		DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
1529		{
1530		conf = ptr->data;
2430	–	/* XXX This is less than pretty */
2431	–	if (conf->type == SERVER_TYPE)
2432	–	{
2433	–	aconf = map_to_conf(conf);
1531
1532	<	if (aconf->clients != 0)
2436	<	{
2437	<	SetConfIllegal(aconf);
2438	<	dlinkDelete(&conf->node, &server_items);
2439	<	}
2440	<	else
2441	<	{
2442	<	delete_conf_item(conf);
2443	<	}
2444	<	}
2445	<	else if (conf->type == OPER_TYPE)
2446	<	{
2447	<	aconf = map_to_conf(conf);
1532	>	dlinkDelete(&conf->node, map_to_list(conf->type));
1533
1534	<	if (aconf->clients != 0)
1535	<	{
2451	<	SetConfIllegal(aconf);
2452	<	dlinkDelete(&conf->node, &oconf_items);
2453	<	}
2454	<	else
2455	<	{
2456	<	delete_conf_item(conf);
2457	<	}
2458	<	}
2459	<	else if (conf->type == XLINE_TYPE  ||
2460	<	conf->type == RXLINE_TYPE ||
2461	<	conf->type == RKLINE_TYPE)
1534	>	/* XXX This is less than pretty */
1535	>	if (conf->type == CONF_SERVER || conf->type == CONF_OPER)
1536		{
1537	<	/* temporary (r)xlines are also on
1538	<	* the (r)xconf items list */
2465	<	if (conf->flags & CONF_FLAGS_TEMPORARY)
2466	<	continue;
2467	<
2468	<	delete_conf_item(conf);
1537	>	if (!conf->ref_count)
1538	>	conf_free(conf);
1539		}
1540	<	else
1540	>	else if (conf->type == CONF_XLINE)
1541		{
1542	<	delete_conf_item(conf);
1542	>	if (!conf->until)
1543	>	conf_free(conf);
1544		}
1545	+	else
1546	+	conf_free(conf);
1547		}
1548		}
1549
1550	+	motd_clear();
1551	+
1552		/*
1553		* don't delete the class table, rather mark all entries
1554	<	* for deletion. The table is cleaned up by check_class. - avalon
1554	>	* for deletion. The table is cleaned up by class_delete_marked. - avalon
1555		*/
1556	<	DLINK_FOREACH(ptr, class_items.head)
2482	<	{
2483	<	cltmp = map_to_conf(ptr->data);
2484	<
2485	<	if (ptr != class_items.tail)  /* never mark the "default" class */
2486	<	cltmp->active = 0;
2487	<	}
1556	>	class_mark_for_deletion();
1557
1558		clear_out_address_conf();
1559
#	Line 2520 | Line 1589 | clear_out_old_conf(void)
1589		SSL_OP_NO_TLSv1);
1590		#endif
1591
2523	–	/* clean out old resvs from the conf */
2524	–	clear_conf_resv();
2525	–
1592		/* clean out AdminInfo */
1593		MyFree(AdminInfo.name);
1594		AdminInfo.name = NULL;
#	Line 2531 | Line 1597 | clear_out_old_conf(void)
1597		MyFree(AdminInfo.description);
1598		AdminInfo.description = NULL;
1599
2534	–	/* operator{} and class{} blocks are freed above */
1600		/* clean out listeners */
1601		close_listeners();
1602
2538	–	/* auth{}, quarantine{}, shared{}, connect{}, kill{}, deny{},
2539	–	* exempt{} and gecos{} blocks are freed above too
2540	–	*/
2541	–
1603		/* clean out general */
1604		MyFree(ConfigFileEntry.service_name);
1605		ConfigFileEntry.service_name = NULL;
2545	–
2546	–	delete_isupport("INVEX");
2547	–	delete_isupport("EXCEPTS");
2548	–	}
2549	–
2550	–	/* flush_deleted_I_P()
2551	–	*
2552	–	* inputs       - none
2553	–	* output       - none
2554	–	* side effects - This function removes I/P conf items
2555	–	*/
2556	–	static void
2557	–	flush_deleted_I_P(void)
2558	–	{
2559	–	dlink_node *ptr;
2560	–	dlink_node *next_ptr;
2561	–	struct ConfItem *conf;
2562	–	struct AccessItem *aconf;
2563	–	dlink_list * free_items [] = {
2564	–	&server_items, &oconf_items, NULL
2565	–	};
2566	–	dlink_list ** iterator = free_items; /* C is dumb */
2567	–
2568	–	/* flush out deleted I and P lines
2569	–	* although still in use.
2570	–	*/
2571	–	for (; *iterator != NULL; iterator++)
2572	–	{
2573	–	DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
2574	–	{
2575	–	conf = ptr->data;
2576	–	aconf = (struct AccessItem *)map_to_conf(conf);
2577	–
2578	–	if (IsConfIllegal(aconf))
2579	–	{
2580	–	dlinkDelete(ptr, *iterator);
2581	–
2582	–	if (aconf->clients == 0)
2583	–	delete_conf_item(conf);
2584	–	}
2585	–	}
2586	–	}
2587	–	}
2588	–
2589	–	/* get_conf_name()
2590	–	*
2591	–	* inputs       - type of conf file to return name of file for
2592	–	* output       - pointer to filename for type of conf
2593	–	* side effects - none
2594	–	*/
2595	–	const char *
2596	–	get_conf_name(ConfType type)
2597	–	{
2598	–	switch (type)
2599	–	{
2600	–	case CONF_TYPE:
2601	–	return ConfigFileEntry.configfile;
2602	–	break;
2603	–	case KLINE_TYPE:
2604	–	return ConfigFileEntry.klinefile;
2605	–	break;
2606	–	case RKLINE_TYPE:
2607	–	return ConfigFileEntry.rklinefile;
2608	–	break;
2609	–	case DLINE_TYPE:
2610	–	return ConfigFileEntry.dlinefile;
2611	–	break;
2612	–	case XLINE_TYPE:
2613	–	return ConfigFileEntry.xlinefile;
2614	–	break;
2615	–	case RXLINE_TYPE:
2616	–	return ConfigFileEntry.rxlinefile;
2617	–	break;
2618	–	case CRESV_TYPE:
2619	–	return ConfigFileEntry.cresvfile;
2620	–	break;
2621	–	case NRESV_TYPE:
2622	–	return ConfigFileEntry.nresvfile;
2623	–	break;
2624	–	case GLINE_TYPE:
2625	–	return ConfigFileEntry.glinefile;
2626	–	break;
2627	–
2628	–	default:
2629	–	return NULL;  /* This should NEVER HAPPEN since we call this function
2630	–	only with the above values, this will cause us to core
2631	–	at some point if this happens so we know where it was */
2632	–	}
2633	–	}
2634	–
2635	–	#define BAD_PING (-1)
2636	–
2637	–	/* get_conf_ping()
2638	–	*
2639	–	* inputs       - pointer to struct AccessItem
2640	–	*              - pointer to a variable that receives ping warning time
2641	–	* output       - ping frequency
2642	–	* side effects - NONE
2643	–	*/
2644	–	static int
2645	–	get_conf_ping(struct ConfItem *conf, int *pingwarn)
2646	–	{
2647	–	struct ClassItem *aclass;
2648	–	struct AccessItem *aconf;
2649	–
2650	–	if (conf != NULL)
2651	–	{
2652	–	aconf = (struct AccessItem *)map_to_conf(conf);
2653	–	if (aconf->class_ptr != NULL)
2654	–	{
2655	–	aclass = (struct ClassItem *)map_to_conf(aconf->class_ptr);
2656	–	*pingwarn = aclass->ping_warning;
2657	–	return aclass->ping_freq;
2658	–	}
2659	–	}
2660	–
2661	–	return BAD_PING;
2662	–	}
2663	–
2664	–	/* get_client_class()
2665	–	*
2666	–	* inputs       - pointer to client struct
2667	–	* output       - pointer to name of class
2668	–	* side effects - NONE
2669	–	*/
2670	–	const char *
2671	–	get_client_class(struct Client *target_p)
2672	–	{
2673	–	dlink_node *cnode = NULL;
2674	–	struct AccessItem *aconf = NULL;
2675	–
2676	–	assert(!IsMe(target_p));
2677	–
2678	–	if ((cnode = target_p->localClient->confs.head))
2679	–	{
2680	–	struct ConfItem *conf = cnode->data;
2681	–
2682	–	assert((conf->type == CLIENT_TYPE) || (conf->type == SERVER_TYPE) ||
2683	–	(conf->type == OPER_TYPE));
2684	–
2685	–	aconf = map_to_conf(conf);
2686	–	if (aconf->class_ptr != NULL)
2687	–	return aconf->class_ptr->name;
2688	–	}
2689	–
2690	–	return "default";
2691	–	}
2692	–
2693	–	/* get_client_ping()
2694	–	*
2695	–	* inputs       - pointer to client struct
2696	–	*              - pointer to a variable that receives ping warning time
2697	–	* output       - ping frequency
2698	–	* side effects - NONE
2699	–	*/
2700	–	int
2701	–	get_client_ping(struct Client *target_p, int *pingwarn)
2702	–	{
2703	–	int ping = 0;
2704	–	dlink_node *cnode = NULL;
2705	–
2706	–	if ((cnode = target_p->localClient->confs.head))
2707	–	{
2708	–	struct ConfItem *conf = cnode->data;
2709	–
2710	–	assert((conf->type == CLIENT_TYPE) || (conf->type == SERVER_TYPE) ||
2711	–	(conf->type == OPER_TYPE));
2712	–
2713	–	ping = get_conf_ping(conf, pingwarn);
2714	–	if (ping > 0)
2715	–	return ping;
2716	–	}
2717	–
2718	–	*pingwarn = 0;
2719	–	return DEFAULT_PINGFREQUENCY;
2720	–	}
2721	–
2722	–	/* find_class()
2723	–	*
2724	–	* inputs       - string name of class
2725	–	* output       - corresponding Class pointer
2726	–	* side effects - NONE
2727	–	*/
2728	–	struct ConfItem *
2729	–	find_class(const char *classname)
2730	–	{
2731	–	struct ConfItem *conf;
2732	–
2733	–	if ((conf = find_exact_name_conf(CLASS_TYPE, NULL, classname, NULL, NULL)) != NULL)
2734	–	return conf;
2735	–
2736	–	return class_default;
2737	–	}
2738	–
2739	–	/* check_class()
2740	–	*
2741	–	* inputs       - NONE
2742	–	* output       - NONE
2743	–	* side effects -
2744	–	*/
2745	–	void
2746	–	check_class(void)
2747	–	{
2748	–	dlink_node *ptr = NULL, *next_ptr = NULL;
2749	–
2750	–	DLINK_FOREACH_SAFE(ptr, next_ptr, class_items.head)
2751	–	{
2752	–	struct ClassItem *aclass = map_to_conf(ptr->data);
2753	–
2754	–	if (!aclass->active && !aclass->curr_user_count)
2755	–	{
2756	–	destroy_cidr_class(aclass);
2757	–	delete_conf_item(ptr->data);
2758	–	}
2759	–	}
2760	–	}
2761	–
2762	–	/* init_class()
2763	–	*
2764	–	* inputs       - NONE
2765	–	* output       - NONE
2766	–	* side effects -
2767	–	*/
2768	–	void
2769	–	init_class(void)
2770	–	{
2771	–	struct ClassItem *aclass;
2772	–
2773	–	class_default = make_conf_item(CLASS_TYPE);
2774	–
2775	–	aclass = map_to_conf(class_default);
2776	–	aclass->active = 1;
2777	–	DupString(class_default->name, "default");
2778	–	aclass->con_freq  = DEFAULT_CONNECTFREQUENCY;
2779	–	aclass->ping_freq = DEFAULT_PINGFREQUENCY;
2780	–	aclass->max_total = MAXIMUM_LINKS_DEFAULT;
2781	–	aclass->max_sendq = DEFAULT_SENDQ;
2782	–
2783	–	client_check_cb = register_callback("check_client", check_client);
2784	–	}
2785	–
2786	–	/* get_sendq()
2787	–	*
2788	–	* inputs       - pointer to client
2789	–	* output       - sendq for this client as found from its class
2790	–	* side effects - NONE
2791	–	*/
2792	–	unsigned int
2793	–	get_sendq(struct Client *client_p)
2794	–	{
2795	–	unsigned int sendq = DEFAULT_SENDQ;
2796	–	dlink_node *cnode;
2797	–	struct ConfItem *class_conf;
2798	–	struct ClassItem *aclass;
2799	–	struct AccessItem *aconf;
2800	–
2801	–	assert(!IsMe(client_p));
2802	–
2803	–	if ((cnode = client_p->localClient->confs.head))
2804	–	{
2805	–	struct ConfItem *conf = cnode->data;
2806	–
2807	–	assert((conf->type == CLIENT_TYPE) || (conf->type == SERVER_TYPE) ||
2808	–	(conf->type == OPER_TYPE));
2809	–
2810	–	aconf = map_to_conf(conf);
2811	–
2812	–	if ((class_conf = aconf->class_ptr) == NULL)
2813	–	return DEFAULT_SENDQ; /* TBV: shouldn't be possible at all */
2814	–
2815	–	aclass = map_to_conf(class_conf);
2816	–	sendq = aclass->max_sendq;
2817	–	return sendq;
2818	–	}
2819	–
2820	–	/* XXX return a default?
2821	–	* if here, then there wasn't an attached conf with a sendq
2822	–	* that is very bad -Dianora
2823	–	*/
2824	–	return DEFAULT_SENDQ;
1606		}
1607
1608		/* conf_add_class_to_conf()
1609		*
1610		* inputs       - pointer to config item
1611		* output       - NONE
1612	<	* side effects - Add a class pointer to a conf
1612	>	* side effects - Add a class pointer to a conf
1613		*/
1614		void
1615	<	conf_add_class_to_conf(struct ConfItem *conf, const char *class_name)
1615	>	conf_add_class_to_conf(struct MaskItem *conf, const char *class_name)
1616		{
1617	<	struct AccessItem *aconf = map_to_conf(conf);
2837	<	struct ClassItem *class = NULL;
2838	<
2839	<	if (class_name == NULL)
1617	>	if (class_name == NULL)
1618		{
1619	<	aconf->class_ptr = class_default;
1619	>	conf->class = class_default;
1620
1621	<	if (conf->type == CLIENT_TYPE)
1622	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1623	<	"Warning *** Defaulting to default class for %s@%s",
1624	<	aconf->user, aconf->host);
1621	>	if (conf->type == CONF_CLIENT)
1622	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1623	>	"Warning *** Defaulting to default class for %s@%s",
1624	>	conf->user, conf->host);
1625		else
1626	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1627	<	"Warning *** Defaulting to default class for %s",
1628	<	conf->name);
1626	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1627	>	"Warning *** Defaulting to default class for %s",
1628	>	conf->name);
1629		}
1630		else
1631	<	aconf->class_ptr = find_class(class_name);
2854	<
2855	<	if (aconf->class_ptr)
2856	<	class = map_to_conf(aconf->class_ptr);
1631	>	conf->class = class_find(class_name, 1);
1632
1633	<	if (aconf->class_ptr == NULL || !class->active)
1633	>	if (conf->class == NULL)
1634		{
1635	<	if (conf->type == CLIENT_TYPE)
1636	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1637	<	"Warning *** Defaulting to default class for %s@%s",
1638	<	aconf->user, aconf->host);
1635	>	if (conf->type == CONF_CLIENT)
1636	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1637	>	"Warning *** Defaulting to default class for %s@%s",
1638	>	conf->user, conf->host);
1639		else
1640	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1641	<	"Warning *** Defaulting to default class for %s",
1642	<	conf->name);
1643	<	aconf->class_ptr = class_default;
1640	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1641	>	"Warning *** Defaulting to default class for %s",
1642	>	conf->name);
1643	>	conf->class = class_default;
1644		}
1645		}
1646
2872	–	/* conf_add_server()
2873	–	*
2874	–	* inputs       - pointer to config item
2875	–	*              - pointer to link count already on this conf
2876	–	* output       - NONE
2877	–	* side effects - Add a connect block
2878	–	*/
2879	–	int
2880	–	conf_add_server(struct ConfItem *conf, const char *class_name)
2881	–	{
2882	–	struct AccessItem *aconf = map_to_conf(conf);
2883	–
2884	–	conf_add_class_to_conf(conf, class_name);
2885	–
2886	–	if (!aconf->host || !conf->name)
2887	–	{
2888	–	sendto_realops_flags(UMODE_ALL, L_ALL, "Bad connect block");
2889	–	ilog(LOG_TYPE_IRCD, "Bad connect block");
2890	–	return -1;
2891	–	}
2892	–
2893	–	if (EmptyString(aconf->passwd))
2894	–	{
2895	–	sendto_realops_flags(UMODE_ALL, L_ALL, "Bad connect block, name %s",
2896	–	conf->name);
2897	–	ilog(LOG_TYPE_IRCD, "Bad connect block, host %s", conf->name);
2898	–	return -1;
2899	–	}
2900	–
2901	–	lookup_confhost(conf);
2902	–
2903	–	return 0;
2904	–	}
2905	–
1647		/* yyerror()
1648		*
1649		* inputs       - message from parser
#	Line 2918 | Line 1659 | yyerror(const char *msg)
1659		return;
1660
1661		strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1662	<	sendto_realops_flags(UMODE_ALL, L_ALL, "\"%s\", line %u: %s: %s",
1662	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1663	>	"\"%s\", line %u: %s: %s",
1664	>	conffilebuf, lineno + 1, msg, newlinebuf);
1665	>	ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1666	>	conffilebuf, lineno + 1, msg, newlinebuf);
1667	>	}
1668	>
1669	>	void
1670	>	conf_error_report(const char *msg)
1671	>	{
1672	>	char newlinebuf[IRCD_BUFSIZE];
1673	>
1674	>	strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1675	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1676	>	"\"%s\", line %u: %s: %s",
1677		conffilebuf, lineno + 1, msg, newlinebuf);
1678		ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1679		conffilebuf, lineno + 1, msg, newlinebuf);
#	Line 2926 | Line 1681 | yyerror(const char *msg)
1681
1682		/*
1683		* valid_tkline()
1684	<	*
1684	>	*
1685		* inputs       - pointer to ascii string to check
1686		*              - whether the specified time is in seconds or minutes
1687		* output       - -1 not enough parameters
#	Line 2935 | Line 1690 | yyerror(const char *msg)
1690		* Originally written by Dianora (Diane, db@db.net)
1691		*/
1692		time_t
1693	<	valid_tkline(const char *p, int minutes)
1693	>	valid_tkline(const char *data, const int minutes)
1694		{
1695	+	const unsigned char *p = (const unsigned char *)data;
1696	+	unsigned char tmpch = '\0';
1697		time_t result = 0;
1698
1699	<	for (; *p; ++p)
1699	>	while ((tmpch = *p++))
1700		{
1701	<	if (!IsDigit(*p))
1701	>	if (!IsDigit(tmpch))
1702		return 0;
1703
1704		result *= 10;
1705	<	result += ((*p) & 0xF);
1705	>	result += (tmpch & 0xF);
1706		}
1707
1708		/*
1709	<	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1709	>	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1710		* i.e. they specifically use 0, I am going to return 1 instead
1711		* as a return value of non-zero is used to flag it as a temporary kline
1712		*/
1713		if (result == 0)
1714		result = 1;
1715
1716	<	/*
1716	>	/*
1717		* If the incoming time is in seconds convert it to minutes for the purpose
1718		* of this calculation
1719		*/
1720		if (!minutes)
1721	<	result = result / (time_t)60;
1721	>	result = result / 60;
1722
1723		if (result > MAX_TDKLINE_TIME)
1724		result = MAX_TDKLINE_TIME;
1725
1726	<	result = result * (time_t)60;  /* turn it into seconds */
1726	>	result = result * 60;  /* turn it into seconds */
1727
1728		return result;
1729		}
1730
1731	+	/* valid_wild_card_simple()
1732	+	*
1733	+	* inputs       - data to check for sufficient non-wildcard characters
1734	+	* outputs      - 1 if valid, else 0
1735	+	* side effects - none
1736	+	*/
1737	+	int
1738	+	valid_wild_card_simple(const char *data)
1739	+	{
1740	+	const unsigned char *p = (const unsigned char *)data;
1741	+	unsigned char tmpch = '\0';
1742	+	int nonwild = 0;
1743	+
1744	+	while ((tmpch = *p++))
1745	+	{
1746	+	if (tmpch == '\\')
1747	+	{
1748	+	++p;
1749	+	if (++nonwild >= ConfigFileEntry.min_nonwildcard_simple)
1750	+	return 1;
1751	+	}
1752	+	else if (!IsMWildChar(tmpch))
1753	+	{
1754	+	if (++nonwild >= ConfigFileEntry.min_nonwildcard_simple)
1755	+	return 1;
1756	+	}
1757	+	}
1758	+
1759	+	return 0;
1760	+	}
1761	+
1762		/* valid_wild_card()
1763		*
1764		* input        - pointer to client
#	Line 2982 | Line 1770 | valid_tkline(const char *p, int minutes)
1770		int
1771		valid_wild_card(struct Client *source_p, int warn, int count, ...)
1772		{
2985	–	char *p;
1773		char tmpch;
1774		int nonwild = 0;
1775		va_list args;
#	Line 3003 | Line 1790 | valid_wild_card(struct Client *source_p,
1790
1791		while (count--)
1792		{
1793	<	p = va_arg(args, char *);
1793	>	const char *p = va_arg(args, const char *);
1794		if (p == NULL)
1795		continue;
1796
#	Line 3016 | Line 1803 | valid_wild_card(struct Client *source_p,
1803		* break - no point in searching further.
1804		*/
1805		if (++nonwild >= ConfigFileEntry.min_nonwildcard)
1806	+	{
1807	+	va_end(args);
1808		return 1;
1809	+	}
1810		}
1811		}
1812		}
1813
1814		if (warn)
1815	<	sendto_one(source_p, ":%s NOTICE %s :Please include at least %d non-wildcard characters with the mask",
1816	<	me.name, source_p->name, ConfigFileEntry.min_nonwildcard);
1815	>	sendto_one_notice(source_p, &me,
1816	>	":Please include at least %d non-wildcard characters with the mask",
1817	>	ConfigFileEntry.min_nonwildcard);
1818	>	va_end(args);
1819		return 0;
1820		}
1821
#	Line 3037 | Line 1829 | valid_wild_card(struct Client *source_p,
1829		*              - parse_flags bit map of things to test
1830		*              - pointer to user or string to parse into
1831		*              - pointer to host or NULL to parse into if non NULL
1832	<	*              - pointer to optional tkline time or NULL
1832	>	*              - pointer to optional tkline time or NULL
1833		*              - pointer to target_server to parse into if non NULL
1834		*              - pointer to reason to parse into
1835		*
#	Line 3059 | Line 1851 | valid_wild_card(struct Client *source_p,
1851		*/
1852		int
1853		parse_aline(const char *cmd, struct Client *source_p,
1854	<	int parc, char **parv,
1855	<	int parse_flags, char **up_p, char **h_p, time_t *tkline_time,
1856	<	char **target_server, char **reason)
1854	>	int parc, char **parv,
1855	>	int parse_flags, char **up_p, char **h_p, time_t *tkline_time,
1856	>	char **target_server, char **reason)
1857		{
1858		int found_tkline_time=0;
1859		static char def_reason[] = "No Reason";
#	Line 3082 | Line 1874 | parse_aline(const char *cmd, struct Clie
1874		*tkline_time = found_tkline_time;
1875		else
1876		{
1877	<	sendto_one(source_p, ":%s NOTICE %s :temp_line not supported by %s",
3086	<	me.name, source_p->name, cmd);
1877	>	sendto_one_notice(source_p, &me, ":temp_line not supported by %s", cmd);
1878		return -1;
1879		}
1880		}
1881
1882		if (parc == 0)
1883		{
1884	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
3094	<	me.name, source_p->name, cmd);
1884	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1885		return -1;
1886		}
1887
#	Line 3105 | Line 1895 | parse_aline(const char *cmd, struct Clie
1895		*up_p = user;
1896		*h_p = host;
1897		}
1898	<
1898	>
1899		parc--;
1900		parv++;
1901
#	Line 3118 | Line 1908 | parse_aline(const char *cmd, struct Clie
1908
1909		if (target_server == NULL)
1910		{
1911	<	sendto_one(source_p, ":%s NOTICE %s :ON server not supported by %s",
1912	<	me.name, source_p->name, cmd);
3123	<	return -1;
1911	>	sendto_one_notice(source_p, &me, ":ON server not supported by %s", cmd);
1912	>	return -1;
1913		}
1914
1915		if (!HasOFlag(source_p, OPER_FLAG_REMOTEBAN))
1916		{
1917	<	sendto_one(source_p, form_str(ERR_NOPRIVS),
3129	<	me.name, source_p->name, "remoteban");
1917	>	sendto_one_numeric(source_p, &me, ERR_NOPRIVS, "remoteban");
1918		return -1;
1919		}
1920
1921		if (parc == 0 || EmptyString(*parv))
1922		{
1923	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1924	<	me.name, source_p->name, cmd);
3137	<	return -1;
1923	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1924	>	return -1;
1925		}
1926
1927		*target_server = *parv;
#	Line 3147 | Line 1934 | parse_aline(const char *cmd, struct Clie
1934		* caller probably NULL'd it first, but no harm to do it again -db
1935		*/
1936		if (target_server != NULL)
1937	<	*target_server = NULL;
1937	>	*target_server = NULL;
1938		}
1939		}
1940
#	Line 3155 | Line 1942 | parse_aline(const char *cmd, struct Clie
1942		{
1943		if (strchr(user, '!') != NULL)
1944		{
1945	<	sendto_one(source_p, ":%s NOTICE %s :Invalid character '!' in kline",
3159	<	me.name, source_p->name);
1945	>	sendto_one_notice(source_p, &me, ":Invalid character '!' in kline");
1946		return -1;
1947		}
1948
#	Line 3173 | Line 1959 | parse_aline(const char *cmd, struct Clie
1959		{
1960		*reason = *parv;
1961		if (!valid_comment(source_p, *reason, 1))
1962	<	return -1;
1962	>	return -1;
1963		}
1964		else
1965		*reason = def_reason;
#	Line 3212 | Line 1998 | find_user_host(struct Client *source_p,
1998		{
1999		*(hostp++) = '\0';                       /* short and squat */
2000		if (*user_host_or_nick)
2001	<	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
2001	>	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
2002		else
2003	<	strcpy(luser, "*");
2003	>	strcpy(luser, "*");
2004	>
2005		if (*hostp)
2006	<	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
2006	>	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
2007		else
2008	<	strcpy(lhost, "*");
2008	>	strcpy(lhost, "*");
2009		}
2010		else
2011		{
2012		luser[0] = '*';             /* no @ found, assume its *@somehost */
2013	<	luser[1] = '\0';
2013	>	luser[1] = '\0';
2014		strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
2015		}
2016	<
2016	>
2017		return 1;
2018		}
2019	<	else if (!(flags & NOUSERLOOKUP))
2019	>	else
2020		{
2021		/* Try to find user@host mask from nick */
2022		/* Okay to use source_p as the first param, because source_p == client_p */
2023	<	if ((target_p =
2024	<	find_chasing(source_p, source_p, user_host_or_nick, NULL)) == NULL)
2023	>	if ((target_p =
2024	>	find_chasing(source_p, user_host_or_nick)) == NULL)
2025		return 0;
2026
2027		if (IsExemptKline(target_p))
2028		{
2029		if (!IsServer(source_p))
2030	<	sendto_one(source_p,
3244	<	":%s NOTICE %s :%s is E-lined",
3245	<	me.name, source_p->name, target_p->name);
2030	>	sendto_one_notice(source_p, &me, ":%s is E-lined", target_p->name);
2031		return 0;
2032		}
2033
#	Line 3277 | Line 2062 | find_user_host(struct Client *source_p,
2062		int
2063		valid_comment(struct Client *source_p, char *comment, int warn)
2064		{
3280	–	if (strchr(comment, '"'))
3281	–	{
3282	–	if (warn)
3283	–	sendto_one(source_p, ":%s NOTICE %s :Invalid character '\"' in comment",
3284	–	me.name, source_p->name);
3285	–	return 0;
3286	–	}
3287	–
2065		if (strlen(comment) > REASONLEN)
2066		comment[REASONLEN-1] = '\0';
2067
#	Line 3299 | Line 2076 | valid_comment(struct Client *source_p, c
2076		* side effects - none
2077		*/
2078		int
2079	<	match_conf_password(const char *password, const struct AccessItem *aconf)
2079	>	match_conf_password(const char *password, const struct MaskItem *conf)
2080		{
2081		const char *encr = NULL;
2082
2083	<	if (EmptyString(password) || EmptyString(aconf->passwd))
2083	>	if (EmptyString(password) || EmptyString(conf->passwd))
2084		return 0;
2085
2086	<	if (aconf->flags & CONF_FLAGS_ENCRYPTED)
2087	<	encr = crypt(password, aconf->passwd);
2086	>	if (conf->flags & CONF_FLAGS_ENCRYPTED)
2087	>	encr = crypt(password, conf->passwd);
2088		else
2089		encr = password;
2090
2091	<	return !strcmp(encr, aconf->passwd);
2091	>	return !strcmp(encr, conf->passwd);
2092		}
2093
2094		/*
#	Line 3340 | Line 2117 | cluster_a_line(struct Client *source_p,
2117
2118		DLINK_FOREACH(ptr, cluster_items.head)
2119		{
2120	<	const struct ConfItem *conf = ptr->data;
2120	>	const struct MaskItem *conf = ptr->data;
2121
2122		if (conf->flags & cluster_type)
2123		sendto_match_servs(source_p, conf->name, CAP_CLUSTER|capab,
2124	<	"%s %s %s", command, conf->name, buffer);
2124	>	"%s %s %s", command, conf->name, buffer);
2125		}
2126		}
2127
#	Line 3395 | Line 2172 | split_nuh(struct split_nuh_item *const i
2172		if (iptr->nickptr && *iptr->nuhmask != '\0')
2173		strlcpy(iptr->nickptr, iptr->nuhmask, iptr->nicksize);
2174
2175	<	if ((q = strchr(++p, '@'))) {
2175	>	if ((q = strchr(++p, '@')))
2176	>	{
2177		*q++ = '\0';
2178
2179		if (*p != '\0')
#	Line 3434 | Line 2212 | split_nuh(struct split_nuh_item *const i
2212		}
2213		}
2214		}
3437	–
3438	–	/*
3439	–	* flags_to_ascii
3440	–	*
3441	–	* inputs       - flags is a bitmask
3442	–	*              - pointer to table of ascii letters corresponding
3443	–	*                to each bit
3444	–	*              - flag 1 for convert ToLower if bit missing
3445	–	*                0 if ignore.
3446	–	* output       - none
3447	–	* side effects - string pointed to by p has bitmap chars written to it
3448	–	*/
3449	–	static void
3450	–	flags_to_ascii(unsigned int flags, const unsigned int bit_table[], char *p,
3451	–	int lowerit)
3452	–	{
3453	–	unsigned int mask = 1;
3454	–	int i = 0;
3455	–
3456	–	for (mask = 1; (mask != 0) && (bit_table[i] != 0); mask <<= 1, i++)
3457	–	{
3458	–	if (flags & mask)
3459	–	*p++ = bit_table[i];
3460	–	else if (lowerit)
3461	–	*p++ = ToLower(bit_table[i]);
3462	–	}
3463	–	*p = '\0';
3464	–	}
3465	–
3466	–	/*
3467	–	* cidr_limit_reached
3468	–	*
3469	–	* inputs       - int flag allowing over_rule of limits
3470	–	*              - pointer to the ip to be added
3471	–	*              - pointer to the class
3472	–	* output       - non zero if limit reached
3473	–	*                0 if limit not reached
3474	–	* side effects -
3475	–	*/
3476	–	static int
3477	–	cidr_limit_reached(int over_rule,
3478	–	struct irc_ssaddr *ip, struct ClassItem *aclass)
3479	–	{
3480	–	dlink_node *ptr = NULL;
3481	–	struct CidrItem *cidr;
3482	–
3483	–	if (aclass->number_per_cidr <= 0)
3484	–	return 0;
3485	–
3486	–	if (ip->ss.ss_family == AF_INET)
3487	–	{
3488	–	if (aclass->cidr_bitlen_ipv4 <= 0)
3489	–	return 0;
3490	–
3491	–	DLINK_FOREACH(ptr, aclass->list_ipv4.head)
3492	–	{
3493	–	cidr = ptr->data;
3494	–	if (match_ipv4(ip, &cidr->mask, aclass->cidr_bitlen_ipv4))
3495	–	{
3496	–	if (!over_rule && (cidr->number_on_this_cidr >= aclass->number_per_cidr))
3497	–	return -1;
3498	–	cidr->number_on_this_cidr++;
3499	–	return 0;
3500	–	}
3501	–	}
3502	–	cidr = MyMalloc(sizeof(struct CidrItem));
3503	–	cidr->number_on_this_cidr = 1;
3504	–	cidr->mask = *ip;
3505	–	mask_addr(&cidr->mask, aclass->cidr_bitlen_ipv4);
3506	–	dlinkAdd(cidr, &cidr->node, &aclass->list_ipv4);
3507	–	}
3508	–	#ifdef IPV6
3509	–	else if (aclass->cidr_bitlen_ipv6 > 0)
3510	–	{
3511	–	DLINK_FOREACH(ptr, aclass->list_ipv6.head)
3512	–	{
3513	–	cidr = ptr->data;
3514	–	if (match_ipv6(ip, &cidr->mask, aclass->cidr_bitlen_ipv6))
3515	–	{
3516	–	if (!over_rule && (cidr->number_on_this_cidr >= aclass->number_per_cidr))
3517	–	return -1;
3518	–	cidr->number_on_this_cidr++;
3519	–	return 0;
3520	–	}
3521	–	}
3522	–	cidr = MyMalloc(sizeof(struct CidrItem));
3523	–	cidr->number_on_this_cidr = 1;
3524	–	cidr->mask = *ip;
3525	–	mask_addr(&cidr->mask, aclass->cidr_bitlen_ipv6);
3526	–	dlinkAdd(cidr, &cidr->node, &aclass->list_ipv6);
3527	–	}
3528	–	#endif
3529	–	return 0;
3530	–	}
3531	–
3532	–	/*
3533	–	* remove_from_cidr_check
3534	–	*
3535	–	* inputs       - pointer to the ip to be removed
3536	–	*              - pointer to the class
3537	–	* output       - NONE
3538	–	* side effects -
3539	–	*/
3540	–	static void
3541	–	remove_from_cidr_check(struct irc_ssaddr *ip, struct ClassItem *aclass)
3542	–	{
3543	–	dlink_node *ptr = NULL;
3544	–	dlink_node *next_ptr = NULL;
3545	–	struct CidrItem *cidr;
3546	–
3547	–	if (aclass->number_per_cidr == 0)
3548	–	return;
3549	–
3550	–	if (ip->ss.ss_family == AF_INET)
3551	–	{
3552	–	if (aclass->cidr_bitlen_ipv4 <= 0)
3553	–	return;
3554	–
3555	–	DLINK_FOREACH_SAFE(ptr, next_ptr, aclass->list_ipv4.head)
3556	–	{
3557	–	cidr = ptr->data;
3558	–	if (match_ipv4(ip, &cidr->mask, aclass->cidr_bitlen_ipv4))
3559	–	{
3560	–	cidr->number_on_this_cidr--;
3561	–	if (cidr->number_on_this_cidr == 0)
3562	–	{
3563	–	dlinkDelete(ptr, &aclass->list_ipv4);
3564	–	MyFree(cidr);
3565	–	return;
3566	–	}
3567	–	}
3568	–	}
3569	–	}
3570	–	#ifdef IPV6
3571	–	else if (aclass->cidr_bitlen_ipv6 > 0)
3572	–	{
3573	–	DLINK_FOREACH_SAFE(ptr, next_ptr, aclass->list_ipv6.head)
3574	–	{
3575	–	cidr = ptr->data;
3576	–	if (match_ipv6(ip, &cidr->mask, aclass->cidr_bitlen_ipv6))
3577	–	{
3578	–	cidr->number_on_this_cidr--;
3579	–	if (cidr->number_on_this_cidr == 0)
3580	–	{
3581	–	dlinkDelete(ptr, &aclass->list_ipv6);
3582	–	MyFree(cidr);
3583	–	return;
3584	–	}
3585	–	}
3586	–	}
3587	–	}
3588	–	#endif
3589	–	}
3590	–
3591	–	static void
3592	–	rebuild_cidr_list(int aftype, struct ConfItem *oldcl, struct ClassItem *newcl,
3593	–	dlink_list *old_list, dlink_list *new_list, int changed)
3594	–	{
3595	–	dlink_node *ptr;
3596	–	struct Client *client_p;
3597	–	struct ConfItem *conf;
3598	–	struct AccessItem *aconf;
3599	–
3600	–	if (!changed)
3601	–	{
3602	–	*new_list = *old_list;
3603	–	old_list->head = old_list->tail = NULL;
3604	–	old_list->length = 0;
3605	–	return;
3606	–	}
3607	–
3608	–	DLINK_FOREACH(ptr, local_client_list.head)
3609	–	{
3610	–	client_p = ptr->data;
3611	–	if (client_p->localClient->aftype != aftype)
3612	–	continue;
3613	–	if (dlink_list_length(&client_p->localClient->confs) == 0)
3614	–	continue;
3615	–
3616	–	conf = client_p->localClient->confs.tail->data;
3617	–	if (conf->type == CLIENT_TYPE)
3618	–	{
3619	–	aconf = map_to_conf(conf);
3620	–	if (aconf->class_ptr == oldcl)
3621	–	cidr_limit_reached(1, &client_p->localClient->ip, newcl);
3622	–	}
3623	–	}
3624	–	}
3625	–
3626	–	/*
3627	–	* rebuild_cidr_class
3628	–	*
3629	–	* inputs       - pointer to old conf
3630	–	*              - pointer to new_class
3631	–	* output       - none
3632	–	* side effects - rebuilds the class link list of cidr blocks
3633	–	*/
3634	–	void
3635	–	rebuild_cidr_class(struct ConfItem *conf, struct ClassItem *new_class)
3636	–	{
3637	–	struct ClassItem *old_class = map_to_conf(conf);
3638	–
3639	–	if (old_class->number_per_cidr > 0 && new_class->number_per_cidr > 0)
3640	–	{
3641	–	if (old_class->cidr_bitlen_ipv4 > 0 && new_class->cidr_bitlen_ipv4 > 0)
3642	–	rebuild_cidr_list(AF_INET, conf, new_class,
3643	–	&old_class->list_ipv4, &new_class->list_ipv4,
3644	–	old_class->cidr_bitlen_ipv4 != new_class->cidr_bitlen_ipv4);
3645	–
3646	–	#ifdef IPV6
3647	–	if (old_class->cidr_bitlen_ipv6 > 0 && new_class->cidr_bitlen_ipv6 > 0)
3648	–	rebuild_cidr_list(AF_INET6, conf, new_class,
3649	–	&old_class->list_ipv6, &new_class->list_ipv6,
3650	–	old_class->cidr_bitlen_ipv6 != new_class->cidr_bitlen_ipv6);
3651	–	#endif
3652	–	}
3653	–
3654	–	destroy_cidr_class(old_class);
3655	–	}
3656	–
3657	–	/*
3658	–	* destroy_cidr_list
3659	–	*
3660	–	* inputs       - pointer to class dlink list of cidr blocks
3661	–	* output       - none
3662	–	* side effects - completely destroys the class link list of cidr blocks
3663	–	*/
3664	–	static void
3665	–	destroy_cidr_list(dlink_list *list)
3666	–	{
3667	–	dlink_node *ptr = NULL, *next_ptr = NULL;
3668	–
3669	–	DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
3670	–	{
3671	–	dlinkDelete(ptr, list);
3672	–	MyFree(ptr->data);
3673	–	}
3674	–	}
3675	–
3676	–	/*
3677	–	* destroy_cidr_class
3678	–	*
3679	–	* inputs       - pointer to class
3680	–	* output       - none
3681	–	* side effects - completely destroys the class link list of cidr blocks
3682	–	*/
3683	–	static void
3684	–	destroy_cidr_class(struct ClassItem *aclass)
3685	–	{
3686	–	destroy_cidr_list(&aclass->list_ipv4);
3687	–	destroy_cidr_list(&aclass->list_ipv6);
3688	–	}

Diff Legend

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