ViewVC Help

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

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

Comparing:
ircd-hybrid-8/src/s_conf.c (file contents), Revision 1243 by michael, Fri Sep 30 10:47:53 2011 UTC vs.
ircd-hybrid/trunk/src/conf.c (file contents), 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	<	*  s_conf.c: Configuration file functions.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2002 by the past and present ircd coders, and others.
4	>	*  Copyright (c) 1997-2014 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 18 | Line 17
17		*  along with this program; if not, write to the Free Software
18		*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
19		*  USA
20	<	*
21	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file conf.c
23	>	* \brief Configuration file functions.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
28		#include "list.h"
29		#include "ircd_defs.h"
30	<	#include "balloc.h"
31	<	#include "s_conf.h"
30	<	#include "s_serv.h"
30	>	#include "conf.h"
31	>	#include "server.h"
32		#include "resv.h"
33		#include "channel.h"
34		#include "client.h"
35		#include "event.h"
35	–	#include "hash.h"
36	–	#include "hook.h"
36		#include "irc_string.h"
38	–	#include "sprintf_irc.h"
37		#include "s_bsd.h"
38		#include "ircd.h"
39		#include "listener.h"
#	Line 43 | Line 41
41		#include "modules.h"
42		#include "numeric.h"
43		#include "fdlist.h"
44	<	#include "s_log.h"
44	>	#include "log.h"
45		#include "send.h"
48	–	#include "s_gline.h"
49	–	#include "fileio.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
58	–	struct Callback *client_check_cb = NULL;
59	–	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 };
61		dlink_list server_items  = { NULL, NULL, 0 };
62		dlink_list cluster_items = { NULL, NULL, 0 };
65	–	dlink_list hub_items     = { NULL, NULL, 0 };
66	–	dlink_list leaf_items    = { NULL, NULL, 0 };
63		dlink_list oconf_items   = { NULL, NULL, 0 };
64		dlink_list uconf_items   = { NULL, NULL, 0 };
65		dlink_list xconf_items   = { NULL, NULL, 0 };
70	–	dlink_list rxconf_items  = { NULL, NULL, 0 };
71	–	dlink_list rkconf_items  = { NULL, NULL, 0 };
66		dlink_list nresv_items   = { NULL, NULL, 0 };
67	<	dlink_list class_items   = { NULL, NULL, 0 };
74	<	dlink_list gdeny_items   = { NULL, NULL, 0 };
75	<
76	<	dlink_list temporary_klines  = { NULL, NULL, 0 };
77	<	dlink_list temporary_dlines  = { NULL, NULL, 0 };
78	<	dlink_list temporary_xlines  = { NULL, NULL, 0 };
79	<	dlink_list temporary_rklines = { NULL, NULL, 0 };
80	<	dlink_list temporary_glines  = { NULL, NULL, 0 };
81	<	dlink_list temporary_rxlines = { NULL, NULL, 0 };
82	<	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];
87	–	extern char yytext[];
72		extern int yyparse(); /* defined in y.tab.c */
73
90	–	struct conf_parser_context conf_parser_ctx = { 0, 0, NULL };
91	–
74		/* internally defined functions */
75	<	static void lookup_confhost(struct ConfItem *);
94	<	static void set_default_conf(void);
95	<	static void validate_conf(void);
96	<	static void read_conf(FBFILE *);
75	>	static void read_conf(FILE *);
76		static void clear_out_old_conf(void);
98	–	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 *);
103	<	static int attach_iline(struct Client *, struct ConfItem *);
104	<	static struct ip_entry *find_or_add_ip(struct irc_ssaddr *);
105	<	static void parse_conf_file(int, int);
106	<	static dlink_list *map_to_list(ConfType);
107	<	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
110	–	/*
111	–	* bit_len
112	–	*/
113	–	static int cidr_limit_reached(int, struct irc_ssaddr *, struct ClassItem *);
114	–	static void remove_from_cidr_check(struct irc_ssaddr *, struct ClassItem *);
115	–	static void destroy_cidr_class(struct ClassItem *);
116	–
117	–	static void flags_to_ascii(unsigned int, const unsigned int[], char *, int);
118	–
119	–	/* address of default class conf */
120	–	static struct ConfItem *class_default;
121	–
122	–	/* usually, with hash tables, you use a prime number...
123	–	* but in this case I am dealing with ip addresses,
124	–	* not ascii strings.
125	–	*/
126	–	#define IP_HASH_SIZE 0x1000
127	–
128	–	struct ip_entry
129	–	{
130	–	struct irc_ssaddr ip;
131	–	int count;
132	–	time_t last_attempt;
133	–	struct ip_entry *next;
134	–	};
135	–
136	–	static struct ip_entry *ip_hash_table[IP_HASH_SIZE];
137	–	static BlockHeap *ip_entry_heap = NULL;
138	–	static int ip_entries_count = 0;
139	–
140	–
141	–	void *
142	–	map_to_conf(struct ConfItem *aconf)
143	–	{
144	–	void *conf;
145	–	conf = (void *)((uintptr_t)aconf +
146	–	(uintptr_t)sizeof(struct ConfItem));
147	–	return(conf);
148	–	}
149	–
150	–	struct ConfItem *
151	–	unmap_conf_item(void *aconf)
152	–	{
153	–	struct ConfItem *conf;
154	–
155	–	conf = (struct ConfItem *)((uintptr_t)aconf -
156	–	(uintptr_t)sizeof(struct ConfItem));
157	–	return(conf);
158	–	}
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 170 | 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->ipnum, addr, sizeof(aconf->ipnum));
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 187 | 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	<	*
201	<	* inputs       - type of item
202	<	* output       - pointer to new conf entry
203	<	* side effects - none
204	<	*/
205	<	struct ConfItem *
206	<	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;
210	<	struct ClassItem *aclass = NULL;
211	<	int status = 0;
212	<
213	<	switch (type)
214	<	{
215	<	case DLINE_TYPE:
216	<	case EXEMPTDLINE_TYPE:
217	<	case GLINE_TYPE:
218	<	case KLINE_TYPE:
219	<	case CLIENT_TYPE:
220	<	case OPER_TYPE:
221	<	case SERVER_TYPE:
222	<	conf = MyMalloc(sizeof(struct ConfItem) +
223	<	sizeof(struct AccessItem));
224	<	aconf = map_to_conf(conf);
225	<	aconf->aftype = AF_INET;
226	<
227	<	/* Yes, sigh. switch on type again */
228	<	switch (type)
229	<	{
230	<	case EXEMPTDLINE_TYPE:
231	<	status = CONF_EXEMPTDLINE;
232	<	break;
233	<
234	<	case DLINE_TYPE:
235	<	status = CONF_DLINE;
236	<	break;
237	<
238	<	case KLINE_TYPE:
239	<	status = CONF_KLINE;
240	<	break;
241	<
242	<	case GLINE_TYPE:
243	<	status = CONF_GLINE;
244	<	break;
245	<
246	<	case CLIENT_TYPE:
247	<	status = CONF_CLIENT;
248	<	break;
249	<
250	<	case OPER_TYPE:
251	<	status = CONF_OPERATOR;
252	<	dlinkAdd(conf, &conf->node, &oconf_items);
253	<	break;
254	<
255	<	case SERVER_TYPE:
256	<	status = CONF_SERVER;
257	<	dlinkAdd(conf, &conf->node, &server_items);
258	<	break;
259	<
260	<	default:
261	<	break;
262	<	}
263	<	aconf->status = status;
264	<	break;
265	<
266	<	case LEAF_TYPE:
267	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
268	<	sizeof(struct MatchItem));
269	<	dlinkAdd(conf, &conf->node, &leaf_items);
270	<	break;
271	<
272	<	case HUB_TYPE:
273	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
274	<	sizeof(struct MatchItem));
275	<	dlinkAdd(conf, &conf->node, &hub_items);
276	<	break;
126	>	struct MaskItem *conf = MyCalloc(sizeof(*conf));
127	>	dlink_list *list = NULL;
128
129	<	case ULINE_TYPE:
130	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
131	<	sizeof(struct MatchItem));
281	<	dlinkAdd(conf, &conf->node, &uconf_items);
282	<	break;
283	<
284	<	case GDENY_TYPE:
285	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
286	<	sizeof(struct AccessItem));
287	<	dlinkAdd(conf, &conf->node, &gdeny_items);
288	<	break;
289	<
290	<	case XLINE_TYPE:
291	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
292	<	sizeof(struct MatchItem));
293	<	dlinkAdd(conf, &conf->node, &xconf_items);
294	<	break;
295	<	#ifdef HAVE_LIBPCRE
296	<	case RXLINE_TYPE:
297	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
298	<	sizeof(struct MatchItem));
299	<	dlinkAdd(conf, &conf->node, &rxconf_items);
300	<	break;
301	<
302	<	case RKLINE_TYPE:
303	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
304	<	sizeof(struct AccessItem));
305	<	aconf = map_to_conf(conf);
306	<	aconf->status = CONF_KLINE;
307	<	dlinkAdd(conf, &conf->node, &rkconf_items);
308	<	break;
309	<	#endif
310	<	case CLUSTER_TYPE:
311	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem));
312	<	dlinkAdd(conf, &conf->node, &cluster_items);
313	<	break;
314	<
315	<	case CRESV_TYPE:
316	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
317	<	sizeof(struct ResvChannel));
318	<	break;
319	<
320	<	case NRESV_TYPE:
321	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
322	<	sizeof(struct MatchItem));
323	<	dlinkAdd(conf, &conf->node, &nresv_items);
324	<	break;
325	<
326	<	case SERVICE_TYPE:
327	<	status = CONF_SERVICE;
328	<	conf = MyMalloc(sizeof(struct ConfItem));
329	<	dlinkAdd(conf, &conf->node, &service_items);
330	<	break;
331	<
332	<	case CLASS_TYPE:
333	<	conf = MyMalloc(sizeof(struct ConfItem) +
334	<	sizeof(struct ClassItem));
335	<	dlinkAdd(conf, &conf->node, &class_items);
336	<
337	<	aclass = map_to_conf(conf);
338	<	aclass->active = 1;
339	<	ConFreq(aclass) = DEFAULT_CONNECTFREQUENCY;
340	<	PingFreq(aclass) = DEFAULT_PINGFREQUENCY;
341	<	MaxTotal(aclass) = MAXIMUM_LINKS_DEFAULT;
342	<	MaxSendq(aclass) = DEFAULT_SENDQ;
343	<
344	<	break;
345	<
346	<	default:
347	<	conf = NULL;
348	<	break;
349	<	}
350	<
351	<	/* XXX Yes, this will core if default is hit. I want it to for now - db */
352	<	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;
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);
366	–	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));
383	<	if (aconf->spasswd != NULL)
384	<	memset(aconf->spasswd, 0, strlen(aconf->spasswd));
385	<	aconf->class_ptr = NULL;
386	<
387	<	MyFree(aconf->passwd);
388	<	MyFree(aconf->spasswd);
389	<	MyFree(aconf->reason);
390	<	MyFree(aconf->oper_reason);
391	<	MyFree(aconf->user);
392	<	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	<	if (aconf->rsa_public_key)
395	<	RSA_free(aconf->rsa_public_key);
396	<	MyFree(aconf->rsa_public_key_file);
397	<	#endif
398	<
399	<	/* Yes, sigh. switch on type again */
400	<	switch(type)
401	<	{
402	<	case EXEMPTDLINE_TYPE:
403	<	case DLINE_TYPE:
404	<	case GLINE_TYPE:
405	<	case KLINE_TYPE:
406	<	case CLIENT_TYPE:
407	<	MyFree(conf);
408	<	break;
166	>	MyFree(conf->cipher_list);
167
168	<	case OPER_TYPE:
169	<	aconf = map_to_conf(conf);
412	<	if (!IsConfIllegal(aconf))
413	<	dlinkDelete(&conf->node, &oconf_items);
414	<	MyFree(conf);
415	<	break;
416	<
417	<	case SERVER_TYPE:
418	<	aconf = map_to_conf(conf);
419	<	if (!IsConfIllegal(aconf))
420	<	dlinkDelete(&conf->node, &server_items);
421	<	MyFree(conf);
422	<	break;
423	<
424	<	default:
425	<	break;
426	<	}
427	<	break;
428	<
429	<	case HUB_TYPE:
430	<	match_item = map_to_conf(conf);
431	<	MyFree(match_item->user);
432	<	MyFree(match_item->host);
433	<	MyFree(match_item->reason);
434	<	MyFree(match_item->oper_reason);
435	<	/* If marked illegal, its already been pulled off of the hub_items list */
436	<	if (!match_item->illegal)
437	<	dlinkDelete(&conf->node, &hub_items);
438	<	MyFree(conf);
439	<	break;
440	<
441	<	case LEAF_TYPE:
442	<	match_item = map_to_conf(conf);
443	<	MyFree(match_item->user);
444	<	MyFree(match_item->host);
445	<	MyFree(match_item->reason);
446	<	MyFree(match_item->oper_reason);
447	<	/* If marked illegal, its already been pulled off of the leaf_items list */
448	<	if (!match_item->illegal)
449	<	dlinkDelete(&conf->node, &leaf_items);
450	<	MyFree(conf);
451	<	break;
452	<
453	<	case ULINE_TYPE:
454	<	match_item = map_to_conf(conf);
455	<	MyFree(match_item->user);
456	<	MyFree(match_item->host);
457	<	MyFree(match_item->reason);
458	<	MyFree(match_item->oper_reason);
459	<	dlinkDelete(&conf->node, &uconf_items);
460	<	MyFree(conf);
461	<	break;
462	<
463	<	case XLINE_TYPE:
464	<	match_item = map_to_conf(conf);
465	<	MyFree(match_item->user);
466	<	MyFree(match_item->host);
467	<	MyFree(match_item->reason);
468	<	MyFree(match_item->oper_reason);
469	<	dlinkDelete(&conf->node, &xconf_items);
470	<	MyFree(conf);
471	<	break;
472	<	#ifdef HAVE_LIBPCRE
473	<	case RKLINE_TYPE:
474	<	aconf = map_to_conf(conf);
475	<	MyFree(aconf->regexuser);
476	<	MyFree(aconf->regexhost);
477	<	MyFree(aconf->user);
478	<	MyFree(aconf->host);
479	<	MyFree(aconf->reason);
480	<	MyFree(aconf->oper_reason);
481	<	dlinkDelete(&conf->node, &rkconf_items);
482	<	MyFree(conf);
483	<	break;
484	<
485	<	case RXLINE_TYPE:
486	<	MyFree(conf->regexpname);
487	<	match_item = map_to_conf(conf);
488	<	MyFree(match_item->user);
489	<	MyFree(match_item->host);
490	<	MyFree(match_item->reason);
491	<	MyFree(match_item->oper_reason);
492	<	dlinkDelete(&conf->node, &rxconf_items);
493	<	MyFree(conf);
494	<	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);
501	<	MyFree(match_item->oper_reason);
502	<	dlinkDelete(&conf->node, &nresv_items);
503	<
504	<	if (conf->flags & CONF_FLAGS_TEMPORARY)
505	<	if ((m = dlinkFindDelete(&temporary_resv, conf)) != NULL)
506	<	free_dlink_node(m);
507	<
508	<	MyFree(conf);
509	<	break;
510	<
511	<	case GDENY_TYPE:
512	<	aconf = map_to_conf(conf);
513	<	MyFree(aconf->user);
514	<	MyFree(aconf->host);
515	<	dlinkDelete(&conf->node, &gdeny_items);
516	<	MyFree(conf);
517	<	break;
518	<
519	<	case CLUSTER_TYPE:
520	<	dlinkDelete(&conf->node, &cluster_items);
521	<	MyFree(conf);
522	<	break;
523	<
524	<	case CRESV_TYPE:
525	<	if (conf->flags & CONF_FLAGS_TEMPORARY)
526	<	if ((m = dlinkFindDelete(&temporary_resv, conf)) != NULL)
527	<	free_dlink_node(m);
528	<
529	<	MyFree(conf);
530	<	break;
531	<
532	<	case CLASS_TYPE:
533	<	dlinkDelete(&conf->node, &class_items);
534	<	MyFree(conf);
535	<	break;
536	<
537	<	case SERVICE_TYPE:
538	<	dlinkDelete(&conf->node, &service_items);
539	<	MyFree(conf);
540	<	break;
541	<
542	<	default:
543	<	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		}
545	–	}
546	–
547	–	/* free_access_item()
548	–	*
549	–	* inputs       - pointer to conf to free
550	–	* output       - none
551	–	* side effects - crucial password fields are zeroed, conf is freed
552	–	*/
553	–	void
554	–	free_access_item(struct AccessItem *aconf)
555	–	{
556	–	struct ConfItem *conf;
557	–
558	–	if (aconf == NULL)
559	–	return;
560	–	conf = unmap_conf_item(aconf);
561	–	delete_conf_item(conf);
562	–	}
563	–
564	–	static const unsigned int shared_bit_table[] =
565	–	{ 'K', 'k', 'U', 'X', 'x', 'Y', 'Q', 'q', 'R', 'L', 0};
566	–
567	–	/* report_confitem_types()
568	–	*
569	–	* inputs       - pointer to client requesting confitem report
570	–	*              - ConfType to report
571	–	* output       - none
572	–	* side effects -
573	–	*/
574	–	void
575	–	report_confitem_types(struct Client *source_p, ConfType type, int temp)
576	–	{
577	–	dlink_node *ptr = NULL;
578	–	struct ConfItem *conf = NULL;
579	–	struct AccessItem *aconf = NULL;
580	–	struct MatchItem *matchitem = NULL;
581	–	struct ClassItem *classitem = NULL;
582	–	char buf[12];
583	–	char *p = NULL;
584	–	const char *pfx = NULL;
177
178	<	switch (type)
178	>	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->leaf_list.head)
179		{
180	<	case GDENY_TYPE:
181	<	DLINK_FOREACH(ptr, gdeny_items.head)
182	<	{
183	<	conf = ptr->data;
592	<	aconf = map_to_conf(conf);
593	<
594	<	p = buf;
595	<
596	<	if (aconf->flags & GDENY_BLOCK)
597	<	*p++ = 'B';
598	<	else
599	<	*p++ = 'b';
600	<
601	<	if (aconf->flags & GDENY_REJECT)
602	<	*p++ = 'R';
603	<	else
604	<	*p++ = 'r';
605	<
606	<	*p = '\0';
607	<
608	<	sendto_one(source_p, ":%s %d %s V %s@%s %s %s",
609	<	me.name, RPL_STATSDEBUG, source_p->name,
610	<	aconf->user, aconf->host, conf->name, buf);
611	<	}
612	<	break;
613	<
614	<	case XLINE_TYPE:
615	<	DLINK_FOREACH(ptr, xconf_items.head)
616	<	{
617	<	conf = ptr->data;
618	<	matchitem = map_to_conf(conf);
619	<
620	<	sendto_one(source_p, form_str(RPL_STATSXLINE),
621	<	me.name, source_p->name,
622	<	matchitem->hold ? "x": "X", matchitem->count,
623	<	conf->name, matchitem->reason);
624	<	}
625	<	break;
626	<
627	<	#ifdef HAVE_LIBPCRE
628	<	case RXLINE_TYPE:
629	<	DLINK_FOREACH(ptr, rxconf_items.head)
630	<	{
631	<	conf = ptr->data;
632	<	matchitem = map_to_conf(conf);
633	<
634	<	sendto_one(source_p, form_str(RPL_STATSXLINE),
635	<	me.name, source_p->name,
636	<	matchitem->hold ? "xR": "XR", matchitem->count,
637	<	conf->name, matchitem->reason);
638	<	}
639	<	break;
640	<
641	<	case RKLINE_TYPE:
642	<	pfx = temp ? "kR" : "KR";
643	<
644	<	DLINK_FOREACH(ptr, rkconf_items.head)
645	<	{
646	<	aconf = map_to_conf((conf = ptr->data));
647	<
648	<	if (temp && !(conf->flags & CONF_FLAGS_TEMPORARY))
649	<	continue;
650	<
651	<	sendto_one(source_p, form_str(RPL_STATSKLINE), me.name,
652	<	source_p->name, pfx, aconf->host, aconf->user,
653	<	aconf->reason, aconf->oper_reason ? aconf->oper_reason : "");
654	<	}
655	<	break;
656	<	#endif
657	<
658	<	case ULINE_TYPE:
659	<	DLINK_FOREACH(ptr, uconf_items.head)
660	<	{
661	<	conf = ptr->data;
662	<	matchitem = map_to_conf(conf);
663	<
664	<	p = buf;
665	<
666	<	/* some of these are redundant for the sake of
667	<	* consistency with cluster{} flags
668	<	*/
669	<	*p++ = 'c';
670	<	flags_to_ascii(matchitem->action, shared_bit_table, p, 0);
671	<
672	<	sendto_one(source_p, form_str(RPL_STATSULINE),
673	<	me.name, source_p->name, conf->name,
674	<	matchitem->user?matchitem->user: "*",
675	<	matchitem->host?matchitem->host: "*", buf);
676	<	}
677	<
678	<	DLINK_FOREACH(ptr, cluster_items.head)
679	<	{
680	<	conf = ptr->data;
681	<
682	<	p = buf;
683	<
684	<	*p++ = 'C';
685	<	flags_to_ascii(conf->flags, shared_bit_table, p, 0);
686	<
687	<	sendto_one(source_p, form_str(RPL_STATSULINE),
688	<	me.name, source_p->name, conf->name,
689	<	"*", "*", buf);
690	<	}
691	<
692	<	break;
693	<
694	<	case OPER_TYPE:
695	<	DLINK_FOREACH(ptr, oconf_items.head)
696	<	{
697	<	conf = ptr->data;
698	<	aconf = map_to_conf(conf);
699	<
700	<	/* Don't allow non opers to see oper privs */
701	<	if (HasUMode(source_p, UMODE_OPER))
702	<	sendto_one(source_p, form_str(RPL_STATSOLINE),
703	<	me.name, source_p->name, 'O', aconf->user, aconf->host,
704	<	conf->name, oper_privs_as_string(aconf->port),
705	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
706	<	else
707	<	sendto_one(source_p, form_str(RPL_STATSOLINE),
708	<	me.name, source_p->name, 'O', aconf->user, aconf->host,
709	<	conf->name, "0",
710	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
711	<	}
712	<	break;
713	<
714	<	case CLASS_TYPE:
715	<	DLINK_FOREACH(ptr, class_items.head)
716	<	{
717	<	conf = ptr->data;
718	<	classitem = map_to_conf(conf);
719	<	sendto_one(source_p, form_str(RPL_STATSYLINE),
720	<	me.name, source_p->name, 'Y',
721	<	conf->name, PingFreq(classitem),
722	<	ConFreq(classitem),
723	<	MaxTotal(classitem), MaxSendq(classitem),
724	<	CurrUserCount(classitem),
725	<	classitem->active ? "active" : "disabled");
726	<	}
727	<	break;
728	<
729	<	case CONF_TYPE:
730	<	case CLIENT_TYPE:
731	<	break;
732	<
733	<	case SERVICE_TYPE:
734	<	DLINK_FOREACH(ptr, service_items.head)
735	<	{
736	<	conf = ptr->data;
737	<	sendto_one(source_p, form_str(RPL_STATSSERVICE),
738	<	me.name, source_p->name, 'S', "*", conf->name, 0, 0);
739	<	}
740	<	break;
741	<
742	<	case SERVER_TYPE:
743	<	DLINK_FOREACH(ptr, server_items.head)
744	<	{
745	<	p = buf;
746	<
747	<	conf = ptr->data;
748	<	aconf = map_to_conf(conf);
749	<
750	<	buf[0] = '\0';
751	<
752	<	if (IsConfAllowAutoConn(aconf))
753	<	*p++ = 'A';
754	<	if (IsConfCryptLink(aconf))
755	<	*p++ = 'C';
756	<	if (IsConfTopicBurst(aconf))
757	<	*p++ = 'T';
758	<	if (IsConfCompressed(aconf))
759	<	*p++ = 'Z';
760	<	if (buf[0] == '\0')
761	<	*p++ = '*';
762	<
763	<	*p = '\0';
764	<
765	<	/*
766	<	* Allow admins to see actual ips unless hide_server_ips is enabled
767	<	*/
768	<	if (!ConfigServerHide.hide_server_ips && HasUMode(source_p, UMODE_ADMIN))
769	<	sendto_one(source_p, form_str(RPL_STATSCLINE),
770	<	me.name, source_p->name, 'C', aconf->host,
771	<	buf, conf->name, aconf->port,
772	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
773	<	else
774	<	sendto_one(source_p, form_str(RPL_STATSCLINE),
775	<	me.name, source_p->name, 'C',
776	<	"*@127.0.0.1", buf, conf->name, aconf->port,
777	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
778	<	}
779	<	break;
780	<
781	<	case HUB_TYPE:
782	<	DLINK_FOREACH(ptr, hub_items.head)
783	<	{
784	<	conf = ptr->data;
785	<	matchitem = map_to_conf(conf);
786	<	sendto_one(source_p, form_str(RPL_STATSHLINE), me.name,
787	<	source_p->name, 'H', matchitem->host, conf->name, 0, "*");
788	<	}
789	<	break;
180	>	MyFree(ptr->data);
181	>	dlinkDelete(ptr, &conf->leaf_list);
182	>	free_dlink_node(ptr);
183	>	}
184
185	<	case LEAF_TYPE:
186	<	DLINK_FOREACH(ptr, leaf_items.head)
187	<	{
794	<	conf = ptr->data;
795	<	matchitem = map_to_conf(conf);
796	<	sendto_one(source_p, form_str(RPL_STATSLLINE), me.name,
797	<	source_p->name, 'L', matchitem->host, conf->name, 0, "*");
798	<	}
799	<	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:
806	<	case NRESV_TYPE:
807	<	case CLUSTER_TYPE:
808	<	default:
809	<	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 823 | 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		{
829	–	struct Client *source_p = va_arg(args, struct Client *);
830	–	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)))
835	<	ilog(L_INFO, "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)
222		{
223		case TOO_MANY:
224	<	sendto_realops_flags(UMODE_FULL, L_ALL,
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);
228	<	ilog(L_INFO,"Too many connections on IP from %s.",
229	<	get_client_name(source_p, SHOW_IP));
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));
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,
236	<	"I-line is full for %s (%s).",
237	<	get_client_name(source_p, SHOW_IP),
238	<	source_p->sockhost);
239	<	ilog(L_INFO,"Too many connections from %s.",
240	<	get_client_name(source_p, SHOW_IP));
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);
239	>	ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
240	>	get_client_name(source_p, SHOW_IP));
241		++ServerStats.is_ref;
242	<	exit_client(source_p, &me,
860	<	"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:
246		++ServerStats.is_ref;
247		/* jdc - lists server name & port connections are on */
248		/*       a purely cosmetical change */
249	<	sendto_realops_flags(UMODE_UNAUTH, L_ALL,
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(L_INFO,
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	<	/* XXX It is prolematical whether it is better to use the
880	<	* capture reject code here or rely on the connecting too fast code.
881	<	* - Dianora
882	<	*/
883	<	if (REJECT_HOLD_TIME > 0)
884	<	{
885	<	sendto_one(source_p, ":%s NOTICE %s :You are not authorized to use this server",
886	<	me.name, source_p->name);
887	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
888	<	SetCaptured(source_p);
889	<	}
890	<	else
891	<	exit_client(source_p, &me, "You are not authorized to use this server");
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);
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);
260	>
261	>	exit_client(source_p, "You are not authorized to use this server");
262		break;
263
264		case BANNED_CLIENT:
265	<	/*
896	<	* Don't exit them immediately, play with them a bit.
897	<	* - Dianora
898	<	*/
899	<	if (REJECT_HOLD_TIME > 0)
900	<	{
901	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
902	<	SetCaptured(source_p);
903	<	}
904	<	else
905	<	exit_client(source_p, &me, "Banned");
265	>	exit_client(source_p, "Banned");
266		++ServerStats.is_ref;
267		break;
268
#	Line 911 | 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
920	–	*              - 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;
929	<	char non_ident[USERLEN + 1] = { '~', '\0' };
930	<	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;
949	<	uhi[1] = client_p->host;
950	<	uhi[2] = client_p->sockhost;
951	<
952	<	rkconf = find_regexp_kline(uhi);
953	<
954	<	if (aconf != NULL)
305	>	if (conf)
306		{
307	<	if (IsConfClient(aconf) && !rkconf)
307	>	if (IsConfClient(conf))
308		{
309	<	conf = unmap_conf_item(aconf);
959	<
960	<	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);
966	<	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);
324	<
325	<	if (!ConfigFileEntry.hide_spoof_ips && IsConfSpoofNotice(aconf))
978	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "%s spoofing: %s as %s",
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,
992	<	client_p->name);
993	<	if (ConfigFileEntry.kline_with_reason)
994	<	sendto_one(client_p, ":%s NOTICE %s :*** Banned %s",
995	<	me.name, client_p->name, aconf->reason);
996	<	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 1008 | 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;
1014	<	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
1023	–	aconf = map_to_conf(conf);
1024	–	if (aconf->class_ptr == NULL)
1025	–	return NOT_AUTHORIZED;  /* If class is missing, this is best */
1026	–
1027	–	aclass = map_to_conf(aconf->class_ptr);
1028	–
364		count_user_host(client_p->username, client_p->host,
365		&global, &local, &ident);
366
#	Line 1033 | Line 368 | attach_iline(struct Client *client_p, st
368		* setting a_limit_reached if any limit is reached.
369		* - Dianora
370		*/
371	<	if (MaxTotal(aclass) != 0 && CurrUserCount(aclass) >= MaxTotal(aclass))
371	>	if (class->max_total && class->ref_count >= class->max_total)
372		a_limit_reached = 1;
373	<	else if (MaxPerIp(aclass) != 0 && ip_found->count > MaxPerIp(aclass))
373	>	else if (class->max_perip && ip_found->count > class->max_perip)
374		a_limit_reached = 1;
375	<	else if (MaxLocal(aclass) != 0 && local >= MaxLocal(aclass))
375	>	else if (class->max_local && local >= class->max_local)
376		a_limit_reached = 1;
377	<	else if (MaxGlobal(aclass) != 0 && global >= MaxGlobal(aclass))
377	>	else if (class->max_global && global >= class->max_global)
378		a_limit_reached = 1;
379	<	else if (MaxIdent(aclass) != 0 && ident >= MaxIdent(aclass) &&
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, "
1055	<	"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
1061	–	/* init_ip_hash_table()
1062	–	*
1063	–	* inputs               - NONE
1064	–	* output               - NONE
1065	–	* side effects         - allocate memory for ip_entry(s)
1066	–	*                      - clear the ip hash table
1067	–	*/
1068	–	void
1069	–	init_ip_hash_table(void)
1070	–	{
1071	–	ip_entry_heap = BlockHeapCreate("ip", sizeof(struct ip_entry),
1072	–	2 * hard_fdlimit);
1073	–	memset(ip_hash_table, 0, sizeof(ip_hash_table));
1074	–	}
1075	–
1076	–	/* find_or_add_ip()
1077	–	*
1078	–	* inputs       - pointer to struct irc_ssaddr
1079	–	* output       - pointer to a struct ip_entry
1080	–	* side effects -
1081	–	*
1082	–	* If the ip # was not found, a new struct ip_entry is created, and the ip
1083	–	* count set to 0.
1084	–	*/
1085	–	static struct ip_entry *
1086	–	find_or_add_ip(struct irc_ssaddr *ip_in)
1087	–	{
1088	–	struct ip_entry *ptr, *newptr;
1089	–	int hash_index = hash_ip(ip_in), res;
1090	–	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
1091	–	#ifdef IPV6
1092	–	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
1093	–	#endif
1094	–
1095	–	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
1096	–	{
1097	–	#ifdef IPV6
1098	–	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
1099	–	continue;
1100	–	if (ip_in->ss.ss_family == AF_INET6)
1101	–	{
1102	–	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
1103	–	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
1104	–	}
1105	–	else
1106	–	#endif
1107	–	{
1108	–	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
1109	–	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
1110	–	}
1111	–	if (res == 0)
1112	–	{
1113	–	/* Found entry already in hash, return it. */
1114	–	return ptr;
1115	–	}
1116	–	}
1117	–
1118	–	if (ip_entries_count >= 2 * hard_fdlimit)
1119	–	garbage_collect_ip_entries();
1120	–
1121	–	newptr = BlockHeapAlloc(ip_entry_heap);
1122	–	ip_entries_count++;
1123	–	memcpy(&newptr->ip, ip_in, sizeof(struct irc_ssaddr));
1124	–
1125	–	newptr->next = ip_hash_table[hash_index];
1126	–	ip_hash_table[hash_index] = newptr;
1127	–
1128	–	return newptr;
1129	–	}
1130	–
1131	–	/* remove_one_ip()
1132	–	*
1133	–	* inputs        - unsigned long IP address value
1134	–	* output        - NONE
1135	–	* side effects  - The ip address given, is looked up in ip hash table
1136	–	*                 and number of ip#'s for that ip decremented.
1137	–	*                 If ip # count reaches 0 and has expired,
1138	–	*                 the struct ip_entry is returned to the ip_entry_heap
1139	–	*/
1140	–	void
1141	–	remove_one_ip(struct irc_ssaddr *ip_in)
1142	–	{
1143	–	struct ip_entry *ptr;
1144	–	struct ip_entry *last_ptr = NULL;
1145	–	int hash_index = hash_ip(ip_in), res;
1146	–	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
1147	–	#ifdef IPV6
1148	–	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
1149	–	#endif
1150	–
1151	–	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
1152	–	{
1153	–	#ifdef IPV6
1154	–	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
1155	–	continue;
1156	–	if (ip_in->ss.ss_family == AF_INET6)
1157	–	{
1158	–	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
1159	–	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
1160	–	}
1161	–	else
1162	–	#endif
1163	–	{
1164	–	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
1165	–	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
1166	–	}
1167	–	if (res)
1168	–	continue;
1169	–	if (ptr->count > 0)
1170	–	ptr->count--;
1171	–	if (ptr->count == 0 &&
1172	–	(CurrentTime-ptr->last_attempt) >= ConfigFileEntry.throttle_time)
1173	–	{
1174	–	if (last_ptr != NULL)
1175	–	last_ptr->next = ptr->next;
1176	–	else
1177	–	ip_hash_table[hash_index] = ptr->next;
1178	–
1179	–	BlockHeapFree(ip_entry_heap, ptr);
1180	–	ip_entries_count--;
1181	–	return;
1182	–	}
1183	–	last_ptr = ptr;
1184	–	}
1185	–	}
1186	–
1187	–	/* hash_ip()
1188	–	*
1189	–	* input        - pointer to an irc_inaddr
1190	–	* output       - integer value used as index into hash table
1191	–	* side effects - hopefully, none
1192	–	*/
1193	–	static int
1194	–	hash_ip(struct irc_ssaddr *addr)
1195	–	{
1196	–	if (addr->ss.ss_family == AF_INET)
1197	–	{
1198	–	struct sockaddr_in *v4 = (struct sockaddr_in *)addr;
1199	–	int hash;
1200	–	uint32_t ip;
1201	–
1202	–	ip   = ntohl(v4->sin_addr.s_addr);
1203	–	hash = ((ip >> 12) + ip) & (IP_HASH_SIZE-1);
1204	–	return hash;
1205	–	}
1206	–	#ifdef IPV6
1207	–	else
1208	–	{
1209	–	int hash;
1210	–	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)addr;
1211	–	uint32_t *ip = (uint32_t *)&v6->sin6_addr.s6_addr;
1212	–
1213	–	hash  = ip[0] ^ ip[3];
1214	–	hash ^= hash >> 16;
1215	–	hash ^= hash >> 8;
1216	–	hash  = hash & (IP_HASH_SIZE - 1);
1217	–	return hash;
1218	–	}
1219	–	#else
1220	–	return 0;
1221	–	#endif
1222	–	}
1223	–
1224	–	/* count_ip_hash()
1225	–	*
1226	–	* inputs        - pointer to counter of number of ips hashed
1227	–	*               - pointer to memory used for ip hash
1228	–	* output        - returned via pointers input
1229	–	* side effects  - NONE
1230	–	*
1231	–	* number of hashed ip #'s is counted up, plus the amount of memory
1232	–	* used in the hash.
1233	–	*/
1234	–	void
1235	–	count_ip_hash(unsigned int *number_ips_stored, uint64_t *mem_ips_stored)
1236	–	{
1237	–	struct ip_entry *ptr;
1238	–	int i;
1239	–
1240	–	*number_ips_stored = 0;
1241	–	*mem_ips_stored    = 0;
1242	–
1243	–	for (i = 0; i < IP_HASH_SIZE; i++)
1244	–	{
1245	–	for (ptr = ip_hash_table[i]; ptr; ptr = ptr->next)
1246	–	{
1247	–	*number_ips_stored += 1;
1248	–	*mem_ips_stored += sizeof(struct ip_entry);
1249	–	}
1250	–	}
1251	–	}
1252	–
1253	–	/* garbage_collect_ip_entries()
1254	–	*
1255	–	* input        - NONE
1256	–	* output       - NONE
1257	–	* side effects - free up all ip entries with no connections
1258	–	*/
1259	–	static void
1260	–	garbage_collect_ip_entries(void)
1261	–	{
1262	–	struct ip_entry *ptr;
1263	–	struct ip_entry *last_ptr;
1264	–	struct ip_entry *next_ptr;
1265	–	int i;
1266	–
1267	–	for (i = 0; i < IP_HASH_SIZE; i++)
1268	–	{
1269	–	last_ptr = NULL;
1270	–
1271	–	for (ptr = ip_hash_table[i]; ptr; ptr = next_ptr)
1272	–	{
1273	–	next_ptr = ptr->next;
1274	–
1275	–	if (ptr->count == 0 &&
1276	–	(CurrentTime - ptr->last_attempt) >= ConfigFileEntry.throttle_time)
1277	–	{
1278	–	if (last_ptr != NULL)
1279	–	last_ptr->next = ptr->next;
1280	–	else
1281	–	ip_hash_table[i] = ptr->next;
1282	–	BlockHeapFree(ip_entry_heap, ptr);
1283	–	ip_entries_count--;
1284	–	}
1285	–	else
1286	–	last_ptr = ptr;
1287	–	}
1288	–	}
1289	–	}
1290	–
395		/* detach_conf()
396		*
397		* inputs       - pointer to client to detach
#	Line 1296 | 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;
1303	<	struct ConfItem *conf;
1304	<	struct ClassItem *aclass;
1305	<	struct AccessItem *aconf;
1306	<	struct ConfItem *aclass_conf;
1307	<	struct MatchItem *match_item;
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;
1312	<
1313	<	if (type == CONF_TYPE || conf->type == type)
1314	<	{
1315	<	dlinkDelete(ptr, &client_p->localClient->confs);
1316	<	free_dlink_node(ptr);
1317	<
1318	<	switch (conf->type)
1319	<	{
1320	<	case CLIENT_TYPE:
1321	<	case OPER_TYPE:
1322	<	case SERVER_TYPE:
1323	<	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 = ClassPtr(aconf)) != NULL)
417	<	{
1329	<	aclass = map_to_conf(aclass_conf);
1330	<
1331	<	assert(aclass->curr_user_count > 0);
1332	<
1333	<	if (conf->type == CLIENT_TYPE)
1334	<	remove_from_cidr_check(&client_p->localClient->ip, aclass);
1335	<	if (--aclass->curr_user_count == 0 && aclass->active == 0)
1336	<	delete_conf_item(aclass_conf);
1337	<	}
1338	<
1339	<	if (--aconf->clients == 0 && IsConfIllegal(aconf))
1340	<	delete_conf_item(conf);
416	>	if (!(conf->type & type))
417	>	continue;
418
419	<	break;
419	>	dlinkDelete(ptr, &client_p->localClient->confs);
420	>	free_dlink_node(ptr);
421
422	<	case LEAF_TYPE:
423	<	case HUB_TYPE:
1346	<	match_item = map_to_conf(conf);
1347	<	if (match_item->ref_count == 0 && match_item->illegal)
1348	<	delete_conf_item(conf);
1349	<	break;
1350	<	default:
1351	<	break;
1352	<	}
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		}
1357	–	}
430
431	<	return -1;
431	>	if (--conf->ref_count == 0 && conf->active == 0)
432	>	conf_free(conf);
433	>	}
434		}
435
436		/* attach_conf()
#	Line 1370 | 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	<	if (dlinkFind(&client_p->localClient->confs, conf) != NULL)
449	>	if (dlinkFind(&client_p->localClient->confs, conf))
450		return 1;
451
452	<	if (conf->type == CLIENT_TYPE ||
453	<	conf->type == SERVER_TYPE ||
454	<	conf->type == OPER_TYPE)
455	<	{
1382	<	struct AccessItem *aconf = map_to_conf(conf);
1383	<	struct ClassItem *aclass = map_to_conf(aconf->class_ptr);
1384	<
1385	<	if (IsConfIllegal(aconf))
1386	<	return NOT_AUTHORIZED;
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	<	if (conf->type == CLIENT_TYPE)
458	<	if (cidr_limit_reached(IsConfExemptLimits(aconf),
1390	<	&client_p->localClient->ip, aclass))
1391	<	return TOO_MANY;    /* Already at maximum allowed */
1392	<
1393	<	CurrUserCount(aclass)++;
1394	<	aconf->clients++;
1395	<	}
1396	<	else if (conf->type == HUB_TYPE || conf->type == LEAF_TYPE)
1397	<	{
1398	<	struct MatchItem *match_item = map_to_conf(conf);
1399	<	match_item->ref_count++;
1400	<	}
457	>	conf->class->ref_count++;
458	>	conf->ref_count++;
459
460		dlinkAdd(conf, make_dlink_node(), &client_p->localClient->confs);
461
#	Line 1417 | Line 475 | attach_connect_block(struct Client *clie
475		const char *host)
476		{
477		dlink_node *ptr;
478	<	struct ConfItem *conf;
1421	<	struct AccessItem *aconf;
478	>	struct MaskItem *conf = NULL;
479
480		assert(client_p != NULL);
481		assert(host != NULL);
#	Line 1429 | Line 486 | attach_connect_block(struct Client *clie
486		DLINK_FOREACH(ptr, server_items.head)
487		{
488		conf = ptr->data;
1432	–	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 1441 | Line 497 | attach_connect_block(struct Client *clie
497		return 0;
498		}
499
1444	–	/* find_conf_exact()
1445	–	*
1446	–	* inputs       - type of ConfItem
1447	–	*              - pointer to name to find
1448	–	*              - pointer to username to find
1449	–	*              - pointer to host to find
1450	–	* output       - NULL or pointer to conf found
1451	–	* side effects - find a conf entry which matches the hostname
1452	–	*                and has the same name.
1453	–	*/
1454	–	struct ConfItem *
1455	–	find_conf_exact(ConfType type, const char *name, const char *user,
1456	–	const char *host)
1457	–	{
1458	–	dlink_node *ptr;
1459	–	dlink_list *list_p;
1460	–	struct ConfItem *conf = NULL;
1461	–	struct AccessItem *aconf;
1462	–
1463	–	/* Only valid for OPER_TYPE and ...? */
1464	–	list_p = map_to_list(type);
1465	–
1466	–	DLINK_FOREACH(ptr, (*list_p).head)
1467	–	{
1468	–	conf = ptr->data;
1469	–
1470	–	if (conf->name == NULL)
1471	–	continue;
1472	–	aconf = map_to_conf(conf);
1473	–	if (aconf->host == NULL)
1474	–	continue;
1475	–	if (irccmp(conf->name, name) != 0)
1476	–	continue;
1477	–
1478	–	/*
1479	–	** Accept if the *real* hostname (usually sockethost)
1480	–	** socket host) matches *either* host or name field
1481	–	** of the configuration.
1482	–	*/
1483	–	if (!match(aconf->host, host) || !match(aconf->user, user))
1484	–	continue;
1485	–	if (type == OPER_TYPE)
1486	–	{
1487	–	struct ClassItem *aclass = map_to_conf(aconf->class_ptr);
1488	–
1489	–	if (aconf->clients >= MaxTotal(aclass))
1490	–	continue;
1491	–	}
1492	–
1493	–	return conf;
1494	–	}
1495	–
1496	–	return NULL;
1497	–	}
1498	–
500		/* find_conf_name()
501		*
502		* inputs       - pointer to conf link list to search
#	Line 1505 | 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 1533 | 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:
1541	<	return(&rxconf_items);
1542	<	break;
1543	<	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:
1556	<	return(&class_items);
1557	<	break;
1558	<	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;
1567	–	case CONF_TYPE:
1568	–	case GLINE_TYPE:
1569	–	case KLINE_TYPE:
1570	–	case DLINE_TYPE:
1571	–	case CRESV_TYPE:
564		default:
565		return NULL;
566		}
#	Line 1580 | 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;
1593	<	struct AccessItem *aconf=NULL;
1594	<	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
1600	<	case RXLINE_TYPE:
1601	<	DLINK_FOREACH(ptr, list_p->head)
1602	<	{
1603	<	conf = ptr->data;
1604	<	assert(conf->regexpname);
1605	<
1606	<	if (!ircd_pcre_exec(conf->regexpname, name))
1607	<	return conf;
1608	<	}
1609	<	break;
1610	<	#endif
1611	<	case SERVICE_TYPE:
589	>	case CONF_SERVICE:
590		DLINK_FOREACH(ptr, list_p->head)
591		{
592		conf = ptr->data;
#	Line 1620 | 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
1630	–	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;
1651	–	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 1669 | 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 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;
1682	<	struct MatchItem *match_item;
1683	<	dlink_list *list_p;
1684	<
1685	<	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;
690	<	aconf = (struct AccessItem *)map_to_conf(conf);
690	>
691		if (EmptyString(conf->name))
692	<	continue;
693	<
694	<	if (irccmp(conf->name, name) == 0)
692	>	continue;
693	>
694	>	if (!irccmp(conf->name, name))
695		{
696	<	if ((user == NULL && (host == NULL)))
697	<	return (conf);
698	<	if (EmptyString(aconf->user) || EmptyString(aconf->host))
699	<	return (conf);
700	<	if (match(aconf->user, user) && match(aconf->host, host))
701	<	return (conf);
696	>	if (!who)
697	>	return conf;
698	>	if (EmptyString(conf->user) || EmptyString(conf->host))
699	>	return NULL;
700	>	if (!match(conf->user, who->username))
701	>	{
702	>	switch (conf->htype)
703	>	{
704	>	case HM_HOST:
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, &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, &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:
724	>	assert(0);
725	>	}
726	>	}
727		}
728		}
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	<	{
1750	<	return (conf);
1751	<	}
748	>	return conf;
749		}
1753	–	break;
750
1755	–	case CLASS_TYPE:
1756	–	DLINK_FOREACH(ptr, list_p->head)
1757	–	{
1758	–	conf = ptr->data;
1759	–	if (EmptyString(conf->name))
1760	–	continue;
1761	–
1762	–	if (irccmp(conf->name, name) == 0)
1763	–	return (conf);
1764	–	}
751		break;
752
753		default:
754		break;
755		}
756	<	return(NULL);
756	>
757	>	return NULL;
758		}
759
760		/* rehash()
#	Line 1779 | Line 766 | find_exact_name_conf(ConfType type, cons
766		int
767		rehash(int sig)
768		{
769	<	if (sig != 0)
770	<	sendto_realops_flags(UMODE_ALL, L_ALL,
771	<	"Got signal SIGHUP, reloading ircd.conf file");
769	>	if (sig)
770	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
771	>	"Got signal SIGHUP, reloading configuration file(s)");
772
773		restart_resolver();
774
#	Line 1792 | 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();
1801	<
1802	<	rehashed_klines = 1;
1803	<
1804	<	if (ConfigLoggingEntry.use_logging)
1805	<	reopen_log(logFileName);
1806	<
1807	<	return(0);
788	>	return 0;
789		}
790
791		/* set_default_conf()
#	Line 1822 | 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;
833	<
834	<	set_log_level(L_NOTICE);
835	<	ConfigLoggingEntry.use_logging = 1;
836	<	ConfigLoggingEntry.operlog[0] = '\0';
1855	<	ConfigLoggingEntry.userlog[0] = '\0';
1856	<	ConfigLoggingEntry.klinelog[0] = '\0';
1857	<	ConfigLoggingEntry.glinelog[0] = '\0';
1858	<	ConfigLoggingEntry.killlog[0] = '\0';
1859	<	ConfigLoggingEntry.operspylog[0] = '\0';
1860	<	ConfigLoggingEntry.ioerrlog[0] = '\0';
1861	<	ConfigLoggingEntry.failed_operlog[0] = '\0';
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_del_all();
835	>
836	>	ConfigLog.use_logging = 1;
837
838		ConfigChannel.disable_fake_channels = 0;
839	<	ConfigChannel.restrict_channels = 0;
840	<	ConfigChannel.disable_local_channels = 0;
841	<	ConfigChannel.use_invex = 1;
842	<	ConfigChannel.use_except = 1;
1868	<	ConfigChannel.use_knock = 1;
1869	<	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 = 15;
1872	<	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;
848		ConfigChannel.no_join_on_split = 0;
849		ConfigChannel.no_create_on_split = 0;
1878	–	ConfigChannel.burst_topicwho = 1;
850
851		ConfigServerHide.flatten_links = 0;
852		ConfigServerHide.links_delay = 300;
853		ConfigServerHide.hidden = 0;
1883	–	ConfigServerHide.disable_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.gline_min_cidr = 16;
864	<	ConfigFileEntry.gline_min_cidr6 = 48;
865	<	ConfigFileEntry.invisible_on_connect = 1;
866	<	ConfigFileEntry.burst_away = 0;
867	<	ConfigFileEntry.use_whois_actually = 1;
868	<	ConfigFileEntry.tkline_expire_notices = 1;
869	<	ConfigFileEntry.hide_spoof_ips = 1;
870	<	ConfigFileEntry.ignore_bogus_ts = 0;
871	<	ConfigFileEntry.disable_auth = 0;
872	<	ConfigFileEntry.disable_remote = 0;
873	<	ConfigFileEntry.kill_chase_time_limit = 90;
874	<	ConfigFileEntry.default_floodcount = 8;
875	<	ConfigFileEntry.failed_oper_notice = 1;
876	<	ConfigFileEntry.dots_in_ident = 0;
877	<	ConfigFileEntry.min_nonwildcard = 4;
878	<	ConfigFileEntry.min_nonwildcard_simple = 3;
879	<	ConfigFileEntry.max_accept = 20;
880	<	ConfigFileEntry.anti_nick_flood = 0;
881	<	ConfigFileEntry.max_nick_time = 20;
882	<	ConfigFileEntry.max_nick_changes = 5;
883	<	ConfigFileEntry.anti_spam_exit_message_time = 0;
884	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
885	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
886	<	ConfigFileEntry.kline_with_reason = 1;
887	<	ConfigFileEntry.kline_reason = NULL;
888	<	ConfigFileEntry.warn_no_nline = 1;
889	<	ConfigFileEntry.stats_o_oper_only = 0;
890	<	ConfigFileEntry.stats_k_oper_only = 1;  /* masked */
891	<	ConfigFileEntry.stats_i_oper_only = 1;  /* masked */
892	<	ConfigFileEntry.stats_P_oper_only = 0;
893	<	ConfigFileEntry.caller_id_wait = 60;
894	<	ConfigFileEntry.opers_bypass_callerid = 0;
895	<	ConfigFileEntry.pace_wait = 10;
896	<	ConfigFileEntry.pace_wait_simple = 1;
897	<	ConfigFileEntry.short_motd = 0;
898	<	ConfigFileEntry.ping_cookie = 0;
899	<	ConfigFileEntry.no_oper_flood = 0;
900	<	ConfigFileEntry.true_no_oper_flood = 0;
901	<	ConfigFileEntry.oper_pass_resv = 1;
902	<	ConfigFileEntry.glines = 0;
903	<	ConfigFileEntry.gline_time = 12 * 3600;
904	<	ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
905	<	ConfigFileEntry.client_flood = CLIENT_FLOOD_DEFAULT;
906	<	ConfigFileEntry.oper_only_umodes = UMODE_DEBUG;
907	<	ConfigFileEntry.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE |
908	<	UMODE_OPERWALL | UMODE_WALLOP;
1937	<	DupString(ConfigFileEntry.servlink_path, SLPATH);
1938	<	#ifdef HAVE_LIBCRYPTO
1939	<	/* jdc -- This is our default value for a cipher.  According to the
1940	<	*        CRYPTLINK document (doc/cryptlink.txt), BF/128 must be supported
1941	<	*        under all circumstances if cryptlinks are enabled.  So,
1942	<	*        this will be our default.
1943	<	*
1944	<	*        NOTE: I apologise for the hard-coded value of "1" (BF/128).
1945	<	*              This should be moved into a find_cipher() routine.
1946	<	*/
1947	<	ConfigFileEntry.default_cipher_preference = &CipherTable[1];
1948	<	#endif
1949	<	ConfigFileEntry.use_egd = 0;
1950	<	ConfigFileEntry.egdpool_path = NULL;
1951	<	#ifdef HAVE_LIBZ
1952	<	ConfigFileEntry.compression_level = 0;
1953	<	#endif
1954	<	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	<	/* read_conf()
911	>	static void
912	>	validate_conf(void)
913	>	{
914	>	if (ConfigGeneral.ts_warn_delta < TS_WARN_DELTA_MIN)
915	>	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
916	>
917	>	if (ConfigGeneral.ts_max_delta < TS_MAX_DELTA_MIN)
918	>	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
919	>
920	>	if (ConfigServerInfo.network_name == NULL)
921	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
922	>
923	>	if (ConfigServerInfo.network_desc == NULL)
924	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
925	>
926	>	if (ConfigGeneral.service_name == NULL)
927	>	ConfigGeneral.service_name = xstrdup(SERVICE_NAME_DEFAULT);
928	>
929	>	ConfigGeneral.max_watch = IRCD_MAX(ConfigGeneral.max_watch, WATCHSIZE_MIN);
930	>	}
931	>
932	>	/* read_conf()
933		*
934		* inputs       - file descriptor pointing to config file to use
935		* output       - None
936		* side effects - Read configuration file.
937		*/
938		static void
939	<	read_conf(FBFILE *file)
939	>	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	<	fbrewind(file);
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 */
1979	<	}
1980	<
1981	<	static void
1982	<	validate_conf(void)
1983	<	{
1984	<	if (ConfigFileEntry.ts_warn_delta < TS_WARN_DELTA_MIN)
1985	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
1986	<
1987	<	if (ConfigFileEntry.ts_max_delta < TS_MAX_DELTA_MIN)
1988	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
1989	<
1990	<	if (ConfigFileEntry.servlink_path == NULL)
1991	<	DupString(ConfigFileEntry.servlink_path, SLPATH);
1992	<
1993	<	if (ServerInfo.network_name == NULL)
1994	<	DupString(ServerInfo.network_name,NETWORK_NAME_DEFAULT);
1995	<
1996	<	if (ServerInfo.network_desc == NULL)
1997	<	DupString(ServerInfo.network_desc,NETWORK_DESC_DEFAULT);
1998	<
1999	<	if (ConfigFileEntry.service_name == NULL)
2000	<	DupString(ConfigFileEntry.service_name, SERVICE_NAME_DEFAULT);
2001	<
2002	<	if ((ConfigFileEntry.client_flood < CLIENT_FLOOD_MIN) ||
2003	<	(ConfigFileEntry.client_flood > CLIENT_FLOOD_MAX))
2004	<	ConfigFileEntry.client_flood = CLIENT_FLOOD_MAX;
2005	<
2006	<	ConfigFileEntry.max_watch = IRCD_MAX(ConfigFileEntry.max_watch, WATCHSIZE_MIN);
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 2011 | Line 958 | validate_conf(void)
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		{
2017	–	struct AccessItem *aconf;
964		struct addrinfo hints, *res;
965
966	<	aconf = map_to_conf(conf);
967	<
2022	<	if (EmptyString(aconf->host) ||
2023	<	EmptyString(aconf->user))
2024	<	{
2025	<	ilog(L_ERROR, "Host/server name error: (%s) (%s)",
2026	<	aconf->host, conf->name);
2027	<	return;
2028	<	}
2029	<
2030	<	if (strchr(aconf->host, '*') ||
2031	<	strchr(aconf->host, '?'))
2032	<	return;
2033	<
2034	<	/* 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 2042 | 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
2053	–	memcpy(&aconf->ipnum, res->ai_addr, res->ai_addrlen);
2054	–	aconf->ipnum.ss_len = res->ai_addrlen;
2055	–	aconf->ipnum.ss.ss_family = res->ai_family;
990		freeaddrinfo(res);
991		}
992
#	Line 2066 | 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) <
2082	<	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
2092	–	static struct AccessItem *
2093	–	find_regexp_kline(const char *uhi[])
2094	–	{
2095	–	#ifdef HAVE_LIBPCRE
2096	–	const dlink_node *ptr = NULL;
2097	–
2098	–	DLINK_FOREACH(ptr, rkconf_items.head)
2099	–	{
2100	–	struct AccessItem *aptr = map_to_conf(ptr->data);
2101	–
2102	–	assert(aptr->regexuser);
2103	–	assert(aptr->regexhost);
2104	–
2105	–	if (!ircd_pcre_exec(aptr->regexuser, uhi[0]) &&
2106	–	(!ircd_pcre_exec(aptr->regexhost, uhi[1]) ||
2107	–	!ircd_pcre_exec(aptr->regexhost, uhi[2])))
2108	–	return aptr;
2109	–	}
2110	–	#endif
2111	–	return NULL;
2112	–	}
2113	–
2114	–	/* find_kill()
2115	–	*
2116	–	* inputs       - pointer to client structure
2117	–	* output       - pointer to struct AccessItem if found
2118	–	* side effects - See if this user is klined already,
2119	–	*                and if so, return struct AccessItem pointer
2120	–	*/
2121	–	struct AccessItem *
2122	–	find_kill(struct Client *client_p)
2123	–	{
2124	–	struct AccessItem *aconf = NULL;
2125	–	const char *uhi[3];
2126	–
2127	–	uhi[0] = client_p->username;
2128	–	uhi[1] = client_p->host;
2129	–	uhi[2] = client_p->sockhost;
2130	–
2131	–	assert(client_p != NULL);
2132	–
2133	–	aconf = find_kline_conf(client_p->host, client_p->username,
2134	–	&client_p->localClient->ip,
2135	–	client_p->localClient->aftype);
2136	–	if (aconf == NULL)
2137	–	aconf = find_regexp_kline(uhi);
2138	–
2139	–	if (aconf && (aconf->status & CONF_KLINE))
2140	–	return aconf;
2141	–
2142	–	return NULL;
2143	–	}
2144	–
2145	–	struct AccessItem *
2146	–	find_gline(struct Client *client_p)
2147	–	{
2148	–	struct AccessItem *aconf;
2149	–
2150	–	assert(client_p != NULL);
2151	–
2152	–	aconf = find_gline_conf(client_p->host, client_p->username,
2153	–	&client_p->localClient->ip,
2154	–	client_p->localClient->aftype);
2155	–
2156	–	if (aconf && (aconf->status & CONF_GLINE))
2157	–	return aconf;
2158	–
2159	–	return NULL;
2160	–	}
2161	–
2162	–	/* add_temp_line()
2163	–	*
2164	–	* inputs        - pointer to struct ConfItem
2165	–	* output        - none
2166	–	* Side effects  - links in given struct ConfItem into
2167	–	*                 temporary *line link list
2168	–	*/
2169	–	void
2170	–	add_temp_line(struct ConfItem *conf)
2171	–	{
2172	–	struct AccessItem *aconf;
2173	–
2174	–	if (conf->type == DLINE_TYPE)
2175	–	{
2176	–	aconf = map_to_conf(conf);
2177	–	SetConfTemporary(aconf);
2178	–	dlinkAdd(conf, &conf->node, &temporary_dlines);
2179	–	MyFree(aconf->user);
2180	–	aconf->user = NULL;
2181	–	add_conf_by_address(CONF_DLINE, aconf);
2182	–	}
2183	–	else if (conf->type == KLINE_TYPE)
2184	–	{
2185	–	aconf = map_to_conf(conf);
2186	–	SetConfTemporary(aconf);
2187	–	dlinkAdd(conf, &conf->node, &temporary_klines);
2188	–	add_conf_by_address(CONF_KILL, aconf);
2189	–	}
2190	–	else if (conf->type == GLINE_TYPE)
2191	–	{
2192	–	aconf = map_to_conf(conf);
2193	–	SetConfTemporary(aconf);
2194	–	dlinkAdd(conf, &conf->node, &temporary_glines);
2195	–	add_conf_by_address(CONF_GLINE, aconf);
2196	–	}
2197	–	else if (conf->type == XLINE_TYPE)
2198	–	{
2199	–	conf->flags |= CONF_FLAGS_TEMPORARY;
2200	–	dlinkAdd(conf, make_dlink_node(), &temporary_xlines);
2201	–	}
2202	–	else if (conf->type == RXLINE_TYPE)
2203	–	{
2204	–	conf->flags |= CONF_FLAGS_TEMPORARY;
2205	–	dlinkAdd(conf, make_dlink_node(), &temporary_rxlines);
2206	–	}
2207	–	else if (conf->type == RKLINE_TYPE)
2208	–	{
2209	–	conf->flags |= CONF_FLAGS_TEMPORARY;
2210	–	dlinkAdd(conf, make_dlink_node(), &temporary_rklines);
2211	–	}
2212	–	else if ((conf->type == NRESV_TYPE) || (conf->type == CRESV_TYPE))
2213	–	{
2214	–	conf->flags |= CONF_FLAGS_TEMPORARY;
2215	–	dlinkAdd(conf, make_dlink_node(), &temporary_resv);
2216	–	}
2217	–	}
2218	–
1029		/* cleanup_tklines()
1030		*
1031		* inputs       - NONE
#	Line 2226 | Line 1036 | add_temp_line(struct ConfItem *conf)
1036		void
1037		cleanup_tklines(void *notused)
1038		{
1039	<	expire_tklines(&temporary_glines);
1040	<	expire_tklines(&temporary_klines);
1041	<	expire_tklines(&temporary_dlines);
1042	<	expire_tklines(&temporary_xlines);
2233	<	expire_tklines(&temporary_rxlines);
2234	<	expire_tklines(&temporary_rklines);
2235	<	expire_tklines(&temporary_resv);
1039	>	hostmask_expire_temporary();
1040	>	expire_tklines(&xconf_items);
1041	>	expire_tklines(&nresv_items);
1042	>	expire_tklines(&cresv_items);
1043		}
1044
1045		/* expire_tklines()
#	Line 2244 | 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;
2249	<	struct ConfItem *conf;
2250	<	struct MatchItem *xconf;
2251	<	struct MatchItem *nconf;
2252	<	struct AccessItem *aconf;
2253	<	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;
2258	–	if (conf->type == GLINE_TYPE ||
2259	–	conf->type == KLINE_TYPE ||
2260	–	conf->type == DLINE_TYPE)
2261	–	{
2262	–	aconf = (struct AccessItem *)map_to_conf(conf);
2263	–	if (aconf->hold <= CurrentTime)
2264	–	{
2265	–	/* XXX - Do we want GLINE expiry notices?? */
2266	–	/* Alert opers that a TKline expired - Hwy */
2267	–	if (ConfigFileEntry.tkline_expire_notices)
2268	–	{
2269	–	if (aconf->status & CONF_KILL)
2270	–	{
2271	–	sendto_realops_flags(UMODE_ALL, L_ALL,
2272	–	"Temporary K-line for [%s@%s] expired",
2273	–	(aconf->user) ? aconf->user : "*",
2274	–	(aconf->host) ? aconf->host : "*");
2275	–	}
2276	–	else if (conf->type == DLINE_TYPE)
2277	–	{
2278	–	sendto_realops_flags(UMODE_ALL, L_ALL,
2279	–	"Temporary D-line for [%s] expired",
2280	–	(aconf->host) ? aconf->host : "*");
2281	–	}
2282	–	}
1060
1061	<	dlinkDelete(ptr, tklist);
1062	<	delete_one_address_conf(aconf->host, aconf);
1063	<	}
1064	<	}
2288	<	else if (conf->type == XLINE_TYPE ||
2289	<	conf->type == RXLINE_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 <= CurrentTime)
1068	<	{
1069	<	if (ConfigFileEntry.tkline_expire_notices)
2295	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2296	<	"Temporary X-line for [%s] %sexpired", conf->name,
2297	<	conf->type == RXLINE_TYPE ? "(REGEX) " : "");
2298	<	dlinkDelete(ptr, tklist);
2299	<	free_dlink_node(ptr);
2300	<	delete_conf_item(conf);
2301	<	}
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	>	conf_free(conf);
1070		}
1071	<	else if (conf->type == RKLINE_TYPE)
1071	>	else if (conf->type == CONF_NRESV || conf->type == CONF_CRESV)
1072		{
1073	<	aconf = map_to_conf(conf);
1074	<	if (aconf->hold <= CurrentTime)
2307	<	{
2308	<	if (ConfigFileEntry.tkline_expire_notices)
2309	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2310	<	"Temporary K-line for [%s@%s] (REGEX) expired",
2311	<	(aconf->user) ? aconf->user : "*",
2312	<	(aconf->host) ? aconf->host : "*");
2313	<	dlinkDelete(ptr, tklist);
2314	<	free_dlink_node(ptr);
2315	<	delete_conf_item(conf);
2316	<	}
2317	<	}
2318	<	else if (conf->type == NRESV_TYPE)
2319	<	{
2320	<	nconf = (struct MatchItem *)map_to_conf(conf);
2321	<	if (nconf->hold <= CurrentTime)
2322	<	{
2323	<	if (ConfigFileEntry.tkline_expire_notices)
2324	<	sendto_realops_flags(UMODE_ALL, L_ALL,
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	<	dlinkDelete(ptr, tklist);
2327	<	free_dlink_node(ptr);
2328	<	delete_conf_item(conf);
2329	<	}
2330	<	}
2331	<	else if (conf->type == CRESV_TYPE)
2332	<	{
2333	<	cconf = (struct ResvChannel *)map_to_conf(conf);
2334	<	if (cconf->hold <= CurrentTime)
2335	<	{
2336	<	if (ConfigFileEntry.tkline_expire_notices)
2337	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2338	<	"Temporary RESV for [%s] expired", cconf->name);
2339	<	delete_channel_resv(cconf);
2340	<	}
1076	>	conf_free(conf);
1077		}
1078		}
1079		}
#	Line 2350 | Line 1086 | expire_tklines(dlink_list *tklist)
1086		*/
1087		static const struct oper_privs
1088		{
1089	<	const unsigned int oprivs;
2354	<	const unsigned int hidden;
1089	>	const unsigned int flag;
1090		const unsigned char c;
1091		} flag_list[] = {
1092	<	{ OPER_FLAG_ADMIN,       OPER_FLAG_HIDDEN_ADMIN,  'A' },
1093	<	{ OPER_FLAG_REMOTEBAN,   0,                       'B' },
1094	<	{ OPER_FLAG_DIE,         0,                       'D' },
1095	<	{ OPER_FLAG_GLINE,       0,                       'G' },
1096	<	{ OPER_FLAG_REHASH,      0,                       'H' },
1097	<	{ OPER_FLAG_K,           0,                       'K' },
1098	<	{ OPER_FLAG_OPERWALL,    0,                       'L' },
1099	<	{ OPER_FLAG_N,           0,                       'N' },
1100	<	{ OPER_FLAG_GLOBAL_KILL, 0,                       'O' },
1101	<	{ OPER_FLAG_REMOTE,      0,                       'R' },
1102	<	{ OPER_FLAG_OPER_SPY,    0,                       'S' },
1103	<	{ OPER_FLAG_UNKLINE,     0,                       'U' },
1104	<	{ OPER_FLAG_X,           0,                       'X' },
1105	<	{ 0, 0, '\0' }
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;
2378	–	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	<	(port & flag_list[i].hidden) == 0)
2384	<	*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 2392 | 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.
1133		*/
1134	<	char *
1134	>	const char *
1135		get_oper_name(const struct Client *client_p)
1136		{
1137	<	dlink_node *cnode;
2404	<	struct ConfItem *conf;
2405	<	struct AccessItem *aconf;
2406	<
1137	>	const dlink_node *cnode = NULL;
1138		/* +5 for !,@,{,} and null */
1139		static char buffer[NICKLEN + USERLEN + HOSTLEN + HOSTLEN + 5];
1140
1141		if (MyConnect(client_p))
1142		{
1143	<	DLINK_FOREACH(cnode, client_p->localClient->confs.head)
1143	>	if ((cnode = client_p->localClient->confs.head))
1144		{
1145	<	conf = cnode->data;
2415	<	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 2442 | 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 = get_conf_name(CONF_TYPE);
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
1191	<	if ((conf_parser_ctx.conf_file = fbopen(filename, "r")) == NULL)
1191	>	if ((conf_parser_ctx.conf_file = fopen(filename, "r")) == NULL)
1192		{
1193		if (cold)
1194		{
1195	<	ilog(L_CRIT, "Unable to read configuration file '%s': %s",
1195	>	ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
1196		filename, strerror(errno));
1197		exit(-1);
1198		}
1199		else
1200		{
1201	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1202	<	"Unable to read configuration file '%s': %s",
1203	<	filename, strerror(errno));
1201	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1202	>	"Unable to read configuration file '%s': %s",
1203	>	filename, strerror(errno));
1204		return;
1205		}
1206		}
#	Line 2478 | Line 1209 | read_conf_files(int cold)
1209		clear_out_old_conf();
1210
1211		read_conf(conf_parser_ctx.conf_file);
1212	<	fbclose(conf_parser_ctx.conf_file);
1212	>	fclose(conf_parser_ctx.conf_file);
1213
1214	<	add_isupport("NETWORK", ServerInfo.network_name, -1);
2484	<	snprintf(chanmodes, sizeof(chanmodes), "b%s%s:%d",
2485	<	ConfigChannel.use_except ? "e" : "",
2486	<	ConfigChannel.use_invex ? "I" : "", ConfigChannel.max_bans);
2487	<	add_isupport("MAXLIST", chanmodes, -1);
2488	<	add_isupport("MAXTARGETS", NULL, ConfigFileEntry.max_targets);
1214	>	log_reopen_all();
1215
1216	<	if (ConfigChannel.disable_local_channels)
1217	<	add_isupport("CHANTYPES", "#", -1);
2492	<	else
2493	<	add_isupport("CHANTYPES", "#&", -1);
1216	>	add_isupport("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
1217	>	add_isupport("NETWORK", ConfigServerInfo.network_name, -1);
1218
1219	<	snprintf(chanlimit, sizeof(chanlimit), "%s:%d",
1220	<	ConfigChannel.disable_local_channels ? "#" : "#&",
1221	<	ConfigChannel.max_chans_per_user);
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_channels);
1226		add_isupport("CHANLIMIT", chanlimit, -1);
1227	<	snprintf(chanmodes, sizeof(chanmodes), "%s%s%s",
1228	<	ConfigChannel.use_except ? "e" : "",
1229	<	ConfigChannel.use_invex ? "I" : "", "b,k,l,imnprstORS");
2502	<	add_isupport("CHANNELLEN", NULL, LOCAL_CHANNELLEN);
2503	<
2504	<	if (ConfigChannel.use_except)
2505	<	add_isupport("EXCEPTS", "e", -1);
2506	<	if (ConfigChannel.use_invex)
2507	<	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 2512 | Line 1234 | read_conf_files(int cold)
1234		* on strlen(form_str(RPL_ISUPPORT))
1235		*/
1236		rebuild_isupport_message_line();
2515	–
2516	–	#ifdef HAVE_LIBPCRE
2517	–	parse_conf_file(RKLINE_TYPE, cold);
2518	–	parse_conf_file(RXLINE_TYPE, cold);
2519	–	#endif
2520	–	parse_conf_file(KLINE_TYPE, cold);
2521	–	parse_conf_file(DLINE_TYPE, cold);
2522	–	parse_conf_file(XLINE_TYPE, cold);
2523	–	parse_conf_file(NRESV_TYPE, cold);
2524	–	parse_conf_file(CRESV_TYPE, cold);
2525	–	}
2526	–
2527	–	/* parse_conf_file()
2528	–	*
2529	–	* inputs       - type of conf file to parse
2530	–	* output       - none
2531	–	* side effects - conf file for givenconf type is opened and read then parsed
2532	–	*/
2533	–	static void
2534	–	parse_conf_file(int type, int cold)
2535	–	{
2536	–	FBFILE *file = NULL;
2537	–	const char *filename = get_conf_name(type);
2538	–
2539	–	if ((file = fbopen(filename, "r")) == NULL)
2540	–	{
2541	–	if (cold)
2542	–	ilog(L_ERROR, "Unable to read configuration file '%s': %s",
2543	–	filename, strerror(errno));
2544	–	else
2545	–	sendto_realops_flags(UMODE_ALL, L_ALL,
2546	–	"Unable to read configuration file '%s': %s",
2547	–	filename, strerror(errno));
2548	–	}
2549	–	else
2550	–	{
2551	–	parse_csv_file(file, type);
2552	–	fbclose(file);
2553	–	}
1237		}
1238
1239		/* clear_out_old_conf()
#	Line 2563 | Line 1246 | static void
1246		clear_out_old_conf(void)
1247		{
1248		dlink_node *ptr = NULL, *next_ptr = NULL;
1249	<	struct ConfItem *conf;
2567	<	struct AccessItem *aconf;
2568	<	struct ClassItem *cltmp;
2569	<	struct MatchItem *match_item;
1249	>	struct MaskItem *conf;
1250		dlink_list *free_items [] = {
1251	<	&server_items,   &oconf_items,    &hub_items, &leaf_items,
1252	<	&uconf_items,   &xconf_items, &rxconf_items, &rkconf_items,
1253	<	&nresv_items, &cluster_items,  &gdeny_items, &service_items, NULL
1251	>	&server_items,   &oconf_items,
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 2578 | 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;
2587	–	/* XXX This is less than pretty */
2588	–	if (conf->type == SERVER_TYPE)
2589	–	{
2590	–	aconf = map_to_conf(conf);
1267
1268	<	if (aconf->clients != 0)
2593	<	{
2594	<	SetConfIllegal(aconf);
2595	<	dlinkDelete(&conf->node, &server_items);
2596	<	}
2597	<	else
2598	<	{
2599	<	delete_conf_item(conf);
2600	<	}
2601	<	}
2602	<	else if (conf->type == OPER_TYPE)
2603	<	{
2604	<	aconf = map_to_conf(conf);
1268	>	dlinkDelete(&conf->node, map_to_list(conf->type));
1269
1270	<	if (aconf->clients != 0)
1271	<	{
2608	<	SetConfIllegal(aconf);
2609	<	dlinkDelete(&conf->node, &oconf_items);
2610	<	}
2611	<	else
2612	<	{
2613	<	delete_conf_item(conf);
2614	<	}
2615	<	}
2616	<	else if (conf->type == CLIENT_TYPE)
1270	>	/* XXX This is less than pretty */
1271	>	if (conf->type == CONF_SERVER || conf->type == CONF_OPER)
1272		{
1273	<	aconf = map_to_conf(conf);
1274	<
2620	<	if (aconf->clients != 0)
2621	<	{
2622	<	SetConfIllegal(aconf);
2623	<	}
2624	<	else
2625	<	{
2626	<	delete_conf_item(conf);
2627	<	}
1273	>	if (!conf->ref_count)
1274	>	conf_free(conf);
1275		}
1276	<	else if (conf->type == XLINE_TYPE  ||
2630	<	conf->type == RXLINE_TYPE ||
2631	<	conf->type == RKLINE_TYPE)
1276	>	else if (conf->type == CONF_XLINE)
1277		{
1278	<	/* temporary (r)xlines are also on
1279	<	* the (r)xconf items list */
2635	<	if (conf->flags & CONF_FLAGS_TEMPORARY)
2636	<	continue;
2637	<
2638	<	delete_conf_item(conf);
1278	>	if (!conf->until)
1279	>	conf_free(conf);
1280		}
1281		else
1282	<	{
2642	<	if ((conf->type == LEAF_TYPE) || (conf->type == HUB_TYPE))
2643	<	{
2644	<	match_item = map_to_conf(conf);
2645	<	if (match_item->ref_count <= 0)
2646	<	delete_conf_item(conf);
2647	<	else
2648	<	{
2649	<	match_item->illegal = 1;
2650	<	dlinkDelete(&conf->node, *iterator);
2651	<	}
2652	<	}
2653	<	else
2654	<	delete_conf_item(conf);
2655	<	}
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)
2664	<	{
2665	<	cltmp = map_to_conf(ptr->data);
2666	<
2667	<	if (ptr != class_items.tail)  /* never mark the "default" class */
2668	<	cltmp->active = 0;
2669	<	}
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;
2683	<	MyFree(ConfigFileEntry.egdpool_path);
2684	<	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;
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();
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
2699	–	/* clean out AdminInfo */
2700	–	MyFree(AdminInfo.name);
2701	–	AdminInfo.name = NULL;
2702	–	MyFree(AdminInfo.email);
2703	–	AdminInfo.email = NULL;
2704	–	MyFree(AdminInfo.description);
2705	–	AdminInfo.description = NULL;
2706	–
2707	–	/* operator{} and class{} blocks are freed above */
1325		/* clean out listeners */
1326		close_listeners();
1327
2711	–	/* auth{}, quarantine{}, shared{}, connect{}, kill{}, deny{},
2712	–	* exempt{} and gecos{} blocks are freed above too
2713	–	*/
2714	–
1328		/* clean out general */
1329	<	MyFree(ConfigFileEntry.service_name);
1330	<	ConfigFileEntry.service_name = NULL;
2718	<
2719	<	MyFree(ConfigFileEntry.servlink_path);
2720	<	ConfigFileEntry.servlink_path = NULL;
2721	<	#ifdef HAVE_LIBCRYPTO
2722	<	ConfigFileEntry.default_cipher_preference = NULL;
2723	<	#endif /* HAVE_LIBCRYPTO */
2724	<	delete_isupport("INVEX");
2725	<	delete_isupport("EXCEPTS");
2726	<	}
2727	<
2728	<	/* flush_deleted_I_P()
2729	<	*
2730	<	* inputs       - none
2731	<	* output       - none
2732	<	* side effects - This function removes I/P conf items
2733	<	*/
2734	<	static void
2735	<	flush_deleted_I_P(void)
2736	<	{
2737	<	dlink_node *ptr;
2738	<	dlink_node *next_ptr;
2739	<	struct ConfItem *conf;
2740	<	struct AccessItem *aconf;
2741	<	dlink_list * free_items [] = {
2742	<	&server_items, &oconf_items, NULL
2743	<	};
2744	<	dlink_list ** iterator = free_items; /* C is dumb */
2745	<
2746	<	/* flush out deleted I and P lines
2747	<	* although still in use.
2748	<	*/
2749	<	for (; *iterator != NULL; iterator++)
2750	<	{
2751	<	DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
2752	<	{
2753	<	conf = ptr->data;
2754	<	aconf = (struct AccessItem *)map_to_conf(conf);
2755	<
2756	<	if (IsConfIllegal(aconf))
2757	<	{
2758	<	dlinkDelete(ptr, *iterator);
2759	<
2760	<	if (aconf->clients == 0)
2761	<	delete_conf_item(conf);
2762	<	}
2763	<	}
2764	<	}
2765	<	}
2766	<
2767	<	/* get_conf_name()
2768	<	*
2769	<	* inputs       - type of conf file to return name of file for
2770	<	* output       - pointer to filename for type of conf
2771	<	* side effects - none
2772	<	*/
2773	<	const char *
2774	<	get_conf_name(ConfType type)
2775	<	{
2776	<	switch (type)
2777	<	{
2778	<	case CONF_TYPE:
2779	<	return ConfigFileEntry.configfile;
2780	<	break;
2781	<	case KLINE_TYPE:
2782	<	return ConfigFileEntry.klinefile;
2783	<	break;
2784	<	case RKLINE_TYPE:
2785	<	return ConfigFileEntry.rklinefile;
2786	<	break;
2787	<	case DLINE_TYPE:
2788	<	return ConfigFileEntry.dlinefile;
2789	<	break;
2790	<	case XLINE_TYPE:
2791	<	return ConfigFileEntry.xlinefile;
2792	<	break;
2793	<	case RXLINE_TYPE:
2794	<	return ConfigFileEntry.rxlinefile;
2795	<	break;
2796	<	case CRESV_TYPE:
2797	<	return ConfigFileEntry.cresvfile;
2798	<	break;
2799	<	case NRESV_TYPE:
2800	<	return ConfigFileEntry.nresvfile;
2801	<	break;
2802	<	case GLINE_TYPE:
2803	<	return ConfigFileEntry.glinefile;
2804	<	break;
2805	<
2806	<	default:
2807	<	return NULL;  /* This should NEVER HAPPEN since we call this function
2808	<	only with the above values, this will cause us to core
2809	<	at some point if this happens so we know where it was */
2810	<	}
2811	<	}
2812	<
2813	<	#define BAD_PING (-1)
2814	<
2815	<	/* get_conf_ping()
2816	<	*
2817	<	* inputs       - pointer to struct AccessItem
2818	<	*              - pointer to a variable that receives ping warning time
2819	<	* output       - ping frequency
2820	<	* side effects - NONE
2821	<	*/
2822	<	static int
2823	<	get_conf_ping(struct ConfItem *conf, int *pingwarn)
2824	<	{
2825	<	struct ClassItem *aclass;
2826	<	struct AccessItem *aconf;
2827	<
2828	<	if (conf != NULL)
2829	<	{
2830	<	aconf = (struct AccessItem *)map_to_conf(conf);
2831	<	if (aconf->class_ptr != NULL)
2832	<	{
2833	<	aclass = (struct ClassItem *)map_to_conf(aconf->class_ptr);
2834	<	*pingwarn = PingWarning(aclass);
2835	<	return PingFreq(aclass);
2836	<	}
2837	<	}
2838	<
2839	<	return BAD_PING;
2840	<	}
2841	<
2842	<	/* get_client_class()
2843	<	*
2844	<	* inputs       - pointer to client struct
2845	<	* output       - pointer to name of class
2846	<	* side effects - NONE
2847	<	*/
2848	<	const char *
2849	<	get_client_class(struct Client *target_p)
2850	<	{
2851	<	dlink_node *ptr;
2852	<	struct ConfItem *conf;
2853	<	struct AccessItem *aconf;
2854	<
2855	<	if (target_p != NULL && !IsMe(target_p) &&
2856	<	target_p->localClient->confs.head != NULL)
2857	<	{
2858	<	DLINK_FOREACH(ptr, target_p->localClient->confs.head)
2859	<	{
2860	<	conf = ptr->data;
2861	<
2862	<	if (conf->type == CLIENT_TYPE || conf->type == SERVER_TYPE ||
2863	<	conf->type == OPER_TYPE)
2864	<	{
2865	<	aconf = (struct AccessItem *) map_to_conf(conf);
2866	<	if (aconf->class_ptr != NULL)
2867	<	return aconf->class_ptr->name;
2868	<	}
2869	<	}
2870	<	}
2871	<
2872	<	return "default";
2873	<	}
2874	<
2875	<	/* get_client_ping()
2876	<	*
2877	<	* inputs       - pointer to client struct
2878	<	*              - pointer to a variable that receives ping warning time
2879	<	* output       - ping frequency
2880	<	* side effects - NONE
2881	<	*/
2882	<	int
2883	<	get_client_ping(struct Client *target_p, int *pingwarn)
2884	<	{
2885	<	int ping;
2886	<	struct ConfItem *conf;
2887	<	dlink_node *nlink;
2888	<
2889	<	if (target_p->localClient->confs.head != NULL)
2890	<	DLINK_FOREACH(nlink, target_p->localClient->confs.head)
2891	<	{
2892	<	conf = nlink->data;
2893	<
2894	<	if ((conf->type == CLIENT_TYPE) || (conf->type == SERVER_TYPE) ||
2895	<	(conf->type == OPER_TYPE))
2896	<	{
2897	<	ping = get_conf_ping(conf, pingwarn);
2898	<	if (ping > 0)
2899	<	return ping;
2900	<	}
2901	<	}
2902	<
2903	<	*pingwarn = 0;
2904	<	return DEFAULT_PINGFREQUENCY;
2905	<	}
2906	<
2907	<	/* find_class()
2908	<	*
2909	<	* inputs       - string name of class
2910	<	* output       - corresponding Class pointer
2911	<	* side effects - NONE
2912	<	*/
2913	<	struct ConfItem *
2914	<	find_class(const char *classname)
2915	<	{
2916	<	struct ConfItem *conf;
2917	<
2918	<	if ((conf = find_exact_name_conf(CLASS_TYPE, classname, NULL, NULL)) != NULL)
2919	<	return conf;
2920	<
2921	<	return class_default;
2922	<	}
2923	<
2924	<	/* check_class()
2925	<	*
2926	<	* inputs       - NONE
2927	<	* output       - NONE
2928	<	* side effects -
2929	<	*/
2930	<	void
2931	<	check_class(void)
2932	<	{
2933	<	dlink_node *ptr = NULL, *next_ptr = NULL;
2934	<
2935	<	DLINK_FOREACH_SAFE(ptr, next_ptr, class_items.head)
2936	<	{
2937	<	struct ClassItem *aclass = map_to_conf(ptr->data);
2938	<
2939	<	if (!aclass->active && !CurrUserCount(aclass))
2940	<	{
2941	<	destroy_cidr_class(aclass);
2942	<	delete_conf_item(ptr->data);
2943	<	}
2944	<	}
2945	<	}
2946	<
2947	<	/* init_class()
2948	<	*
2949	<	* inputs       - NONE
2950	<	* output       - NONE
2951	<	* side effects -
2952	<	*/
2953	<	void
2954	<	init_class(void)
2955	<	{
2956	<	struct ClassItem *aclass;
2957	<
2958	<	class_default = make_conf_item(CLASS_TYPE);
2959	<
2960	<	aclass = map_to_conf(class_default);
2961	<	aclass->active = 1;
2962	<	DupString(class_default->name, "default");
2963	<	ConFreq(aclass)  = DEFAULT_CONNECTFREQUENCY;
2964	<	PingFreq(aclass) = DEFAULT_PINGFREQUENCY;
2965	<	MaxTotal(aclass) = MAXIMUM_LINKS_DEFAULT;
2966	<	MaxSendq(aclass) = DEFAULT_SENDQ;
2967	<
2968	<	client_check_cb = register_callback("check_client", check_client);
2969	<	}
2970	<
2971	<	/* get_sendq()
2972	<	*
2973	<	* inputs       - pointer to client
2974	<	* output       - sendq for this client as found from its class
2975	<	* side effects - NONE
2976	<	*/
2977	<	unsigned int
2978	<	get_sendq(struct Client *client_p)
2979	<	{
2980	<	unsigned int sendq = DEFAULT_SENDQ;
2981	<	dlink_node *ptr;
2982	<	struct ConfItem *conf;
2983	<	struct ConfItem *class_conf;
2984	<	struct ClassItem *aclass;
2985	<	struct AccessItem *aconf;
2986	<
2987	<	if (client_p && !IsMe(client_p) && (client_p->localClient->confs.head))
2988	<	{
2989	<	DLINK_FOREACH(ptr, client_p->localClient->confs.head)
2990	<	{
2991	<	conf = ptr->data;
2992	<	if ((conf->type == SERVER_TYPE) || (conf->type == OPER_TYPE)
2993	<	|| (conf->type == CLIENT_TYPE))
2994	<	{
2995	<	aconf = (struct AccessItem *)map_to_conf(conf);
2996	<	if ((class_conf = aconf->class_ptr) == NULL)
2997	<	continue;
2998	<	aclass = (struct ClassItem *)map_to_conf(class_conf);
2999	<	sendq = MaxSendq(aclass);
3000	<	return sendq;
3001	<	}
3002	<	}
3003	<	}
3004	<	/* XXX return a default?
3005	<	* if here, then there wasn't an attached conf with a sendq
3006	<	* that is very bad -Dianora
3007	<	*/
3008	<	return DEFAULT_SENDQ;
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);
3021	<	struct ClassItem *class = NULL;
3022	<
3023	<	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)
1347	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1348	<	"Warning *** Defaulting to default class for %s@%s",
1349	<	aconf->user, aconf->host);
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	>	conf->user, conf->host);
1350		else
1351	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1352	<	"Warning *** Defaulting to default class for %s",
1353	<	conf->name);
1351	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1352	>	"Warning *** Defaulting to default class for %s",
1353	>	conf->name);
1354		}
1355		else
1356	<	aconf->class_ptr = find_class(class_name);
1356	>	conf->class = class_find(class_name, 1);
1357
1358	<	if (aconf->class_ptr)
3040	<	class = map_to_conf(aconf->class_ptr);
3041	<
3042	<	if (aconf->class_ptr == NULL || !class->active)
1358	>	if (conf->class == NULL)
1359		{
1360	<	if (conf->type == CLIENT_TYPE)
1361	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1362	<	"Warning *** Defaulting to default class for %s@%s",
1363	<	aconf->user, aconf->host);
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	>	conf->user, conf->host);
1364		else
1365	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1366	<	"Warning *** Defaulting to default class for %s",
1367	<	conf->name);
1368	<	aconf->class_ptr = class_default;
1365	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1366	>	"Warning *** Defaulting to default class for %s",
1367	>	conf->name);
1368	>	conf->class = class_default;
1369		}
1370		}
1371
3056	–	/* conf_add_server()
3057	–	*
3058	–	* inputs       - pointer to config item
3059	–	*              - pointer to link count already on this conf
3060	–	* output       - NONE
3061	–	* side effects - Add a connect block
3062	–	*/
3063	–	int
3064	–	conf_add_server(struct ConfItem *conf, const char *class_name)
3065	–	{
3066	–	struct AccessItem *aconf;
3067	–	struct split_nuh_item nuh;
3068	–	char conf_user[USERLEN + 1];
3069	–	char conf_host[HOSTLEN + 1];
3070	–
3071	–	aconf = map_to_conf(conf);
3072	–
3073	–	conf_add_class_to_conf(conf, class_name);
3074	–
3075	–	if (!aconf->host || !conf->name)
3076	–	{
3077	–	sendto_realops_flags(UMODE_ALL, L_ALL, "Bad connect block");
3078	–	ilog(L_WARN, "Bad connect block");
3079	–	return -1;
3080	–	}
3081	–
3082	–	if (EmptyString(aconf->passwd) && !IsConfCryptLink(aconf))
3083	–	{
3084	–	sendto_realops_flags(UMODE_ALL, L_ALL, "Bad connect block, name %s",
3085	–	conf->name);
3086	–	ilog(L_WARN, "Bad connect block, host %s", conf->name);
3087	–	return -1;
3088	–	}
3089	–
3090	–	nuh.nuhmask  = aconf->host;
3091	–	nuh.nickptr  = NULL;
3092	–	nuh.userptr  = conf_user;
3093	–	nuh.hostptr  = conf_host;
3094	–
3095	–	nuh.nicksize = 0;
3096	–	nuh.usersize = sizeof(conf_user);
3097	–	nuh.hostsize = sizeof(conf_host);
3098	–
3099	–	split_nuh(&nuh);
3100	–
3101	–	MyFree(aconf->host);
3102	–	aconf->host = NULL;
3103	–
3104	–	DupString(aconf->user, conf_user); /* somehow username checking for servers
3105	–	got lost in H6/7, will have to be re-added */
3106	–	DupString(aconf->host, conf_host);
3107	–
3108	–	lookup_confhost(conf);
3109	–
3110	–	return 0;
3111	–	}
3112	–
1372		/* yyerror()
1373		*
1374		* inputs       - message from parser
#	Line 3125 | Line 1384 | yyerror(const char *msg)
1384		return;
1385
1386		strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1387	<	sendto_realops_flags(UMODE_ALL, L_ALL, "\"%s\", line %u: %s: %s",
1387	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1388	>	"\"%s\", line %u: %s: %s",
1389		conffilebuf, lineno + 1, msg, newlinebuf);
1390	<	ilog(L_WARN, "\"%s\", line %u: %s: %s",
1390	>	ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1391		conffilebuf, lineno + 1, msg, newlinebuf);
1392		}
1393
1394	<	int
1395	<	conf_fbgets(char *lbuf, unsigned int max_size, FBFILE *fb)
1394	>	void
1395	>	conf_error_report(const char *msg)
1396		{
1397	<	if (fbgets(lbuf, max_size, fb) == NULL)
3138	<	return 0;
3139	<
3140	<	return strlen(lbuf);
3141	<	}
1397	>	char newlinebuf[IRCD_BUFSIZE];
1398
1399	<	int
1400	<	conf_yy_fatal_error(const char *msg)
1401	<	{
1402	<	return 0;
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",
1404	>	conffilebuf, lineno + 1, msg, newlinebuf);
1405		}
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 3157 | Line 1415 | conf_yy_fatal_error(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 3204 | 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;
3209	<	int nonwild = 0;
1498	>	unsigned char tmpch = '\0';
1499	>	unsigned int nonwild = 0;
1500		va_list args;
1501
1502		/*
#	Line 3225 | 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 3237 | 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 3259 | 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 3281 | 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 3304 | 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",
3308	<	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),
3316	<	me.name, source_p->name, cmd);
1609	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1610		return -1;
1611		}
1612
#	Line 3327 | 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 3340 | 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);
3345	<	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),
3351	<	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);
3359	<	return -1;
1648	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1649	>	return -1;
1650		}
1651
1652		*target_server = *parv;
#	Line 3369 | 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 3377 | 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",
3381	<	me.name, source_p->name);
1670	>	sendto_one_notice(source_p, &me, ":Invalid character '!' in kline");
1671		return -1;
1672		}
1673
#	Line 3395 | 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 3434 | 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 if (!(flags & NOUSERLOOKUP))
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,
3466	<	":%s NOTICE %s :%s is E-lined",
3467	<	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 3499 | Line 1787 | find_user_host(struct Client *source_p,
1787		int
1788		valid_comment(struct Client *source_p, char *comment, int warn)
1789		{
3502	–	if (strchr(comment, '"'))
3503	–	{
3504	–	if (warn)
3505	–	sendto_one(source_p, ":%s NOTICE %s :Invalid character '\"' in comment",
3506	–	me.name, source_p->name);
3507	–	return 0;
3508	–	}
3509	–
1790		if (strlen(comment) > REASONLEN)
1791		comment[REASONLEN-1] = '\0';
1792
#	Line 3521 | 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 (password == NULL || aconf->passwd == NULL)
1808	>	if (EmptyString(password) || EmptyString(conf->passwd))
1809		return 0;
1810
1811	<	if (aconf->flags & CONF_FLAGS_ENCRYPTED)
1812	<	{
3533	<	/* use first two chars of the password they send in as salt */
3534	<	/* If the password in the conf is MD5, and ircd is linked
3535	<	* to scrypt on FreeBSD, or the standard crypt library on
3536	<	* glibc Linux, then this code will work fine on generating
3537	<	* the proper encrypted hash for comparison.
3538	<	*/
3539	<	if (*aconf->passwd)
3540	<	encr = crypt(password, aconf->passwd);
3541	<	else
3542	<	encr = "";
3543	<	}
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 3552 | 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
1825	<	*              - cluster type -- CLUSTER_KLINE etc. from s_conf.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
1828		* side effects - Take source_p send the pattern with args given
#	Line 3564 | 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 3573 | 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 3625 | 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 3651 | 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 3667 | Line 1937 | split_nuh(struct split_nuh_item *const i
1937		}
1938		}
1939		}
3670	–
3671	–	/*
3672	–	* flags_to_ascii
3673	–	*
3674	–	* inputs       - flags is a bitmask
3675	–	*              - pointer to table of ascii letters corresponding
3676	–	*                to each bit
3677	–	*              - flag 1 for convert ToLower if bit missing
3678	–	*                0 if ignore.
3679	–	* output       - none
3680	–	* side effects - string pointed to by p has bitmap chars written to it
3681	–	*/
3682	–	static void
3683	–	flags_to_ascii(unsigned int flags, const unsigned int bit_table[], char *p,
3684	–	int lowerit)
3685	–	{
3686	–	unsigned int mask = 1;
3687	–	int i = 0;
3688	–
3689	–	for (mask = 1; (mask != 0) && (bit_table[i] != 0); mask <<= 1, i++)
3690	–	{
3691	–	if (flags & mask)
3692	–	*p++ = bit_table[i];
3693	–	else if (lowerit)
3694	–	*p++ = ToLower(bit_table[i]);
3695	–	}
3696	–	*p = '\0';
3697	–	}
3698	–
3699	–	/*
3700	–	* cidr_limit_reached
3701	–	*
3702	–	* inputs       - int flag allowing over_rule of limits
3703	–	*              - pointer to the ip to be added
3704	–	*              - pointer to the class
3705	–	* output       - non zero if limit reached
3706	–	*                0 if limit not reached
3707	–	* side effects -
3708	–	*/
3709	–	static int
3710	–	cidr_limit_reached(int over_rule,
3711	–	struct irc_ssaddr *ip, struct ClassItem *aclass)
3712	–	{
3713	–	dlink_node *ptr = NULL;
3714	–	struct CidrItem *cidr;
3715	–
3716	–	if (NumberPerCidr(aclass) <= 0)
3717	–	return 0;
3718	–
3719	–	if (ip->ss.ss_family == AF_INET)
3720	–	{
3721	–	if (CidrBitlenIPV4(aclass) <= 0)
3722	–	return 0;
3723	–
3724	–	DLINK_FOREACH(ptr, aclass->list_ipv4.head)
3725	–	{
3726	–	cidr = ptr->data;
3727	–	if (match_ipv4(ip, &cidr->mask, CidrBitlenIPV4(aclass)))
3728	–	{
3729	–	if (!over_rule && (cidr->number_on_this_cidr >= NumberPerCidr(aclass)))
3730	–	return -1;
3731	–	cidr->number_on_this_cidr++;
3732	–	return 0;
3733	–	}
3734	–	}
3735	–	cidr = MyMalloc(sizeof(struct CidrItem));
3736	–	cidr->number_on_this_cidr = 1;
3737	–	cidr->mask = *ip;
3738	–	mask_addr(&cidr->mask, CidrBitlenIPV4(aclass));
3739	–	dlinkAdd(cidr, &cidr->node, &aclass->list_ipv4);
3740	–	}
3741	–	#ifdef IPV6
3742	–	else if (CidrBitlenIPV6(aclass) > 0)
3743	–	{
3744	–	DLINK_FOREACH(ptr, aclass->list_ipv6.head)
3745	–	{
3746	–	cidr = ptr->data;
3747	–	if (match_ipv6(ip, &cidr->mask, CidrBitlenIPV6(aclass)))
3748	–	{
3749	–	if (!over_rule && (cidr->number_on_this_cidr >= NumberPerCidr(aclass)))
3750	–	return -1;
3751	–	cidr->number_on_this_cidr++;
3752	–	return 0;
3753	–	}
3754	–	}
3755	–	cidr = MyMalloc(sizeof(struct CidrItem));
3756	–	cidr->number_on_this_cidr = 1;
3757	–	cidr->mask = *ip;
3758	–	mask_addr(&cidr->mask, CidrBitlenIPV6(aclass));
3759	–	dlinkAdd(cidr, &cidr->node, &aclass->list_ipv6);
3760	–	}
3761	–	#endif
3762	–	return 0;
3763	–	}
3764	–
3765	–	/*
3766	–	* remove_from_cidr_check
3767	–	*
3768	–	* inputs       - pointer to the ip to be removed
3769	–	*              - pointer to the class
3770	–	* output       - NONE
3771	–	* side effects -
3772	–	*/
3773	–	static void
3774	–	remove_from_cidr_check(struct irc_ssaddr *ip, struct ClassItem *aclass)
3775	–	{
3776	–	dlink_node *ptr = NULL;
3777	–	dlink_node *next_ptr = NULL;
3778	–	struct CidrItem *cidr;
3779	–
3780	–	if (NumberPerCidr(aclass) == 0)
3781	–	return;
3782	–
3783	–	if (ip->ss.ss_family == AF_INET)
3784	–	{
3785	–	if (CidrBitlenIPV4(aclass) <= 0)
3786	–	return;
3787	–
3788	–	DLINK_FOREACH_SAFE(ptr, next_ptr, aclass->list_ipv4.head)
3789	–	{
3790	–	cidr = ptr->data;
3791	–	if (match_ipv4(ip, &cidr->mask, CidrBitlenIPV4(aclass)))
3792	–	{
3793	–	cidr->number_on_this_cidr--;
3794	–	if (cidr->number_on_this_cidr == 0)
3795	–	{
3796	–	dlinkDelete(ptr, &aclass->list_ipv4);
3797	–	MyFree(cidr);
3798	–	return;
3799	–	}
3800	–	}
3801	–	}
3802	–	}
3803	–	#ifdef IPV6
3804	–	else if (CidrBitlenIPV6(aclass) > 0)
3805	–	{
3806	–	DLINK_FOREACH_SAFE(ptr, next_ptr, aclass->list_ipv6.head)
3807	–	{
3808	–	cidr = ptr->data;
3809	–	if (match_ipv6(ip, &cidr->mask, CidrBitlenIPV6(aclass)))
3810	–	{
3811	–	cidr->number_on_this_cidr--;
3812	–	if (cidr->number_on_this_cidr == 0)
3813	–	{
3814	–	dlinkDelete(ptr, &aclass->list_ipv6);
3815	–	MyFree(cidr);
3816	–	return;
3817	–	}
3818	–	}
3819	–	}
3820	–	}
3821	–	#endif
3822	–	}
3823	–
3824	–	static void
3825	–	rebuild_cidr_list(int aftype, struct ConfItem *oldcl, struct ClassItem *newcl,
3826	–	dlink_list *old_list, dlink_list *new_list, int changed)
3827	–	{
3828	–	dlink_node *ptr;
3829	–	struct Client *client_p;
3830	–	struct ConfItem *conf;
3831	–	struct AccessItem *aconf;
3832	–
3833	–	if (!changed)
3834	–	{
3835	–	*new_list = *old_list;
3836	–	old_list->head = old_list->tail = NULL;
3837	–	old_list->length = 0;
3838	–	return;
3839	–	}
3840	–
3841	–	DLINK_FOREACH(ptr, local_client_list.head)
3842	–	{
3843	–	client_p = ptr->data;
3844	–	if (client_p->localClient->aftype != aftype)
3845	–	continue;
3846	–	if (dlink_list_length(&client_p->localClient->confs) == 0)
3847	–	continue;
3848	–
3849	–	conf = client_p->localClient->confs.tail->data;
3850	–	if (conf->type == CLIENT_TYPE)
3851	–	{
3852	–	aconf = map_to_conf(conf);
3853	–	if (aconf->class_ptr == oldcl)
3854	–	cidr_limit_reached(1, &client_p->localClient->ip, newcl);
3855	–	}
3856	–	}
3857	–	}
3858	–
3859	–	/*
3860	–	* rebuild_cidr_class
3861	–	*
3862	–	* inputs       - pointer to old conf
3863	–	*              - pointer to new_class
3864	–	* output       - none
3865	–	* side effects - rebuilds the class link list of cidr blocks
3866	–	*/
3867	–	void
3868	–	rebuild_cidr_class(struct ConfItem *conf, struct ClassItem *new_class)
3869	–	{
3870	–	struct ClassItem *old_class = map_to_conf(conf);
3871	–
3872	–	if (NumberPerCidr(old_class) > 0 && NumberPerCidr(new_class) > 0)
3873	–	{
3874	–	if (CidrBitlenIPV4(old_class) > 0 && CidrBitlenIPV4(new_class) > 0)
3875	–	rebuild_cidr_list(AF_INET, conf, new_class,
3876	–	&old_class->list_ipv4, &new_class->list_ipv4,
3877	–	CidrBitlenIPV4(old_class) != CidrBitlenIPV4(new_class));
3878	–
3879	–	#ifdef IPV6
3880	–	if (CidrBitlenIPV6(old_class) > 0 && CidrBitlenIPV6(new_class) > 0)
3881	–	rebuild_cidr_list(AF_INET6, conf, new_class,
3882	–	&old_class->list_ipv6, &new_class->list_ipv6,
3883	–	CidrBitlenIPV6(old_class) != CidrBitlenIPV6(new_class));
3884	–	#endif
3885	–	}
3886	–
3887	–	destroy_cidr_class(old_class);
3888	–	}
3889	–
3890	–	/*
3891	–	* destroy_cidr_list
3892	–	*
3893	–	* inputs       - pointer to class dlink list of cidr blocks
3894	–	* output       - none
3895	–	* side effects - completely destroys the class link list of cidr blocks
3896	–	*/
3897	–	static void
3898	–	destroy_cidr_list(dlink_list *list)
3899	–	{
3900	–	dlink_node *ptr = NULL, *next_ptr = NULL;
3901	–
3902	–	DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
3903	–	{
3904	–	dlinkDelete(ptr, list);
3905	–	MyFree(ptr->data);
3906	–	}
3907	–	}
3908	–
3909	–	/*
3910	–	* destroy_cidr_class
3911	–	*
3912	–	* inputs       - pointer to class
3913	–	* output       - none
3914	–	* side effects - completely destroys the class link list of cidr blocks
3915	–	*/
3916	–	static void
3917	–	destroy_cidr_class(struct ClassItem *aclass)
3918	–	{
3919	–	destroy_cidr_list(&aclass->list_ipv4);
3920	–	destroy_cidr_list(&aclass->list_ipv6);
3921	–	}

Diff Legend

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