ViewVC Help

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

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

Comparing ircd-hybrid/trunk/src/conf.c (file contents):
Revision 1628 by michael, Thu Nov 1 21:08:56 2012 UTC vs.
Revision 4343 by michael, Sat Aug 2 16:58:33 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"
31	>	#include "server.h"
32		#include "resv.h"
33		#include "channel.h"
34		#include "client.h"
35		#include "event.h"
35	–	#include "hook.h"
36		#include "irc_string.h"
37		#include "s_bsd.h"
38		#include "ircd.h"
#	Line 43 | Line 43
43		#include "fdlist.h"
44		#include "log.h"
45		#include "send.h"
46	–	#include "s_gline.h"
46		#include "memory.h"
47	<	#include "irc_res.h"
47	>	#include "res.h"
48		#include "userhost.h"
49	<	#include "s_user.h"
49	>	#include "user.h"
50		#include "channel_mode.h"
51		#include "parse.h"
52	<	#include "s_misc.h"
52	>	#include "misc.h"
53		#include "conf_db.h"
54	+	#include "conf_class.h"
55	+	#include "motd.h"
56	+	#include "ipcache.h"
57
56	–	struct Callback *client_check_cb = NULL;
57	–	struct config_server_hide ConfigServerHide;
58
59		/* general conf items link list root, other than k lines etc. */
60		dlink_list service_items = { NULL, NULL, 0 };
#	Line 63 | Line 63 | dlink_list cluster_items = { NULL, NULL,
63		dlink_list oconf_items   = { NULL, NULL, 0 };
64		dlink_list uconf_items   = { NULL, NULL, 0 };
65		dlink_list xconf_items   = { NULL, NULL, 0 };
66	–	dlink_list rxconf_items  = { NULL, NULL, 0 };
67	–	dlink_list rkconf_items  = { NULL, NULL, 0 };
66		dlink_list nresv_items   = { NULL, NULL, 0 };
67	<	dlink_list class_items   = { NULL, NULL, 0 };
70	<
71	<	dlink_list temporary_resv = { NULL, NULL, 0 };
67	>	dlink_list cresv_items   = { NULL, NULL, 0 };
68
69		extern unsigned int lineno;
70		extern char linebuf[];
71		extern char conffilebuf[IRCD_BUFSIZE];
72		extern int yyparse(); /* defined in y.tab.c */
73
78	–	struct conf_parser_context conf_parser_ctx = { 0, 0, NULL };
79	–
74		/* internally defined functions */
75		static void read_conf(FILE *);
76		static void clear_out_old_conf(void);
83	–	static void flush_deleted_I_P(void);
77		static void expire_tklines(dlink_list *);
78	<	static void garbage_collect_ip_entries(void);
79	<	static int hash_ip(struct irc_ssaddr *);
80	<	static int verify_access(struct Client *, const char *);
88	<	static int attach_iline(struct Client *, struct ConfItem *);
89	<	static struct ip_entry *find_or_add_ip(struct irc_ssaddr *);
90	<	static dlink_list *map_to_list(ConfType);
91	<	static struct AccessItem *find_regexp_kline(const char *[]);
78	>	static int verify_access(struct Client *);
79	>	static int attach_iline(struct Client *, struct MaskItem *);
80	>	static dlink_list *map_to_list(enum maskitem_type);
81		static int find_user_host(struct Client *, char *, char *, char *, unsigned int);
82
94	–	/*
95	–	* bit_len
96	–	*/
97	–	static int cidr_limit_reached(int, struct irc_ssaddr *, struct ClassItem *);
98	–	static void remove_from_cidr_check(struct irc_ssaddr *, struct ClassItem *);
99	–	static void destroy_cidr_class(struct ClassItem *);
100	–
101	–	static void flags_to_ascii(unsigned int, const unsigned int[], char *, int);
102	–
103	–	/* address of default class conf */
104	–	static struct ConfItem *class_default;
105	–
106	–	/* usually, with hash tables, you use a prime number...
107	–	* but in this case I am dealing with ip addresses,
108	–	* not ascii strings.
109	–	*/
110	–	#define IP_HASH_SIZE 0x1000
111	–
112	–	struct ip_entry
113	–	{
114	–	struct irc_ssaddr ip;
115	–	int count;
116	–	time_t last_attempt;
117	–	struct ip_entry *next;
118	–	};
119	–
120	–	static struct ip_entry *ip_hash_table[IP_HASH_SIZE];
121	–	static BlockHeap *ip_entry_heap = NULL;
122	–	static int ip_entries_count = 0;
123	–
124	–
125	–	void *
126	–	map_to_conf(struct ConfItem *aconf)
127	–	{
128	–	void *conf;
129	–	conf = (void *)((uintptr_t)aconf +
130	–	(uintptr_t)sizeof(struct ConfItem));
131	–	return(conf);
132	–	}
133	–
134	–	struct ConfItem *
135	–	unmap_conf_item(void *aconf)
136	–	{
137	–	struct ConfItem *conf;
138	–
139	–	conf = (struct ConfItem *)((uintptr_t)aconf -
140	–	(uintptr_t)sizeof(struct ConfItem));
141	–	return(conf);
142	–	}
83
84		/* conf_dns_callback()
85		*
86	<	* inputs       - pointer to struct AccessItem
86	>	* inputs       - pointer to struct MaskItem
87		*              - pointer to DNSReply reply
88		* output       - none
89		* side effects - called when resolver query finishes
#	Line 154 | Line 94 | unmap_conf_item(void *aconf)
94		static void
95		conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name)
96		{
97	<	struct AccessItem *aconf = vptr;
97	>	struct MaskItem *conf = vptr;
98
99	<	aconf->dns_pending = 0;
99	>	conf->dns_pending = 0;
100
101	<	if (addr != NULL)
102	<	memcpy(&aconf->addr, addr, sizeof(aconf->addr));
101	>	if (addr)
102	>	memcpy(&conf->addr, addr, sizeof(conf->addr));
103		else
104	<	aconf->dns_failed = 1;
104	>	conf->dns_failed = 1;
105		}
106
107		/* conf_dns_lookup()
#	Line 171 | Line 111 | conf_dns_callback(void *vptr, const stru
111		* allocate a dns_query and start ns lookup.
112		*/
113		static void
114	<	conf_dns_lookup(struct AccessItem *aconf)
114	>	conf_dns_lookup(struct MaskItem *conf)
115		{
116	<	if (!aconf->dns_pending)
116	>	if (!conf->dns_pending)
117		{
118	<	aconf->dns_pending = 1;
119	<	gethost_byname(conf_dns_callback, aconf, aconf->host);
118	>	conf->dns_pending = 1;
119	>	gethost_byname(conf_dns_callback, conf, conf->host);
120		}
121		}
122
123	<	/* make_conf_item()
124	<	*
185	<	* inputs       - type of item
186	<	* output       - pointer to new conf entry
187	<	* side effects - none
188	<	*/
189	<	struct ConfItem *
190	<	make_conf_item(ConfType type)
123	>	struct MaskItem *
124	>	conf_make(enum maskitem_type type)
125		{
126	<	struct ConfItem *conf = NULL;
127	<	struct AccessItem *aconf = NULL;
194	<	struct ClassItem *aclass = NULL;
195	<	int status = 0;
196	<
197	<	switch (type)
198	<	{
199	<	case DLINE_TYPE:
200	<	case EXEMPTDLINE_TYPE:
201	<	case GLINE_TYPE:
202	<	case KLINE_TYPE:
203	<	case CLIENT_TYPE:
204	<	case OPER_TYPE:
205	<	case SERVER_TYPE:
206	<	conf = MyMalloc(sizeof(struct ConfItem) +
207	<	sizeof(struct AccessItem));
208	<	aconf = map_to_conf(conf);
209	<	aconf->aftype = AF_INET;
210	<
211	<	/* Yes, sigh. switch on type again */
212	<	switch (type)
213	<	{
214	<	case EXEMPTDLINE_TYPE:
215	<	status = CONF_EXEMPTDLINE;
216	<	break;
217	<
218	<	case DLINE_TYPE:
219	<	status = CONF_DLINE;
220	<	break;
221	<
222	<	case KLINE_TYPE:
223	<	status = CONF_KLINE;
224	<	break;
225	<
226	<	case GLINE_TYPE:
227	<	status = CONF_GLINE;
228	<	break;
229	<
230	<	case CLIENT_TYPE:
231	<	status = CONF_CLIENT;
232	<	break;
233	<
234	<	case OPER_TYPE:
235	<	status = CONF_OPERATOR;
236	<	dlinkAdd(conf, &conf->node, &oconf_items);
237	<	break;
238	<
239	<	case SERVER_TYPE:
240	<	status = CONF_SERVER;
241	<	dlinkAdd(conf, &conf->node, &server_items);
242	<	break;
243	<
244	<	default:
245	<	break;
246	<	}
247	<	aconf->status = status;
248	<	break;
249	<
250	<	case ULINE_TYPE:
251	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
252	<	sizeof(struct MatchItem));
253	<	dlinkAdd(conf, &conf->node, &uconf_items);
254	<	break;
126	>	struct MaskItem *conf = MyCalloc(sizeof(*conf));
127	>	dlink_list *list = NULL;
128
129	<	case XLINE_TYPE:
130	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
131	<	sizeof(struct MatchItem));
259	<	dlinkAdd(conf, &conf->node, &xconf_items);
260	<	break;
261	<	#ifdef HAVE_LIBPCRE
262	<	case RXLINE_TYPE:
263	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
264	<	sizeof(struct MatchItem));
265	<	dlinkAdd(conf, &conf->node, &rxconf_items);
266	<	break;
267	<
268	<	case RKLINE_TYPE:
269	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
270	<	sizeof(struct AccessItem));
271	<	aconf = map_to_conf(conf);
272	<	aconf->status = CONF_KLINE;
273	<	dlinkAdd(conf, &conf->node, &rkconf_items);
274	<	break;
275	<	#endif
276	<	case CLUSTER_TYPE:
277	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem));
278	<	dlinkAdd(conf, &conf->node, &cluster_items);
279	<	break;
280	<
281	<	case CRESV_TYPE:
282	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
283	<	sizeof(struct ResvChannel));
284	<	break;
285	<
286	<	case NRESV_TYPE:
287	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
288	<	sizeof(struct MatchItem));
289	<	dlinkAdd(conf, &conf->node, &nresv_items);
290	<	break;
291	<
292	<	case SERVICE_TYPE:
293	<	status = CONF_SERVICE;
294	<	conf = MyMalloc(sizeof(struct ConfItem));
295	<	dlinkAdd(conf, &conf->node, &service_items);
296	<	break;
297	<
298	<	case CLASS_TYPE:
299	<	conf = MyMalloc(sizeof(struct ConfItem) +
300	<	sizeof(struct ClassItem));
301	<	dlinkAdd(conf, &conf->node, &class_items);
302	<
303	<	aclass = map_to_conf(conf);
304	<	aclass->active = 1;
305	<	aclass->con_freq = DEFAULT_CONNECTFREQUENCY;
306	<	aclass->ping_freq = DEFAULT_PINGFREQUENCY;
307	<	aclass->max_total = MAXIMUM_LINKS_DEFAULT;
308	<	aclass->max_sendq = DEFAULT_SENDQ;
309	<	aclass->max_recvq = DEFAULT_RECVQ;
310	<
311	<	break;
312	<
313	<	default:
314	<	conf = NULL;
315	<	break;
316	<	}
317	<
318	<	/* XXX Yes, this will core if default is hit. I want it to for now - db */
319	<	conf->type = type;
129	>	conf->type   = type;
130	>	conf->active = 1;
131	>	conf->aftype = AF_INET;
132
133	+	if ((list = map_to_list(type)))
134	+	dlinkAdd(conf, &conf->node, list);
135		return conf;
136		}
137
138		void
139	<	delete_conf_item(struct ConfItem *conf)
139	>	conf_free(struct MaskItem *conf)
140		{
141	<	dlink_node *m = NULL, *m_next = NULL;
142	<	struct MatchItem *match_item;
143	<	struct AccessItem *aconf;
144	<	ConfType type = conf->type;
141	>	dlink_node *ptr = NULL, *ptr_next = NULL;
142	>	dlink_list *list = NULL;
143	>
144	>	if (conf->node.next)
145	>	if ((list = map_to_list(conf->type)))
146	>	dlinkDelete(&conf->node, list);
147
148		MyFree(conf->name);
333	–	conf->name = NULL;
149
150	<	switch(type)
151	<	{
152	<	case DLINE_TYPE:
153	<	case EXEMPTDLINE_TYPE:
154	<	case GLINE_TYPE:
155	<	case KLINE_TYPE:
156	<	case CLIENT_TYPE:
157	<	case OPER_TYPE:
158	<	case SERVER_TYPE:
159	<	aconf = map_to_conf(conf);
160	<
161	<	if (aconf->dns_pending)
162	<	delete_resolver_queries(aconf);
163	<	if (aconf->passwd != NULL)
164	<	memset(aconf->passwd, 0, strlen(aconf->passwd));
350	<	if (aconf->spasswd != NULL)
351	<	memset(aconf->spasswd, 0, strlen(aconf->spasswd));
352	<	aconf->class_ptr = NULL;
353	<
354	<	MyFree(aconf->passwd);
355	<	MyFree(aconf->spasswd);
356	<	MyFree(aconf->reason);
357	<	MyFree(aconf->user);
358	<	MyFree(aconf->host);
150	>	if (conf->dns_pending)
151	>	delete_resolver_queries(conf);
152	>	if (conf->passwd)
153	>	memset(conf->passwd, 0, strlen(conf->passwd));
154	>	if (conf->spasswd)
155	>	memset(conf->spasswd, 0, strlen(conf->spasswd));
156	>
157	>	conf->class = NULL;
158	>
159	>	MyFree(conf->passwd);
160	>	MyFree(conf->spasswd);
161	>	MyFree(conf->reason);
162	>	MyFree(conf->certfp);
163	>	MyFree(conf->user);
164	>	MyFree(conf->host);
165		#ifdef HAVE_LIBCRYPTO
166	<	MyFree(aconf->cipher_list);
361	<
362	<	if (aconf->rsa_public_key)
363	<	RSA_free(aconf->rsa_public_key);
364	<	MyFree(aconf->rsa_public_key_file);
365	<	#endif
166	>	MyFree(conf->cipher_list);
167
168	<	/* Yes, sigh. switch on type again */
169	<	switch(type)
369	<	{
370	<	case EXEMPTDLINE_TYPE:
371	<	case DLINE_TYPE:
372	<	case GLINE_TYPE:
373	<	case KLINE_TYPE:
374	<	case CLIENT_TYPE:
375	<	MyFree(conf);
376	<	break;
377	<
378	<	case OPER_TYPE:
379	<	aconf = map_to_conf(conf);
380	<	if (!IsConfIllegal(aconf))
381	<	dlinkDelete(&conf->node, &oconf_items);
382	<	MyFree(conf);
383	<	break;
384	<
385	<	case SERVER_TYPE:
386	<	aconf = map_to_conf(conf);
387	<
388	<	DLINK_FOREACH_SAFE(m, m_next, aconf->hub_list.head)
389	<	{
390	<	MyFree(m->data);
391	<	free_dlink_node(m);
392	<	}
393	<
394	<	DLINK_FOREACH_SAFE(m, m_next, aconf->leaf_list.head)
395	<	{
396	<	MyFree(m->data);
397	<	free_dlink_node(m);
398	<	}
399	<
400	<	if (!IsConfIllegal(aconf))
401	<	dlinkDelete(&conf->node, &server_items);
402	<	MyFree(conf);
403	<	break;
404	<
405	<	default:
406	<	break;
407	<	}
408	<	break;
409	<
410	<	case ULINE_TYPE:
411	<	match_item = map_to_conf(conf);
412	<	MyFree(match_item->user);
413	<	MyFree(match_item->host);
414	<	MyFree(match_item->reason);
415	<	dlinkDelete(&conf->node, &uconf_items);
416	<	MyFree(conf);
417	<	break;
418	<
419	<	case XLINE_TYPE:
420	<	match_item = map_to_conf(conf);
421	<	MyFree(match_item->user);
422	<	MyFree(match_item->host);
423	<	MyFree(match_item->reason);
424	<	dlinkDelete(&conf->node, &xconf_items);
425	<	MyFree(conf);
426	<	break;
427	<	#ifdef HAVE_LIBPCRE
428	<	case RKLINE_TYPE:
429	<	aconf = map_to_conf(conf);
430	<	MyFree(aconf->regexuser);
431	<	MyFree(aconf->regexhost);
432	<	MyFree(aconf->user);
433	<	MyFree(aconf->host);
434	<	MyFree(aconf->reason);
435	<	dlinkDelete(&conf->node, &rkconf_items);
436	<	MyFree(conf);
437	<	break;
438	<
439	<	case RXLINE_TYPE:
440	<	MyFree(conf->regexpname);
441	<	match_item = map_to_conf(conf);
442	<	MyFree(match_item->user);
443	<	MyFree(match_item->host);
444	<	MyFree(match_item->reason);
445	<	dlinkDelete(&conf->node, &rxconf_items);
446	<	MyFree(conf);
447	<	break;
168	>	if (conf->rsa_public_key)
169	>	RSA_free(conf->rsa_public_key);
170		#endif
171	<	case NRESV_TYPE:
172	<	match_item = map_to_conf(conf);
173	<	MyFree(match_item->user);
174	<	MyFree(match_item->host);
175	<	MyFree(match_item->reason);
454	<	dlinkDelete(&conf->node, &nresv_items);
455	<	MyFree(conf);
456	<	break;
457	<
458	<	case CLUSTER_TYPE:
459	<	dlinkDelete(&conf->node, &cluster_items);
460	<	MyFree(conf);
461	<	break;
462	<
463	<	case CRESV_TYPE:
464	<	MyFree(conf);
465	<	break;
466	<
467	<	case CLASS_TYPE:
468	<	dlinkDelete(&conf->node, &class_items);
469	<	MyFree(conf);
470	<	break;
471	<
472	<	case SERVICE_TYPE:
473	<	dlinkDelete(&conf->node, &service_items);
474	<	MyFree(conf);
475	<	break;
476	<
477	<	default:
478	<	break;
171	>	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->hub_list.head)
172	>	{
173	>	MyFree(ptr->data);
174	>	dlinkDelete(ptr, &conf->hub_list);
175	>	free_dlink_node(ptr);
176		}
480	–	}
481	–
482	–	/* free_access_item()
483	–	*
484	–	* inputs       - pointer to conf to free
485	–	* output       - none
486	–	* side effects - crucial password fields are zeroed, conf is freed
487	–	*/
488	–	void
489	–	free_access_item(struct AccessItem *aconf)
490	–	{
491	–	struct ConfItem *conf;
492	–
493	–	if (aconf == NULL)
494	–	return;
495	–	conf = unmap_conf_item(aconf);
496	–	delete_conf_item(conf);
497	–	}
498	–
499	–	static const unsigned int shared_bit_table[] =
500	–	{ 'K', 'k', 'U', 'X', 'x', 'Y', 'Q', 'q', 'R', 'L', 0};
501	–
502	–	/* report_confitem_types()
503	–	*
504	–	* inputs       - pointer to client requesting confitem report
505	–	*              - ConfType to report
506	–	* output       - none
507	–	* side effects -
508	–	*/
509	–	void
510	–	report_confitem_types(struct Client *source_p, ConfType type)
511	–	{
512	–	dlink_node *ptr = NULL, *dptr = NULL;
513	–	struct ConfItem *conf = NULL;
514	–	struct AccessItem *aconf = NULL;
515	–	struct MatchItem *matchitem = NULL;
516	–	struct ClassItem *classitem = NULL;
517	–	char buf[12];
518	–	char *p = NULL;
177
178	<	switch (type)
178	>	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->leaf_list.head)
179		{
180	<	case XLINE_TYPE:
181	<	DLINK_FOREACH(ptr, xconf_items.head)
182	<	{
183	<	conf = ptr->data;
526	<	matchitem = map_to_conf(conf);
527	<
528	<	sendto_one(source_p, form_str(RPL_STATSXLINE),
529	<	me.name, source_p->name,
530	<	matchitem->hold ? "x": "X", matchitem->count,
531	<	conf->name, matchitem->reason);
532	<	}
533	<	break;
534	<
535	<	#ifdef HAVE_LIBPCRE
536	<	case RXLINE_TYPE:
537	<	DLINK_FOREACH(ptr, rxconf_items.head)
538	<	{
539	<	conf = ptr->data;
540	<	matchitem = map_to_conf(conf);
541	<
542	<	sendto_one(source_p, form_str(RPL_STATSXLINE),
543	<	me.name, source_p->name,
544	<	"XR", matchitem->count,
545	<	conf->name, matchitem->reason);
546	<	}
547	<	break;
548	<
549	<	case RKLINE_TYPE:
550	<	DLINK_FOREACH(ptr, rkconf_items.head)
551	<	{
552	<	aconf = map_to_conf((conf = ptr->data));
553	<
554	<	sendto_one(source_p, form_str(RPL_STATSKLINE), me.name,
555	<	source_p->name, "KR", aconf->host, aconf->user,
556	<	aconf->reason);
557	<	}
558	<	break;
559	<	#endif
560	<
561	<	case ULINE_TYPE:
562	<	DLINK_FOREACH(ptr, uconf_items.head)
563	<	{
564	<	conf = ptr->data;
565	<	matchitem = map_to_conf(conf);
566	<
567	<	p = buf;
568	<
569	<	/* some of these are redundant for the sake of
570	<	* consistency with cluster{} flags
571	<	*/
572	<	*p++ = 'c';
573	<	flags_to_ascii(matchitem->action, shared_bit_table, p, 0);
574	<
575	<	sendto_one(source_p, form_str(RPL_STATSULINE),
576	<	me.name, source_p->name, conf->name,
577	<	matchitem->user?matchitem->user: "*",
578	<	matchitem->host?matchitem->host: "*", buf);
579	<	}
580	<
581	<	DLINK_FOREACH(ptr, cluster_items.head)
582	<	{
583	<	conf = ptr->data;
584	<
585	<	p = buf;
586	<
587	<	*p++ = 'C';
588	<	flags_to_ascii(conf->flags, shared_bit_table, p, 0);
589	<
590	<	sendto_one(source_p, form_str(RPL_STATSULINE),
591	<	me.name, source_p->name, conf->name,
592	<	"*", "*", buf);
593	<	}
594	<
595	<	break;
596	<
597	<	case OPER_TYPE:
598	<	DLINK_FOREACH(ptr, oconf_items.head)
599	<	{
600	<	conf = ptr->data;
601	<	aconf = map_to_conf(conf);
602	<
603	<	/* Don't allow non opers to see oper privs */
604	<	if (HasUMode(source_p, UMODE_OPER))
605	<	sendto_one(source_p, form_str(RPL_STATSOLINE),
606	<	me.name, source_p->name, 'O', aconf->user, aconf->host,
607	<	conf->name, oper_privs_as_string(aconf->port),
608	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
609	<	else
610	<	sendto_one(source_p, form_str(RPL_STATSOLINE),
611	<	me.name, source_p->name, 'O', aconf->user, aconf->host,
612	<	conf->name, "0",
613	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
614	<	}
615	<	break;
616	<
617	<	case CLASS_TYPE:
618	<	DLINK_FOREACH(ptr, class_items.head)
619	<	{
620	<	conf = ptr->data;
621	<	classitem = map_to_conf(conf);
622	<	sendto_one(source_p, form_str(RPL_STATSYLINE),
623	<	me.name, source_p->name, 'Y',
624	<	conf->name, classitem->ping_freq,
625	<	classitem->con_freq,
626	<	classitem->max_total, classitem->max_sendq,
627	<	classitem->max_recvq,
628	<	classitem->curr_user_count,
629	<	classitem->number_per_cidr, classitem->cidr_bitlen_ipv4,
630	<	classitem->number_per_cidr, classitem->cidr_bitlen_ipv6,
631	<	classitem->active ? "active" : "disabled");
632	<	}
633	<	break;
634	<
635	<	case CONF_TYPE:
636	<	case CLIENT_TYPE:
637	<	break;
638	<
639	<	case SERVICE_TYPE:
640	<	DLINK_FOREACH(ptr, service_items.head)
641	<	{
642	<	conf = ptr->data;
643	<	sendto_one(source_p, form_str(RPL_STATSSERVICE),
644	<	me.name, source_p->name, 'S', "*", conf->name, 0, 0);
645	<	}
646	<	break;
647	<
648	<	case SERVER_TYPE:
649	<	DLINK_FOREACH(ptr, server_items.head)
650	<	{
651	<	p = buf;
652	<
653	<	conf = ptr->data;
654	<	aconf = map_to_conf(conf);
655	<
656	<	buf[0] = '\0';
657	<
658	<	if (IsConfAllowAutoConn(aconf))
659	<	*p++ = 'A';
660	<	if (IsConfSSL(aconf))
661	<	*p++ = 'S';
662	<	if (buf[0] == '\0')
663	<	*p++ = '*';
664	<
665	<	*p = '\0';
666	<
667	<	/*
668	<	* Allow admins to see actual ips unless hide_server_ips is enabled
669	<	*/
670	<	if (!ConfigServerHide.hide_server_ips && HasUMode(source_p, UMODE_ADMIN))
671	<	sendto_one(source_p, form_str(RPL_STATSCLINE),
672	<	me.name, source_p->name, 'C', aconf->host,
673	<	buf, conf->name, aconf->port,
674	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
675	<	else
676	<	sendto_one(source_p, form_str(RPL_STATSCLINE),
677	<	me.name, source_p->name, 'C',
678	<	"*@127.0.0.1", buf, conf->name, aconf->port,
679	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
680	<	}
681	<	break;
682	<
683	<	case HUB_TYPE:
684	<	DLINK_FOREACH(ptr, server_items.head)
685	<	{
686	<	conf = ptr->data;
687	<	aconf = map_to_conf(conf);
688	<
689	<	DLINK_FOREACH(dptr, aconf->hub_list.head)
690	<	sendto_one(source_p, form_str(RPL_STATSHLINE), me.name,
691	<	source_p->name, 'H', dptr->data, conf->name, 0, "*");
692	<	}
693	<	break;
694	<
695	<	case LEAF_TYPE:
696	<	DLINK_FOREACH(ptr, server_items.head)
697	<	{
698	<	conf = ptr->data;
699	<	aconf = map_to_conf(conf);
180	>	MyFree(ptr->data);
181	>	dlinkDelete(ptr, &conf->leaf_list);
182	>	free_dlink_node(ptr);
183	>	}
184
185	<	DLINK_FOREACH(dptr, aconf->leaf_list.head)
186	<	sendto_one(source_p, form_str(RPL_STATSLLINE), me.name,
187	<	source_p->name, 'L', dptr->data, conf->name, 0, "*");
704	<	}
705	<	break;
185	>	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->exempt_list.head)
186	>	{
187	>	struct exempt *exptr = ptr->data;
188
189	<	case GLINE_TYPE:
190	<	case KLINE_TYPE:
191	<	case DLINE_TYPE:
192	<	case EXEMPTDLINE_TYPE:
193	<	case CRESV_TYPE:
712	<	case NRESV_TYPE:
713	<	case CLUSTER_TYPE:
714	<	default:
715	<	break;
189	>	dlinkDelete(ptr, &conf->exempt_list);
190	>	MyFree(exptr->name);
191	>	MyFree(exptr->user);
192	>	MyFree(exptr->host);
193	>	MyFree(exptr);
194		}
195	+
196	+	MyFree(conf);
197		}
198
199		/* check_client()
#	Line 729 | Line 209 | report_confitem_types(struct Client *sou
209		*                Look for conf lines which have the same
210		*                status as the flags passed.
211		*/
212	<	static void *
213	<	check_client(va_list args)
212	>	int
213	>	check_client(struct Client *source_p)
214		{
735	–	struct Client *source_p = va_arg(args, struct Client *);
736	–	const char *username = va_arg(args, const char *);
215		int i;
216	<
217	<	/* I'm already in big trouble if source_p->localClient is NULL -db */
218	<	if ((i = verify_access(source_p, username)))
741	<	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
216	>
217	>	if ((i = verify_access(source_p)))
218	>	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
219		source_p->name, source_p->sockhost);
220
221		switch (i)
#	Line 746 | Line 223 | check_client(va_list args)
223		case TOO_MANY:
224		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
225		"Too many on IP for %s (%s).",
226	<	get_client_name(source_p, SHOW_IP),
227	<	source_p->sockhost);
226	>	get_client_name(source_p, SHOW_IP),
227	>	source_p->sockhost);
228		ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
229	<	get_client_name(source_p, SHOW_IP));
229	>	get_client_name(source_p, SHOW_IP));
230		++ServerStats.is_ref;
231	<	exit_client(source_p, &me, "No more connections allowed on that IP");
231	>	exit_client(source_p, "No more connections allowed on that IP");
232		break;
233
234		case I_LINE_FULL:
235		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
236		"auth{} block is full for %s (%s).",
237	<	get_client_name(source_p, SHOW_IP),
238	<	source_p->sockhost);
237	>	get_client_name(source_p, SHOW_IP),
238	>	source_p->sockhost);
239		ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
240	<	get_client_name(source_p, SHOW_IP));
240	>	get_client_name(source_p, SHOW_IP));
241		++ServerStats.is_ref;
242	<	exit_client(source_p, &me,
766	<	"No more connections allowed in your connection class");
242	>	exit_client(source_p, "No more connections allowed in your connection class");
243		break;
244
245		case NOT_AUTHORIZED:
#	Line 771 | Line 247 | check_client(va_list args)
247		/* jdc - lists server name & port connections are on */
248		/*       a purely cosmetical change */
249		sendto_realops_flags(UMODE_UNAUTH, L_ALL, SEND_NOTICE,
250	<	"Unauthorized client connection from %s [%s] on [%s/%u].",
251	<	get_client_name(source_p, SHOW_IP),
252	<	source_p->sockhost,
253	<	source_p->localClient->listener->name,
254	<	source_p->localClient->listener->port);
250	>	"Unauthorized client connection from %s [%s] on [%s/%u].",
251	>	get_client_name(source_p, SHOW_IP),
252	>	source_p->sockhost,
253	>	source_p->localClient->listener->name,
254	>	source_p->localClient->listener->port);
255		ilog(LOG_TYPE_IRCD,
256	<	"Unauthorized client connection from %s on [%s/%u].",
257	<	get_client_name(source_p, SHOW_IP),
258	<	source_p->localClient->listener->name,
259	<	source_p->localClient->listener->port);
256	>	"Unauthorized client connection from %s on [%s/%u].",
257	>	get_client_name(source_p, SHOW_IP),
258	>	source_p->localClient->listener->name,
259	>	source_p->localClient->listener->port);
260
261	<	exit_client(source_p, &me, "You are not authorized to use this server");
261	>	exit_client(source_p, "You are not authorized to use this server");
262		break;
263
264		case BANNED_CLIENT:
265	<	exit_client(source_p, &me, "Banned");
265	>	exit_client(source_p, "Banned");
266		++ServerStats.is_ref;
267		break;
268
#	Line 795 | Line 271 | check_client(va_list args)
271		break;
272		}
273
274	<	return (i < 0 ? NULL : source_p);
274	>	return (i < 0 ? 0 : 1);
275		}
276
277		/* verify_access()
278		*
279		* inputs       - pointer to client to verify
804	–	*              - pointer to proposed username
280		* output       - 0 if success -'ve if not
281		* side effect  - find the first (best) I line to attach.
282		*/
283		static int
284	<	verify_access(struct Client *client_p, const char *username)
284	>	verify_access(struct Client *client_p)
285		{
286	<	struct AccessItem *aconf = NULL, *rkconf = NULL;
287	<	struct ConfItem *conf = NULL;
813	<	char non_ident[USERLEN + 1] = { '~', '\0' };
814	<	const char *uhi[3];
286	>	struct MaskItem *conf = NULL;
287	>	char non_ident[USERLEN + 1] = "~";
288
289		if (IsGotId(client_p))
290		{
291	<	aconf = find_address_conf(client_p->host, client_p->username,
292	<	&client_p->localClient->ip,
293	<	client_p->localClient->aftype,
291	>	conf = find_address_conf(client_p->host, client_p->username,
292	>	&client_p->localClient->ip,
293	>	client_p->localClient->aftype,
294		client_p->localClient->passwd);
295		}
296		else
297		{
298	<	strlcpy(non_ident+1, username, sizeof(non_ident)-1);
299	<	aconf = find_address_conf(client_p->host,non_ident,
300	<	&client_p->localClient->ip,
301	<	client_p->localClient->aftype,
302	<	client_p->localClient->passwd);
298	>	strlcpy(non_ident + 1, client_p->username, sizeof(non_ident) - 1);
299	>	conf = find_address_conf(client_p->host,non_ident,
300	>	&client_p->localClient->ip,
301	>	client_p->localClient->aftype,
302	>	client_p->localClient->passwd);
303		}
304
305	<	uhi[0] = IsGotId(client_p) ? client_p->username : non_ident;
833	<	uhi[1] = client_p->host;
834	<	uhi[2] = client_p->sockhost;
835	<
836	<	rkconf = find_regexp_kline(uhi);
837	<
838	<	if (aconf != NULL)
305	>	if (conf)
306		{
307	<	if (IsConfClient(aconf) && !rkconf)
307	>	if (IsConfClient(conf))
308		{
309	<	conf = unmap_conf_item(aconf);
843	<
844	<	if (IsConfRedir(aconf))
309	>	if (IsConfRedir(conf))
310		{
311	<	sendto_one(client_p, form_str(RPL_REDIR),
312	<	me.name, client_p->name,
313	<	conf->name ? conf->name : "",
314	<	aconf->port);
850	<	return(NOT_AUTHORIZED);
311	>	sendto_one_numeric(client_p, &me, RPL_REDIR,
312	>	conf->name ? conf->name : "",
313	>	conf->port);
314	>	return NOT_AUTHORIZED;
315		}
316
317	<	if (IsConfDoIdentd(aconf))
318	<	SetNeedId(client_p);
317	>	if (IsConfDoIdentd(conf))
318	>	SetNeedId(client_p);
319
320		/* Thanks for spoof idea amm */
321	<	if (IsConfDoSpoofIp(aconf))
321	>	if (IsConfDoSpoofIp(conf))
322		{
323	<	conf = unmap_conf_item(aconf);
860	<
861	<	if (!ConfigFileEntry.hide_spoof_ips && IsConfSpoofNotice(aconf))
323	>	if (!ConfigGeneral.hide_spoof_ips && IsConfSpoofNotice(conf))
324		sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
325		"%s spoofing: %s as %s",
326		client_p->name, client_p->host, conf->name);
327		strlcpy(client_p->host, conf->name, sizeof(client_p->host));
328	<	SetIPSpoof(client_p);
328	>	AddFlag(client_p, FLAGS_IP_SPOOFING | FLAGS_AUTH_SPOOF);
329		}
330
331	<	return(attach_iline(client_p, conf));
331	>	return attach_iline(client_p, conf);
332		}
333	<	else if (rkconf || IsConfKill(aconf) || (ConfigFileEntry.glines && IsConfGline(aconf)))
333	>	else if (IsConfKill(conf) || (ConfigGeneral.glines && IsConfGline(conf)))
334		{
335	<	/* XXX */
336	<	aconf = rkconf ? rkconf : aconf;
337	<	if (IsConfGline(aconf))
338	<	sendto_one(client_p, ":%s NOTICE %s :*** G-lined", me.name,
877	<	client_p->name);
878	<	sendto_one(client_p, ":%s NOTICE %s :*** Banned: %s",
879	<	me.name, client_p->name, aconf->reason);
880	<	return(BANNED_CLIENT);
335	>	if (IsConfGline(conf))
336	>	sendto_one_notice(client_p, &me, ":*** G-lined");
337	>	sendto_one_notice(client_p, &me, ":*** Banned: %s", conf->reason);
338	>	return BANNED_CLIENT;
339		}
340		}
341
342	<	return(NOT_AUTHORIZED);
342	>	return NOT_AUTHORIZED;
343		}
344
345		/* attach_iline()
#	Line 892 | Line 350 | verify_access(struct Client *client_p, c
350		* side effects - do actual attach
351		*/
352		static int
353	<	attach_iline(struct Client *client_p, struct ConfItem *conf)
353	>	attach_iline(struct Client *client_p, struct MaskItem *conf)
354		{
355	<	struct AccessItem *aconf;
898	<	struct ClassItem *aclass;
355	>	const struct ClassItem *class = conf->class;
356		struct ip_entry *ip_found;
357		int a_limit_reached = 0;
358	<	int local = 0, global = 0, ident = 0;
358	>	unsigned int local = 0, global = 0, ident = 0;
359
360	<	ip_found = find_or_add_ip(&client_p->localClient->ip);
360	>	ip_found = ipcache_find_or_add_address(&client_p->localClient->ip);
361		ip_found->count++;
362		SetIpHash(client_p);
363
907	–	aconf = map_to_conf(conf);
908	–	if (aconf->class_ptr == NULL)
909	–	return NOT_AUTHORIZED;  /* If class is missing, this is best */
910	–
911	–	aclass = map_to_conf(aconf->class_ptr);
912	–
364		count_user_host(client_p->username, client_p->host,
365		&global, &local, &ident);
366
#	Line 917 | Line 368 | attach_iline(struct Client *client_p, st
368		* setting a_limit_reached if any limit is reached.
369		* - Dianora
370		*/
371	<	if (aclass->max_total != 0 && aclass->curr_user_count >= aclass->max_total)
371	>	if (class->max_total && class->ref_count >= class->max_total)
372		a_limit_reached = 1;
373	<	else if (aclass->max_perip != 0 && ip_found->count > aclass->max_perip)
373	>	else if (class->max_perip && ip_found->count > class->max_perip)
374		a_limit_reached = 1;
375	<	else if (aclass->max_local != 0 && local >= aclass->max_local)
375	>	else if (class->max_local && local >= class->max_local)
376		a_limit_reached = 1;
377	<	else if (aclass->max_global != 0 && global >= aclass->max_global)
377	>	else if (class->max_global && global >= class->max_global)
378		a_limit_reached = 1;
379	<	else if (aclass->max_ident != 0 && ident >= aclass->max_ident &&
379	>	else if (class->max_ident && ident >= class->max_ident &&
380		client_p->username[0] != '~')
381		a_limit_reached = 1;
382
383		if (a_limit_reached)
384		{
385	<	if (!IsConfExemptLimits(aconf))
385	>	if (!IsConfExemptLimits(conf))
386		return TOO_MANY;   /* Already at maximum allowed */
387
388	<	sendto_one(client_p,
389	<	":%s NOTICE %s :*** Your connection class is full, "
939	<	"but you have exceed_limit = yes;", me.name, client_p->name);
388	>	sendto_one_notice(client_p, &me, ":*** Your connection class is full, "
389	>	"but you have exceed_limit = yes;");
390		}
391
392		return attach_conf(client_p, conf);
393		}
394
945	–	/* init_ip_hash_table()
946	–	*
947	–	* inputs               - NONE
948	–	* output               - NONE
949	–	* side effects         - allocate memory for ip_entry(s)
950	–	*                      - clear the ip hash table
951	–	*/
952	–	void
953	–	init_ip_hash_table(void)
954	–	{
955	–	ip_entry_heap = BlockHeapCreate("ip", sizeof(struct ip_entry),
956	–	2 * hard_fdlimit);
957	–	memset(ip_hash_table, 0, sizeof(ip_hash_table));
958	–	}
959	–
960	–	/* find_or_add_ip()
961	–	*
962	–	* inputs       - pointer to struct irc_ssaddr
963	–	* output       - pointer to a struct ip_entry
964	–	* side effects -
965	–	*
966	–	* If the ip # was not found, a new struct ip_entry is created, and the ip
967	–	* count set to 0.
968	–	*/
969	–	static struct ip_entry *
970	–	find_or_add_ip(struct irc_ssaddr *ip_in)
971	–	{
972	–	struct ip_entry *ptr, *newptr;
973	–	int hash_index = hash_ip(ip_in), res;
974	–	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
975	–	#ifdef IPV6
976	–	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
977	–	#endif
978	–
979	–	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
980	–	{
981	–	#ifdef IPV6
982	–	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
983	–	continue;
984	–	if (ip_in->ss.ss_family == AF_INET6)
985	–	{
986	–	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
987	–	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
988	–	}
989	–	else
990	–	#endif
991	–	{
992	–	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
993	–	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
994	–	}
995	–	if (res == 0)
996	–	{
997	–	/* Found entry already in hash, return it. */
998	–	return ptr;
999	–	}
1000	–	}
1001	–
1002	–	if (ip_entries_count >= 2 * hard_fdlimit)
1003	–	garbage_collect_ip_entries();
1004	–
1005	–	newptr = BlockHeapAlloc(ip_entry_heap);
1006	–	ip_entries_count++;
1007	–	memcpy(&newptr->ip, ip_in, sizeof(struct irc_ssaddr));
1008	–
1009	–	newptr->next = ip_hash_table[hash_index];
1010	–	ip_hash_table[hash_index] = newptr;
1011	–
1012	–	return newptr;
1013	–	}
1014	–
1015	–	/* remove_one_ip()
1016	–	*
1017	–	* inputs        - unsigned long IP address value
1018	–	* output        - NONE
1019	–	* side effects  - The ip address given, is looked up in ip hash table
1020	–	*                 and number of ip#'s for that ip decremented.
1021	–	*                 If ip # count reaches 0 and has expired,
1022	–	*                 the struct ip_entry is returned to the ip_entry_heap
1023	–	*/
1024	–	void
1025	–	remove_one_ip(struct irc_ssaddr *ip_in)
1026	–	{
1027	–	struct ip_entry *ptr;
1028	–	struct ip_entry *last_ptr = NULL;
1029	–	int hash_index = hash_ip(ip_in), res;
1030	–	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
1031	–	#ifdef IPV6
1032	–	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
1033	–	#endif
1034	–
1035	–	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
1036	–	{
1037	–	#ifdef IPV6
1038	–	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
1039	–	continue;
1040	–	if (ip_in->ss.ss_family == AF_INET6)
1041	–	{
1042	–	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
1043	–	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
1044	–	}
1045	–	else
1046	–	#endif
1047	–	{
1048	–	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
1049	–	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
1050	–	}
1051	–	if (res)
1052	–	continue;
1053	–	if (ptr->count > 0)
1054	–	ptr->count--;
1055	–	if (ptr->count == 0 &&
1056	–	(CurrentTime-ptr->last_attempt) >= ConfigFileEntry.throttle_time)
1057	–	{
1058	–	if (last_ptr != NULL)
1059	–	last_ptr->next = ptr->next;
1060	–	else
1061	–	ip_hash_table[hash_index] = ptr->next;
1062	–
1063	–	BlockHeapFree(ip_entry_heap, ptr);
1064	–	ip_entries_count--;
1065	–	return;
1066	–	}
1067	–	last_ptr = ptr;
1068	–	}
1069	–	}
1070	–
1071	–	/* hash_ip()
1072	–	*
1073	–	* input        - pointer to an irc_inaddr
1074	–	* output       - integer value used as index into hash table
1075	–	* side effects - hopefully, none
1076	–	*/
1077	–	static int
1078	–	hash_ip(struct irc_ssaddr *addr)
1079	–	{
1080	–	if (addr->ss.ss_family == AF_INET)
1081	–	{
1082	–	struct sockaddr_in *v4 = (struct sockaddr_in *)addr;
1083	–	int hash;
1084	–	uint32_t ip;
1085	–
1086	–	ip   = ntohl(v4->sin_addr.s_addr);
1087	–	hash = ((ip >> 12) + ip) & (IP_HASH_SIZE-1);
1088	–	return hash;
1089	–	}
1090	–	#ifdef IPV6
1091	–	else
1092	–	{
1093	–	int hash;
1094	–	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)addr;
1095	–	uint32_t *ip = (uint32_t *)&v6->sin6_addr.s6_addr;
1096	–
1097	–	hash  = ip[0] ^ ip[3];
1098	–	hash ^= hash >> 16;
1099	–	hash ^= hash >> 8;
1100	–	hash  = hash & (IP_HASH_SIZE - 1);
1101	–	return hash;
1102	–	}
1103	–	#else
1104	–	return 0;
1105	–	#endif
1106	–	}
1107	–
1108	–	/* count_ip_hash()
1109	–	*
1110	–	* inputs        - pointer to counter of number of ips hashed
1111	–	*               - pointer to memory used for ip hash
1112	–	* output        - returned via pointers input
1113	–	* side effects  - NONE
1114	–	*
1115	–	* number of hashed ip #'s is counted up, plus the amount of memory
1116	–	* used in the hash.
1117	–	*/
1118	–	void
1119	–	count_ip_hash(unsigned int *number_ips_stored, uint64_t *mem_ips_stored)
1120	–	{
1121	–	struct ip_entry *ptr;
1122	–	int i;
1123	–
1124	–	*number_ips_stored = 0;
1125	–	*mem_ips_stored    = 0;
1126	–
1127	–	for (i = 0; i < IP_HASH_SIZE; i++)
1128	–	{
1129	–	for (ptr = ip_hash_table[i]; ptr; ptr = ptr->next)
1130	–	{
1131	–	*number_ips_stored += 1;
1132	–	*mem_ips_stored += sizeof(struct ip_entry);
1133	–	}
1134	–	}
1135	–	}
1136	–
1137	–	/* garbage_collect_ip_entries()
1138	–	*
1139	–	* input        - NONE
1140	–	* output       - NONE
1141	–	* side effects - free up all ip entries with no connections
1142	–	*/
1143	–	static void
1144	–	garbage_collect_ip_entries(void)
1145	–	{
1146	–	struct ip_entry *ptr;
1147	–	struct ip_entry *last_ptr;
1148	–	struct ip_entry *next_ptr;
1149	–	int i;
1150	–
1151	–	for (i = 0; i < IP_HASH_SIZE; i++)
1152	–	{
1153	–	last_ptr = NULL;
1154	–
1155	–	for (ptr = ip_hash_table[i]; ptr; ptr = next_ptr)
1156	–	{
1157	–	next_ptr = ptr->next;
1158	–
1159	–	if (ptr->count == 0 &&
1160	–	(CurrentTime - ptr->last_attempt) >= ConfigFileEntry.throttle_time)
1161	–	{
1162	–	if (last_ptr != NULL)
1163	–	last_ptr->next = ptr->next;
1164	–	else
1165	–	ip_hash_table[i] = ptr->next;
1166	–	BlockHeapFree(ip_entry_heap, ptr);
1167	–	ip_entries_count--;
1168	–	}
1169	–	else
1170	–	last_ptr = ptr;
1171	–	}
1172	–	}
1173	–	}
1174	–
395		/* detach_conf()
396		*
397		* inputs       - pointer to client to detach
#	Line 1180 | Line 400 | garbage_collect_ip_entries(void)
400		* side effects - Disassociate configuration from the client.
401		*                Also removes a class from the list if marked for deleting.
402		*/
403	<	int
404	<	detach_conf(struct Client *client_p, ConfType type)
403	>	void
404	>	detach_conf(struct Client *client_p, enum maskitem_type type)
405		{
406	<	dlink_node *ptr, *next_ptr;
1187	<	struct ConfItem *conf;
1188	<	struct ClassItem *aclass;
1189	<	struct AccessItem *aconf;
1190	<	struct ConfItem *aclass_conf;
406	>	dlink_node *ptr = NULL, *ptr_next = NULL;
407
408	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->confs.head)
408	>	DLINK_FOREACH_SAFE(ptr, ptr_next, client_p->localClient->confs.head)
409		{
410	<	conf = ptr->data;
1195	<
1196	<	if (type == CONF_TYPE || conf->type == type)
1197	<	{
1198	<	dlinkDelete(ptr, &client_p->localClient->confs);
1199	<	free_dlink_node(ptr);
1200	<
1201	<	switch (conf->type)
1202	<	{
1203	<	case CLIENT_TYPE:
1204	<	case OPER_TYPE:
1205	<	case SERVER_TYPE:
1206	<	aconf = map_to_conf(conf);
410	>	struct MaskItem *conf = ptr->data;
411
412	<	assert(aconf->clients > 0);
412	>	assert(conf->type & (CONF_CLIENT | CONF_OPER | CONF_SERVER));
413	>	assert(conf->ref_count > 0);
414	>	assert(conf->class->ref_count > 0);
415
416	<	if ((aclass_conf = aconf->class_ptr) != NULL)
417	<	{
1212	<	aclass = map_to_conf(aclass_conf);
1213	<
1214	<	assert(aclass->curr_user_count > 0);
1215	<
1216	<	if (conf->type == CLIENT_TYPE)
1217	<	remove_from_cidr_check(&client_p->localClient->ip, aclass);
1218	<	if (--aclass->curr_user_count == 0 && aclass->active == 0)
1219	<	delete_conf_item(aclass_conf);
1220	<	}
416	>	if (!(conf->type & type))
417	>	continue;
418
419	<	if (--aconf->clients == 0 && IsConfIllegal(aconf))
420	<	delete_conf_item(conf);
419	>	dlinkDelete(ptr, &client_p->localClient->confs);
420	>	free_dlink_node(ptr);
421
422	<	break;
423	<	default:
1227	<	break;
1228	<	}
422	>	if (conf->type == CONF_CLIENT)
423	>	remove_from_cidr_check(&client_p->localClient->ip, conf->class);
424
425	<	if (type != CONF_TYPE)
426	<	return 0;
425	>	if (--conf->class->ref_count == 0 && conf->class->active == 0)
426	>	{
427	>	class_free(conf->class);
428	>	conf->class = NULL;
429		}
1233	–	}
430
431	<	return -1;
431	>	if (--conf->ref_count == 0 && conf->active == 0)
432	>	conf_free(conf);
433	>	}
434		}
435
436		/* attach_conf()
#	Line 1246 | Line 444 | detach_conf(struct Client *client_p, Con
444		*                attachment if there was an old one...
445		*/
446		int
447	<	attach_conf(struct Client *client_p, struct ConfItem *conf)
447	>	attach_conf(struct Client *client_p, struct MaskItem *conf)
448		{
449	<	struct AccessItem *aconf = map_to_conf(conf);
1252	<	struct ClassItem *aclass = map_to_conf(aconf->class_ptr);
1253	<
1254	<	if (dlinkFind(&client_p->localClient->confs, conf) != NULL)
449	>	if (dlinkFind(&client_p->localClient->confs, conf))
450		return 1;
451
452	<	if (IsConfIllegal(aconf)) /* TBV: can't happen */
453	<	return NOT_AUTHORIZED;
454	<
1260	<	if (conf->type == CLIENT_TYPE)
1261	<	if (cidr_limit_reached(IsConfExemptLimits(aconf),
1262	<	&client_p->localClient->ip, aclass))
452	>	if (conf->type == CONF_CLIENT)
453	>	if (cidr_limit_reached(IsConfExemptLimits(conf),
454	>	&client_p->localClient->ip, conf->class))
455		return TOO_MANY;    /* Already at maximum allowed */
456
457	<	aclass->curr_user_count++;
458	<	aconf->clients++;
457	>	conf->class->ref_count++;
458	>	conf->ref_count++;
459
460		dlinkAdd(conf, make_dlink_node(), &client_p->localClient->confs);
461
#	Line 1283 | Line 475 | attach_connect_block(struct Client *clie
475		const char *host)
476		{
477		dlink_node *ptr;
478	<	struct ConfItem *conf;
1287	<	struct AccessItem *aconf;
478	>	struct MaskItem *conf = NULL;
479
480		assert(client_p != NULL);
481		assert(host != NULL);
#	Line 1295 | Line 486 | attach_connect_block(struct Client *clie
486		DLINK_FOREACH(ptr, server_items.head)
487		{
488		conf = ptr->data;
1298	–	aconf = map_to_conf(conf);
489
490	<	if (match(conf->name, name) == 0 || match(aconf->host, host) == 0)
490	>	if (match(conf->name, name) || match(conf->host, host))
491		continue;
492
493		attach_conf(client_p, conf);
#	Line 1307 | Line 497 | attach_connect_block(struct Client *clie
497		return 0;
498		}
499
1310	–	/* find_conf_exact()
1311	–	*
1312	–	* inputs       - type of ConfItem
1313	–	*              - pointer to name to find
1314	–	*              - pointer to username to find
1315	–	*              - pointer to host to find
1316	–	* output       - NULL or pointer to conf found
1317	–	* side effects - find a conf entry which matches the hostname
1318	–	*                and has the same name.
1319	–	*/
1320	–	struct ConfItem *
1321	–	find_conf_exact(ConfType type, const char *name, const char *user,
1322	–	const char *host)
1323	–	{
1324	–	dlink_node *ptr;
1325	–	dlink_list *list_p;
1326	–	struct ConfItem *conf = NULL;
1327	–	struct AccessItem *aconf;
1328	–
1329	–	/* Only valid for OPER_TYPE and ...? */
1330	–	list_p = map_to_list(type);
1331	–
1332	–	DLINK_FOREACH(ptr, (*list_p).head)
1333	–	{
1334	–	conf = ptr->data;
1335	–
1336	–	if (conf->name == NULL)
1337	–	continue;
1338	–	aconf = map_to_conf(conf);
1339	–	if (aconf->host == NULL)
1340	–	continue;
1341	–	if (irccmp(conf->name, name) != 0)
1342	–	continue;
1343	–
1344	–	/*
1345	–	** Accept if the *real* hostname (usually sockethost)
1346	–	** socket host) matches *either* host or name field
1347	–	** of the configuration.
1348	–	*/
1349	–	if (!match(aconf->host, host) || !match(aconf->user, user))
1350	–	continue;
1351	–	if (type == OPER_TYPE)
1352	–	{
1353	–	struct ClassItem *aclass = map_to_conf(aconf->class_ptr);
1354	–
1355	–	if (aconf->clients >= aclass->max_total)
1356	–	continue;
1357	–	}
1358	–
1359	–	return conf;
1360	–	}
1361	–
1362	–	return NULL;
1363	–	}
1364	–
500		/* find_conf_name()
501		*
502		* inputs       - pointer to conf link list to search
#	Line 1371 | Line 506 | find_conf_exact(ConfType type, const cha
506		* side effects - find a conf entry which matches the name
507		*                and has the given mask.
508		*/
509	<	struct ConfItem *
510	<	find_conf_name(dlink_list *list, const char *name, ConfType type)
509	>	struct MaskItem *
510	>	find_conf_name(dlink_list *list, const char *name, enum maskitem_type type)
511		{
512		dlink_node *ptr;
513	<	struct ConfItem* conf;
513	>	struct MaskItem* conf;
514
515		DLINK_FOREACH(ptr, list->head)
516		{
517		conf = ptr->data;
518	<
518	>
519		if (conf->type == type)
520		{
521	<	if (conf->name && (irccmp(conf->name, name) == 0 ||
522	<	match(conf->name, name)))
521	>	if (conf->name && (!irccmp(conf->name, name) ||
522	>	!match(conf->name, name)))
523		return conf;
524		}
525		}
#	Line 1399 | Line 534 | find_conf_name(dlink_list *list, const c
534		* side effects - none
535		*/
536		static dlink_list *
537	<	map_to_list(ConfType type)
537	>	map_to_list(enum maskitem_type type)
538		{
539		switch(type)
540		{
541	<	case RXLINE_TYPE:
1407	<	return(&rxconf_items);
1408	<	break;
1409	<	case XLINE_TYPE:
541	>	case CONF_XLINE:
542		return(&xconf_items);
543		break;
544	<	case ULINE_TYPE:
544	>	case CONF_ULINE:
545		return(&uconf_items);
546		break;
547	<	case NRESV_TYPE:
547	>	case CONF_NRESV:
548		return(&nresv_items);
549		break;
550	<	case OPER_TYPE:
550	>	case CONF_CRESV:
551	>	return(&cresv_items);
552	>	case CONF_OPER:
553		return(&oconf_items);
554		break;
555	<	case CLASS_TYPE:
1422	<	return(&class_items);
1423	<	break;
1424	<	case SERVER_TYPE:
555	>	case CONF_SERVER:
556		return(&server_items);
557		break;
558	<	case SERVICE_TYPE:
558	>	case CONF_SERVICE:
559		return(&service_items);
560		break;
561	<	case CLUSTER_TYPE:
561	>	case CONF_CLUSTER:
562		return(&cluster_items);
563		break;
1433	–	case CONF_TYPE:
1434	–	case GLINE_TYPE:
1435	–	case KLINE_TYPE:
1436	–	case DLINE_TYPE:
1437	–	case CRESV_TYPE:
564		default:
565		return NULL;
566		}
#	Line 1446 | Line 572 | map_to_list(ConfType type)
572		*              - pointer to name string to find
573		*              - pointer to user
574		*              - pointer to host
575	<	*              - optional action to match on as well
576	<	* output       - NULL or pointer to found struct MatchItem
575	>	*              - optional flags to match on as well
576	>	* output       - NULL or pointer to found struct MaskItem
577		* side effects - looks for a match on name field
578		*/
579	<	struct ConfItem *
580	<	find_matching_name_conf(ConfType type, const char *name, const char *user,
581	<	const char *host, int action)
579	>	struct MaskItem *
580	>	find_matching_name_conf(enum maskitem_type type, const char *name, const char *user,
581	>	const char *host, unsigned int flags)
582		{
583		dlink_node *ptr=NULL;
584	<	struct ConfItem *conf=NULL;
1459	<	struct AccessItem *aconf=NULL;
1460	<	struct MatchItem *match_item=NULL;
584	>	struct MaskItem *conf=NULL;
585		dlink_list *list_p = map_to_list(type);
586
587		switch (type)
588		{
589	<	#ifdef HAVE_LIBPCRE
1466	<	case RXLINE_TYPE:
1467	<	DLINK_FOREACH(ptr, list_p->head)
1468	<	{
1469	<	conf = ptr->data;
1470	<	assert(conf->regexpname);
1471	<
1472	<	if (!ircd_pcre_exec(conf->regexpname, name))
1473	<	return conf;
1474	<	}
1475	<	break;
1476	<	#endif
1477	<	case SERVICE_TYPE:
589	>	case CONF_SERVICE:
590		DLINK_FOREACH(ptr, list_p->head)
591		{
592		conf = ptr->data;
#	Line 1486 | Line 598 | find_matching_name_conf(ConfType type, c
598		}
599		break;
600
601	<	case XLINE_TYPE:
602	<	case ULINE_TYPE:
603	<	case NRESV_TYPE:
601	>	case CONF_XLINE:
602	>	case CONF_ULINE:
603	>	case CONF_NRESV:
604	>	case CONF_CRESV:
605		DLINK_FOREACH(ptr, list_p->head)
606		{
607		conf = ptr->data;
608
1496	–	match_item = map_to_conf(conf);
609		if (EmptyString(conf->name))
610	<	continue;
611	<	if ((name != NULL) && match_esc(conf->name, name))
610	>	continue;
611	>	if ((name != NULL) && !match(conf->name, name))
612		{
613	<	if ((user == NULL && (host == NULL)))
614	<	return conf;
615	<	if ((match_item->action & action) != action)
613	>	if ((user == NULL && (host == NULL)))
614	>	return conf;
615	>	if ((conf->flags & flags) != flags)
616		continue;
617	<	if (EmptyString(match_item->user) || EmptyString(match_item->host))
618	<	return conf;
619	<	if (match(match_item->user, user) && match(match_item->host, host))
620	<	return conf;
617	>	if (EmptyString(conf->user) || EmptyString(conf->host))
618	>	return conf;
619	>	if (!match(conf->user, user) && !match(conf->host, host))
620	>	return conf;
621		}
622		}
623		break;
624
625	<	case SERVER_TYPE:
625	>	case CONF_SERVER:
626		DLINK_FOREACH(ptr, list_p->head)
627		{
628		conf = ptr->data;
1517	–	aconf = map_to_conf(conf);
629
630	<	if ((name != NULL) && match_esc(name, conf->name))
630	>	if ((name != NULL) && !match(name, conf->name))
631		return conf;
632	<	else if ((host != NULL) && match_esc(host, aconf->host))
632	>	else if ((host != NULL) && !match(host, conf->host))
633		return conf;
634		}
635		break;
636	<
636	>
637		default:
638		break;
639		}
#	Line 1535 | Line 646 | find_matching_name_conf(ConfType type, c
646		*              - pointer to name string to find
647		*              - pointer to user
648		*              - pointer to host
649	<	* output       - NULL or pointer to found struct MatchItem
649	>	* output       - NULL or pointer to found struct MaskItem
650		* side effects - looks for an exact match on name field
651		*/
652	<	struct ConfItem *
653	<	find_exact_name_conf(ConfType type, const struct Client *who, const char *name,
652	>	struct MaskItem *
653	>	find_exact_name_conf(enum maskitem_type type, const struct Client *who, const char *name,
654		const char *user, const char *host)
655		{
656		dlink_node *ptr = NULL;
657	<	struct AccessItem *aconf;
658	<	struct ConfItem *conf;
1548	<	struct MatchItem *match_item;
1549	<	dlink_list *list_p;
1550	<
1551	<	list_p = map_to_list(type);
657	>	struct MaskItem *conf;
658	>	dlink_list *list_p = map_to_list(type);
659
660		switch(type)
661		{
662	<	case RXLINE_TYPE:
663	<	case XLINE_TYPE:
664	<	case ULINE_TYPE:
665	<	case NRESV_TYPE:
662	>	case CONF_XLINE:
663	>	case CONF_ULINE:
664	>	case CONF_NRESV:
665	>	case CONF_CRESV:
666
667		DLINK_FOREACH(ptr, list_p->head)
668		{
669		conf = ptr->data;
670	<	match_item = (struct MatchItem *)map_to_conf(conf);
670	>
671		if (EmptyString(conf->name))
672	<	continue;
673	<
672	>	continue;
673	>
674		if (irccmp(conf->name, name) == 0)
675		{
676	<	if ((user == NULL && (host == NULL)))
677	<	return (conf);
678	<	if (EmptyString(match_item->user) || EmptyString(match_item->host))
679	<	return (conf);
680	<	if (match(match_item->user, user) && match(match_item->host, host))
681	<	return (conf);
676	>	if ((user == NULL && (host == NULL)))
677	>	return conf;
678	>	if (EmptyString(conf->user) || EmptyString(conf->host))
679	>	return conf;
680	>	if (!match(conf->user, user) && !match(conf->host, host))
681	>	return conf;
682		}
683		}
684		break;
685
686	<	case OPER_TYPE:
686	>	case CONF_OPER:
687		DLINK_FOREACH(ptr, list_p->head)
688		{
689		conf = ptr->data;
1583	–	aconf = map_to_conf(conf);
690
691		if (EmptyString(conf->name))
692		continue;
#	Line 1589 | Line 695 | find_exact_name_conf(ConfType type, cons
695		{
696		if (!who)
697		return conf;
698	<	if (EmptyString(aconf->user) || EmptyString(aconf->host))
699	<	return conf;
700	<	if (match(aconf->user, who->username))
698	>	if (EmptyString(conf->user) || EmptyString(conf->host))
699	>	return NULL;
700	>	if (!match(conf->user, who->username))
701		{
702	<	switch (aconf->type)
702	>	switch (conf->htype)
703		{
704		case HM_HOST:
705	<	if (match(aconf->host, who->host) || match(aconf->host, who->sockhost))
706	<	return conf;
705	>	if (!match(conf->host, who->host) || !match(conf->host, who->sockhost))
706	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
707	>	return conf;
708		break;
709		case HM_IPV4:
710		if (who->localClient->aftype == AF_INET)
711	<	if (match_ipv4(&who->localClient->ip, &aconf->addr, aconf->bits))
712	<	return conf;
711	>	if (match_ipv4(&who->localClient->ip, &conf->addr, conf->bits))
712	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
713	>	return conf;
714		break;
715		#ifdef IPV6
716		case HM_IPV6:
717		if (who->localClient->aftype == AF_INET6)
718	<	if (match_ipv6(&who->localClient->ip, &aconf->addr, aconf->bits))
719	<	return conf;
718	>	if (match_ipv6(&who->localClient->ip, &conf->addr, conf->bits))
719	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
720	>	return conf;
721		break;
722		#endif
723		default:
#	Line 1620 | Line 729 | find_exact_name_conf(ConfType type, cons
729
730		break;
731
732	<	case SERVER_TYPE:
732	>	case CONF_SERVER:
733		DLINK_FOREACH(ptr, list_p->head)
734		{
735		conf = ptr->data;
736	<	aconf = (struct AccessItem *)map_to_conf(conf);
736	>
737		if (EmptyString(conf->name))
738	<	continue;
739	<
738	>	continue;
739	>
740		if (name == NULL)
741		{
742	<	if (EmptyString(aconf->host))
743	<	continue;
744	<	if (irccmp(aconf->host, host) == 0)
745	<	return(conf);
742	>	if (EmptyString(conf->host))
743	>	continue;
744	>	if (irccmp(conf->host, host) == 0)
745	>	return conf;
746		}
747		else if (irccmp(conf->name, name) == 0)
748	<	{
1640	<	return (conf);
1641	<	}
748	>	return conf;
749		}
1643	–	break;
750
1645	–	case CLASS_TYPE:
1646	–	DLINK_FOREACH(ptr, list_p->head)
1647	–	{
1648	–	conf = ptr->data;
1649	–	if (EmptyString(conf->name))
1650	–	continue;
1651	–
1652	–	if (irccmp(conf->name, name) == 0)
1653	–	return (conf);
1654	–	}
751		break;
752
753		default:
754		break;
755		}
756	<	return(NULL);
756	>
757	>	return NULL;
758		}
759
760		/* rehash()
#	Line 1669 | Line 766 | find_exact_name_conf(ConfType type, cons
766		int
767		rehash(int sig)
768		{
769	<	if (sig != 0)
769	>	if (sig)
770		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
771	<	"Got signal SIGHUP, reloading ircd.conf file");
771	>	"Got signal SIGHUP, reloading configuration file(s)");
772
773		restart_resolver();
774
#	Line 1682 | Line 779 | rehash(int sig)
779
780		read_conf_files(0);
781
782	<	if (ServerInfo.description != NULL)
783	<	strlcpy(me.info, ServerInfo.description, sizeof(me.info));
782	>	if (ConfigServerInfo.description)
783	>	strlcpy(me.info, ConfigServerInfo.description, sizeof(me.info));
784
785		load_conf_modules();
786	+	check_conf_klines();
787
788	<	flush_deleted_I_P();
1691	<
1692	<	rehashed_klines = 1;
1693	<	/* XXX */
1694	<	if (ConfigLoggingEntry.use_logging)
1695	<	log_close_all();
1696	<
1697	<	return(0);
788	>	return 0;
789		}
790
791		/* set_default_conf()
#	Line 1712 | Line 803 | set_default_conf(void)
803		/* verify init_class() ran, this should be an unnecessary check
804		* but its not much work.
805		*/
806	<	assert(class_default == (struct ConfItem *) class_items.tail->data);
806	>	assert(class_default == class_get_list()->tail->data);
807
808		#ifdef HAVE_LIBCRYPTO
809	<	ServerInfo.rsa_private_key = NULL;
810	<	ServerInfo.rsa_private_key_file = NULL;
809	>	ConfigServerInfo.message_digest_algorithm = EVP_sha256();
810	>	ConfigServerInfo.rsa_private_key = NULL;
811	>	ConfigServerInfo.rsa_private_key_file = NULL;
812		#endif
813
814	<	/* ServerInfo.name is not rehashable */
815	<	/* ServerInfo.name = ServerInfo.name; */
816	<	ServerInfo.description = NULL;
817	<	DupString(ServerInfo.network_name, NETWORK_NAME_DEFAULT);
818	<	DupString(ServerInfo.network_desc, NETWORK_DESC_DEFAULT);
819	<
820	<	memset(&ServerInfo.ip, 0, sizeof(ServerInfo.ip));
821	<	ServerInfo.specific_ipv4_vhost = 0;
822	<	memset(&ServerInfo.ip6, 0, sizeof(ServerInfo.ip6));
823	<	ServerInfo.specific_ipv6_vhost = 0;
824	<
825	<	ServerInfo.max_clients = MAXCLIENTS_MAX;
826	<
827	<	ServerInfo.hub = 0;
828	<	ServerInfo.dns_host.sin_addr.s_addr = 0;
829	<	ServerInfo.dns_host.sin_port = 0;
830	<	AdminInfo.name = NULL;
831	<	AdminInfo.email = NULL;
832	<	AdminInfo.description = NULL;
814	>	/* ConfigServerInfo.name is not rehashable */
815	>	/* ConfigServerInfo.name = ConfigServerInfo.name; */
816	>	ConfigServerInfo.description = NULL;
817	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
818	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
819	>
820	>	memset(&ConfigServerInfo.ip, 0, sizeof(ConfigServerInfo.ip));
821	>	ConfigServerInfo.specific_ipv4_vhost = 0;
822	>	memset(&ConfigServerInfo.ip6, 0, sizeof(ConfigServerInfo.ip6));
823	>	ConfigServerInfo.specific_ipv6_vhost = 0;
824	>
825	>	ConfigServerInfo.max_clients = MAXCLIENTS_MAX;
826	>	ConfigServerInfo.max_nick_length = 9;
827	>	ConfigServerInfo.max_topic_length = 80;
828	>	ConfigServerInfo.hub = 0;
829	>
830	>	ConfigAdminInfo.name = NULL;
831	>	ConfigAdminInfo.email = NULL;
832	>	ConfigAdminInfo.description = NULL;
833
834	<	log_close_all();
834	>	log_del_all();
835
836	<	ConfigLoggingEntry.use_logging = 1;
836	>	ConfigLog.use_logging = 1;
837
838		ConfigChannel.disable_fake_channels = 0;
839	<	ConfigChannel.restrict_channels = 0;
840	<	ConfigChannel.knock_delay = 300;
839	>	ConfigChannel.invite_client_count = 10;
840	>	ConfigChannel.invite_client_time = 300;
841	>	ConfigChannel.knock_client_count = 1;
842	>	ConfigChannel.knock_client_time = 300;
843		ConfigChannel.knock_delay_channel = 60;
844	<	ConfigChannel.max_chans_per_user = 25;
1751	<	ConfigChannel.max_chans_per_oper = 50;
1752	<	ConfigChannel.quiet_on_ban = 1;
844	>	ConfigChannel.max_channels = 25;
845		ConfigChannel.max_bans = 25;
846		ConfigChannel.default_split_user_count = 0;
847		ConfigChannel.default_split_server_count = 0;
#	Line 1760 | Line 852 | set_default_conf(void)
852		ConfigServerHide.links_delay = 300;
853		ConfigServerHide.hidden = 0;
854		ConfigServerHide.hide_servers = 0;
855	<	DupString(ConfigServerHide.hidden_name, NETWORK_NAME_DEFAULT);
855	>	ConfigServerHide.hide_services = 0;
856	>	ConfigServerHide.hidden_name = xstrdup(NETWORK_NAME_DEFAULT);
857		ConfigServerHide.hide_server_ips = 0;
858	+	ConfigServerHide.disable_remote_commands = 0;
859
860	<
861	<	DupString(ConfigFileEntry.service_name, SERVICE_NAME_DEFAULT);
862	<	ConfigFileEntry.max_watch = WATCHSIZE_DEFAULT;
863	<	ConfigFileEntry.glines = 0;
864	<	ConfigFileEntry.gline_time = 12 * 3600;
865	<	ConfigFileEntry.gline_request_time = GLINE_REQUEST_EXPIRE_DEFAULT;
866	<	ConfigFileEntry.gline_min_cidr = 16;
867	<	ConfigFileEntry.gline_min_cidr6 = 48;
868	<	ConfigFileEntry.invisible_on_connect = 1;
869	<	ConfigFileEntry.tkline_expire_notices = 1;
870	<	ConfigFileEntry.hide_spoof_ips = 1;
871	<	ConfigFileEntry.ignore_bogus_ts = 0;
872	<	ConfigFileEntry.disable_auth = 0;
873	<	ConfigFileEntry.disable_remote = 0;
874	<	ConfigFileEntry.kill_chase_time_limit = 90;
875	<	ConfigFileEntry.default_floodcount = 8;
876	<	ConfigFileEntry.failed_oper_notice = 1;
877	<	ConfigFileEntry.dots_in_ident = 0;
878	<	ConfigFileEntry.min_nonwildcard = 4;
879	<	ConfigFileEntry.min_nonwildcard_simple = 3;
880	<	ConfigFileEntry.max_accept = 20;
881	<	ConfigFileEntry.anti_nick_flood = 0;
882	<	ConfigFileEntry.max_nick_time = 20;
883	<	ConfigFileEntry.max_nick_changes = 5;
884	<	ConfigFileEntry.anti_spam_exit_message_time = 0;
885	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
886	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
887	<	ConfigFileEntry.warn_no_nline = 1;
888	<	ConfigFileEntry.stats_o_oper_only = 0;
889	<	ConfigFileEntry.stats_k_oper_only = 1;  /* masked */
890	<	ConfigFileEntry.stats_i_oper_only = 1;  /* masked */
891	<	ConfigFileEntry.stats_P_oper_only = 0;
892	<	ConfigFileEntry.caller_id_wait = 60;
893	<	ConfigFileEntry.opers_bypass_callerid = 0;
894	<	ConfigFileEntry.pace_wait = 10;
895	<	ConfigFileEntry.pace_wait_simple = 1;
896	<	ConfigFileEntry.short_motd = 0;
897	<	ConfigFileEntry.ping_cookie = 0;
898	<	ConfigFileEntry.no_oper_flood = 0;
899	<	ConfigFileEntry.true_no_oper_flood = 0;
900	<	ConfigFileEntry.oper_pass_resv = 1;
901	<	ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
902	<	ConfigFileEntry.oper_only_umodes = UMODE_DEBUG;
903	<	ConfigFileEntry.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE |
904	<	UMODE_OPERWALL | UMODE_WALLOP;
905	<	ConfigFileEntry.use_egd = 0;
906	<	ConfigFileEntry.egdpool_path = NULL;
907	<	ConfigFileEntry.throttle_time = 10;
860	>	ConfigGeneral.away_count = 2;
861	>	ConfigGeneral.away_time = 10;
862	>	ConfigGeneral.service_name = xstrdup(SERVICE_NAME_DEFAULT);
863	>	ConfigGeneral.max_watch = WATCHSIZE_DEFAULT;
864	>	ConfigGeneral.cycle_on_host_change = 1;
865	>	ConfigGeneral.glines = 0;
866	>	ConfigGeneral.gline_time = 12 * 3600;
867	>	ConfigGeneral.gline_request_time = GLINE_REQUEST_EXPIRE_DEFAULT;
868	>	ConfigGeneral.gline_min_cidr = 16;
869	>	ConfigGeneral.gline_min_cidr6 = 48;
870	>	ConfigGeneral.invisible_on_connect = 1;
871	>	ConfigGeneral.tkline_expire_notices = 1;
872	>	ConfigGeneral.hide_spoof_ips = 1;
873	>	ConfigGeneral.ignore_bogus_ts = 0;
874	>	ConfigGeneral.disable_auth = 0;
875	>	ConfigGeneral.kill_chase_time_limit = 90;
876	>	ConfigGeneral.default_floodcount = 8;
877	>	ConfigGeneral.failed_oper_notice = 1;
878	>	ConfigGeneral.dots_in_ident = 0;
879	>	ConfigGeneral.min_nonwildcard = 4;
880	>	ConfigGeneral.min_nonwildcard_simple = 3;
881	>	ConfigGeneral.max_accept = 20;
882	>	ConfigGeneral.anti_nick_flood = 0;
883	>	ConfigGeneral.max_nick_time = 20;
884	>	ConfigGeneral.max_nick_changes = 5;
885	>	ConfigGeneral.anti_spam_exit_message_time = 0;
886	>	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
887	>	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
888	>	ConfigGeneral.warn_no_connect_block = 1;
889	>	ConfigGeneral.stats_e_disabled = 0;
890	>	ConfigGeneral.stats_o_oper_only = 0;
891	>	ConfigGeneral.stats_k_oper_only = 1;  /* 1 = masked */
892	>	ConfigGeneral.stats_i_oper_only = 1;  /* 1 = masked */
893	>	ConfigGeneral.stats_P_oper_only = 0;
894	>	ConfigGeneral.stats_u_oper_only = 0;
895	>	ConfigGeneral.caller_id_wait = 60;
896	>	ConfigGeneral.opers_bypass_callerid = 0;
897	>	ConfigGeneral.pace_wait = 10;
898	>	ConfigGeneral.pace_wait_simple = 1;
899	>	ConfigGeneral.short_motd = 0;
900	>	ConfigGeneral.ping_cookie = 0;
901	>	ConfigGeneral.no_oper_flood = 0;
902	>	ConfigGeneral.true_no_oper_flood = 0;
903	>	ConfigGeneral.oper_pass_resv = 1;
904	>	ConfigGeneral.max_targets = MAX_TARGETS_DEFAULT;
905	>	ConfigGeneral.oper_only_umodes = UMODE_DEBUG;
906	>	ConfigGeneral.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE | UMODE_WALLOP;
907	>	ConfigGeneral.throttle_count = 1;
908	>	ConfigGeneral.throttle_time = 1;
909		}
910
911		static void
912		validate_conf(void)
913		{
914	<	if (ConfigFileEntry.ts_warn_delta < TS_WARN_DELTA_MIN)
915	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
914	>	if (ConfigGeneral.ts_warn_delta < TS_WARN_DELTA_MIN)
915	>	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
916
917	<	if (ConfigFileEntry.ts_max_delta < TS_MAX_DELTA_MIN)
918	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
917	>	if (ConfigGeneral.ts_max_delta < TS_MAX_DELTA_MIN)
918	>	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
919
920	<	if (ServerInfo.network_name == NULL)
921	<	DupString(ServerInfo.network_name,NETWORK_NAME_DEFAULT);
920	>	if (ConfigServerInfo.network_name == NULL)
921	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
922
923	<	if (ServerInfo.network_desc == NULL)
924	<	DupString(ServerInfo.network_desc,NETWORK_DESC_DEFAULT);
923	>	if (ConfigServerInfo.network_desc == NULL)
924	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
925
926	<	if (ConfigFileEntry.service_name == NULL)
927	<	DupString(ConfigFileEntry.service_name, SERVICE_NAME_DEFAULT);
926	>	if (ConfigGeneral.service_name == NULL)
927	>	ConfigGeneral.service_name = xstrdup(SERVICE_NAME_DEFAULT);
928
929	<	ConfigFileEntry.max_watch = IRCD_MAX(ConfigFileEntry.max_watch, WATCHSIZE_MIN);
929	>	ConfigGeneral.max_watch = IRCD_MAX(ConfigGeneral.max_watch, WATCHSIZE_MIN);
930		}
931
932	<	/* read_conf()
932	>	/* read_conf()
933		*
934		* inputs       - file descriptor pointing to config file to use
935		* output       - None
#	Line 1845 | Line 940 | read_conf(FILE *file)
940		{
941		lineno = 0;
942
943	<	set_default_conf(); /* Set default values prior to conf parsing */
943	>	set_default_conf();  /* Set default values prior to conf parsing */
944		conf_parser_ctx.pass = 1;
945	<	yyparse();          /* pick up the classes first */
945	>	yyparse();  /* Pick up the classes first */
946
947		rewind(file);
948
949		conf_parser_ctx.pass = 2;
950	<	yyparse();          /* Load the values from the conf */
951	<	validate_conf();    /* Check to make sure some values are still okay. */
952	<	/* Some global values are also loaded here. */
953	<	check_class();      /* Make sure classes are valid */
950	>	yyparse();  /* Load the values from the conf */
951	>	validate_conf();  /* Check to make sure some values are still okay. */
952	>	/* Some global values are also loaded here. */
953	>	class_delete_marked();  /* Delete unused classes that are marked for deletion */
954		}
955
956		/* lookup_confhost()
#	Line 1863 | Line 958 | read_conf(FILE *file)
958		* start DNS lookups of all hostnames in the conf
959		* line and convert an IP addresses in a.b.c.d number for to IP#s.
960		*/
961	<	static void
962	<	lookup_confhost(struct ConfItem *conf)
961	>	void
962	>	lookup_confhost(struct MaskItem *conf)
963		{
1869	–	struct AccessItem *aconf;
964		struct addrinfo hints, *res;
965
966	<	aconf = map_to_conf(conf);
967	<
1874	<	if (has_wildcards(aconf->host))
1875	<	{
1876	<	ilog(LOG_TYPE_IRCD, "Host/server name error: (%s) (%s)",
1877	<	aconf->host, conf->name);
1878	<	return;
1879	<	}
1880	<
1881	<	/* Do name lookup now on hostnames given and store the
966	>	/*
967	>	* Do name lookup now on hostnames given and store the
968		* ip numbers in conf structure.
969		*/
970		memset(&hints, 0, sizeof(hints));
#	Line 1889 | Line 975 | lookup_confhost(struct ConfItem *conf)
975		/* Get us ready for a bind() and don't bother doing dns lookup */
976		hints.ai_flags = AI_PASSIVE | AI_NUMERICHOST;
977
978	<	if (getaddrinfo(aconf->host, NULL, &hints, &res))
978	>	if (getaddrinfo(conf->host, NULL, &hints, &res))
979		{
980	<	conf_dns_lookup(aconf);
980	>	conf_dns_lookup(conf);
981		return;
982		}
983
984	<	assert(res != NULL);
984	>	assert(res);
985	>
986	>	memcpy(&conf->addr, res->ai_addr, res->ai_addrlen);
987	>	conf->addr.ss_len = res->ai_addrlen;
988	>	conf->addr.ss.ss_family = res->ai_family;
989
1900	–	memcpy(&aconf->addr, res->ai_addr, res->ai_addrlen);
1901	–	aconf->addr.ss_len = res->ai_addrlen;
1902	–	aconf->addr.ss.ss_family = res->ai_family;
990		freeaddrinfo(res);
991		}
992
#	Line 1913 | Line 1000 | lookup_confhost(struct ConfItem *conf)
1000		int
1001		conf_connect_allowed(struct irc_ssaddr *addr, int aftype)
1002		{
1003	<	struct ip_entry *ip_found;
1004	<	struct AccessItem *aconf = find_dline_conf(addr, aftype);
1003	>	struct ip_entry *ip_found = NULL;
1004	>	struct MaskItem *conf = find_dline_conf(addr, aftype);
1005
1006		/* DLINE exempt also gets you out of static limits/pacing... */
1007	<	if (aconf && (aconf->status & CONF_EXEMPTDLINE))
1007	>	if (conf && (conf->type == CONF_EXEMPT))
1008		return 0;
1009
1010	<	if (aconf != NULL)
1010	>	if (conf)
1011		return BANNED_CLIENT;
1012
1013	<	ip_found = find_or_add_ip(addr);
1013	>	ip_found = ipcache_find_or_add_address(addr);
1014
1015	<	if ((CurrentTime - ip_found->last_attempt) <
1929	<	ConfigFileEntry.throttle_time)
1015	>	if ((CurrentTime - ip_found->last_attempt) < ConfigGeneral.throttle_time)
1016		{
1017	<	ip_found->last_attempt = CurrentTime;
1018	<	return TOO_FAST;
1017	>	if (ip_found->connection_count >= ConfigGeneral.throttle_count)
1018	>	return TOO_FAST;
1019	>
1020	>	++ip_found->connection_count;
1021		}
1022	+	else
1023	+	ip_found->connection_count = 1;
1024
1025		ip_found->last_attempt = CurrentTime;
1026		return 0;
1027		}
1028
1939	–	static struct AccessItem *
1940	–	find_regexp_kline(const char *uhi[])
1941	–	{
1942	–	#ifdef HAVE_LIBPCRE
1943	–	const dlink_node *ptr = NULL;
1944	–
1945	–	DLINK_FOREACH(ptr, rkconf_items.head)
1946	–	{
1947	–	struct AccessItem *aptr = map_to_conf(ptr->data);
1948	–
1949	–	assert(aptr->regexuser);
1950	–	assert(aptr->regexhost);
1951	–
1952	–	if (!ircd_pcre_exec(aptr->regexuser, uhi[0]) &&
1953	–	(!ircd_pcre_exec(aptr->regexhost, uhi[1]) ||
1954	–	!ircd_pcre_exec(aptr->regexhost, uhi[2])))
1955	–	return aptr;
1956	–	}
1957	–	#endif
1958	–	return NULL;
1959	–	}
1960	–
1961	–	/* find_kill()
1962	–	*
1963	–	* inputs       - pointer to client structure
1964	–	* output       - pointer to struct AccessItem if found
1965	–	* side effects - See if this user is klined already,
1966	–	*                and if so, return struct AccessItem pointer
1967	–	*/
1968	–	struct AccessItem *
1969	–	find_kill(struct Client *client_p)
1970	–	{
1971	–	struct AccessItem *aconf = NULL;
1972	–	const char *uhi[3];
1973	–
1974	–	uhi[0] = client_p->username;
1975	–	uhi[1] = client_p->host;
1976	–	uhi[2] = client_p->sockhost;
1977	–
1978	–	assert(client_p != NULL);
1979	–
1980	–	aconf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
1981	–	CONF_KLINE, client_p->localClient->aftype,
1982	–	client_p->username, NULL, 1);
1983	–	if (aconf == NULL)
1984	–	aconf = find_regexp_kline(uhi);
1985	–
1986	–	return aconf;
1987	–	}
1988	–
1989	–	struct AccessItem *
1990	–	find_gline(struct Client *client_p)
1991	–	{
1992	–	struct AccessItem *aconf;
1993	–
1994	–	assert(client_p != NULL);
1995	–
1996	–	aconf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
1997	–	CONF_GLINE, client_p->localClient->aftype,
1998	–	client_p->username, NULL, 1);
1999	–	return aconf;
2000	–	}
2001	–
1029		/* cleanup_tklines()
1030		*
1031		* inputs       - NONE
#	Line 2010 | Line 1037 | void
1037		cleanup_tklines(void *notused)
1038		{
1039		hostmask_expire_temporary();
1040	<	expire_tklines(&xconf_items);
1040	>	expire_tklines(&xconf_items);
1041		expire_tklines(&nresv_items);
1042	<	expire_tklines(&resv_channel_list);
1042	>	expire_tklines(&cresv_items);
1043		}
1044
1045		/* expire_tklines()
#	Line 2024 | Line 1051 | cleanup_tklines(void *notused)
1051		static void
1052		expire_tklines(dlink_list *tklist)
1053		{
1054	<	dlink_node *ptr;
1055	<	dlink_node *next_ptr;
2029	<	struct ConfItem *conf;
2030	<	struct MatchItem *xconf;
2031	<	struct MatchItem *nconf;
2032	<	struct ResvChannel *cconf;
1054	>	dlink_node *ptr = NULL, *ptr_next = NULL;
1055	>	struct MaskItem *conf = NULL;
1056
1057	<	DLINK_FOREACH_SAFE(ptr, next_ptr, tklist->head)
1057	>	DLINK_FOREACH_SAFE(ptr, ptr_next, tklist->head)
1058		{
1059		conf = ptr->data;
1060
1061	<	if (conf->type == XLINE_TYPE)
1061	>	if (!conf->until || conf->until > CurrentTime)
1062	>	continue;
1063	>
1064	>	if (conf->type == CONF_XLINE)
1065		{
1066	<	xconf = (struct MatchItem *)map_to_conf(conf);
1067	<	if (xconf->hold && xconf->hold <= CurrentTime)
2042	<	{
2043	<	if (ConfigFileEntry.tkline_expire_notices)
2044	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1066	>	if (ConfigGeneral.tkline_expire_notices)
1067	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1068		"Temporary X-line for [%s] expired", conf->name);
1069	<	delete_conf_item(conf);
2047	<	}
1069	>	conf_free(conf);
1070		}
1071	<	else if (conf->type == NRESV_TYPE)
1071	>	else if (conf->type == CONF_NRESV || conf->type == CONF_CRESV)
1072		{
1073	<	nconf = (struct MatchItem *)map_to_conf(conf);
1074	<	if (nconf->hold && nconf->hold <= CurrentTime)
2053	<	{
2054	<	if (ConfigFileEntry.tkline_expire_notices)
2055	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1073	>	if (ConfigGeneral.tkline_expire_notices)
1074	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1075		"Temporary RESV for [%s] expired", conf->name);
1076	<	delete_conf_item(conf);
2058	<	}
2059	<	}
2060	<	else if (conf->type == CRESV_TYPE)
2061	<	{
2062	<	cconf = ptr->data;
2063	<	if (cconf->hold && cconf->hold <= CurrentTime)
2064	<	{
2065	<	if (ConfigFileEntry.tkline_expire_notices)
2066	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
2067	<	"Temporary RESV for [%s] expired", cconf->name);
2068	<	delete_channel_resv(cconf);
2069	<	}
1076	>	conf_free(conf);
1077		}
1078		}
1079		}
#	Line 2079 | Line 1086 | expire_tklines(dlink_list *tklist)
1086		*/
1087		static const struct oper_privs
1088		{
1089	<	const unsigned int oprivs;
1089	>	const unsigned int flag;
1090		const unsigned char c;
1091		} flag_list[] = {
1092	<	{ OPER_FLAG_ADMIN,       'A' },
1093	<	{ OPER_FLAG_REMOTEBAN,   'B' },
1094	<	{ OPER_FLAG_DIE,         'D' },
1095	<	{ OPER_FLAG_GLINE,       'G' },
1096	<	{ OPER_FLAG_REHASH,      'H' },
1097	<	{ OPER_FLAG_K,           'K' },
1098	<	{ OPER_FLAG_OPERWALL,    'L' },
1099	<	{ OPER_FLAG_N,           'N' },
1100	<	{ OPER_FLAG_GLOBAL_KILL, 'O' },
1101	<	{ OPER_FLAG_REMOTE,      'R' },
1102	<	{ OPER_FLAG_OPER_SPY,    'S' },
1103	<	{ OPER_FLAG_UNKLINE,     'U' },
1104	<	{ OPER_FLAG_X,           'X' },
1092	>	{ OPER_FLAG_ADMIN,          'A' },
1093	>	{ OPER_FLAG_REMOTEBAN,      'B' },
1094	>	{ OPER_FLAG_DIE,            'D' },
1095	>	{ OPER_FLAG_GLINE,          'G' },
1096	>	{ OPER_FLAG_REHASH,         'H' },
1097	>	{ OPER_FLAG_KLINE,          'K' },
1098	>	{ OPER_FLAG_KILL,           'N' },
1099	>	{ OPER_FLAG_KILL_REMOTE,    'O' },
1100	>	{ OPER_FLAG_CONNECT,        'P' },
1101	>	{ OPER_FLAG_CONNECT_REMOTE, 'Q' },
1102	>	{ OPER_FLAG_SQUIT,          'R' },
1103	>	{ OPER_FLAG_SQUIT_REMOTE,   'S' },
1104	>	{ OPER_FLAG_UNKLINE,        'U' },
1105	>	{ OPER_FLAG_XLINE,          'X' },
1106		{ 0, '\0' }
1107		};
1108
1109		char *
1110		oper_privs_as_string(const unsigned int port)
1111		{
1112	<	static char privs_out[16];
1112	>	static char privs_out[IRCD_BUFSIZE];
1113		char *privs_ptr = privs_out;
2106	–	unsigned int i = 0;
1114
1115	<	for (; flag_list[i].oprivs; ++i)
1115	>	for (const struct oper_privs *opriv = flag_list; opriv->flag; ++opriv)
1116		{
1117	<	if (port & flag_list[i].oprivs)
1118	<	*privs_ptr++ = flag_list[i].c;
1117	>	if (port & opriv->flag)
1118	>	*privs_ptr++ = opriv->c;
1119		else
1120	<	*privs_ptr++ = ToLowerTab[flag_list[i].c];
1120	>	*privs_ptr++ = ToLower(opriv->c);
1121		}
1122
1123		*privs_ptr = '\0';
#	Line 2119 | Line 1126 | oper_privs_as_string(const unsigned int
1126		}
1127
1128		/*
1129	<	* Input: A client to find the active oper{} name for.
1129	>	* Input: A client to find the active operator {} name for.
1130		* Output: The nick!user@host{oper} of the oper.
1131		*         "oper" is server name for remote opers
1132		* Side effects: None.
#	Line 2127 | Line 1134 | oper_privs_as_string(const unsigned int
1134		const char *
1135		get_oper_name(const struct Client *client_p)
1136		{
1137	<	dlink_node *cnode = NULL;
1137	>	const dlink_node *cnode = NULL;
1138		/* +5 for !,@,{,} and null */
1139		static char buffer[NICKLEN + USERLEN + HOSTLEN + HOSTLEN + 5];
1140
#	Line 2135 | Line 1142 | get_oper_name(const struct Client *clien
1142		{
1143		if ((cnode = client_p->localClient->confs.head))
1144		{
1145	<	struct ConfItem *conf = cnode->data;
2139	<	const struct AccessItem *aconf = map_to_conf(conf);
1145	>	const struct MaskItem *conf = cnode->data;
1146
1147	<	if (IsConfOperator(aconf))
1147	>	if (IsConfOperator(conf))
1148		{
1149	<	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1149	>	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1150		client_p->username, client_p->host, conf->name);
1151	<	return buffer;
1151	>	return buffer;
1152		}
1153		}
1154
1155	<	/* Probably should assert here for now. If there is an oper out there
1156	<	* with no oper{} conf attached, it would be good for us to know...
1155	>	/*
1156	>	* Probably should assert here for now. If there is an oper out there
1157	>	* with no operator {} conf attached, it would be good for us to know...
1158		*/
1159	<	assert(0); /* Oper without oper conf! */
1159	>	assert(0);  /* Oper without oper conf! */
1160		}
1161
1162		snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1163	<	client_p->username, client_p->host, client_p->servptr->name);
1163	>	client_p->username, client_p->host, client_p->servptr->name);
1164		return buffer;
1165		}
1166
#	Line 2166 | Line 1173 | get_oper_name(const struct Client *clien
1173		void
1174		read_conf_files(int cold)
1175		{
1176	<	const char *filename;
1177	<	char chanmodes[32];
1178	<	char chanlimit[32];
1176	>	const char *filename = NULL;
1177	>	char chanmodes[IRCD_BUFSIZE] = "";
1178	>	char chanlimit[IRCD_BUFSIZE] = "";
1179
1180		conf_parser_ctx.boot = cold;
1181	<	filename = ConfigFileEntry.configfile;
1181	>	filename = ConfigGeneral.configfile;
1182
1183		/* We need to know the initial filename for the yyerror() to report
1184		FIXME: The full path is in conffilenamebuf first time since we
1185	<	dont know anything else
1185	>	don't know anything else
1186
1187	<	- Gozem 2002-07-21
1187	>	- Gozem 2002-07-21
1188		*/
1189		strlcpy(conffilebuf, filename, sizeof(conffilebuf));
1190
#	Line 2192 | Line 1199 | read_conf_files(int cold)
1199		else
1200		{
1201		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1202	<	"Unable to read configuration file '%s': %s",
1203	<	filename, strerror(errno));
1202	>	"Unable to read configuration file '%s': %s",
1203	>	filename, strerror(errno));
1204		return;
1205		}
1206		}
#	Line 2204 | Line 1211 | read_conf_files(int cold)
1211		read_conf(conf_parser_ctx.conf_file);
1212		fclose(conf_parser_ctx.conf_file);
1213
1214	<	add_isupport("NETWORK", ServerInfo.network_name, -1);
2208	<	snprintf(chanmodes, sizeof(chanmodes), "beI:%d",
2209	<	ConfigChannel.max_bans);
2210	<	add_isupport("MAXLIST", chanmodes, -1);
2211	<	add_isupport("MAXTARGETS", NULL, ConfigFileEntry.max_targets);
1214	>	log_reopen_all();
1215
1216	+	add_isupport("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
1217	+	add_isupport("NETWORK", ConfigServerInfo.network_name, -1);
1218	+
1219	+	snprintf(chanmodes, sizeof(chanmodes), "beI:%d", ConfigChannel.max_bans);
1220	+	add_isupport("MAXLIST", chanmodes, -1);
1221	+	add_isupport("MAXTARGETS", NULL, ConfigGeneral.max_targets);
1222		add_isupport("CHANTYPES", "#", -1);
1223
1224		snprintf(chanlimit, sizeof(chanlimit), "#:%d",
1225	<	ConfigChannel.max_chans_per_user);
1225	>	ConfigChannel.max_channels);
1226		add_isupport("CHANLIMIT", chanlimit, -1);
1227	<	snprintf(chanmodes, sizeof(chanmodes), "%s",
1228	<	"beI,k,l,imnprstORS");
1229	<	add_isupport("CHANNELLEN", NULL, LOCAL_CHANNELLEN);
2221	<
2222	<	add_isupport("EXCEPTS", "e", -1);
2223	<	add_isupport("INVEX", "I", -1);
1227	>	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,cimnprstMORS");
1228	>	add_isupport("CHANNELLEN", NULL, CHANNELLEN);
1229	>	add_isupport("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
1230		add_isupport("CHANMODES", chanmodes, -1);
1231
1232		/*
#	Line 2240 | Line 1246 | static void
1246		clear_out_old_conf(void)
1247		{
1248		dlink_node *ptr = NULL, *next_ptr = NULL;
1249	<	struct ConfItem *conf;
2244	<	struct AccessItem *aconf;
2245	<	struct ClassItem *cltmp;
1249	>	struct MaskItem *conf;
1250		dlink_list *free_items [] = {
1251		&server_items,   &oconf_items,
1252	<	&uconf_items,   &xconf_items, &rxconf_items, &rkconf_items,
1253	<	&nresv_items, &cluster_items,  &service_items, NULL
1252	>	&uconf_items,   &xconf_items,
1253	>	&nresv_items, &cluster_items,  &service_items, &cresv_items, NULL
1254		};
1255
1256		dlink_list ** iterator = free_items; /* C is dumb */
#	Line 2254 | Line 1258 | clear_out_old_conf(void)
1258		/* We only need to free anything allocated by yyparse() here.
1259		* Resetting structs, etc, is taken care of by set_default_conf().
1260		*/
1261	<
1261	>
1262		for (; *iterator != NULL; iterator++)
1263		{
1264		DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
1265		{
1266		conf = ptr->data;
2263	–	/* XXX This is less than pretty */
2264	–	if (conf->type == SERVER_TYPE)
2265	–	{
2266	–	aconf = map_to_conf(conf);
1267
1268	<	if (aconf->clients != 0)
2269	<	{
2270	<	SetConfIllegal(aconf);
2271	<	dlinkDelete(&conf->node, &server_items);
2272	<	}
2273	<	else
2274	<	{
2275	<	delete_conf_item(conf);
2276	<	}
2277	<	}
2278	<	else if (conf->type == OPER_TYPE)
2279	<	{
2280	<	aconf = map_to_conf(conf);
1268	>	dlinkDelete(&conf->node, map_to_list(conf->type));
1269
1270	<	if (aconf->clients != 0)
1271	<	{
2284	<	SetConfIllegal(aconf);
2285	<	dlinkDelete(&conf->node, &oconf_items);
2286	<	}
2287	<	else
2288	<	{
2289	<	delete_conf_item(conf);
2290	<	}
2291	<	}
2292	<	else if (conf->type == XLINE_TYPE  ||
2293	<	conf->type == RXLINE_TYPE ||
2294	<	conf->type == RKLINE_TYPE)
1270	>	/* XXX This is less than pretty */
1271	>	if (conf->type == CONF_SERVER || conf->type == CONF_OPER)
1272		{
1273	<	/* temporary (r)xlines are also on
1274	<	* the (r)xconf items list */
2298	<	aconf = map_to_conf(conf);
2299	<	if (aconf->hold)
2300	<	continue;
2301	<
2302	<	delete_conf_item(conf);
1273	>	if (!conf->ref_count)
1274	>	conf_free(conf);
1275		}
1276	<	else
1276	>	else if (conf->type == CONF_XLINE)
1277		{
1278	<	delete_conf_item(conf);
1278	>	if (!conf->until)
1279	>	conf_free(conf);
1280		}
1281	+	else
1282	+	conf_free(conf);
1283		}
1284		}
1285
1286	+	motd_clear();
1287	+
1288		/*
1289		* don't delete the class table, rather mark all entries
1290	<	* for deletion. The table is cleaned up by check_class. - avalon
1290	>	* for deletion. The table is cleaned up by class_delete_marked. - avalon
1291		*/
1292	<	DLINK_FOREACH(ptr, class_items.head)
2316	<	{
2317	<	cltmp = map_to_conf(ptr->data);
2318	<
2319	<	if (ptr != class_items.tail)  /* never mark the "default" class */
2320	<	cltmp->active = 0;
2321	<	}
1292	>	class_mark_for_deletion();
1293
1294		clear_out_address_conf();
1295
1296		/* clean out module paths */
1297		mod_clear_paths();
1298
1299	<	/* clean out ServerInfo */
1300	<	MyFree(ServerInfo.description);
1301	<	ServerInfo.description = NULL;
1302	<	MyFree(ServerInfo.network_name);
1303	<	ServerInfo.network_name = NULL;
1304	<	MyFree(ServerInfo.network_desc);
1305	<	ServerInfo.network_desc = NULL;
2335	<	MyFree(ConfigFileEntry.egdpool_path);
2336	<	ConfigFileEntry.egdpool_path = NULL;
1299	>	/* clean out ConfigServerInfo */
1300	>	MyFree(ConfigServerInfo.description);
1301	>	ConfigServerInfo.description = NULL;
1302	>	MyFree(ConfigServerInfo.network_name);
1303	>	ConfigServerInfo.network_name = NULL;
1304	>	MyFree(ConfigServerInfo.network_desc);
1305	>	ConfigServerInfo.network_desc = NULL;
1306		#ifdef HAVE_LIBCRYPTO
1307	<	if (ServerInfo.rsa_private_key != NULL)
1307	>	if (ConfigServerInfo.rsa_private_key)
1308		{
1309	<	RSA_free(ServerInfo.rsa_private_key);
1310	<	ServerInfo.rsa_private_key = NULL;
1309	>	RSA_free(ConfigServerInfo.rsa_private_key);
1310	>	ConfigServerInfo.rsa_private_key = NULL;
1311		}
1312
1313	<	MyFree(ServerInfo.rsa_private_key_file);
1314	<	ServerInfo.rsa_private_key_file = NULL;
2346	<
2347	<	if (ServerInfo.server_ctx)
2348	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2|
2349	<	SSL_OP_NO_SSLv3|
2350	<	SSL_OP_NO_TLSv1);
2351	<	if (ServerInfo.client_ctx)
2352	<	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv2|
2353	<	SSL_OP_NO_SSLv3|
2354	<	SSL_OP_NO_TLSv1);
1313	>	MyFree(ConfigServerInfo.rsa_private_key_file);
1314	>	ConfigServerInfo.rsa_private_key_file = NULL;
1315		#endif
1316
1317	<	/* clean out old resvs from the conf */
1318	<	clear_conf_resv();
1319	<
1320	<	/* clean out AdminInfo */
1321	<	MyFree(AdminInfo.name);
1322	<	AdminInfo.name = NULL;
1323	<	MyFree(AdminInfo.email);
2364	<	AdminInfo.email = NULL;
2365	<	MyFree(AdminInfo.description);
2366	<	AdminInfo.description = NULL;
1317	>	/* clean out ConfigAdminInfo */
1318	>	MyFree(ConfigAdminInfo.name);
1319	>	ConfigAdminInfo.name = NULL;
1320	>	MyFree(ConfigAdminInfo.email);
1321	>	ConfigAdminInfo.email = NULL;
1322	>	MyFree(ConfigAdminInfo.description);
1323	>	ConfigAdminInfo.description = NULL;
1324
2368	–	/* operator{} and class{} blocks are freed above */
1325		/* clean out listeners */
1326		close_listeners();
1327
2372	–	/* auth{}, quarantine{}, shared{}, connect{}, kill{}, deny{},
2373	–	* exempt{} and gecos{} blocks are freed above too
2374	–	*/
2375	–
1328		/* clean out general */
1329	<	MyFree(ConfigFileEntry.service_name);
1330	<	ConfigFileEntry.service_name = NULL;
2379	<
2380	<	delete_isupport("INVEX");
2381	<	delete_isupport("EXCEPTS");
2382	<	}
2383	<
2384	<	/* flush_deleted_I_P()
2385	<	*
2386	<	* inputs       - none
2387	<	* output       - none
2388	<	* side effects - This function removes I/P conf items
2389	<	*/
2390	<	static void
2391	<	flush_deleted_I_P(void)
2392	<	{
2393	<	dlink_node *ptr;
2394	<	dlink_node *next_ptr;
2395	<	struct ConfItem *conf;
2396	<	struct AccessItem *aconf;
2397	<	dlink_list * free_items [] = {
2398	<	&server_items, &oconf_items, NULL
2399	<	};
2400	<	dlink_list ** iterator = free_items; /* C is dumb */
2401	<
2402	<	/* flush out deleted I and P lines
2403	<	* although still in use.
2404	<	*/
2405	<	for (; *iterator != NULL; iterator++)
2406	<	{
2407	<	DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
2408	<	{
2409	<	conf = ptr->data;
2410	<	aconf = (struct AccessItem *)map_to_conf(conf);
2411	<
2412	<	if (IsConfIllegal(aconf))
2413	<	{
2414	<	dlinkDelete(ptr, *iterator);
2415	<
2416	<	if (aconf->clients == 0)
2417	<	delete_conf_item(conf);
2418	<	}
2419	<	}
2420	<	}
2421	<	}
2422	<
2423	<	#define BAD_PING (-1)
2424	<
2425	<	/* get_conf_ping()
2426	<	*
2427	<	* inputs       - pointer to struct AccessItem
2428	<	*              - pointer to a variable that receives ping warning time
2429	<	* output       - ping frequency
2430	<	* side effects - NONE
2431	<	*/
2432	<	static int
2433	<	get_conf_ping(struct ConfItem *conf, int *pingwarn)
2434	<	{
2435	<	struct ClassItem *aclass;
2436	<	struct AccessItem *aconf;
2437	<
2438	<	if (conf != NULL)
2439	<	{
2440	<	aconf = (struct AccessItem *)map_to_conf(conf);
2441	<	if (aconf->class_ptr != NULL)
2442	<	{
2443	<	aclass = (struct ClassItem *)map_to_conf(aconf->class_ptr);
2444	<	*pingwarn = aclass->ping_warning;
2445	<	return aclass->ping_freq;
2446	<	}
2447	<	}
2448	<
2449	<	return BAD_PING;
2450	<	}
2451	<
2452	<	/* get_client_class()
2453	<	*
2454	<	* inputs       - pointer to client struct
2455	<	* output       - pointer to name of class
2456	<	* side effects - NONE
2457	<	*/
2458	<	const char *
2459	<	get_client_class(struct Client *target_p)
2460	<	{
2461	<	dlink_node *cnode = NULL;
2462	<	struct AccessItem *aconf = NULL;
2463	<
2464	<	assert(!IsMe(target_p));
2465	<
2466	<	if ((cnode = target_p->localClient->confs.head))
2467	<	{
2468	<	struct ConfItem *conf = cnode->data;
2469	<
2470	<	assert((conf->type == CLIENT_TYPE) || (conf->type == SERVER_TYPE) ||
2471	<	(conf->type == OPER_TYPE));
2472	<
2473	<	aconf = map_to_conf(conf);
2474	<	if (aconf->class_ptr != NULL)
2475	<	return aconf->class_ptr->name;
2476	<	}
2477	<
2478	<	return "default";
2479	<	}
2480	<
2481	<	/* get_client_ping()
2482	<	*
2483	<	* inputs       - pointer to client struct
2484	<	*              - pointer to a variable that receives ping warning time
2485	<	* output       - ping frequency
2486	<	* side effects - NONE
2487	<	*/
2488	<	int
2489	<	get_client_ping(struct Client *target_p, int *pingwarn)
2490	<	{
2491	<	int ping = 0;
2492	<	dlink_node *cnode = NULL;
2493	<
2494	<	if ((cnode = target_p->localClient->confs.head))
2495	<	{
2496	<	struct ConfItem *conf = cnode->data;
2497	<
2498	<	assert((conf->type == CLIENT_TYPE) || (conf->type == SERVER_TYPE) ||
2499	<	(conf->type == OPER_TYPE));
2500	<
2501	<	ping = get_conf_ping(conf, pingwarn);
2502	<	if (ping > 0)
2503	<	return ping;
2504	<	}
2505	<
2506	<	*pingwarn = 0;
2507	<	return DEFAULT_PINGFREQUENCY;
2508	<	}
2509	<
2510	<	/* find_class()
2511	<	*
2512	<	* inputs       - string name of class
2513	<	* output       - corresponding Class pointer
2514	<	* side effects - NONE
2515	<	*/
2516	<	struct ConfItem *
2517	<	find_class(const char *classname)
2518	<	{
2519	<	struct ConfItem *conf;
2520	<
2521	<	if ((conf = find_exact_name_conf(CLASS_TYPE, NULL, classname, NULL, NULL)) != NULL)
2522	<	return conf;
2523	<
2524	<	return class_default;
2525	<	}
2526	<
2527	<	/* check_class()
2528	<	*
2529	<	* inputs       - NONE
2530	<	* output       - NONE
2531	<	* side effects -
2532	<	*/
2533	<	void
2534	<	check_class(void)
2535	<	{
2536	<	dlink_node *ptr = NULL, *next_ptr = NULL;
2537	<
2538	<	DLINK_FOREACH_SAFE(ptr, next_ptr, class_items.head)
2539	<	{
2540	<	struct ClassItem *aclass = map_to_conf(ptr->data);
2541	<
2542	<	if (!aclass->active && !aclass->curr_user_count)
2543	<	{
2544	<	destroy_cidr_class(aclass);
2545	<	delete_conf_item(ptr->data);
2546	<	}
2547	<	}
2548	<	}
2549	<
2550	<	/* init_class()
2551	<	*
2552	<	* inputs       - NONE
2553	<	* output       - NONE
2554	<	* side effects -
2555	<	*/
2556	<	void
2557	<	init_class(void)
2558	<	{
2559	<	struct ClassItem *aclass;
2560	<
2561	<	class_default = make_conf_item(CLASS_TYPE);
2562	<
2563	<	aclass = map_to_conf(class_default);
2564	<	aclass->active = 1;
2565	<	DupString(class_default->name, "default");
2566	<	aclass->con_freq  = DEFAULT_CONNECTFREQUENCY;
2567	<	aclass->ping_freq = DEFAULT_PINGFREQUENCY;
2568	<	aclass->max_total = MAXIMUM_LINKS_DEFAULT;
2569	<	aclass->max_sendq = DEFAULT_SENDQ;
2570	<	aclass->max_recvq = DEFAULT_RECVQ;
2571	<
2572	<	client_check_cb = register_callback("check_client", check_client);
2573	<	}
2574	<
2575	<	/* get_sendq()
2576	<	*
2577	<	* inputs       - pointer to client
2578	<	* output       - sendq for this client as found from its class
2579	<	* side effects - NONE
2580	<	*/
2581	<	unsigned int
2582	<	get_sendq(struct Client *client_p)
2583	<	{
2584	<	unsigned int sendq = DEFAULT_SENDQ;
2585	<	dlink_node *cnode;
2586	<	struct ConfItem *class_conf;
2587	<	struct ClassItem *aclass;
2588	<	struct AccessItem *aconf;
2589	<
2590	<	assert(!IsMe(client_p));
2591	<
2592	<	if ((cnode = client_p->localClient->confs.head))
2593	<	{
2594	<	struct ConfItem *conf = cnode->data;
2595	<
2596	<	assert((conf->type == CLIENT_TYPE) || (conf->type == SERVER_TYPE) ||
2597	<	(conf->type == OPER_TYPE));
2598	<
2599	<	aconf = map_to_conf(conf);
2600	<
2601	<	if ((class_conf = aconf->class_ptr) == NULL)
2602	<	return DEFAULT_SENDQ; /* TBV: shouldn't be possible at all */
2603	<
2604	<	aclass = map_to_conf(class_conf);
2605	<	sendq = aclass->max_sendq;
2606	<	return sendq;
2607	<	}
2608	<
2609	<	/* XXX return a default?
2610	<	* if here, then there wasn't an attached conf with a sendq
2611	<	* that is very bad -Dianora
2612	<	*/
2613	<	return DEFAULT_SENDQ;
2614	<	}
2615	<
2616	<	unsigned int
2617	<	get_recvq(struct Client *client_p)
2618	<	{
2619	<	unsigned int recvq = DEFAULT_RECVQ;
2620	<	dlink_node *cnode;
2621	<	struct ConfItem *class_conf;
2622	<	struct ClassItem *aclass;
2623	<	struct AccessItem *aconf;
2624	<
2625	<	assert(!IsMe(client_p));
2626	<
2627	<	if ((cnode = client_p->localClient->confs.head))
2628	<	{
2629	<	struct ConfItem *conf = cnode->data;
2630	<
2631	<	assert((conf->type == CLIENT_TYPE) || (conf->type == SERVER_TYPE) ||
2632	<	(conf->type == OPER_TYPE));
2633	<
2634	<	aconf = map_to_conf(conf);
2635	<
2636	<	if ((class_conf = aconf->class_ptr) == NULL)
2637	<	return DEFAULT_RECVQ; /* TBV: shouldn't be possible at all */
2638	<
2639	<	aclass = map_to_conf(class_conf);
2640	<	recvq = aclass->max_recvq;
2641	<	return recvq;
2642	<	}
2643	<
2644	<	/* XXX return a default?
2645	<	* if here, then there wasn't an attached conf with a recvq
2646	<	* that is very bad -Dianora
2647	<	*/
2648	<	return DEFAULT_RECVQ;
1329	>	MyFree(ConfigGeneral.service_name);
1330	>	ConfigGeneral.service_name = NULL;
1331		}
1332
1333		/* conf_add_class_to_conf()
1334		*
1335		* inputs       - pointer to config item
1336		* output       - NONE
1337	<	* side effects - Add a class pointer to a conf
1337	>	* side effects - Add a class pointer to a conf
1338		*/
1339		void
1340	<	conf_add_class_to_conf(struct ConfItem *conf, const char *class_name)
1340	>	conf_add_class_to_conf(struct MaskItem *conf, const char *class_name)
1341		{
1342	<	struct AccessItem *aconf = map_to_conf(conf);
2661	<	struct ClassItem *class = NULL;
2662	<
2663	<	if (class_name == NULL)
1342	>	if (class_name == NULL)
1343		{
1344	<	aconf->class_ptr = class_default;
1344	>	conf->class = class_default;
1345
1346	<	if (conf->type == CLIENT_TYPE)
1346	>	if (conf->type == CONF_CLIENT)
1347		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1348	<	"Warning *** Defaulting to default class for %s@%s",
1349	<	aconf->user, aconf->host);
1348	>	"Warning *** Defaulting to default class for %s@%s",
1349	>	conf->user, conf->host);
1350		else
1351		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1352	<	"Warning *** Defaulting to default class for %s",
1353	<	conf->name);
1352	>	"Warning *** Defaulting to default class for %s",
1353	>	conf->name);
1354		}
1355		else
1356	<	aconf->class_ptr = find_class(class_name);
2678	<
2679	<	if (aconf->class_ptr)
2680	<	class = map_to_conf(aconf->class_ptr);
1356	>	conf->class = class_find(class_name, 1);
1357
1358	<	if (aconf->class_ptr == NULL || !class->active)
1358	>	if (conf->class == NULL)
1359		{
1360	<	if (conf->type == CLIENT_TYPE)
1360	>	if (conf->type == CONF_CLIENT)
1361		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1362	<	"Warning *** Defaulting to default class for %s@%s",
1363	<	aconf->user, aconf->host);
1362	>	"Warning *** Defaulting to default class for %s@%s",
1363	>	conf->user, conf->host);
1364		else
1365		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1366	<	"Warning *** Defaulting to default class for %s",
1367	<	conf->name);
1368	<	aconf->class_ptr = class_default;
2693	<	}
2694	<	}
2695	<
2696	<	/* conf_add_server()
2697	<	*
2698	<	* inputs       - pointer to config item
2699	<	*              - pointer to link count already on this conf
2700	<	* output       - NONE
2701	<	* side effects - Add a connect block
2702	<	*/
2703	<	int
2704	<	conf_add_server(struct ConfItem *conf, const char *class_name)
2705	<	{
2706	<	struct AccessItem *aconf = map_to_conf(conf);
2707	<
2708	<	conf_add_class_to_conf(conf, class_name);
2709	<
2710	<	if (!aconf->host || !conf->name)
2711	<	{
2712	<	sendto_realops_flags(UMODE_ALL, L_ALL,  SEND_NOTICE,
2713	<	"Bad connect block");
2714	<	ilog(LOG_TYPE_IRCD, "Bad connect block");
2715	<	return -1;
1366	>	"Warning *** Defaulting to default class for %s",
1367	>	conf->name);
1368	>	conf->class = class_default;
1369		}
2717	–
2718	–	if (EmptyString(aconf->passwd))
2719	–	{
2720	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
2721	–	"Bad connect block, name %s",
2722	–	conf->name);
2723	–	ilog(LOG_TYPE_IRCD, "Bad connect block, host %s", conf->name);
2724	–	return -1;
2725	–	}
2726	–
2727	–	lookup_confhost(conf);
2728	–
2729	–	return 0;
1370		}
1371
1372		/* yyerror()
#	Line 2744 | Line 1384 | yyerror(const char *msg)
1384		return;
1385
1386		strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1387	<	sendto_realops_flags(UMODE_ALL, L_ALL,  SEND_NOTICE,
1387	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1388	>	"\"%s\", line %u: %s: %s",
1389	>	conffilebuf, lineno + 1, msg, newlinebuf);
1390	>	ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1391	>	conffilebuf, lineno + 1, msg, newlinebuf);
1392	>	}
1393	>
1394	>	void
1395	>	conf_error_report(const char *msg)
1396	>	{
1397	>	char newlinebuf[IRCD_BUFSIZE];
1398	>
1399	>	strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1400	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1401		"\"%s\", line %u: %s: %s",
1402		conffilebuf, lineno + 1, msg, newlinebuf);
1403		ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
#	Line 2753 | Line 1406 | yyerror(const char *msg)
1406
1407		/*
1408		* valid_tkline()
1409	<	*
1409	>	*
1410		* inputs       - pointer to ascii string to check
1411		*              - whether the specified time is in seconds or minutes
1412		* output       - -1 not enough parameters
#	Line 2762 | Line 1415 | yyerror(const char *msg)
1415		* Originally written by Dianora (Diane, db@db.net)
1416		*/
1417		time_t
1418	<	valid_tkline(const char *p, int minutes)
1418	>	valid_tkline(const char *data, const int minutes)
1419		{
1420	+	const unsigned char *p = (const unsigned char *)data;
1421	+	unsigned char tmpch = '\0';
1422		time_t result = 0;
1423
1424	<	for (; *p; ++p)
1424	>	while ((tmpch = *p++))
1425		{
1426	<	if (!IsDigit(*p))
1426	>	if (!IsDigit(tmpch))
1427		return 0;
1428
1429		result *= 10;
1430	<	result += ((*p) & 0xF);
1430	>	result += (tmpch & 0xF);
1431		}
1432
1433		/*
1434	<	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1434	>	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1435		* i.e. they specifically use 0, I am going to return 1 instead
1436		* as a return value of non-zero is used to flag it as a temporary kline
1437		*/
1438		if (result == 0)
1439		result = 1;
1440
1441	<	/*
1441	>	/*
1442		* If the incoming time is in seconds convert it to minutes for the purpose
1443		* of this calculation
1444		*/
1445		if (!minutes)
1446	<	result = result / (time_t)60;
1446	>	result = result / 60;
1447
1448		if (result > MAX_TDKLINE_TIME)
1449		result = MAX_TDKLINE_TIME;
1450
1451	<	result = result * (time_t)60;  /* turn it into seconds */
1451	>	result = result * 60;  /* turn it into seconds */
1452
1453		return result;
1454		}
1455
1456	+	/* valid_wild_card_simple()
1457	+	*
1458	+	* inputs       - data to check for sufficient non-wildcard characters
1459	+	* outputs      - 1 if valid, else 0
1460	+	* side effects - none
1461	+	*/
1462	+	int
1463	+	valid_wild_card_simple(const char *data)
1464	+	{
1465	+	const unsigned char *p = (const unsigned char *)data;
1466	+	unsigned char tmpch = '\0';
1467	+	unsigned int nonwild = 0;
1468	+
1469	+	while ((tmpch = *p++))
1470	+	{
1471	+	if (tmpch == '\\' && *p)
1472	+	{
1473	+	++p;
1474	+	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1475	+	return 1;
1476	+	}
1477	+	else if (!IsMWildChar(tmpch))
1478	+	{
1479	+	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1480	+	return 1;
1481	+	}
1482	+	}
1483	+
1484	+	return 0;
1485	+	}
1486	+
1487		/* valid_wild_card()
1488		*
1489		* input        - pointer to client
#	Line 2809 | Line 1495 | valid_tkline(const char *p, int minutes)
1495		int
1496		valid_wild_card(struct Client *source_p, int warn, int count, ...)
1497		{
1498	<	char *p;
1499	<	char tmpch;
2814	<	int nonwild = 0;
1498	>	unsigned char tmpch = '\0';
1499	>	unsigned int nonwild = 0;
1500		va_list args;
1501
1502		/*
#	Line 2830 | Line 1515 | valid_wild_card(struct Client *source_p,
1515
1516		while (count--)
1517		{
1518	<	p = va_arg(args, char *);
1518	>	const unsigned char *p = va_arg(args, const unsigned char *);
1519		if (p == NULL)
1520		continue;
1521
#	Line 2842 | Line 1527 | valid_wild_card(struct Client *source_p,
1527		* If we find enough non-wild characters, we can
1528		* break - no point in searching further.
1529		*/
1530	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard)
1530	>	if (++nonwild >= ConfigGeneral.min_nonwildcard)
1531	>	{
1532	>	va_end(args);
1533		return 1;
1534	+	}
1535		}
1536		}
1537		}
1538
1539		if (warn)
1540	<	sendto_one(source_p, ":%s NOTICE %s :Please include at least %d non-wildcard characters with the mask",
1541	<	me.name, source_p->name, ConfigFileEntry.min_nonwildcard);
1540	>	sendto_one_notice(source_p, &me,
1541	>	":Please include at least %u non-wildcard characters with the mask",
1542	>	ConfigGeneral.min_nonwildcard);
1543	>	va_end(args);
1544		return 0;
1545		}
1546
#	Line 2864 | Line 1554 | valid_wild_card(struct Client *source_p,
1554		*              - parse_flags bit map of things to test
1555		*              - pointer to user or string to parse into
1556		*              - pointer to host or NULL to parse into if non NULL
1557	<	*              - pointer to optional tkline time or NULL
1557	>	*              - pointer to optional tkline time or NULL
1558		*              - pointer to target_server to parse into if non NULL
1559		*              - pointer to reason to parse into
1560		*
#	Line 2886 | Line 1576 | valid_wild_card(struct Client *source_p,
1576		*/
1577		int
1578		parse_aline(const char *cmd, struct Client *source_p,
1579	<	int parc, char **parv,
1580	<	int parse_flags, char **up_p, char **h_p, time_t *tkline_time,
1581	<	char **target_server, char **reason)
1579	>	int parc, char **parv,
1580	>	int parse_flags, char **up_p, char **h_p, time_t *tkline_time,
1581	>	char **target_server, char **reason)
1582		{
1583		int found_tkline_time=0;
1584	<	static char def_reason[] = "No Reason";
1584	>	static char def_reason[] = CONF_NOREASON;
1585		static char user[USERLEN*4+1];
1586		static char host[HOSTLEN*4+1];
1587
#	Line 2909 | Line 1599 | parse_aline(const char *cmd, struct Clie
1599		*tkline_time = found_tkline_time;
1600		else
1601		{
1602	<	sendto_one(source_p, ":%s NOTICE %s :temp_line not supported by %s",
2913	<	me.name, source_p->name, cmd);
1602	>	sendto_one_notice(source_p, &me, ":temp_line not supported by %s", cmd);
1603		return -1;
1604		}
1605		}
1606
1607		if (parc == 0)
1608		{
1609	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
2921	<	me.name, source_p->name, cmd);
1609	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1610		return -1;
1611		}
1612
#	Line 2932 | Line 1620 | parse_aline(const char *cmd, struct Clie
1620		*up_p = user;
1621		*h_p = host;
1622		}
1623	<
1623	>
1624		parc--;
1625		parv++;
1626
#	Line 2945 | Line 1633 | parse_aline(const char *cmd, struct Clie
1633
1634		if (target_server == NULL)
1635		{
1636	<	sendto_one(source_p, ":%s NOTICE %s :ON server not supported by %s",
1637	<	me.name, source_p->name, cmd);
2950	<	return -1;
1636	>	sendto_one_notice(source_p, &me, ":ON server not supported by %s", cmd);
1637	>	return -1;
1638		}
1639
1640		if (!HasOFlag(source_p, OPER_FLAG_REMOTEBAN))
1641		{
1642	<	sendto_one(source_p, form_str(ERR_NOPRIVS),
2956	<	me.name, source_p->name, "remoteban");
1642	>	sendto_one_numeric(source_p, &me, ERR_NOPRIVS, "remoteban");
1643		return -1;
1644		}
1645
1646		if (parc == 0 || EmptyString(*parv))
1647		{
1648	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1649	<	me.name, source_p->name, cmd);
2964	<	return -1;
1648	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1649	>	return -1;
1650		}
1651
1652		*target_server = *parv;
#	Line 2974 | Line 1659 | parse_aline(const char *cmd, struct Clie
1659		* caller probably NULL'd it first, but no harm to do it again -db
1660		*/
1661		if (target_server != NULL)
1662	<	*target_server = NULL;
1662	>	*target_server = NULL;
1663		}
1664		}
1665
#	Line 2982 | Line 1667 | parse_aline(const char *cmd, struct Clie
1667		{
1668		if (strchr(user, '!') != NULL)
1669		{
1670	<	sendto_one(source_p, ":%s NOTICE %s :Invalid character '!' in kline",
2986	<	me.name, source_p->name);
1670	>	sendto_one_notice(source_p, &me, ":Invalid character '!' in kline");
1671		return -1;
1672		}
1673
#	Line 3000 | Line 1684 | parse_aline(const char *cmd, struct Clie
1684		{
1685		*reason = *parv;
1686		if (!valid_comment(source_p, *reason, 1))
1687	<	return -1;
1687	>	return -1;
1688		}
1689		else
1690		*reason = def_reason;
#	Line 3039 | Line 1723 | find_user_host(struct Client *source_p,
1723		{
1724		*(hostp++) = '\0';                       /* short and squat */
1725		if (*user_host_or_nick)
1726	<	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
1726	>	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
1727		else
1728	<	strcpy(luser, "*");
1728	>	strcpy(luser, "*");
1729	>
1730		if (*hostp)
1731	<	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
1731	>	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
1732		else
1733	<	strcpy(lhost, "*");
1733	>	strcpy(lhost, "*");
1734		}
1735		else
1736		{
1737		luser[0] = '*';             /* no @ found, assume its *@somehost */
1738	<	luser[1] = '\0';
1738	>	luser[1] = '\0';
1739		strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
1740		}
1741	<
1741	>
1742		return 1;
1743		}
1744		else
1745		{
1746		/* Try to find user@host mask from nick */
1747		/* Okay to use source_p as the first param, because source_p == client_p */
1748	<	if ((target_p =
1749	<	find_chasing(source_p, source_p, user_host_or_nick, NULL)) == NULL)
1750	<	return 0;
1748	>	if ((target_p =
1749	>	find_chasing(source_p, user_host_or_nick)) == NULL)
1750	>	return 0;  /* find_chasing sends ERR_NOSUCHNICK */
1751
1752		if (IsExemptKline(target_p))
1753		{
1754		if (!IsServer(source_p))
1755	<	sendto_one(source_p,
3071	<	":%s NOTICE %s :%s is E-lined",
3072	<	me.name, source_p->name, target_p->name);
1755	>	sendto_one_notice(source_p, &me, ":%s is E-lined", target_p->name);
1756		return 0;
1757		}
1758
#	Line 3104 | Line 1787 | find_user_host(struct Client *source_p,
1787		int
1788		valid_comment(struct Client *source_p, char *comment, int warn)
1789		{
3107	–	if (strchr(comment, '"'))
3108	–	{
3109	–	if (warn)
3110	–	sendto_one(source_p, ":%s NOTICE %s :Invalid character '\"' in comment",
3111	–	me.name, source_p->name);
3112	–	return 0;
3113	–	}
3114	–
1790		if (strlen(comment) > REASONLEN)
1791		comment[REASONLEN-1] = '\0';
1792
#	Line 3126 | Line 1801 | valid_comment(struct Client *source_p, c
1801		* side effects - none
1802		*/
1803		int
1804	<	match_conf_password(const char *password, const struct AccessItem *aconf)
1804	>	match_conf_password(const char *password, const struct MaskItem *conf)
1805		{
1806		const char *encr = NULL;
1807
1808	<	if (EmptyString(password) || EmptyString(aconf->passwd))
1808	>	if (EmptyString(password) || EmptyString(conf->passwd))
1809		return 0;
1810
1811	<	if (aconf->flags & CONF_FLAGS_ENCRYPTED)
1812	<	encr = crypt(password, aconf->passwd);
1811	>	if (conf->flags & CONF_FLAGS_ENCRYPTED)
1812	>	encr = crypt(password, conf->passwd);
1813		else
1814		encr = password;
1815
1816	<	return !strcmp(encr, aconf->passwd);
1816	>	return encr && !strcmp(encr, conf->passwd);
1817		}
1818
1819		/*
#	Line 3146 | Line 1821 | match_conf_password(const char *password
1821		*
1822		* inputs       - client sending the cluster
1823		*              - command name "KLINE" "XLINE" etc.
1824	<	*              - capab -- CAP_KLN etc. from s_serv.h
1824	>	*              - capab -- CAP_KLN etc. from server.h
1825		*              - cluster type -- CLUSTER_KLINE etc. from conf.h
1826		*              - pattern and args to send along
1827		* output       - none
#	Line 3158 | Line 1833 | cluster_a_line(struct Client *source_p,
1833		int capab, int cluster_type, const char *pattern, ...)
1834		{
1835		va_list args;
1836	<	char buffer[IRCD_BUFSIZE];
1836	>	char buffer[IRCD_BUFSIZE] = "";
1837		const dlink_node *ptr = NULL;
1838
1839		va_start(args, pattern);
#	Line 3167 | Line 1842 | cluster_a_line(struct Client *source_p,
1842
1843		DLINK_FOREACH(ptr, cluster_items.head)
1844		{
1845	<	const struct ConfItem *conf = ptr->data;
1845	>	const struct MaskItem *conf = ptr->data;
1846
1847		if (conf->flags & cluster_type)
1848		sendto_match_servs(source_p, conf->name, CAP_CLUSTER|capab,
1849	<	"%s %s %s", command, conf->name, buffer);
1849	>	"%s %s %s", command, conf->name, buffer);
1850		}
1851		}
1852
#	Line 3219 | Line 1894 | split_nuh(struct split_nuh_item *const i
1894		{
1895		*p = '\0';
1896
1897	<	if (iptr->nickptr && *iptr->nuhmask != '\0')
1897	>	if (iptr->nickptr && *iptr->nuhmask)
1898		strlcpy(iptr->nickptr, iptr->nuhmask, iptr->nicksize);
1899
1900	<	if ((q = strchr(++p, '@'))) {
1900	>	if ((q = strchr(++p, '@')))
1901	>	{
1902		*q++ = '\0';
1903
1904	<	if (*p != '\0')
1904	>	if (*p)
1905		strlcpy(iptr->userptr, p, iptr->usersize);
1906
1907	<	if (*q != '\0')
1907	>	if (*q)
1908		strlcpy(iptr->hostptr, q, iptr->hostsize);
1909		}
1910		else
1911		{
1912	<	if (*p != '\0')
1912	>	if (*p)
1913		strlcpy(iptr->userptr, p, iptr->usersize);
1914		}
1915		}
#	Line 3245 | Line 1921 | split_nuh(struct split_nuh_item *const i
1921		/* if found a @ */
1922		*p++ = '\0';
1923
1924	<	if (*iptr->nuhmask != '\0')
1924	>	if (*iptr->nuhmask)
1925		strlcpy(iptr->userptr, iptr->nuhmask, iptr->usersize);
1926
1927	<	if (*p != '\0')
1927	>	if (*p)
1928		strlcpy(iptr->hostptr, p, iptr->hostsize);
1929		}
1930		else
#	Line 3261 | Line 1937 | split_nuh(struct split_nuh_item *const i
1937		}
1938		}
1939		}
3264	–
3265	–	/*
3266	–	* flags_to_ascii
3267	–	*
3268	–	* inputs       - flags is a bitmask
3269	–	*              - pointer to table of ascii letters corresponding
3270	–	*                to each bit
3271	–	*              - flag 1 for convert ToLower if bit missing
3272	–	*                0 if ignore.
3273	–	* output       - none
3274	–	* side effects - string pointed to by p has bitmap chars written to it
3275	–	*/
3276	–	static void
3277	–	flags_to_ascii(unsigned int flags, const unsigned int bit_table[], char *p,
3278	–	int lowerit)
3279	–	{
3280	–	unsigned int mask = 1;
3281	–	int i = 0;
3282	–
3283	–	for (mask = 1; (mask != 0) && (bit_table[i] != 0); mask <<= 1, i++)
3284	–	{
3285	–	if (flags & mask)
3286	–	*p++ = bit_table[i];
3287	–	else if (lowerit)
3288	–	*p++ = ToLower(bit_table[i]);
3289	–	}
3290	–	*p = '\0';
3291	–	}
3292	–
3293	–	/*
3294	–	* cidr_limit_reached
3295	–	*
3296	–	* inputs       - int flag allowing over_rule of limits
3297	–	*              - pointer to the ip to be added
3298	–	*              - pointer to the class
3299	–	* output       - non zero if limit reached
3300	–	*                0 if limit not reached
3301	–	* side effects -
3302	–	*/
3303	–	static int
3304	–	cidr_limit_reached(int over_rule,
3305	–	struct irc_ssaddr *ip, struct ClassItem *aclass)
3306	–	{
3307	–	dlink_node *ptr = NULL;
3308	–	struct CidrItem *cidr;
3309	–
3310	–	if (aclass->number_per_cidr <= 0)
3311	–	return 0;
3312	–
3313	–	if (ip->ss.ss_family == AF_INET)
3314	–	{
3315	–	if (aclass->cidr_bitlen_ipv4 <= 0)
3316	–	return 0;
3317	–
3318	–	DLINK_FOREACH(ptr, aclass->list_ipv4.head)
3319	–	{
3320	–	cidr = ptr->data;
3321	–	if (match_ipv4(ip, &cidr->mask, aclass->cidr_bitlen_ipv4))
3322	–	{
3323	–	if (!over_rule && (cidr->number_on_this_cidr >= aclass->number_per_cidr))
3324	–	return -1;
3325	–	cidr->number_on_this_cidr++;
3326	–	return 0;
3327	–	}
3328	–	}
3329	–	cidr = MyMalloc(sizeof(struct CidrItem));
3330	–	cidr->number_on_this_cidr = 1;
3331	–	cidr->mask = *ip;
3332	–	mask_addr(&cidr->mask, aclass->cidr_bitlen_ipv4);
3333	–	dlinkAdd(cidr, &cidr->node, &aclass->list_ipv4);
3334	–	}
3335	–	#ifdef IPV6
3336	–	else if (aclass->cidr_bitlen_ipv6 > 0)
3337	–	{
3338	–	DLINK_FOREACH(ptr, aclass->list_ipv6.head)
3339	–	{
3340	–	cidr = ptr->data;
3341	–	if (match_ipv6(ip, &cidr->mask, aclass->cidr_bitlen_ipv6))
3342	–	{
3343	–	if (!over_rule && (cidr->number_on_this_cidr >= aclass->number_per_cidr))
3344	–	return -1;
3345	–	cidr->number_on_this_cidr++;
3346	–	return 0;
3347	–	}
3348	–	}
3349	–	cidr = MyMalloc(sizeof(struct CidrItem));
3350	–	cidr->number_on_this_cidr = 1;
3351	–	cidr->mask = *ip;
3352	–	mask_addr(&cidr->mask, aclass->cidr_bitlen_ipv6);
3353	–	dlinkAdd(cidr, &cidr->node, &aclass->list_ipv6);
3354	–	}
3355	–	#endif
3356	–	return 0;
3357	–	}
3358	–
3359	–	/*
3360	–	* remove_from_cidr_check
3361	–	*
3362	–	* inputs       - pointer to the ip to be removed
3363	–	*              - pointer to the class
3364	–	* output       - NONE
3365	–	* side effects -
3366	–	*/
3367	–	static void
3368	–	remove_from_cidr_check(struct irc_ssaddr *ip, struct ClassItem *aclass)
3369	–	{
3370	–	dlink_node *ptr = NULL;
3371	–	dlink_node *next_ptr = NULL;
3372	–	struct CidrItem *cidr;
3373	–
3374	–	if (aclass->number_per_cidr == 0)
3375	–	return;
3376	–
3377	–	if (ip->ss.ss_family == AF_INET)
3378	–	{
3379	–	if (aclass->cidr_bitlen_ipv4 <= 0)
3380	–	return;
3381	–
3382	–	DLINK_FOREACH_SAFE(ptr, next_ptr, aclass->list_ipv4.head)
3383	–	{
3384	–	cidr = ptr->data;
3385	–	if (match_ipv4(ip, &cidr->mask, aclass->cidr_bitlen_ipv4))
3386	–	{
3387	–	cidr->number_on_this_cidr--;
3388	–	if (cidr->number_on_this_cidr == 0)
3389	–	{
3390	–	dlinkDelete(ptr, &aclass->list_ipv4);
3391	–	MyFree(cidr);
3392	–	return;
3393	–	}
3394	–	}
3395	–	}
3396	–	}
3397	–	#ifdef IPV6
3398	–	else if (aclass->cidr_bitlen_ipv6 > 0)
3399	–	{
3400	–	DLINK_FOREACH_SAFE(ptr, next_ptr, aclass->list_ipv6.head)
3401	–	{
3402	–	cidr = ptr->data;
3403	–	if (match_ipv6(ip, &cidr->mask, aclass->cidr_bitlen_ipv6))
3404	–	{
3405	–	cidr->number_on_this_cidr--;
3406	–	if (cidr->number_on_this_cidr == 0)
3407	–	{
3408	–	dlinkDelete(ptr, &aclass->list_ipv6);
3409	–	MyFree(cidr);
3410	–	return;
3411	–	}
3412	–	}
3413	–	}
3414	–	}
3415	–	#endif
3416	–	}
3417	–
3418	–	static void
3419	–	rebuild_cidr_list(int aftype, struct ConfItem *oldcl, struct ClassItem *newcl,
3420	–	dlink_list *old_list, dlink_list *new_list, int changed)
3421	–	{
3422	–	dlink_node *ptr;
3423	–	struct Client *client_p;
3424	–	struct ConfItem *conf;
3425	–	struct AccessItem *aconf;
3426	–
3427	–	if (!changed)
3428	–	{
3429	–	*new_list = *old_list;
3430	–	old_list->head = old_list->tail = NULL;
3431	–	old_list->length = 0;
3432	–	return;
3433	–	}
3434	–
3435	–	DLINK_FOREACH(ptr, local_client_list.head)
3436	–	{
3437	–	client_p = ptr->data;
3438	–	if (client_p->localClient->aftype != aftype)
3439	–	continue;
3440	–	if (dlink_list_length(&client_p->localClient->confs) == 0)
3441	–	continue;
3442	–
3443	–	conf = client_p->localClient->confs.tail->data;
3444	–	if (conf->type == CLIENT_TYPE)
3445	–	{
3446	–	aconf = map_to_conf(conf);
3447	–	if (aconf->class_ptr == oldcl)
3448	–	cidr_limit_reached(1, &client_p->localClient->ip, newcl);
3449	–	}
3450	–	}
3451	–	}
3452	–
3453	–	/*
3454	–	* rebuild_cidr_class
3455	–	*
3456	–	* inputs       - pointer to old conf
3457	–	*              - pointer to new_class
3458	–	* output       - none
3459	–	* side effects - rebuilds the class link list of cidr blocks
3460	–	*/
3461	–	void
3462	–	rebuild_cidr_class(struct ConfItem *conf, struct ClassItem *new_class)
3463	–	{
3464	–	struct ClassItem *old_class = map_to_conf(conf);
3465	–
3466	–	if (old_class->number_per_cidr > 0 && new_class->number_per_cidr > 0)
3467	–	{
3468	–	if (old_class->cidr_bitlen_ipv4 > 0 && new_class->cidr_bitlen_ipv4 > 0)
3469	–	rebuild_cidr_list(AF_INET, conf, new_class,
3470	–	&old_class->list_ipv4, &new_class->list_ipv4,
3471	–	old_class->cidr_bitlen_ipv4 != new_class->cidr_bitlen_ipv4);
3472	–
3473	–	#ifdef IPV6
3474	–	if (old_class->cidr_bitlen_ipv6 > 0 && new_class->cidr_bitlen_ipv6 > 0)
3475	–	rebuild_cidr_list(AF_INET6, conf, new_class,
3476	–	&old_class->list_ipv6, &new_class->list_ipv6,
3477	–	old_class->cidr_bitlen_ipv6 != new_class->cidr_bitlen_ipv6);
3478	–	#endif
3479	–	}
3480	–
3481	–	destroy_cidr_class(old_class);
3482	–	}
3483	–
3484	–	/*
3485	–	* destroy_cidr_list
3486	–	*
3487	–	* inputs       - pointer to class dlink list of cidr blocks
3488	–	* output       - none
3489	–	* side effects - completely destroys the class link list of cidr blocks
3490	–	*/
3491	–	static void
3492	–	destroy_cidr_list(dlink_list *list)
3493	–	{
3494	–	dlink_node *ptr = NULL, *next_ptr = NULL;
3495	–
3496	–	DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
3497	–	{
3498	–	dlinkDelete(ptr, list);
3499	–	MyFree(ptr->data);
3500	–	}
3501	–	}
3502	–
3503	–	/*
3504	–	* destroy_cidr_class
3505	–	*
3506	–	* inputs       - pointer to class
3507	–	* output       - none
3508	–	* side effects - completely destroys the class link list of cidr blocks
3509	–	*/
3510	–	static void
3511	–	destroy_cidr_class(struct ClassItem *aclass)
3512	–	{
3513	–	destroy_cidr_list(&aclass->list_ipv4);
3514	–	destroy_cidr_list(&aclass->list_ipv6);
3515	–	}

Diff Legend

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