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 1176 by michael, Sun Aug 14 11:24:24 2011 UTC vs.
ircd-hybrid/trunk/src/conf.c (file contents), Revision 4415 by michael, Thu Aug 7 14:09:36 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"
34	–	#include "common.h"
35		#include "event.h"
36	–	#include "hash.h"
37	–	#include "hook.h"
36		#include "irc_string.h"
39	–	#include "sprintf_irc.h"
37		#include "s_bsd.h"
38		#include "ircd.h"
39		#include "listener.h"
#	Line 44 | 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"
49	–	#include "s_gline.h"
50	–	#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 "misc.h"
53	+	#include "conf_db.h"
54	+	#include "conf_class.h"
55	+	#include "motd.h"
56	+	#include "ipcache.h"
57
57	–	struct Callback *client_check_cb = NULL;
58	–	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 };
64	–	dlink_list hub_items     = { NULL, NULL, 0 };
65	–	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 };
69	–	dlink_list rxconf_items  = { NULL, NULL, 0 };
70	–	dlink_list rkconf_items  = { NULL, NULL, 0 };
66		dlink_list nresv_items   = { NULL, NULL, 0 };
67	<	dlink_list class_items   = { NULL, NULL, 0 };
73	<	dlink_list gdeny_items   = { NULL, NULL, 0 };
74	<
75	<	dlink_list temporary_klines  = { NULL, NULL, 0 };
76	<	dlink_list temporary_dlines  = { NULL, NULL, 0 };
77	<	dlink_list temporary_xlines  = { NULL, NULL, 0 };
78	<	dlink_list temporary_rklines = { NULL, NULL, 0 };
79	<	dlink_list temporary_glines  = { NULL, NULL, 0 };
80	<	dlink_list temporary_rxlines = { NULL, NULL, 0 };
81	<	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];
86	–	extern char yytext[];
72		extern int yyparse(); /* defined in y.tab.c */
73
89	–	struct conf_parser_context conf_parser_ctx = { 0, 0, NULL };
90	–
74		/* internally defined functions */
75	<	static void lookup_confhost(struct ConfItem *);
93	<	static void set_default_conf(void);
94	<	static void validate_conf(void);
95	<	static void read_conf(FBFILE *);
75	>	static void read_conf(FILE *);
76		static void clear_out_old_conf(void);
97	–	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 *);
102	<	static int attach_iline(struct Client *, struct ConfItem *);
103	<	static struct ip_entry *find_or_add_ip(struct irc_ssaddr *);
104	<	static void parse_conf_file(int, int);
105	<	static dlink_list *map_to_list(ConfType);
106	<	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
109	–	/*
110	–	* bit_len
111	–	*/
112	–	static int cidr_limit_reached(int, struct irc_ssaddr *, struct ClassItem *);
113	–	static void remove_from_cidr_check(struct irc_ssaddr *, struct ClassItem *);
114	–	static void destroy_cidr_class(struct ClassItem *);
115	–
116	–	static void flags_to_ascii(unsigned int, const unsigned int[], char *, int);
117	–
118	–	/* address of default class conf */
119	–	static struct ConfItem *class_default;
120	–
121	–	/* usually, with hash tables, you use a prime number...
122	–	* but in this case I am dealing with ip addresses,
123	–	* not ascii strings.
124	–	*/
125	–	#define IP_HASH_SIZE 0x1000
126	–
127	–	struct ip_entry
128	–	{
129	–	struct irc_ssaddr ip;
130	–	int count;
131	–	time_t last_attempt;
132	–	struct ip_entry *next;
133	–	};
134	–
135	–	static struct ip_entry *ip_hash_table[IP_HASH_SIZE];
136	–	static BlockHeap *ip_entry_heap = NULL;
137	–	static int ip_entries_count = 0;
138	–
139	–
140	–	void *
141	–	map_to_conf(struct ConfItem *aconf)
142	–	{
143	–	void *conf;
144	–	conf = (void *)((uintptr_t)aconf +
145	–	(uintptr_t)sizeof(struct ConfItem));
146	–	return(conf);
147	–	}
148	–
149	–	struct ConfItem *
150	–	unmap_conf_item(void *aconf)
151	–	{
152	–	struct ConfItem *conf;
153	–
154	–	conf = (struct ConfItem *)((uintptr_t)aconf -
155	–	(uintptr_t)sizeof(struct ConfItem));
156	–	return(conf);
157	–	}
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 167 | Line 92 | unmap_conf_item(void *aconf)
92		* if successful save hp in the conf item it was called with
93		*/
94		static void
95	<	conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name)
95	>	conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name, size_t namelength)
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 186 | 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	<	*
200	<	* inputs       - type of item
201	<	* output       - pointer to new conf entry
202	<	* side effects - none
203	<	*/
204	<	struct ConfItem *
205	<	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;
209	<	struct ClassItem *aclass = NULL;
210	<	int status = 0;
211	<
212	<	switch (type)
213	<	{
214	<	case DLINE_TYPE:
215	<	case EXEMPTDLINE_TYPE:
216	<	case GLINE_TYPE:
217	<	case KLINE_TYPE:
218	<	case CLIENT_TYPE:
219	<	case OPER_TYPE:
220	<	case SERVER_TYPE:
221	<	conf = MyMalloc(sizeof(struct ConfItem) +
222	<	sizeof(struct AccessItem));
223	<	aconf = map_to_conf(conf);
224	<	aconf->aftype = AF_INET;
225	<
226	<	/* Yes, sigh. switch on type again */
227	<	switch (type)
228	<	{
229	<	case EXEMPTDLINE_TYPE:
230	<	status = CONF_EXEMPTDLINE;
231	<	break;
232	<
233	<	case DLINE_TYPE:
234	<	status = CONF_DLINE;
235	<	break;
236	<
237	<	case KLINE_TYPE:
238	<	status = CONF_KLINE;
239	<	break;
240	<
241	<	case GLINE_TYPE:
242	<	status = CONF_GLINE;
243	<	break;
244	<
245	<	case CLIENT_TYPE:
246	<	status = CONF_CLIENT;
247	<	break;
248	<
249	<	case OPER_TYPE:
250	<	status = CONF_OPERATOR;
251	<	dlinkAdd(conf, &conf->node, &oconf_items);
252	<	break;
253	<
254	<	case SERVER_TYPE:
255	<	status = CONF_SERVER;
256	<	dlinkAdd(conf, &conf->node, &server_items);
257	<	break;
258	<
259	<	default:
260	<	break;
261	<	}
262	<	aconf->status = status;
263	<	break;
264	<
265	<	case LEAF_TYPE:
266	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
267	<	sizeof(struct MatchItem));
268	<	dlinkAdd(conf, &conf->node, &leaf_items);
269	<	break;
270	<
271	<	case HUB_TYPE:
272	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
273	<	sizeof(struct MatchItem));
274	<	dlinkAdd(conf, &conf->node, &hub_items);
275	<	break;
276	<
277	<	case ULINE_TYPE:
278	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
279	<	sizeof(struct MatchItem));
280	<	dlinkAdd(conf, &conf->node, &uconf_items);
281	<	break;
282	<
283	<	case GDENY_TYPE:
284	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
285	<	sizeof(struct AccessItem));
286	<	dlinkAdd(conf, &conf->node, &gdeny_items);
287	<	break;
288	<
289	<	case XLINE_TYPE:
290	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
291	<	sizeof(struct MatchItem));
292	<	dlinkAdd(conf, &conf->node, &xconf_items);
293	<	break;
294	<	#ifdef HAVE_LIBPCRE
295	<	case RXLINE_TYPE:
296	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
297	<	sizeof(struct MatchItem));
298	<	dlinkAdd(conf, &conf->node, &rxconf_items);
299	<	break;
126	>	struct MaskItem *conf = MyCalloc(sizeof(*conf));
127	>	dlink_list *list = NULL;
128
129	<	case RKLINE_TYPE:
130	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
131	<	sizeof(struct AccessItem));
304	<	aconf = map_to_conf(conf);
305	<	aconf->status = CONF_KLINE;
306	<	dlinkAdd(conf, &conf->node, &rkconf_items);
307	<	break;
308	<	#endif
309	<	case CLUSTER_TYPE:
310	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem));
311	<	dlinkAdd(conf, &conf->node, &cluster_items);
312	<	break;
313	<
314	<	case CRESV_TYPE:
315	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
316	<	sizeof(struct ResvChannel));
317	<	break;
318	<
319	<	case NRESV_TYPE:
320	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
321	<	sizeof(struct MatchItem));
322	<	dlinkAdd(conf, &conf->node, &nresv_items);
323	<	break;
324	<
325	<	case SERVICE_TYPE:
326	<	status = CONF_SERVICE;
327	<	conf = MyMalloc(sizeof(struct ConfItem));
328	<	dlinkAdd(conf, &conf->node, &service_items);
329	<	break;
330	<
331	<	case CLASS_TYPE:
332	<	conf = MyMalloc(sizeof(struct ConfItem) +
333	<	sizeof(struct ClassItem));
334	<	dlinkAdd(conf, &conf->node, &class_items);
335	<
336	<	aclass = map_to_conf(conf);
337	<	aclass->active = 1;
338	<	ConFreq(aclass) = DEFAULT_CONNECTFREQUENCY;
339	<	PingFreq(aclass) = DEFAULT_PINGFREQUENCY;
340	<	MaxTotal(aclass) = MAXIMUM_LINKS_DEFAULT;
341	<	MaxSendq(aclass) = DEFAULT_SENDQ;
342	<
343	<	break;
344	<
345	<	default:
346	<	conf = NULL;
347	<	break;
348	<	}
349	<
350	<	/* XXX Yes, this will core if default is hit. I want it to for now - db */
351	<	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);
365	–	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));
382	<	if (aconf->spasswd != NULL)
383	<	memset(aconf->spasswd, 0, strlen(aconf->spasswd));
384	<	aconf->class_ptr = NULL;
385	<
386	<	MyFree(aconf->passwd);
387	<	MyFree(aconf->spasswd);
388	<	MyFree(aconf->reason);
389	<	MyFree(aconf->oper_reason);
390	<	MyFree(aconf->user);
391	<	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)
394	<	RSA_free(aconf->rsa_public_key);
395	<	MyFree(aconf->rsa_public_key_file);
396	<	#endif
166	>	MyFree(conf->cipher_list);
167
168	<	/* Yes, sigh. switch on type again */
169	<	switch(type)
400	<	{
401	<	case EXEMPTDLINE_TYPE:
402	<	case DLINE_TYPE:
403	<	case GLINE_TYPE:
404	<	case KLINE_TYPE:
405	<	case CLIENT_TYPE:
406	<	MyFree(conf);
407	<	break;
408	<
409	<	case OPER_TYPE:
410	<	aconf = map_to_conf(conf);
411	<	if (!IsConfIllegal(aconf))
412	<	dlinkDelete(&conf->node, &oconf_items);
413	<	MyFree(conf);
414	<	break;
415	<
416	<	case SERVER_TYPE:
417	<	aconf = map_to_conf(conf);
418	<	if (!IsConfIllegal(aconf))
419	<	dlinkDelete(&conf->node, &server_items);
420	<	MyFree(conf);
421	<	break;
422	<
423	<	default:
424	<	break;
425	<	}
426	<	break;
427	<
428	<	case HUB_TYPE:
429	<	match_item = map_to_conf(conf);
430	<	MyFree(match_item->user);
431	<	MyFree(match_item->host);
432	<	MyFree(match_item->reason);
433	<	MyFree(match_item->oper_reason);
434	<	/* If marked illegal, its already been pulled off of the hub_items list */
435	<	if (!match_item->illegal)
436	<	dlinkDelete(&conf->node, &hub_items);
437	<	MyFree(conf);
438	<	break;
439	<
440	<	case LEAF_TYPE:
441	<	match_item = map_to_conf(conf);
442	<	MyFree(match_item->user);
443	<	MyFree(match_item->host);
444	<	MyFree(match_item->reason);
445	<	MyFree(match_item->oper_reason);
446	<	/* If marked illegal, its already been pulled off of the leaf_items list */
447	<	if (!match_item->illegal)
448	<	dlinkDelete(&conf->node, &leaf_items);
449	<	MyFree(conf);
450	<	break;
451	<
452	<	case ULINE_TYPE:
453	<	match_item = map_to_conf(conf);
454	<	MyFree(match_item->user);
455	<	MyFree(match_item->host);
456	<	MyFree(match_item->reason);
457	<	MyFree(match_item->oper_reason);
458	<	dlinkDelete(&conf->node, &uconf_items);
459	<	MyFree(conf);
460	<	break;
461	<
462	<	case XLINE_TYPE:
463	<	match_item = map_to_conf(conf);
464	<	MyFree(match_item->user);
465	<	MyFree(match_item->host);
466	<	MyFree(match_item->reason);
467	<	MyFree(match_item->oper_reason);
468	<	dlinkDelete(&conf->node, &xconf_items);
469	<	MyFree(conf);
470	<	break;
471	<	#ifdef HAVE_LIBPCRE
472	<	case RKLINE_TYPE:
473	<	aconf = map_to_conf(conf);
474	<	MyFree(aconf->regexuser);
475	<	MyFree(aconf->regexhost);
476	<	MyFree(aconf->user);
477	<	MyFree(aconf->host);
478	<	MyFree(aconf->reason);
479	<	MyFree(aconf->oper_reason);
480	<	dlinkDelete(&conf->node, &rkconf_items);
481	<	MyFree(conf);
482	<	break;
483	<
484	<	case RXLINE_TYPE:
485	<	MyFree(conf->regexpname);
486	<	match_item = map_to_conf(conf);
487	<	MyFree(match_item->user);
488	<	MyFree(match_item->host);
489	<	MyFree(match_item->reason);
490	<	MyFree(match_item->oper_reason);
491	<	dlinkDelete(&conf->node, &rxconf_items);
492	<	MyFree(conf);
493	<	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);
500	<	MyFree(match_item->oper_reason);
501	<	dlinkDelete(&conf->node, &nresv_items);
502	<
503	<	if (conf->flags & CONF_FLAGS_TEMPORARY)
504	<	if ((m = dlinkFindDelete(&temporary_resv, conf)) != NULL)
505	<	free_dlink_node(m);
506	<
507	<	MyFree(conf);
508	<	break;
509	<
510	<	case GDENY_TYPE:
511	<	aconf = map_to_conf(conf);
512	<	MyFree(aconf->user);
513	<	MyFree(aconf->host);
514	<	dlinkDelete(&conf->node, &gdeny_items);
515	<	MyFree(conf);
516	<	break;
517	<
518	<	case CLUSTER_TYPE:
519	<	dlinkDelete(&conf->node, &cluster_items);
520	<	MyFree(conf);
521	<	break;
522	<
523	<	case CRESV_TYPE:
524	<	if (conf->flags & CONF_FLAGS_TEMPORARY)
525	<	if ((m = dlinkFindDelete(&temporary_resv, conf)) != NULL)
526	<	free_dlink_node(m);
527	<
528	<	MyFree(conf);
529	<	break;
530	<
531	<	case CLASS_TYPE:
532	<	dlinkDelete(&conf->node, &class_items);
533	<	MyFree(conf);
534	<	break;
535	<
536	<	case SERVICE_TYPE:
537	<	dlinkDelete(&conf->node, &service_items);
538	<	MyFree(conf);
539	<	break;
540	<
541	<	default:
542	<	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		}
544	–	}
545	–
546	–	/* free_access_item()
547	–	*
548	–	* inputs       - pointer to conf to free
549	–	* output       - none
550	–	* side effects - crucial password fields are zeroed, conf is freed
551	–	*/
552	–	void
553	–	free_access_item(struct AccessItem *aconf)
554	–	{
555	–	struct ConfItem *conf;
556	–
557	–	if (aconf == NULL)
558	–	return;
559	–	conf = unmap_conf_item(aconf);
560	–	delete_conf_item(conf);
561	–	}
562	–
563	–	static const unsigned int shared_bit_table[] =
564	–	{ 'K', 'k', 'U', 'X', 'x', 'Y', 'Q', 'q', 'R', 'L', 0};
565	–
566	–	/* report_confitem_types()
567	–	*
568	–	* inputs       - pointer to client requesting confitem report
569	–	*              - ConfType to report
570	–	* output       - none
571	–	* side effects -
572	–	*/
573	–	void
574	–	report_confitem_types(struct Client *source_p, ConfType type, int temp)
575	–	{
576	–	dlink_node *ptr = NULL;
577	–	struct ConfItem *conf = NULL;
578	–	struct AccessItem *aconf = NULL;
579	–	struct MatchItem *matchitem = NULL;
580	–	struct ClassItem *classitem = NULL;
581	–	char buf[12];
582	–	char *p = NULL;
583	–	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;
591	<	aconf = map_to_conf(conf);
592	<
593	<	p = buf;
594	<
595	<	if (aconf->flags & GDENY_BLOCK)
596	<	*p++ = 'B';
597	<	else
598	<	*p++ = 'b';
599	<
600	<	if (aconf->flags & GDENY_REJECT)
601	<	*p++ = 'R';
602	<	else
603	<	*p++ = 'r';
604	<
605	<	*p = '\0';
606	<
607	<	sendto_one(source_p, ":%s %d %s V %s@%s %s %s",
608	<	me.name, RPL_STATSDEBUG, source_p->name,
609	<	aconf->user, aconf->host, conf->name, buf);
610	<	}
611	<	break;
612	<
613	<	case XLINE_TYPE:
614	<	DLINK_FOREACH(ptr, xconf_items.head)
615	<	{
616	<	conf = ptr->data;
617	<	matchitem = map_to_conf(conf);
618	<
619	<	sendto_one(source_p, form_str(RPL_STATSXLINE),
620	<	me.name, source_p->name,
621	<	matchitem->hold ? "x": "X", matchitem->count,
622	<	conf->name, matchitem->reason);
623	<	}
624	<	break;
625	<
626	<	#ifdef HAVE_LIBPCRE
627	<	case RXLINE_TYPE:
628	<	DLINK_FOREACH(ptr, rxconf_items.head)
629	<	{
630	<	conf = ptr->data;
631	<	matchitem = map_to_conf(conf);
632	<
633	<	sendto_one(source_p, form_str(RPL_STATSXLINE),
634	<	me.name, source_p->name,
635	<	matchitem->hold ? "xR": "XR", matchitem->count,
636	<	conf->name, matchitem->reason);
637	<	}
638	<	break;
639	<
640	<	case RKLINE_TYPE:
641	<	pfx = temp ? "kR" : "KR";
642	<
643	<	DLINK_FOREACH(ptr, rkconf_items.head)
644	<	{
645	<	aconf = map_to_conf((conf = ptr->data));
646	<
647	<	if (temp && !(conf->flags & CONF_FLAGS_TEMPORARY))
648	<	continue;
649	<
650	<	sendto_one(source_p, form_str(RPL_STATSKLINE), me.name,
651	<	source_p->name, pfx, aconf->host, aconf->user,
652	<	aconf->reason, aconf->oper_reason ? aconf->oper_reason : "");
653	<	}
654	<	break;
655	<	#endif
656	<
657	<	case ULINE_TYPE:
658	<	DLINK_FOREACH(ptr, uconf_items.head)
659	<	{
660	<	conf = ptr->data;
661	<	matchitem = map_to_conf(conf);
662	<
663	<	p = buf;
664	<
665	<	/* some of these are redundant for the sake of
666	<	* consistency with cluster{} flags
667	<	*/
668	<	*p++ = 'c';
669	<	flags_to_ascii(matchitem->action, shared_bit_table, p, 0);
670	<
671	<	sendto_one(source_p, form_str(RPL_STATSULINE),
672	<	me.name, source_p->name, conf->name,
673	<	matchitem->user?matchitem->user: "*",
674	<	matchitem->host?matchitem->host: "*", buf);
675	<	}
676	<
677	<	DLINK_FOREACH(ptr, cluster_items.head)
678	<	{
679	<	conf = ptr->data;
680	<
681	<	p = buf;
682	<
683	<	*p++ = 'C';
684	<	flags_to_ascii(conf->flags, shared_bit_table, p, 0);
685	<
686	<	sendto_one(source_p, form_str(RPL_STATSULINE),
687	<	me.name, source_p->name, conf->name,
688	<	"*", "*", buf);
689	<	}
690	<
691	<	break;
692	<
693	<	case OPER_TYPE:
694	<	DLINK_FOREACH(ptr, oconf_items.head)
695	<	{
696	<	conf = ptr->data;
697	<	aconf = map_to_conf(conf);
698	<
699	<	/* Don't allow non opers to see oper privs */
700	<	if (IsOper(source_p))
701	<	sendto_one(source_p, form_str(RPL_STATSOLINE),
702	<	me.name, source_p->name, 'O', aconf->user, aconf->host,
703	<	conf->name, oper_privs_as_string(aconf->port),
704	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
705	<	else
706	<	sendto_one(source_p, form_str(RPL_STATSOLINE),
707	<	me.name, source_p->name, 'O', aconf->user, aconf->host,
708	<	conf->name, "0",
709	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
710	<	}
711	<	break;
712	<
713	<	case CLASS_TYPE:
714	<	DLINK_FOREACH(ptr, class_items.head)
715	<	{
716	<	conf = ptr->data;
717	<	classitem = map_to_conf(conf);
718	<	sendto_one(source_p, form_str(RPL_STATSYLINE),
719	<	me.name, source_p->name, 'Y',
720	<	conf->name, PingFreq(classitem),
721	<	ConFreq(classitem),
722	<	MaxTotal(classitem), MaxSendq(classitem),
723	<	CurrUserCount(classitem),
724	<	classitem->active ? "active" : "disabled");
725	<	}
726	<	break;
727	<
728	<	case CONF_TYPE:
729	<	case CLIENT_TYPE:
730	<	break;
731	<
732	<	case SERVICE_TYPE:
733	<	DLINK_FOREACH(ptr, service_items.head)
734	<	{
735	<	conf = ptr->data;
736	<	sendto_one(source_p, form_str(RPL_STATSSERVICE),
737	<	me.name, source_p->name, 'S', "*", conf->name, 0, 0);
738	<	}
739	<	break;
740	<
741	<	case SERVER_TYPE:
742	<	DLINK_FOREACH(ptr, server_items.head)
743	<	{
744	<	p = buf;
745	<
746	<	conf = ptr->data;
747	<	aconf = map_to_conf(conf);
748	<
749	<	buf[0] = '\0';
750	<
751	<	if (IsConfAllowAutoConn(aconf))
752	<	*p++ = 'A';
753	<	if (IsConfCryptLink(aconf))
754	<	*p++ = 'C';
755	<	if (IsConfTopicBurst(aconf))
756	<	*p++ = 'T';
757	<	if (IsConfCompressed(aconf))
758	<	*p++ = 'Z';
759	<	if (buf[0] == '\0')
760	<	*p++ = '*';
761	<
762	<	*p = '\0';
763	<
764	<	/*
765	<	* Allow admins to see actual ips unless hide_server_ips is enabled
766	<	*/
767	<	if (!ConfigServerHide.hide_server_ips && IsAdmin(source_p))
768	<	sendto_one(source_p, form_str(RPL_STATSCLINE),
769	<	me.name, source_p->name, 'C', aconf->host,
770	<	buf, conf->name, aconf->port,
771	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
772	<	else
773	<	sendto_one(source_p, form_str(RPL_STATSCLINE),
774	<	me.name, source_p->name, 'C',
775	<	"*@127.0.0.1", buf, conf->name, aconf->port,
776	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
777	<	}
778	<	break;
779	<
780	<	case HUB_TYPE:
781	<	DLINK_FOREACH(ptr, hub_items.head)
782	<	{
783	<	conf = ptr->data;
784	<	matchitem = map_to_conf(conf);
785	<	sendto_one(source_p, form_str(RPL_STATSHLINE), me.name,
786	<	source_p->name, 'H', matchitem->host, conf->name, 0, "*");
787	<	}
788	<	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	<	{
793	<	conf = ptr->data;
794	<	matchitem = map_to_conf(conf);
795	<	sendto_one(source_p, form_str(RPL_STATSLLINE), me.name,
796	<	source_p->name, 'L', matchitem->host, conf->name, 0, "*");
797	<	}
798	<	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:
805	<	case NRESV_TYPE:
806	<	case CLUSTER_TYPE:
807	<	default:
808	<	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 822 | 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		{
828	–	struct Client *source_p = va_arg(args, struct Client *);
829	–	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)))
834	<	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,
859	<	"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
879	<	* capture reject code here or rely on the connecting too fast code.
880	<	* - Dianora
881	<	*/
882	<	if (REJECT_HOLD_TIME > 0)
883	<	{
884	<	sendto_one(source_p, ":%s NOTICE %s :You are not authorized to use this server",
885	<	me.name, source_p->name);
886	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
887	<	SetCaptured(source_p);
888	<	}
889	<	else
890	<	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	<	/*
895	<	* Don't exit them immediately, play with them a bit.
896	<	* - Dianora
897	<	*/
898	<	if (REJECT_HOLD_TIME > 0)
899	<	{
900	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
901	<	SetCaptured(source_p);
902	<	}
903	<	else
904	<	exit_client(source_p, &me, "Banned");
265	>	exit_client(source_p, "Banned");
266		++ServerStats.is_ref;
267		break;
268
#	Line 910 | 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
919	–	*              - 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;
928	<	char non_ident[USERLEN + 1] = { '~', '\0' };
929	<	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;
948	<	uhi[1] = client_p->host;
949	<	uhi[2] = client_p->sockhost;
950	<
951	<	rkconf = find_regexp_kline(uhi);
952	<
953	<	if (aconf != NULL)
305	>	if (conf)
306		{
307	<	if (IsConfClient(aconf) && !rkconf)
307	>	if (IsConfClient(conf))
308		{
309	<	conf = unmap_conf_item(aconf);
958	<
959	<	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);
965	<	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))
977	<	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,
991	<	client_p->name);
992	<	if (ConfigFileEntry.kline_with_reason)
993	<	sendto_one(client_p, ":%s NOTICE %s :*** Banned %s",
994	<	me.name, client_p->name, aconf->reason);
995	<	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 1007 | 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;
1013	<	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);
1021	<
1022	<	aconf = map_to_conf(conf);
1023	<	if (aconf->class_ptr == NULL)
1024	<	return NOT_AUTHORIZED;  /* If class is missing, this is best */
1025	<
1026	<	aclass = map_to_conf(aconf->class_ptr);
362	>	AddFlag(client_p, FLAGS_IPHASH);
363
364		count_user_host(client_p->username, client_p->host,
365		&global, &local, &ident);
#	Line 1032 | 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, "
1054	<	"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
1060	–	/* init_ip_hash_table()
1061	–	*
1062	–	* inputs               - NONE
1063	–	* output               - NONE
1064	–	* side effects         - allocate memory for ip_entry(s)
1065	–	*                      - clear the ip hash table
1066	–	*/
1067	–	void
1068	–	init_ip_hash_table(void)
1069	–	{
1070	–	ip_entry_heap = BlockHeapCreate("ip", sizeof(struct ip_entry),
1071	–	2 * hard_fdlimit);
1072	–	memset(ip_hash_table, 0, sizeof(ip_hash_table));
1073	–	}
1074	–
1075	–	/* find_or_add_ip()
1076	–	*
1077	–	* inputs       - pointer to struct irc_ssaddr
1078	–	* output       - pointer to a struct ip_entry
1079	–	* side effects -
1080	–	*
1081	–	* If the ip # was not found, a new struct ip_entry is created, and the ip
1082	–	* count set to 0.
1083	–	*/
1084	–	static struct ip_entry *
1085	–	find_or_add_ip(struct irc_ssaddr *ip_in)
1086	–	{
1087	–	struct ip_entry *ptr, *newptr;
1088	–	int hash_index = hash_ip(ip_in), res;
1089	–	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
1090	–	#ifdef IPV6
1091	–	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
1092	–	#endif
1093	–
1094	–	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
1095	–	{
1096	–	#ifdef IPV6
1097	–	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
1098	–	continue;
1099	–	if (ip_in->ss.ss_family == AF_INET6)
1100	–	{
1101	–	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
1102	–	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
1103	–	}
1104	–	else
1105	–	#endif
1106	–	{
1107	–	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
1108	–	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
1109	–	}
1110	–	if (res == 0)
1111	–	{
1112	–	/* Found entry already in hash, return it. */
1113	–	return ptr;
1114	–	}
1115	–	}
1116	–
1117	–	if (ip_entries_count >= 2 * hard_fdlimit)
1118	–	garbage_collect_ip_entries();
1119	–
1120	–	newptr = BlockHeapAlloc(ip_entry_heap);
1121	–	ip_entries_count++;
1122	–	memcpy(&newptr->ip, ip_in, sizeof(struct irc_ssaddr));
1123	–
1124	–	newptr->next = ip_hash_table[hash_index];
1125	–	ip_hash_table[hash_index] = newptr;
1126	–
1127	–	return newptr;
1128	–	}
1129	–
1130	–	/* remove_one_ip()
1131	–	*
1132	–	* inputs        - unsigned long IP address value
1133	–	* output        - NONE
1134	–	* side effects  - The ip address given, is looked up in ip hash table
1135	–	*                 and number of ip#'s for that ip decremented.
1136	–	*                 If ip # count reaches 0 and has expired,
1137	–	*                 the struct ip_entry is returned to the ip_entry_heap
1138	–	*/
1139	–	void
1140	–	remove_one_ip(struct irc_ssaddr *ip_in)
1141	–	{
1142	–	struct ip_entry *ptr;
1143	–	struct ip_entry *last_ptr = NULL;
1144	–	int hash_index = hash_ip(ip_in), res;
1145	–	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
1146	–	#ifdef IPV6
1147	–	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
1148	–	#endif
1149	–
1150	–	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
1151	–	{
1152	–	#ifdef IPV6
1153	–	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
1154	–	continue;
1155	–	if (ip_in->ss.ss_family == AF_INET6)
1156	–	{
1157	–	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
1158	–	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
1159	–	}
1160	–	else
1161	–	#endif
1162	–	{
1163	–	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
1164	–	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
1165	–	}
1166	–	if (res)
1167	–	continue;
1168	–	if (ptr->count > 0)
1169	–	ptr->count--;
1170	–	if (ptr->count == 0 &&
1171	–	(CurrentTime-ptr->last_attempt) >= ConfigFileEntry.throttle_time)
1172	–	{
1173	–	if (last_ptr != NULL)
1174	–	last_ptr->next = ptr->next;
1175	–	else
1176	–	ip_hash_table[hash_index] = ptr->next;
1177	–
1178	–	BlockHeapFree(ip_entry_heap, ptr);
1179	–	ip_entries_count--;
1180	–	return;
1181	–	}
1182	–	last_ptr = ptr;
1183	–	}
1184	–	}
1185	–
1186	–	/* hash_ip()
1187	–	*
1188	–	* input        - pointer to an irc_inaddr
1189	–	* output       - integer value used as index into hash table
1190	–	* side effects - hopefully, none
1191	–	*/
1192	–	static int
1193	–	hash_ip(struct irc_ssaddr *addr)
1194	–	{
1195	–	if (addr->ss.ss_family == AF_INET)
1196	–	{
1197	–	struct sockaddr_in *v4 = (struct sockaddr_in *)addr;
1198	–	int hash;
1199	–	uint32_t ip;
1200	–
1201	–	ip   = ntohl(v4->sin_addr.s_addr);
1202	–	hash = ((ip >> 12) + ip) & (IP_HASH_SIZE-1);
1203	–	return hash;
1204	–	}
1205	–	#ifdef IPV6
1206	–	else
1207	–	{
1208	–	int hash;
1209	–	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)addr;
1210	–	uint32_t *ip = (uint32_t *)&v6->sin6_addr.s6_addr;
1211	–
1212	–	hash  = ip[0] ^ ip[3];
1213	–	hash ^= hash >> 16;
1214	–	hash ^= hash >> 8;
1215	–	hash  = hash & (IP_HASH_SIZE - 1);
1216	–	return hash;
1217	–	}
1218	–	#else
1219	–	return 0;
1220	–	#endif
1221	–	}
1222	–
1223	–	/* count_ip_hash()
1224	–	*
1225	–	* inputs        - pointer to counter of number of ips hashed
1226	–	*               - pointer to memory used for ip hash
1227	–	* output        - returned via pointers input
1228	–	* side effects  - NONE
1229	–	*
1230	–	* number of hashed ip #'s is counted up, plus the amount of memory
1231	–	* used in the hash.
1232	–	*/
1233	–	void
1234	–	count_ip_hash(unsigned int *number_ips_stored, uint64_t *mem_ips_stored)
1235	–	{
1236	–	struct ip_entry *ptr;
1237	–	int i;
1238	–
1239	–	*number_ips_stored = 0;
1240	–	*mem_ips_stored    = 0;
1241	–
1242	–	for (i = 0; i < IP_HASH_SIZE; i++)
1243	–	{
1244	–	for (ptr = ip_hash_table[i]; ptr; ptr = ptr->next)
1245	–	{
1246	–	*number_ips_stored += 1;
1247	–	*mem_ips_stored += sizeof(struct ip_entry);
1248	–	}
1249	–	}
1250	–	}
1251	–
1252	–	/* garbage_collect_ip_entries()
1253	–	*
1254	–	* input        - NONE
1255	–	* output       - NONE
1256	–	* side effects - free up all ip entries with no connections
1257	–	*/
1258	–	static void
1259	–	garbage_collect_ip_entries(void)
1260	–	{
1261	–	struct ip_entry *ptr;
1262	–	struct ip_entry *last_ptr;
1263	–	struct ip_entry *next_ptr;
1264	–	int i;
1265	–
1266	–	for (i = 0; i < IP_HASH_SIZE; i++)
1267	–	{
1268	–	last_ptr = NULL;
1269	–
1270	–	for (ptr = ip_hash_table[i]; ptr; ptr = next_ptr)
1271	–	{
1272	–	next_ptr = ptr->next;
1273	–
1274	–	if (ptr->count == 0 &&
1275	–	(CurrentTime - ptr->last_attempt) >= ConfigFileEntry.throttle_time)
1276	–	{
1277	–	if (last_ptr != NULL)
1278	–	last_ptr->next = ptr->next;
1279	–	else
1280	–	ip_hash_table[i] = ptr->next;
1281	–	BlockHeapFree(ip_entry_heap, ptr);
1282	–	ip_entries_count--;
1283	–	}
1284	–	else
1285	–	last_ptr = ptr;
1286	–	}
1287	–	}
1288	–	}
1289	–
395		/* detach_conf()
396		*
397		* inputs       - pointer to client to detach
#	Line 1295 | 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;
1302	<	struct ConfItem *conf;
1303	<	struct ClassItem *aclass;
1304	<	struct AccessItem *aconf;
1305	<	struct ConfItem *aclass_conf;
1306	<	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;
1311	<
1312	<	if (type == CONF_TYPE || conf->type == type)
1313	<	{
1314	<	dlinkDelete(ptr, &client_p->localClient->confs);
1315	<	free_dlink_node(ptr);
1316	<
1317	<	switch (conf->type)
1318	<	{
1319	<	case CLIENT_TYPE:
1320	<	case OPER_TYPE:
1321	<	case SERVER_TYPE:
1322	<	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	<	{
1328	<	aclass = map_to_conf(aclass_conf);
1329	<
1330	<	assert(aclass->curr_user_count > 0);
1331	<
1332	<	if (conf->type == CLIENT_TYPE)
1333	<	remove_from_cidr_check(&client_p->localClient->ip, aclass);
1334	<	if (--aclass->curr_user_count == 0 && aclass->active == 0)
1335	<	delete_conf_item(aclass_conf);
1336	<	}
1337	<
1338	<	if (--aconf->clients == 0 && IsConfIllegal(aconf))
1339	<	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:
1345	<	match_item = map_to_conf(conf);
1346	<	if (match_item->ref_count == 0 && match_item->illegal)
1347	<	delete_conf_item(conf);
1348	<	break;
1349	<	default:
1350	<	break;
1351	<	}
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		}
1356	–	}
430
431	<	return -1;
431	>	if (--conf->ref_count == 0 && conf->active == 0)
432	>	conf_free(conf);
433	>	}
434		}
435
436		/* attach_conf()
#	Line 1369 | 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	<	{
1381	<	struct AccessItem *aconf = map_to_conf(conf);
1382	<	struct ClassItem *aclass = map_to_conf(aconf->class_ptr);
1383	<
1384	<	if (IsConfIllegal(aconf))
1385	<	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),
1389	<	&client_p->localClient->ip, aclass))
1390	<	return TOO_MANY;    /* Already at maximum allowed */
1391	<
1392	<	CurrUserCount(aclass)++;
1393	<	aconf->clients++;
1394	<	}
1395	<	else if (conf->type == HUB_TYPE || conf->type == LEAF_TYPE)
1396	<	{
1397	<	struct MatchItem *match_item = map_to_conf(conf);
1398	<	match_item->ref_count++;
1399	<	}
457	>	conf->class->ref_count++;
458	>	conf->ref_count++;
459
460		dlinkAdd(conf, make_dlink_node(), &client_p->localClient->confs);
461
#	Line 1416 | Line 475 | attach_connect_block(struct Client *clie
475		const char *host)
476		{
477		dlink_node *ptr;
478	<	struct ConfItem *conf;
1420	<	struct AccessItem *aconf;
478	>	struct MaskItem *conf = NULL;
479
480		assert(client_p != NULL);
481		assert(host != NULL);
#	Line 1428 | Line 486 | attach_connect_block(struct Client *clie
486		DLINK_FOREACH(ptr, server_items.head)
487		{
488		conf = ptr->data;
1431	–	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 1440 | Line 497 | attach_connect_block(struct Client *clie
497		return 0;
498		}
499
1443	–	/* find_conf_exact()
1444	–	*
1445	–	* inputs       - type of ConfItem
1446	–	*              - pointer to name to find
1447	–	*              - pointer to username to find
1448	–	*              - pointer to host to find
1449	–	* output       - NULL or pointer to conf found
1450	–	* side effects - find a conf entry which matches the hostname
1451	–	*                and has the same name.
1452	–	*/
1453	–	struct ConfItem *
1454	–	find_conf_exact(ConfType type, const char *name, const char *user,
1455	–	const char *host)
1456	–	{
1457	–	dlink_node *ptr;
1458	–	dlink_list *list_p;
1459	–	struct ConfItem *conf = NULL;
1460	–	struct AccessItem *aconf;
1461	–
1462	–	/* Only valid for OPER_TYPE and ...? */
1463	–	list_p = map_to_list(type);
1464	–
1465	–	DLINK_FOREACH(ptr, (*list_p).head)
1466	–	{
1467	–	conf = ptr->data;
1468	–
1469	–	if (conf->name == NULL)
1470	–	continue;
1471	–	aconf = map_to_conf(conf);
1472	–	if (aconf->host == NULL)
1473	–	continue;
1474	–	if (irccmp(conf->name, name) != 0)
1475	–	continue;
1476	–
1477	–	/*
1478	–	** Accept if the *real* hostname (usually sockethost)
1479	–	** socket host) matches *either* host or name field
1480	–	** of the configuration.
1481	–	*/
1482	–	if (!match(aconf->host, host) || !match(aconf->user, user))
1483	–	continue;
1484	–	if (type == OPER_TYPE)
1485	–	{
1486	–	struct ClassItem *aclass = map_to_conf(aconf->class_ptr);
1487	–
1488	–	if (aconf->clients >= MaxTotal(aclass))
1489	–	continue;
1490	–	}
1491	–
1492	–	return conf;
1493	–	}
1494	–
1495	–	return NULL;
1496	–	}
1497	–
500		/* find_conf_name()
501		*
502		* inputs       - pointer to conf link list to search
#	Line 1504 | 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 1532 | 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:
1540	<	return(&rxconf_items);
1541	<	break;
1542	<	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:
1555	<	return(&class_items);
1556	<	break;
1557	<	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;
1566	–	case CONF_TYPE:
1567	–	case GLINE_TYPE:
1568	–	case KLINE_TYPE:
1569	–	case DLINE_TYPE:
1570	–	case CRESV_TYPE:
564		default:
565		return NULL;
566		}
#	Line 1579 | 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;
1592	<	struct AccessItem *aconf=NULL;
1593	<	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
1599	<	case RXLINE_TYPE:
1600	<	DLINK_FOREACH(ptr, list_p->head)
1601	<	{
1602	<	conf = ptr->data;
1603	<	assert(conf->regexpname);
1604	<
1605	<	if (!ircd_pcre_exec(conf->regexpname, name))
1606	<	return conf;
1607	<	}
1608	<	break;
1609	<	#endif
1610	<	case SERVICE_TYPE:
589	>	case CONF_SERVICE:
590		DLINK_FOREACH(ptr, list_p->head)
591		{
592		conf = ptr->data;
#	Line 1619 | 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
1629	–	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;
1650	–	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 1668 | 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;
1681	<	struct MatchItem *match_item;
1682	<	dlink_list *list_p;
1683	<
1684	<	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	>	case HM_IPV6:
716	>	if (who->localClient->aftype == AF_INET6)
717	>	if (match_ipv6(&who->localClient->ip, &conf->addr, conf->bits))
718	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
719	>	return conf;
720	>	break;
721	>	default:
722	>	assert(0);
723	>	}
724	>	}
725		}
726		}
727	+
728		break;
729
730	<	case SERVER_TYPE:
730	>	case CONF_SERVER:
731		DLINK_FOREACH(ptr, list_p->head)
732		{
733		conf = ptr->data;
734	<	aconf = (struct AccessItem *)map_to_conf(conf);
734	>
735		if (EmptyString(conf->name))
736	<	continue;
737	<
736	>	continue;
737	>
738		if (name == NULL)
739		{
740	<	if (EmptyString(aconf->host))
741	<	continue;
742	<	if (irccmp(aconf->host, host) == 0)
743	<	return(conf);
740	>	if (EmptyString(conf->host))
741	>	continue;
742	>	if (irccmp(conf->host, host) == 0)
743	>	return conf;
744		}
745		else if (irccmp(conf->name, name) == 0)
746	<	{
1749	<	return (conf);
1750	<	}
746	>	return conf;
747		}
1752	–	break;
748
1754	–	case CLASS_TYPE:
1755	–	DLINK_FOREACH(ptr, list_p->head)
1756	–	{
1757	–	conf = ptr->data;
1758	–	if (EmptyString(conf->name))
1759	–	continue;
1760	–
1761	–	if (irccmp(conf->name, name) == 0)
1762	–	return (conf);
1763	–	}
749		break;
750
751		default:
752		break;
753		}
754	<	return(NULL);
754	>
755	>	return NULL;
756		}
757
758		/* rehash()
#	Line 1778 | Line 764 | find_exact_name_conf(ConfType type, cons
764		int
765		rehash(int sig)
766		{
767	<	if (sig != 0)
768	<	sendto_realops_flags(UMODE_ALL, L_ALL,
769	<	"Got signal SIGHUP, reloading ircd.conf file");
767	>	if (sig)
768	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
769	>	"Got signal SIGHUP, reloading configuration file(s)");
770
771		restart_resolver();
772
773		/* don't close listeners until we know we can go ahead with the rehash */
774
1789	–	/* Check to see if we magically got(or lost) IPv6 support */
1790	–	check_can_use_v6();
1791	–
775		read_conf_files(0);
776
777	<	if (ServerInfo.description != NULL)
778	<	strlcpy(me.info, ServerInfo.description, sizeof(me.info));
777	>	if (ConfigServerInfo.description)
778	>	strlcpy(me.info, ConfigServerInfo.description, sizeof(me.info));
779
780		load_conf_modules();
781	+	check_conf_klines();
782
783	<	flush_deleted_I_P();
1800	<
1801	<	rehashed_klines = 1;
1802	<
1803	<	if (ConfigLoggingEntry.use_logging)
1804	<	reopen_log(logFileName);
1805	<
1806	<	return(0);
783	>	return 0;
784		}
785
786		/* set_default_conf()
#	Line 1821 | Line 798 | set_default_conf(void)
798		/* verify init_class() ran, this should be an unnecessary check
799		* but its not much work.
800		*/
801	<	assert(class_default == (struct ConfItem *) class_items.tail->data);
801	>	assert(class_default == class_get_list()->tail->data);
802
803		#ifdef HAVE_LIBCRYPTO
804	<	ServerInfo.rsa_private_key = NULL;
805	<	ServerInfo.rsa_private_key_file = NULL;
804	>	ConfigServerInfo.message_digest_algorithm = EVP_sha256();
805	>	ConfigServerInfo.rsa_private_key = NULL;
806	>	ConfigServerInfo.rsa_private_key_file = NULL;
807		#endif
808
809	<	/* ServerInfo.name is not rehashable */
810	<	/* ServerInfo.name = ServerInfo.name; */
811	<	ServerInfo.description = NULL;
812	<	DupString(ServerInfo.network_name, NETWORK_NAME_DEFAULT);
813	<	DupString(ServerInfo.network_desc, NETWORK_DESC_DEFAULT);
814	<
815	<	memset(&ServerInfo.ip, 0, sizeof(ServerInfo.ip));
816	<	ServerInfo.specific_ipv4_vhost = 0;
817	<	memset(&ServerInfo.ip6, 0, sizeof(ServerInfo.ip6));
818	<	ServerInfo.specific_ipv6_vhost = 0;
819	<
820	<	ServerInfo.max_clients = MAXCLIENTS_MAX;
821	<
822	<	ServerInfo.hub = 0;
823	<	ServerInfo.dns_host.sin_addr.s_addr = 0;
824	<	ServerInfo.dns_host.sin_port = 0;
825	<	AdminInfo.name = NULL;
826	<	AdminInfo.email = NULL;
827	<	AdminInfo.description = NULL;
828	<
829	<	set_log_level(L_NOTICE);
830	<	ConfigLoggingEntry.use_logging = 1;
831	<	ConfigLoggingEntry.operlog[0] = '\0';
832	<	ConfigLoggingEntry.userlog[0] = '\0';
833	<	ConfigLoggingEntry.klinelog[0] = '\0';
834	<	ConfigLoggingEntry.glinelog[0] = '\0';
835	<	ConfigLoggingEntry.killlog[0] = '\0';
836	<	ConfigLoggingEntry.operspylog[0] = '\0';
837	<	ConfigLoggingEntry.ioerrlog[0] = '\0';
1860	<	ConfigLoggingEntry.failed_operlog[0] = '\0';
1861	<
1862	<	ConfigChannel.disable_fake_channels = NO;
1863	<	ConfigChannel.restrict_channels = NO;
1864	<	ConfigChannel.disable_local_channels = NO;
1865	<	ConfigChannel.use_invex = YES;
1866	<	ConfigChannel.use_except = YES;
1867	<	ConfigChannel.use_knock = YES;
1868	<	ConfigChannel.knock_delay = 300;
809	>	/* ConfigServerInfo.name is not rehashable */
810	>	/* ConfigServerInfo.name = ConfigServerInfo.name; */
811	>	ConfigServerInfo.description = NULL;
812	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
813	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
814	>
815	>	memset(&ConfigServerInfo.ip, 0, sizeof(ConfigServerInfo.ip));
816	>	ConfigServerInfo.specific_ipv4_vhost = 0;
817	>	memset(&ConfigServerInfo.ip6, 0, sizeof(ConfigServerInfo.ip6));
818	>	ConfigServerInfo.specific_ipv6_vhost = 0;
819	>
820	>	ConfigServerInfo.max_clients = MAXCLIENTS_MAX;
821	>	ConfigServerInfo.max_nick_length = 9;
822	>	ConfigServerInfo.max_topic_length = 80;
823	>	ConfigServerInfo.hub = 0;
824	>
825	>	ConfigAdminInfo.name = NULL;
826	>	ConfigAdminInfo.email = NULL;
827	>	ConfigAdminInfo.description = NULL;
828	>
829	>	log_del_all();
830	>
831	>	ConfigLog.use_logging = 1;
832	>
833	>	ConfigChannel.disable_fake_channels = 0;
834	>	ConfigChannel.invite_client_count = 10;
835	>	ConfigChannel.invite_client_time = 300;
836	>	ConfigChannel.knock_client_count = 1;
837	>	ConfigChannel.knock_client_time = 300;
838		ConfigChannel.knock_delay_channel = 60;
839	<	ConfigChannel.max_chans_per_user = 15;
1871	<	ConfigChannel.quiet_on_ban = YES;
839	>	ConfigChannel.max_channels = 25;
840		ConfigChannel.max_bans = 25;
841		ConfigChannel.default_split_user_count = 0;
842		ConfigChannel.default_split_server_count = 0;
843	<	ConfigChannel.no_join_on_split = NO;
844	<	ConfigChannel.no_create_on_split = NO;
1877	<	ConfigChannel.burst_topicwho = YES;
843	>	ConfigChannel.no_join_on_split = 0;
844	>	ConfigChannel.no_create_on_split = 0;
845
846	<	ConfigServerHide.flatten_links = NO;
846	>	ConfigServerHide.flatten_links = 0;
847		ConfigServerHide.links_delay = 300;
848	<	ConfigServerHide.hidden = NO;
849	<	ConfigServerHide.disable_hidden = NO;
850	<	ConfigServerHide.hide_servers = NO;
851	<	DupString(ConfigServerHide.hidden_name, NETWORK_NAME_DEFAULT);
852	<	ConfigServerHide.hide_server_ips = NO;
853	<
854	<
855	<	DupString(ConfigFileEntry.service_name, SERVICE_NAME_DEFAULT);
856	<	ConfigFileEntry.max_watch = WATCHSIZE_DEFAULT;
857	<	ConfigFileEntry.gline_min_cidr = 16;
858	<	ConfigFileEntry.gline_min_cidr6 = 48;
859	<	ConfigFileEntry.invisible_on_connect = YES;
860	<	ConfigFileEntry.burst_away = NO;
861	<	ConfigFileEntry.use_whois_actually = YES;
862	<	ConfigFileEntry.tkline_expire_notices = YES;
863	<	ConfigFileEntry.hide_spoof_ips = YES;
864	<	ConfigFileEntry.ignore_bogus_ts = NO;
865	<	ConfigFileEntry.disable_auth = NO;
866	<	ConfigFileEntry.disable_remote = NO;
867	<	ConfigFileEntry.kill_chase_time_limit = 90;
868	<	ConfigFileEntry.default_floodcount = 8;
869	<	ConfigFileEntry.failed_oper_notice = YES;
870	<	ConfigFileEntry.dots_in_ident = 0;
871	<	ConfigFileEntry.min_nonwildcard = 4;
872	<	ConfigFileEntry.min_nonwildcard_simple = 3;
873	<	ConfigFileEntry.max_accept = 20;
874	<	ConfigFileEntry.anti_nick_flood = NO;
875	<	ConfigFileEntry.max_nick_time = 20;
876	<	ConfigFileEntry.max_nick_changes = 5;
877	<	ConfigFileEntry.anti_spam_exit_message_time = 0;
878	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
879	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
880	<	ConfigFileEntry.kline_with_reason = YES;
881	<	ConfigFileEntry.kline_reason = NULL;
882	<	ConfigFileEntry.warn_no_nline = YES;
883	<	ConfigFileEntry.stats_o_oper_only = NO;
884	<	ConfigFileEntry.stats_k_oper_only = 1;  /* masked */
885	<	ConfigFileEntry.stats_i_oper_only = 1;  /* masked */
886	<	ConfigFileEntry.stats_P_oper_only = NO;
887	<	ConfigFileEntry.caller_id_wait = 60;
888	<	ConfigFileEntry.opers_bypass_callerid = NO;
889	<	ConfigFileEntry.pace_wait = 10;
890	<	ConfigFileEntry.pace_wait_simple = 1;
891	<	ConfigFileEntry.short_motd = NO;
892	<	ConfigFileEntry.ping_cookie = NO;
893	<	ConfigFileEntry.no_oper_flood = NO;
894	<	ConfigFileEntry.true_no_oper_flood = NO;
895	<	ConfigFileEntry.oper_pass_resv = YES;
896	<	ConfigFileEntry.glines = NO;
897	<	ConfigFileEntry.gline_time = 12 * 3600;
898	<	ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
899	<	ConfigFileEntry.client_flood = CLIENT_FLOOD_DEFAULT;
900	<	ConfigFileEntry.oper_only_umodes = UMODE_DEBUG;
901	<	ConfigFileEntry.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE |
902	<	UMODE_OPERWALL | UMODE_WALLOP;
903	<	DupString(ConfigFileEntry.servlink_path, SLPATH);
1937	<	#ifdef HAVE_LIBCRYPTO
1938	<	/* jdc -- This is our default value for a cipher.  According to the
1939	<	*        CRYPTLINK document (doc/cryptlink.txt), BF/128 must be supported
1940	<	*        under all circumstances if cryptlinks are enabled.  So,
1941	<	*        this will be our default.
1942	<	*
1943	<	*        NOTE: I apologise for the hard-coded value of "1" (BF/128).
1944	<	*              This should be moved into a find_cipher() routine.
1945	<	*/
1946	<	ConfigFileEntry.default_cipher_preference = &CipherTable[1];
1947	<	#endif
1948	<	ConfigFileEntry.use_egd = NO;
1949	<	ConfigFileEntry.egdpool_path = NULL;
1950	<	#ifdef HAVE_LIBZ
1951	<	ConfigFileEntry.compression_level = 0;
1952	<	#endif
1953	<	ConfigFileEntry.throttle_time = 10;
848	>	ConfigServerHide.hidden = 0;
849	>	ConfigServerHide.hide_servers = 0;
850	>	ConfigServerHide.hide_services = 0;
851	>	ConfigServerHide.hidden_name = xstrdup(NETWORK_NAME_DEFAULT);
852	>	ConfigServerHide.hide_server_ips = 0;
853	>	ConfigServerHide.disable_remote_commands = 0;
854	>
855	>	ConfigGeneral.away_count = 2;
856	>	ConfigGeneral.away_time = 10;
857	>	ConfigGeneral.service_name = xstrdup(SERVICE_NAME_DEFAULT);
858	>	ConfigGeneral.max_watch = WATCHSIZE_DEFAULT;
859	>	ConfigGeneral.cycle_on_host_change = 1;
860	>	ConfigGeneral.glines = 0;
861	>	ConfigGeneral.gline_time = 12 * 3600;
862	>	ConfigGeneral.gline_request_time = GLINE_REQUEST_EXPIRE_DEFAULT;
863	>	ConfigGeneral.gline_min_cidr = 16;
864	>	ConfigGeneral.gline_min_cidr6 = 48;
865	>	ConfigGeneral.invisible_on_connect = 1;
866	>	ConfigGeneral.tkline_expire_notices = 1;
867	>	ConfigGeneral.hide_spoof_ips = 1;
868	>	ConfigGeneral.ignore_bogus_ts = 0;
869	>	ConfigGeneral.disable_auth = 0;
870	>	ConfigGeneral.kill_chase_time_limit = 90;
871	>	ConfigGeneral.default_floodcount = 8;
872	>	ConfigGeneral.failed_oper_notice = 1;
873	>	ConfigGeneral.dots_in_ident = 0;
874	>	ConfigGeneral.min_nonwildcard = 4;
875	>	ConfigGeneral.min_nonwildcard_simple = 3;
876	>	ConfigGeneral.max_accept = 20;
877	>	ConfigGeneral.anti_nick_flood = 0;
878	>	ConfigGeneral.max_nick_time = 20;
879	>	ConfigGeneral.max_nick_changes = 5;
880	>	ConfigGeneral.anti_spam_exit_message_time = 0;
881	>	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
882	>	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
883	>	ConfigGeneral.warn_no_connect_block = 1;
884	>	ConfigGeneral.stats_e_disabled = 0;
885	>	ConfigGeneral.stats_o_oper_only = 0;
886	>	ConfigGeneral.stats_k_oper_only = 1;  /* 1 = masked */
887	>	ConfigGeneral.stats_i_oper_only = 1;  /* 1 = masked */
888	>	ConfigGeneral.stats_P_oper_only = 0;
889	>	ConfigGeneral.stats_u_oper_only = 0;
890	>	ConfigGeneral.caller_id_wait = 60;
891	>	ConfigGeneral.opers_bypass_callerid = 0;
892	>	ConfigGeneral.pace_wait = 10;
893	>	ConfigGeneral.pace_wait_simple = 1;
894	>	ConfigGeneral.short_motd = 0;
895	>	ConfigGeneral.ping_cookie = 0;
896	>	ConfigGeneral.no_oper_flood = 0;
897	>	ConfigGeneral.true_no_oper_flood = 0;
898	>	ConfigGeneral.oper_pass_resv = 1;
899	>	ConfigGeneral.max_targets = MAX_TARGETS_DEFAULT;
900	>	ConfigGeneral.oper_only_umodes = UMODE_DEBUG;
901	>	ConfigGeneral.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE | UMODE_WALLOP;
902	>	ConfigGeneral.throttle_count = 1;
903	>	ConfigGeneral.throttle_time = 1;
904		}
905
906	<	/* read_conf()
906	>	static void
907	>	validate_conf(void)
908	>	{
909	>	if (ConfigGeneral.ts_warn_delta < TS_WARN_DELTA_MIN)
910	>	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
911	>
912	>	if (ConfigGeneral.ts_max_delta < TS_MAX_DELTA_MIN)
913	>	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
914	>
915	>	if (ConfigServerInfo.network_name == NULL)
916	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
917	>
918	>	if (ConfigServerInfo.network_desc == NULL)
919	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
920	>
921	>	if (ConfigGeneral.service_name == NULL)
922	>	ConfigGeneral.service_name = xstrdup(SERVICE_NAME_DEFAULT);
923	>
924	>	ConfigGeneral.max_watch = IRCD_MAX(ConfigGeneral.max_watch, WATCHSIZE_MIN);
925	>	}
926	>
927	>	/* read_conf()
928		*
929		* inputs       - file descriptor pointing to config file to use
930		* output       - None
931		* side effects - Read configuration file.
932		*/
933		static void
934	<	read_conf(FBFILE *file)
934	>	read_conf(FILE *file)
935		{
936		lineno = 0;
937
938	<	set_default_conf(); /* Set default values prior to conf parsing */
938	>	set_default_conf();  /* Set default values prior to conf parsing */
939		conf_parser_ctx.pass = 1;
940	<	yyparse();          /* pick up the classes first */
940	>	yyparse();  /* Pick up the classes first */
941
942	<	fbrewind(file);
942	>	rewind(file);
943
944		conf_parser_ctx.pass = 2;
945	<	yyparse();          /* Load the values from the conf */
946	<	validate_conf();    /* Check to make sure some values are still okay. */
947	<	/* Some global values are also loaded here. */
948	<	check_class();      /* Make sure classes are valid */
1978	<	}
1979	<
1980	<	static void
1981	<	validate_conf(void)
1982	<	{
1983	<	if (ConfigFileEntry.ts_warn_delta < TS_WARN_DELTA_MIN)
1984	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
1985	<
1986	<	if (ConfigFileEntry.ts_max_delta < TS_MAX_DELTA_MIN)
1987	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
1988	<
1989	<	if (ConfigFileEntry.servlink_path == NULL)
1990	<	DupString(ConfigFileEntry.servlink_path, SLPATH);
1991	<
1992	<	if (ServerInfo.network_name == NULL)
1993	<	DupString(ServerInfo.network_name,NETWORK_NAME_DEFAULT);
1994	<
1995	<	if (ServerInfo.network_desc == NULL)
1996	<	DupString(ServerInfo.network_desc,NETWORK_DESC_DEFAULT);
1997	<
1998	<	if (ConfigFileEntry.service_name == NULL)
1999	<	DupString(ConfigFileEntry.service_name, SERVICE_NAME_DEFAULT);
2000	<
2001	<	if ((ConfigFileEntry.client_flood < CLIENT_FLOOD_MIN) ||
2002	<	(ConfigFileEntry.client_flood > CLIENT_FLOOD_MAX))
2003	<	ConfigFileEntry.client_flood = CLIENT_FLOOD_MAX;
2004	<
2005	<	ConfigFileEntry.max_watch = IRCD_MAX(ConfigFileEntry.max_watch, WATCHSIZE_MIN);
945	>	yyparse();  /* Load the values from the conf */
946	>	validate_conf();  /* Check to make sure some values are still okay. */
947	>	/* Some global values are also loaded here. */
948	>	class_delete_marked();  /* Delete unused classes that are marked for deletion */
949		}
950
951		/* lookup_confhost()
#	Line 2010 | Line 953 | validate_conf(void)
953		* start DNS lookups of all hostnames in the conf
954		* line and convert an IP addresses in a.b.c.d number for to IP#s.
955		*/
956	<	static void
957	<	lookup_confhost(struct ConfItem *conf)
956	>	void
957	>	lookup_confhost(struct MaskItem *conf)
958		{
2016	–	struct AccessItem *aconf;
959		struct addrinfo hints, *res;
960
961	<	aconf = map_to_conf(conf);
962	<
2021	<	if (EmptyString(aconf->host) ||
2022	<	EmptyString(aconf->user))
2023	<	{
2024	<	ilog(L_ERROR, "Host/server name error: (%s) (%s)",
2025	<	aconf->host, conf->name);
2026	<	return;
2027	<	}
2028	<
2029	<	if (strchr(aconf->host, '*') ||
2030	<	strchr(aconf->host, '?'))
2031	<	return;
2032	<
2033	<	/* Do name lookup now on hostnames given and store the
961	>	/*
962	>	* Do name lookup now on hostnames given and store the
963		* ip numbers in conf structure.
964		*/
965		memset(&hints, 0, sizeof(hints));
#	Line 2041 | Line 970 | lookup_confhost(struct ConfItem *conf)
970		/* Get us ready for a bind() and don't bother doing dns lookup */
971		hints.ai_flags = AI_PASSIVE | AI_NUMERICHOST;
972
973	<	if (getaddrinfo(aconf->host, NULL, &hints, &res))
973	>	if (getaddrinfo(conf->host, NULL, &hints, &res))
974		{
975	<	conf_dns_lookup(aconf);
975	>	conf_dns_lookup(conf);
976		return;
977		}
978
979	<	assert(res != NULL);
979	>	assert(res);
980	>
981	>	memcpy(&conf->addr, res->ai_addr, res->ai_addrlen);
982	>	conf->addr.ss_len = res->ai_addrlen;
983	>	conf->addr.ss.ss_family = res->ai_family;
984
2052	–	memcpy(&aconf->ipnum, res->ai_addr, res->ai_addrlen);
2053	–	aconf->ipnum.ss_len = res->ai_addrlen;
2054	–	aconf->ipnum.ss.ss_family = res->ai_family;
985		freeaddrinfo(res);
986		}
987
#	Line 2065 | Line 995 | lookup_confhost(struct ConfItem *conf)
995		int
996		conf_connect_allowed(struct irc_ssaddr *addr, int aftype)
997		{
998	<	struct ip_entry *ip_found;
999	<	struct AccessItem *aconf = find_dline_conf(addr, aftype);
998	>	struct ip_entry *ip_found = NULL;
999	>	struct MaskItem *conf = find_dline_conf(addr, aftype);
1000
1001		/* DLINE exempt also gets you out of static limits/pacing... */
1002	<	if (aconf && (aconf->status & CONF_EXEMPTDLINE))
1002	>	if (conf && (conf->type == CONF_EXEMPT))
1003		return 0;
1004
1005	<	if (aconf != NULL)
1005	>	if (conf)
1006		return BANNED_CLIENT;
1007
1008	<	ip_found = find_or_add_ip(addr);
1008	>	ip_found = ipcache_find_or_add_address(addr);
1009
1010	<	if ((CurrentTime - ip_found->last_attempt) <
2081	<	ConfigFileEntry.throttle_time)
1010	>	if ((CurrentTime - ip_found->last_attempt) < ConfigGeneral.throttle_time)
1011		{
1012	<	ip_found->last_attempt = CurrentTime;
1013	<	return TOO_FAST;
1012	>	if (ip_found->connection_count >= ConfigGeneral.throttle_count)
1013	>	return TOO_FAST;
1014	>
1015	>	++ip_found->connection_count;
1016		}
1017	+	else
1018	+	ip_found->connection_count = 1;
1019
1020		ip_found->last_attempt = CurrentTime;
1021		return 0;
1022		}
1023
2091	–	static struct AccessItem *
2092	–	find_regexp_kline(const char *uhi[])
2093	–	{
2094	–	#ifdef HAVE_LIBPCRE
2095	–	const dlink_node *ptr = NULL;
2096	–
2097	–	DLINK_FOREACH(ptr, rkconf_items.head)
2098	–	{
2099	–	struct AccessItem *aptr = map_to_conf(ptr->data);
2100	–
2101	–	assert(aptr->regexuser);
2102	–	assert(aptr->regexhost);
2103	–
2104	–	if (!ircd_pcre_exec(aptr->regexuser, uhi[0]) &&
2105	–	(!ircd_pcre_exec(aptr->regexhost, uhi[1]) ||
2106	–	!ircd_pcre_exec(aptr->regexhost, uhi[2])))
2107	–	return aptr;
2108	–	}
2109	–	#endif
2110	–	return NULL;
2111	–	}
2112	–
2113	–	/* find_kill()
2114	–	*
2115	–	* inputs       - pointer to client structure
2116	–	* output       - pointer to struct AccessItem if found
2117	–	* side effects - See if this user is klined already,
2118	–	*                and if so, return struct AccessItem pointer
2119	–	*/
2120	–	struct AccessItem *
2121	–	find_kill(struct Client *client_p)
2122	–	{
2123	–	struct AccessItem *aconf = NULL;
2124	–	const char *uhi[3];
2125	–
2126	–	uhi[0] = client_p->username;
2127	–	uhi[1] = client_p->host;
2128	–	uhi[2] = client_p->sockhost;
2129	–
2130	–	assert(client_p != NULL);
2131	–
2132	–	aconf = find_kline_conf(client_p->host, client_p->username,
2133	–	&client_p->localClient->ip,
2134	–	client_p->localClient->aftype);
2135	–	if (aconf == NULL)
2136	–	aconf = find_regexp_kline(uhi);
2137	–
2138	–	if (aconf && (aconf->status & CONF_KLINE))
2139	–	return aconf;
2140	–
2141	–	return NULL;
2142	–	}
2143	–
2144	–	struct AccessItem *
2145	–	find_gline(struct Client *client_p)
2146	–	{
2147	–	struct AccessItem *aconf;
2148	–
2149	–	assert(client_p != NULL);
2150	–
2151	–	aconf = find_gline_conf(client_p->host, client_p->username,
2152	–	&client_p->localClient->ip,
2153	–	client_p->localClient->aftype);
2154	–
2155	–	if (aconf && (aconf->status & CONF_GLINE))
2156	–	return aconf;
2157	–
2158	–	return NULL;
2159	–	}
2160	–
2161	–	/* add_temp_line()
2162	–	*
2163	–	* inputs        - pointer to struct ConfItem
2164	–	* output        - none
2165	–	* Side effects  - links in given struct ConfItem into
2166	–	*                 temporary *line link list
2167	–	*/
2168	–	void
2169	–	add_temp_line(struct ConfItem *conf)
2170	–	{
2171	–	struct AccessItem *aconf;
2172	–
2173	–	if (conf->type == DLINE_TYPE)
2174	–	{
2175	–	aconf = map_to_conf(conf);
2176	–	SetConfTemporary(aconf);
2177	–	dlinkAdd(conf, &conf->node, &temporary_dlines);
2178	–	MyFree(aconf->user);
2179	–	aconf->user = NULL;
2180	–	add_conf_by_address(CONF_DLINE, aconf);
2181	–	}
2182	–	else if (conf->type == KLINE_TYPE)
2183	–	{
2184	–	aconf = map_to_conf(conf);
2185	–	SetConfTemporary(aconf);
2186	–	dlinkAdd(conf, &conf->node, &temporary_klines);
2187	–	add_conf_by_address(CONF_KILL, aconf);
2188	–	}
2189	–	else if (conf->type == GLINE_TYPE)
2190	–	{
2191	–	aconf = map_to_conf(conf);
2192	–	SetConfTemporary(aconf);
2193	–	dlinkAdd(conf, &conf->node, &temporary_glines);
2194	–	add_conf_by_address(CONF_GLINE, aconf);
2195	–	}
2196	–	else if (conf->type == XLINE_TYPE)
2197	–	{
2198	–	conf->flags |= CONF_FLAGS_TEMPORARY;
2199	–	dlinkAdd(conf, make_dlink_node(), &temporary_xlines);
2200	–	}
2201	–	else if (conf->type == RXLINE_TYPE)
2202	–	{
2203	–	conf->flags |= CONF_FLAGS_TEMPORARY;
2204	–	dlinkAdd(conf, make_dlink_node(), &temporary_rxlines);
2205	–	}
2206	–	else if (conf->type == RKLINE_TYPE)
2207	–	{
2208	–	conf->flags |= CONF_FLAGS_TEMPORARY;
2209	–	dlinkAdd(conf, make_dlink_node(), &temporary_rklines);
2210	–	}
2211	–	else if ((conf->type == NRESV_TYPE) || (conf->type == CRESV_TYPE))
2212	–	{
2213	–	conf->flags |= CONF_FLAGS_TEMPORARY;
2214	–	dlinkAdd(conf, make_dlink_node(), &temporary_resv);
2215	–	}
2216	–	}
2217	–
1024		/* cleanup_tklines()
1025		*
1026		* inputs       - NONE
#	Line 2225 | Line 1031 | add_temp_line(struct ConfItem *conf)
1031		void
1032		cleanup_tklines(void *notused)
1033		{
1034	<	expire_tklines(&temporary_glines);
1035	<	expire_tklines(&temporary_klines);
1036	<	expire_tklines(&temporary_dlines);
1037	<	expire_tklines(&temporary_xlines);
2232	<	expire_tklines(&temporary_rxlines);
2233	<	expire_tklines(&temporary_rklines);
2234	<	expire_tklines(&temporary_resv);
1034	>	hostmask_expire_temporary();
1035	>	expire_tklines(&xconf_items);
1036	>	expire_tklines(&nresv_items);
1037	>	expire_tklines(&cresv_items);
1038		}
1039
1040		/* expire_tklines()
#	Line 2243 | Line 1046 | cleanup_tklines(void *notused)
1046		static void
1047		expire_tklines(dlink_list *tklist)
1048		{
1049	<	dlink_node *ptr;
1050	<	dlink_node *next_ptr;
2248	<	struct ConfItem *conf;
2249	<	struct MatchItem *xconf;
2250	<	struct MatchItem *nconf;
2251	<	struct AccessItem *aconf;
2252	<	struct ResvChannel *cconf;
1049	>	dlink_node *ptr = NULL, *ptr_next = NULL;
1050	>	struct MaskItem *conf = NULL;
1051
1052	<	DLINK_FOREACH_SAFE(ptr, next_ptr, tklist->head)
1052	>	DLINK_FOREACH_SAFE(ptr, ptr_next, tklist->head)
1053		{
1054		conf = ptr->data;
2257	–	if (conf->type == GLINE_TYPE ||
2258	–	conf->type == KLINE_TYPE ||
2259	–	conf->type == DLINE_TYPE)
2260	–	{
2261	–	aconf = (struct AccessItem *)map_to_conf(conf);
2262	–	if (aconf->hold <= CurrentTime)
2263	–	{
2264	–	/* XXX - Do we want GLINE expiry notices?? */
2265	–	/* Alert opers that a TKline expired - Hwy */
2266	–	if (ConfigFileEntry.tkline_expire_notices)
2267	–	{
2268	–	if (aconf->status & CONF_KILL)
2269	–	{
2270	–	sendto_realops_flags(UMODE_ALL, L_ALL,
2271	–	"Temporary K-line for [%s@%s] expired",
2272	–	(aconf->user) ? aconf->user : "*",
2273	–	(aconf->host) ? aconf->host : "*");
2274	–	}
2275	–	else if (conf->type == DLINE_TYPE)
2276	–	{
2277	–	sendto_realops_flags(UMODE_ALL, L_ALL,
2278	–	"Temporary D-line for [%s] expired",
2279	–	(aconf->host) ? aconf->host : "*");
2280	–	}
2281	–	}
1055
1056	<	dlinkDelete(ptr, tklist);
1057	<	delete_one_address_conf(aconf->host, aconf);
1058	<	}
1059	<	}
2287	<	else if (conf->type == XLINE_TYPE ||
2288	<	conf->type == RXLINE_TYPE)
2289	<	{
2290	<	xconf = (struct MatchItem *)map_to_conf(conf);
2291	<	if (xconf->hold <= CurrentTime)
2292	<	{
2293	<	if (ConfigFileEntry.tkline_expire_notices)
2294	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2295	<	"Temporary X-line for [%s] %sexpired", conf->name,
2296	<	conf->type == RXLINE_TYPE ? "(REGEX) " : "");
2297	<	dlinkDelete(ptr, tklist);
2298	<	free_dlink_node(ptr);
2299	<	delete_conf_item(conf);
2300	<	}
2301	<	}
2302	<	else if (conf->type == RKLINE_TYPE)
1056	>	if (!conf->until || conf->until > CurrentTime)
1057	>	continue;
1058	>
1059	>	if (conf->type == CONF_XLINE)
1060		{
1061	<	aconf = map_to_conf(conf);
1062	<	if (aconf->hold <= CurrentTime)
1063	<	{
1064	<	if (ConfigFileEntry.tkline_expire_notices)
2308	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2309	<	"Temporary K-line for [%s@%s] (REGEX) expired",
2310	<	(aconf->user) ? aconf->user : "*",
2311	<	(aconf->host) ? aconf->host : "*");
2312	<	dlinkDelete(ptr, tklist);
2313	<	free_dlink_node(ptr);
2314	<	delete_conf_item(conf);
2315	<	}
1061	>	if (ConfigGeneral.tkline_expire_notices)
1062	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1063	>	"Temporary X-line for [%s] expired", conf->name);
1064	>	conf_free(conf);
1065		}
1066	<	else if (conf->type == NRESV_TYPE)
1066	>	else if (conf->type == CONF_NRESV || conf->type == CONF_CRESV)
1067		{
1068	<	nconf = (struct MatchItem *)map_to_conf(conf);
1069	<	if (nconf->hold <= CurrentTime)
2321	<	{
2322	<	if (ConfigFileEntry.tkline_expire_notices)
2323	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1068	>	if (ConfigGeneral.tkline_expire_notices)
1069	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1070		"Temporary RESV for [%s] expired", conf->name);
1071	<	dlinkDelete(ptr, tklist);
2326	<	free_dlink_node(ptr);
2327	<	delete_conf_item(conf);
2328	<	}
2329	<	}
2330	<	else if (conf->type == CRESV_TYPE)
2331	<	{
2332	<	cconf = (struct ResvChannel *)map_to_conf(conf);
2333	<	if (cconf->hold <= CurrentTime)
2334	<	{
2335	<	if (ConfigFileEntry.tkline_expire_notices)
2336	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2337	<	"Temporary RESV for [%s] expired", cconf->name);
2338	<	delete_channel_resv(cconf);
2339	<	}
1071	>	conf_free(conf);
1072		}
1073		}
1074		}
#	Line 2349 | Line 1081 | expire_tklines(dlink_list *tklist)
1081		*/
1082		static const struct oper_privs
1083		{
1084	<	const unsigned int oprivs;
2353	<	const unsigned int hidden;
1084	>	const unsigned int flag;
1085		const unsigned char c;
1086		} flag_list[] = {
1087	<	{ OPER_FLAG_ADMIN,       OPER_FLAG_HIDDEN_ADMIN,  'A' },
1088	<	{ OPER_FLAG_REMOTEBAN,   0,                       'B' },
1089	<	{ OPER_FLAG_DIE,         0,                       'D' },
1090	<	{ OPER_FLAG_GLINE,       0,                       'G' },
1091	<	{ OPER_FLAG_REHASH,      0,                       'H' },
1092	<	{ OPER_FLAG_K,           0,                       'K' },
1093	<	{ OPER_FLAG_OPERWALL,    0,                       'L' },
1094	<	{ OPER_FLAG_N,           0,                       'N' },
1095	<	{ OPER_FLAG_GLOBAL_KILL, 0,                       'O' },
1096	<	{ OPER_FLAG_REMOTE,      0,                       'R' },
1097	<	{ OPER_FLAG_OPER_SPY,    0,                       'S' },
1098	<	{ OPER_FLAG_UNKLINE,     0,                       'U' },
1099	<	{ OPER_FLAG_X,           0,                       'X' },
1100	<	{ 0, 0, '\0' }
1087	>	{ OPER_FLAG_ADMIN,          'A' },
1088	>	{ OPER_FLAG_REMOTEBAN,      'B' },
1089	>	{ OPER_FLAG_DIE,            'D' },
1090	>	{ OPER_FLAG_GLINE,          'G' },
1091	>	{ OPER_FLAG_REHASH,         'H' },
1092	>	{ OPER_FLAG_KLINE,          'K' },
1093	>	{ OPER_FLAG_KILL,           'N' },
1094	>	{ OPER_FLAG_KILL_REMOTE,    'O' },
1095	>	{ OPER_FLAG_CONNECT,        'P' },
1096	>	{ OPER_FLAG_CONNECT_REMOTE, 'Q' },
1097	>	{ OPER_FLAG_SQUIT,          'R' },
1098	>	{ OPER_FLAG_SQUIT_REMOTE,   'S' },
1099	>	{ OPER_FLAG_UNKLINE,        'U' },
1100	>	{ OPER_FLAG_XLINE,          'X' },
1101	>	{ 0, '\0' }
1102		};
1103
1104		char *
1105		oper_privs_as_string(const unsigned int port)
1106		{
1107	<	static char privs_out[16];
1107	>	static char privs_out[IRCD_BUFSIZE];
1108		char *privs_ptr = privs_out;
2377	–	unsigned int i = 0;
1109
1110	<	for (; flag_list[i].oprivs; ++i)
1110	>	for (const struct oper_privs *opriv = flag_list; opriv->flag; ++opriv)
1111		{
1112	<	if ((port & flag_list[i].oprivs) &&
1113	<	(port & flag_list[i].hidden) == 0)
2383	<	*privs_ptr++ = flag_list[i].c;
1112	>	if (port & opriv->flag)
1113	>	*privs_ptr++ = opriv->c;
1114		else
1115	<	*privs_ptr++ = ToLowerTab[flag_list[i].c];
1115	>	*privs_ptr++ = ToLower(opriv->c);
1116		}
1117
1118		*privs_ptr = '\0';
#	Line 2391 | Line 1121 | oper_privs_as_string(const unsigned int
1121		}
1122
1123		/*
1124	<	* Input: A client to find the active oper{} name for.
1124	>	* Input: A client to find the active operator {} name for.
1125		* Output: The nick!user@host{oper} of the oper.
1126		*         "oper" is server name for remote opers
1127		* Side effects: None.
1128		*/
1129	<	char *
1129	>	const char *
1130		get_oper_name(const struct Client *client_p)
1131		{
1132	<	dlink_node *cnode;
2403	<	struct ConfItem *conf;
2404	<	struct AccessItem *aconf;
2405	<
1132	>	const dlink_node *cnode = NULL;
1133		/* +5 for !,@,{,} and null */
1134		static char buffer[NICKLEN + USERLEN + HOSTLEN + HOSTLEN + 5];
1135
1136		if (MyConnect(client_p))
1137		{
1138	<	DLINK_FOREACH(cnode, client_p->localClient->confs.head)
1138	>	if ((cnode = client_p->localClient->confs.head))
1139		{
1140	<	conf = cnode->data;
2414	<	aconf = map_to_conf(conf);
1140	>	const struct MaskItem *conf = cnode->data;
1141
1142	<	if (IsConfOperator(aconf))
1142	>	if (IsConfOperator(conf))
1143		{
1144	<	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1144	>	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1145		client_p->username, client_p->host, conf->name);
1146	<	return buffer;
1146	>	return buffer;
1147		}
1148		}
1149
1150	<	/* Probably should assert here for now. If there is an oper out there
1151	<	* with no oper{} conf attached, it would be good for us to know...
1150	>	/*
1151	>	* Probably should assert here for now. If there is an oper out there
1152	>	* with no operator {} conf attached, it would be good for us to know...
1153		*/
1154	<	assert(0); /* Oper without oper conf! */
1154	>	assert(0);  /* Oper without oper conf! */
1155		}
1156
1157		snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1158	<	client_p->username, client_p->host, client_p->servptr->name);
1158	>	client_p->username, client_p->host, client_p->servptr->name);
1159		return buffer;
1160		}
1161
#	Line 2441 | Line 1168 | get_oper_name(const struct Client *clien
1168		void
1169		read_conf_files(int cold)
1170		{
1171	<	const char *filename;
1172	<	char chanmodes[32];
1173	<	char chanlimit[32];
1171	>	const char *filename = NULL;
1172	>	char chanmodes[IRCD_BUFSIZE] = "";
1173	>	char chanlimit[IRCD_BUFSIZE] = "";
1174
1175		conf_parser_ctx.boot = cold;
1176	<	filename = get_conf_name(CONF_TYPE);
1176	>	filename = ConfigGeneral.configfile;
1177
1178		/* We need to know the initial filename for the yyerror() to report
1179		FIXME: The full path is in conffilenamebuf first time since we
1180	<	dont know anything else
1180	>	don't know anything else
1181
1182	<	- Gozem 2002-07-21
1182	>	- Gozem 2002-07-21
1183		*/
1184		strlcpy(conffilebuf, filename, sizeof(conffilebuf));
1185
1186	<	if ((conf_parser_ctx.conf_file = fbopen(filename, "r")) == NULL)
1186	>	if ((conf_parser_ctx.conf_file = fopen(filename, "r")) == NULL)
1187		{
1188		if (cold)
1189		{
1190	<	ilog(L_CRIT, "Unable to read configuration file '%s': %s",
1190	>	ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
1191		filename, strerror(errno));
1192		exit(-1);
1193		}
1194		else
1195		{
1196	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1197	<	"Unable to read configuration file '%s': %s",
1198	<	filename, strerror(errno));
1196	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1197	>	"Unable to read configuration file '%s': %s",
1198	>	filename, strerror(errno));
1199		return;
1200		}
1201		}
#	Line 2477 | Line 1204 | read_conf_files(int cold)
1204		clear_out_old_conf();
1205
1206		read_conf(conf_parser_ctx.conf_file);
1207	<	fbclose(conf_parser_ctx.conf_file);
1207	>	fclose(conf_parser_ctx.conf_file);
1208
1209	<	add_isupport("NETWORK", ServerInfo.network_name, -1);
2483	<	snprintf(chanmodes, sizeof(chanmodes), "b%s%s:%d",
2484	<	ConfigChannel.use_except ? "e" : "",
2485	<	ConfigChannel.use_invex ? "I" : "", ConfigChannel.max_bans);
2486	<	add_isupport("MAXLIST", chanmodes, -1);
2487	<	add_isupport("MAXTARGETS", NULL, ConfigFileEntry.max_targets);
1209	>	log_reopen_all();
1210
1211	<	if (ConfigChannel.disable_local_channels)
1212	<	add_isupport("CHANTYPES", "#", -1);
2491	<	else
2492	<	add_isupport("CHANTYPES", "#&", -1);
1211	>	add_isupport("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
1212	>	add_isupport("NETWORK", ConfigServerInfo.network_name, -1);
1213
1214	<	snprintf(chanlimit, sizeof(chanlimit), "%s:%d",
1215	<	ConfigChannel.disable_local_channels ? "#" : "#&",
1216	<	ConfigChannel.max_chans_per_user);
1214	>	snprintf(chanmodes, sizeof(chanmodes), "beI:%d", ConfigChannel.max_bans);
1215	>	add_isupport("MAXLIST", chanmodes, -1);
1216	>	add_isupport("MAXTARGETS", NULL, ConfigGeneral.max_targets);
1217	>	add_isupport("CHANTYPES", "#", -1);
1218	>
1219	>	snprintf(chanlimit, sizeof(chanlimit), "#:%d",
1220	>	ConfigChannel.max_channels);
1221		add_isupport("CHANLIMIT", chanlimit, -1);
1222	<	snprintf(chanmodes, sizeof(chanmodes), "%s%s%s",
1223	<	ConfigChannel.use_except ? "e" : "",
1224	<	ConfigChannel.use_invex ? "I" : "", "b,k,l,imnprstORS");
2501	<	add_isupport("CHANNELLEN", NULL, LOCAL_CHANNELLEN);
2502	<
2503	<	if (ConfigChannel.use_except)
2504	<	add_isupport("EXCEPTS", "e", -1);
2505	<	if (ConfigChannel.use_invex)
2506	<	add_isupport("INVEX", "I", -1);
1222	>	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,cimnprstMORS");
1223	>	add_isupport("CHANNELLEN", NULL, CHANNELLEN);
1224	>	add_isupport("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
1225		add_isupport("CHANMODES", chanmodes, -1);
1226
1227		/*
#	Line 2511 | Line 1229 | read_conf_files(int cold)
1229		* on strlen(form_str(RPL_ISUPPORT))
1230		*/
1231		rebuild_isupport_message_line();
2514	–
2515	–	#ifdef HAVE_LIBPCRE
2516	–	parse_conf_file(RKLINE_TYPE, cold);
2517	–	parse_conf_file(RXLINE_TYPE, cold);
2518	–	#endif
2519	–	parse_conf_file(KLINE_TYPE, cold);
2520	–	parse_conf_file(DLINE_TYPE, cold);
2521	–	parse_conf_file(XLINE_TYPE, cold);
2522	–	parse_conf_file(NRESV_TYPE, cold);
2523	–	parse_conf_file(CRESV_TYPE, cold);
2524	–	}
2525	–
2526	–	/* parse_conf_file()
2527	–	*
2528	–	* inputs       - type of conf file to parse
2529	–	* output       - none
2530	–	* side effects - conf file for givenconf type is opened and read then parsed
2531	–	*/
2532	–	static void
2533	–	parse_conf_file(int type, int cold)
2534	–	{
2535	–	FBFILE *file = NULL;
2536	–	const char *filename = get_conf_name(type);
2537	–
2538	–	if ((file = fbopen(filename, "r")) == NULL)
2539	–	{
2540	–	if (cold)
2541	–	ilog(L_ERROR, "Unable to read configuration file '%s': %s",
2542	–	filename, strerror(errno));
2543	–	else
2544	–	sendto_realops_flags(UMODE_ALL, L_ALL,
2545	–	"Unable to read configuration file '%s': %s",
2546	–	filename, strerror(errno));
2547	–	}
2548	–	else
2549	–	{
2550	–	parse_csv_file(file, type);
2551	–	fbclose(file);
2552	–	}
1232		}
1233
1234		/* clear_out_old_conf()
#	Line 2562 | Line 1241 | static void
1241		clear_out_old_conf(void)
1242		{
1243		dlink_node *ptr = NULL, *next_ptr = NULL;
1244	<	struct ConfItem *conf;
2566	<	struct AccessItem *aconf;
2567	<	struct ClassItem *cltmp;
2568	<	struct MatchItem *match_item;
1244	>	struct MaskItem *conf;
1245		dlink_list *free_items [] = {
1246	<	&server_items,   &oconf_items,    &hub_items, &leaf_items,
1247	<	&uconf_items,   &xconf_items, &rxconf_items, &rkconf_items,
1248	<	&nresv_items, &cluster_items,  &gdeny_items, &service_items, NULL
1246	>	&server_items,   &oconf_items,
1247	>	&uconf_items,   &xconf_items,
1248	>	&nresv_items, &cluster_items,  &service_items, &cresv_items, NULL
1249		};
1250
1251		dlink_list ** iterator = free_items; /* C is dumb */
#	Line 2577 | Line 1253 | clear_out_old_conf(void)
1253		/* We only need to free anything allocated by yyparse() here.
1254		* Resetting structs, etc, is taken care of by set_default_conf().
1255		*/
1256	<
1256	>
1257		for (; *iterator != NULL; iterator++)
1258		{
1259		DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
1260		{
1261		conf = ptr->data;
2586	–	/* XXX This is less than pretty */
2587	–	if (conf->type == SERVER_TYPE)
2588	–	{
2589	–	aconf = map_to_conf(conf);
1262
1263	<	if (aconf->clients != 0)
2592	<	{
2593	<	SetConfIllegal(aconf);
2594	<	dlinkDelete(&conf->node, &server_items);
2595	<	}
2596	<	else
2597	<	{
2598	<	delete_conf_item(conf);
2599	<	}
2600	<	}
2601	<	else if (conf->type == OPER_TYPE)
2602	<	{
2603	<	aconf = map_to_conf(conf);
1263	>	dlinkDelete(&conf->node, map_to_list(conf->type));
1264
1265	<	if (aconf->clients != 0)
1266	<	{
2607	<	SetConfIllegal(aconf);
2608	<	dlinkDelete(&conf->node, &oconf_items);
2609	<	}
2610	<	else
2611	<	{
2612	<	delete_conf_item(conf);
2613	<	}
2614	<	}
2615	<	else if (conf->type == CLIENT_TYPE)
1265	>	/* XXX This is less than pretty */
1266	>	if (conf->type == CONF_SERVER || conf->type == CONF_OPER)
1267		{
1268	<	aconf = map_to_conf(conf);
1269	<
2619	<	if (aconf->clients != 0)
2620	<	{
2621	<	SetConfIllegal(aconf);
2622	<	}
2623	<	else
2624	<	{
2625	<	delete_conf_item(conf);
2626	<	}
1268	>	if (!conf->ref_count)
1269	>	conf_free(conf);
1270		}
1271	<	else if (conf->type == XLINE_TYPE  ||
2629	<	conf->type == RXLINE_TYPE ||
2630	<	conf->type == RKLINE_TYPE)
1271	>	else if (conf->type == CONF_XLINE)
1272		{
1273	<	/* temporary (r)xlines are also on
1274	<	* the (r)xconf items list */
2634	<	if (conf->flags & CONF_FLAGS_TEMPORARY)
2635	<	continue;
2636	<
2637	<	delete_conf_item(conf);
1273	>	if (!conf->until)
1274	>	conf_free(conf);
1275		}
1276		else
1277	<	{
2641	<	if ((conf->type == LEAF_TYPE) || (conf->type == HUB_TYPE))
2642	<	{
2643	<	match_item = map_to_conf(conf);
2644	<	if (match_item->ref_count <= 0)
2645	<	delete_conf_item(conf);
2646	<	else
2647	<	{
2648	<	match_item->illegal = 1;
2649	<	dlinkDelete(&conf->node, *iterator);
2650	<	}
2651	<	}
2652	<	else
2653	<	delete_conf_item(conf);
2654	<	}
1277	>	conf_free(conf);
1278		}
1279		}
1280
1281	+	motd_clear();
1282	+
1283		/*
1284		* don't delete the class table, rather mark all entries
1285	<	* for deletion. The table is cleaned up by check_class. - avalon
1285	>	* for deletion. The table is cleaned up by class_delete_marked. - avalon
1286		*/
1287	<	DLINK_FOREACH(ptr, class_items.head)
2663	<	{
2664	<	cltmp = map_to_conf(ptr->data);
2665	<
2666	<	if (ptr != class_items.tail)  /* never mark the "default" class */
2667	<	cltmp->active = 0;
2668	<	}
1287	>	class_mark_for_deletion();
1288
1289		clear_out_address_conf();
1290
1291		/* clean out module paths */
1292		mod_clear_paths();
1293
1294	<	/* clean out ServerInfo */
1295	<	MyFree(ServerInfo.description);
1296	<	ServerInfo.description = NULL;
1297	<	MyFree(ServerInfo.network_name);
1298	<	ServerInfo.network_name = NULL;
1299	<	MyFree(ServerInfo.network_desc);
1300	<	ServerInfo.network_desc = NULL;
2682	<	MyFree(ConfigFileEntry.egdpool_path);
2683	<	ConfigFileEntry.egdpool_path = NULL;
1294	>	/* clean out ConfigServerInfo */
1295	>	MyFree(ConfigServerInfo.description);
1296	>	ConfigServerInfo.description = NULL;
1297	>	MyFree(ConfigServerInfo.network_name);
1298	>	ConfigServerInfo.network_name = NULL;
1299	>	MyFree(ConfigServerInfo.network_desc);
1300	>	ConfigServerInfo.network_desc = NULL;
1301		#ifdef HAVE_LIBCRYPTO
1302	<	if (ServerInfo.rsa_private_key != NULL)
1302	>	if (ConfigServerInfo.rsa_private_key)
1303		{
1304	<	RSA_free(ServerInfo.rsa_private_key);
1305	<	ServerInfo.rsa_private_key = NULL;
1304	>	RSA_free(ConfigServerInfo.rsa_private_key);
1305	>	ConfigServerInfo.rsa_private_key = NULL;
1306		}
1307
1308	<	MyFree(ServerInfo.rsa_private_key_file);
1309	<	ServerInfo.rsa_private_key_file = NULL;
1308	>	MyFree(ConfigServerInfo.rsa_private_key_file);
1309	>	ConfigServerInfo.rsa_private_key_file = NULL;
1310		#endif
1311
1312	<	/* clean out old resvs from the conf */
1313	<	clear_conf_resv();
1312	>	/* clean out ConfigAdminInfo */
1313	>	MyFree(ConfigAdminInfo.name);
1314	>	ConfigAdminInfo.name = NULL;
1315	>	MyFree(ConfigAdminInfo.email);
1316	>	ConfigAdminInfo.email = NULL;
1317	>	MyFree(ConfigAdminInfo.description);
1318	>	ConfigAdminInfo.description = NULL;
1319
2698	–	/* clean out AdminInfo */
2699	–	MyFree(AdminInfo.name);
2700	–	AdminInfo.name = NULL;
2701	–	MyFree(AdminInfo.email);
2702	–	AdminInfo.email = NULL;
2703	–	MyFree(AdminInfo.description);
2704	–	AdminInfo.description = NULL;
2705	–
2706	–	/* operator{} and class{} blocks are freed above */
1320		/* clean out listeners */
1321		close_listeners();
1322
2710	–	/* auth{}, quarantine{}, shared{}, connect{}, kill{}, deny{},
2711	–	* exempt{} and gecos{} blocks are freed above too
2712	–	*/
2713	–
1323		/* clean out general */
1324	<	MyFree(ConfigFileEntry.service_name);
1325	<	ConfigFileEntry.service_name = NULL;
2717	<
2718	<	MyFree(ConfigFileEntry.servlink_path);
2719	<	ConfigFileEntry.servlink_path = NULL;
2720	<	#ifdef HAVE_LIBCRYPTO
2721	<	ConfigFileEntry.default_cipher_preference = NULL;
2722	<	#endif /* HAVE_LIBCRYPTO */
2723	<	delete_isupport("INVEX");
2724	<	delete_isupport("EXCEPTS");
2725	<	}
2726	<
2727	<	/* flush_deleted_I_P()
2728	<	*
2729	<	* inputs       - none
2730	<	* output       - none
2731	<	* side effects - This function removes I/P conf items
2732	<	*/
2733	<	static void
2734	<	flush_deleted_I_P(void)
2735	<	{
2736	<	dlink_node *ptr;
2737	<	dlink_node *next_ptr;
2738	<	struct ConfItem *conf;
2739	<	struct AccessItem *aconf;
2740	<	dlink_list * free_items [] = {
2741	<	&server_items, &oconf_items, NULL
2742	<	};
2743	<	dlink_list ** iterator = free_items; /* C is dumb */
2744	<
2745	<	/* flush out deleted I and P lines
2746	<	* although still in use.
2747	<	*/
2748	<	for (; *iterator != NULL; iterator++)
2749	<	{
2750	<	DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
2751	<	{
2752	<	conf = ptr->data;
2753	<	aconf = (struct AccessItem *)map_to_conf(conf);
2754	<
2755	<	if (IsConfIllegal(aconf))
2756	<	{
2757	<	dlinkDelete(ptr, *iterator);
2758	<
2759	<	if (aconf->clients == 0)
2760	<	delete_conf_item(conf);
2761	<	}
2762	<	}
2763	<	}
2764	<	}
2765	<
2766	<	/* get_conf_name()
2767	<	*
2768	<	* inputs       - type of conf file to return name of file for
2769	<	* output       - pointer to filename for type of conf
2770	<	* side effects - none
2771	<	*/
2772	<	const char *
2773	<	get_conf_name(ConfType type)
2774	<	{
2775	<	switch (type)
2776	<	{
2777	<	case CONF_TYPE:
2778	<	return ConfigFileEntry.configfile;
2779	<	break;
2780	<	case KLINE_TYPE:
2781	<	return ConfigFileEntry.klinefile;
2782	<	break;
2783	<	case RKLINE_TYPE:
2784	<	return ConfigFileEntry.rklinefile;
2785	<	break;
2786	<	case DLINE_TYPE:
2787	<	return ConfigFileEntry.dlinefile;
2788	<	break;
2789	<	case XLINE_TYPE:
2790	<	return ConfigFileEntry.xlinefile;
2791	<	break;
2792	<	case RXLINE_TYPE:
2793	<	return ConfigFileEntry.rxlinefile;
2794	<	break;
2795	<	case CRESV_TYPE:
2796	<	return ConfigFileEntry.cresvfile;
2797	<	break;
2798	<	case NRESV_TYPE:
2799	<	return ConfigFileEntry.nresvfile;
2800	<	break;
2801	<	case GLINE_TYPE:
2802	<	return ConfigFileEntry.glinefile;
2803	<	break;
2804	<
2805	<	default:
2806	<	return NULL;  /* This should NEVER HAPPEN since we call this function
2807	<	only with the above values, this will cause us to core
2808	<	at some point if this happens so we know where it was */
2809	<	}
2810	<	}
2811	<
2812	<	#define BAD_PING (-1)
2813	<
2814	<	/* get_conf_ping()
2815	<	*
2816	<	* inputs       - pointer to struct AccessItem
2817	<	*              - pointer to a variable that receives ping warning time
2818	<	* output       - ping frequency
2819	<	* side effects - NONE
2820	<	*/
2821	<	static int
2822	<	get_conf_ping(struct ConfItem *conf, int *pingwarn)
2823	<	{
2824	<	struct ClassItem *aclass;
2825	<	struct AccessItem *aconf;
2826	<
2827	<	if (conf != NULL)
2828	<	{
2829	<	aconf = (struct AccessItem *)map_to_conf(conf);
2830	<	if (aconf->class_ptr != NULL)
2831	<	{
2832	<	aclass = (struct ClassItem *)map_to_conf(aconf->class_ptr);
2833	<	*pingwarn = PingWarning(aclass);
2834	<	return PingFreq(aclass);
2835	<	}
2836	<	}
2837	<
2838	<	return BAD_PING;
2839	<	}
2840	<
2841	<	/* get_client_class()
2842	<	*
2843	<	* inputs       - pointer to client struct
2844	<	* output       - pointer to name of class
2845	<	* side effects - NONE
2846	<	*/
2847	<	const char *
2848	<	get_client_class(struct Client *target_p)
2849	<	{
2850	<	dlink_node *ptr;
2851	<	struct ConfItem *conf;
2852	<	struct AccessItem *aconf;
2853	<
2854	<	if (target_p != NULL && !IsMe(target_p) &&
2855	<	target_p->localClient->confs.head != NULL)
2856	<	{
2857	<	DLINK_FOREACH(ptr, target_p->localClient->confs.head)
2858	<	{
2859	<	conf = ptr->data;
2860	<
2861	<	if (conf->type == CLIENT_TYPE || conf->type == SERVER_TYPE ||
2862	<	conf->type == OPER_TYPE)
2863	<	{
2864	<	aconf = (struct AccessItem *) map_to_conf(conf);
2865	<	if (aconf->class_ptr != NULL)
2866	<	return aconf->class_ptr->name;
2867	<	}
2868	<	}
2869	<	}
2870	<
2871	<	return "default";
2872	<	}
2873	<
2874	<	/* get_client_ping()
2875	<	*
2876	<	* inputs       - pointer to client struct
2877	<	*              - pointer to a variable that receives ping warning time
2878	<	* output       - ping frequency
2879	<	* side effects - NONE
2880	<	*/
2881	<	int
2882	<	get_client_ping(struct Client *target_p, int *pingwarn)
2883	<	{
2884	<	int ping;
2885	<	struct ConfItem *conf;
2886	<	dlink_node *nlink;
2887	<
2888	<	if (target_p->localClient->confs.head != NULL)
2889	<	DLINK_FOREACH(nlink, target_p->localClient->confs.head)
2890	<	{
2891	<	conf = nlink->data;
2892	<
2893	<	if ((conf->type == CLIENT_TYPE) || (conf->type == SERVER_TYPE) ||
2894	<	(conf->type == OPER_TYPE))
2895	<	{
2896	<	ping = get_conf_ping(conf, pingwarn);
2897	<	if (ping > 0)
2898	<	return ping;
2899	<	}
2900	<	}
2901	<
2902	<	*pingwarn = 0;
2903	<	return DEFAULT_PINGFREQUENCY;
2904	<	}
2905	<
2906	<	/* find_class()
2907	<	*
2908	<	* inputs       - string name of class
2909	<	* output       - corresponding Class pointer
2910	<	* side effects - NONE
2911	<	*/
2912	<	struct ConfItem *
2913	<	find_class(const char *classname)
2914	<	{
2915	<	struct ConfItem *conf;
2916	<
2917	<	if ((conf = find_exact_name_conf(CLASS_TYPE, classname, NULL, NULL)) != NULL)
2918	<	return conf;
2919	<
2920	<	return class_default;
2921	<	}
2922	<
2923	<	/* check_class()
2924	<	*
2925	<	* inputs       - NONE
2926	<	* output       - NONE
2927	<	* side effects -
2928	<	*/
2929	<	void
2930	<	check_class(void)
2931	<	{
2932	<	dlink_node *ptr = NULL, *next_ptr = NULL;
2933	<
2934	<	DLINK_FOREACH_SAFE(ptr, next_ptr, class_items.head)
2935	<	{
2936	<	struct ClassItem *aclass = map_to_conf(ptr->data);
2937	<
2938	<	if (!aclass->active && !CurrUserCount(aclass))
2939	<	{
2940	<	destroy_cidr_class(aclass);
2941	<	delete_conf_item(ptr->data);
2942	<	}
2943	<	}
2944	<	}
2945	<
2946	<	/* init_class()
2947	<	*
2948	<	* inputs       - NONE
2949	<	* output       - NONE
2950	<	* side effects -
2951	<	*/
2952	<	void
2953	<	init_class(void)
2954	<	{
2955	<	struct ClassItem *aclass;
2956	<
2957	<	class_default = make_conf_item(CLASS_TYPE);
2958	<
2959	<	aclass = map_to_conf(class_default);
2960	<	aclass->active = 1;
2961	<	DupString(class_default->name, "default");
2962	<	ConFreq(aclass)  = DEFAULT_CONNECTFREQUENCY;
2963	<	PingFreq(aclass) = DEFAULT_PINGFREQUENCY;
2964	<	MaxTotal(aclass) = MAXIMUM_LINKS_DEFAULT;
2965	<	MaxSendq(aclass) = DEFAULT_SENDQ;
2966	<
2967	<	client_check_cb = register_callback("check_client", check_client);
2968	<	}
2969	<
2970	<	/* get_sendq()
2971	<	*
2972	<	* inputs       - pointer to client
2973	<	* output       - sendq for this client as found from its class
2974	<	* side effects - NONE
2975	<	*/
2976	<	unsigned int
2977	<	get_sendq(struct Client *client_p)
2978	<	{
2979	<	unsigned int sendq = DEFAULT_SENDQ;
2980	<	dlink_node *ptr;
2981	<	struct ConfItem *conf;
2982	<	struct ConfItem *class_conf;
2983	<	struct ClassItem *aclass;
2984	<	struct AccessItem *aconf;
2985	<
2986	<	if (client_p && !IsMe(client_p) && (client_p->localClient->confs.head))
2987	<	{
2988	<	DLINK_FOREACH(ptr, client_p->localClient->confs.head)
2989	<	{
2990	<	conf = ptr->data;
2991	<	if ((conf->type == SERVER_TYPE) || (conf->type == OPER_TYPE)
2992	<	|| (conf->type == CLIENT_TYPE))
2993	<	{
2994	<	aconf = (struct AccessItem *)map_to_conf(conf);
2995	<	if ((class_conf = aconf->class_ptr) == NULL)
2996	<	continue;
2997	<	aclass = (struct ClassItem *)map_to_conf(class_conf);
2998	<	sendq = MaxSendq(aclass);
2999	<	return sendq;
3000	<	}
3001	<	}
3002	<	}
3003	<	/* XXX return a default?
3004	<	* if here, then there wasn't an attached conf with a sendq
3005	<	* that is very bad -Dianora
3006	<	*/
3007	<	return DEFAULT_SENDQ;
1324	>	MyFree(ConfigGeneral.service_name);
1325	>	ConfigGeneral.service_name = NULL;
1326		}
1327
1328		/* conf_add_class_to_conf()
1329		*
1330		* inputs       - pointer to config item
1331		* output       - NONE
1332	<	* side effects - Add a class pointer to a conf
1332	>	* side effects - Add a class pointer to a conf
1333		*/
1334		void
1335	<	conf_add_class_to_conf(struct ConfItem *conf, const char *class_name)
1335	>	conf_add_class_to_conf(struct MaskItem *conf, const char *class_name)
1336		{
1337	<	struct AccessItem *aconf = map_to_conf(conf);
3020	<	struct ClassItem *class = NULL;
3021	<
3022	<	if (class_name == NULL)
1337	>	if (class_name == NULL)
1338		{
1339	<	aconf->class_ptr = class_default;
1339	>	conf->class = class_default;
1340
1341	<	if (conf->type == CLIENT_TYPE)
1342	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1343	<	"Warning *** Defaulting to default class for %s@%s",
1344	<	aconf->user, aconf->host);
1341	>	if (conf->type == CONF_CLIENT)
1342	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1343	>	"Warning *** Defaulting to default class for %s@%s",
1344	>	conf->user, conf->host);
1345		else
1346	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1347	<	"Warning *** Defaulting to default class for %s",
1348	<	conf->name);
1346	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1347	>	"Warning *** Defaulting to default class for %s",
1348	>	conf->name);
1349		}
1350		else
1351	<	aconf->class_ptr = find_class(class_name);
3037	<
3038	<	if (aconf->class_ptr)
3039	<	class = map_to_conf(aconf->class_ptr);
1351	>	conf->class = class_find(class_name, 1);
1352
1353	<	if (aconf->class_ptr == NULL || !class->active)
1353	>	if (conf->class == NULL)
1354		{
1355	<	if (conf->type == CLIENT_TYPE)
1356	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1357	<	"Warning *** Defaulting to default class for %s@%s",
1358	<	aconf->user, aconf->host);
1355	>	if (conf->type == CONF_CLIENT)
1356	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1357	>	"Warning *** Defaulting to default class for %s@%s",
1358	>	conf->user, conf->host);
1359		else
1360	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1361	<	"Warning *** Defaulting to default class for %s",
1362	<	conf->name);
1363	<	aconf->class_ptr = class_default;
1360	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1361	>	"Warning *** Defaulting to default class for %s",
1362	>	conf->name);
1363	>	conf->class = class_default;
1364		}
1365		}
1366
3055	–	/* conf_add_server()
3056	–	*
3057	–	* inputs       - pointer to config item
3058	–	*              - pointer to link count already on this conf
3059	–	* output       - NONE
3060	–	* side effects - Add a connect block
3061	–	*/
3062	–	int
3063	–	conf_add_server(struct ConfItem *conf, const char *class_name)
3064	–	{
3065	–	struct AccessItem *aconf;
3066	–	struct split_nuh_item nuh;
3067	–	char conf_user[USERLEN + 1];
3068	–	char conf_host[HOSTLEN + 1];
3069	–
3070	–	aconf = map_to_conf(conf);
3071	–
3072	–	conf_add_class_to_conf(conf, class_name);
3073	–
3074	–	if (!aconf->host || !conf->name)
3075	–	{
3076	–	sendto_realops_flags(UMODE_ALL, L_ALL, "Bad connect block");
3077	–	ilog(L_WARN, "Bad connect block");
3078	–	return -1;
3079	–	}
3080	–
3081	–	if (EmptyString(aconf->passwd) && !IsConfCryptLink(aconf))
3082	–	{
3083	–	sendto_realops_flags(UMODE_ALL, L_ALL, "Bad connect block, name %s",
3084	–	conf->name);
3085	–	ilog(L_WARN, "Bad connect block, host %s", conf->name);
3086	–	return -1;
3087	–	}
3088	–
3089	–	nuh.nuhmask  = aconf->host;
3090	–	nuh.nickptr  = NULL;
3091	–	nuh.userptr  = conf_user;
3092	–	nuh.hostptr  = conf_host;
3093	–
3094	–	nuh.nicksize = 0;
3095	–	nuh.usersize = sizeof(conf_user);
3096	–	nuh.hostsize = sizeof(conf_host);
3097	–
3098	–	split_nuh(&nuh);
3099	–
3100	–	MyFree(aconf->host);
3101	–	aconf->host = NULL;
3102	–
3103	–	DupString(aconf->user, conf_user); /* somehow username checking for servers
3104	–	got lost in H6/7, will have to be re-added */
3105	–	DupString(aconf->host, conf_host);
3106	–
3107	–	lookup_confhost(conf);
3108	–
3109	–	return 0;
3110	–	}
3111	–
1367		/* yyerror()
1368		*
1369		* inputs       - message from parser
#	Line 3124 | Line 1379 | yyerror(const char *msg)
1379		return;
1380
1381		strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1382	<	sendto_realops_flags(UMODE_ALL, L_ALL, "\"%s\", line %u: %s: %s",
1382	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1383	>	"\"%s\", line %u: %s: %s",
1384		conffilebuf, lineno + 1, msg, newlinebuf);
1385	<	ilog(L_WARN, "\"%s\", line %u: %s: %s",
1385	>	ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1386		conffilebuf, lineno + 1, msg, newlinebuf);
1387		}
1388
1389	<	int
1390	<	conf_fbgets(char *lbuf, unsigned int max_size, FBFILE *fb)
1389	>	void
1390	>	conf_error_report(const char *msg)
1391		{
1392	<	if (fbgets(lbuf, max_size, fb) == NULL)
3137	<	return 0;
3138	<
3139	<	return strlen(lbuf);
3140	<	}
1392	>	char newlinebuf[IRCD_BUFSIZE];
1393
1394	<	int
1395	<	conf_yy_fatal_error(const char *msg)
1396	<	{
1397	<	return 0;
1394	>	strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1395	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1396	>	"\"%s\", line %u: %s: %s",
1397	>	conffilebuf, lineno + 1, msg, newlinebuf);
1398	>	ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1399	>	conffilebuf, lineno + 1, msg, newlinebuf);
1400		}
1401
1402		/*
1403		* valid_tkline()
1404	<	*
1404	>	*
1405		* inputs       - pointer to ascii string to check
1406		*              - whether the specified time is in seconds or minutes
1407		* output       - -1 not enough parameters
#	Line 3156 | Line 1410 | conf_yy_fatal_error(const char *msg)
1410		* Originally written by Dianora (Diane, db@db.net)
1411		*/
1412		time_t
1413	<	valid_tkline(const char *p, int minutes)
1413	>	valid_tkline(const char *data, const int minutes)
1414		{
1415	+	const unsigned char *p = (const unsigned char *)data;
1416	+	unsigned char tmpch = '\0';
1417		time_t result = 0;
1418
1419	<	for (; *p; ++p)
1419	>	while ((tmpch = *p++))
1420		{
1421	<	if (!IsDigit(*p))
1421	>	if (!IsDigit(tmpch))
1422		return 0;
1423
1424		result *= 10;
1425	<	result += ((*p) & 0xF);
1425	>	result += (tmpch & 0xF);
1426		}
1427
1428		/*
1429	<	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1429	>	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1430		* i.e. they specifically use 0, I am going to return 1 instead
1431		* as a return value of non-zero is used to flag it as a temporary kline
1432		*/
1433		if (result == 0)
1434		result = 1;
1435
1436	<	/*
1436	>	/*
1437		* If the incoming time is in seconds convert it to minutes for the purpose
1438		* of this calculation
1439		*/
1440		if (!minutes)
1441	<	result = result / (time_t)60;
1441	>	result = result / 60;
1442
1443		if (result > MAX_TDKLINE_TIME)
1444		result = MAX_TDKLINE_TIME;
1445
1446	<	result = result * (time_t)60;  /* turn it into seconds */
1446	>	result = result * 60;  /* turn it into seconds */
1447
1448		return result;
1449		}
1450
1451	+	/* valid_wild_card_simple()
1452	+	*
1453	+	* inputs       - data to check for sufficient non-wildcard characters
1454	+	* outputs      - 1 if valid, else 0
1455	+	* side effects - none
1456	+	*/
1457	+	int
1458	+	valid_wild_card_simple(const char *data)
1459	+	{
1460	+	const unsigned char *p = (const unsigned char *)data;
1461	+	unsigned char tmpch = '\0';
1462	+	unsigned int nonwild = 0;
1463	+
1464	+	while ((tmpch = *p++))
1465	+	{
1466	+	if (tmpch == '\\' && *p)
1467	+	{
1468	+	++p;
1469	+	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1470	+	return 1;
1471	+	}
1472	+	else if (!IsMWildChar(tmpch))
1473	+	{
1474	+	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1475	+	return 1;
1476	+	}
1477	+	}
1478	+
1479	+	return 0;
1480	+	}
1481	+
1482		/* valid_wild_card()
1483		*
1484		* input        - pointer to client
#	Line 3203 | Line 1490 | valid_tkline(const char *p, int minutes)
1490		int
1491		valid_wild_card(struct Client *source_p, int warn, int count, ...)
1492		{
1493	<	char *p;
1494	<	char tmpch;
3208	<	int nonwild = 0;
1493	>	unsigned char tmpch = '\0';
1494	>	unsigned int nonwild = 0;
1495		va_list args;
1496
1497		/*
#	Line 3224 | Line 1510 | valid_wild_card(struct Client *source_p,
1510
1511		while (count--)
1512		{
1513	<	p = va_arg(args, char *);
1513	>	const unsigned char *p = va_arg(args, const unsigned char *);
1514		if (p == NULL)
1515		continue;
1516
#	Line 3236 | Line 1522 | valid_wild_card(struct Client *source_p,
1522		* If we find enough non-wild characters, we can
1523		* break - no point in searching further.
1524		*/
1525	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard)
1525	>	if (++nonwild >= ConfigGeneral.min_nonwildcard)
1526	>	{
1527	>	va_end(args);
1528		return 1;
1529	+	}
1530		}
1531		}
1532		}
1533
1534		if (warn)
1535	<	sendto_one(source_p, ":%s NOTICE %s :Please include at least %d non-wildcard characters with the mask",
1536	<	me.name, source_p->name, ConfigFileEntry.min_nonwildcard);
1535	>	sendto_one_notice(source_p, &me,
1536	>	":Please include at least %u non-wildcard characters with the mask",
1537	>	ConfigGeneral.min_nonwildcard);
1538	>	va_end(args);
1539		return 0;
1540		}
1541
#	Line 3258 | Line 1549 | valid_wild_card(struct Client *source_p,
1549		*              - parse_flags bit map of things to test
1550		*              - pointer to user or string to parse into
1551		*              - pointer to host or NULL to parse into if non NULL
1552	<	*              - pointer to optional tkline time or NULL
1552	>	*              - pointer to optional tkline time or NULL
1553		*              - pointer to target_server to parse into if non NULL
1554		*              - pointer to reason to parse into
1555		*
#	Line 3280 | Line 1571 | valid_wild_card(struct Client *source_p,
1571		*/
1572		int
1573		parse_aline(const char *cmd, struct Client *source_p,
1574	<	int parc, char **parv,
1575	<	int parse_flags, char **up_p, char **h_p, time_t *tkline_time,
1576	<	char **target_server, char **reason)
1574	>	int parc, char **parv,
1575	>	int parse_flags, char **up_p, char **h_p, time_t *tkline_time,
1576	>	char **target_server, char **reason)
1577		{
1578		int found_tkline_time=0;
1579	<	static char def_reason[] = "No Reason";
1579	>	static char def_reason[] = CONF_NOREASON;
1580		static char user[USERLEN*4+1];
1581		static char host[HOSTLEN*4+1];
1582
#	Line 3303 | Line 1594 | parse_aline(const char *cmd, struct Clie
1594		*tkline_time = found_tkline_time;
1595		else
1596		{
1597	<	sendto_one(source_p, ":%s NOTICE %s :temp_line not supported by %s",
3307	<	me.name, source_p->name, cmd);
1597	>	sendto_one_notice(source_p, &me, ":temp_line not supported by %s", cmd);
1598		return -1;
1599		}
1600		}
1601
1602		if (parc == 0)
1603		{
1604	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
3315	<	me.name, source_p->name, cmd);
1604	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1605		return -1;
1606		}
1607
#	Line 3326 | Line 1615 | parse_aline(const char *cmd, struct Clie
1615		*up_p = user;
1616		*h_p = host;
1617		}
1618	<
1618	>
1619		parc--;
1620		parv++;
1621
#	Line 3339 | Line 1628 | parse_aline(const char *cmd, struct Clie
1628
1629		if (target_server == NULL)
1630		{
1631	<	sendto_one(source_p, ":%s NOTICE %s :ON server not supported by %s",
1632	<	me.name, source_p->name, cmd);
3344	<	return -1;
1631	>	sendto_one_notice(source_p, &me, ":ON server not supported by %s", cmd);
1632	>	return -1;
1633		}
1634
1635	<	if (!IsOperRemoteBan(source_p))
1635	>	if (!HasOFlag(source_p, OPER_FLAG_REMOTEBAN))
1636		{
1637	<	sendto_one(source_p, form_str(ERR_NOPRIVS),
3350	<	me.name, source_p->name, "remoteban");
1637	>	sendto_one_numeric(source_p, &me, ERR_NOPRIVS, "remoteban");
1638		return -1;
1639		}
1640
1641		if (parc == 0 || EmptyString(*parv))
1642		{
1643	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1644	<	me.name, source_p->name, cmd);
3358	<	return -1;
1643	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1644	>	return -1;
1645		}
1646
1647		*target_server = *parv;
#	Line 3368 | Line 1654 | parse_aline(const char *cmd, struct Clie
1654		* caller probably NULL'd it first, but no harm to do it again -db
1655		*/
1656		if (target_server != NULL)
1657	<	*target_server = NULL;
1657	>	*target_server = NULL;
1658		}
1659		}
1660
#	Line 3376 | Line 1662 | parse_aline(const char *cmd, struct Clie
1662		{
1663		if (strchr(user, '!') != NULL)
1664		{
1665	<	sendto_one(source_p, ":%s NOTICE %s :Invalid character '!' in kline",
3380	<	me.name, source_p->name);
1665	>	sendto_one_notice(source_p, &me, ":Invalid character '!' in kline");
1666		return -1;
1667		}
1668
1669	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, YES, 2, *up_p, *h_p))
1669	>	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 2, *up_p, *h_p))
1670		return -1;
1671		}
1672		else
1673	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, YES, 1, *up_p))
1673	>	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 1, *up_p))
1674		return -1;
1675
1676		if (reason != NULL)
#	Line 3393 | Line 1678 | parse_aline(const char *cmd, struct Clie
1678		if (parc != 0 && !EmptyString(*parv))
1679		{
1680		*reason = *parv;
1681	<	if (!valid_comment(source_p, *reason, YES))
1682	<	return -1;
1681	>	if (!valid_comment(source_p, *reason, 1))
1682	>	return -1;
1683		}
1684		else
1685		*reason = def_reason;
#	Line 3433 | Line 1718 | find_user_host(struct Client *source_p,
1718		{
1719		*(hostp++) = '\0';                       /* short and squat */
1720		if (*user_host_or_nick)
1721	<	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
1721	>	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
1722		else
1723	<	strcpy(luser, "*");
1723	>	strcpy(luser, "*");
1724	>
1725		if (*hostp)
1726	<	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
1726	>	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
1727		else
1728	<	strcpy(lhost, "*");
1728	>	strcpy(lhost, "*");
1729		}
1730		else
1731		{
1732		luser[0] = '*';             /* no @ found, assume its *@somehost */
1733	<	luser[1] = '\0';
1733	>	luser[1] = '\0';
1734		strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
1735		}
1736	<
1736	>
1737		return 1;
1738		}
1739	<	else if (!(flags & NOUSERLOOKUP))
1739	>	else
1740		{
1741		/* Try to find user@host mask from nick */
1742		/* Okay to use source_p as the first param, because source_p == client_p */
1743	<	if ((target_p =
1744	<	find_chasing(source_p, source_p, user_host_or_nick, NULL)) == NULL)
1745	<	return 0;
1743	>	if ((target_p =
1744	>	find_chasing(source_p, user_host_or_nick)) == NULL)
1745	>	return 0;  /* find_chasing sends ERR_NOSUCHNICK */
1746
1747		if (IsExemptKline(target_p))
1748		{
1749		if (!IsServer(source_p))
1750	<	sendto_one(source_p,
3465	<	":%s NOTICE %s :%s is E-lined",
3466	<	me.name, source_p->name, target_p->name);
1750	>	sendto_one_notice(source_p, &me, ":%s is E-lined", target_p->name);
1751		return 0;
1752		}
1753
#	Line 3498 | Line 1782 | find_user_host(struct Client *source_p,
1782		int
1783		valid_comment(struct Client *source_p, char *comment, int warn)
1784		{
3501	–	if (strchr(comment, '"'))
3502	–	{
3503	–	if (warn)
3504	–	sendto_one(source_p, ":%s NOTICE %s :Invalid character '\"' in comment",
3505	–	me.name, source_p->name);
3506	–	return 0;
3507	–	}
3508	–
1785		if (strlen(comment) > REASONLEN)
1786		comment[REASONLEN-1] = '\0';
1787
#	Line 3520 | Line 1796 | valid_comment(struct Client *source_p, c
1796		* side effects - none
1797		*/
1798		int
1799	<	match_conf_password(const char *password, const struct AccessItem *aconf)
1799	>	match_conf_password(const char *password, const struct MaskItem *conf)
1800		{
1801		const char *encr = NULL;
1802
1803	<	if (password == NULL || aconf->passwd == NULL)
1803	>	if (EmptyString(password) || EmptyString(conf->passwd))
1804		return 0;
1805
1806	<	if (aconf->flags & CONF_FLAGS_ENCRYPTED)
1807	<	{
3532	<	/* use first two chars of the password they send in as salt */
3533	<	/* If the password in the conf is MD5, and ircd is linked
3534	<	* to scrypt on FreeBSD, or the standard crypt library on
3535	<	* glibc Linux, then this code will work fine on generating
3536	<	* the proper encrypted hash for comparison.
3537	<	*/
3538	<	if (*aconf->passwd)
3539	<	encr = crypt(password, aconf->passwd);
3540	<	else
3541	<	encr = "";
3542	<	}
1806	>	if (conf->flags & CONF_FLAGS_ENCRYPTED)
1807	>	encr = crypt(password, conf->passwd);
1808		else
1809		encr = password;
1810
1811	<	return !strcmp(encr, aconf->passwd);
1811	>	return encr && !strcmp(encr, conf->passwd);
1812		}
1813
1814		/*
#	Line 3551 | Line 1816 | match_conf_password(const char *password
1816		*
1817		* inputs       - client sending the cluster
1818		*              - command name "KLINE" "XLINE" etc.
1819	<	*              - capab -- CAP_KLN etc. from s_serv.h
1820	<	*              - cluster type -- CLUSTER_KLINE etc. from s_conf.h
1819	>	*              - capab -- CAP_KLN etc. from server.h
1820	>	*              - cluster type -- CLUSTER_KLINE etc. from conf.h
1821		*              - pattern and args to send along
1822		* output       - none
1823		* side effects - Take source_p send the pattern with args given
#	Line 3563 | Line 1828 | cluster_a_line(struct Client *source_p,
1828		int capab, int cluster_type, const char *pattern, ...)
1829		{
1830		va_list args;
1831	<	char buffer[IRCD_BUFSIZE];
1831	>	char buffer[IRCD_BUFSIZE] = "";
1832		const dlink_node *ptr = NULL;
1833
1834		va_start(args, pattern);
#	Line 3572 | Line 1837 | cluster_a_line(struct Client *source_p,
1837
1838		DLINK_FOREACH(ptr, cluster_items.head)
1839		{
1840	<	const struct ConfItem *conf = ptr->data;
1840	>	const struct MaskItem *conf = ptr->data;
1841
1842		if (conf->flags & cluster_type)
1843		sendto_match_servs(source_p, conf->name, CAP_CLUSTER|capab,
1844	<	"%s %s %s", command, conf->name, buffer);
1844	>	"%s %s %s", command, conf->name, buffer);
1845		}
1846		}
1847
#	Line 3624 | Line 1889 | split_nuh(struct split_nuh_item *const i
1889		{
1890		*p = '\0';
1891
1892	<	if (iptr->nickptr && *iptr->nuhmask != '\0')
1892	>	if (iptr->nickptr && *iptr->nuhmask)
1893		strlcpy(iptr->nickptr, iptr->nuhmask, iptr->nicksize);
1894
1895	<	if ((q = strchr(++p, '@'))) {
1895	>	if ((q = strchr(++p, '@')))
1896	>	{
1897		*q++ = '\0';
1898
1899	<	if (*p != '\0')
1899	>	if (*p)
1900		strlcpy(iptr->userptr, p, iptr->usersize);
1901
1902	<	if (*q != '\0')
1902	>	if (*q)
1903		strlcpy(iptr->hostptr, q, iptr->hostsize);
1904		}
1905		else
1906		{
1907	<	if (*p != '\0')
1907	>	if (*p)
1908		strlcpy(iptr->userptr, p, iptr->usersize);
1909		}
1910		}
#	Line 3650 | Line 1916 | split_nuh(struct split_nuh_item *const i
1916		/* if found a @ */
1917		*p++ = '\0';
1918
1919	<	if (*iptr->nuhmask != '\0')
1919	>	if (*iptr->nuhmask)
1920		strlcpy(iptr->userptr, iptr->nuhmask, iptr->usersize);
1921
1922	<	if (*p != '\0')
1922	>	if (*p)
1923		strlcpy(iptr->hostptr, p, iptr->hostsize);
1924		}
1925		else
#	Line 3666 | Line 1932 | split_nuh(struct split_nuh_item *const i
1932		}
1933		}
1934		}
3669	–
3670	–	/*
3671	–	* flags_to_ascii
3672	–	*
3673	–	* inputs       - flags is a bitmask
3674	–	*              - pointer to table of ascii letters corresponding
3675	–	*                to each bit
3676	–	*              - flag 1 for convert ToLower if bit missing
3677	–	*                0 if ignore.
3678	–	* output       - none
3679	–	* side effects - string pointed to by p has bitmap chars written to it
3680	–	*/
3681	–	static void
3682	–	flags_to_ascii(unsigned int flags, const unsigned int bit_table[], char *p,
3683	–	int lowerit)
3684	–	{
3685	–	unsigned int mask = 1;
3686	–	int i = 0;
3687	–
3688	–	for (mask = 1; (mask != 0) && (bit_table[i] != 0); mask <<= 1, i++)
3689	–	{
3690	–	if (flags & mask)
3691	–	*p++ = bit_table[i];
3692	–	else if (lowerit)
3693	–	*p++ = ToLower(bit_table[i]);
3694	–	}
3695	–	*p = '\0';
3696	–	}
3697	–
3698	–	/*
3699	–	* cidr_limit_reached
3700	–	*
3701	–	* inputs       - int flag allowing over_rule of limits
3702	–	*              - pointer to the ip to be added
3703	–	*              - pointer to the class
3704	–	* output       - non zero if limit reached
3705	–	*                0 if limit not reached
3706	–	* side effects -
3707	–	*/
3708	–	static int
3709	–	cidr_limit_reached(int over_rule,
3710	–	struct irc_ssaddr *ip, struct ClassItem *aclass)
3711	–	{
3712	–	dlink_node *ptr = NULL;
3713	–	struct CidrItem *cidr;
3714	–
3715	–	if (NumberPerCidr(aclass) <= 0)
3716	–	return 0;
3717	–
3718	–	if (ip->ss.ss_family == AF_INET)
3719	–	{
3720	–	if (CidrBitlenIPV4(aclass) <= 0)
3721	–	return 0;
3722	–
3723	–	DLINK_FOREACH(ptr, aclass->list_ipv4.head)
3724	–	{
3725	–	cidr = ptr->data;
3726	–	if (match_ipv4(ip, &cidr->mask, CidrBitlenIPV4(aclass)))
3727	–	{
3728	–	if (!over_rule && (cidr->number_on_this_cidr >= NumberPerCidr(aclass)))
3729	–	return -1;
3730	–	cidr->number_on_this_cidr++;
3731	–	return 0;
3732	–	}
3733	–	}
3734	–	cidr = MyMalloc(sizeof(struct CidrItem));
3735	–	cidr->number_on_this_cidr = 1;
3736	–	cidr->mask = *ip;
3737	–	mask_addr(&cidr->mask, CidrBitlenIPV4(aclass));
3738	–	dlinkAdd(cidr, &cidr->node, &aclass->list_ipv4);
3739	–	}
3740	–	#ifdef IPV6
3741	–	else if (CidrBitlenIPV6(aclass) > 0)
3742	–	{
3743	–	DLINK_FOREACH(ptr, aclass->list_ipv6.head)
3744	–	{
3745	–	cidr = ptr->data;
3746	–	if (match_ipv6(ip, &cidr->mask, CidrBitlenIPV6(aclass)))
3747	–	{
3748	–	if (!over_rule && (cidr->number_on_this_cidr >= NumberPerCidr(aclass)))
3749	–	return -1;
3750	–	cidr->number_on_this_cidr++;
3751	–	return 0;
3752	–	}
3753	–	}
3754	–	cidr = MyMalloc(sizeof(struct CidrItem));
3755	–	cidr->number_on_this_cidr = 1;
3756	–	cidr->mask = *ip;
3757	–	mask_addr(&cidr->mask, CidrBitlenIPV6(aclass));
3758	–	dlinkAdd(cidr, &cidr->node, &aclass->list_ipv6);
3759	–	}
3760	–	#endif
3761	–	return 0;
3762	–	}
3763	–
3764	–	/*
3765	–	* remove_from_cidr_check
3766	–	*
3767	–	* inputs       - pointer to the ip to be removed
3768	–	*              - pointer to the class
3769	–	* output       - NONE
3770	–	* side effects -
3771	–	*/
3772	–	static void
3773	–	remove_from_cidr_check(struct irc_ssaddr *ip, struct ClassItem *aclass)
3774	–	{
3775	–	dlink_node *ptr = NULL;
3776	–	dlink_node *next_ptr = NULL;
3777	–	struct CidrItem *cidr;
3778	–
3779	–	if (NumberPerCidr(aclass) == 0)
3780	–	return;
3781	–
3782	–	if (ip->ss.ss_family == AF_INET)
3783	–	{
3784	–	if (CidrBitlenIPV4(aclass) <= 0)
3785	–	return;
3786	–
3787	–	DLINK_FOREACH_SAFE(ptr, next_ptr, aclass->list_ipv4.head)
3788	–	{
3789	–	cidr = ptr->data;
3790	–	if (match_ipv4(ip, &cidr->mask, CidrBitlenIPV4(aclass)))
3791	–	{
3792	–	cidr->number_on_this_cidr--;
3793	–	if (cidr->number_on_this_cidr == 0)
3794	–	{
3795	–	dlinkDelete(ptr, &aclass->list_ipv4);
3796	–	MyFree(cidr);
3797	–	return;
3798	–	}
3799	–	}
3800	–	}
3801	–	}
3802	–	#ifdef IPV6
3803	–	else if (CidrBitlenIPV6(aclass) > 0)
3804	–	{
3805	–	DLINK_FOREACH_SAFE(ptr, next_ptr, aclass->list_ipv6.head)
3806	–	{
3807	–	cidr = ptr->data;
3808	–	if (match_ipv6(ip, &cidr->mask, CidrBitlenIPV6(aclass)))
3809	–	{
3810	–	cidr->number_on_this_cidr--;
3811	–	if (cidr->number_on_this_cidr == 0)
3812	–	{
3813	–	dlinkDelete(ptr, &aclass->list_ipv6);
3814	–	MyFree(cidr);
3815	–	return;
3816	–	}
3817	–	}
3818	–	}
3819	–	}
3820	–	#endif
3821	–	}
3822	–
3823	–	static void
3824	–	rebuild_cidr_list(int aftype, struct ConfItem *oldcl, struct ClassItem *newcl,
3825	–	dlink_list *old_list, dlink_list *new_list, int changed)
3826	–	{
3827	–	dlink_node *ptr;
3828	–	struct Client *client_p;
3829	–	struct ConfItem *conf;
3830	–	struct AccessItem *aconf;
3831	–
3832	–	if (!changed)
3833	–	{
3834	–	*new_list = *old_list;
3835	–	old_list->head = old_list->tail = NULL;
3836	–	old_list->length = 0;
3837	–	return;
3838	–	}
3839	–
3840	–	DLINK_FOREACH(ptr, local_client_list.head)
3841	–	{
3842	–	client_p = ptr->data;
3843	–	if (client_p->localClient->aftype != aftype)
3844	–	continue;
3845	–	if (dlink_list_length(&client_p->localClient->confs) == 0)
3846	–	continue;
3847	–
3848	–	conf = client_p->localClient->confs.tail->data;
3849	–	if (conf->type == CLIENT_TYPE)
3850	–	{
3851	–	aconf = map_to_conf(conf);
3852	–	if (aconf->class_ptr == oldcl)
3853	–	cidr_limit_reached(1, &client_p->localClient->ip, newcl);
3854	–	}
3855	–	}
3856	–	}
3857	–
3858	–	/*
3859	–	* rebuild_cidr_class
3860	–	*
3861	–	* inputs       - pointer to old conf
3862	–	*              - pointer to new_class
3863	–	* output       - none
3864	–	* side effects - rebuilds the class link list of cidr blocks
3865	–	*/
3866	–	void
3867	–	rebuild_cidr_class(struct ConfItem *conf, struct ClassItem *new_class)
3868	–	{
3869	–	struct ClassItem *old_class = map_to_conf(conf);
3870	–
3871	–	if (NumberPerCidr(old_class) > 0 && NumberPerCidr(new_class) > 0)
3872	–	{
3873	–	if (CidrBitlenIPV4(old_class) > 0 && CidrBitlenIPV4(new_class) > 0)
3874	–	rebuild_cidr_list(AF_INET, conf, new_class,
3875	–	&old_class->list_ipv4, &new_class->list_ipv4,
3876	–	CidrBitlenIPV4(old_class) != CidrBitlenIPV4(new_class));
3877	–
3878	–	#ifdef IPV6
3879	–	if (CidrBitlenIPV6(old_class) > 0 && CidrBitlenIPV6(new_class) > 0)
3880	–	rebuild_cidr_list(AF_INET6, conf, new_class,
3881	–	&old_class->list_ipv6, &new_class->list_ipv6,
3882	–	CidrBitlenIPV6(old_class) != CidrBitlenIPV6(new_class));
3883	–	#endif
3884	–	}
3885	–
3886	–	destroy_cidr_class(old_class);
3887	–	}
3888	–
3889	–	/*
3890	–	* destroy_cidr_list
3891	–	*
3892	–	* inputs       - pointer to class dlink list of cidr blocks
3893	–	* output       - none
3894	–	* side effects - completely destroys the class link list of cidr blocks
3895	–	*/
3896	–	static void
3897	–	destroy_cidr_list(dlink_list *list)
3898	–	{
3899	–	dlink_node *ptr = NULL, *next_ptr = NULL;
3900	–
3901	–	DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
3902	–	{
3903	–	dlinkDelete(ptr, list);
3904	–	MyFree(ptr->data);
3905	–	}
3906	–	}
3907	–
3908	–	/*
3909	–	* destroy_cidr_class
3910	–	*
3911	–	* inputs       - pointer to class
3912	–	* output       - none
3913	–	* side effects - completely destroys the class link list of cidr blocks
3914	–	*/
3915	–	static void
3916	–	destroy_cidr_class(struct ClassItem *aclass)
3917	–	{
3918	–	destroy_cidr_list(&aclass->list_ipv4);
3919	–	destroy_cidr_list(&aclass->list_ipv6);
3920	–	}

Diff Legend

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