ViewVC Help

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

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

Comparing:
ircd-hybrid-8/src/conf.c (file contents), Revision 1393 by michael, Wed May 2 19:17:37 2012 UTC vs.
ircd-hybrid/trunk/src/conf.c (file contents), Revision 7248 by michael, Thu Feb 4 17:21:58 2016 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  conf.c: Configuration file functions.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2002 by the past and present ircd coders, and others.
4	>	*  Copyright (c) 1997-2016 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 16 | Line 15
15		*
16		*  You should have received a copy of the GNU General Public License
17		*  along with this program; if not, write to the Free Software
18	<	*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
18	>	*  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
19		*  USA
20	<	*
21	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file conf.c
23	>	* \brief Configuration file functions.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
28		#include "list.h"
29		#include "ircd_defs.h"
28	–	#include "balloc.h"
30		#include "conf.h"
31	<	#include "s_serv.h"
32	<	#include "resv.h"
31	>	#include "conf_cluster.h"
32	>	#include "conf_pseudo.h"
33	>	#include "conf_resv.h"
34	>	#include "conf_service.h"
35	>	#include "conf_shared.h"
36	>	#include "server.h"
37		#include "channel.h"
38		#include "client.h"
39		#include "event.h"
35	–	#include "hook.h"
40		#include "irc_string.h"
41		#include "s_bsd.h"
42		#include "ircd.h"
#	Line 43 | Line 47
47		#include "fdlist.h"
48		#include "log.h"
49		#include "send.h"
46	–	#include "s_gline.h"
50		#include "memory.h"
51	<	#include "irc_res.h"
51	>	#include "res.h"
52		#include "userhost.h"
53	<	#include "s_user.h"
53	>	#include "user.h"
54		#include "channel_mode.h"
55		#include "parse.h"
56	<	#include "s_misc.h"
56	>	#include "misc.h"
57	>	#include "conf_db.h"
58	>	#include "conf_class.h"
59	>	#include "motd.h"
60	>	#include "ipcache.h"
61	>	#include "isupport.h"
62
55	–	struct Callback *client_check_cb = NULL;
56	–	struct config_server_hide ConfigServerHide;
63
64	<	/* general conf items link list root, other than k lines etc. */
65	<	dlink_list service_items = { NULL, NULL, 0 };
66	<	dlink_list server_items  = { NULL, NULL, 0 };
67	<	dlink_list cluster_items = { NULL, NULL, 0 };
68	<	dlink_list oconf_items   = { NULL, NULL, 0 };
69	<	dlink_list uconf_items   = { NULL, NULL, 0 };
70	<	dlink_list xconf_items   = { NULL, NULL, 0 };
65	<	dlink_list rxconf_items  = { NULL, NULL, 0 };
66	<	dlink_list rkconf_items  = { NULL, NULL, 0 };
67	<	dlink_list nresv_items   = { NULL, NULL, 0 };
68	<	dlink_list class_items   = { NULL, NULL, 0 };
69	<	dlink_list gdeny_items   = { NULL, NULL, 0 };
64	>	struct config_channel_entry ConfigChannel;
65	>	struct config_serverhide_entry ConfigServerHide;
66	>	struct config_general_entry ConfigGeneral;
67	>	struct config_log_entry ConfigLog = { .use_logging = 1 };
68	>	struct config_serverinfo_entry ConfigServerInfo;
69	>	struct config_admin_entry ConfigAdminInfo;
70	>	struct conf_parser_context conf_parser_ctx;
71
72	<	dlink_list temporary_xlines  = { NULL, NULL, 0 };
73	<	dlink_list temporary_resv = { NULL, NULL, 0 };
72	>	/* general conf items link list root, other than k lines etc. */
73	>	dlink_list server_items;
74	>	dlink_list operator_items;
75	>	dlink_list gecos_items;
76	>	dlink_list nresv_items;
77	>	dlink_list cresv_items;
78
79		extern unsigned int lineno;
80		extern char linebuf[];
81		extern char conffilebuf[IRCD_BUFSIZE];
82		extern int yyparse(); /* defined in y.tab.c */
83
79	–	struct conf_parser_context conf_parser_ctx = { 0, 0, NULL };
80	–
81	–	/* internally defined functions */
82	–	static void read_conf(FILE *);
83	–	static void clear_out_old_conf(void);
84	–	static void flush_deleted_I_P(void);
85	–	static void expire_tklines(dlink_list *);
86	–	static void garbage_collect_ip_entries(void);
87	–	static int hash_ip(struct irc_ssaddr *);
88	–	static int verify_access(struct Client *, const char *);
89	–	static int attach_iline(struct Client *, struct ConfItem *);
90	–	static struct ip_entry *find_or_add_ip(struct irc_ssaddr *);
91	–	static void parse_conf_file(int, int);
92	–	static dlink_list *map_to_list(ConfType);
93	–	static struct AccessItem *find_regexp_kline(const char *[]);
94	–	static int find_user_host(struct Client *, char *, char *, char *, unsigned int);
95	–
96	–	/*
97	–	* bit_len
98	–	*/
99	–	static int cidr_limit_reached(int, struct irc_ssaddr *, struct ClassItem *);
100	–	static void remove_from_cidr_check(struct irc_ssaddr *, struct ClassItem *);
101	–	static void destroy_cidr_class(struct ClassItem *);
102	–
103	–	static void flags_to_ascii(unsigned int, const unsigned int[], char *, int);
104	–
105	–	/* address of default class conf */
106	–	static struct ConfItem *class_default;
107	–
108	–	/* usually, with hash tables, you use a prime number...
109	–	* but in this case I am dealing with ip addresses,
110	–	* not ascii strings.
111	–	*/
112	–	#define IP_HASH_SIZE 0x1000
113	–
114	–	struct ip_entry
115	–	{
116	–	struct irc_ssaddr ip;
117	–	int count;
118	–	time_t last_attempt;
119	–	struct ip_entry *next;
120	–	};
121	–
122	–	static struct ip_entry *ip_hash_table[IP_HASH_SIZE];
123	–	static BlockHeap *ip_entry_heap = NULL;
124	–	static int ip_entries_count = 0;
125	–
126	–
127	–	void *
128	–	map_to_conf(struct ConfItem *aconf)
129	–	{
130	–	void *conf;
131	–	conf = (void *)((uintptr_t)aconf +
132	–	(uintptr_t)sizeof(struct ConfItem));
133	–	return(conf);
134	–	}
135	–
136	–	struct ConfItem *
137	–	unmap_conf_item(void *aconf)
138	–	{
139	–	struct ConfItem *conf;
140	–
141	–	conf = (struct ConfItem *)((uintptr_t)aconf -
142	–	(uintptr_t)sizeof(struct ConfItem));
143	–	return(conf);
144	–	}
84
85		/* conf_dns_callback()
86		*
87	<	* inputs       - pointer to struct AccessItem
87	>	* inputs       - pointer to struct MaskItem
88		*              - pointer to DNSReply reply
89		* output       - none
90		* side effects - called when resolver query finishes
#	Line 154 | Line 93 | unmap_conf_item(void *aconf)
93		* if successful save hp in the conf item it was called with
94		*/
95		static void
96	<	conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name)
96	>	conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name, size_t namelength)
97		{
98	<	struct AccessItem *aconf = vptr;
98	>	struct MaskItem *const conf = vptr;
99
100	<	aconf->dns_pending = 0;
100	>	conf->dns_pending = 0;
101
102	<	if (addr != NULL)
103	<	memcpy(&aconf->addr, addr, sizeof(aconf->addr));
102	>	if (addr)
103	>	memcpy(&conf->addr, addr, sizeof(conf->addr));
104		else
105	<	aconf->dns_failed = 1;
105	>	conf->dns_failed = 1;
106		}
107
108		/* conf_dns_lookup()
#	Line 173 | Line 112 | conf_dns_callback(void *vptr, const stru
112		* allocate a dns_query and start ns lookup.
113		*/
114		static void
115	<	conf_dns_lookup(struct AccessItem *aconf)
115	>	conf_dns_lookup(struct MaskItem *conf)
116		{
117	<	if (!aconf->dns_pending)
118	<	{
119	<	aconf->dns_pending = 1;
120	<	gethost_byname(conf_dns_callback, aconf, aconf->host);
121	<	}
117	>	if (conf->dns_pending)
118	>	return;
119	>
120	>	conf->dns_pending = 1;
121	>
122	>	if (conf->aftype == AF_INET)
123	>	gethost_byname_type(conf_dns_callback, conf, conf->host, T_A);
124	>	else
125	>	gethost_byname_type(conf_dns_callback, conf, conf->host, T_AAAA);
126		}
127
128	<	/* make_conf_item()
128	>	/* map_to_list()
129		*
130	<	* inputs       - type of item
131	<	* output       - pointer to new conf entry
132	<	* side effects - none
130	>	* inputs       - ConfType conf
131	>	* output       - pointer to dlink_list to use
132	>	* side effects - none
133		*/
134	<	struct ConfItem *
135	<	make_conf_item(ConfType type)
134	>	static dlink_list *
135	>	map_to_list(enum maskitem_type type)
136		{
194	–	struct ConfItem *conf = NULL;
195	–	struct AccessItem *aconf = NULL;
196	–	struct ClassItem *aclass = NULL;
197	–	int status = 0;
198	–
137		switch (type)
138		{
139	<	case DLINE_TYPE:
140	<	case EXEMPTDLINE_TYPE:
203	<	case GLINE_TYPE:
204	<	case KLINE_TYPE:
205	<	case CLIENT_TYPE:
206	<	case OPER_TYPE:
207	<	case SERVER_TYPE:
208	<	conf = MyMalloc(sizeof(struct ConfItem) +
209	<	sizeof(struct AccessItem));
210	<	aconf = map_to_conf(conf);
211	<	aconf->aftype = AF_INET;
212	<
213	<	/* Yes, sigh. switch on type again */
214	<	switch (type)
215	<	{
216	<	case EXEMPTDLINE_TYPE:
217	<	status = CONF_EXEMPTDLINE;
139	>	case CONF_XLINE:
140	>	return &gecos_items;
141		break;
142	<
143	<	case DLINE_TYPE:
221	<	status = CONF_DLINE;
142	>	case CONF_NRESV:
143	>	return &nresv_items;
144		break;
145	<
146	<	case KLINE_TYPE:
225	<	status = CONF_KLINE;
145	>	case CONF_CRESV:
146	>	return &cresv_items;
147		break;
148	<
149	<	case GLINE_TYPE:
229	<	status = CONF_GLINE;
148	>	case CONF_OPER:
149	>	return &operator_items;
150		break;
151	<
152	<	case CLIENT_TYPE:
233	<	status = CONF_CLIENT;
234	<	break;
235	<
236	<	case OPER_TYPE:
237	<	status = CONF_OPERATOR;
238	<	dlinkAdd(conf, &conf->node, &oconf_items);
239	<	break;
240	<
241	<	case SERVER_TYPE:
242	<	status = CONF_SERVER;
243	<	dlinkAdd(conf, &conf->node, &server_items);
151	>	case CONF_SERVER:
152	>	return &server_items;
153		break;
245	–
154		default:
155	<	break;
248	<	}
249	<	aconf->status = status;
250	<	break;
251	<
252	<	case ULINE_TYPE:
253	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
254	<	sizeof(struct MatchItem));
255	<	dlinkAdd(conf, &conf->node, &uconf_items);
256	<	break;
257	<
258	<	case GDENY_TYPE:
259	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
260	<	sizeof(struct AccessItem));
261	<	dlinkAdd(conf, &conf->node, &gdeny_items);
262	<	break;
263	<
264	<	case XLINE_TYPE:
265	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
266	<	sizeof(struct MatchItem));
267	<	dlinkAdd(conf, &conf->node, &xconf_items);
268	<	break;
269	<	#ifdef HAVE_LIBPCRE
270	<	case RXLINE_TYPE:
271	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
272	<	sizeof(struct MatchItem));
273	<	dlinkAdd(conf, &conf->node, &rxconf_items);
274	<	break;
275	<
276	<	case RKLINE_TYPE:
277	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
278	<	sizeof(struct AccessItem));
279	<	aconf = map_to_conf(conf);
280	<	aconf->status = CONF_KLINE;
281	<	dlinkAdd(conf, &conf->node, &rkconf_items);
282	<	break;
283	<	#endif
284	<	case CLUSTER_TYPE:
285	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem));
286	<	dlinkAdd(conf, &conf->node, &cluster_items);
287	<	break;
288	<
289	<	case CRESV_TYPE:
290	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
291	<	sizeof(struct ResvChannel));
292	<	break;
293	<
294	<	case NRESV_TYPE:
295	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
296	<	sizeof(struct MatchItem));
297	<	dlinkAdd(conf, &conf->node, &nresv_items);
298	<	break;
299	<
300	<	case SERVICE_TYPE:
301	<	status = CONF_SERVICE;
302	<	conf = MyMalloc(sizeof(struct ConfItem));
303	<	dlinkAdd(conf, &conf->node, &service_items);
304	<	break;
305	<
306	<	case CLASS_TYPE:
307	<	conf = MyMalloc(sizeof(struct ConfItem) +
308	<	sizeof(struct ClassItem));
309	<	dlinkAdd(conf, &conf->node, &class_items);
310	<
311	<	aclass = map_to_conf(conf);
312	<	aclass->active = 1;
313	<	aclass->con_freq = DEFAULT_CONNECTFREQUENCY;
314	<	aclass->ping_freq = DEFAULT_PINGFREQUENCY;
315	<	aclass->max_total = MAXIMUM_LINKS_DEFAULT;
316	<	aclass->max_sendq = DEFAULT_SENDQ;
317	<
318	<	break;
319	<
320	<	default:
321	<	conf = NULL;
322	<	break;
155	>	return NULL;
156		}
324	–
325	–	/* XXX Yes, this will core if default is hit. I want it to for now - db */
326	–	conf->type = type;
327	–
328	–	return conf;
157		}
158
159	<	void
160	<	delete_conf_item(struct ConfItem *conf)
159	>	struct MaskItem *
160	>	conf_make(enum maskitem_type type)
161		{
162	<	dlink_node *m = NULL, *m_next = NULL;
163	<	struct MatchItem *match_item;
336	<	struct AccessItem *aconf;
337	<	ConfType type = conf->type;
338	<
339	<	MyFree(conf->name);
340	<	conf->name = NULL;
341	<
342	<	switch(type)
343	<	{
344	<	case DLINE_TYPE:
345	<	case EXEMPTDLINE_TYPE:
346	<	case GLINE_TYPE:
347	<	case KLINE_TYPE:
348	<	case CLIENT_TYPE:
349	<	case OPER_TYPE:
350	<	case SERVER_TYPE:
351	<	aconf = map_to_conf(conf);
352	<
353	<	if (aconf->dns_pending)
354	<	delete_resolver_queries(aconf);
355	<	if (aconf->passwd != NULL)
356	<	memset(aconf->passwd, 0, strlen(aconf->passwd));
357	<	if (aconf->spasswd != NULL)
358	<	memset(aconf->spasswd, 0, strlen(aconf->spasswd));
359	<	aconf->class_ptr = NULL;
360	<
361	<	MyFree(aconf->passwd);
362	<	MyFree(aconf->spasswd);
363	<	MyFree(aconf->reason);
364	<	MyFree(aconf->oper_reason);
365	<	MyFree(aconf->user);
366	<	MyFree(aconf->host);
367	<	MyFree(aconf->cipher_list);
368	<	#ifdef HAVE_LIBCRYPTO
369	<	if (aconf->rsa_public_key)
370	<	RSA_free(aconf->rsa_public_key);
371	<	MyFree(aconf->rsa_public_key_file);
372	<	#endif
373	<
374	<	/* Yes, sigh. switch on type again */
375	<	switch(type)
376	<	{
377	<	case EXEMPTDLINE_TYPE:
378	<	case DLINE_TYPE:
379	<	case GLINE_TYPE:
380	<	case KLINE_TYPE:
381	<	case CLIENT_TYPE:
382	<	MyFree(conf);
383	<	break;
384	<
385	<	case OPER_TYPE:
386	<	aconf = map_to_conf(conf);
387	<	if (!IsConfIllegal(aconf))
388	<	dlinkDelete(&conf->node, &oconf_items);
389	<	MyFree(conf);
390	<	break;
391	<
392	<	case SERVER_TYPE:
393	<	aconf = map_to_conf(conf);
394	<
395	<	DLINK_FOREACH_SAFE(m, m_next, aconf->hub_list.head)
396	<	{
397	<	MyFree(m->data);
398	<	free_dlink_node(m);
399	<	}
400	<
401	<	DLINK_FOREACH_SAFE(m, m_next, aconf->leaf_list.head)
402	<	{
403	<	MyFree(m->data);
404	<	free_dlink_node(m);
405	<	}
406	<
407	<	if (!IsConfIllegal(aconf))
408	<	dlinkDelete(&conf->node, &server_items);
409	<	MyFree(conf);
410	<	break;
411	<
412	<	default:
413	<	break;
414	<	}
415	<	break;
416	<
417	<	case ULINE_TYPE:
418	<	match_item = map_to_conf(conf);
419	<	MyFree(match_item->user);
420	<	MyFree(match_item->host);
421	<	MyFree(match_item->reason);
422	<	MyFree(match_item->oper_reason);
423	<	dlinkDelete(&conf->node, &uconf_items);
424	<	MyFree(conf);
425	<	break;
426	<
427	<	case XLINE_TYPE:
428	<	match_item = map_to_conf(conf);
429	<	MyFree(match_item->user);
430	<	MyFree(match_item->host);
431	<	MyFree(match_item->reason);
432	<	MyFree(match_item->oper_reason);
433	<	dlinkDelete(&conf->node, &xconf_items);
434	<	MyFree(conf);
435	<	break;
436	<	#ifdef HAVE_LIBPCRE
437	<	case RKLINE_TYPE:
438	<	aconf = map_to_conf(conf);
439	<	MyFree(aconf->regexuser);
440	<	MyFree(aconf->regexhost);
441	<	MyFree(aconf->user);
442	<	MyFree(aconf->host);
443	<	MyFree(aconf->reason);
444	<	MyFree(aconf->oper_reason);
445	<	dlinkDelete(&conf->node, &rkconf_items);
446	<	MyFree(conf);
447	<	break;
448	<
449	<	case RXLINE_TYPE:
450	<	MyFree(conf->regexpname);
451	<	match_item = map_to_conf(conf);
452	<	MyFree(match_item->user);
453	<	MyFree(match_item->host);
454	<	MyFree(match_item->reason);
455	<	MyFree(match_item->oper_reason);
456	<	dlinkDelete(&conf->node, &rxconf_items);
457	<	MyFree(conf);
458	<	break;
459	<	#endif
460	<	case NRESV_TYPE:
461	<	match_item = map_to_conf(conf);
462	<	MyFree(match_item->user);
463	<	MyFree(match_item->host);
464	<	MyFree(match_item->reason);
465	<	MyFree(match_item->oper_reason);
466	<	dlinkDelete(&conf->node, &nresv_items);
467	<
468	<	if (conf->flags & CONF_FLAGS_TEMPORARY)
469	<	if ((m = dlinkFindDelete(&temporary_resv, conf)) != NULL)
470	<	free_dlink_node(m);
471	<
472	<	MyFree(conf);
473	<	break;
474	<
475	<	case GDENY_TYPE:
476	<	aconf = map_to_conf(conf);
477	<	MyFree(aconf->user);
478	<	MyFree(aconf->host);
479	<	dlinkDelete(&conf->node, &gdeny_items);
480	<	MyFree(conf);
481	<	break;
482	<
483	<	case CLUSTER_TYPE:
484	<	dlinkDelete(&conf->node, &cluster_items);
485	<	MyFree(conf);
486	<	break;
162	>	struct MaskItem *const conf = xcalloc(sizeof(*conf));
163	>	dlink_list *list = NULL;
164
165	<	case CRESV_TYPE:
166	<	if (conf->flags & CONF_FLAGS_TEMPORARY)
167	<	if ((m = dlinkFindDelete(&temporary_resv, conf)) != NULL)
491	<	free_dlink_node(m);
165	>	conf->type   = type;
166	>	conf->active = 1;
167	>	conf->aftype = AF_INET;
168
169	<	MyFree(conf);
170	<	break;
171	<
496	<	case CLASS_TYPE:
497	<	dlinkDelete(&conf->node, &class_items);
498	<	MyFree(conf);
499	<	break;
500	<
501	<	case SERVICE_TYPE:
502	<	dlinkDelete(&conf->node, &service_items);
503	<	MyFree(conf);
504	<	break;
505	<
506	<	default:
507	<	break;
508	<	}
509	<	}
510	<
511	<	/* free_access_item()
512	<	*
513	<	* inputs       - pointer to conf to free
514	<	* output       - none
515	<	* side effects - crucial password fields are zeroed, conf is freed
516	<	*/
517	<	void
518	<	free_access_item(struct AccessItem *aconf)
519	<	{
520	<	struct ConfItem *conf;
521	<
522	<	if (aconf == NULL)
523	<	return;
524	<	conf = unmap_conf_item(aconf);
525	<	delete_conf_item(conf);
169	>	if ((list = map_to_list(type)))
170	>	dlinkAdd(conf, &conf->node, list);
171	>	return conf;
172		}
173
528	–	static const unsigned int shared_bit_table[] =
529	–	{ 'K', 'k', 'U', 'X', 'x', 'Y', 'Q', 'q', 'R', 'L', 0};
530	–
531	–	/* report_confitem_types()
532	–	*
533	–	* inputs       - pointer to client requesting confitem report
534	–	*              - ConfType to report
535	–	* output       - none
536	–	* side effects -
537	–	*/
174		void
175	<	report_confitem_types(struct Client *source_p, ConfType type)
175	>	conf_free(struct MaskItem *conf)
176		{
177	<	dlink_node *ptr = NULL, *dptr = NULL;
178	<	struct ConfItem *conf = NULL;
543	<	struct AccessItem *aconf = NULL;
544	<	struct MatchItem *matchitem = NULL;
545	<	struct ClassItem *classitem = NULL;
546	<	char buf[12];
547	<	char *p = NULL;
548	<
549	<	switch (type)
550	<	{
551	<	case GDENY_TYPE:
552	<	DLINK_FOREACH(ptr, gdeny_items.head)
553	<	{
554	<	conf = ptr->data;
555	<	aconf = map_to_conf(conf);
177	>	dlink_node *node = NULL, *node_next = NULL;
178	>	dlink_list *list = NULL;
179
180	<	p = buf;
180	>	if ((list = map_to_list(conf->type)))
181	>	dlinkFindDelete(list, conf);
182
183	<	if (aconf->flags & GDENY_BLOCK)
560	<	*p++ = 'B';
561	<	else
562	<	*p++ = 'b';
563	<
564	<	if (aconf->flags & GDENY_REJECT)
565	<	*p++ = 'R';
566	<	else
567	<	*p++ = 'r';
183	>	xfree(conf->name);
184
185	<	*p = '\0';
185	>	if (conf->dns_pending)
186	>	delete_resolver_queries(conf);
187	>	if (conf->passwd)
188	>	memset(conf->passwd, 0, strlen(conf->passwd));
189	>	if (conf->spasswd)
190	>	memset(conf->spasswd, 0, strlen(conf->spasswd));
191
192	<	sendto_one(source_p, ":%s %d %s V %s@%s %s %s",
572	<	me.name, RPL_STATSDEBUG, source_p->name,
573	<	aconf->user, aconf->host, conf->name, buf);
574	<	}
575	<	break;
192	>	conf->class = NULL;
193
194	<	case XLINE_TYPE:
195	<	DLINK_FOREACH(ptr, xconf_items.head)
196	<	{
197	<	conf = ptr->data;
198	<	matchitem = map_to_conf(conf);
199	<
200	<	sendto_one(source_p, form_str(RPL_STATSXLINE),
201	<	me.name, source_p->name,
585	<	matchitem->hold ? "x": "X", matchitem->count,
586	<	conf->name, matchitem->reason);
587	<	}
588	<	break;
194	>	xfree(conf->passwd);
195	>	xfree(conf->spasswd);
196	>	xfree(conf->reason);
197	>	xfree(conf->certfp);
198	>	xfree(conf->whois);
199	>	xfree(conf->user);
200	>	xfree(conf->host);
201	>	xfree(conf->cipher_list);
202
203	<	#ifdef HAVE_LIBPCRE
591	<	case RXLINE_TYPE:
592	<	DLINK_FOREACH(ptr, rxconf_items.head)
593	<	{
594	<	conf = ptr->data;
595	<	matchitem = map_to_conf(conf);
596	<
597	<	sendto_one(source_p, form_str(RPL_STATSXLINE),
598	<	me.name, source_p->name,
599	<	"XR", matchitem->count,
600	<	conf->name, matchitem->reason);
601	<	}
602	<	break;
603	<
604	<	case RKLINE_TYPE:
605	<	DLINK_FOREACH(ptr, rkconf_items.head)
606	<	{
607	<	aconf = map_to_conf((conf = ptr->data));
608	<
609	<	sendto_one(source_p, form_str(RPL_STATSKLINE), me.name,
610	<	source_p->name, "KR", aconf->host, aconf->user,
611	<	aconf->reason, aconf->oper_reason ? aconf->oper_reason : "");
612	<	}
613	<	break;
614	<	#endif
615	<
616	<	case ULINE_TYPE:
617	<	DLINK_FOREACH(ptr, uconf_items.head)
618	<	{
619	<	conf = ptr->data;
620	<	matchitem = map_to_conf(conf);
621	<
622	<	p = buf;
623	<
624	<	/* some of these are redundant for the sake of
625	<	* consistency with cluster{} flags
626	<	*/
627	<	*p++ = 'c';
628	<	flags_to_ascii(matchitem->action, shared_bit_table, p, 0);
629	<
630	<	sendto_one(source_p, form_str(RPL_STATSULINE),
631	<	me.name, source_p->name, conf->name,
632	<	matchitem->user?matchitem->user: "*",
633	<	matchitem->host?matchitem->host: "*", buf);
634	<	}
635	<
636	<	DLINK_FOREACH(ptr, cluster_items.head)
637	<	{
638	<	conf = ptr->data;
639	<
640	<	p = buf;
641	<
642	<	*p++ = 'C';
643	<	flags_to_ascii(conf->flags, shared_bit_table, p, 0);
644	<
645	<	sendto_one(source_p, form_str(RPL_STATSULINE),
646	<	me.name, source_p->name, conf->name,
647	<	"*", "*", buf);
648	<	}
649	<
650	<	break;
651	<
652	<	case OPER_TYPE:
653	<	DLINK_FOREACH(ptr, oconf_items.head)
654	<	{
655	<	conf = ptr->data;
656	<	aconf = map_to_conf(conf);
657	<
658	<	/* Don't allow non opers to see oper privs */
659	<	if (HasUMode(source_p, UMODE_OPER))
660	<	sendto_one(source_p, form_str(RPL_STATSOLINE),
661	<	me.name, source_p->name, 'O', aconf->user, aconf->host,
662	<	conf->name, oper_privs_as_string(aconf->port),
663	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
664	<	else
665	<	sendto_one(source_p, form_str(RPL_STATSOLINE),
666	<	me.name, source_p->name, 'O', aconf->user, aconf->host,
667	<	conf->name, "0",
668	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
669	<	}
670	<	break;
671	<
672	<	case CLASS_TYPE:
673	<	DLINK_FOREACH(ptr, class_items.head)
674	<	{
675	<	conf = ptr->data;
676	<	classitem = map_to_conf(conf);
677	<	sendto_one(source_p, form_str(RPL_STATSYLINE),
678	<	me.name, source_p->name, 'Y',
679	<	conf->name, classitem->ping_freq,
680	<	classitem->con_freq,
681	<	classitem->max_total, classitem->max_sendq,
682	<	classitem->curr_user_count,
683	<	classitem->active ? "active" : "disabled");
684	<	}
685	<	break;
686	<
687	<	case CONF_TYPE:
688	<	case CLIENT_TYPE:
689	<	break;
690	<
691	<	case SERVICE_TYPE:
692	<	DLINK_FOREACH(ptr, service_items.head)
693	<	{
694	<	conf = ptr->data;
695	<	sendto_one(source_p, form_str(RPL_STATSSERVICE),
696	<	me.name, source_p->name, 'S', "*", conf->name, 0, 0);
697	<	}
698	<	break;
699	<
700	<	case SERVER_TYPE:
701	<	DLINK_FOREACH(ptr, server_items.head)
702	<	{
703	<	p = buf;
704	<
705	<	conf = ptr->data;
706	<	aconf = map_to_conf(conf);
707	<
708	<	buf[0] = '\0';
709	<
710	<	if (IsConfAllowAutoConn(aconf))
711	<	*p++ = 'A';
712	<	if (IsConfSSL(aconf))
713	<	*p++ = 'S';
714	<	if (IsConfTopicBurst(aconf))
715	<	*p++ = 'T';
716	<	if (buf[0] == '\0')
717	<	*p++ = '*';
718	<
719	<	*p = '\0';
720	<
721	<	/*
722	<	* Allow admins to see actual ips unless hide_server_ips is enabled
723	<	*/
724	<	if (!ConfigServerHide.hide_server_ips && HasUMode(source_p, UMODE_ADMIN))
725	<	sendto_one(source_p, form_str(RPL_STATSCLINE),
726	<	me.name, source_p->name, 'C', aconf->host,
727	<	buf, conf->name, aconf->port,
728	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
729	<	else
730	<	sendto_one(source_p, form_str(RPL_STATSCLINE),
731	<	me.name, source_p->name, 'C',
732	<	"*@127.0.0.1", buf, conf->name, aconf->port,
733	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
734	<	}
735	<	break;
736	<
737	<	case HUB_TYPE:
738	<	DLINK_FOREACH(ptr, server_items.head)
739	<	{
740	<	conf = ptr->data;
741	<	aconf = map_to_conf(conf);
742	<
743	<	DLINK_FOREACH(dptr, aconf->hub_list.head)
744	<	sendto_one(source_p, form_str(RPL_STATSHLINE), me.name,
745	<	source_p->name, 'H', dptr->data, conf->name, 0, "*");
746	<	}
747	<	break;
748	<
749	<	case LEAF_TYPE:
750	<	DLINK_FOREACH(ptr, server_items.head)
751	<	{
752	<	conf = ptr->data;
753	<	aconf = map_to_conf(conf);
754	<
755	<	DLINK_FOREACH(dptr, aconf->leaf_list.head)
756	<	sendto_one(source_p, form_str(RPL_STATSLLINE), me.name,
757	<	source_p->name, 'L', dptr->data, conf->name, 0, "*");
758	<	}
759	<	break;
760	<
761	<	case GLINE_TYPE:
762	<	case KLINE_TYPE:
763	<	case DLINE_TYPE:
764	<	case EXEMPTDLINE_TYPE:
765	<	case CRESV_TYPE:
766	<	case NRESV_TYPE:
767	<	case CLUSTER_TYPE:
768	<	default:
769	<	break;
770	<	}
771	<	}
772	<
773	<	/* check_client()
774	<	*
775	<	* inputs       - pointer to client
776	<	* output       - 0 = Success
777	<	*                NOT_AUTHORIZED    (-1) = Access denied (no I line match)
778	<	*                IRCD_SOCKET_ERROR (-2) = Bad socket.
779	<	*                I_LINE_FULL       (-3) = I-line is full
780	<	*                TOO_MANY          (-4) = Too many connections from hostname
781	<	*                BANNED_CLIENT     (-5) = K-lined
782	<	* side effects - Ordinary client access check.
783	<	*                Look for conf lines which have the same
784	<	*                status as the flags passed.
785	<	*/
786	<	static void *
787	<	check_client(va_list args)
788	<	{
789	<	struct Client *source_p = va_arg(args, struct Client *);
790	<	const char *username = va_arg(args, const char *);
791	<	int i;
792	<
793	<	/* I'm already in big trouble if source_p->localClient is NULL -db */
794	<	if ((i = verify_access(source_p, username)))
795	<	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
796	<	source_p->name, source_p->sockhost);
797	<
798	<	switch (i)
203	>	DLINK_FOREACH_SAFE(node, node_next, conf->hub_list.head)
204		{
205	<	case TOO_MANY:
206	<	sendto_realops_flags(UMODE_FULL, L_ALL,
207	<	"Too many on IP for %s (%s).",
803	<	get_client_name(source_p, SHOW_IP),
804	<	source_p->sockhost);
805	<	ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
806	<	get_client_name(source_p, SHOW_IP));
807	<	++ServerStats.is_ref;
808	<	exit_client(source_p, &me, "No more connections allowed on that IP");
809	<	break;
810	<
811	<	case I_LINE_FULL:
812	<	sendto_realops_flags(UMODE_FULL, L_ALL,
813	<	"I-line is full for %s (%s).",
814	<	get_client_name(source_p, SHOW_IP),
815	<	source_p->sockhost);
816	<	ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
817	<	get_client_name(source_p, SHOW_IP));
818	<	++ServerStats.is_ref;
819	<	exit_client(source_p, &me,
820	<	"No more connections allowed in your connection class");
821	<	break;
822	<
823	<	case NOT_AUTHORIZED:
824	<	++ServerStats.is_ref;
825	<	/* jdc - lists server name & port connections are on */
826	<	/*       a purely cosmetical change */
827	<	sendto_realops_flags(UMODE_UNAUTH, L_ALL,
828	<	"Unauthorized client connection from %s [%s] on [%s/%u].",
829	<	get_client_name(source_p, SHOW_IP),
830	<	source_p->sockhost,
831	<	source_p->localClient->listener->name,
832	<	source_p->localClient->listener->port);
833	<	ilog(LOG_TYPE_IRCD,
834	<	"Unauthorized client connection from %s on [%s/%u].",
835	<	get_client_name(source_p, SHOW_IP),
836	<	source_p->localClient->listener->name,
837	<	source_p->localClient->listener->port);
838	<
839	<	/* XXX It is prolematical whether it is better to use the
840	<	* capture reject code here or rely on the connecting too fast code.
841	<	* - Dianora
842	<	*/
843	<	if (REJECT_HOLD_TIME > 0)
844	<	{
845	<	sendto_one(source_p, ":%s NOTICE %s :You are not authorized to use this server",
846	<	me.name, source_p->name);
847	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
848	<	SetCaptured(source_p);
849	<	}
850	<	else
851	<	exit_client(source_p, &me, "You are not authorized to use this server");
852	<	break;
853	<
854	<	case BANNED_CLIENT:
855	<	/*
856	<	* Don't exit them immediately, play with them a bit.
857	<	* - Dianora
858	<	*/
859	<	if (REJECT_HOLD_TIME > 0)
860	<	{
861	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
862	<	SetCaptured(source_p);
863	<	}
864	<	else
865	<	exit_client(source_p, &me, "Banned");
866	<	++ServerStats.is_ref;
867	<	break;
868	<
869	<	case 0:
870	<	default:
871	<	break;
205	>	xfree(node->data);
206	>	dlinkDelete(node, &conf->hub_list);
207	>	free_dlink_node(node);
208		}
209
210	<	return (i < 0 ? NULL : source_p);
875	<	}
876	<
877	<	/* verify_access()
878	<	*
879	<	* inputs       - pointer to client to verify
880	<	*              - pointer to proposed username
881	<	* output       - 0 if success -'ve if not
882	<	* side effect  - find the first (best) I line to attach.
883	<	*/
884	<	static int
885	<	verify_access(struct Client *client_p, const char *username)
886	<	{
887	<	struct AccessItem *aconf = NULL, *rkconf = NULL;
888	<	struct ConfItem *conf = NULL;
889	<	char non_ident[USERLEN + 1] = { '~', '\0' };
890	<	const char *uhi[3];
891	<
892	<	if (IsGotId(client_p))
893	<	{
894	<	aconf = find_address_conf(client_p->host, client_p->username,
895	<	&client_p->localClient->ip,
896	<	client_p->localClient->aftype,
897	<	client_p->localClient->passwd);
898	<	}
899	<	else
210	>	DLINK_FOREACH_SAFE(node, node_next, conf->leaf_list.head)
211		{
212	<	strlcpy(non_ident+1, username, sizeof(non_ident)-1);
213	<	aconf = find_address_conf(client_p->host,non_ident,
214	<	&client_p->localClient->ip,
904	<	client_p->localClient->aftype,
905	<	client_p->localClient->passwd);
212	>	xfree(node->data);
213	>	dlinkDelete(node, &conf->leaf_list);
214	>	free_dlink_node(node);
215		}
216
217	<	uhi[0] = IsGotId(client_p) ? client_p->username : non_ident;
909	<	uhi[1] = client_p->host;
910	<	uhi[2] = client_p->sockhost;
911	<
912	<	rkconf = find_regexp_kline(uhi);
913	<
914	<	if (aconf != NULL)
217	>	DLINK_FOREACH_SAFE(node, node_next, conf->exempt_list.head)
218		{
219	<	if (IsConfClient(aconf) && !rkconf)
917	<	{
918	<	conf = unmap_conf_item(aconf);
919	<
920	<	if (IsConfRedir(aconf))
921	<	{
922	<	sendto_one(client_p, form_str(RPL_REDIR),
923	<	me.name, client_p->name,
924	<	conf->name ? conf->name : "",
925	<	aconf->port);
926	<	return(NOT_AUTHORIZED);
927	<	}
219	>	struct exempt *exptr = node->data;
220
221	<	if (IsConfDoIdentd(aconf))
222	<	SetNeedId(client_p);
223	<
224	<	/* Thanks for spoof idea amm */
225	<	if (IsConfDoSpoofIp(aconf))
934	<	{
935	<	conf = unmap_conf_item(aconf);
936	<
937	<	if (!ConfigFileEntry.hide_spoof_ips && IsConfSpoofNotice(aconf))
938	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "%s spoofing: %s as %s",
939	<	client_p->name, client_p->host, conf->name);
940	<	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
941	<	SetIPSpoof(client_p);
942	<	}
943	<
944	<	return(attach_iline(client_p, conf));
945	<	}
946	<	else if (rkconf || IsConfKill(aconf) || (ConfigFileEntry.glines && IsConfGline(aconf)))
947	<	{
948	<	/* XXX */
949	<	aconf = rkconf ? rkconf : aconf;
950	<	if (IsConfGline(aconf))
951	<	sendto_one(client_p, ":%s NOTICE %s :*** G-lined", me.name,
952	<	client_p->name);
953	<	if (ConfigFileEntry.kline_with_reason)
954	<	sendto_one(client_p, ":%s NOTICE %s :*** Banned %s",
955	<	me.name, client_p->name, aconf->reason);
956	<	return(BANNED_CLIENT);
957	<	}
221	>	dlinkDelete(node, &conf->exempt_list);
222	>	xfree(exptr->name);
223	>	xfree(exptr->user);
224	>	xfree(exptr->host);
225	>	xfree(exptr);
226		}
227
228	<	return(NOT_AUTHORIZED);
228	>	xfree(conf);
229		}
230
231		/* attach_iline()
232		*
233	<	* inputs       - client pointer
234	<	*              - conf pointer
235	<	* output       -
236	<	* side effects - do actual attach
233	>	* inputs       - client pointer
234	>	*              - conf pointer
235	>	* output       -
236	>	* side effects - do actual attach
237		*/
238		static int
239	<	attach_iline(struct Client *client_p, struct ConfItem *conf)
239	>	attach_iline(struct Client *client_p, struct MaskItem *conf)
240		{
241	<	struct AccessItem *aconf;
974	<	struct ClassItem *aclass;
241	>	const struct ClassItem *const class = conf->class;
242		struct ip_entry *ip_found;
243		int a_limit_reached = 0;
244	<	int local = 0, global = 0, ident = 0;
244	>	unsigned int local = 0, global = 0, ident = 0;
245
246	<	ip_found = find_or_add_ip(&client_p->localClient->ip);
246	>	ip_found = ipcache_find_or_add_address(&client_p->connection->ip);
247		ip_found->count++;
248	<	SetIpHash(client_p);
982	<
983	<	aconf = map_to_conf(conf);
984	<	if (aconf->class_ptr == NULL)
985	<	return NOT_AUTHORIZED;  /* If class is missing, this is best */
986	<
987	<	aclass = map_to_conf(aconf->class_ptr);
248	>	AddFlag(client_p, FLAGS_IPHASH);
249
250	<	count_user_host(client_p->username, client_p->host,
251	<	&global, &local, &ident);
250	>	userhost_count(client_p->username, client_p->host,
251	>	&global, &local, &ident);
252
253		/* XXX blah. go down checking the various silly limits
254		* setting a_limit_reached if any limit is reached.
255		* - Dianora
256		*/
257	<	if (aclass->max_total != 0 && aclass->curr_user_count >= aclass->max_total)
257	>	if (class->max_total && class->ref_count >= class->max_total)
258		a_limit_reached = 1;
259	<	else if (aclass->max_perip != 0 && ip_found->count > aclass->max_perip)
259	>	else if (class->max_perip && ip_found->count > class->max_perip)
260		a_limit_reached = 1;
261	<	else if (aclass->max_local != 0 && local >= aclass->max_local)
261	>	else if (class->max_local && local >= class->max_local)
262		a_limit_reached = 1;
263	<	else if (aclass->max_global != 0 && global >= aclass->max_global)
263	>	else if (class->max_global && global >= class->max_global)
264		a_limit_reached = 1;
265	<	else if (aclass->max_ident != 0 && ident >= aclass->max_ident &&
265	>	else if (class->max_ident && ident >= class->max_ident &&
266		client_p->username[0] != '~')
267		a_limit_reached = 1;
268
269		if (a_limit_reached)
270		{
271	<	if (!IsConfExemptLimits(aconf))
271	>	if (!IsConfExemptLimits(conf))
272		return TOO_MANY;   /* Already at maximum allowed */
273
274	<	sendto_one(client_p,
275	<	":%s NOTICE %s :*** Your connection class is full, "
1015	<	"but you have exceed_limit = yes;", me.name, client_p->name);
274	>	sendto_one_notice(client_p, &me, ":*** Your connection class is full, "
275	>	"but you have exceed_limit = yes;");
276		}
277
278		return attach_conf(client_p, conf);
279		}
280
281	<	/* init_ip_hash_table()
1022	<	*
1023	<	* inputs               - NONE
1024	<	* output               - NONE
1025	<	* side effects         - allocate memory for ip_entry(s)
1026	<	*                      - clear the ip hash table
1027	<	*/
1028	<	void
1029	<	init_ip_hash_table(void)
1030	<	{
1031	<	ip_entry_heap = BlockHeapCreate("ip", sizeof(struct ip_entry),
1032	<	2 * hard_fdlimit);
1033	<	memset(ip_hash_table, 0, sizeof(ip_hash_table));
1034	<	}
1035	<
1036	<	/* find_or_add_ip()
1037	<	*
1038	<	* inputs       - pointer to struct irc_ssaddr
1039	<	* output       - pointer to a struct ip_entry
1040	<	* side effects -
281	>	/* verify_access()
282		*
283	<	* If the ip # was not found, a new struct ip_entry is created, and the ip
284	<	* count set to 0.
283	>	* inputs       - pointer to client to verify
284	>	* output       - 0 if success -'ve if not
285	>	* side effect  - find the first (best) I line to attach.
286		*/
287	<	static struct ip_entry *
288	<	find_or_add_ip(struct irc_ssaddr *ip_in)
287	>	static int
288	>	verify_access(struct Client *client_p)
289		{
290	<	struct ip_entry *ptr, *newptr;
1049	<	int hash_index = hash_ip(ip_in), res;
1050	<	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
1051	<	#ifdef IPV6
1052	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
1053	<	#endif
290	>	struct MaskItem *conf = NULL;
291
292	<	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
292	>	if (HasFlag(client_p, FLAGS_GOTID))
293		{
294	<	#ifdef IPV6
295	<	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
296	<	continue;
297	<	if (ip_in->ss.ss_family == AF_INET6)
1061	<	{
1062	<	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
1063	<	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
1064	<	}
1065	<	else
1066	<	#endif
1067	<	{
1068	<	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
1069	<	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
1070	<	}
1071	<	if (res == 0)
1072	<	{
1073	<	/* Found entry already in hash, return it. */
1074	<	return ptr;
1075	<	}
294	>	conf = find_address_conf(client_p->host, client_p->username,
295	>	&client_p->connection->ip,
296	>	client_p->connection->aftype,
297	>	client_p->connection->password);
298		}
299	+	else
300	+	{
301	+	char non_ident[USERLEN + 1] = "~";
302
303	<	if (ip_entries_count >= 2 * hard_fdlimit)
304	<	garbage_collect_ip_entries();
305	<
306	<	newptr = BlockHeapAlloc(ip_entry_heap);
307	<	ip_entries_count++;
308	<	memcpy(&newptr->ip, ip_in, sizeof(struct irc_ssaddr));
303	>	strlcpy(non_ident + 1, client_p->username, sizeof(non_ident) - 1);
304	>	conf = find_address_conf(client_p->host, non_ident,
305	>	&client_p->connection->ip,
306	>	client_p->connection->aftype,
307	>	client_p->connection->password);
308	>	}
309
310	<	newptr->next = ip_hash_table[hash_index];
311	<	ip_hash_table[hash_index] = newptr;
310	>	if (!conf)
311	>	return NOT_AUTHORIZED;
312
313	<	return newptr;
1089	<	}
313	>	assert(IsConfClient(conf) || IsConfKill(conf));
314
315	<	/* remove_one_ip()
1092	<	*
1093	<	* inputs        - unsigned long IP address value
1094	<	* output        - NONE
1095	<	* side effects  - The ip address given, is looked up in ip hash table
1096	<	*                 and number of ip#'s for that ip decremented.
1097	<	*                 If ip # count reaches 0 and has expired,
1098	<	*                 the struct ip_entry is returned to the ip_entry_heap
1099	<	*/
1100	<	void
1101	<	remove_one_ip(struct irc_ssaddr *ip_in)
1102	<	{
1103	<	struct ip_entry *ptr;
1104	<	struct ip_entry *last_ptr = NULL;
1105	<	int hash_index = hash_ip(ip_in), res;
1106	<	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
1107	<	#ifdef IPV6
1108	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
1109	<	#endif
1110	<
1111	<	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
315	>	if (IsConfClient(conf))
316		{
317	<	#ifdef IPV6
1114	<	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
1115	<	continue;
1116	<	if (ip_in->ss.ss_family == AF_INET6)
317	>	if (IsConfRedir(conf))
318		{
319	<	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
320	<	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
321	<	}
322	<	else
1122	<	#endif
1123	<	{
1124	<	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
1125	<	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
319	>	sendto_one_numeric(client_p, &me, RPL_REDIR,
320	>	conf->name ? conf->name : "",
321	>	conf->port);
322	>	return NOT_AUTHORIZED;
323		}
324	<	if (res)
325	<	continue;
1129	<	if (ptr->count > 0)
1130	<	ptr->count--;
1131	<	if (ptr->count == 0 &&
1132	<	(CurrentTime-ptr->last_attempt) >= ConfigFileEntry.throttle_time)
324	>
325	>	if (IsConfDoSpoofIp(conf))
326		{
327	<	if (last_ptr != NULL)
328	<	last_ptr->next = ptr->next;
329	<	else
1137	<	ip_hash_table[hash_index] = ptr->next;
327	>	if (IsConfSpoofNotice(conf))
328	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE, "%s spoofing: %s as %s",
329	>	client_p->name, client_p->host, conf->name);
330
331	<	BlockHeapFree(ip_entry_heap, ptr);
1140	<	ip_entries_count--;
1141	<	return;
331	>	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
332		}
1143	–	last_ptr = ptr;
1144	–	}
1145	–	}
1146	–
1147	–	/* hash_ip()
1148	–	*
1149	–	* input        - pointer to an irc_inaddr
1150	–	* output       - integer value used as index into hash table
1151	–	* side effects - hopefully, none
1152	–	*/
1153	–	static int
1154	–	hash_ip(struct irc_ssaddr *addr)
1155	–	{
1156	–	if (addr->ss.ss_family == AF_INET)
1157	–	{
1158	–	struct sockaddr_in *v4 = (struct sockaddr_in *)addr;
1159	–	int hash;
1160	–	uint32_t ip;
333
334	<	ip   = ntohl(v4->sin_addr.s_addr);
1163	<	hash = ((ip >> 12) + ip) & (IP_HASH_SIZE-1);
1164	<	return hash;
1165	<	}
1166	<	#ifdef IPV6
1167	<	else
1168	<	{
1169	<	int hash;
1170	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)addr;
1171	<	uint32_t *ip = (uint32_t *)&v6->sin6_addr.s6_addr;
1172	<
1173	<	hash  = ip[0] ^ ip[3];
1174	<	hash ^= hash >> 16;
1175	<	hash ^= hash >> 8;
1176	<	hash  = hash & (IP_HASH_SIZE - 1);
1177	<	return hash;
334	>	return attach_iline(client_p, conf);
335		}
336	<	#else
337	<	return 0;
338	<	#endif
336	>
337	>	sendto_one_notice(client_p, &me, ":*** Banned: %s", conf->reason);
338	>	return BANNED_CLIENT;
339		}
340
341	<	/* count_ip_hash()
1185	<	*
1186	<	* inputs        - pointer to counter of number of ips hashed
1187	<	*               - pointer to memory used for ip hash
1188	<	* output        - returned via pointers input
1189	<	* side effects  - NONE
341	>	/* check_client()
342		*
343	<	* number of hashed ip #'s is counted up, plus the amount of memory
344	<	* used in the hash.
343	>	* inputs       - pointer to client
344	>	* output       - 0 = Success
345	>	*                NOT_AUTHORIZED    (-1) = Access denied (no I line match)
346	>	*                IRCD_SOCKET_ERROR (-2) = Bad socket.
347	>	*                I_LINE_FULL       (-3) = I-line is full
348	>	*                TOO_MANY          (-4) = Too many connections from hostname
349	>	*                BANNED_CLIENT     (-5) = K-lined
350	>	* side effects - Ordinary client access check.
351	>	*                Look for conf lines which have the same
352	>	*                status as the flags passed.
353		*/
354	<	void
355	<	count_ip_hash(unsigned int *number_ips_stored, uint64_t *mem_ips_stored)
354	>	int
355	>	check_client(struct Client *source_p)
356		{
1197	–	struct ip_entry *ptr;
357		int i;
358
359	<	*number_ips_stored = 0;
360	<	*mem_ips_stored    = 0;
359	>	if ((i = verify_access(source_p)))
360	>	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
361	>	source_p->name, source_p->sockhost);
362
363	<	for (i = 0; i < IP_HASH_SIZE; i++)
363	>	switch (i)
364		{
365	<	for (ptr = ip_hash_table[i]; ptr; ptr = ptr->next)
366	<	{
367	<	*number_ips_stored += 1;
368	<	*mem_ips_stored += sizeof(struct ip_entry);
369	<	}
370	<	}
371	<	}
365	>	case TOO_MANY:
366	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
367	>	"Too many on IP for %s (%s).",
368	>	get_client_name(source_p, SHOW_IP),
369	>	source_p->sockhost);
370	>	ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
371	>	get_client_name(source_p, SHOW_IP));
372	>	++ServerStats.is_ref;
373	>	exit_client(source_p, "No more connections allowed on that IP");
374	>	break;
375
376	<	/* garbage_collect_ip_entries()
377	<	*
378	<	* input        - NONE
379	<	* output       - NONE
380	<	* side effects - free up all ip entries with no connections
381	<	*/
382	<	static void
383	<	garbage_collect_ip_entries(void)
384	<	{
385	<	struct ip_entry *ptr;
1223	<	struct ip_entry *last_ptr;
1224	<	struct ip_entry *next_ptr;
1225	<	int i;
376	>	case I_LINE_FULL:
377	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
378	>	"auth {} block is full for %s (%s).",
379	>	get_client_name(source_p, SHOW_IP),
380	>	source_p->sockhost);
381	>	ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
382	>	get_client_name(source_p, SHOW_IP));
383	>	++ServerStats.is_ref;
384	>	exit_client(source_p, "No more connections allowed in your connection class");
385	>	break;
386
387	<	for (i = 0; i < IP_HASH_SIZE; i++)
388	<	{
389	<	last_ptr = NULL;
387	>	case NOT_AUTHORIZED:
388	>	/* jdc - lists server name & port connections are on */
389	>	/*       a purely cosmetical change */
390	>	sendto_realops_flags(UMODE_UNAUTH, L_ALL, SEND_NOTICE,
391	>	"Unauthorized client connection from %s [%s] on [%s/%u].",
392	>	get_client_name(source_p, SHOW_IP),
393	>	source_p->sockhost,
394	>	source_p->connection->listener->name,
395	>	source_p->connection->listener->port);
396	>	ilog(LOG_TYPE_IRCD, "Unauthorized client connection from %s on [%s/%u].",
397	>	get_client_name(source_p, SHOW_IP),
398	>	source_p->connection->listener->name,
399	>	source_p->connection->listener->port);
400
401	<	for (ptr = ip_hash_table[i]; ptr; ptr = next_ptr)
402	<	{
403	<	next_ptr = ptr->next;
401	>	++ServerStats.is_ref;
402	>	exit_client(source_p, "You are not authorized to use this server");
403	>	break;
404
405	<	if (ptr->count == 0 &&
406	<	(CurrentTime - ptr->last_attempt) >= ConfigFileEntry.throttle_time)
407	<	{
408	<	if (last_ptr != NULL)
409	<	last_ptr->next = ptr->next;
410	<	else
411	<	ip_hash_table[i] = ptr->next;
412	<	BlockHeapFree(ip_entry_heap, ptr);
1243	<	ip_entries_count--;
1244	<	}
1245	<	else
1246	<	last_ptr = ptr;
1247	<	}
405	>	case BANNED_CLIENT:
406	>	++ServerStats.is_ref;
407	>	exit_client(source_p, "Banned");
408	>	break;
409	>
410	>	case 0:
411	>	default:
412	>	break;
413		}
414	+
415	+	return !(i < 0);
416		}
417
418		/* detach_conf()
#	Line 1256 | Line 423 | garbage_collect_ip_entries(void)
423		* side effects - Disassociate configuration from the client.
424		*                Also removes a class from the list if marked for deleting.
425		*/
426	<	int
427	<	detach_conf(struct Client *client_p, ConfType type)
426	>	void
427	>	detach_conf(struct Client *client_p, enum maskitem_type type)
428		{
429	<	dlink_node *ptr, *next_ptr;
1263	<	struct ConfItem *conf;
1264	<	struct ClassItem *aclass;
1265	<	struct AccessItem *aconf;
1266	<	struct ConfItem *aclass_conf;
1267	<	struct MatchItem *match_item;
429	>	dlink_node *node = NULL, *node_next = NULL;
430
431	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->confs.head)
431	>	DLINK_FOREACH_SAFE(node, node_next, client_p->connection->confs.head)
432		{
433	<	conf = ptr->data;
1272	<
1273	<	if (type == CONF_TYPE || conf->type == type)
1274	<	{
1275	<	dlinkDelete(ptr, &client_p->localClient->confs);
1276	<	free_dlink_node(ptr);
433	>	struct MaskItem *conf = node->data;
434
435	<	switch (conf->type)
436	<	{
437	<	case CLIENT_TYPE:
1281	<	case OPER_TYPE:
1282	<	case SERVER_TYPE:
1283	<	aconf = map_to_conf(conf);
435	>	assert(conf->type & (CONF_CLIENT | CONF_OPER | CONF_SERVER));
436	>	assert(conf->ref_count > 0);
437	>	assert(conf->class->ref_count > 0);
438
439	<	assert(aconf->clients > 0);
440	<
1287	<	if ((aclass_conf = aconf->class_ptr) != NULL)
1288	<	{
1289	<	aclass = map_to_conf(aclass_conf);
1290	<
1291	<	assert(aclass->curr_user_count > 0);
1292	<
1293	<	if (conf->type == CLIENT_TYPE)
1294	<	remove_from_cidr_check(&client_p->localClient->ip, aclass);
1295	<	if (--aclass->curr_user_count == 0 && aclass->active == 0)
1296	<	delete_conf_item(aclass_conf);
1297	<	}
439	>	if (!(conf->type & type))
440	>	continue;
441
442	<	if (--aconf->clients == 0 && IsConfIllegal(aconf))
443	<	delete_conf_item(conf);
442	>	dlinkDelete(node, &client_p->connection->confs);
443	>	free_dlink_node(node);
444
445	<	break;
446	<	default:
1304	<	break;
1305	<	}
445	>	if (conf->type == CONF_CLIENT)
446	>	remove_from_cidr_check(&client_p->connection->ip, conf->class);
447
448	<	if (type != CONF_TYPE)
449	<	return 0;
448	>	if (--conf->class->ref_count == 0 && conf->class->active == 0)
449	>	{
450	>	class_free(conf->class);
451	>	conf->class = NULL;
452		}
1310	–	}
453
454	<	return -1;
454	>	if (--conf->ref_count == 0 && conf->active == 0)
455	>	conf_free(conf);
456	>	}
457		}
458
459		/* attach_conf()
#	Line 1323 | Line 467 | detach_conf(struct Client *client_p, Con
467		*                attachment if there was an old one...
468		*/
469		int
470	<	attach_conf(struct Client *client_p, struct ConfItem *conf)
470	>	attach_conf(struct Client *client_p, struct MaskItem *conf)
471		{
472	<	if (dlinkFind(&client_p->localClient->confs, conf) != NULL)
472	>	if (dlinkFind(&client_p->connection->confs, conf))
473		return 1;
474
475	<	if (conf->type == CLIENT_TYPE ||
476	<	conf->type == SERVER_TYPE ||
477	<	conf->type == OPER_TYPE)
478	<	{
1335	<	struct AccessItem *aconf = map_to_conf(conf);
1336	<	struct ClassItem *aclass = map_to_conf(aconf->class_ptr);
475	>	if (conf->type == CONF_CLIENT)
476	>	if (cidr_limit_reached(IsConfExemptLimits(conf),
477	>	&client_p->connection->ip, conf->class))
478	>	return TOO_MANY;    /* Already at maximum allowed */
479
480	<	if (IsConfIllegal(aconf))
481	<	return NOT_AUTHORIZED;
480	>	conf->class->ref_count++;
481	>	conf->ref_count++;
482
483	<	if (conf->type == CLIENT_TYPE)
1342	<	if (cidr_limit_reached(IsConfExemptLimits(aconf),
1343	<	&client_p->localClient->ip, aclass))
1344	<	return TOO_MANY;    /* Already at maximum allowed */
1345	<
1346	<	aclass->curr_user_count++;
1347	<	aconf->clients++;
1348	<	}
1349	<
1350	<	dlinkAdd(conf, make_dlink_node(), &client_p->localClient->confs);
483	>	dlinkAdd(conf, make_dlink_node(), &client_p->connection->confs);
484
485		return 0;
486		}
#	Line 1364 | Line 497 | int
497		attach_connect_block(struct Client *client_p, const char *name,
498		const char *host)
499		{
500	<	dlink_node *ptr;
1368	<	struct ConfItem *conf;
1369	<	struct AccessItem *aconf;
500	>	dlink_node *node = NULL;
501
502	<	assert(client_p != NULL);
1372	<	assert(host != NULL);
1373	<
1374	<	if (client_p == NULL || host == NULL)
1375	<	return 0;
502	>	assert(host);
503
504	<	DLINK_FOREACH(ptr, server_items.head)
504	>	DLINK_FOREACH(node, server_items.head)
505		{
506	<	conf = ptr->data;
1380	<	aconf = map_to_conf(conf);
506	>	struct MaskItem *conf = node->data;
507
508	<	if (match(conf->name, name) == 0 || match(aconf->host, host) == 0)
508	>	if (match(conf->name, name) || match(conf->host, host))
509		continue;
510
511		attach_conf(client_p, conf);
512	<	return -1;
512	>	return 1;
513		}
514
515		return 0;
516		}
517
1392	–	/* find_conf_exact()
1393	–	*
1394	–	* inputs       - type of ConfItem
1395	–	*              - pointer to name to find
1396	–	*              - pointer to username to find
1397	–	*              - pointer to host to find
1398	–	* output       - NULL or pointer to conf found
1399	–	* side effects - find a conf entry which matches the hostname
1400	–	*                and has the same name.
1401	–	*/
1402	–	struct ConfItem *
1403	–	find_conf_exact(ConfType type, const char *name, const char *user,
1404	–	const char *host)
1405	–	{
1406	–	dlink_node *ptr;
1407	–	dlink_list *list_p;
1408	–	struct ConfItem *conf = NULL;
1409	–	struct AccessItem *aconf;
1410	–
1411	–	/* Only valid for OPER_TYPE and ...? */
1412	–	list_p = map_to_list(type);
1413	–
1414	–	DLINK_FOREACH(ptr, (*list_p).head)
1415	–	{
1416	–	conf = ptr->data;
1417	–
1418	–	if (conf->name == NULL)
1419	–	continue;
1420	–	aconf = map_to_conf(conf);
1421	–	if (aconf->host == NULL)
1422	–	continue;
1423	–	if (irccmp(conf->name, name) != 0)
1424	–	continue;
1425	–
1426	–	/*
1427	–	** Accept if the *real* hostname (usually sockethost)
1428	–	** socket host) matches *either* host or name field
1429	–	** of the configuration.
1430	–	*/
1431	–	if (!match(aconf->host, host) || !match(aconf->user, user))
1432	–	continue;
1433	–	if (type == OPER_TYPE)
1434	–	{
1435	–	struct ClassItem *aclass = map_to_conf(aconf->class_ptr);
1436	–
1437	–	if (aconf->clients >= aclass->max_total)
1438	–	continue;
1439	–	}
1440	–
1441	–	return conf;
1442	–	}
1443	–
1444	–	return NULL;
1445	–	}
1446	–
518		/* find_conf_name()
519		*
520		* inputs       - pointer to conf link list to search
#	Line 1453 | Line 524 | find_conf_exact(ConfType type, const cha
524		* side effects - find a conf entry which matches the name
525		*                and has the given mask.
526		*/
527	<	struct ConfItem *
528	<	find_conf_name(dlink_list *list, const char *name, ConfType type)
527	>	struct MaskItem *
528	>	find_conf_name(dlink_list *list, const char *name, enum maskitem_type type)
529		{
530	<	dlink_node *ptr;
1460	<	struct ConfItem* conf;
530	>	dlink_node *node = NULL;
531
532	<	DLINK_FOREACH(ptr, list->head)
532	>	DLINK_FOREACH(node, list->head)
533		{
534	<	conf = ptr->data;
535	<
534	>	struct MaskItem *conf = node->data;
535	>
536		if (conf->type == type)
537		{
538	<	if (conf->name && (irccmp(conf->name, name) == 0 ||
539	<	match(conf->name, name)))
1470	<	return conf;
538	>	if (conf->name && !irccmp(conf->name, name))
539	>	return conf;
540		}
541		}
542
543		return NULL;
544		}
545
1477	–	/* map_to_list()
1478	–	*
1479	–	* inputs       - ConfType conf
1480	–	* output       - pointer to dlink_list to use
1481	–	* side effects - none
1482	–	*/
1483	–	static dlink_list *
1484	–	map_to_list(ConfType type)
1485	–	{
1486	–	switch(type)
1487	–	{
1488	–	case RXLINE_TYPE:
1489	–	return(&rxconf_items);
1490	–	break;
1491	–	case XLINE_TYPE:
1492	–	return(&xconf_items);
1493	–	break;
1494	–	case ULINE_TYPE:
1495	–	return(&uconf_items);
1496	–	break;
1497	–	case NRESV_TYPE:
1498	–	return(&nresv_items);
1499	–	break;
1500	–	case OPER_TYPE:
1501	–	return(&oconf_items);
1502	–	break;
1503	–	case CLASS_TYPE:
1504	–	return(&class_items);
1505	–	break;
1506	–	case SERVER_TYPE:
1507	–	return(&server_items);
1508	–	break;
1509	–	case SERVICE_TYPE:
1510	–	return(&service_items);
1511	–	break;
1512	–	case CLUSTER_TYPE:
1513	–	return(&cluster_items);
1514	–	break;
1515	–	case CONF_TYPE:
1516	–	case GLINE_TYPE:
1517	–	case KLINE_TYPE:
1518	–	case DLINE_TYPE:
1519	–	case CRESV_TYPE:
1520	–	default:
1521	–	return NULL;
1522	–	}
1523	–	}
1524	–
546		/* find_matching_name_conf()
547		*
548		* inputs       - type of link list to look in
549		*              - pointer to name string to find
550		*              - pointer to user
551		*              - pointer to host
552	<	*              - optional action to match on as well
553	<	* output       - NULL or pointer to found struct MatchItem
552	>	*              - optional flags to match on as well
553	>	* output       - NULL or pointer to found struct MaskItem
554		* side effects - looks for a match on name field
555		*/
556	<	struct ConfItem *
557	<	find_matching_name_conf(ConfType type, const char *name, const char *user,
558	<	const char *host, int action)
559	<	{
560	<	dlink_node *ptr=NULL;
561	<	struct ConfItem *conf=NULL;
562	<	struct AccessItem *aconf=NULL;
1542	<	struct MatchItem *match_item=NULL;
1543	<	dlink_list *list_p = map_to_list(type);
556	>	struct MaskItem *
557	>	find_matching_name_conf(enum maskitem_type type, const char *name, const char *user,
558	>	const char *host, unsigned int flags)
559	>	{
560	>	dlink_node *node = NULL;
561	>	dlink_list *list = map_to_list(type);
562	>	struct MaskItem *conf = NULL;
563
564		switch (type)
565		{
566	<	#ifdef HAVE_LIBPCRE
567	<	case RXLINE_TYPE:
568	<	DLINK_FOREACH(ptr, list_p->head)
569	<	{
1551	<	conf = ptr->data;
1552	<	assert(conf->regexpname);
1553	<
1554	<	if (!ircd_pcre_exec(conf->regexpname, name))
1555	<	return conf;
1556	<	}
1557	<	break;
1558	<	#endif
1559	<	case SERVICE_TYPE:
1560	<	DLINK_FOREACH(ptr, list_p->head)
566	>	case CONF_XLINE:
567	>	case CONF_NRESV:
568	>	case CONF_CRESV:
569	>	DLINK_FOREACH(node, list->head)
570		{
571	<	conf = ptr->data;
571	>	conf = node->data;
572
573		if (EmptyString(conf->name))
574		continue;
575	<	if ((name != NULL) && !irccmp(name, conf->name))
1567	<	return conf;
1568	<	}
1569	<	break;
1570	<
1571	<	case XLINE_TYPE:
1572	<	case ULINE_TYPE:
1573	<	case NRESV_TYPE:
1574	<	DLINK_FOREACH(ptr, list_p->head)
1575	<	{
1576	<	conf = ptr->data;
1577	<
1578	<	match_item = map_to_conf(conf);
1579	<	if (EmptyString(conf->name))
1580	<	continue;
1581	<	if ((name != NULL) && match_esc(conf->name, name))
575	>	if (name && !match(conf->name, name))
576		{
577	<	if ((user == NULL && (host == NULL)))
578	<	return conf;
579	<	if ((match_item->action & action) != action)
577	>	if ((user == NULL && (host == NULL)))
578	>	return conf;
579	>	if ((conf->modes & flags) != flags)
580		continue;
581	<	if (EmptyString(match_item->user) || EmptyString(match_item->host))
582	<	return conf;
583	<	if (match(match_item->user, user) && match(match_item->host, host))
584	<	return conf;
581	>	if (EmptyString(conf->user) || EmptyString(conf->host))
582	>	return conf;
583	>	if (!match(conf->user, user) && !match(conf->host, host))
584	>	return conf;
585		}
586		}
587		break;
588
589	<	case SERVER_TYPE:
590	<	DLINK_FOREACH(ptr, list_p->head)
589	>	case CONF_SERVER:
590	>	DLINK_FOREACH(node, list->head)
591		{
592	<	conf = ptr->data;
1599	<	aconf = map_to_conf(conf);
592	>	conf = node->data;
593
594	<	if ((name != NULL) && match_esc(name, conf->name))
594	>	if (name && !match(name, conf->name))
595		return conf;
596	<	else if ((host != NULL) && match_esc(host, aconf->host))
596	>	if (host && !match(host, conf->host))
597		return conf;
598		}
599		break;
600	<
600	>
601		default:
602		break;
603		}
#	Line 1617 | Line 610 | find_matching_name_conf(ConfType type, c
610		*              - pointer to name string to find
611		*              - pointer to user
612		*              - pointer to host
613	<	* output       - NULL or pointer to found struct MatchItem
613	>	* output       - NULL or pointer to found struct MaskItem
614		* side effects - looks for an exact match on name field
615		*/
616	<	struct ConfItem *
617	<	find_exact_name_conf(ConfType type, const struct Client *who, const char *name,
616	>	struct MaskItem *
617	>	find_exact_name_conf(enum maskitem_type type, const struct Client *who, const char *name,
618		const char *user, const char *host)
619		{
620	<	dlink_node *ptr = NULL;
621	<	struct AccessItem *aconf;
622	<	struct ConfItem *conf;
1630	<	struct MatchItem *match_item;
1631	<	dlink_list *list_p;
1632	<
1633	<	list_p = map_to_list(type);
620	>	dlink_node *node = NULL;
621	>	dlink_list *list = map_to_list(type);
622	>	struct MaskItem *conf = NULL;
623
624		switch(type)
625		{
626	<	case RXLINE_TYPE:
627	<	case XLINE_TYPE:
628	<	case ULINE_TYPE:
1640	<	case NRESV_TYPE:
626	>	case CONF_XLINE:
627	>	case CONF_NRESV:
628	>	case CONF_CRESV:
629
630	<	DLINK_FOREACH(ptr, list_p->head)
630	>	DLINK_FOREACH(node, list->head)
631		{
632	<	conf = ptr->data;
633	<	match_item = (struct MatchItem *)map_to_conf(conf);
632	>	conf = node->data;
633	>
634		if (EmptyString(conf->name))
635	<	continue;
636	<
635	>	continue;
636	>
637		if (irccmp(conf->name, name) == 0)
638		{
639	<	if ((user == NULL && (host == NULL)))
640	<	return (conf);
641	<	if (EmptyString(match_item->user) || EmptyString(match_item->host))
642	<	return (conf);
643	<	if (match(match_item->user, user) && match(match_item->host, host))
644	<	return (conf);
639	>	if ((user == NULL && (host == NULL)))
640	>	return conf;
641	>	if (EmptyString(conf->user) || EmptyString(conf->host))
642	>	return conf;
643	>	if (!match(conf->user, user) && !match(conf->host, host))
644	>	return conf;
645		}
646		}
647		break;
648
649	<	case OPER_TYPE:
650	<	DLINK_FOREACH(ptr, list_p->head)
649	>	case CONF_OPER:
650	>	DLINK_FOREACH(node, list->head)
651		{
652	<	conf = ptr->data;
1665	<	aconf = map_to_conf(conf);
652	>	conf = node->data;
653
654		if (EmptyString(conf->name))
655		continue;
#	Line 1671 | Line 658 | find_exact_name_conf(ConfType type, cons
658		{
659		if (!who)
660		return conf;
661	<	if (EmptyString(aconf->user) || EmptyString(aconf->host))
662	<	return conf;
663	<	if (match(aconf->user, who->username))
661	>	if (EmptyString(conf->user) || EmptyString(conf->host))
662	>	return NULL;
663	>	if (!match(conf->user, who->username))
664		{
665	<	switch (aconf->type)
665	>	switch (conf->htype)
666		{
667		case HM_HOST:
668	<	if (match(aconf->host, who->host) || match(aconf->host, who->sockhost))
669	<	return conf;
668	>	if (!match(conf->host, who->host) || !match(conf->host, who->sockhost))
669	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
670	>	return conf;
671		break;
672		case HM_IPV4:
673	<	if (who->localClient->aftype == AF_INET)
674	<	if (match_ipv4(&who->localClient->ip, &aconf->addr, aconf->bits))
675	<	return conf;
673	>	if (who->connection->aftype == AF_INET)
674	>	if (match_ipv4(&who->connection->ip, &conf->addr, conf->bits))
675	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
676	>	return conf;
677		break;
1689	–	#ifdef IPV6
678		case HM_IPV6:
679	<	if (who->localClient->aftype == AF_INET6)
680	<	if (match_ipv6(&who->localClient->ip, &aconf->addr, aconf->bits))
681	<	return conf;
679	>	if (who->connection->aftype == AF_INET6)
680	>	if (match_ipv6(&who->connection->ip, &conf->addr, conf->bits))
681	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
682	>	return conf;
683		break;
1695	–	#endif
684		default:
685		assert(0);
686		}
#	Line 1702 | Line 690 | find_exact_name_conf(ConfType type, cons
690
691		break;
692
693	<	case SERVER_TYPE:
694	<	DLINK_FOREACH(ptr, list_p->head)
693	>	case CONF_SERVER:
694	>	DLINK_FOREACH(node, list->head)
695		{
696	<	conf = ptr->data;
697	<	aconf = (struct AccessItem *)map_to_conf(conf);
696	>	conf = node->data;
697	>
698		if (EmptyString(conf->name))
699	<	continue;
700	<
699	>	continue;
700	>
701		if (name == NULL)
702		{
703	<	if (EmptyString(aconf->host))
704	<	continue;
705	<	if (irccmp(aconf->host, host) == 0)
706	<	return(conf);
703	>	if (EmptyString(conf->host))
704	>	continue;
705	>	if (irccmp(conf->host, host) == 0)
706	>	return conf;
707		}
708		else if (irccmp(conf->name, name) == 0)
709	<	{
1722	<	return (conf);
1723	<	}
709	>	return conf;
710		}
1725	–	break;
711
1727	–	case CLASS_TYPE:
1728	–	DLINK_FOREACH(ptr, list_p->head)
1729	–	{
1730	–	conf = ptr->data;
1731	–	if (EmptyString(conf->name))
1732	–	continue;
1733	–
1734	–	if (irccmp(conf->name, name) == 0)
1735	–	return (conf);
1736	–	}
712		break;
713
714		default:
715		break;
716		}
1742	–	return(NULL);
1743	–	}
1744	–
1745	–	/* rehash()
1746	–	*
1747	–	* Actual REHASH service routine. Called with sig == 0 if it has been called
1748	–	* as a result of an operator issuing this command, else assume it has been
1749	–	* called as a result of the server receiving a HUP signal.
1750	–	*/
1751	–	int
1752	–	rehash(int sig)
1753	–	{
1754	–	if (sig != 0)
1755	–	sendto_realops_flags(UMODE_ALL, L_ALL,
1756	–	"Got signal SIGHUP, reloading ircd.conf file");
1757	–
1758	–	restart_resolver();
1759	–
1760	–	/* don't close listeners until we know we can go ahead with the rehash */
1761	–
1762	–	/* Check to see if we magically got(or lost) IPv6 support */
1763	–	check_can_use_v6();
1764	–
1765	–	read_conf_files(0);
1766	–
1767	–	if (ServerInfo.description != NULL)
1768	–	strlcpy(me.info, ServerInfo.description, sizeof(me.info));
1769	–
1770	–	load_conf_modules();
1771	–
1772	–	flush_deleted_I_P();
717
718	<	rehashed_klines = 1;
1775	<	/* XXX */
1776	<	if (ConfigLoggingEntry.use_logging)
1777	<	log_close_all();
1778	<
1779	<	return(0);
718	>	return NULL;
719		}
720
721		/* set_default_conf()
#	Line 1794 | Line 733 | set_default_conf(void)
733		/* verify init_class() ran, this should be an unnecessary check
734		* but its not much work.
735		*/
736	<	assert(class_default == (struct ConfItem *) class_items.tail->data);
736	>	assert(class_default == class_get_list()->tail->data);
737	>
738	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
739	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
740
741	<	#ifdef HAVE_LIBCRYPTO
742	<	ServerInfo.rsa_private_key = NULL;
743	<	ServerInfo.rsa_private_key_file = NULL;
744	<	#endif
1803	<
1804	<	/* ServerInfo.name is not rehashable */
1805	<	/* ServerInfo.name = ServerInfo.name; */
1806	<	ServerInfo.description = NULL;
1807	<	DupString(ServerInfo.network_name, NETWORK_NAME_DEFAULT);
1808	<	DupString(ServerInfo.network_desc, NETWORK_DESC_DEFAULT);
1809	<
1810	<	memset(&ServerInfo.ip, 0, sizeof(ServerInfo.ip));
1811	<	ServerInfo.specific_ipv4_vhost = 0;
1812	<	memset(&ServerInfo.ip6, 0, sizeof(ServerInfo.ip6));
1813	<	ServerInfo.specific_ipv6_vhost = 0;
1814	<
1815	<	ServerInfo.max_clients = MAXCLIENTS_MAX;
1816	<
1817	<	ServerInfo.hub = 0;
1818	<	ServerInfo.dns_host.sin_addr.s_addr = 0;
1819	<	ServerInfo.dns_host.sin_port = 0;
1820	<	AdminInfo.name = NULL;
1821	<	AdminInfo.email = NULL;
1822	<	AdminInfo.description = NULL;
741	>	memset(&ConfigServerInfo.ip, 0, sizeof(ConfigServerInfo.ip));
742	>	ConfigServerInfo.specific_ipv4_vhost = 0;
743	>	memset(&ConfigServerInfo.ip6, 0, sizeof(ConfigServerInfo.ip6));
744	>	ConfigServerInfo.specific_ipv6_vhost = 0;
745
746	<	log_close_all();
746	>	ConfigServerInfo.default_max_clients = MAXCLIENTS_MAX;
747	>	ConfigServerInfo.max_nick_length = 9;
748	>	ConfigServerInfo.max_topic_length = 80;
749	>	ConfigServerInfo.hub = 0;
750
751	<	ConfigLoggingEntry.use_logging = 1;
751	>	log_del_all();
752	>
753	>	ConfigLog.use_logging = 1;
754
755		ConfigChannel.disable_fake_channels = 0;
756	<	ConfigChannel.restrict_channels = 0;
757	<	ConfigChannel.disable_local_channels = 0;
758	<	ConfigChannel.use_invex = 1;
759	<	ConfigChannel.use_except = 1;
760	<	ConfigChannel.use_knock = 1;
1834	<	ConfigChannel.knock_delay = 300;
756	>	ConfigChannel.invite_client_count = 10;
757	>	ConfigChannel.invite_client_time = 300;
758	>	ConfigChannel.invite_delay_channel = 5;
759	>	ConfigChannel.knock_client_count = 1;
760	>	ConfigChannel.knock_client_time = 300;
761		ConfigChannel.knock_delay_channel = 60;
762	<	ConfigChannel.max_chans_per_user = 15;
1837	<	ConfigChannel.quiet_on_ban = 1;
762	>	ConfigChannel.max_channels = 25;
763		ConfigChannel.max_bans = 25;
764	<	ConfigChannel.default_split_user_count = 0;
765	<	ConfigChannel.default_split_server_count = 0;
1841	<	ConfigChannel.no_join_on_split = 0;
1842	<	ConfigChannel.no_create_on_split = 0;
1843	<	ConfigChannel.burst_topicwho = 1;
764	>	ConfigChannel.default_join_flood_count = 18;
765	>	ConfigChannel.default_join_flood_time = 6;
766
767		ConfigServerHide.flatten_links = 0;
768	<	ConfigServerHide.links_delay = 300;
768	>	ConfigServerHide.flatten_links_delay = 300;
769		ConfigServerHide.hidden = 0;
1848	–	ConfigServerHide.disable_hidden = 0;
770		ConfigServerHide.hide_servers = 0;
771	<	DupString(ConfigServerHide.hidden_name, NETWORK_NAME_DEFAULT);
771	>	ConfigServerHide.hide_services = 0;
772	>	ConfigServerHide.hidden_name = xstrdup(NETWORK_NAME_DEFAULT);
773		ConfigServerHide.hide_server_ips = 0;
774	+	ConfigServerHide.disable_remote_commands = 0;
775
776	<
777	<	DupString(ConfigFileEntry.service_name, SERVICE_NAME_DEFAULT);
778	<	ConfigFileEntry.max_watch = WATCHSIZE_DEFAULT;
779	<	ConfigFileEntry.gline_min_cidr = 16;
780	<	ConfigFileEntry.gline_min_cidr6 = 48;
781	<	ConfigFileEntry.invisible_on_connect = 1;
782	<	ConfigFileEntry.burst_away = 0;
783	<	ConfigFileEntry.use_whois_actually = 1;
784	<	ConfigFileEntry.tkline_expire_notices = 1;
785	<	ConfigFileEntry.hide_spoof_ips = 1;
786	<	ConfigFileEntry.ignore_bogus_ts = 0;
787	<	ConfigFileEntry.disable_auth = 0;
788	<	ConfigFileEntry.disable_remote = 0;
789	<	ConfigFileEntry.kill_chase_time_limit = 90;
790	<	ConfigFileEntry.default_floodcount = 8;
791	<	ConfigFileEntry.failed_oper_notice = 1;
792	<	ConfigFileEntry.dots_in_ident = 0;
793	<	ConfigFileEntry.min_nonwildcard = 4;
794	<	ConfigFileEntry.min_nonwildcard_simple = 3;
795	<	ConfigFileEntry.max_accept = 20;
796	<	ConfigFileEntry.anti_nick_flood = 0;
797	<	ConfigFileEntry.max_nick_time = 20;
798	<	ConfigFileEntry.max_nick_changes = 5;
799	<	ConfigFileEntry.anti_spam_exit_message_time = 0;
800	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
801	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
802	<	ConfigFileEntry.kline_with_reason = 1;
803	<	ConfigFileEntry.kline_reason = NULL;
804	<	ConfigFileEntry.warn_no_nline = 1;
805	<	ConfigFileEntry.stats_o_oper_only = 0;
806	<	ConfigFileEntry.stats_k_oper_only = 1;  /* masked */
807	<	ConfigFileEntry.stats_i_oper_only = 1;  /* masked */
808	<	ConfigFileEntry.stats_P_oper_only = 0;
809	<	ConfigFileEntry.caller_id_wait = 60;
810	<	ConfigFileEntry.opers_bypass_callerid = 0;
811	<	ConfigFileEntry.pace_wait = 10;
812	<	ConfigFileEntry.pace_wait_simple = 1;
813	<	ConfigFileEntry.short_motd = 0;
814	<	ConfigFileEntry.ping_cookie = 0;
815	<	ConfigFileEntry.no_oper_flood = 0;
816	<	ConfigFileEntry.true_no_oper_flood = 0;
817	<	ConfigFileEntry.oper_pass_resv = 1;
818	<	ConfigFileEntry.glines = 0;
819	<	ConfigFileEntry.gline_time = 12 * 3600;
820	<	ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
821	<	ConfigFileEntry.client_flood = CLIENT_FLOOD_DEFAULT;
822	<	ConfigFileEntry.oper_only_umodes = UMODE_DEBUG;
1900	<	ConfigFileEntry.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE |
1901	<	UMODE_OPERWALL | UMODE_WALLOP;
1902	<	ConfigFileEntry.use_egd = 0;
1903	<	ConfigFileEntry.egdpool_path = NULL;
1904	<	ConfigFileEntry.throttle_time = 10;
776	>	ConfigGeneral.away_count = 2;
777	>	ConfigGeneral.away_time = 10;
778	>	ConfigGeneral.max_watch = 50;
779	>	ConfigGeneral.cycle_on_host_change = 1;
780	>	ConfigGeneral.dline_min_cidr = 16;
781	>	ConfigGeneral.dline_min_cidr6 = 48;
782	>	ConfigGeneral.kline_min_cidr = 16;
783	>	ConfigGeneral.kline_min_cidr6 = 48;
784	>	ConfigGeneral.invisible_on_connect = 1;
785	>	ConfigGeneral.tkline_expire_notices = 1;
786	>	ConfigGeneral.ignore_bogus_ts = 0;
787	>	ConfigGeneral.disable_auth = 0;
788	>	ConfigGeneral.kill_chase_time_limit = 90;
789	>	ConfigGeneral.default_floodcount = 8;
790	>	ConfigGeneral.failed_oper_notice = 1;
791	>	ConfigGeneral.dots_in_ident = 0;
792	>	ConfigGeneral.min_nonwildcard = 4;
793	>	ConfigGeneral.min_nonwildcard_simple = 3;
794	>	ConfigGeneral.max_accept = 50;
795	>	ConfigGeneral.anti_nick_flood = 0;
796	>	ConfigGeneral.max_nick_time = 20;
797	>	ConfigGeneral.max_nick_changes = 5;
798	>	ConfigGeneral.anti_spam_exit_message_time = 0;
799	>	ConfigGeneral.ts_warn_delta = 30;
800	>	ConfigGeneral.ts_max_delta = 600;
801	>	ConfigGeneral.warn_no_connect_block = 1;
802	>	ConfigGeneral.stats_e_disabled = 0;
803	>	ConfigGeneral.stats_i_oper_only = 1;  /* 1 = masked */
804	>	ConfigGeneral.stats_k_oper_only = 1;  /* 1 = masked */
805	>	ConfigGeneral.stats_o_oper_only = 1;
806	>	ConfigGeneral.stats_m_oper_only = 1;
807	>	ConfigGeneral.stats_P_oper_only = 0;
808	>	ConfigGeneral.stats_u_oper_only = 0;
809	>	ConfigGeneral.caller_id_wait = 60;
810	>	ConfigGeneral.opers_bypass_callerid = 0;
811	>	ConfigGeneral.pace_wait = 10;
812	>	ConfigGeneral.pace_wait_simple = 1;
813	>	ConfigGeneral.short_motd = 0;
814	>	ConfigGeneral.ping_cookie = 0;
815	>	ConfigGeneral.no_oper_flood = 0;
816	>	ConfigGeneral.max_targets = MAX_TARGETS_DEFAULT;
817	>	ConfigGeneral.oper_only_umodes = UMODE_DEBUG | UMODE_LOCOPS | UMODE_HIDDEN | UMODE_FARCONNECT |
818	>	UMODE_UNAUTH | UMODE_EXTERNAL | UMODE_BOTS | UMODE_NCHANGE |
819	>	UMODE_SPY | UMODE_FULL | UMODE_SKILL | UMODE_REJ | UMODE_CCONN;
820	>	ConfigGeneral.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE | UMODE_WALLOP;
821	>	ConfigGeneral.throttle_count = 1;
822	>	ConfigGeneral.throttle_time = 1;
823		}
824
825		static void
826		validate_conf(void)
827		{
828	<	if (ConfigFileEntry.ts_warn_delta < TS_WARN_DELTA_MIN)
829	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
1912	<
1913	<	if (ConfigFileEntry.ts_max_delta < TS_MAX_DELTA_MIN)
1914	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
1915	<
1916	<	if (ServerInfo.network_name == NULL)
1917	<	DupString(ServerInfo.network_name,NETWORK_NAME_DEFAULT);
1918	<
1919	<	if (ServerInfo.network_desc == NULL)
1920	<	DupString(ServerInfo.network_desc,NETWORK_DESC_DEFAULT);
1921	<
1922	<	if (ConfigFileEntry.service_name == NULL)
1923	<	DupString(ConfigFileEntry.service_name, SERVICE_NAME_DEFAULT);
1924	<
1925	<	if ((ConfigFileEntry.client_flood < CLIENT_FLOOD_MIN) ||
1926	<	(ConfigFileEntry.client_flood > CLIENT_FLOOD_MAX))
1927	<	ConfigFileEntry.client_flood = CLIENT_FLOOD_MAX;
828	>	if (EmptyString(ConfigServerInfo.network_name))
829	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
830
831	<	ConfigFileEntry.max_watch = IRCD_MAX(ConfigFileEntry.max_watch, WATCHSIZE_MIN);
831	>	if (EmptyString(ConfigServerInfo.network_desc))
832	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
833		}
834
835	<	/* read_conf()
835	>	/* read_conf()
836		*
837		* inputs       - file descriptor pointing to config file to use
838		* output       - None
#	Line 1940 | Line 843 | read_conf(FILE *file)
843		{
844		lineno = 0;
845
846	<	set_default_conf(); /* Set default values prior to conf parsing */
846	>	set_default_conf();  /* Set default values prior to conf parsing */
847		conf_parser_ctx.pass = 1;
848	<	yyparse();          /* pick up the classes first */
848	>	yyparse();  /* Pick up the classes first */
849
850		rewind(file);
851
852		conf_parser_ctx.pass = 2;
853	<	yyparse();          /* Load the values from the conf */
854	<	validate_conf();    /* Check to make sure some values are still okay. */
855	<	/* Some global values are also loaded here. */
856	<	check_class();      /* Make sure classes are valid */
853	>	yyparse();  /* Load the values from the conf */
854	>	validate_conf();  /* Check to make sure some values are still okay. */
855	>	/* Some global values are also loaded here. */
856	>	class_delete_marked();  /* Delete unused classes that are marked for deletion */
857	>	}
858	>
859	>	/* conf_rehash()
860	>	*
861	>	* Actual REHASH service routine. Called with sig == 0 if it has been called
862	>	* as a result of an operator issuing this command, else assume it has been
863	>	* called as a result of the server receiving a HUP signal.
864	>	*/
865	>	void
866	>	conf_rehash(int sig)
867	>	{
868	>	if (sig)
869	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
870	>	"Got signal SIGHUP, reloading configuration file(s)");
871	>
872	>	restart_resolver();
873	>
874	>	/* don't close listeners until we know we can go ahead with the rehash */
875	>
876	>	read_conf_files(0);
877	>
878	>	load_conf_modules();
879	>	check_conf_klines();
880		}
881
882		/* lookup_confhost()
#	Line 1958 | Line 884 | read_conf(FILE *file)
884		* start DNS lookups of all hostnames in the conf
885		* line and convert an IP addresses in a.b.c.d number for to IP#s.
886		*/
887	<	static void
888	<	lookup_confhost(struct ConfItem *conf)
887	>	void
888	>	lookup_confhost(struct MaskItem *conf)
889		{
1964	–	struct AccessItem *aconf;
890		struct addrinfo hints, *res;
891
892	<	aconf = map_to_conf(conf);
893	<
1969	<	if (EmptyString(aconf->host) ||
1970	<	EmptyString(aconf->user))
1971	<	{
1972	<	ilog(LOG_TYPE_IRCD, "Host/server name error: (%s) (%s)",
1973	<	aconf->host, conf->name);
1974	<	return;
1975	<	}
1976	<
1977	<	if (strchr(aconf->host, '*') ||
1978	<	strchr(aconf->host, '?'))
1979	<	return;
1980	<
1981	<	/* Do name lookup now on hostnames given and store the
892	>	/*
893	>	* Do name lookup now on hostnames given and store the
894		* ip numbers in conf structure.
895		*/
896		memset(&hints, 0, sizeof(hints));
#	Line 1989 | Line 901 | lookup_confhost(struct ConfItem *conf)
901		/* Get us ready for a bind() and don't bother doing dns lookup */
902		hints.ai_flags = AI_PASSIVE | AI_NUMERICHOST;
903
904	<	if (getaddrinfo(aconf->host, NULL, &hints, &res))
904	>	if (getaddrinfo(conf->host, NULL, &hints, &res))
905		{
906	<	conf_dns_lookup(aconf);
906	>	conf_dns_lookup(conf);
907		return;
908		}
909
910	<	assert(res != NULL);
910	>	assert(res);
911	>
912	>	memcpy(&conf->addr, res->ai_addr, res->ai_addrlen);
913	>	conf->addr.ss_len = res->ai_addrlen;
914	>	conf->addr.ss.ss_family = res->ai_family;
915
2000	–	memcpy(&aconf->addr, res->ai_addr, res->ai_addrlen);
2001	–	aconf->addr.ss_len = res->ai_addrlen;
2002	–	aconf->addr.ss.ss_family = res->ai_family;
916		freeaddrinfo(res);
917		}
918
#	Line 2013 | Line 926 | lookup_confhost(struct ConfItem *conf)
926		int
927		conf_connect_allowed(struct irc_ssaddr *addr, int aftype)
928		{
929	<	struct ip_entry *ip_found;
930	<	struct AccessItem *aconf = find_dline_conf(addr, aftype);
929	>	struct ip_entry *ip_found = NULL;
930	>	const struct MaskItem *conf = find_dline_conf(addr, aftype);
931
932	<	/* DLINE exempt also gets you out of static limits/pacing... */
933	<	if (aconf && (aconf->status & CONF_EXEMPTDLINE))
934	<	return 0;
935	<
936	<	if (aconf != NULL)
932	>	if (conf)
933	>	{
934	>	/* DLINE exempt also gets you out of static limits/pacing... */
935	>	if (conf->type == CONF_EXEMPT)
936	>	return 0;
937		return BANNED_CLIENT;
938	+	}
939
940	<	ip_found = find_or_add_ip(addr);
940	>	ip_found = ipcache_find_or_add_address(addr);
941
942	<	if ((CurrentTime - ip_found->last_attempt) <
2029	<	ConfigFileEntry.throttle_time)
942	>	if ((CurrentTime - ip_found->last_attempt) < ConfigGeneral.throttle_time)
943		{
944	<	ip_found->last_attempt = CurrentTime;
945	<	return TOO_FAST;
944	>	if (ip_found->connection_count >= ConfigGeneral.throttle_count)
945	>	return TOO_FAST;
946	>
947	>	++ip_found->connection_count;
948		}
949	+	else
950	+	ip_found->connection_count = 1;
951
952		ip_found->last_attempt = CurrentTime;
953		return 0;
954		}
955
956	<	static struct AccessItem *
2040	<	find_regexp_kline(const char *uhi[])
2041	<	{
2042	<	#ifdef HAVE_LIBPCRE
2043	<	const dlink_node *ptr = NULL;
2044	<
2045	<	DLINK_FOREACH(ptr, rkconf_items.head)
2046	<	{
2047	<	struct AccessItem *aptr = map_to_conf(ptr->data);
2048	<
2049	<	assert(aptr->regexuser);
2050	<	assert(aptr->regexhost);
2051	<
2052	<	if (!ircd_pcre_exec(aptr->regexuser, uhi[0]) &&
2053	<	(!ircd_pcre_exec(aptr->regexhost, uhi[1]) ||
2054	<	!ircd_pcre_exec(aptr->regexhost, uhi[2])))
2055	<	return aptr;
2056	<	}
2057	<	#endif
2058	<	return NULL;
2059	<	}
2060	<
2061	<	/* find_kill()
956	>	/* expire_tklines()
957		*
958	<	* inputs       - pointer to client structure
959	<	* output       - pointer to struct AccessItem if found
960	<	* side effects - See if this user is klined already,
2066	<	*                and if so, return struct AccessItem pointer
958	>	* inputs       - tkline list pointer
959	>	* output       - NONE
960	>	* side effects - expire tklines
961		*/
962	<	struct AccessItem *
963	<	find_kill(struct Client *client_p)
2070	<	{
2071	<	struct AccessItem *aconf = NULL;
2072	<	const char *uhi[3];
2073	<
2074	<	uhi[0] = client_p->username;
2075	<	uhi[1] = client_p->host;
2076	<	uhi[2] = client_p->sockhost;
2077	<
2078	<	assert(client_p != NULL);
2079	<
2080	<	aconf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
2081	<	CONF_KLINE, client_p->localClient->aftype,
2082	<	client_p->username, NULL, 1);
2083	<	if (aconf == NULL)
2084	<	aconf = find_regexp_kline(uhi);
2085	<
2086	<	return aconf;
2087	<	}
2088	<
2089	<	struct AccessItem *
2090	<	find_gline(struct Client *client_p)
962	>	static void
963	>	expire_tklines(dlink_list *list)
964		{
965	<	struct AccessItem *aconf;
965	>	dlink_node *node = NULL, *node_next = NULL;
966
967	<	assert(client_p != NULL);
967	>	DLINK_FOREACH_SAFE(node, node_next, list->head)
968	>	{
969	>	struct MaskItem *conf = node->data;
970
971	<	aconf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
972	<	CONF_GLINE, client_p->localClient->aftype,
2098	<	client_p->username, NULL, 1);
2099	<	return aconf;
2100	<	}
971	>	if (!conf->until || conf->until > CurrentTime)
972	>	continue;
973
974	<	/* add_temp_line()
975	<	*
976	<	* inputs        - pointer to struct ConfItem
977	<	* output        - none
2106	<	* Side effects  - links in given struct ConfItem into
2107	<	*                 temporary *line link list
2108	<	*/
2109	<	void
2110	<	add_temp_line(struct ConfItem *conf)
2111	<	{
2112	<	if (conf->type == XLINE_TYPE)
2113	<	{
2114	<	conf->flags |= CONF_FLAGS_TEMPORARY;
2115	<	dlinkAdd(conf, make_dlink_node(), &temporary_xlines);
2116	<	}
2117	<	else if ((conf->type == NRESV_TYPE) || (conf->type == CRESV_TYPE))
2118	<	{
2119	<	conf->flags |= CONF_FLAGS_TEMPORARY;
2120	<	dlinkAdd(conf, make_dlink_node(), &temporary_resv);
974	>	if (ConfigGeneral.tkline_expire_notices)
975	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE, "Temporary %s for [%s] expired",
976	>	(conf->type == CONF_XLINE) ? "X-line" : "RESV", conf->name);
977	>	conf_free(conf);
978		}
979		}
980
#	Line 2129 | Line 986 | add_temp_line(struct ConfItem *conf)
986		*                This is an event started off in ircd.c
987		*/
988		void
989	<	cleanup_tklines(void *notused)
989	>	cleanup_tklines(void *unused)
990		{
991		hostmask_expire_temporary();
992	<	expire_tklines(&temporary_xlines);
993	<	expire_tklines(&temporary_resv);
994	<	}
2138	<
2139	<	/* expire_tklines()
2140	<	*
2141	<	* inputs       - tkline list pointer
2142	<	* output       - NONE
2143	<	* side effects - expire tklines
2144	<	*/
2145	<	static void
2146	<	expire_tklines(dlink_list *tklist)
2147	<	{
2148	<	dlink_node *ptr;
2149	<	dlink_node *next_ptr;
2150	<	struct ConfItem *conf;
2151	<	struct MatchItem *xconf;
2152	<	struct MatchItem *nconf;
2153	<	struct ResvChannel *cconf;
2154	<
2155	<	DLINK_FOREACH_SAFE(ptr, next_ptr, tklist->head)
2156	<	{
2157	<	conf = ptr->data;
2158	<
2159	<	if (conf->type == XLINE_TYPE)
2160	<	{
2161	<	xconf = (struct MatchItem *)map_to_conf(conf);
2162	<	if (xconf->hold <= CurrentTime)
2163	<	{
2164	<	if (ConfigFileEntry.tkline_expire_notices)
2165	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2166	<	"Temporary X-line for [%s] sexpired", conf->name);
2167	<	dlinkDelete(ptr, tklist);
2168	<	free_dlink_node(ptr);
2169	<	delete_conf_item(conf);
2170	<	}
2171	<	}
2172	<	else if (conf->type == NRESV_TYPE)
2173	<	{
2174	<	nconf = (struct MatchItem *)map_to_conf(conf);
2175	<	if (nconf->hold <= CurrentTime)
2176	<	{
2177	<	if (ConfigFileEntry.tkline_expire_notices)
2178	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2179	<	"Temporary RESV for [%s] expired", conf->name);
2180	<	dlinkDelete(ptr, tklist);
2181	<	free_dlink_node(ptr);
2182	<	delete_conf_item(conf);
2183	<	}
2184	<	}
2185	<	else if (conf->type == CRESV_TYPE)
2186	<	{
2187	<	cconf = (struct ResvChannel *)map_to_conf(conf);
2188	<	if (cconf->hold <= CurrentTime)
2189	<	{
2190	<	if (ConfigFileEntry.tkline_expire_notices)
2191	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2192	<	"Temporary RESV for [%s] expired", cconf->name);
2193	<	delete_channel_resv(cconf);
2194	<	}
2195	<	}
2196	<	}
992	>	expire_tklines(&gecos_items);
993	>	expire_tklines(&nresv_items);
994	>	expire_tklines(&cresv_items);
995		}
996
997		/* oper_privs_as_string()
#	Line 2202 | Line 1000 | expire_tklines(dlink_list *tklist)
1000		* output        - pointer to static string showing oper privs
1001		* side effects  - return as string, the oper privs as derived from port
1002		*/
1003	<	static const struct oper_privs
1003	>	static const struct oper_flags
1004		{
1005	<	const unsigned int oprivs;
1005	>	const unsigned int flag;
1006		const unsigned char c;
1007	<	} flag_list[] = {
1008	<	{ OPER_FLAG_ADMIN,       'A' },
1009	<	{ OPER_FLAG_REMOTEBAN,   'B' },
1010	<	{ OPER_FLAG_DIE,         'D' },
1011	<	{ OPER_FLAG_GLINE,       'G' },
1012	<	{ OPER_FLAG_REHASH,      'H' },
1013	<	{ OPER_FLAG_K,           'K' },
1014	<	{ OPER_FLAG_OPERWALL,    'L' },
1015	<	{ OPER_FLAG_N,           'N' },
1016	<	{ OPER_FLAG_GLOBAL_KILL, 'O' },
1017	<	{ OPER_FLAG_REMOTE,      'R' },
1018	<	{ OPER_FLAG_OPER_SPY,    'S' },
1019	<	{ OPER_FLAG_UNKLINE,     'U' },
1020	<	{ OPER_FLAG_X,           'X' },
1007	>	} flag_table[] = {
1008	>	{ OPER_FLAG_ADMIN,          'A' },
1009	>	{ OPER_FLAG_CLOSE,          'B' },
1010	>	{ OPER_FLAG_CONNECT,        'C' },
1011	>	{ OPER_FLAG_CONNECT_REMOTE, 'D' },
1012	>	{ OPER_FLAG_DIE,            'E' },
1013	>	{ OPER_FLAG_DLINE,          'F' },
1014	>	{ OPER_FLAG_GLOBOPS,        'G' },
1015	>	{ OPER_FLAG_JOIN_RESV,      'H' },
1016	>	{ OPER_FLAG_KILL,           'I' },
1017	>	{ OPER_FLAG_KILL_REMOTE,    'J' },
1018	>	{ OPER_FLAG_KLINE,          'K' },
1019	>	{ OPER_FLAG_LOCOPS,         'L' },
1020	>	{ OPER_FLAG_MODULE,         'M' },
1021	>	{ OPER_FLAG_NICK_RESV,      'N' },
1022	>	{ OPER_FLAG_OPME,           'O' },
1023	>	{ OPER_FLAG_REHASH,         'P' },
1024	>	{ OPER_FLAG_REMOTEBAN,      'Q' },
1025	>	{ OPER_FLAG_RESTART,        'R' },
1026	>	{ OPER_FLAG_RESV,           'S' },
1027	>	{ OPER_FLAG_SET,            'T' },
1028	>	{ OPER_FLAG_SQUIT,          'U' },
1029	>	{ OPER_FLAG_SQUIT_REMOTE,   'V' },
1030	>	{ OPER_FLAG_UNDLINE,        'W' },
1031	>	{ OPER_FLAG_UNKLINE,        'X' },
1032	>	{ OPER_FLAG_UNRESV,         'Y' },
1033	>	{ OPER_FLAG_UNXLINE,        'Z' },
1034	>	{ OPER_FLAG_WALLOPS,        'a' },
1035	>	{ OPER_FLAG_XLINE,          'b' },
1036		{ 0, '\0' }
1037		};
1038
1039	<	char *
1040	<	oper_privs_as_string(const unsigned int port)
1039	>	const char *
1040	>	oper_privs_as_string(const unsigned int flags)
1041		{
1042	<	static char privs_out[16];
1043	<	char *privs_ptr = privs_out;
2231	<	unsigned int i = 0;
1042	>	static char buf[sizeof(flag_table) / sizeof(struct oper_flags)];
1043	>	char *p = buf;
1044
1045	<	for (; flag_list[i].oprivs; ++i)
1046	<	{
1047	<	if (port & flag_list[i].oprivs)
1048	<	*privs_ptr++ = flag_list[i].c;
1049	<	else
1050	<	*privs_ptr++ = ToLowerTab[flag_list[i].c];
2239	<	}
1045	>	for (const struct oper_flags *tab = flag_table; tab->flag; ++tab)
1046	>	if (flags & tab->flag)
1047	>	*p++ = tab->c;
1048	>
1049	>	if (p == buf)
1050	>	*p++ = '0';
1051
1052	<	*privs_ptr = '\0';
1052	>	*p = '\0';
1053
1054	<	return privs_out;
1054	>	return buf;
1055		}
1056
1057		/*
1058	<	* Input: A client to find the active oper{} name for.
1058	>	* Input: A client to find the active operator {} name for.
1059		* Output: The nick!user@host{oper} of the oper.
1060		*         "oper" is server name for remote opers
1061		* Side effects: None.
#	Line 2252 | Line 1063 | oper_privs_as_string(const unsigned int
1063		const char *
1064		get_oper_name(const struct Client *client_p)
1065		{
1066	<	dlink_node *cnode = NULL;
1067	<	/* +5 for !,@,{,} and null */
1068	<	static char buffer[NICKLEN + USERLEN + HOSTLEN + HOSTLEN + 5];
1066	>	static char buffer[IRCD_BUFSIZE];
1067	>
1068	>	if (IsServer(client_p))
1069	>	return client_p->name;
1070
1071		if (MyConnect(client_p))
1072		{
1073	<	if ((cnode = client_p->localClient->confs.head))
1073	>	const dlink_node *const node = client_p->connection->confs.head;
1074	>
1075	>	if (node)
1076		{
1077	<	struct ConfItem *conf = cnode->data;
2264	<	const struct AccessItem *aconf = map_to_conf(conf);
1077	>	const struct MaskItem *const conf = node->data;
1078
1079	<	if (IsConfOperator(aconf))
1079	>	if (conf->type == CONF_OPER)
1080		{
1081	<	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1081	>	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1082		client_p->username, client_p->host, conf->name);
1083	<	return buffer;
1083	>	return buffer;
1084		}
1085		}
1086
1087	<	/* Probably should assert here for now. If there is an oper out there
1088	<	* with no oper{} conf attached, it would be good for us to know...
1087	>	/*
1088	>	* Probably should assert here for now. If there is an oper out there
1089	>	* with no operator {} conf attached, it would be good for us to know...
1090		*/
1091	<	assert(0); /* Oper without oper conf! */
1091	>	assert(0);  /* Oper without oper conf! */
1092		}
1093
1094		snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1095	<	client_p->username, client_p->host, client_p->servptr->name);
1095	>	client_p->username, client_p->host, client_p->servptr->name);
1096		return buffer;
1097		}
1098
2285	–	/* read_conf_files()
2286	–	*
2287	–	* inputs       - cold start YES or NO
2288	–	* output       - none
2289	–	* side effects - read all conf files needed, ircd.conf kline.conf etc.
2290	–	*/
2291	–	void
2292	–	read_conf_files(int cold)
2293	–	{
2294	–	const char *filename;
2295	–	char chanmodes[32];
2296	–	char chanlimit[32];
2297	–
2298	–	conf_parser_ctx.boot = cold;
2299	–	filename = get_conf_name(CONF_TYPE);
2300	–
2301	–	/* We need to know the initial filename for the yyerror() to report
2302	–	FIXME: The full path is in conffilenamebuf first time since we
2303	–	dont know anything else
2304	–
2305	–	- Gozem 2002-07-21
2306	–	*/
2307	–	strlcpy(conffilebuf, filename, sizeof(conffilebuf));
2308	–
2309	–	if ((conf_parser_ctx.conf_file = fopen(filename, "r")) == NULL)
2310	–	{
2311	–	if (cold)
2312	–	{
2313	–	ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
2314	–	filename, strerror(errno));
2315	–	exit(-1);
2316	–	}
2317	–	else
2318	–	{
2319	–	sendto_realops_flags(UMODE_ALL, L_ALL,
2320	–	"Unable to read configuration file '%s': %s",
2321	–	filename, strerror(errno));
2322	–	return;
2323	–	}
2324	–	}
2325	–
2326	–	if (!cold)
2327	–	clear_out_old_conf();
2328	–
2329	–	read_conf(conf_parser_ctx.conf_file);
2330	–	fclose(conf_parser_ctx.conf_file);
2331	–
2332	–	add_isupport("NETWORK", ServerInfo.network_name, -1);
2333	–	snprintf(chanmodes, sizeof(chanmodes), "b%s%s:%d",
2334	–	ConfigChannel.use_except ? "e" : "",
2335	–	ConfigChannel.use_invex ? "I" : "", ConfigChannel.max_bans);
2336	–	add_isupport("MAXLIST", chanmodes, -1);
2337	–	add_isupport("MAXTARGETS", NULL, ConfigFileEntry.max_targets);
2338	–
2339	–	if (ConfigChannel.disable_local_channels)
2340	–	add_isupport("CHANTYPES", "#", -1);
2341	–	else
2342	–	add_isupport("CHANTYPES", "#&", -1);
2343	–
2344	–	snprintf(chanlimit, sizeof(chanlimit), "%s:%d",
2345	–	ConfigChannel.disable_local_channels ? "#" : "#&",
2346	–	ConfigChannel.max_chans_per_user);
2347	–	add_isupport("CHANLIMIT", chanlimit, -1);
2348	–	snprintf(chanmodes, sizeof(chanmodes), "%s%s%s",
2349	–	ConfigChannel.use_except ? "e" : "",
2350	–	ConfigChannel.use_invex ? "I" : "", "b,k,l,imnprstORS");
2351	–	add_isupport("CHANNELLEN", NULL, LOCAL_CHANNELLEN);
2352	–
2353	–	if (ConfigChannel.use_except)
2354	–	add_isupport("EXCEPTS", "e", -1);
2355	–	if (ConfigChannel.use_invex)
2356	–	add_isupport("INVEX", "I", -1);
2357	–	add_isupport("CHANMODES", chanmodes, -1);
2358	–
2359	–	/*
2360	–	* message_locale may have changed.  rebuild isupport since it relies
2361	–	* on strlen(form_str(RPL_ISUPPORT))
2362	–	*/
2363	–	rebuild_isupport_message_line();
2364	–
2365	–	#ifdef HAVE_LIBPCRE
2366	–	parse_conf_file(RKLINE_TYPE, cold);
2367	–	parse_conf_file(RXLINE_TYPE, cold);
2368	–	#endif
2369	–	parse_conf_file(KLINE_TYPE, cold);
2370	–	parse_conf_file(DLINE_TYPE, cold);
2371	–	parse_conf_file(XLINE_TYPE, cold);
2372	–	parse_conf_file(NRESV_TYPE, cold);
2373	–	parse_conf_file(CRESV_TYPE, cold);
2374	–	}
2375	–
2376	–	/* parse_conf_file()
2377	–	*
2378	–	* inputs       - type of conf file to parse
2379	–	* output       - none
2380	–	* side effects - conf file for givenconf type is opened and read then parsed
2381	–	*/
2382	–	static void
2383	–	parse_conf_file(int type, int cold)
2384	–	{
2385	–	FILE *file = NULL;
2386	–	const char *filename = get_conf_name(type);
2387	–
2388	–	if ((file = fopen(filename, "r")) == NULL)
2389	–	{
2390	–	if (cold)
2391	–	ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
2392	–	filename, strerror(errno));
2393	–	else
2394	–	sendto_realops_flags(UMODE_ALL, L_ALL,
2395	–	"Unable to read configuration file '%s': %s",
2396	–	filename, strerror(errno));
2397	–	}
2398	–	else
2399	–	{
2400	–	parse_csv_file(file, type);
2401	–	fclose(file);
2402	–	}
2403	–	}
2404	–
1099		/* clear_out_old_conf()
1100		*
1101		* inputs       - none
#	Line 2411 | Line 1105 | parse_conf_file(int type, int cold)
1105		static void
1106		clear_out_old_conf(void)
1107		{
1108	<	dlink_node *ptr = NULL, *next_ptr = NULL;
2415	<	struct ConfItem *conf;
2416	<	struct AccessItem *aconf;
2417	<	struct ClassItem *cltmp;
2418	<	struct MatchItem *match_item;
1108	>	dlink_node *node = NULL, *node_next = NULL;
1109		dlink_list *free_items [] = {
1110	<	&server_items,   &oconf_items,
1111	<	&uconf_items,   &xconf_items, &rxconf_items, &rkconf_items,
1112	<	&nresv_items, &cluster_items,  &gdeny_items, &service_items, NULL
1110	>	&server_items,   &operator_items,
1111	>	&gecos_items,
1112	>	&nresv_items, &cresv_items, NULL
1113		};
1114
1115		dlink_list ** iterator = free_items; /* C is dumb */
#	Line 2427 | Line 1117 | clear_out_old_conf(void)
1117		/* We only need to free anything allocated by yyparse() here.
1118		* Resetting structs, etc, is taken care of by set_default_conf().
1119		*/
1120	<
1121	<	for (; *iterator != NULL; iterator++)
1120	>
1121	>	for (; *iterator; iterator++)
1122		{
1123	<	DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
1123	>	DLINK_FOREACH_SAFE(node, node_next, (*iterator)->head)
1124		{
1125	<	conf = ptr->data;
2436	<	/* XXX This is less than pretty */
2437	<	if (conf->type == SERVER_TYPE)
2438	<	{
2439	<	aconf = map_to_conf(conf);
1125	>	struct MaskItem *conf = node->data;
1126
1127	<	if (aconf->clients != 0)
2442	<	{
2443	<	SetConfIllegal(aconf);
2444	<	dlinkDelete(&conf->node, &server_items);
2445	<	}
2446	<	else
2447	<	{
2448	<	delete_conf_item(conf);
2449	<	}
2450	<	}
2451	<	else if (conf->type == OPER_TYPE)
2452	<	{
2453	<	aconf = map_to_conf(conf);
1127	>	conf->active = 0;
1128
1129	<	if (aconf->clients != 0)
2456	<	{
2457	<	SetConfIllegal(aconf);
2458	<	dlinkDelete(&conf->node, &oconf_items);
2459	<	}
2460	<	else
2461	<	{
2462	<	delete_conf_item(conf);
2463	<	}
2464	<	}
2465	<	else if (conf->type == XLINE_TYPE  ||
2466	<	conf->type == RXLINE_TYPE ||
2467	<	conf->type == RKLINE_TYPE)
1129	>	if (!IsConfDatabase(conf))
1130		{
1131	<	/* temporary (r)xlines are also on
2470	<	* the (r)xconf items list */
2471	<	if (conf->flags & CONF_FLAGS_TEMPORARY)
2472	<	continue;
1131	>	dlinkDelete(&conf->node, *iterator);
1132
1133	<	delete_conf_item(conf);
1134	<	}
2476	<	else
2477	<	{
2478	<	delete_conf_item(conf);
1133	>	if (!conf->ref_count)
1134	>	conf_free(conf);
1135		}
1136		}
1137		}
1138
1139	+	motd_clear();  /* Clear motd {} items and re-cache default motd */
1140	+
1141		/*
1142	<	* don't delete the class table, rather mark all entries
1143	<	* for deletion. The table is cleaned up by check_class. - avalon
1142	>	* Don't delete the class table, rather mark all entries for deletion.
1143	>	* The table is cleaned up by class_delete_marked. - avalon
1144		*/
1145	<	DLINK_FOREACH(ptr, class_items.head)
2488	<	{
2489	<	cltmp = map_to_conf(ptr->data);
2490	<
2491	<	if (ptr != class_items.tail)  /* never mark the "default" class */
2492	<	cltmp->active = 0;
2493	<	}
1145	>	class_mark_for_deletion();
1146
1147		clear_out_address_conf();
1148
1149	<	/* clean out module paths */
2498	<	mod_clear_paths();
1149	>	modules_conf_clear();  /* Clear modules {} items */
1150
1151	<	/* clean out ServerInfo */
2501	<	MyFree(ServerInfo.description);
2502	<	ServerInfo.description = NULL;
2503	<	MyFree(ServerInfo.network_name);
2504	<	ServerInfo.network_name = NULL;
2505	<	MyFree(ServerInfo.network_desc);
2506	<	ServerInfo.network_desc = NULL;
2507	<	MyFree(ConfigFileEntry.egdpool_path);
2508	<	ConfigFileEntry.egdpool_path = NULL;
2509	<	#ifdef HAVE_LIBCRYPTO
2510	<	if (ServerInfo.rsa_private_key != NULL)
2511	<	{
2512	<	RSA_free(ServerInfo.rsa_private_key);
2513	<	ServerInfo.rsa_private_key = NULL;
2514	<	}
2515	<
2516	<	MyFree(ServerInfo.rsa_private_key_file);
2517	<	ServerInfo.rsa_private_key_file = NULL;
2518	<
2519	<	if (ServerInfo.server_ctx)
2520	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2|
2521	<	SSL_OP_NO_SSLv3|
2522	<	SSL_OP_NO_TLSv1);
2523	<	if (ServerInfo.client_ctx)
2524	<	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv2|
2525	<	SSL_OP_NO_SSLv3|
2526	<	SSL_OP_NO_TLSv1);
2527	<	#endif
2528	<
2529	<	/* clean out old resvs from the conf */
2530	<	clear_conf_resv();
2531	<
2532	<	/* clean out AdminInfo */
2533	<	MyFree(AdminInfo.name);
2534	<	AdminInfo.name = NULL;
2535	<	MyFree(AdminInfo.email);
2536	<	AdminInfo.email = NULL;
2537	<	MyFree(AdminInfo.description);
2538	<	AdminInfo.description = NULL;
2539	<
2540	<	/* operator{} and class{} blocks are freed above */
2541	<	/* clean out listeners */
2542	<	close_listeners();
1151	>	motd_clear();  /* Clear motd {} items and re-cache default motd */
1152
1153	<	/* auth{}, quarantine{}, shared{}, connect{}, kill{}, deny{},
1154	<	* exempt{} and gecos{} blocks are freed above too
1155	<	*/
1153	>	cluster_clear();  /* Clear cluster {} items */
1154	>
1155	>	service_clear();  /* Clear service {} items */
1156
1157	<	/* clean out general */
1158	<	MyFree(ConfigFileEntry.service_name);
1159	<	ConfigFileEntry.service_name = NULL;
1157	>	shared_clear();  /* Clear shared {} items */
1158	>
1159	>	pseudo_clear();  /* Clear pseudo {} items */
1160	>
1161	>	/* Clean out ConfigServerInfo */
1162	>	xfree(ConfigServerInfo.description);
1163	>	ConfigServerInfo.description = NULL;
1164	>	xfree(ConfigServerInfo.network_name);
1165	>	ConfigServerInfo.network_name = NULL;
1166	>	xfree(ConfigServerInfo.network_desc);
1167	>	ConfigServerInfo.network_desc = NULL;
1168	>
1169	>	xfree(ConfigServerInfo.rsa_private_key_file);
1170	>	ConfigServerInfo.rsa_private_key_file = NULL;
1171	>	xfree(ConfigServerInfo.ssl_certificate_file);
1172	>	ConfigServerInfo.ssl_certificate_file = NULL;
1173	>	xfree(ConfigServerInfo.ssl_dh_param_file);
1174	>	ConfigServerInfo.ssl_dh_param_file = NULL;
1175	>	xfree(ConfigServerInfo.ssl_dh_elliptic_curve);
1176	>	ConfigServerInfo.ssl_dh_elliptic_curve = NULL;
1177	>	xfree(ConfigServerInfo.ssl_cipher_list);
1178	>	ConfigServerInfo.ssl_cipher_list = NULL;
1179	>	xfree(ConfigServerInfo.ssl_message_digest_algorithm);
1180	>	ConfigServerInfo.ssl_message_digest_algorithm = NULL;
1181	>
1182	>	/* Clean out ConfigAdminInfo */
1183	>	xfree(ConfigAdminInfo.name);
1184	>	ConfigAdminInfo.name = NULL;
1185	>	xfree(ConfigAdminInfo.email);
1186	>	ConfigAdminInfo.email = NULL;
1187	>	xfree(ConfigAdminInfo.description);
1188	>	ConfigAdminInfo.description = NULL;
1189
1190	<	delete_isupport("INVEX");
1191	<	delete_isupport("EXCEPTS");
1190	>	xfree(ConfigServerHide.flatten_links_file);
1191	>	ConfigServerHide.flatten_links_file = NULL;
1192	>
1193	>	/* Clean out listeners */
1194	>	listener_close_marked();
1195		}
1196
2556	–	/* flush_deleted_I_P()
2557	–	*
2558	–	* inputs       - none
2559	–	* output       - none
2560	–	* side effects - This function removes I/P conf items
2561	–	*/
1197		static void
1198	<	flush_deleted_I_P(void)
1198	>	conf_handle_tls(int cold)
1199		{
1200	<	dlink_node *ptr;
2566	<	dlink_node *next_ptr;
2567	<	struct ConfItem *conf;
2568	<	struct AccessItem *aconf;
2569	<	dlink_list * free_items [] = {
2570	<	&server_items, &oconf_items, NULL
2571	<	};
2572	<	dlink_list ** iterator = free_items; /* C is dumb */
2573	<
2574	<	/* flush out deleted I and P lines
2575	<	* although still in use.
2576	<	*/
2577	<	for (; *iterator != NULL; iterator++)
1200	>	if (!tls_new_cred())
1201		{
1202	<	DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
1202	>	if (cold)
1203		{
1204	<	conf = ptr->data;
1205	<	aconf = (struct AccessItem *)map_to_conf(conf);
2583	<
2584	<	if (IsConfIllegal(aconf))
2585	<	{
2586	<	dlinkDelete(ptr, *iterator);
2587	<
2588	<	if (aconf->clients == 0)
2589	<	delete_conf_item(conf);
2590	<	}
1204	>	ilog(LOG_TYPE_IRCD, "Error while initializing TLS");
1205	>	exit(EXIT_FAILURE);
1206		}
1207	<	}
2593	<	}
2594	<
2595	<	/* get_conf_name()
2596	<	*
2597	<	* inputs       - type of conf file to return name of file for
2598	<	* output       - pointer to filename for type of conf
2599	<	* side effects - none
2600	<	*/
2601	<	const char *
2602	<	get_conf_name(ConfType type)
2603	<	{
2604	<	switch (type)
2605	<	{
2606	<	case CONF_TYPE:
2607	<	return ConfigFileEntry.configfile;
2608	<	break;
2609	<	case KLINE_TYPE:
2610	<	return ConfigFileEntry.klinefile;
2611	<	break;
2612	<	case RKLINE_TYPE:
2613	<	return ConfigFileEntry.rklinefile;
2614	<	break;
2615	<	case DLINE_TYPE:
2616	<	return ConfigFileEntry.dlinefile;
2617	<	break;
2618	<	case XLINE_TYPE:
2619	<	return ConfigFileEntry.xlinefile;
2620	<	break;
2621	<	case RXLINE_TYPE:
2622	<	return ConfigFileEntry.rxlinefile;
2623	<	break;
2624	<	case CRESV_TYPE:
2625	<	return ConfigFileEntry.cresvfile;
2626	<	break;
2627	<	case NRESV_TYPE:
2628	<	return ConfigFileEntry.nresvfile;
2629	<	break;
2630	<	case GLINE_TYPE:
2631	<	return ConfigFileEntry.glinefile;
2632	<	break;
2633	<
2634	<	default:
2635	<	return NULL;  /* This should NEVER HAPPEN since we call this function
2636	<	only with the above values, this will cause us to core
2637	<	at some point if this happens so we know where it was */
2638	<	}
2639	<	}
2640	<
2641	<	#define BAD_PING (-1)
2642	<
2643	<	/* get_conf_ping()
2644	<	*
2645	<	* inputs       - pointer to struct AccessItem
2646	<	*              - pointer to a variable that receives ping warning time
2647	<	* output       - ping frequency
2648	<	* side effects - NONE
2649	<	*/
2650	<	static int
2651	<	get_conf_ping(struct ConfItem *conf, int *pingwarn)
2652	<	{
2653	<	struct ClassItem *aclass;
2654	<	struct AccessItem *aconf;
2655	<
2656	<	if (conf != NULL)
2657	<	{
2658	<	aconf = (struct AccessItem *)map_to_conf(conf);
2659	<	if (aconf->class_ptr != NULL)
1207	>	else
1208		{
1209	<	aclass = (struct ClassItem *)map_to_conf(aconf->class_ptr);
1210	<	*pingwarn = aclass->ping_warning;
1211	<	return aclass->ping_freq;
1209	>	/* Failed to load new settings/certs, old ones remain active */
1210	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
1211	>	"Error reloading TLS settings, check the ircd log"); // report_crypto_errors logs this
1212		}
1213		}
2666	–
2667	–	return BAD_PING;
2668	–	}
2669	–
2670	–	/* get_client_class()
2671	–	*
2672	–	* inputs       - pointer to client struct
2673	–	* output       - pointer to name of class
2674	–	* side effects - NONE
2675	–	*/
2676	–	const char *
2677	–	get_client_class(struct Client *target_p)
2678	–	{
2679	–	dlink_node *cnode = NULL;
2680	–	struct AccessItem *aconf = NULL;
2681	–
2682	–	assert(!IsMe(target_p));
2683	–
2684	–	if ((cnode = target_p->localClient->confs.head))
2685	–	{
2686	–	struct ConfItem *conf = cnode->data;
2687	–
2688	–	assert((conf->type == CLIENT_TYPE) || (conf->type == SERVER_TYPE) ||
2689	–	(conf->type == OPER_TYPE));
2690	–
2691	–	aconf = map_to_conf(conf);
2692	–	if (aconf->class_ptr != NULL)
2693	–	return aconf->class_ptr->name;
2694	–	}
2695	–
2696	–	return "default";
1214		}
1215
1216	<	/* get_client_ping()
2700	<	*
2701	<	* inputs       - pointer to client struct
2702	<	*              - pointer to a variable that receives ping warning time
2703	<	* output       - ping frequency
2704	<	* side effects - NONE
2705	<	*/
2706	<	int
2707	<	get_client_ping(struct Client *target_p, int *pingwarn)
2708	<	{
2709	<	int ping = 0;
2710	<	dlink_node *cnode = NULL;
2711	<
2712	<	if ((cnode = target_p->localClient->confs.head))
2713	<	{
2714	<	struct ConfItem *conf = cnode->data;
2715	<
2716	<	assert((conf->type == CLIENT_TYPE) || (conf->type == SERVER_TYPE) ||
2717	<	(conf->type == OPER_TYPE));
2718	<
2719	<	ping = get_conf_ping(conf, pingwarn);
2720	<	if (ping > 0)
2721	<	return ping;
2722	<	}
2723	<
2724	<	*pingwarn = 0;
2725	<	return DEFAULT_PINGFREQUENCY;
2726	<	}
2727	<
2728	<	/* find_class()
1216	>	/* read_conf_files()
1217		*
1218	<	* inputs       - string name of class
1219	<	* output       - corresponding Class pointer
1220	<	* side effects - NONE
1218	>	* inputs       - cold start YES or NO
1219	>	* output       - none
1220	>	* side effects - read all conf files needed, ircd.conf kline.conf etc.
1221		*/
1222	<	struct ConfItem *
1223	<	find_class(const char *classname)
1222	>	void
1223	>	read_conf_files(int cold)
1224		{
1225	<	struct ConfItem *conf;
1225	>	const char *filename = NULL;
1226	>	char chanmodes[IRCD_BUFSIZE] = "";
1227	>	char chanlimit[IRCD_BUFSIZE] = "";
1228
1229	<	if ((conf = find_exact_name_conf(CLASS_TYPE, NULL, classname, NULL, NULL)) != NULL)
1230	<	return conf;
1229	>	conf_parser_ctx.boot = cold;
1230	>	filename = ConfigGeneral.configfile;
1231
1232	<	return class_default;
1233	<	}
1232	>	/* We need to know the initial filename for the yyerror() to report
1233	>	FIXME: The full path is in conffilenamebuf first time since we
1234	>	don't know anything else
1235
1236	<	/* check_class()
1237	<	*
1238	<	* inputs       - NONE
2748	<	* output       - NONE
2749	<	* side effects -
2750	<	*/
2751	<	void
2752	<	check_class(void)
2753	<	{
2754	<	dlink_node *ptr = NULL, *next_ptr = NULL;
1236	>	- Gozem 2002-07-21
1237	>	*/
1238	>	strlcpy(conffilebuf, filename, sizeof(conffilebuf));
1239
1240	<	DLINK_FOREACH_SAFE(ptr, next_ptr, class_items.head)
1240	>	if ((conf_parser_ctx.conf_file = fopen(filename, "r")) == NULL)
1241		{
1242	<	struct ClassItem *aclass = map_to_conf(ptr->data);
2759	<
2760	<	if (!aclass->active && !aclass->curr_user_count)
1242	>	if (cold)
1243		{
1244	<	destroy_cidr_class(aclass);
1245	<	delete_conf_item(ptr->data);
1244	>	ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
1245	>	filename, strerror(errno));
1246	>	exit(EXIT_FAILURE);
1247	>	}
1248	>	else
1249	>	{
1250	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1251	>	"Unable to read configuration file '%s': %s",
1252	>	filename, strerror(errno));
1253	>	return;
1254		}
1255		}
2766	–	}
2767	–
2768	–	/* init_class()
2769	–	*
2770	–	* inputs       - NONE
2771	–	* output       - NONE
2772	–	* side effects -
2773	–	*/
2774	–	void
2775	–	init_class(void)
2776	–	{
2777	–	struct ClassItem *aclass;
2778	–
2779	–	class_default = make_conf_item(CLASS_TYPE);
2780	–
2781	–	aclass = map_to_conf(class_default);
2782	–	aclass->active = 1;
2783	–	DupString(class_default->name, "default");
2784	–	aclass->con_freq  = DEFAULT_CONNECTFREQUENCY;
2785	–	aclass->ping_freq = DEFAULT_PINGFREQUENCY;
2786	–	aclass->max_total = MAXIMUM_LINKS_DEFAULT;
2787	–	aclass->max_sendq = DEFAULT_SENDQ;
2788	–
2789	–	client_check_cb = register_callback("check_client", check_client);
2790	–	}
2791	–
2792	–	/* get_sendq()
2793	–	*
2794	–	* inputs       - pointer to client
2795	–	* output       - sendq for this client as found from its class
2796	–	* side effects - NONE
2797	–	*/
2798	–	unsigned int
2799	–	get_sendq(struct Client *client_p)
2800	–	{
2801	–	unsigned int sendq = DEFAULT_SENDQ;
2802	–	dlink_node *cnode;
2803	–	struct ConfItem *class_conf;
2804	–	struct ClassItem *aclass;
2805	–	struct AccessItem *aconf;
2806	–
2807	–	assert(!IsMe(client_p));
1256
1257	<	if ((cnode = client_p->localClient->confs.head))
1258	<	{
2811	<	struct ConfItem *conf = cnode->data;
1257	>	if (!cold)
1258	>	clear_out_old_conf();
1259
1260	<	assert((conf->type == CLIENT_TYPE) || (conf->type == SERVER_TYPE) ||
1261	<	(conf->type == OPER_TYPE));
1260	>	read_conf(conf_parser_ctx.conf_file);
1261	>	fclose(conf_parser_ctx.conf_file);
1262
1263	<	aconf = map_to_conf(conf);
1263	>	log_reopen_all();
1264	>	conf_handle_tls(cold);
1265
1266	<	if ((class_conf = aconf->class_ptr) == NULL)
1267	<	return DEFAULT_SENDQ; /* TBV: shouldn't be possible at all */
1266	>	isupport_add("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
1267	>	isupport_add("NETWORK", ConfigServerInfo.network_name, -1);
1268
1269	<	aclass = map_to_conf(class_conf);
1270	<	sendq = aclass->max_sendq;
1271	<	return sendq;
1272	<	}
1269	>	snprintf(chanmodes, sizeof(chanmodes), "beI:%u", ConfigChannel.max_bans);
1270	>	isupport_add("MAXLIST", chanmodes, -1);
1271	>	isupport_add("MAXTARGETS", NULL, ConfigGeneral.max_targets);
1272	>	isupport_add("CHANTYPES", "#", -1);
1273	>
1274	>	snprintf(chanlimit, sizeof(chanlimit), "#:%u",
1275	>	ConfigChannel.max_channels);
1276	>	isupport_add("CHANLIMIT", chanlimit, -1);
1277	>	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,cimnprstCMORST");
1278	>	isupport_add("CHANNELLEN", NULL, CHANNELLEN);
1279	>	isupport_add("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
1280	>	isupport_add("CHANMODES", chanmodes, -1);
1281
1282	<	/* XXX return a default?
1283	<	* if here, then there wasn't an attached conf with a sendq
1284	<	* that is very bad -Dianora
1282	>	/*
1283	>	* message_locale may have changed.  rebuild isupport since it relies
1284	>	* on strlen(form_str(RPL_ISUPPORT))
1285		*/
1286	<	return DEFAULT_SENDQ;
1286	>	isupport_rebuild();
1287		}
1288
1289		/* conf_add_class_to_conf()
1290		*
1291		* inputs       - pointer to config item
1292		* output       - NONE
1293	<	* side effects - Add a class pointer to a conf
1293	>	* side effects - Add a class pointer to a conf
1294		*/
1295		void
1296	<	conf_add_class_to_conf(struct ConfItem *conf, const char *class_name)
1296	>	conf_add_class_to_conf(struct MaskItem *conf, const char *name)
1297		{
1298	<	struct AccessItem *aconf = map_to_conf(conf);
2843	<	struct ClassItem *class = NULL;
2844	<
2845	<	if (class_name == NULL)
1298	>	if (EmptyString(name) || (conf->class = class_find(name, 1)) == NULL)
1299		{
1300	<	aconf->class_ptr = class_default;
1300	>	conf->class = class_default;
1301
1302	<	if (conf->type == CLIENT_TYPE)
1303	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1304	<	"Warning *** Defaulting to default class for %s@%s",
1305	<	aconf->user, aconf->host);
2853	<	else
2854	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2855	<	"Warning *** Defaulting to default class for %s",
2856	<	conf->name);
2857	<	}
2858	<	else
2859	<	aconf->class_ptr = find_class(class_name);
2860	<
2861	<	if (aconf->class_ptr)
2862	<	class = map_to_conf(aconf->class_ptr);
2863	<
2864	<	if (aconf->class_ptr == NULL || !class->active)
2865	<	{
2866	<	if (conf->type == CLIENT_TYPE)
2867	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2868	<	"Warning *** Defaulting to default class for %s@%s",
2869	<	aconf->user, aconf->host);
1302	>	if (conf->type == CONF_CLIENT || conf->type == CONF_OPER)
1303	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1304	>	"Warning *** Defaulting to default class for %s@%s",
1305	>	conf->user, conf->host);
1306		else
1307	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1308	<	"Warning *** Defaulting to default class for %s",
1309	<	conf->name);
2874	<	aconf->class_ptr = class_default;
1307	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1308	>	"Warning *** Defaulting to default class for %s",
1309	>	conf->name);
1310		}
1311		}
1312
2878	–	/* conf_add_server()
2879	–	*
2880	–	* inputs       - pointer to config item
2881	–	*              - pointer to link count already on this conf
2882	–	* output       - NONE
2883	–	* side effects - Add a connect block
2884	–	*/
2885	–	int
2886	–	conf_add_server(struct ConfItem *conf, const char *class_name)
2887	–	{
2888	–	struct AccessItem *aconf = map_to_conf(conf);
2889	–
2890	–	conf_add_class_to_conf(conf, class_name);
2891	–
2892	–	if (!aconf->host || !conf->name)
2893	–	{
2894	–	sendto_realops_flags(UMODE_ALL, L_ALL, "Bad connect block");
2895	–	ilog(LOG_TYPE_IRCD, "Bad connect block");
2896	–	return -1;
2897	–	}
2898	–
2899	–	if (EmptyString(aconf->passwd))
2900	–	{
2901	–	sendto_realops_flags(UMODE_ALL, L_ALL, "Bad connect block, name %s",
2902	–	conf->name);
2903	–	ilog(LOG_TYPE_IRCD, "Bad connect block, host %s", conf->name);
2904	–	return -1;
2905	–	}
2906	–
2907	–	lookup_confhost(conf);
2908	–
2909	–	return 0;
2910	–	}
2911	–
1313		/* yyerror()
1314		*
1315		* inputs       - message from parser
#	Line 2924 | Line 1325 | yyerror(const char *msg)
1325		return;
1326
1327		strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1328	<	sendto_realops_flags(UMODE_ALL, L_ALL, "\"%s\", line %u: %s: %s",
1328	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1329	>	"\"%s\", line %u: %s: %s",
1330	>	conffilebuf, lineno + 1, msg, newlinebuf);
1331	>	ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1332	>	conffilebuf, lineno + 1, msg, newlinebuf);
1333	>	}
1334	>
1335	>	void
1336	>	conf_error_report(const char *msg)
1337	>	{
1338	>	char newlinebuf[IRCD_BUFSIZE];
1339	>
1340	>	strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1341	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1342	>	"\"%s\", line %u: %s: %s",
1343		conffilebuf, lineno + 1, msg, newlinebuf);
1344		ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1345		conffilebuf, lineno + 1, msg, newlinebuf);
#	Line 2932 | Line 1347 | yyerror(const char *msg)
1347
1348		/*
1349		* valid_tkline()
1350	<	*
1350	>	*
1351		* inputs       - pointer to ascii string to check
1352		*              - whether the specified time is in seconds or minutes
1353		* output       - -1 not enough parameters
#	Line 2941 | Line 1356 | yyerror(const char *msg)
1356		* Originally written by Dianora (Diane, db@db.net)
1357		*/
1358		time_t
1359	<	valid_tkline(const char *p, int minutes)
1359	>	valid_tkline(const char *data, const int minutes)
1360		{
1361	+	const unsigned char *p = (const unsigned char *)data;
1362	+	unsigned char tmpch = '\0';
1363		time_t result = 0;
1364
1365	<	for (; *p; ++p)
1365	>	while ((tmpch = *p++))
1366		{
1367	<	if (!IsDigit(*p))
1367	>	if (!IsDigit(tmpch))
1368		return 0;
1369
1370		result *= 10;
1371	<	result += ((*p) & 0xF);
1371	>	result += (tmpch & 0xF);
1372		}
1373
1374		/*
1375	<	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1376	<	* i.e. they specifically use 0, I am going to return 1 instead
1377	<	* as a return value of non-zero is used to flag it as a temporary kline
1375	>	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1376	>	* i.e. they specifically use 0, I am going to return 1 instead as a return
1377	>	* value of non-zero is used to flag it as a temporary kline
1378		*/
1379		if (result == 0)
1380		result = 1;
1381
1382	<	/*
1382	>	/*
1383		* If the incoming time is in seconds convert it to minutes for the purpose
1384		* of this calculation
1385		*/
1386		if (!minutes)
1387	<	result = result / (time_t)60;
1387	>	result = result / 60;
1388
1389		if (result > MAX_TDKLINE_TIME)
1390		result = MAX_TDKLINE_TIME;
1391
1392	<	result = result * (time_t)60;  /* turn it into seconds */
1392	>	result = result * 60;  /* Turn it into seconds */
1393
1394		return result;
1395		}
1396
1397	+	/* valid_wild_card_simple()
1398	+	*
1399	+	* inputs       - data to check for sufficient non-wildcard characters
1400	+	* outputs      - 1 if valid, else 0
1401	+	* side effects - none
1402	+	*/
1403	+	int
1404	+	valid_wild_card_simple(const char *data)
1405	+	{
1406	+	const unsigned char *p = (const unsigned char *)data;
1407	+	unsigned char tmpch = '\0';
1408	+	unsigned int nonwild = 0, wild = 0;
1409	+
1410	+	while ((tmpch = *p++))
1411	+	{
1412	+	if (tmpch == '\\' && *p)
1413	+	{
1414	+	++p;
1415	+	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1416	+	return 1;
1417	+	}
1418	+	else if (!IsMWildChar(tmpch))
1419	+	{
1420	+	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1421	+	return 1;
1422	+	}
1423	+	else
1424	+	++wild;
1425	+	}
1426	+
1427	+	return !wild;
1428	+	}
1429	+
1430		/* valid_wild_card()
1431		*
1432		* input        - pointer to client
#	Line 2986 | Line 1436 | valid_tkline(const char *p, int minutes)
1436		* side effects - NOTICE is given to source_p if warn is 1
1437		*/
1438		int
1439	<	valid_wild_card(struct Client *source_p, int warn, int count, ...)
1439	>	valid_wild_card(struct Client *source_p, int count, ...)
1440		{
1441	<	char *p;
1442	<	char tmpch;
2993	<	int nonwild = 0;
1441	>	unsigned char tmpch = '\0';
1442	>	unsigned int nonwild = 0;
1443		va_list args;
1444
1445		/*
#	Line 3009 | Line 1458 | valid_wild_card(struct Client *source_p,
1458
1459		while (count--)
1460		{
1461	<	p = va_arg(args, char *);
1461	>	const unsigned char *p = va_arg(args, const unsigned char *);
1462		if (p == NULL)
1463		continue;
1464
#	Line 3021 | Line 1470 | valid_wild_card(struct Client *source_p,
1470		* If we find enough non-wild characters, we can
1471		* break - no point in searching further.
1472		*/
1473	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard)
1473	>	if (++nonwild >= ConfigGeneral.min_nonwildcard)
1474	>	{
1475	>	va_end(args);
1476		return 1;
1477	+	}
1478		}
1479		}
1480		}
1481
1482	<	if (warn)
1483	<	sendto_one(source_p, ":%s NOTICE %s :Please include at least %d non-wildcard characters with the mask",
1484	<	me.name, source_p->name, ConfigFileEntry.min_nonwildcard);
1482	>	if (IsClient(source_p))
1483	>	sendto_one_notice(source_p, &me,
1484	>	":Please include at least %u non-wildcard characters with the mask",
1485	>	ConfigGeneral.min_nonwildcard);
1486	>	va_end(args);
1487	>	return 0;
1488	>	}
1489	>
1490	>	/* find_user_host()
1491	>	*
1492	>	* inputs       - pointer to client placing kline
1493	>	*              - pointer to user_host_or_nick
1494	>	*              - pointer to user buffer
1495	>	*              - pointer to host buffer
1496	>	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
1497	>	* side effects -
1498	>	*/
1499	>	static int
1500	>	find_user_host(struct Client *source_p, char *user_host_or_nick,
1501	>	char *luser, char *lhost)
1502	>	{
1503	>	struct Client *target_p = NULL;
1504	>	char *hostp = NULL;
1505	>
1506	>	if (lhost == NULL)
1507	>	{
1508	>	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
1509	>	return 1;
1510	>	}
1511	>
1512	>	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
1513	>	{
1514	>	/* Explicit user@host mask given */
1515	>	if (hostp)                            /* I'm a little user@host */
1516	>	{
1517	>	*(hostp++) = '\0';                       /* short and squat */
1518	>
1519	>	if (*user_host_or_nick)
1520	>	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
1521	>	else
1522	>	strcpy(luser, "*");
1523	>
1524	>	if (*hostp)
1525	>	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
1526	>	else
1527	>	strcpy(lhost, "*");
1528	>	}
1529	>	else
1530	>	{
1531	>	luser[0] = '*';             /* no @ found, assume its *@somehost */
1532	>	luser[1] = '\0';
1533	>	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
1534	>	}
1535	>
1536	>	return 1;
1537	>	}
1538	>	else
1539	>	{
1540	>	/* Try to find user@host mask from nick */
1541	>	/* Okay to use source_p as the first param, because source_p == client_p */
1542	>	if ((target_p =
1543	>	find_chasing(source_p, user_host_or_nick)) == NULL)
1544	>	return 0;  /* find_chasing sends ERR_NOSUCHNICK */
1545	>
1546	>	if (HasFlag(target_p, FLAGS_EXEMPTKLINE))
1547	>	{
1548	>	if (IsClient(source_p))
1549	>	sendto_one_notice(source_p, &me, ":%s is E-lined", target_p->name);
1550	>	return 0;
1551	>	}
1552	>
1553	>	/*
1554	>	* Turn the "user" bit into "*user", blow away '~'
1555	>	* if found in original user name (non-idented)
1556	>	*/
1557	>	strlcpy(luser, target_p->username, USERLEN*4 + 1);
1558	>
1559	>	if (target_p->username[0] == '~')
1560	>	luser[0] = '*';
1561	>
1562	>	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
1563	>	return 1;
1564	>	}
1565	>
1566		return 0;
1567		}
1568
#	Line 3043 | Line 1576 | valid_wild_card(struct Client *source_p,
1576		*              - parse_flags bit map of things to test
1577		*              - pointer to user or string to parse into
1578		*              - pointer to host or NULL to parse into if non NULL
1579	<	*              - pointer to optional tkline time or NULL
1579	>	*              - pointer to optional tkline time or NULL
1580		*              - pointer to target_server to parse into if non NULL
1581		*              - pointer to reason to parse into
1582		*
1583	<	* output       - 1 if valid, -1 if not valid
1583	>	* output       - 1 if valid, 0 if not valid
1584		* side effects - A generalised k/d/x etc. line parser,
1585		*               "ALINE [time] user@host|string [ON] target :reason"
1586		*                will parse returning a parsed user, host if
#	Line 3065 | Line 1598 | valid_wild_card(struct Client *source_p,
1598		*/
1599		int
1600		parse_aline(const char *cmd, struct Client *source_p,
1601	<	int parc, char **parv,
1602	<	int parse_flags, char **up_p, char **h_p, time_t *tkline_time,
1603	<	char **target_server, char **reason)
1601	>	int parc, char **parv,
1602	>	int parse_flags, char **up_p, char **h_p, time_t *tkline_time,
1603	>	char **target_server, char **reason)
1604		{
1605		int found_tkline_time=0;
1606	<	static char def_reason[] = "No Reason";
1606	>	static char default_reason[] = CONF_NOREASON;
1607		static char user[USERLEN*4+1];
1608		static char host[HOSTLEN*4+1];
1609
#	Line 3079 | Line 1612 | parse_aline(const char *cmd, struct Clie
1612
1613		found_tkline_time = valid_tkline(*parv, TK_MINUTES);
1614
1615	<	if (found_tkline_time != 0)
1615	>	if (found_tkline_time)
1616		{
1617		parv++;
1618		parc--;
1619
1620	<	if (tkline_time != NULL)
1620	>	if (tkline_time)
1621		*tkline_time = found_tkline_time;
1622		else
1623		{
1624	<	sendto_one(source_p, ":%s NOTICE %s :temp_line not supported by %s",
1625	<	me.name, source_p->name, cmd);
3093	<	return -1;
1624	>	sendto_one_notice(source_p, &me, ":temp_line not supported by %s", cmd);
1625	>	return 0;
1626		}
1627		}
1628
1629		if (parc == 0)
1630		{
1631	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1632	<	me.name, source_p->name, cmd);
3101	<	return -1;
1631	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1632	>	return 0;
1633		}
1634
1635		if (h_p == NULL)
1636		*up_p = *parv;
1637		else
1638		{
1639	<	if (find_user_host(source_p, *parv, user, host, parse_flags) == 0)
1640	<	return -1;
1639	>	if (find_user_host(source_p, *parv, user, host) == 0)
1640	>	return 0;
1641
1642		*up_p = user;
1643		*h_p = host;
1644		}
1645	<
1645	>
1646		parc--;
1647		parv++;
1648
1649	<	if (parc != 0)
1649	>	if (parc)
1650		{
1651		if (irccmp(*parv, "ON") == 0)
1652		{
1653		parc--;
1654		parv++;
1655
3125	–	if (target_server == NULL)
3126	–	{
3127	–	sendto_one(source_p, ":%s NOTICE %s :ON server not supported by %s",
3128	–	me.name, source_p->name, cmd);
3129	–	return -1;
3130	–	}
3131	–
1656		if (!HasOFlag(source_p, OPER_FLAG_REMOTEBAN))
1657		{
1658	<	sendto_one(source_p, form_str(ERR_NOPRIVS),
1659	<	me.name, source_p->name, "remoteban");
3136	<	return -1;
1658	>	sendto_one_numeric(source_p, &me, ERR_NOPRIVS, "remoteban");
1659	>	return 0;
1660		}
1661
1662		if (parc == 0 || EmptyString(*parv))
1663		{
1664	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1665	<	me.name, source_p->name, cmd);
3143	<	return -1;
1664	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1665	>	return 0;
1666		}
1667
1668		*target_server = *parv;
#	Line 3152 | Line 1674 | parse_aline(const char *cmd, struct Clie
1674		/* Make sure target_server *is* NULL if no ON server found
1675		* caller probably NULL'd it first, but no harm to do it again -db
1676		*/
1677	<	if (target_server != NULL)
1678	<	*target_server = NULL;
1677	>	if (target_server)
1678	>	*target_server = NULL;
1679		}
1680		}
1681
1682	<	if (h_p != NULL)
1682	>	if (h_p)
1683		{
1684	<	if (strchr(user, '!') != NULL)
1684	>	if (strchr(user, '!'))
1685		{
1686	<	sendto_one(source_p, ":%s NOTICE %s :Invalid character '!' in kline",
1687	<	me.name, source_p->name);
3166	<	return -1;
1686	>	sendto_one_notice(source_p, &me, ":Invalid character '!' in kline");
1687	>	return 0;
1688		}
1689
1690	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 2, *up_p, *h_p))
1691	<	return -1;
1690	>	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 2, *up_p, *h_p))
1691	>	return 0;
1692		}
1693		else
1694	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 1, *up_p))
1695	<	return -1;
1694	>	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, *up_p))
1695	>	return 0;
1696
1697	<	if (reason != NULL)
1697	>	if (reason)
1698		{
1699	<	if (parc != 0 && !EmptyString(*parv))
3179	<	{
1699	>	if (parc && !EmptyString(*parv))
1700		*reason = *parv;
3181	–	if (!valid_comment(source_p, *reason, 1))
3182	–	return -1;
3183	–	}
3184	–	else
3185	–	*reason = def_reason;
3186	–	}
3187	–
3188	–	return 1;
3189	–	}
3190	–
3191	–	/* find_user_host()
3192	–	*
3193	–	* inputs       - pointer to client placing kline
3194	–	*              - pointer to user_host_or_nick
3195	–	*              - pointer to user buffer
3196	–	*              - pointer to host buffer
3197	–	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
3198	–	* side effects -
3199	–	*/
3200	–	static int
3201	–	find_user_host(struct Client *source_p, char *user_host_or_nick,
3202	–	char *luser, char *lhost, unsigned int flags)
3203	–	{
3204	–	struct Client *target_p = NULL;
3205	–	char *hostp = NULL;
3206	–
3207	–	if (lhost == NULL)
3208	–	{
3209	–	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
3210	–	return 1;
3211	–	}
3212	–
3213	–	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
3214	–	{
3215	–	/* Explicit user@host mask given */
3216	–
3217	–	if (hostp != NULL)                            /* I'm a little user@host */
3218	–	{
3219	–	*(hostp++) = '\0';                       /* short and squat */
3220	–	if (*user_host_or_nick)
3221	–	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
3222	–	else
3223	–	strcpy(luser, "*");
3224	–	if (*hostp)
3225	–	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
3226	–	else
3227	–	strcpy(lhost, "*");
3228	–	}
3229	–	else
3230	–	{
3231	–	luser[0] = '*';             /* no @ found, assume its *@somehost */
3232	–	luser[1] = '\0';
3233	–	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
3234	–	}
3235	–
3236	–	return 1;
3237	–	}
3238	–	else if (!(flags & NOUSERLOOKUP))
3239	–	{
3240	–	/* Try to find user@host mask from nick */
3241	–	/* Okay to use source_p as the first param, because source_p == client_p */
3242	–	if ((target_p =
3243	–	find_chasing(source_p, source_p, user_host_or_nick, NULL)) == NULL)
3244	–	return 0;
3245	–
3246	–	if (IsExemptKline(target_p))
3247	–	{
3248	–	if (!IsServer(source_p))
3249	–	sendto_one(source_p,
3250	–	":%s NOTICE %s :%s is E-lined",
3251	–	me.name, source_p->name, target_p->name);
3252	–	return 0;
3253	–	}
3254	–
3255	–	/*
3256	–	* turn the "user" bit into "*user", blow away '~'
3257	–	* if found in original user name (non-idented)
3258	–	*/
3259	–	strlcpy(luser, target_p->username, USERLEN*4 + 1);
3260	–
3261	–	if (target_p->username[0] == '~')
3262	–	luser[0] = '*';
3263	–
3264	–	if (target_p->sockhost[0] == '\0' ||
3265	–	(target_p->sockhost[0] == '0' && target_p->sockhost[1] == '\0'))
3266	–	strlcpy(lhost, target_p->host, HOSTLEN*4 + 1);
1701		else
1702	<	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
3269	<	return 1;
1702	>	*reason = default_reason;
1703		}
1704
3272	–	return 0;
3273	–	}
3274	–
3275	–	/* valid_comment()
3276	–	*
3277	–	* inputs       - pointer to client
3278	–	*              - pointer to comment
3279	–	* output       - 0 if no valid comment,
3280	–	*              - 1 if valid
3281	–	* side effects - truncates reason where necessary
3282	–	*/
3283	–	int
3284	–	valid_comment(struct Client *source_p, char *comment, int warn)
3285	–	{
3286	–	if (strchr(comment, '"'))
3287	–	{
3288	–	if (warn)
3289	–	sendto_one(source_p, ":%s NOTICE %s :Invalid character '\"' in comment",
3290	–	me.name, source_p->name);
3291	–	return 0;
3292	–	}
3293	–
3294	–	if (strlen(comment) > REASONLEN)
3295	–	comment[REASONLEN-1] = '\0';
3296	–
1705		return 1;
1706		}
1707
#	Line 3305 | Line 1713 | valid_comment(struct Client *source_p, c
1713		* side effects - none
1714		*/
1715		int
1716	<	match_conf_password(const char *password, const struct AccessItem *aconf)
1716	>	match_conf_password(const char *password, const struct MaskItem *conf)
1717		{
1718		const char *encr = NULL;
1719
1720	<	if (EmptyString(password) || EmptyString(aconf->passwd))
1720	>	if (EmptyString(password) || EmptyString(conf->passwd))
1721		return 0;
1722
1723	<	if (aconf->flags & CONF_FLAGS_ENCRYPTED)
1724	<	encr = crypt(password, aconf->passwd);
1723	>	if (conf->flags & CONF_FLAGS_ENCRYPTED)
1724	>	encr = crypt(password, conf->passwd);
1725		else
1726		encr = password;
1727
1728	<	return !strcmp(encr, aconf->passwd);
3321	<	}
3322	<
3323	<	/*
3324	<	* cluster_a_line
3325	<	*
3326	<	* inputs       - client sending the cluster
3327	<	*              - command name "KLINE" "XLINE" etc.
3328	<	*              - capab -- CAP_KLN etc. from s_serv.h
3329	<	*              - cluster type -- CLUSTER_KLINE etc. from conf.h
3330	<	*              - pattern and args to send along
3331	<	* output       - none
3332	<	* side effects - Take source_p send the pattern with args given
3333	<	*                along to all servers that match capab and cluster type
3334	<	*/
3335	<	void
3336	<	cluster_a_line(struct Client *source_p, const char *command,
3337	<	int capab, int cluster_type, const char *pattern, ...)
3338	<	{
3339	<	va_list args;
3340	<	char buffer[IRCD_BUFSIZE];
3341	<	const dlink_node *ptr = NULL;
3342	<
3343	<	va_start(args, pattern);
3344	<	vsnprintf(buffer, sizeof(buffer), pattern, args);
3345	<	va_end(args);
3346	<
3347	<	DLINK_FOREACH(ptr, cluster_items.head)
3348	<	{
3349	<	const struct ConfItem *conf = ptr->data;
3350	<
3351	<	if (conf->flags & cluster_type)
3352	<	sendto_match_servs(source_p, conf->name, CAP_CLUSTER|capab,
3353	<	"%s %s %s", command, conf->name, buffer);
3354	<	}
1728	>	return encr && !strcmp(encr, conf->passwd);
1729		}
1730
1731		/*
#	Line 3389 | Line 1763 | split_nuh(struct split_nuh_item *const i
1763
1764		if (iptr->nickptr)
1765		strlcpy(iptr->nickptr, "*", iptr->nicksize);
1766	+
1767		if (iptr->userptr)
1768		strlcpy(iptr->userptr, "*", iptr->usersize);
1769	+
1770		if (iptr->hostptr)
1771		strlcpy(iptr->hostptr, "*", iptr->hostsize);
1772
#	Line 3398 | Line 1774 | split_nuh(struct split_nuh_item *const i
1774		{
1775		*p = '\0';
1776
1777	<	if (iptr->nickptr && *iptr->nuhmask != '\0')
1777	>	if (iptr->nickptr && *iptr->nuhmask)
1778		strlcpy(iptr->nickptr, iptr->nuhmask, iptr->nicksize);
1779
1780	<	if ((q = strchr(++p, '@'))) {
1780	>	if ((q = strchr(++p, '@')))
1781	>	{
1782		*q++ = '\0';
1783
1784	<	if (*p != '\0')
1784	>	if (*p)
1785		strlcpy(iptr->userptr, p, iptr->usersize);
1786
1787	<	if (*q != '\0')
1787	>	if (*q)
1788		strlcpy(iptr->hostptr, q, iptr->hostsize);
1789		}
1790		else
1791		{
1792	<	if (*p != '\0')
1792	>	if (*p)
1793		strlcpy(iptr->userptr, p, iptr->usersize);
1794		}
1795		}
#	Line 3424 | Line 1801 | split_nuh(struct split_nuh_item *const i
1801		/* if found a @ */
1802		*p++ = '\0';
1803
1804	<	if (*iptr->nuhmask != '\0')
1804	>	if (*iptr->nuhmask)
1805		strlcpy(iptr->userptr, iptr->nuhmask, iptr->usersize);
1806
1807	<	if (*p != '\0')
1807	>	if (*p)
1808		strlcpy(iptr->hostptr, p, iptr->hostsize);
1809		}
1810		else
1811		{
1812	<	/* no @ found */
1812	>	/* No @ found */
1813		if (!iptr->nickptr || strpbrk(iptr->nuhmask, ".:"))
1814		strlcpy(iptr->hostptr, iptr->nuhmask, iptr->hostsize);
1815		else
#	Line 3440 | Line 1817 | split_nuh(struct split_nuh_item *const i
1817		}
1818		}
1819		}
3443	–
3444	–	/*
3445	–	* flags_to_ascii
3446	–	*
3447	–	* inputs       - flags is a bitmask
3448	–	*              - pointer to table of ascii letters corresponding
3449	–	*                to each bit
3450	–	*              - flag 1 for convert ToLower if bit missing
3451	–	*                0 if ignore.
3452	–	* output       - none
3453	–	* side effects - string pointed to by p has bitmap chars written to it
3454	–	*/
3455	–	static void
3456	–	flags_to_ascii(unsigned int flags, const unsigned int bit_table[], char *p,
3457	–	int lowerit)
3458	–	{
3459	–	unsigned int mask = 1;
3460	–	int i = 0;
3461	–
3462	–	for (mask = 1; (mask != 0) && (bit_table[i] != 0); mask <<= 1, i++)
3463	–	{
3464	–	if (flags & mask)
3465	–	*p++ = bit_table[i];
3466	–	else if (lowerit)
3467	–	*p++ = ToLower(bit_table[i]);
3468	–	}
3469	–	*p = '\0';
3470	–	}
3471	–
3472	–	/*
3473	–	* cidr_limit_reached
3474	–	*
3475	–	* inputs       - int flag allowing over_rule of limits
3476	–	*              - pointer to the ip to be added
3477	–	*              - pointer to the class
3478	–	* output       - non zero if limit reached
3479	–	*                0 if limit not reached
3480	–	* side effects -
3481	–	*/
3482	–	static int
3483	–	cidr_limit_reached(int over_rule,
3484	–	struct irc_ssaddr *ip, struct ClassItem *aclass)
3485	–	{
3486	–	dlink_node *ptr = NULL;
3487	–	struct CidrItem *cidr;
3488	–
3489	–	if (aclass->number_per_cidr <= 0)
3490	–	return 0;
3491	–
3492	–	if (ip->ss.ss_family == AF_INET)
3493	–	{
3494	–	if (aclass->cidr_bitlen_ipv4 <= 0)
3495	–	return 0;
3496	–
3497	–	DLINK_FOREACH(ptr, aclass->list_ipv4.head)
3498	–	{
3499	–	cidr = ptr->data;
3500	–	if (match_ipv4(ip, &cidr->mask, aclass->cidr_bitlen_ipv4))
3501	–	{
3502	–	if (!over_rule && (cidr->number_on_this_cidr >= aclass->number_per_cidr))
3503	–	return -1;
3504	–	cidr->number_on_this_cidr++;
3505	–	return 0;
3506	–	}
3507	–	}
3508	–	cidr = MyMalloc(sizeof(struct CidrItem));
3509	–	cidr->number_on_this_cidr = 1;
3510	–	cidr->mask = *ip;
3511	–	mask_addr(&cidr->mask, aclass->cidr_bitlen_ipv4);
3512	–	dlinkAdd(cidr, &cidr->node, &aclass->list_ipv4);
3513	–	}
3514	–	#ifdef IPV6
3515	–	else if (aclass->cidr_bitlen_ipv6 > 0)
3516	–	{
3517	–	DLINK_FOREACH(ptr, aclass->list_ipv6.head)
3518	–	{
3519	–	cidr = ptr->data;
3520	–	if (match_ipv6(ip, &cidr->mask, aclass->cidr_bitlen_ipv6))
3521	–	{
3522	–	if (!over_rule && (cidr->number_on_this_cidr >= aclass->number_per_cidr))
3523	–	return -1;
3524	–	cidr->number_on_this_cidr++;
3525	–	return 0;
3526	–	}
3527	–	}
3528	–	cidr = MyMalloc(sizeof(struct CidrItem));
3529	–	cidr->number_on_this_cidr = 1;
3530	–	cidr->mask = *ip;
3531	–	mask_addr(&cidr->mask, aclass->cidr_bitlen_ipv6);
3532	–	dlinkAdd(cidr, &cidr->node, &aclass->list_ipv6);
3533	–	}
3534	–	#endif
3535	–	return 0;
3536	–	}
3537	–
3538	–	/*
3539	–	* remove_from_cidr_check
3540	–	*
3541	–	* inputs       - pointer to the ip to be removed
3542	–	*              - pointer to the class
3543	–	* output       - NONE
3544	–	* side effects -
3545	–	*/
3546	–	static void
3547	–	remove_from_cidr_check(struct irc_ssaddr *ip, struct ClassItem *aclass)
3548	–	{
3549	–	dlink_node *ptr = NULL;
3550	–	dlink_node *next_ptr = NULL;
3551	–	struct CidrItem *cidr;
3552	–
3553	–	if (aclass->number_per_cidr == 0)
3554	–	return;
3555	–
3556	–	if (ip->ss.ss_family == AF_INET)
3557	–	{
3558	–	if (aclass->cidr_bitlen_ipv4 <= 0)
3559	–	return;
3560	–
3561	–	DLINK_FOREACH_SAFE(ptr, next_ptr, aclass->list_ipv4.head)
3562	–	{
3563	–	cidr = ptr->data;
3564	–	if (match_ipv4(ip, &cidr->mask, aclass->cidr_bitlen_ipv4))
3565	–	{
3566	–	cidr->number_on_this_cidr--;
3567	–	if (cidr->number_on_this_cidr == 0)
3568	–	{
3569	–	dlinkDelete(ptr, &aclass->list_ipv4);
3570	–	MyFree(cidr);
3571	–	return;
3572	–	}
3573	–	}
3574	–	}
3575	–	}
3576	–	#ifdef IPV6
3577	–	else if (aclass->cidr_bitlen_ipv6 > 0)
3578	–	{
3579	–	DLINK_FOREACH_SAFE(ptr, next_ptr, aclass->list_ipv6.head)
3580	–	{
3581	–	cidr = ptr->data;
3582	–	if (match_ipv6(ip, &cidr->mask, aclass->cidr_bitlen_ipv6))
3583	–	{
3584	–	cidr->number_on_this_cidr--;
3585	–	if (cidr->number_on_this_cidr == 0)
3586	–	{
3587	–	dlinkDelete(ptr, &aclass->list_ipv6);
3588	–	MyFree(cidr);
3589	–	return;
3590	–	}
3591	–	}
3592	–	}
3593	–	}
3594	–	#endif
3595	–	}
3596	–
3597	–	static void
3598	–	rebuild_cidr_list(int aftype, struct ConfItem *oldcl, struct ClassItem *newcl,
3599	–	dlink_list *old_list, dlink_list *new_list, int changed)
3600	–	{
3601	–	dlink_node *ptr;
3602	–	struct Client *client_p;
3603	–	struct ConfItem *conf;
3604	–	struct AccessItem *aconf;
3605	–
3606	–	if (!changed)
3607	–	{
3608	–	*new_list = *old_list;
3609	–	old_list->head = old_list->tail = NULL;
3610	–	old_list->length = 0;
3611	–	return;
3612	–	}
3613	–
3614	–	DLINK_FOREACH(ptr, local_client_list.head)
3615	–	{
3616	–	client_p = ptr->data;
3617	–	if (client_p->localClient->aftype != aftype)
3618	–	continue;
3619	–	if (dlink_list_length(&client_p->localClient->confs) == 0)
3620	–	continue;
3621	–
3622	–	conf = client_p->localClient->confs.tail->data;
3623	–	if (conf->type == CLIENT_TYPE)
3624	–	{
3625	–	aconf = map_to_conf(conf);
3626	–	if (aconf->class_ptr == oldcl)
3627	–	cidr_limit_reached(1, &client_p->localClient->ip, newcl);
3628	–	}
3629	–	}
3630	–	}
3631	–
3632	–	/*
3633	–	* rebuild_cidr_class
3634	–	*
3635	–	* inputs       - pointer to old conf
3636	–	*              - pointer to new_class
3637	–	* output       - none
3638	–	* side effects - rebuilds the class link list of cidr blocks
3639	–	*/
3640	–	void
3641	–	rebuild_cidr_class(struct ConfItem *conf, struct ClassItem *new_class)
3642	–	{
3643	–	struct ClassItem *old_class = map_to_conf(conf);
3644	–
3645	–	if (old_class->number_per_cidr > 0 && new_class->number_per_cidr > 0)
3646	–	{
3647	–	if (old_class->cidr_bitlen_ipv4 > 0 && new_class->cidr_bitlen_ipv4 > 0)
3648	–	rebuild_cidr_list(AF_INET, conf, new_class,
3649	–	&old_class->list_ipv4, &new_class->list_ipv4,
3650	–	old_class->cidr_bitlen_ipv4 != new_class->cidr_bitlen_ipv4);
3651	–
3652	–	#ifdef IPV6
3653	–	if (old_class->cidr_bitlen_ipv6 > 0 && new_class->cidr_bitlen_ipv6 > 0)
3654	–	rebuild_cidr_list(AF_INET6, conf, new_class,
3655	–	&old_class->list_ipv6, &new_class->list_ipv6,
3656	–	old_class->cidr_bitlen_ipv6 != new_class->cidr_bitlen_ipv6);
3657	–	#endif
3658	–	}
3659	–
3660	–	destroy_cidr_class(old_class);
3661	–	}
3662	–
3663	–	/*
3664	–	* destroy_cidr_list
3665	–	*
3666	–	* inputs       - pointer to class dlink list of cidr blocks
3667	–	* output       - none
3668	–	* side effects - completely destroys the class link list of cidr blocks
3669	–	*/
3670	–	static void
3671	–	destroy_cidr_list(dlink_list *list)
3672	–	{
3673	–	dlink_node *ptr = NULL, *next_ptr = NULL;
3674	–
3675	–	DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
3676	–	{
3677	–	dlinkDelete(ptr, list);
3678	–	MyFree(ptr->data);
3679	–	}
3680	–	}
3681	–
3682	–	/*
3683	–	* destroy_cidr_class
3684	–	*
3685	–	* inputs       - pointer to class
3686	–	* output       - none
3687	–	* side effects - completely destroys the class link list of cidr blocks
3688	–	*/
3689	–	static void
3690	–	destroy_cidr_class(struct ClassItem *aclass)
3691	–	{
3692	–	destroy_cidr_list(&aclass->list_ipv4);
3693	–	destroy_cidr_list(&aclass->list_ipv6);
3694	–	}

Diff Legend

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