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 1459 by michael, Fri Jul 6 14:23:09 2012 UTC vs.
ircd-hybrid/trunk/src/conf.c (file contents), Revision 6367 by michael, Wed Aug 19 10:25:00 2015 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-2015 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"
31	>	#include "conf_pseudo.h"
32	>	#include "server.h"
33		#include "resv.h"
34		#include "channel.h"
35		#include "client.h"
36		#include "event.h"
35	–	#include "hook.h"
37		#include "irc_string.h"
38		#include "s_bsd.h"
39		#include "ircd.h"
#	Line 43 | Line 44
44		#include "fdlist.h"
45		#include "log.h"
46		#include "send.h"
46	–	#include "s_gline.h"
47		#include "memory.h"
48	<	#include "irc_res.h"
48	>	#include "res.h"
49		#include "userhost.h"
50	<	#include "s_user.h"
50	>	#include "user.h"
51		#include "channel_mode.h"
52		#include "parse.h"
53	<	#include "s_misc.h"
53	>	#include "misc.h"
54	>	#include "conf_db.h"
55	>	#include "conf_class.h"
56	>	#include "motd.h"
57	>	#include "ipcache.h"
58	>	#include "isupport.h"
59
55	–	struct Callback *client_check_cb = NULL;
56	–	struct config_server_hide ConfigServerHide;
60
61	<	/* general conf items link list root, other than k lines etc. */
62	<	dlink_list service_items = { NULL, NULL, 0 };
63	<	dlink_list server_items  = { NULL, NULL, 0 };
64	<	dlink_list cluster_items = { NULL, NULL, 0 };
65	<	dlink_list oconf_items   = { NULL, NULL, 0 };
66	<	dlink_list uconf_items   = { NULL, NULL, 0 };
67	<	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 };
61	>	struct config_channel_entry ConfigChannel;
62	>	struct config_serverhide_entry ConfigServerHide;
63	>	struct config_general_entry ConfigGeneral;
64	>	struct config_log_entry ConfigLog = { .use_logging = 1 };
65	>	struct config_serverinfo_entry ConfigServerInfo;
66	>	struct config_admin_entry ConfigAdminInfo;
67	>	struct conf_parser_context conf_parser_ctx;
68
69	<	dlink_list temporary_xlines  = { NULL, NULL, 0 };
70	<	dlink_list temporary_resv = { NULL, NULL, 0 };
69	>	/* general conf items link list root, other than k lines etc. */
70	>	dlink_list service_items;
71	>	dlink_list server_items;
72	>	dlink_list cluster_items;
73	>	dlink_list oconf_items;
74	>	dlink_list uconf_items;
75	>	dlink_list xconf_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
78	–	struct conf_parser_context conf_parser_ctx = { 0, 0, NULL };
79	–
80	–	/* internally defined functions */
81	–	static void read_conf(FILE *);
82	–	static void clear_out_old_conf(void);
83	–	static void flush_deleted_I_P(void);
84	–	static void expire_tklines(dlink_list *);
85	–	static void garbage_collect_ip_entries(void);
86	–	static int hash_ip(struct irc_ssaddr *);
87	–	static int verify_access(struct Client *, const char *);
88	–	static int attach_iline(struct Client *, struct ConfItem *);
89	–	static struct ip_entry *find_or_add_ip(struct irc_ssaddr *);
90	–	static void parse_conf_file(int, int);
91	–	static dlink_list *map_to_list(ConfType);
92	–	static struct AccessItem *find_regexp_kline(const char *[]);
93	–	static int find_user_host(struct Client *, char *, char *, char *, unsigned int);
94	–
95	–	/*
96	–	* bit_len
97	–	*/
98	–	static int cidr_limit_reached(int, struct irc_ssaddr *, struct ClassItem *);
99	–	static void remove_from_cidr_check(struct irc_ssaddr *, struct ClassItem *);
100	–	static void destroy_cidr_class(struct ClassItem *);
101	–
102	–	static void flags_to_ascii(unsigned int, const unsigned int[], char *, int);
103	–
104	–	/* address of default class conf */
105	–	static struct ConfItem *class_default;
106	–
107	–	/* usually, with hash tables, you use a prime number...
108	–	* but in this case I am dealing with ip addresses,
109	–	* not ascii strings.
110	–	*/
111	–	#define IP_HASH_SIZE 0x1000
112	–
113	–	struct ip_entry
114	–	{
115	–	struct irc_ssaddr ip;
116	–	int count;
117	–	time_t last_attempt;
118	–	struct ip_entry *next;
119	–	};
120	–
121	–	static struct ip_entry *ip_hash_table[IP_HASH_SIZE];
122	–	static BlockHeap *ip_entry_heap = NULL;
123	–	static int ip_entries_count = 0;
124	–
125	–
126	–	void *
127	–	map_to_conf(struct ConfItem *aconf)
128	–	{
129	–	void *conf;
130	–	conf = (void *)((uintptr_t)aconf +
131	–	(uintptr_t)sizeof(struct ConfItem));
132	–	return(conf);
133	–	}
134	–
135	–	struct ConfItem *
136	–	unmap_conf_item(void *aconf)
137	–	{
138	–	struct ConfItem *conf;
139	–
140	–	conf = (struct ConfItem *)((uintptr_t)aconf -
141	–	(uintptr_t)sizeof(struct ConfItem));
142	–	return(conf);
143	–	}
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 153 | 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 172 | 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		{
193	–	struct ConfItem *conf = NULL;
194	–	struct AccessItem *aconf = NULL;
195	–	struct ClassItem *aclass = NULL;
196	–	int status = 0;
197	–
137		switch (type)
138		{
139	<	case DLINE_TYPE:
140	<	case EXEMPTDLINE_TYPE:
202	<	case GLINE_TYPE:
203	<	case KLINE_TYPE:
204	<	case CLIENT_TYPE:
205	<	case OPER_TYPE:
206	<	case SERVER_TYPE:
207	<	conf = MyMalloc(sizeof(struct ConfItem) +
208	<	sizeof(struct AccessItem));
209	<	aconf = map_to_conf(conf);
210	<	aconf->aftype = AF_INET;
211	<
212	<	/* Yes, sigh. switch on type again */
213	<	switch (type)
214	<	{
215	<	case EXEMPTDLINE_TYPE:
216	<	status = CONF_EXEMPTDLINE;
139	>	case CONF_XLINE:
140	>	return &xconf_items;
141		break;
142	<
143	<	case DLINE_TYPE:
220	<	status = CONF_DLINE;
221	<	break;
222	<
223	<	case KLINE_TYPE:
224	<	status = CONF_KLINE;
225	<	break;
226	<
227	<	case GLINE_TYPE:
228	<	status = CONF_GLINE;
229	<	break;
230	<
231	<	case CLIENT_TYPE:
232	<	status = CONF_CLIENT;
142	>	case CONF_ULINE:
143	>	return &uconf_items;
144		break;
145	<
146	<	case OPER_TYPE:
236	<	status = CONF_OPERATOR;
237	<	dlinkAdd(conf, &conf->node, &oconf_items);
145	>	case CONF_NRESV:
146	>	return &nresv_items;
147		break;
148	<
149	<	case SERVER_TYPE:
241	<	status = CONF_SERVER;
242	<	dlinkAdd(conf, &conf->node, &server_items);
148	>	case CONF_CRESV:
149	>	return &cresv_items;
150		break;
151	<
152	<	default:
151	>	case CONF_OPER:
152	>	return &oconf_items;
153		break;
154	<	}
155	<	aconf->status = status;
249	<	break;
250	<
251	<	case ULINE_TYPE:
252	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
253	<	sizeof(struct MatchItem));
254	<	dlinkAdd(conf, &conf->node, &uconf_items);
255	<	break;
256	<
257	<	case XLINE_TYPE:
258	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
259	<	sizeof(struct MatchItem));
260	<	dlinkAdd(conf, &conf->node, &xconf_items);
261	<	break;
262	<	#ifdef HAVE_LIBPCRE
263	<	case RXLINE_TYPE:
264	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
265	<	sizeof(struct MatchItem));
266	<	dlinkAdd(conf, &conf->node, &rxconf_items);
267	<	break;
268	<
269	<	case RKLINE_TYPE:
270	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
271	<	sizeof(struct AccessItem));
272	<	aconf = map_to_conf(conf);
273	<	aconf->status = CONF_KLINE;
274	<	dlinkAdd(conf, &conf->node, &rkconf_items);
275	<	break;
276	<	#endif
277	<	case CLUSTER_TYPE:
278	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem));
279	<	dlinkAdd(conf, &conf->node, &cluster_items);
280	<	break;
281	<
282	<	case CRESV_TYPE:
283	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
284	<	sizeof(struct ResvChannel));
285	<	break;
286	<
287	<	case NRESV_TYPE:
288	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
289	<	sizeof(struct MatchItem));
290	<	dlinkAdd(conf, &conf->node, &nresv_items);
291	<	break;
292	<
293	<	case SERVICE_TYPE:
294	<	status = CONF_SERVICE;
295	<	conf = MyMalloc(sizeof(struct ConfItem));
296	<	dlinkAdd(conf, &conf->node, &service_items);
297	<	break;
298	<
299	<	case CLASS_TYPE:
300	<	conf = MyMalloc(sizeof(struct ConfItem) +
301	<	sizeof(struct ClassItem));
302	<	dlinkAdd(conf, &conf->node, &class_items);
303	<
304	<	aclass = map_to_conf(conf);
305	<	aclass->active = 1;
306	<	aclass->con_freq = DEFAULT_CONNECTFREQUENCY;
307	<	aclass->ping_freq = DEFAULT_PINGFREQUENCY;
308	<	aclass->max_total = MAXIMUM_LINKS_DEFAULT;
309	<	aclass->max_sendq = DEFAULT_SENDQ;
310	<
311	<	break;
312	<
313	<	default:
314	<	conf = NULL;
315	<	break;
316	<	}
317	<
318	<	/* XXX Yes, this will core if default is hit. I want it to for now - db */
319	<	conf->type = type;
320	<
321	<	return conf;
322	<	}
323	<
324	<	void
325	<	delete_conf_item(struct ConfItem *conf)
326	<	{
327	<	dlink_node *m = NULL, *m_next = NULL;
328	<	struct MatchItem *match_item;
329	<	struct AccessItem *aconf;
330	<	ConfType type = conf->type;
331	<
332	<	MyFree(conf->name);
333	<	conf->name = NULL;
334	<
335	<	switch(type)
336	<	{
337	<	case DLINE_TYPE:
338	<	case EXEMPTDLINE_TYPE:
339	<	case GLINE_TYPE:
340	<	case KLINE_TYPE:
341	<	case CLIENT_TYPE:
342	<	case OPER_TYPE:
343	<	case SERVER_TYPE:
344	<	aconf = map_to_conf(conf);
345	<
346	<	if (aconf->dns_pending)
347	<	delete_resolver_queries(aconf);
348	<	if (aconf->passwd != NULL)
349	<	memset(aconf->passwd, 0, strlen(aconf->passwd));
350	<	if (aconf->spasswd != NULL)
351	<	memset(aconf->spasswd, 0, strlen(aconf->spasswd));
352	<	aconf->class_ptr = NULL;
353	<
354	<	MyFree(aconf->passwd);
355	<	MyFree(aconf->spasswd);
356	<	MyFree(aconf->reason);
357	<	MyFree(aconf->oper_reason);
358	<	MyFree(aconf->user);
359	<	MyFree(aconf->host);
360	<	#ifdef HAVE_LIBCRYPTO
361	<	MyFree(aconf->cipher_list);
362	<
363	<	if (aconf->rsa_public_key)
364	<	RSA_free(aconf->rsa_public_key);
365	<	MyFree(aconf->rsa_public_key_file);
366	<	#endif
367	<
368	<	/* Yes, sigh. switch on type again */
369	<	switch(type)
370	<	{
371	<	case EXEMPTDLINE_TYPE:
372	<	case DLINE_TYPE:
373	<	case GLINE_TYPE:
374	<	case KLINE_TYPE:
375	<	case CLIENT_TYPE:
376	<	MyFree(conf);
154	>	case CONF_SERVER:
155	>	return &server_items;
156		break;
157	<
158	<	case OPER_TYPE:
380	<	aconf = map_to_conf(conf);
381	<	if (!IsConfIllegal(aconf))
382	<	dlinkDelete(&conf->node, &oconf_items);
383	<	MyFree(conf);
157	>	case CONF_SERVICE:
158	>	return &service_items;
159		break;
160	<
161	<	case SERVER_TYPE:
387	<	aconf = map_to_conf(conf);
388	<
389	<	DLINK_FOREACH_SAFE(m, m_next, aconf->hub_list.head)
390	<	{
391	<	MyFree(m->data);
392	<	free_dlink_node(m);
393	<	}
394	<
395	<	DLINK_FOREACH_SAFE(m, m_next, aconf->leaf_list.head)
396	<	{
397	<	MyFree(m->data);
398	<	free_dlink_node(m);
399	<	}
400	<
401	<	if (!IsConfIllegal(aconf))
402	<	dlinkDelete(&conf->node, &server_items);
403	<	MyFree(conf);
160	>	case CONF_CLUSTER:
161	>	return &cluster_items;
162		break;
405	–
163		default:
164	<	break;
408	<	}
409	<	break;
410	<
411	<	case ULINE_TYPE:
412	<	match_item = map_to_conf(conf);
413	<	MyFree(match_item->user);
414	<	MyFree(match_item->host);
415	<	MyFree(match_item->reason);
416	<	MyFree(match_item->oper_reason);
417	<	dlinkDelete(&conf->node, &uconf_items);
418	<	MyFree(conf);
419	<	break;
420	<
421	<	case XLINE_TYPE:
422	<	match_item = map_to_conf(conf);
423	<	MyFree(match_item->user);
424	<	MyFree(match_item->host);
425	<	MyFree(match_item->reason);
426	<	MyFree(match_item->oper_reason);
427	<	dlinkDelete(&conf->node, &xconf_items);
428	<	MyFree(conf);
429	<	break;
430	<	#ifdef HAVE_LIBPCRE
431	<	case RKLINE_TYPE:
432	<	aconf = map_to_conf(conf);
433	<	MyFree(aconf->regexuser);
434	<	MyFree(aconf->regexhost);
435	<	MyFree(aconf->user);
436	<	MyFree(aconf->host);
437	<	MyFree(aconf->reason);
438	<	MyFree(aconf->oper_reason);
439	<	dlinkDelete(&conf->node, &rkconf_items);
440	<	MyFree(conf);
441	<	break;
442	<
443	<	case RXLINE_TYPE:
444	<	MyFree(conf->regexpname);
445	<	match_item = map_to_conf(conf);
446	<	MyFree(match_item->user);
447	<	MyFree(match_item->host);
448	<	MyFree(match_item->reason);
449	<	MyFree(match_item->oper_reason);
450	<	dlinkDelete(&conf->node, &rxconf_items);
451	<	MyFree(conf);
452	<	break;
453	<	#endif
454	<	case NRESV_TYPE:
455	<	match_item = map_to_conf(conf);
456	<	MyFree(match_item->user);
457	<	MyFree(match_item->host);
458	<	MyFree(match_item->reason);
459	<	MyFree(match_item->oper_reason);
460	<	dlinkDelete(&conf->node, &nresv_items);
461	<
462	<	if (conf->flags & CONF_FLAGS_TEMPORARY)
463	<	if ((m = dlinkFindDelete(&temporary_resv, conf)) != NULL)
464	<	free_dlink_node(m);
465	<
466	<	MyFree(conf);
467	<	break;
468	<
469	<	case CLUSTER_TYPE:
470	<	dlinkDelete(&conf->node, &cluster_items);
471	<	MyFree(conf);
472	<	break;
473	<
474	<	case CRESV_TYPE:
475	<	if (conf->flags & CONF_FLAGS_TEMPORARY)
476	<	if ((m = dlinkFindDelete(&temporary_resv, conf)) != NULL)
477	<	free_dlink_node(m);
478	<
479	<	MyFree(conf);
480	<	break;
481	<
482	<	case CLASS_TYPE:
483	<	dlinkDelete(&conf->node, &class_items);
484	<	MyFree(conf);
485	<	break;
486	<
487	<	case SERVICE_TYPE:
488	<	dlinkDelete(&conf->node, &service_items);
489	<	MyFree(conf);
490	<	break;
491	<
492	<	default:
493	<	break;
164	>	return NULL;
165		}
166		}
167
168	<	/* free_access_item()
169	<	*
499	<	* inputs       - pointer to conf to free
500	<	* output       - none
501	<	* side effects - crucial password fields are zeroed, conf is freed
502	<	*/
503	<	void
504	<	free_access_item(struct AccessItem *aconf)
168	>	struct MaskItem *
169	>	conf_make(enum maskitem_type type)
170		{
171	<	struct ConfItem *conf;
171	>	struct MaskItem *const conf = MyCalloc(sizeof(*conf));
172	>	dlink_list *list = NULL;
173
174	<	if (aconf == NULL)
175	<	return;
176	<	conf = unmap_conf_item(aconf);
511	<	delete_conf_item(conf);
512	<	}
174	>	conf->type   = type;
175	>	conf->active = 1;
176	>	conf->aftype = AF_INET;
177
178	<	static const unsigned int shared_bit_table[] =
179	<	{ 'K', 'k', 'U', 'X', 'x', 'Y', 'Q', 'q', 'R', 'L', 0};
178	>	if ((list = map_to_list(type)))
179	>	dlinkAdd(conf, &conf->node, list);
180	>	return conf;
181	>	}
182
517	–	/* report_confitem_types()
518	–	*
519	–	* inputs       - pointer to client requesting confitem report
520	–	*              - ConfType to report
521	–	* output       - none
522	–	* side effects -
523	–	*/
183		void
184	<	report_confitem_types(struct Client *source_p, ConfType type)
184	>	conf_free(struct MaskItem *conf)
185		{
186	<	dlink_node *ptr = NULL, *dptr = NULL;
187	<	struct ConfItem *conf = NULL;
529	<	struct AccessItem *aconf = NULL;
530	<	struct MatchItem *matchitem = NULL;
531	<	struct ClassItem *classitem = NULL;
532	<	char buf[12];
533	<	char *p = NULL;
186	>	dlink_node *node = NULL, *node_next = NULL;
187	>	dlink_list *list = NULL;
188
189	<	switch (type)
190	<	{
537	<	case XLINE_TYPE:
538	<	DLINK_FOREACH(ptr, xconf_items.head)
539	<	{
540	<	conf = ptr->data;
541	<	matchitem = map_to_conf(conf);
189	>	if ((list = map_to_list(conf->type)))
190	>	dlinkFindDelete(list, conf);
191
192	<	sendto_one(source_p, form_str(RPL_STATSXLINE),
544	<	me.name, source_p->name,
545	<	matchitem->hold ? "x": "X", matchitem->count,
546	<	conf->name, matchitem->reason);
547	<	}
548	<	break;
549	<
550	<	#ifdef HAVE_LIBPCRE
551	<	case RXLINE_TYPE:
552	<	DLINK_FOREACH(ptr, rxconf_items.head)
553	<	{
554	<	conf = ptr->data;
555	<	matchitem = map_to_conf(conf);
556	<
557	<	sendto_one(source_p, form_str(RPL_STATSXLINE),
558	<	me.name, source_p->name,
559	<	"XR", matchitem->count,
560	<	conf->name, matchitem->reason);
561	<	}
562	<	break;
192	>	MyFree(conf->name);
193
194	<	case RKLINE_TYPE:
195	<	DLINK_FOREACH(ptr, rkconf_items.head)
196	<	{
197	<	aconf = map_to_conf((conf = ptr->data));
194	>	if (conf->dns_pending)
195	>	delete_resolver_queries(conf);
196	>	if (conf->passwd)
197	>	memset(conf->passwd, 0, strlen(conf->passwd));
198	>	if (conf->spasswd)
199	>	memset(conf->spasswd, 0, strlen(conf->spasswd));
200	>
201	>	conf->class = NULL;
202	>
203	>	MyFree(conf->passwd);
204	>	MyFree(conf->spasswd);
205	>	MyFree(conf->reason);
206	>	MyFree(conf->certfp);
207	>	MyFree(conf->whois);
208	>	MyFree(conf->user);
209	>	MyFree(conf->host);
210	>	#ifdef HAVE_LIBCRYPTO
211	>	MyFree(conf->cipher_list);
212
213	<	sendto_one(source_p, form_str(RPL_STATSKLINE), me.name,
214	<	source_p->name, "KR", aconf->host, aconf->user,
571	<	aconf->reason, aconf->oper_reason ? aconf->oper_reason : "");
572	<	}
573	<	break;
213	>	if (conf->rsa_public_key)
214	>	RSA_free(conf->rsa_public_key);
215		#endif
216	<
576	<	case ULINE_TYPE:
577	<	DLINK_FOREACH(ptr, uconf_items.head)
578	<	{
579	<	conf = ptr->data;
580	<	matchitem = map_to_conf(conf);
581	<
582	<	p = buf;
583	<
584	<	/* some of these are redundant for the sake of
585	<	* consistency with cluster{} flags
586	<	*/
587	<	*p++ = 'c';
588	<	flags_to_ascii(matchitem->action, shared_bit_table, p, 0);
589	<
590	<	sendto_one(source_p, form_str(RPL_STATSULINE),
591	<	me.name, source_p->name, conf->name,
592	<	matchitem->user?matchitem->user: "*",
593	<	matchitem->host?matchitem->host: "*", buf);
594	<	}
595	<
596	<	DLINK_FOREACH(ptr, cluster_items.head)
597	<	{
598	<	conf = ptr->data;
599	<
600	<	p = buf;
601	<
602	<	*p++ = 'C';
603	<	flags_to_ascii(conf->flags, shared_bit_table, p, 0);
604	<
605	<	sendto_one(source_p, form_str(RPL_STATSULINE),
606	<	me.name, source_p->name, conf->name,
607	<	"*", "*", buf);
608	<	}
609	<
610	<	break;
611	<
612	<	case OPER_TYPE:
613	<	DLINK_FOREACH(ptr, oconf_items.head)
614	<	{
615	<	conf = ptr->data;
616	<	aconf = map_to_conf(conf);
617	<
618	<	/* Don't allow non opers to see oper privs */
619	<	if (HasUMode(source_p, UMODE_OPER))
620	<	sendto_one(source_p, form_str(RPL_STATSOLINE),
621	<	me.name, source_p->name, 'O', aconf->user, aconf->host,
622	<	conf->name, oper_privs_as_string(aconf->port),
623	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
624	<	else
625	<	sendto_one(source_p, form_str(RPL_STATSOLINE),
626	<	me.name, source_p->name, 'O', aconf->user, aconf->host,
627	<	conf->name, "0",
628	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
629	<	}
630	<	break;
631	<
632	<	case CLASS_TYPE:
633	<	DLINK_FOREACH(ptr, class_items.head)
634	<	{
635	<	conf = ptr->data;
636	<	classitem = map_to_conf(conf);
637	<	sendto_one(source_p, form_str(RPL_STATSYLINE),
638	<	me.name, source_p->name, 'Y',
639	<	conf->name, classitem->ping_freq,
640	<	classitem->con_freq,
641	<	classitem->max_total, classitem->max_sendq,
642	<	classitem->curr_user_count,
643	<	classitem->number_per_cidr, classitem->cidr_bitlen_ipv4,
644	<	classitem->number_per_cidr, classitem->cidr_bitlen_ipv6,
645	<	classitem->active ? "active" : "disabled");
646	<	}
647	<	break;
648	<
649	<	case CONF_TYPE:
650	<	case CLIENT_TYPE:
651	<	break;
652	<
653	<	case SERVICE_TYPE:
654	<	DLINK_FOREACH(ptr, service_items.head)
655	<	{
656	<	conf = ptr->data;
657	<	sendto_one(source_p, form_str(RPL_STATSSERVICE),
658	<	me.name, source_p->name, 'S', "*", conf->name, 0, 0);
659	<	}
660	<	break;
661	<
662	<	case SERVER_TYPE:
663	<	DLINK_FOREACH(ptr, server_items.head)
664	<	{
665	<	p = buf;
666	<
667	<	conf = ptr->data;
668	<	aconf = map_to_conf(conf);
669	<
670	<	buf[0] = '\0';
671	<
672	<	if (IsConfAllowAutoConn(aconf))
673	<	*p++ = 'A';
674	<	if (IsConfSSL(aconf))
675	<	*p++ = 'S';
676	<	if (IsConfTopicBurst(aconf))
677	<	*p++ = 'T';
678	<	if (buf[0] == '\0')
679	<	*p++ = '*';
680	<
681	<	*p = '\0';
682	<
683	<	/*
684	<	* Allow admins to see actual ips unless hide_server_ips is enabled
685	<	*/
686	<	if (!ConfigServerHide.hide_server_ips && HasUMode(source_p, UMODE_ADMIN))
687	<	sendto_one(source_p, form_str(RPL_STATSCLINE),
688	<	me.name, source_p->name, 'C', aconf->host,
689	<	buf, conf->name, aconf->port,
690	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
691	<	else
692	<	sendto_one(source_p, form_str(RPL_STATSCLINE),
693	<	me.name, source_p->name, 'C',
694	<	"*@127.0.0.1", buf, conf->name, aconf->port,
695	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
696	<	}
697	<	break;
698	<
699	<	case HUB_TYPE:
700	<	DLINK_FOREACH(ptr, server_items.head)
701	<	{
702	<	conf = ptr->data;
703	<	aconf = map_to_conf(conf);
704	<
705	<	DLINK_FOREACH(dptr, aconf->hub_list.head)
706	<	sendto_one(source_p, form_str(RPL_STATSHLINE), me.name,
707	<	source_p->name, 'H', dptr->data, conf->name, 0, "*");
708	<	}
709	<	break;
710	<
711	<	case LEAF_TYPE:
712	<	DLINK_FOREACH(ptr, server_items.head)
713	<	{
714	<	conf = ptr->data;
715	<	aconf = map_to_conf(conf);
716	<
717	<	DLINK_FOREACH(dptr, aconf->leaf_list.head)
718	<	sendto_one(source_p, form_str(RPL_STATSLLINE), me.name,
719	<	source_p->name, 'L', dptr->data, conf->name, 0, "*");
720	<	}
721	<	break;
722	<
723	<	case GLINE_TYPE:
724	<	case KLINE_TYPE:
725	<	case DLINE_TYPE:
726	<	case EXEMPTDLINE_TYPE:
727	<	case CRESV_TYPE:
728	<	case NRESV_TYPE:
729	<	case CLUSTER_TYPE:
730	<	default:
731	<	break;
732	<	}
733	<	}
734	<
735	<	/* check_client()
736	<	*
737	<	* inputs       - pointer to client
738	<	* output       - 0 = Success
739	<	*                NOT_AUTHORIZED    (-1) = Access denied (no I line match)
740	<	*                IRCD_SOCKET_ERROR (-2) = Bad socket.
741	<	*                I_LINE_FULL       (-3) = I-line is full
742	<	*                TOO_MANY          (-4) = Too many connections from hostname
743	<	*                BANNED_CLIENT     (-5) = K-lined
744	<	* side effects - Ordinary client access check.
745	<	*                Look for conf lines which have the same
746	<	*                status as the flags passed.
747	<	*/
748	<	static void *
749	<	check_client(va_list args)
750	<	{
751	<	struct Client *source_p = va_arg(args, struct Client *);
752	<	const char *username = va_arg(args, const char *);
753	<	int i;
754	<
755	<	/* I'm already in big trouble if source_p->localClient is NULL -db */
756	<	if ((i = verify_access(source_p, username)))
757	<	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
758	<	source_p->name, source_p->sockhost);
759	<
760	<	switch (i)
216	>	DLINK_FOREACH_SAFE(node, node_next, conf->hub_list.head)
217		{
218	<	case TOO_MANY:
219	<	sendto_realops_flags(UMODE_FULL, L_ALL,
220	<	"Too many on IP for %s (%s).",
765	<	get_client_name(source_p, SHOW_IP),
766	<	source_p->sockhost);
767	<	ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
768	<	get_client_name(source_p, SHOW_IP));
769	<	++ServerStats.is_ref;
770	<	exit_client(source_p, &me, "No more connections allowed on that IP");
771	<	break;
772	<
773	<	case I_LINE_FULL:
774	<	sendto_realops_flags(UMODE_FULL, L_ALL,
775	<	"I-line is full for %s (%s).",
776	<	get_client_name(source_p, SHOW_IP),
777	<	source_p->sockhost);
778	<	ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
779	<	get_client_name(source_p, SHOW_IP));
780	<	++ServerStats.is_ref;
781	<	exit_client(source_p, &me,
782	<	"No more connections allowed in your connection class");
783	<	break;
784	<
785	<	case NOT_AUTHORIZED:
786	<	++ServerStats.is_ref;
787	<	/* jdc - lists server name & port connections are on */
788	<	/*       a purely cosmetical change */
789	<	sendto_realops_flags(UMODE_UNAUTH, L_ALL,
790	<	"Unauthorized client connection from %s [%s] on [%s/%u].",
791	<	get_client_name(source_p, SHOW_IP),
792	<	source_p->sockhost,
793	<	source_p->localClient->listener->name,
794	<	source_p->localClient->listener->port);
795	<	ilog(LOG_TYPE_IRCD,
796	<	"Unauthorized client connection from %s on [%s/%u].",
797	<	get_client_name(source_p, SHOW_IP),
798	<	source_p->localClient->listener->name,
799	<	source_p->localClient->listener->port);
800	<
801	<	/* XXX It is prolematical whether it is better to use the
802	<	* capture reject code here or rely on the connecting too fast code.
803	<	* - Dianora
804	<	*/
805	<	if (REJECT_HOLD_TIME > 0)
806	<	{
807	<	sendto_one(source_p, ":%s NOTICE %s :You are not authorized to use this server",
808	<	me.name, source_p->name);
809	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
810	<	SetCaptured(source_p);
811	<	}
812	<	else
813	<	exit_client(source_p, &me, "You are not authorized to use this server");
814	<	break;
815	<
816	<	case BANNED_CLIENT:
817	<	/*
818	<	* Don't exit them immediately, play with them a bit.
819	<	* - Dianora
820	<	*/
821	<	if (REJECT_HOLD_TIME > 0)
822	<	{
823	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
824	<	SetCaptured(source_p);
825	<	}
826	<	else
827	<	exit_client(source_p, &me, "Banned");
828	<	++ServerStats.is_ref;
829	<	break;
830	<
831	<	case 0:
832	<	default:
833	<	break;
218	>	MyFree(node->data);
219	>	dlinkDelete(node, &conf->hub_list);
220	>	free_dlink_node(node);
221		}
222
223	<	return (i < 0 ? NULL : source_p);
837	<	}
838	<
839	<	/* verify_access()
840	<	*
841	<	* inputs       - pointer to client to verify
842	<	*              - pointer to proposed username
843	<	* output       - 0 if success -'ve if not
844	<	* side effect  - find the first (best) I line to attach.
845	<	*/
846	<	static int
847	<	verify_access(struct Client *client_p, const char *username)
848	<	{
849	<	struct AccessItem *aconf = NULL, *rkconf = NULL;
850	<	struct ConfItem *conf = NULL;
851	<	char non_ident[USERLEN + 1] = { '~', '\0' };
852	<	const char *uhi[3];
853	<
854	<	if (IsGotId(client_p))
855	<	{
856	<	aconf = find_address_conf(client_p->host, client_p->username,
857	<	&client_p->localClient->ip,
858	<	client_p->localClient->aftype,
859	<	client_p->localClient->passwd);
860	<	}
861	<	else
223	>	DLINK_FOREACH_SAFE(node, node_next, conf->leaf_list.head)
224		{
225	<	strlcpy(non_ident+1, username, sizeof(non_ident)-1);
226	<	aconf = find_address_conf(client_p->host,non_ident,
227	<	&client_p->localClient->ip,
866	<	client_p->localClient->aftype,
867	<	client_p->localClient->passwd);
225	>	MyFree(node->data);
226	>	dlinkDelete(node, &conf->leaf_list);
227	>	free_dlink_node(node);
228		}
229
230	<	uhi[0] = IsGotId(client_p) ? client_p->username : non_ident;
871	<	uhi[1] = client_p->host;
872	<	uhi[2] = client_p->sockhost;
873	<
874	<	rkconf = find_regexp_kline(uhi);
875	<
876	<	if (aconf != NULL)
230	>	DLINK_FOREACH_SAFE(node, node_next, conf->exempt_list.head)
231		{
232	<	if (IsConfClient(aconf) && !rkconf)
879	<	{
880	<	conf = unmap_conf_item(aconf);
881	<
882	<	if (IsConfRedir(aconf))
883	<	{
884	<	sendto_one(client_p, form_str(RPL_REDIR),
885	<	me.name, client_p->name,
886	<	conf->name ? conf->name : "",
887	<	aconf->port);
888	<	return(NOT_AUTHORIZED);
889	<	}
890	<
891	<	if (IsConfDoIdentd(aconf))
892	<	SetNeedId(client_p);
232	>	struct exempt *exptr = node->data;
233
234	<	/* Thanks for spoof idea amm */
235	<	if (IsConfDoSpoofIp(aconf))
236	<	{
237	<	conf = unmap_conf_item(aconf);
238	<
899	<	if (!ConfigFileEntry.hide_spoof_ips && IsConfSpoofNotice(aconf))
900	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "%s spoofing: %s as %s",
901	<	client_p->name, client_p->host, conf->name);
902	<	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
903	<	SetIPSpoof(client_p);
904	<	}
905	<
906	<	return(attach_iline(client_p, conf));
907	<	}
908	<	else if (rkconf || IsConfKill(aconf) || (ConfigFileEntry.glines && IsConfGline(aconf)))
909	<	{
910	<	/* XXX */
911	<	aconf = rkconf ? rkconf : aconf;
912	<	if (IsConfGline(aconf))
913	<	sendto_one(client_p, ":%s NOTICE %s :*** G-lined", me.name,
914	<	client_p->name);
915	<	if (ConfigFileEntry.kline_with_reason)
916	<	sendto_one(client_p, ":%s NOTICE %s :*** Banned %s",
917	<	me.name, client_p->name, aconf->reason);
918	<	return(BANNED_CLIENT);
919	<	}
234	>	dlinkDelete(node, &conf->exempt_list);
235	>	MyFree(exptr->name);
236	>	MyFree(exptr->user);
237	>	MyFree(exptr->host);
238	>	MyFree(exptr);
239		}
240
241	<	return(NOT_AUTHORIZED);
241	>	MyFree(conf);
242		}
243
244		/* attach_iline()
245		*
246	<	* inputs       - client pointer
247	<	*              - conf pointer
248	<	* output       -
249	<	* side effects - do actual attach
246	>	* inputs       - client pointer
247	>	*              - conf pointer
248	>	* output       -
249	>	* side effects - do actual attach
250		*/
251		static int
252	<	attach_iline(struct Client *client_p, struct ConfItem *conf)
252	>	attach_iline(struct Client *client_p, struct MaskItem *conf)
253		{
254	<	struct AccessItem *aconf;
936	<	struct ClassItem *aclass;
254	>	const struct ClassItem *const class = conf->class;
255		struct ip_entry *ip_found;
256		int a_limit_reached = 0;
257	<	int local = 0, global = 0, ident = 0;
257	>	unsigned int local = 0, global = 0, ident = 0;
258
259	<	ip_found = find_or_add_ip(&client_p->localClient->ip);
259	>	ip_found = ipcache_find_or_add_address(&client_p->connection->ip);
260		ip_found->count++;
261	<	SetIpHash(client_p);
944	<
945	<	aconf = map_to_conf(conf);
946	<	if (aconf->class_ptr == NULL)
947	<	return NOT_AUTHORIZED;  /* If class is missing, this is best */
948	<
949	<	aclass = map_to_conf(aconf->class_ptr);
261	>	AddFlag(client_p, FLAGS_IPHASH);
262
263		count_user_host(client_p->username, client_p->host,
264		&global, &local, &ident);
#	Line 955 | Line 267 | attach_iline(struct Client *client_p, st
267		* setting a_limit_reached if any limit is reached.
268		* - Dianora
269		*/
270	<	if (aclass->max_total != 0 && aclass->curr_user_count >= aclass->max_total)
270	>	if (class->max_total && class->ref_count >= class->max_total)
271		a_limit_reached = 1;
272	<	else if (aclass->max_perip != 0 && ip_found->count > aclass->max_perip)
272	>	else if (class->max_perip && ip_found->count > class->max_perip)
273		a_limit_reached = 1;
274	<	else if (aclass->max_local != 0 && local >= aclass->max_local)
274	>	else if (class->max_local && local >= class->max_local)
275		a_limit_reached = 1;
276	<	else if (aclass->max_global != 0 && global >= aclass->max_global)
276	>	else if (class->max_global && global >= class->max_global)
277		a_limit_reached = 1;
278	<	else if (aclass->max_ident != 0 && ident >= aclass->max_ident &&
278	>	else if (class->max_ident && ident >= class->max_ident &&
279		client_p->username[0] != '~')
280		a_limit_reached = 1;
281
282		if (a_limit_reached)
283		{
284	<	if (!IsConfExemptLimits(aconf))
284	>	if (!IsConfExemptLimits(conf))
285		return TOO_MANY;   /* Already at maximum allowed */
286
287	<	sendto_one(client_p,
288	<	":%s NOTICE %s :*** Your connection class is full, "
977	<	"but you have exceed_limit = yes;", me.name, client_p->name);
287	>	sendto_one_notice(client_p, &me, ":*** Your connection class is full, "
288	>	"but you have exceed_limit = yes;");
289		}
290
291		return attach_conf(client_p, conf);
292		}
293
294	<	/* init_ip_hash_table()
984	<	*
985	<	* inputs               - NONE
986	<	* output               - NONE
987	<	* side effects         - allocate memory for ip_entry(s)
988	<	*                      - clear the ip hash table
989	<	*/
990	<	void
991	<	init_ip_hash_table(void)
992	<	{
993	<	ip_entry_heap = BlockHeapCreate("ip", sizeof(struct ip_entry),
994	<	2 * hard_fdlimit);
995	<	memset(ip_hash_table, 0, sizeof(ip_hash_table));
996	<	}
997	<
998	<	/* find_or_add_ip()
999	<	*
1000	<	* inputs       - pointer to struct irc_ssaddr
1001	<	* output       - pointer to a struct ip_entry
1002	<	* side effects -
294	>	/* verify_access()
295		*
296	<	* If the ip # was not found, a new struct ip_entry is created, and the ip
297	<	* count set to 0.
296	>	* inputs       - pointer to client to verify
297	>	* output       - 0 if success -'ve if not
298	>	* side effect  - find the first (best) I line to attach.
299		*/
300	<	static struct ip_entry *
301	<	find_or_add_ip(struct irc_ssaddr *ip_in)
300	>	static int
301	>	verify_access(struct Client *client_p)
302		{
303	<	struct ip_entry *ptr, *newptr;
1011	<	int hash_index = hash_ip(ip_in), res;
1012	<	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
1013	<	#ifdef IPV6
1014	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
1015	<	#endif
303	>	struct MaskItem *conf = NULL;
304
305	<	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
305	>	if (HasFlag(client_p, FLAGS_GOTID))
306		{
307	<	#ifdef IPV6
308	<	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
309	<	continue;
310	<	if (ip_in->ss.ss_family == AF_INET6)
1023	<	{
1024	<	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
1025	<	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
1026	<	}
1027	<	else
1028	<	#endif
1029	<	{
1030	<	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
1031	<	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
1032	<	}
1033	<	if (res == 0)
1034	<	{
1035	<	/* Found entry already in hash, return it. */
1036	<	return ptr;
1037	<	}
307	>	conf = find_address_conf(client_p->host, client_p->username,
308	>	&client_p->connection->ip,
309	>	client_p->connection->aftype,
310	>	client_p->connection->password);
311		}
312	+	else
313	+	{
314	+	char non_ident[USERLEN + 1] = "~";
315
316	<	if (ip_entries_count >= 2 * hard_fdlimit)
317	<	garbage_collect_ip_entries();
318	<
319	<	newptr = BlockHeapAlloc(ip_entry_heap);
320	<	ip_entries_count++;
321	<	memcpy(&newptr->ip, ip_in, sizeof(struct irc_ssaddr));
1046	<
1047	<	newptr->next = ip_hash_table[hash_index];
1048	<	ip_hash_table[hash_index] = newptr;
316	>	strlcpy(non_ident + 1, client_p->username, sizeof(non_ident) - 1);
317	>	conf = find_address_conf(client_p->host, non_ident,
318	>	&client_p->connection->ip,
319	>	client_p->connection->aftype,
320	>	client_p->connection->password);
321	>	}
322
323	<	return newptr;
324	<	}
323	>	if (!conf)
324	>	return NOT_AUTHORIZED;
325
326	<	/* remove_one_ip()
1054	<	*
1055	<	* inputs        - unsigned long IP address value
1056	<	* output        - NONE
1057	<	* side effects  - The ip address given, is looked up in ip hash table
1058	<	*                 and number of ip#'s for that ip decremented.
1059	<	*                 If ip # count reaches 0 and has expired,
1060	<	*                 the struct ip_entry is returned to the ip_entry_heap
1061	<	*/
1062	<	void
1063	<	remove_one_ip(struct irc_ssaddr *ip_in)
1064	<	{
1065	<	struct ip_entry *ptr;
1066	<	struct ip_entry *last_ptr = NULL;
1067	<	int hash_index = hash_ip(ip_in), res;
1068	<	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
1069	<	#ifdef IPV6
1070	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
1071	<	#endif
326	>	assert(IsConfClient(conf) || IsConfKill(conf));
327
328	<	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
328	>	if (IsConfClient(conf))
329		{
330	<	#ifdef IPV6
1076	<	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
1077	<	continue;
1078	<	if (ip_in->ss.ss_family == AF_INET6)
1079	<	{
1080	<	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
1081	<	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
1082	<	}
1083	<	else
1084	<	#endif
330	>	if (IsConfRedir(conf))
331		{
332	<	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
333	<	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
332	>	sendto_one_numeric(client_p, &me, RPL_REDIR,
333	>	conf->name ? conf->name : "",
334	>	conf->port);
335	>	return NOT_AUTHORIZED;
336		}
337	<	if (res)
338	<	continue;
1091	<	if (ptr->count > 0)
1092	<	ptr->count--;
1093	<	if (ptr->count == 0 &&
1094	<	(CurrentTime-ptr->last_attempt) >= ConfigFileEntry.throttle_time)
337	>
338	>	if (IsConfDoSpoofIp(conf))
339		{
340	<	if (last_ptr != NULL)
341	<	last_ptr->next = ptr->next;
342	<	else
1099	<	ip_hash_table[hash_index] = ptr->next;
340	>	if (IsConfSpoofNotice(conf))
341	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE, "%s spoofing: %s as %s",
342	>	client_p->name, client_p->host, conf->name);
343
344	<	BlockHeapFree(ip_entry_heap, ptr);
1102	<	ip_entries_count--;
1103	<	return;
344	>	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
345		}
1105	–	last_ptr = ptr;
1106	–	}
1107	–	}
346
347	<	/* hash_ip()
1110	<	*
1111	<	* input        - pointer to an irc_inaddr
1112	<	* output       - integer value used as index into hash table
1113	<	* side effects - hopefully, none
1114	<	*/
1115	<	static int
1116	<	hash_ip(struct irc_ssaddr *addr)
1117	<	{
1118	<	if (addr->ss.ss_family == AF_INET)
1119	<	{
1120	<	struct sockaddr_in *v4 = (struct sockaddr_in *)addr;
1121	<	int hash;
1122	<	uint32_t ip;
1123	<
1124	<	ip   = ntohl(v4->sin_addr.s_addr);
1125	<	hash = ((ip >> 12) + ip) & (IP_HASH_SIZE-1);
1126	<	return hash;
1127	<	}
1128	<	#ifdef IPV6
1129	<	else
1130	<	{
1131	<	int hash;
1132	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)addr;
1133	<	uint32_t *ip = (uint32_t *)&v6->sin6_addr.s6_addr;
1134	<
1135	<	hash  = ip[0] ^ ip[3];
1136	<	hash ^= hash >> 16;
1137	<	hash ^= hash >> 8;
1138	<	hash  = hash & (IP_HASH_SIZE - 1);
1139	<	return hash;
347	>	return attach_iline(client_p, conf);
348		}
349	<	#else
350	<	return 0;
351	<	#endif
349	>
350	>	sendto_one_notice(client_p, &me, ":*** Banned: %s", conf->reason);
351	>	return BANNED_CLIENT;
352		}
353
354	<	/* count_ip_hash()
1147	<	*
1148	<	* inputs        - pointer to counter of number of ips hashed
1149	<	*               - pointer to memory used for ip hash
1150	<	* output        - returned via pointers input
1151	<	* side effects  - NONE
354	>	/* check_client()
355		*
356	<	* number of hashed ip #'s is counted up, plus the amount of memory
357	<	* used in the hash.
356	>	* inputs       - pointer to client
357	>	* output       - 0 = Success
358	>	*                NOT_AUTHORIZED    (-1) = Access denied (no I line match)
359	>	*                IRCD_SOCKET_ERROR (-2) = Bad socket.
360	>	*                I_LINE_FULL       (-3) = I-line is full
361	>	*                TOO_MANY          (-4) = Too many connections from hostname
362	>	*                BANNED_CLIENT     (-5) = K-lined
363	>	* side effects - Ordinary client access check.
364	>	*                Look for conf lines which have the same
365	>	*                status as the flags passed.
366		*/
367	<	void
368	<	count_ip_hash(unsigned int *number_ips_stored, uint64_t *mem_ips_stored)
367	>	int
368	>	check_client(struct Client *source_p)
369		{
1159	–	struct ip_entry *ptr;
370		int i;
371
372	<	*number_ips_stored = 0;
373	<	*mem_ips_stored    = 0;
372	>	if ((i = verify_access(source_p)))
373	>	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
374	>	source_p->name, source_p->sockhost);
375
376	<	for (i = 0; i < IP_HASH_SIZE; i++)
376	>	switch (i)
377		{
378	<	for (ptr = ip_hash_table[i]; ptr; ptr = ptr->next)
379	<	{
380	<	*number_ips_stored += 1;
381	<	*mem_ips_stored += sizeof(struct ip_entry);
382	<	}
383	<	}
384	<	}
378	>	case TOO_MANY:
379	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
380	>	"Too many on IP for %s (%s).",
381	>	get_client_name(source_p, SHOW_IP),
382	>	source_p->sockhost);
383	>	ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
384	>	get_client_name(source_p, SHOW_IP));
385	>	++ServerStats.is_ref;
386	>	exit_client(source_p, "No more connections allowed on that IP");
387	>	break;
388
389	<	/* garbage_collect_ip_entries()
390	<	*
391	<	* input        - NONE
392	<	* output       - NONE
393	<	* side effects - free up all ip entries with no connections
394	<	*/
395	<	static void
396	<	garbage_collect_ip_entries(void)
397	<	{
398	<	struct ip_entry *ptr;
1185	<	struct ip_entry *last_ptr;
1186	<	struct ip_entry *next_ptr;
1187	<	int i;
389	>	case I_LINE_FULL:
390	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
391	>	"auth {} block is full for %s (%s).",
392	>	get_client_name(source_p, SHOW_IP),
393	>	source_p->sockhost);
394	>	ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
395	>	get_client_name(source_p, SHOW_IP));
396	>	++ServerStats.is_ref;
397	>	exit_client(source_p, "No more connections allowed in your connection class");
398	>	break;
399
400	<	for (i = 0; i < IP_HASH_SIZE; i++)
401	<	{
402	<	last_ptr = NULL;
400	>	case NOT_AUTHORIZED:
401	>	/* jdc - lists server name & port connections are on */
402	>	/*       a purely cosmetical change */
403	>	sendto_realops_flags(UMODE_UNAUTH, L_ALL, SEND_NOTICE,
404	>	"Unauthorized client connection from %s [%s] on [%s/%u].",
405	>	get_client_name(source_p, SHOW_IP),
406	>	source_p->sockhost,
407	>	source_p->connection->listener->name,
408	>	source_p->connection->listener->port);
409	>	ilog(LOG_TYPE_IRCD, "Unauthorized client connection from %s on [%s/%u].",
410	>	get_client_name(source_p, SHOW_IP),
411	>	source_p->connection->listener->name,
412	>	source_p->connection->listener->port);
413
414	<	for (ptr = ip_hash_table[i]; ptr; ptr = next_ptr)
415	<	{
416	<	next_ptr = ptr->next;
414	>	++ServerStats.is_ref;
415	>	exit_client(source_p, "You are not authorized to use this server");
416	>	break;
417
418	<	if (ptr->count == 0 &&
419	<	(CurrentTime - ptr->last_attempt) >= ConfigFileEntry.throttle_time)
420	<	{
421	<	if (last_ptr != NULL)
422	<	last_ptr->next = ptr->next;
423	<	else
424	<	ip_hash_table[i] = ptr->next;
425	<	BlockHeapFree(ip_entry_heap, ptr);
1205	<	ip_entries_count--;
1206	<	}
1207	<	else
1208	<	last_ptr = ptr;
1209	<	}
418	>	case BANNED_CLIENT:
419	>	++ServerStats.is_ref;
420	>	exit_client(source_p, "Banned");
421	>	break;
422	>
423	>	case 0:
424	>	default:
425	>	break;
426		}
427	+
428	+	return !(i < 0);
429		}
430
431		/* detach_conf()
#	Line 1218 | Line 436 | garbage_collect_ip_entries(void)
436		* side effects - Disassociate configuration from the client.
437		*                Also removes a class from the list if marked for deleting.
438		*/
439	<	int
440	<	detach_conf(struct Client *client_p, ConfType type)
439	>	void
440	>	detach_conf(struct Client *client_p, enum maskitem_type type)
441		{
442	<	dlink_node *ptr, *next_ptr;
1225	<	struct ConfItem *conf;
1226	<	struct ClassItem *aclass;
1227	<	struct AccessItem *aconf;
1228	<	struct ConfItem *aclass_conf;
1229	<	struct MatchItem *match_item;
442	>	dlink_node *node = NULL, *node_next = NULL;
443
444	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->confs.head)
444	>	DLINK_FOREACH_SAFE(node, node_next, client_p->connection->confs.head)
445		{
446	<	conf = ptr->data;
1234	<
1235	<	if (type == CONF_TYPE || conf->type == type)
1236	<	{
1237	<	dlinkDelete(ptr, &client_p->localClient->confs);
1238	<	free_dlink_node(ptr);
1239	<
1240	<	switch (conf->type)
1241	<	{
1242	<	case CLIENT_TYPE:
1243	<	case OPER_TYPE:
1244	<	case SERVER_TYPE:
1245	<	aconf = map_to_conf(conf);
1246	<
1247	<	assert(aconf->clients > 0);
1248	<
1249	<	if ((aclass_conf = aconf->class_ptr) != NULL)
1250	<	{
1251	<	aclass = map_to_conf(aclass_conf);
446	>	struct MaskItem *conf = node->data;
447
448	<	assert(aclass->curr_user_count > 0);
448	>	assert(conf->type & (CONF_CLIENT | CONF_OPER | CONF_SERVER));
449	>	assert(conf->ref_count > 0);
450	>	assert(conf->class->ref_count > 0);
451
452	<	if (conf->type == CLIENT_TYPE)
453	<	remove_from_cidr_check(&client_p->localClient->ip, aclass);
1257	<	if (--aclass->curr_user_count == 0 && aclass->active == 0)
1258	<	delete_conf_item(aclass_conf);
1259	<	}
452	>	if (!(conf->type & type))
453	>	continue;
454
455	<	if (--aconf->clients == 0 && IsConfIllegal(aconf))
456	<	delete_conf_item(conf);
455	>	dlinkDelete(node, &client_p->connection->confs);
456	>	free_dlink_node(node);
457
458	<	break;
459	<	default:
1266	<	break;
1267	<	}
458	>	if (conf->type == CONF_CLIENT)
459	>	remove_from_cidr_check(&client_p->connection->ip, conf->class);
460
461	<	if (type != CONF_TYPE)
462	<	return 0;
461	>	if (--conf->class->ref_count == 0 && conf->class->active == 0)
462	>	{
463	>	class_free(conf->class);
464	>	conf->class = NULL;
465		}
1272	–	}
466
467	<	return -1;
467	>	if (--conf->ref_count == 0 && conf->active == 0)
468	>	conf_free(conf);
469	>	}
470		}
471
472		/* attach_conf()
#	Line 1285 | Line 480 | detach_conf(struct Client *client_p, Con
480		*                attachment if there was an old one...
481		*/
482		int
483	<	attach_conf(struct Client *client_p, struct ConfItem *conf)
483	>	attach_conf(struct Client *client_p, struct MaskItem *conf)
484		{
485	<	struct AccessItem *aconf = map_to_conf(conf);
1291	<	struct ClassItem *aclass = map_to_conf(aconf->class_ptr);
1292	<
1293	<	if (dlinkFind(&client_p->localClient->confs, conf) != NULL)
485	>	if (dlinkFind(&client_p->connection->confs, conf))
486		return 1;
487
488	<	if (IsConfIllegal(aconf)) /* TBV: can't happen */
489	<	return NOT_AUTHORIZED;
490	<
1299	<	if (conf->type == CLIENT_TYPE)
1300	<	if (cidr_limit_reached(IsConfExemptLimits(aconf),
1301	<	&client_p->localClient->ip, aclass))
488	>	if (conf->type == CONF_CLIENT)
489	>	if (cidr_limit_reached(IsConfExemptLimits(conf),
490	>	&client_p->connection->ip, conf->class))
491		return TOO_MANY;    /* Already at maximum allowed */
492
493	<	aclass->curr_user_count++;
494	<	aconf->clients++;
493	>	conf->class->ref_count++;
494	>	conf->ref_count++;
495
496	<	dlinkAdd(conf, make_dlink_node(), &client_p->localClient->confs);
496	>	dlinkAdd(conf, make_dlink_node(), &client_p->connection->confs);
497
498		return 0;
499		}
#	Line 1321 | Line 510 | int
510		attach_connect_block(struct Client *client_p, const char *name,
511		const char *host)
512		{
513	<	dlink_node *ptr;
1325	<	struct ConfItem *conf;
1326	<	struct AccessItem *aconf;
513	>	dlink_node *node = NULL;
514
515	<	assert(client_p != NULL);
1329	<	assert(host != NULL);
515	>	assert(host);
516
517	<	if (client_p == NULL || host == NULL)
1332	<	return 0;
1333	<
1334	<	DLINK_FOREACH(ptr, server_items.head)
517	>	DLINK_FOREACH(node, server_items.head)
518		{
519	<	conf = ptr->data;
1337	<	aconf = map_to_conf(conf);
519	>	struct MaskItem *conf = node->data;
520
521	<	if (match(conf->name, name) == 0 || match(aconf->host, host) == 0)
521	>	if (match(conf->name, name) || match(conf->host, host))
522		continue;
523
524		attach_conf(client_p, conf);
525	<	return -1;
525	>	return 1;
526		}
527
528		return 0;
529		}
530
1349	–	/* find_conf_exact()
1350	–	*
1351	–	* inputs       - type of ConfItem
1352	–	*              - pointer to name to find
1353	–	*              - pointer to username to find
1354	–	*              - pointer to host to find
1355	–	* output       - NULL or pointer to conf found
1356	–	* side effects - find a conf entry which matches the hostname
1357	–	*                and has the same name.
1358	–	*/
1359	–	struct ConfItem *
1360	–	find_conf_exact(ConfType type, const char *name, const char *user,
1361	–	const char *host)
1362	–	{
1363	–	dlink_node *ptr;
1364	–	dlink_list *list_p;
1365	–	struct ConfItem *conf = NULL;
1366	–	struct AccessItem *aconf;
1367	–
1368	–	/* Only valid for OPER_TYPE and ...? */
1369	–	list_p = map_to_list(type);
1370	–
1371	–	DLINK_FOREACH(ptr, (*list_p).head)
1372	–	{
1373	–	conf = ptr->data;
1374	–
1375	–	if (conf->name == NULL)
1376	–	continue;
1377	–	aconf = map_to_conf(conf);
1378	–	if (aconf->host == NULL)
1379	–	continue;
1380	–	if (irccmp(conf->name, name) != 0)
1381	–	continue;
1382	–
1383	–	/*
1384	–	** Accept if the *real* hostname (usually sockethost)
1385	–	** socket host) matches *either* host or name field
1386	–	** of the configuration.
1387	–	*/
1388	–	if (!match(aconf->host, host) || !match(aconf->user, user))
1389	–	continue;
1390	–	if (type == OPER_TYPE)
1391	–	{
1392	–	struct ClassItem *aclass = map_to_conf(aconf->class_ptr);
1393	–
1394	–	if (aconf->clients >= aclass->max_total)
1395	–	continue;
1396	–	}
1397	–
1398	–	return conf;
1399	–	}
1400	–
1401	–	return NULL;
1402	–	}
1403	–
531		/* find_conf_name()
532		*
533		* inputs       - pointer to conf link list to search
#	Line 1410 | Line 537 | find_conf_exact(ConfType type, const cha
537		* side effects - find a conf entry which matches the name
538		*                and has the given mask.
539		*/
540	<	struct ConfItem *
541	<	find_conf_name(dlink_list *list, const char *name, ConfType type)
540	>	struct MaskItem *
541	>	find_conf_name(dlink_list *list, const char *name, enum maskitem_type type)
542		{
543	<	dlink_node *ptr;
1417	<	struct ConfItem* conf;
543	>	dlink_node *node = NULL;
544
545	<	DLINK_FOREACH(ptr, list->head)
545	>	DLINK_FOREACH(node, list->head)
546		{
547	<	conf = ptr->data;
548	<
547	>	struct MaskItem *conf = node->data;
548	>
549		if (conf->type == type)
550		{
551	<	if (conf->name && (irccmp(conf->name, name) == 0 ||
552	<	match(conf->name, name)))
1427	<	return conf;
551	>	if (conf->name && !irccmp(conf->name, name))
552	>	return conf;
553		}
554		}
555
556		return NULL;
557		}
558
1434	–	/* map_to_list()
1435	–	*
1436	–	* inputs       - ConfType conf
1437	–	* output       - pointer to dlink_list to use
1438	–	* side effects - none
1439	–	*/
1440	–	static dlink_list *
1441	–	map_to_list(ConfType type)
1442	–	{
1443	–	switch(type)
1444	–	{
1445	–	case RXLINE_TYPE:
1446	–	return(&rxconf_items);
1447	–	break;
1448	–	case XLINE_TYPE:
1449	–	return(&xconf_items);
1450	–	break;
1451	–	case ULINE_TYPE:
1452	–	return(&uconf_items);
1453	–	break;
1454	–	case NRESV_TYPE:
1455	–	return(&nresv_items);
1456	–	break;
1457	–	case OPER_TYPE:
1458	–	return(&oconf_items);
1459	–	break;
1460	–	case CLASS_TYPE:
1461	–	return(&class_items);
1462	–	break;
1463	–	case SERVER_TYPE:
1464	–	return(&server_items);
1465	–	break;
1466	–	case SERVICE_TYPE:
1467	–	return(&service_items);
1468	–	break;
1469	–	case CLUSTER_TYPE:
1470	–	return(&cluster_items);
1471	–	break;
1472	–	case CONF_TYPE:
1473	–	case GLINE_TYPE:
1474	–	case KLINE_TYPE:
1475	–	case DLINE_TYPE:
1476	–	case CRESV_TYPE:
1477	–	default:
1478	–	return NULL;
1479	–	}
1480	–	}
1481	–
559		/* find_matching_name_conf()
560		*
561		* inputs       - type of link list to look in
562		*              - pointer to name string to find
563		*              - pointer to user
564		*              - pointer to host
565	<	*              - optional action to match on as well
566	<	* output       - NULL or pointer to found struct MatchItem
565	>	*              - optional flags to match on as well
566	>	* output       - NULL or pointer to found struct MaskItem
567		* side effects - looks for a match on name field
568		*/
569	<	struct ConfItem *
570	<	find_matching_name_conf(ConfType type, const char *name, const char *user,
571	<	const char *host, int action)
572	<	{
573	<	dlink_node *ptr=NULL;
574	<	struct ConfItem *conf=NULL;
575	<	struct AccessItem *aconf=NULL;
1499	<	struct MatchItem *match_item=NULL;
1500	<	dlink_list *list_p = map_to_list(type);
569	>	struct MaskItem *
570	>	find_matching_name_conf(enum maskitem_type type, const char *name, const char *user,
571	>	const char *host, unsigned int flags)
572	>	{
573	>	dlink_node *node = NULL;
574	>	dlink_list *list = map_to_list(type);
575	>	struct MaskItem *conf = NULL;
576
577		switch (type)
578		{
579	<	#ifdef HAVE_LIBPCRE
580	<	case RXLINE_TYPE:
1506	<	DLINK_FOREACH(ptr, list_p->head)
1507	<	{
1508	<	conf = ptr->data;
1509	<	assert(conf->regexpname);
1510	<
1511	<	if (!ircd_pcre_exec(conf->regexpname, name))
1512	<	return conf;
1513	<	}
1514	<	break;
1515	<	#endif
1516	<	case SERVICE_TYPE:
1517	<	DLINK_FOREACH(ptr, list_p->head)
579	>	case CONF_SERVICE:
580	>	DLINK_FOREACH(node, list->head)
581		{
582	<	conf = ptr->data;
582	>	conf = node->data;
583
584		if (EmptyString(conf->name))
585		continue;
586	<	if ((name != NULL) && !irccmp(name, conf->name))
586	>	if (name && !irccmp(name, conf->name))
587		return conf;
588		}
589		break;
590
591	<	case XLINE_TYPE:
592	<	case ULINE_TYPE:
593	<	case NRESV_TYPE:
594	<	DLINK_FOREACH(ptr, list_p->head)
591	>	case CONF_XLINE:
592	>	case CONF_ULINE:
593	>	case CONF_NRESV:
594	>	case CONF_CRESV:
595	>	DLINK_FOREACH(node, list->head)
596		{
597	<	conf = ptr->data;
597	>	conf = node->data;
598
1535	–	match_item = map_to_conf(conf);
599		if (EmptyString(conf->name))
600	<	continue;
601	<	if ((name != NULL) && match_esc(conf->name, name))
600	>	continue;
601	>	if (name && !match(conf->name, name))
602		{
603	<	if ((user == NULL && (host == NULL)))
604	<	return conf;
605	<	if ((match_item->action & action) != action)
603	>	if ((user == NULL && (host == NULL)))
604	>	return conf;
605	>	if ((conf->flags & flags) != flags)
606		continue;
607	<	if (EmptyString(match_item->user) || EmptyString(match_item->host))
608	<	return conf;
609	<	if (match(match_item->user, user) && match(match_item->host, host))
610	<	return conf;
607	>	if (EmptyString(conf->user) || EmptyString(conf->host))
608	>	return conf;
609	>	if (!match(conf->user, user) && !match(conf->host, host))
610	>	return conf;
611		}
612		}
613		break;
614
615	<	case SERVER_TYPE:
616	<	DLINK_FOREACH(ptr, list_p->head)
615	>	case CONF_SERVER:
616	>	DLINK_FOREACH(node, list->head)
617		{
618	<	conf = ptr->data;
1556	<	aconf = map_to_conf(conf);
618	>	conf = node->data;
619
620	<	if ((name != NULL) && match_esc(name, conf->name))
620	>	if (name && !match(name, conf->name))
621		return conf;
622	<	else if ((host != NULL) && match_esc(host, aconf->host))
622	>	if (host && !match(host, conf->host))
623		return conf;
624		}
625		break;
626	<
626	>
627		default:
628		break;
629		}
#	Line 1574 | Line 636 | find_matching_name_conf(ConfType type, c
636		*              - pointer to name string to find
637		*              - pointer to user
638		*              - pointer to host
639	<	* output       - NULL or pointer to found struct MatchItem
639	>	* output       - NULL or pointer to found struct MaskItem
640		* side effects - looks for an exact match on name field
641		*/
642	<	struct ConfItem *
643	<	find_exact_name_conf(ConfType type, const struct Client *who, const char *name,
642	>	struct MaskItem *
643	>	find_exact_name_conf(enum maskitem_type type, const struct Client *who, const char *name,
644		const char *user, const char *host)
645		{
646	<	dlink_node *ptr = NULL;
647	<	struct AccessItem *aconf;
648	<	struct ConfItem *conf;
1587	<	struct MatchItem *match_item;
1588	<	dlink_list *list_p;
1589	<
1590	<	list_p = map_to_list(type);
646	>	dlink_node *node = NULL;
647	>	dlink_list *list = map_to_list(type);
648	>	struct MaskItem *conf = NULL;
649
650		switch(type)
651		{
652	<	case RXLINE_TYPE:
653	<	case XLINE_TYPE:
654	<	case ULINE_TYPE:
655	<	case NRESV_TYPE:
652	>	case CONF_XLINE:
653	>	case CONF_ULINE:
654	>	case CONF_NRESV:
655	>	case CONF_CRESV:
656
657	<	DLINK_FOREACH(ptr, list_p->head)
657	>	DLINK_FOREACH(node, list->head)
658		{
659	<	conf = ptr->data;
660	<	match_item = (struct MatchItem *)map_to_conf(conf);
659	>	conf = node->data;
660	>
661		if (EmptyString(conf->name))
662	<	continue;
663	<
662	>	continue;
663	>
664		if (irccmp(conf->name, name) == 0)
665		{
666	<	if ((user == NULL && (host == NULL)))
667	<	return (conf);
668	<	if (EmptyString(match_item->user) || EmptyString(match_item->host))
669	<	return (conf);
670	<	if (match(match_item->user, user) && match(match_item->host, host))
671	<	return (conf);
666	>	if ((user == NULL && (host == NULL)))
667	>	return conf;
668	>	if (EmptyString(conf->user) || EmptyString(conf->host))
669	>	return conf;
670	>	if (!match(conf->user, user) && !match(conf->host, host))
671	>	return conf;
672		}
673		}
674		break;
675
676	<	case OPER_TYPE:
677	<	DLINK_FOREACH(ptr, list_p->head)
676	>	case CONF_OPER:
677	>	DLINK_FOREACH(node, list->head)
678		{
679	<	conf = ptr->data;
1622	<	aconf = map_to_conf(conf);
679	>	conf = node->data;
680
681		if (EmptyString(conf->name))
682		continue;
#	Line 1628 | Line 685 | find_exact_name_conf(ConfType type, cons
685		{
686		if (!who)
687		return conf;
688	<	if (EmptyString(aconf->user) || EmptyString(aconf->host))
689	<	return conf;
690	<	if (match(aconf->user, who->username))
688	>	if (EmptyString(conf->user) || EmptyString(conf->host))
689	>	return NULL;
690	>	if (!match(conf->user, who->username))
691		{
692	<	switch (aconf->type)
692	>	switch (conf->htype)
693		{
694		case HM_HOST:
695	<	if (match(aconf->host, who->host) || match(aconf->host, who->sockhost))
696	<	return conf;
695	>	if (!match(conf->host, who->host) || !match(conf->host, who->sockhost))
696	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
697	>	return conf;
698		break;
699		case HM_IPV4:
700	<	if (who->localClient->aftype == AF_INET)
701	<	if (match_ipv4(&who->localClient->ip, &aconf->addr, aconf->bits))
702	<	return conf;
700	>	if (who->connection->aftype == AF_INET)
701	>	if (match_ipv4(&who->connection->ip, &conf->addr, conf->bits))
702	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
703	>	return conf;
704		break;
1646	–	#ifdef IPV6
705		case HM_IPV6:
706	<	if (who->localClient->aftype == AF_INET6)
707	<	if (match_ipv6(&who->localClient->ip, &aconf->addr, aconf->bits))
708	<	return conf;
706	>	if (who->connection->aftype == AF_INET6)
707	>	if (match_ipv6(&who->connection->ip, &conf->addr, conf->bits))
708	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
709	>	return conf;
710		break;
1652	–	#endif
711		default:
712		assert(0);
713		}
#	Line 1659 | Line 717 | find_exact_name_conf(ConfType type, cons
717
718		break;
719
720	<	case SERVER_TYPE:
721	<	DLINK_FOREACH(ptr, list_p->head)
720	>	case CONF_SERVER:
721	>	DLINK_FOREACH(node, list->head)
722		{
723	<	conf = ptr->data;
724	<	aconf = (struct AccessItem *)map_to_conf(conf);
723	>	conf = node->data;
724	>
725		if (EmptyString(conf->name))
726	<	continue;
727	<
726	>	continue;
727	>
728		if (name == NULL)
729		{
730	<	if (EmptyString(aconf->host))
731	<	continue;
732	<	if (irccmp(aconf->host, host) == 0)
733	<	return(conf);
730	>	if (EmptyString(conf->host))
731	>	continue;
732	>	if (irccmp(conf->host, host) == 0)
733	>	return conf;
734		}
735		else if (irccmp(conf->name, name) == 0)
736	<	{
1679	<	return (conf);
1680	<	}
736	>	return conf;
737		}
1682	–	break;
738
1684	–	case CLASS_TYPE:
1685	–	DLINK_FOREACH(ptr, list_p->head)
1686	–	{
1687	–	conf = ptr->data;
1688	–	if (EmptyString(conf->name))
1689	–	continue;
1690	–
1691	–	if (irccmp(conf->name, name) == 0)
1692	–	return (conf);
1693	–	}
739		break;
740
741		default:
742		break;
743		}
1699	–	return(NULL);
1700	–	}
1701	–
1702	–	/* rehash()
1703	–	*
1704	–	* Actual REHASH service routine. Called with sig == 0 if it has been called
1705	–	* as a result of an operator issuing this command, else assume it has been
1706	–	* called as a result of the server receiving a HUP signal.
1707	–	*/
1708	–	int
1709	–	rehash(int sig)
1710	–	{
1711	–	if (sig != 0)
1712	–	sendto_realops_flags(UMODE_ALL, L_ALL,
1713	–	"Got signal SIGHUP, reloading ircd.conf file");
1714	–
1715	–	restart_resolver();
1716	–
1717	–	/* don't close listeners until we know we can go ahead with the rehash */
1718	–
1719	–	/* Check to see if we magically got(or lost) IPv6 support */
1720	–	check_can_use_v6();
1721	–
1722	–	read_conf_files(0);
1723	–
1724	–	if (ServerInfo.description != NULL)
1725	–	strlcpy(me.info, ServerInfo.description, sizeof(me.info));
1726	–
1727	–	load_conf_modules();
744
745	<	flush_deleted_I_P();
1730	<
1731	<	rehashed_klines = 1;
1732	<	/* XXX */
1733	<	if (ConfigLoggingEntry.use_logging)
1734	<	log_close_all();
1735	<
1736	<	return(0);
745	>	return NULL;
746		}
747
748		/* set_default_conf()
#	Line 1751 | Line 760 | set_default_conf(void)
760		/* verify init_class() ran, this should be an unnecessary check
761		* but its not much work.
762		*/
763	<	assert(class_default == (struct ConfItem *) class_items.tail->data);
763	>	assert(class_default == class_get_list()->tail->data);
764
765		#ifdef HAVE_LIBCRYPTO
766	<	ServerInfo.rsa_private_key = NULL;
767	<	ServerInfo.rsa_private_key_file = NULL;
766	>	#if OPENSSL_VERSION_NUMBER >= 0x009080FFL && !defined(OPENSSL_NO_ECDH)
767	>	{
768	>	EC_KEY *key = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
769	>
770	>	if (key)
771	>	{
772	>	SSL_CTX_set_tmp_ecdh(ConfigServerInfo.server_ctx, key);
773	>	EC_KEY_free(key);
774	>	}
775	>	}
776	>
777	>	SSL_CTX_set_options(ConfigServerInfo.server_ctx, SSL_OP_SINGLE_ECDH_USE);
778		#endif
779
780	<	/* ServerInfo.name is not rehashable */
781	<	/* ServerInfo.name = ServerInfo.name; */
782	<	ServerInfo.description = NULL;
783	<	DupString(ServerInfo.network_name, NETWORK_NAME_DEFAULT);
784	<	DupString(ServerInfo.network_desc, NETWORK_DESC_DEFAULT);
785	<
786	<	memset(&ServerInfo.ip, 0, sizeof(ServerInfo.ip));
787	<	ServerInfo.specific_ipv4_vhost = 0;
788	<	memset(&ServerInfo.ip6, 0, sizeof(ServerInfo.ip6));
789	<	ServerInfo.specific_ipv6_vhost = 0;
790	<
791	<	ServerInfo.max_clients = MAXCLIENTS_MAX;
792	<
793	<	ServerInfo.hub = 0;
794	<	ServerInfo.dns_host.sin_addr.s_addr = 0;
795	<	ServerInfo.dns_host.sin_port = 0;
796	<	AdminInfo.name = NULL;
797	<	AdminInfo.email = NULL;
798	<	AdminInfo.description = NULL;
780	>	SSL_CTX_set_cipher_list(ConfigServerInfo.server_ctx, "EECDH+HIGH:EDH+HIGH:HIGH:!aNULL");
781	>	ConfigServerInfo.message_digest_algorithm = EVP_sha256();
782	>	ConfigServerInfo.rsa_private_key = NULL;
783	>	ConfigServerInfo.rsa_private_key_file = NULL;
784	>	#endif
785	>
786	>	/* ConfigServerInfo.name is not rehashable */
787	>	/* ConfigServerInfo.name = ConfigServerInfo.name; */
788	>	ConfigServerInfo.description = NULL;
789	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
790	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
791	>
792	>	memset(&ConfigServerInfo.ip, 0, sizeof(ConfigServerInfo.ip));
793	>	ConfigServerInfo.specific_ipv4_vhost = 0;
794	>	memset(&ConfigServerInfo.ip6, 0, sizeof(ConfigServerInfo.ip6));
795	>	ConfigServerInfo.specific_ipv6_vhost = 0;
796	>
797	>	ConfigServerInfo.default_max_clients = MAXCLIENTS_MAX;
798	>	ConfigServerInfo.max_nick_length = 9;
799	>	ConfigServerInfo.max_topic_length = 80;
800	>	ConfigServerInfo.hub = 0;
801	>
802	>	ConfigAdminInfo.name = NULL;
803	>	ConfigAdminInfo.email = NULL;
804	>	ConfigAdminInfo.description = NULL;
805
806	<	log_close_all();
806	>	log_del_all();
807
808	<	ConfigLoggingEntry.use_logging = 1;
808	>	ConfigLog.use_logging = 1;
809
810		ConfigChannel.disable_fake_channels = 0;
811	<	ConfigChannel.restrict_channels = 0;
812	<	ConfigChannel.disable_local_channels = 0;
813	<	ConfigChannel.use_invex = 1;
814	<	ConfigChannel.use_except = 1;
1790	<	ConfigChannel.use_knock = 1;
1791	<	ConfigChannel.knock_delay = 300;
811	>	ConfigChannel.invite_client_count = 10;
812	>	ConfigChannel.invite_client_time = 300;
813	>	ConfigChannel.knock_client_count = 1;
814	>	ConfigChannel.knock_client_time = 300;
815		ConfigChannel.knock_delay_channel = 60;
816	<	ConfigChannel.max_chans_per_user = 25;
1794	<	ConfigChannel.max_chans_per_oper = 50;
1795	<	ConfigChannel.quiet_on_ban = 1;
816	>	ConfigChannel.max_channels = 25;
817		ConfigChannel.max_bans = 25;
818	+	ConfigChannel.default_join_flood_count = 18;
819	+	ConfigChannel.default_join_flood_time = 6;
820		ConfigChannel.default_split_user_count = 0;
821		ConfigChannel.default_split_server_count = 0;
822		ConfigChannel.no_join_on_split = 0;
#	Line 1802 | Line 825 | set_default_conf(void)
825		ConfigServerHide.flatten_links = 0;
826		ConfigServerHide.links_delay = 300;
827		ConfigServerHide.hidden = 0;
1805	–	ConfigServerHide.disable_hidden = 0;
828		ConfigServerHide.hide_servers = 0;
829	<	DupString(ConfigServerHide.hidden_name, NETWORK_NAME_DEFAULT);
829	>	ConfigServerHide.hide_services = 0;
830	>	ConfigServerHide.hidden_name = xstrdup(NETWORK_NAME_DEFAULT);
831		ConfigServerHide.hide_server_ips = 0;
832	+	ConfigServerHide.disable_remote_commands = 0;
833
834	<
835	<	DupString(ConfigFileEntry.service_name, SERVICE_NAME_DEFAULT);
836	<	ConfigFileEntry.max_watch = WATCHSIZE_DEFAULT;
837	<	ConfigFileEntry.glines = 0;
838	<	ConfigFileEntry.gline_time = 12 * 3600;
839	<	ConfigFileEntry.gline_request_time = GLINE_REQUEST_EXPIRE_DEFAULT;
840	<	ConfigFileEntry.gline_min_cidr = 16;
841	<	ConfigFileEntry.gline_min_cidr6 = 48;
842	<	ConfigFileEntry.invisible_on_connect = 1;
843	<	ConfigFileEntry.burst_away = 0;
844	<	ConfigFileEntry.use_whois_actually = 1;
845	<	ConfigFileEntry.tkline_expire_notices = 1;
846	<	ConfigFileEntry.hide_spoof_ips = 1;
847	<	ConfigFileEntry.ignore_bogus_ts = 0;
848	<	ConfigFileEntry.disable_auth = 0;
849	<	ConfigFileEntry.disable_remote = 0;
850	<	ConfigFileEntry.kill_chase_time_limit = 90;
851	<	ConfigFileEntry.default_floodcount = 8;
852	<	ConfigFileEntry.failed_oper_notice = 1;
853	<	ConfigFileEntry.dots_in_ident = 0;
854	<	ConfigFileEntry.min_nonwildcard = 4;
855	<	ConfigFileEntry.min_nonwildcard_simple = 3;
856	<	ConfigFileEntry.max_accept = 20;
857	<	ConfigFileEntry.anti_nick_flood = 0;
858	<	ConfigFileEntry.max_nick_time = 20;
859	<	ConfigFileEntry.max_nick_changes = 5;
860	<	ConfigFileEntry.anti_spam_exit_message_time = 0;
861	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
862	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
863	<	ConfigFileEntry.kline_with_reason = 1;
864	<	ConfigFileEntry.kline_reason = NULL;
865	<	ConfigFileEntry.warn_no_nline = 1;
866	<	ConfigFileEntry.stats_o_oper_only = 0;
867	<	ConfigFileEntry.stats_k_oper_only = 1;  /* masked */
868	<	ConfigFileEntry.stats_i_oper_only = 1;  /* masked */
869	<	ConfigFileEntry.stats_P_oper_only = 0;
870	<	ConfigFileEntry.caller_id_wait = 60;
871	<	ConfigFileEntry.opers_bypass_callerid = 0;
872	<	ConfigFileEntry.pace_wait = 10;
873	<	ConfigFileEntry.pace_wait_simple = 1;
874	<	ConfigFileEntry.short_motd = 0;
875	<	ConfigFileEntry.ping_cookie = 0;
876	<	ConfigFileEntry.no_oper_flood = 0;
877	<	ConfigFileEntry.true_no_oper_flood = 0;
878	<	ConfigFileEntry.oper_pass_resv = 1;
879	<	ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
880	<	ConfigFileEntry.client_flood = CLIENT_FLOOD_DEFAULT;
881	<	ConfigFileEntry.oper_only_umodes = UMODE_DEBUG;
1858	<	ConfigFileEntry.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE |
1859	<	UMODE_OPERWALL | UMODE_WALLOP;
1860	<	ConfigFileEntry.use_egd = 0;
1861	<	ConfigFileEntry.egdpool_path = NULL;
1862	<	ConfigFileEntry.throttle_time = 10;
834	>	ConfigGeneral.away_count = 2;
835	>	ConfigGeneral.away_time = 10;
836	>	ConfigGeneral.max_watch = WATCHSIZE_DEFAULT;
837	>	ConfigGeneral.cycle_on_host_change = 1;
838	>	ConfigGeneral.dline_min_cidr = 16;
839	>	ConfigGeneral.dline_min_cidr6 = 48;
840	>	ConfigGeneral.kline_min_cidr = 16;
841	>	ConfigGeneral.kline_min_cidr6 = 48;
842	>	ConfigGeneral.invisible_on_connect = 1;
843	>	ConfigGeneral.tkline_expire_notices = 1;
844	>	ConfigGeneral.ignore_bogus_ts = 0;
845	>	ConfigGeneral.disable_auth = 0;
846	>	ConfigGeneral.kill_chase_time_limit = 90;
847	>	ConfigGeneral.default_floodcount = 8;
848	>	ConfigGeneral.failed_oper_notice = 1;
849	>	ConfigGeneral.dots_in_ident = 0;
850	>	ConfigGeneral.min_nonwildcard = 4;
851	>	ConfigGeneral.min_nonwildcard_simple = 3;
852	>	ConfigGeneral.max_accept = 20;
853	>	ConfigGeneral.anti_nick_flood = 0;
854	>	ConfigGeneral.max_nick_time = 20;
855	>	ConfigGeneral.max_nick_changes = 5;
856	>	ConfigGeneral.anti_spam_exit_message_time = 0;
857	>	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
858	>	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
859	>	ConfigGeneral.warn_no_connect_block = 1;
860	>	ConfigGeneral.stats_e_disabled = 0;
861	>	ConfigGeneral.stats_i_oper_only = 1;  /* 1 = masked */
862	>	ConfigGeneral.stats_k_oper_only = 1;  /* 1 = masked */
863	>	ConfigGeneral.stats_o_oper_only = 1;
864	>	ConfigGeneral.stats_m_oper_only = 1;
865	>	ConfigGeneral.stats_P_oper_only = 0;
866	>	ConfigGeneral.stats_u_oper_only = 0;
867	>	ConfigGeneral.caller_id_wait = 60;
868	>	ConfigGeneral.opers_bypass_callerid = 0;
869	>	ConfigGeneral.pace_wait = 10;
870	>	ConfigGeneral.pace_wait_simple = 1;
871	>	ConfigGeneral.short_motd = 0;
872	>	ConfigGeneral.ping_cookie = 0;
873	>	ConfigGeneral.no_oper_flood = 0;
874	>	ConfigGeneral.oper_pass_resv = 1;
875	>	ConfigGeneral.max_targets = MAX_TARGETS_DEFAULT;
876	>	ConfigGeneral.oper_only_umodes = UMODE_DEBUG | UMODE_LOCOPS | UMODE_HIDDEN | UMODE_FARCONNECT |
877	>	UMODE_UNAUTH | UMODE_EXTERNAL | UMODE_BOTS | UMODE_NCHANGE |
878	>	UMODE_SPY | UMODE_FULL | UMODE_SKILL | UMODE_REJ | UMODE_CCONN;
879	>	ConfigGeneral.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE | UMODE_WALLOP;
880	>	ConfigGeneral.throttle_count = 1;
881	>	ConfigGeneral.throttle_time = 1;
882		}
883
884		static void
885		validate_conf(void)
886		{
887	<	if (ConfigFileEntry.ts_warn_delta < TS_WARN_DELTA_MIN)
888	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
1870	<
1871	<	if (ConfigFileEntry.ts_max_delta < TS_MAX_DELTA_MIN)
1872	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
887	>	if (ConfigGeneral.ts_warn_delta < TS_WARN_DELTA_MIN)
888	>	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
889
890	<	if (ServerInfo.network_name == NULL)
891	<	DupString(ServerInfo.network_name,NETWORK_NAME_DEFAULT);
890	>	if (ConfigGeneral.ts_max_delta < TS_MAX_DELTA_MIN)
891	>	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
892
893	<	if (ServerInfo.network_desc == NULL)
894	<	DupString(ServerInfo.network_desc,NETWORK_DESC_DEFAULT);
893	>	if (EmptyString(ConfigServerInfo.network_name))
894	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
895
896	<	if (ConfigFileEntry.service_name == NULL)
897	<	DupString(ConfigFileEntry.service_name, SERVICE_NAME_DEFAULT);
896	>	if (EmptyString(ConfigServerInfo.network_desc))
897	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
898
899	<	if ((ConfigFileEntry.client_flood < CLIENT_FLOOD_MIN) ||
1884	<	(ConfigFileEntry.client_flood > CLIENT_FLOOD_MAX))
1885	<	ConfigFileEntry.client_flood = CLIENT_FLOOD_MAX;
1886	<
1887	<	ConfigFileEntry.max_watch = IRCD_MAX(ConfigFileEntry.max_watch, WATCHSIZE_MIN);
899	>	ConfigGeneral.max_watch = IRCD_MAX(ConfigGeneral.max_watch, WATCHSIZE_MIN);
900		}
901
902	<	/* read_conf()
902	>	/* read_conf()
903		*
904		* inputs       - file descriptor pointing to config file to use
905		* output       - None
#	Line 1898 | Line 910 | read_conf(FILE *file)
910		{
911		lineno = 0;
912
913	<	set_default_conf(); /* Set default values prior to conf parsing */
913	>	set_default_conf();  /* Set default values prior to conf parsing */
914		conf_parser_ctx.pass = 1;
915	<	yyparse();          /* pick up the classes first */
915	>	yyparse();  /* Pick up the classes first */
916
917		rewind(file);
918
919		conf_parser_ctx.pass = 2;
920	<	yyparse();          /* Load the values from the conf */
921	<	validate_conf();    /* Check to make sure some values are still okay. */
922	<	/* Some global values are also loaded here. */
923	<	check_class();      /* Make sure classes are valid */
920	>	yyparse();  /* Load the values from the conf */
921	>	validate_conf();  /* Check to make sure some values are still okay. */
922	>	/* Some global values are also loaded here. */
923	>	class_delete_marked();  /* Delete unused classes that are marked for deletion */
924	>	}
925	>
926	>	/* conf_rehash()
927	>	*
928	>	* Actual REHASH service routine. Called with sig == 0 if it has been called
929	>	* as a result of an operator issuing this command, else assume it has been
930	>	* called as a result of the server receiving a HUP signal.
931	>	*/
932	>	void
933	>	conf_rehash(int sig)
934	>	{
935	>	if (sig)
936	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
937	>	"Got signal SIGHUP, reloading configuration file(s)");
938	>
939	>	restart_resolver();
940	>
941	>	/* don't close listeners until we know we can go ahead with the rehash */
942	>
943	>	read_conf_files(0);
944	>
945	>	load_conf_modules();
946	>	check_conf_klines();
947		}
948
949		/* lookup_confhost()
#	Line 1916 | Line 951 | read_conf(FILE *file)
951		* start DNS lookups of all hostnames in the conf
952		* line and convert an IP addresses in a.b.c.d number for to IP#s.
953		*/
954	<	static void
955	<	lookup_confhost(struct ConfItem *conf)
954	>	void
955	>	lookup_confhost(struct MaskItem *conf)
956		{
1922	–	struct AccessItem *aconf;
957		struct addrinfo hints, *res;
958
959	<	aconf = map_to_conf(conf);
960	<
1927	<	if (has_wildcards(aconf->host))
1928	<	{
1929	<	ilog(LOG_TYPE_IRCD, "Host/server name error: (%s) (%s)",
1930	<	aconf->host, conf->name);
1931	<	return;
1932	<	}
1933	<
1934	<	/* Do name lookup now on hostnames given and store the
959	>	/*
960	>	* Do name lookup now on hostnames given and store the
961		* ip numbers in conf structure.
962		*/
963		memset(&hints, 0, sizeof(hints));
#	Line 1942 | Line 968 | lookup_confhost(struct ConfItem *conf)
968		/* Get us ready for a bind() and don't bother doing dns lookup */
969		hints.ai_flags = AI_PASSIVE | AI_NUMERICHOST;
970
971	<	if (getaddrinfo(aconf->host, NULL, &hints, &res))
971	>	if (getaddrinfo(conf->host, NULL, &hints, &res))
972		{
973	<	conf_dns_lookup(aconf);
973	>	conf_dns_lookup(conf);
974		return;
975		}
976
977	<	assert(res != NULL);
977	>	assert(res);
978	>
979	>	memcpy(&conf->addr, res->ai_addr, res->ai_addrlen);
980	>	conf->addr.ss_len = res->ai_addrlen;
981	>	conf->addr.ss.ss_family = res->ai_family;
982
1953	–	memcpy(&aconf->addr, res->ai_addr, res->ai_addrlen);
1954	–	aconf->addr.ss_len = res->ai_addrlen;
1955	–	aconf->addr.ss.ss_family = res->ai_family;
983		freeaddrinfo(res);
984		}
985
#	Line 1966 | Line 993 | lookup_confhost(struct ConfItem *conf)
993		int
994		conf_connect_allowed(struct irc_ssaddr *addr, int aftype)
995		{
996	<	struct ip_entry *ip_found;
997	<	struct AccessItem *aconf = find_dline_conf(addr, aftype);
996	>	struct ip_entry *ip_found = NULL;
997	>	struct MaskItem *const conf = find_dline_conf(addr, aftype);
998
999		/* DLINE exempt also gets you out of static limits/pacing... */
1000	<	if (aconf && (aconf->status & CONF_EXEMPTDLINE))
1000	>	if (conf && (conf->type == CONF_EXEMPT))
1001		return 0;
1002
1003	<	if (aconf != NULL)
1003	>	if (conf)
1004		return BANNED_CLIENT;
1005
1006	<	ip_found = find_or_add_ip(addr);
1006	>	ip_found = ipcache_find_or_add_address(addr);
1007
1008	<	if ((CurrentTime - ip_found->last_attempt) <
1982	<	ConfigFileEntry.throttle_time)
1008	>	if ((CurrentTime - ip_found->last_attempt) < ConfigGeneral.throttle_time)
1009		{
1010	<	ip_found->last_attempt = CurrentTime;
1011	<	return TOO_FAST;
1010	>	if (ip_found->connection_count >= ConfigGeneral.throttle_count)
1011	>	return TOO_FAST;
1012	>
1013	>	++ip_found->connection_count;
1014		}
1015	+	else
1016	+	ip_found->connection_count = 1;
1017
1018		ip_found->last_attempt = CurrentTime;
1019		return 0;
1020		}
1021
1022	<	static struct AccessItem *
1993	<	find_regexp_kline(const char *uhi[])
1994	<	{
1995	<	#ifdef HAVE_LIBPCRE
1996	<	const dlink_node *ptr = NULL;
1997	<
1998	<	DLINK_FOREACH(ptr, rkconf_items.head)
1999	<	{
2000	<	struct AccessItem *aptr = map_to_conf(ptr->data);
2001	<
2002	<	assert(aptr->regexuser);
2003	<	assert(aptr->regexhost);
2004	<
2005	<	if (!ircd_pcre_exec(aptr->regexuser, uhi[0]) &&
2006	<	(!ircd_pcre_exec(aptr->regexhost, uhi[1]) ||
2007	<	!ircd_pcre_exec(aptr->regexhost, uhi[2])))
2008	<	return aptr;
2009	<	}
2010	<	#endif
2011	<	return NULL;
2012	<	}
2013	<
2014	<	/* find_kill()
1022	>	/* expire_tklines()
1023		*
1024	<	* inputs       - pointer to client structure
1025	<	* output       - pointer to struct AccessItem if found
1026	<	* side effects - See if this user is klined already,
2019	<	*                and if so, return struct AccessItem pointer
1024	>	* inputs       - tkline list pointer
1025	>	* output       - NONE
1026	>	* side effects - expire tklines
1027		*/
1028	<	struct AccessItem *
1029	<	find_kill(struct Client *client_p)
2023	<	{
2024	<	struct AccessItem *aconf = NULL;
2025	<	const char *uhi[3];
2026	<
2027	<	uhi[0] = client_p->username;
2028	<	uhi[1] = client_p->host;
2029	<	uhi[2] = client_p->sockhost;
2030	<
2031	<	assert(client_p != NULL);
2032	<
2033	<	aconf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
2034	<	CONF_KLINE, client_p->localClient->aftype,
2035	<	client_p->username, NULL, 1);
2036	<	if (aconf == NULL)
2037	<	aconf = find_regexp_kline(uhi);
2038	<
2039	<	return aconf;
2040	<	}
2041	<
2042	<	struct AccessItem *
2043	<	find_gline(struct Client *client_p)
1028	>	static void
1029	>	expire_tklines(dlink_list *list)
1030		{
1031	<	struct AccessItem *aconf;
1031	>	dlink_node *node = NULL, *node_next = NULL;
1032
1033	<	assert(client_p != NULL);
1033	>	DLINK_FOREACH_SAFE(node, node_next, list->head)
1034	>	{
1035	>	struct MaskItem *conf = node->data;
1036
1037	<	aconf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
1038	<	CONF_GLINE, client_p->localClient->aftype,
2051	<	client_p->username, NULL, 1);
2052	<	return aconf;
2053	<	}
1037	>	if (!conf->until || conf->until > CurrentTime)
1038	>	continue;
1039
1040	<	/* add_temp_line()
1041	<	*
1042	<	* inputs        - pointer to struct ConfItem
1043	<	* output        - none
2059	<	* Side effects  - links in given struct ConfItem into
2060	<	*                 temporary *line link list
2061	<	*/
2062	<	void
2063	<	add_temp_line(struct ConfItem *conf)
2064	<	{
2065	<	if (conf->type == XLINE_TYPE)
2066	<	{
2067	<	conf->flags |= CONF_FLAGS_TEMPORARY;
2068	<	dlinkAdd(conf, make_dlink_node(), &temporary_xlines);
2069	<	}
2070	<	else if ((conf->type == NRESV_TYPE) || (conf->type == CRESV_TYPE))
2071	<	{
2072	<	conf->flags |= CONF_FLAGS_TEMPORARY;
2073	<	dlinkAdd(conf, make_dlink_node(), &temporary_resv);
1040	>	if (ConfigGeneral.tkline_expire_notices)
1041	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE, "Temporary %s for [%s] expired",
1042	>	(conf->type == CONF_XLINE) ? "X-line" : "RESV", conf->name);
1043	>	conf_free(conf);
1044		}
1045		}
1046
#	Line 2082 | Line 1052 | add_temp_line(struct ConfItem *conf)
1052		*                This is an event started off in ircd.c
1053		*/
1054		void
1055	<	cleanup_tklines(void *notused)
1055	>	cleanup_tklines(void *unused)
1056		{
1057		hostmask_expire_temporary();
1058	<	expire_tklines(&temporary_xlines);
1059	<	expire_tklines(&temporary_resv);
1060	<	}
2091	<
2092	<	/* expire_tklines()
2093	<	*
2094	<	* inputs       - tkline list pointer
2095	<	* output       - NONE
2096	<	* side effects - expire tklines
2097	<	*/
2098	<	static void
2099	<	expire_tklines(dlink_list *tklist)
2100	<	{
2101	<	dlink_node *ptr;
2102	<	dlink_node *next_ptr;
2103	<	struct ConfItem *conf;
2104	<	struct MatchItem *xconf;
2105	<	struct MatchItem *nconf;
2106	<	struct ResvChannel *cconf;
2107	<
2108	<	DLINK_FOREACH_SAFE(ptr, next_ptr, tklist->head)
2109	<	{
2110	<	conf = ptr->data;
2111	<
2112	<	if (conf->type == XLINE_TYPE)
2113	<	{
2114	<	xconf = (struct MatchItem *)map_to_conf(conf);
2115	<	if (xconf->hold <= CurrentTime)
2116	<	{
2117	<	if (ConfigFileEntry.tkline_expire_notices)
2118	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2119	<	"Temporary X-line for [%s] sexpired", conf->name);
2120	<	dlinkDelete(ptr, tklist);
2121	<	free_dlink_node(ptr);
2122	<	delete_conf_item(conf);
2123	<	}
2124	<	}
2125	<	else if (conf->type == NRESV_TYPE)
2126	<	{
2127	<	nconf = (struct MatchItem *)map_to_conf(conf);
2128	<	if (nconf->hold <= CurrentTime)
2129	<	{
2130	<	if (ConfigFileEntry.tkline_expire_notices)
2131	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2132	<	"Temporary RESV for [%s] expired", conf->name);
2133	<	dlinkDelete(ptr, tklist);
2134	<	free_dlink_node(ptr);
2135	<	delete_conf_item(conf);
2136	<	}
2137	<	}
2138	<	else if (conf->type == CRESV_TYPE)
2139	<	{
2140	<	cconf = (struct ResvChannel *)map_to_conf(conf);
2141	<	if (cconf->hold <= CurrentTime)
2142	<	{
2143	<	if (ConfigFileEntry.tkline_expire_notices)
2144	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2145	<	"Temporary RESV for [%s] expired", cconf->name);
2146	<	delete_channel_resv(cconf);
2147	<	}
2148	<	}
2149	<	}
1058	>	expire_tklines(&xconf_items);
1059	>	expire_tklines(&nresv_items);
1060	>	expire_tklines(&cresv_items);
1061		}
1062
1063		/* oper_privs_as_string()
#	Line 2157 | Line 1068 | expire_tklines(dlink_list *tklist)
1068		*/
1069		static const struct oper_privs
1070		{
1071	<	const unsigned int oprivs;
1071	>	const unsigned int flag;
1072		const unsigned char c;
1073		} flag_list[] = {
1074	<	{ OPER_FLAG_ADMIN,       'A' },
1075	<	{ OPER_FLAG_REMOTEBAN,   'B' },
1076	<	{ OPER_FLAG_DIE,         'D' },
1077	<	{ OPER_FLAG_GLINE,       'G' },
1078	<	{ OPER_FLAG_REHASH,      'H' },
1079	<	{ OPER_FLAG_K,           'K' },
1080	<	{ OPER_FLAG_OPERWALL,    'L' },
1081	<	{ OPER_FLAG_N,           'N' },
1082	<	{ OPER_FLAG_GLOBAL_KILL, 'O' },
1083	<	{ OPER_FLAG_REMOTE,      'R' },
1084	<	{ OPER_FLAG_OPER_SPY,    'S' },
1085	<	{ OPER_FLAG_UNKLINE,     'U' },
1086	<	{ OPER_FLAG_X,           'X' },
1074	>	{ OPER_FLAG_ADMIN,          'A' },
1075	>	{ OPER_FLAG_REMOTEBAN,      'B' },
1076	>	{ OPER_FLAG_DIE,            'D' },
1077	>	{ OPER_FLAG_REHASH,         'H' },
1078	>	{ OPER_FLAG_KLINE,          'K' },
1079	>	{ OPER_FLAG_KILL,           'N' },
1080	>	{ OPER_FLAG_KILL_REMOTE,    'O' },
1081	>	{ OPER_FLAG_CONNECT,        'P' },
1082	>	{ OPER_FLAG_CONNECT_REMOTE, 'Q' },
1083	>	{ OPER_FLAG_SQUIT,          'R' },
1084	>	{ OPER_FLAG_SQUIT_REMOTE,   'S' },
1085	>	{ OPER_FLAG_UNKLINE,        'U' },
1086	>	{ OPER_FLAG_XLINE,          'X' },
1087		{ 0, '\0' }
1088		};
1089
1090	<	char *
1090	>	const char *
1091		oper_privs_as_string(const unsigned int port)
1092		{
1093	<	static char privs_out[16];
1093	>	static char privs_out[IRCD_BUFSIZE];
1094		char *privs_ptr = privs_out;
2184	–	unsigned int i = 0;
1095
1096	<	for (; flag_list[i].oprivs; ++i)
1096	>	for (const struct oper_privs *opriv = flag_list; opriv->flag; ++opriv)
1097		{
1098	<	if (port & flag_list[i].oprivs)
1099	<	*privs_ptr++ = flag_list[i].c;
1098	>	if (port & opriv->flag)
1099	>	*privs_ptr++ = opriv->c;
1100		else
1101	<	*privs_ptr++ = ToLowerTab[flag_list[i].c];
1101	>	*privs_ptr++ = ToLower(opriv->c);
1102		}
1103
1104		*privs_ptr = '\0';
#	Line 2197 | Line 1107 | oper_privs_as_string(const unsigned int
1107		}
1108
1109		/*
1110	<	* Input: A client to find the active oper{} name for.
1110	>	* Input: A client to find the active operator {} name for.
1111		* Output: The nick!user@host{oper} of the oper.
1112		*         "oper" is server name for remote opers
1113		* Side effects: None.
#	Line 2205 | Line 1115 | oper_privs_as_string(const unsigned int
1115		const char *
1116		get_oper_name(const struct Client *client_p)
1117		{
1118	<	dlink_node *cnode = NULL;
1119	<	/* +5 for !,@,{,} and null */
1120	<	static char buffer[NICKLEN + USERLEN + HOSTLEN + HOSTLEN + 5];
1118	>	static char buffer[IRCD_BUFSIZE];
1119	>
1120	>	if (IsServer(client_p))
1121	>	return client_p->name;
1122
1123		if (MyConnect(client_p))
1124		{
1125	<	if ((cnode = client_p->localClient->confs.head))
1125	>	const dlink_node *const node = client_p->connection->confs.head;
1126	>
1127	>	if (node)
1128		{
1129	<	struct ConfItem *conf = cnode->data;
2217	<	const struct AccessItem *aconf = map_to_conf(conf);
1129	>	const struct MaskItem *const conf = node->data;
1130
1131	<	if (IsConfOperator(aconf))
1131	>	if (conf->type == CONF_OPER)
1132		{
1133	<	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1133	>	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1134		client_p->username, client_p->host, conf->name);
1135	<	return buffer;
1135	>	return buffer;
1136		}
1137		}
1138
1139	<	/* Probably should assert here for now. If there is an oper out there
1140	<	* with no oper{} conf attached, it would be good for us to know...
1139	>	/*
1140	>	* Probably should assert here for now. If there is an oper out there
1141	>	* with no operator {} conf attached, it would be good for us to know...
1142		*/
1143	<	assert(0); /* Oper without oper conf! */
1143	>	assert(0);  /* Oper without oper conf! */
1144		}
1145
1146		snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1147	<	client_p->username, client_p->host, client_p->servptr->name);
1147	>	client_p->username, client_p->host, client_p->servptr->name);
1148		return buffer;
1149		}
1150
2238	–	/* read_conf_files()
2239	–	*
2240	–	* inputs       - cold start YES or NO
2241	–	* output       - none
2242	–	* side effects - read all conf files needed, ircd.conf kline.conf etc.
2243	–	*/
2244	–	void
2245	–	read_conf_files(int cold)
2246	–	{
2247	–	const char *filename;
2248	–	char chanmodes[32];
2249	–	char chanlimit[32];
2250	–
2251	–	conf_parser_ctx.boot = cold;
2252	–	filename = get_conf_name(CONF_TYPE);
2253	–
2254	–	/* We need to know the initial filename for the yyerror() to report
2255	–	FIXME: The full path is in conffilenamebuf first time since we
2256	–	dont know anything else
2257	–
2258	–	- Gozem 2002-07-21
2259	–	*/
2260	–	strlcpy(conffilebuf, filename, sizeof(conffilebuf));
2261	–
2262	–	if ((conf_parser_ctx.conf_file = fopen(filename, "r")) == NULL)
2263	–	{
2264	–	if (cold)
2265	–	{
2266	–	ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
2267	–	filename, strerror(errno));
2268	–	exit(-1);
2269	–	}
2270	–	else
2271	–	{
2272	–	sendto_realops_flags(UMODE_ALL, L_ALL,
2273	–	"Unable to read configuration file '%s': %s",
2274	–	filename, strerror(errno));
2275	–	return;
2276	–	}
2277	–	}
2278	–
2279	–	if (!cold)
2280	–	clear_out_old_conf();
2281	–
2282	–	read_conf(conf_parser_ctx.conf_file);
2283	–	fclose(conf_parser_ctx.conf_file);
2284	–
2285	–	add_isupport("NETWORK", ServerInfo.network_name, -1);
2286	–	snprintf(chanmodes, sizeof(chanmodes), "b%s%s:%d",
2287	–	ConfigChannel.use_except ? "e" : "",
2288	–	ConfigChannel.use_invex ? "I" : "", ConfigChannel.max_bans);
2289	–	add_isupport("MAXLIST", chanmodes, -1);
2290	–	add_isupport("MAXTARGETS", NULL, ConfigFileEntry.max_targets);
2291	–
2292	–	if (ConfigChannel.disable_local_channels)
2293	–	add_isupport("CHANTYPES", "#", -1);
2294	–	else
2295	–	add_isupport("CHANTYPES", "#&", -1);
2296	–
2297	–	snprintf(chanlimit, sizeof(chanlimit), "%s:%d",
2298	–	ConfigChannel.disable_local_channels ? "#" : "#&",
2299	–	ConfigChannel.max_chans_per_user);
2300	–	add_isupport("CHANLIMIT", chanlimit, -1);
2301	–	snprintf(chanmodes, sizeof(chanmodes), "%s%s%s",
2302	–	ConfigChannel.use_except ? "e" : "",
2303	–	ConfigChannel.use_invex ? "I" : "", "b,k,l,imnprstORS");
2304	–	add_isupport("CHANNELLEN", NULL, LOCAL_CHANNELLEN);
2305	–
2306	–	if (ConfigChannel.use_except)
2307	–	add_isupport("EXCEPTS", "e", -1);
2308	–	if (ConfigChannel.use_invex)
2309	–	add_isupport("INVEX", "I", -1);
2310	–	add_isupport("CHANMODES", chanmodes, -1);
2311	–
2312	–	/*
2313	–	* message_locale may have changed.  rebuild isupport since it relies
2314	–	* on strlen(form_str(RPL_ISUPPORT))
2315	–	*/
2316	–	rebuild_isupport_message_line();
2317	–
2318	–	#ifdef HAVE_LIBPCRE
2319	–	parse_conf_file(RKLINE_TYPE, cold);
2320	–	parse_conf_file(RXLINE_TYPE, cold);
2321	–	#endif
2322	–	parse_conf_file(KLINE_TYPE, cold);
2323	–	parse_conf_file(DLINE_TYPE, cold);
2324	–	parse_conf_file(XLINE_TYPE, cold);
2325	–	parse_conf_file(NRESV_TYPE, cold);
2326	–	parse_conf_file(CRESV_TYPE, cold);
2327	–	}
2328	–
2329	–	/* parse_conf_file()
2330	–	*
2331	–	* inputs       - type of conf file to parse
2332	–	* output       - none
2333	–	* side effects - conf file for givenconf type is opened and read then parsed
2334	–	*/
2335	–	static void
2336	–	parse_conf_file(int type, int cold)
2337	–	{
2338	–	FILE *file = NULL;
2339	–	const char *filename = get_conf_name(type);
2340	–
2341	–	if ((file = fopen(filename, "r")) == NULL)
2342	–	{
2343	–	if (cold)
2344	–	ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
2345	–	filename, strerror(errno));
2346	–	else
2347	–	sendto_realops_flags(UMODE_ALL, L_ALL,
2348	–	"Unable to read configuration file '%s': %s",
2349	–	filename, strerror(errno));
2350	–	}
2351	–	else
2352	–	{
2353	–	parse_csv_file(file, type);
2354	–	fclose(file);
2355	–	}
2356	–	}
2357	–
1151		/* clear_out_old_conf()
1152		*
1153		* inputs       - none
#	Line 2364 | Line 1157 | parse_conf_file(int type, int cold)
1157		static void
1158		clear_out_old_conf(void)
1159		{
1160	<	dlink_node *ptr = NULL, *next_ptr = NULL;
2368	<	struct ConfItem *conf;
2369	<	struct AccessItem *aconf;
2370	<	struct ClassItem *cltmp;
2371	<	struct MatchItem *match_item;
1160	>	dlink_node *node = NULL, *node_next = NULL;
1161		dlink_list *free_items [] = {
1162		&server_items,   &oconf_items,
1163	<	&uconf_items,   &xconf_items, &rxconf_items, &rkconf_items,
1164	<	&nresv_items, &cluster_items,  &service_items, NULL
1163	>	&uconf_items,   &xconf_items,
1164	>	&nresv_items, &cluster_items,  &service_items, &cresv_items, NULL
1165		};
1166
1167		dlink_list ** iterator = free_items; /* C is dumb */
#	Line 2380 | Line 1169 | clear_out_old_conf(void)
1169		/* We only need to free anything allocated by yyparse() here.
1170		* Resetting structs, etc, is taken care of by set_default_conf().
1171		*/
1172	<
1173	<	for (; *iterator != NULL; iterator++)
1172	>
1173	>	for (; *iterator; iterator++)
1174		{
1175	<	DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
1175	>	DLINK_FOREACH_SAFE(node, node_next, (*iterator)->head)
1176		{
1177	<	conf = ptr->data;
2389	<	/* XXX This is less than pretty */
2390	<	if (conf->type == SERVER_TYPE)
2391	<	{
2392	<	aconf = map_to_conf(conf);
1177	>	struct MaskItem *conf = node->data;
1178
1179	<	if (aconf->clients != 0)
2395	<	{
2396	<	SetConfIllegal(aconf);
2397	<	dlinkDelete(&conf->node, &server_items);
2398	<	}
2399	<	else
2400	<	{
2401	<	delete_conf_item(conf);
2402	<	}
2403	<	}
2404	<	else if (conf->type == OPER_TYPE)
2405	<	{
2406	<	aconf = map_to_conf(conf);
1179	>	conf->active = 0;
1180
1181	<	if (aconf->clients != 0)
2409	<	{
2410	<	SetConfIllegal(aconf);
2411	<	dlinkDelete(&conf->node, &oconf_items);
2412	<	}
2413	<	else
2414	<	{
2415	<	delete_conf_item(conf);
2416	<	}
2417	<	}
2418	<	else if (conf->type == XLINE_TYPE  ||
2419	<	conf->type == RXLINE_TYPE ||
2420	<	conf->type == RKLINE_TYPE)
1181	>	if (!IsConfDatabase(conf))
1182		{
1183	<	/* temporary (r)xlines are also on
2423	<	* the (r)xconf items list */
2424	<	if (conf->flags & CONF_FLAGS_TEMPORARY)
2425	<	continue;
1183	>	dlinkDelete(&conf->node, *iterator);
1184
1185	<	delete_conf_item(conf);
1186	<	}
2429	<	else
2430	<	{
2431	<	delete_conf_item(conf);
1185	>	if (!conf->ref_count)
1186	>	conf_free(conf);
1187		}
1188		}
1189		}
1190
1191	+	motd_clear();
1192	+
1193		/*
1194	<	* don't delete the class table, rather mark all entries
1195	<	* for deletion. The table is cleaned up by check_class. - avalon
1194	>	* Don't delete the class table, rather mark all entries for deletion.
1195	>	* The table is cleaned up by class_delete_marked. - avalon
1196		*/
1197	<	DLINK_FOREACH(ptr, class_items.head)
2441	<	{
2442	<	cltmp = map_to_conf(ptr->data);
2443	<
2444	<	if (ptr != class_items.tail)  /* never mark the "default" class */
2445	<	cltmp->active = 0;
2446	<	}
1197	>	class_mark_for_deletion();
1198
1199		clear_out_address_conf();
1200
1201	<	/* clean out module paths */
1201	>	/* Clean out module paths */
1202		mod_clear_paths();
1203
1204	<	/* clean out ServerInfo */
1205	<	MyFree(ServerInfo.description);
1206	<	ServerInfo.description = NULL;
1207	<	MyFree(ServerInfo.network_name);
1208	<	ServerInfo.network_name = NULL;
1209	<	MyFree(ServerInfo.network_desc);
1210	<	ServerInfo.network_desc = NULL;
1211	<	MyFree(ConfigFileEntry.egdpool_path);
1212	<	ConfigFileEntry.egdpool_path = NULL;
1204	>	pseudo_clear();
1205	>
1206	>	/* Clean out ConfigServerInfo */
1207	>	MyFree(ConfigServerInfo.description);
1208	>	ConfigServerInfo.description = NULL;
1209	>	MyFree(ConfigServerInfo.network_name);
1210	>	ConfigServerInfo.network_name = NULL;
1211	>	MyFree(ConfigServerInfo.network_desc);
1212	>	ConfigServerInfo.network_desc = NULL;
1213		#ifdef HAVE_LIBCRYPTO
1214	<	if (ServerInfo.rsa_private_key != NULL)
1214	>	if (ConfigServerInfo.rsa_private_key)
1215		{
1216	<	RSA_free(ServerInfo.rsa_private_key);
1217	<	ServerInfo.rsa_private_key = NULL;
1216	>	RSA_free(ConfigServerInfo.rsa_private_key);
1217	>	ConfigServerInfo.rsa_private_key = NULL;
1218		}
1219
1220	<	MyFree(ServerInfo.rsa_private_key_file);
1221	<	ServerInfo.rsa_private_key_file = NULL;
2471	<
2472	<	if (ServerInfo.server_ctx)
2473	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2|
2474	<	SSL_OP_NO_SSLv3|
2475	<	SSL_OP_NO_TLSv1);
2476	<	if (ServerInfo.client_ctx)
2477	<	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv2|
2478	<	SSL_OP_NO_SSLv3|
2479	<	SSL_OP_NO_TLSv1);
1220	>	MyFree(ConfigServerInfo.rsa_private_key_file);
1221	>	ConfigServerInfo.rsa_private_key_file = NULL;
1222		#endif
1223
1224	<	/* clean out old resvs from the conf */
1225	<	clear_conf_resv();
1226	<
1227	<	/* clean out AdminInfo */
1228	<	MyFree(AdminInfo.name);
1229	<	AdminInfo.name = NULL;
1230	<	MyFree(AdminInfo.email);
2489	<	AdminInfo.email = NULL;
2490	<	MyFree(AdminInfo.description);
2491	<	AdminInfo.description = NULL;
2492	<
2493	<	/* operator{} and class{} blocks are freed above */
2494	<	/* clean out listeners */
2495	<	close_listeners();
2496	<
2497	<	/* auth{}, quarantine{}, shared{}, connect{}, kill{}, deny{},
2498	<	* exempt{} and gecos{} blocks are freed above too
2499	<	*/
2500	<
2501	<	/* clean out general */
2502	<	MyFree(ConfigFileEntry.service_name);
2503	<	ConfigFileEntry.service_name = NULL;
1224	>	/* Clean out ConfigAdminInfo */
1225	>	MyFree(ConfigAdminInfo.name);
1226	>	ConfigAdminInfo.name = NULL;
1227	>	MyFree(ConfigAdminInfo.email);
1228	>	ConfigAdminInfo.email = NULL;
1229	>	MyFree(ConfigAdminInfo.description);
1230	>	ConfigAdminInfo.description = NULL;
1231
1232	<	delete_isupport("INVEX");
1233	<	delete_isupport("EXCEPTS");
1232	>	/* Clean out listeners */
1233	>	listener_close_marked();
1234		}
1235
1236	<	/* flush_deleted_I_P()
1236	>	/* read_conf_files()
1237		*
1238	<	* inputs       - none
1238	>	* inputs       - cold start YES or NO
1239		* output       - none
1240	<	* side effects - This function removes I/P conf items
2514	<	*/
2515	<	static void
2516	<	flush_deleted_I_P(void)
2517	<	{
2518	<	dlink_node *ptr;
2519	<	dlink_node *next_ptr;
2520	<	struct ConfItem *conf;
2521	<	struct AccessItem *aconf;
2522	<	dlink_list * free_items [] = {
2523	<	&server_items, &oconf_items, NULL
2524	<	};
2525	<	dlink_list ** iterator = free_items; /* C is dumb */
2526	<
2527	<	/* flush out deleted I and P lines
2528	<	* although still in use.
2529	<	*/
2530	<	for (; *iterator != NULL; iterator++)
2531	<	{
2532	<	DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
2533	<	{
2534	<	conf = ptr->data;
2535	<	aconf = (struct AccessItem *)map_to_conf(conf);
2536	<
2537	<	if (IsConfIllegal(aconf))
2538	<	{
2539	<	dlinkDelete(ptr, *iterator);
2540	<
2541	<	if (aconf->clients == 0)
2542	<	delete_conf_item(conf);
2543	<	}
2544	<	}
2545	<	}
2546	<	}
2547	<
2548	<	/* get_conf_name()
2549	<	*
2550	<	* inputs       - type of conf file to return name of file for
2551	<	* output       - pointer to filename for type of conf
2552	<	* side effects - none
1240	>	* side effects - read all conf files needed, ircd.conf kline.conf etc.
1241		*/
1242	<	const char *
1243	<	get_conf_name(ConfType type)
1242	>	void
1243	>	read_conf_files(int cold)
1244		{
1245	<	switch (type)
1246	<	{
1247	<	case CONF_TYPE:
2560	<	return ConfigFileEntry.configfile;
2561	<	break;
2562	<	case KLINE_TYPE:
2563	<	return ConfigFileEntry.klinefile;
2564	<	break;
2565	<	case RKLINE_TYPE:
2566	<	return ConfigFileEntry.rklinefile;
2567	<	break;
2568	<	case DLINE_TYPE:
2569	<	return ConfigFileEntry.dlinefile;
2570	<	break;
2571	<	case XLINE_TYPE:
2572	<	return ConfigFileEntry.xlinefile;
2573	<	break;
2574	<	case RXLINE_TYPE:
2575	<	return ConfigFileEntry.rxlinefile;
2576	<	break;
2577	<	case CRESV_TYPE:
2578	<	return ConfigFileEntry.cresvfile;
2579	<	break;
2580	<	case NRESV_TYPE:
2581	<	return ConfigFileEntry.nresvfile;
2582	<	break;
2583	<	case GLINE_TYPE:
2584	<	return ConfigFileEntry.glinefile;
2585	<	break;
1245	>	const char *filename = NULL;
1246	>	char chanmodes[IRCD_BUFSIZE] = "";
1247	>	char chanlimit[IRCD_BUFSIZE] = "";
1248
1249	<	default:
1250	<	return NULL;  /* This should NEVER HAPPEN since we call this function
2589	<	only with the above values, this will cause us to core
2590	<	at some point if this happens so we know where it was */
2591	<	}
2592	<	}
1249	>	conf_parser_ctx.boot = cold;
1250	>	filename = ConfigGeneral.configfile;
1251
1252	<	#define BAD_PING (-1)
1252	>	/* We need to know the initial filename for the yyerror() to report
1253	>	FIXME: The full path is in conffilenamebuf first time since we
1254	>	don't know anything else
1255
1256	<	/* get_conf_ping()
1257	<	*
1258	<	* inputs       - pointer to struct AccessItem
2599	<	*              - pointer to a variable that receives ping warning time
2600	<	* output       - ping frequency
2601	<	* side effects - NONE
2602	<	*/
2603	<	static int
2604	<	get_conf_ping(struct ConfItem *conf, int *pingwarn)
2605	<	{
2606	<	struct ClassItem *aclass;
2607	<	struct AccessItem *aconf;
1256	>	- Gozem 2002-07-21
1257	>	*/
1258	>	strlcpy(conffilebuf, filename, sizeof(conffilebuf));
1259
1260	<	if (conf != NULL)
1260	>	if ((conf_parser_ctx.conf_file = fopen(filename, "r")) == NULL)
1261		{
1262	<	aconf = (struct AccessItem *)map_to_conf(conf);
2612	<	if (aconf->class_ptr != NULL)
1262	>	if (cold)
1263		{
1264	<	aclass = (struct ClassItem *)map_to_conf(aconf->class_ptr);
1265	<	*pingwarn = aclass->ping_warning;
1266	<	return aclass->ping_freq;
1264	>	ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
1265	>	filename, strerror(errno));
1266	>	exit(-1);
1267		}
1268	<	}
2619	<
2620	<	return BAD_PING;
2621	<	}
2622	<
2623	<	/* get_client_class()
2624	<	*
2625	<	* inputs       - pointer to client struct
2626	<	* output       - pointer to name of class
2627	<	* side effects - NONE
2628	<	*/
2629	<	const char *
2630	<	get_client_class(struct Client *target_p)
2631	<	{
2632	<	dlink_node *cnode = NULL;
2633	<	struct AccessItem *aconf = NULL;
2634	<
2635	<	assert(!IsMe(target_p));
2636	<
2637	<	if ((cnode = target_p->localClient->confs.head))
2638	<	{
2639	<	struct ConfItem *conf = cnode->data;
2640	<
2641	<	assert((conf->type == CLIENT_TYPE) || (conf->type == SERVER_TYPE) ||
2642	<	(conf->type == OPER_TYPE));
2643	<
2644	<	aconf = map_to_conf(conf);
2645	<	if (aconf->class_ptr != NULL)
2646	<	return aconf->class_ptr->name;
2647	<	}
2648	<
2649	<	return "default";
2650	<	}
2651	<
2652	<	/* get_client_ping()
2653	<	*
2654	<	* inputs       - pointer to client struct
2655	<	*              - pointer to a variable that receives ping warning time
2656	<	* output       - ping frequency
2657	<	* side effects - NONE
2658	<	*/
2659	<	int
2660	<	get_client_ping(struct Client *target_p, int *pingwarn)
2661	<	{
2662	<	int ping = 0;
2663	<	dlink_node *cnode = NULL;
2664	<
2665	<	if ((cnode = target_p->localClient->confs.head))
2666	<	{
2667	<	struct ConfItem *conf = cnode->data;
2668	<
2669	<	assert((conf->type == CLIENT_TYPE) || (conf->type == SERVER_TYPE) ||
2670	<	(conf->type == OPER_TYPE));
2671	<
2672	<	ping = get_conf_ping(conf, pingwarn);
2673	<	if (ping > 0)
2674	<	return ping;
2675	<	}
2676	<
2677	<	*pingwarn = 0;
2678	<	return DEFAULT_PINGFREQUENCY;
2679	<	}
2680	<
2681	<	/* find_class()
2682	<	*
2683	<	* inputs       - string name of class
2684	<	* output       - corresponding Class pointer
2685	<	* side effects - NONE
2686	<	*/
2687	<	struct ConfItem *
2688	<	find_class(const char *classname)
2689	<	{
2690	<	struct ConfItem *conf;
2691	<
2692	<	if ((conf = find_exact_name_conf(CLASS_TYPE, NULL, classname, NULL, NULL)) != NULL)
2693	<	return conf;
2694	<
2695	<	return class_default;
2696	<	}
2697	<
2698	<	/* check_class()
2699	<	*
2700	<	* inputs       - NONE
2701	<	* output       - NONE
2702	<	* side effects -
2703	<	*/
2704	<	void
2705	<	check_class(void)
2706	<	{
2707	<	dlink_node *ptr = NULL, *next_ptr = NULL;
2708	<
2709	<	DLINK_FOREACH_SAFE(ptr, next_ptr, class_items.head)
2710	<	{
2711	<	struct ClassItem *aclass = map_to_conf(ptr->data);
2712	<
2713	<	if (!aclass->active && !aclass->curr_user_count)
1268	>	else
1269		{
1270	<	destroy_cidr_class(aclass);
1271	<	delete_conf_item(ptr->data);
1270	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1271	>	"Unable to read configuration file '%s': %s",
1272	>	filename, strerror(errno));
1273	>	return;
1274		}
1275		}
2719	–	}
2720	–
2721	–	/* init_class()
2722	–	*
2723	–	* inputs       - NONE
2724	–	* output       - NONE
2725	–	* side effects -
2726	–	*/
2727	–	void
2728	–	init_class(void)
2729	–	{
2730	–	struct ClassItem *aclass;
2731	–
2732	–	class_default = make_conf_item(CLASS_TYPE);
2733	–
2734	–	aclass = map_to_conf(class_default);
2735	–	aclass->active = 1;
2736	–	DupString(class_default->name, "default");
2737	–	aclass->con_freq  = DEFAULT_CONNECTFREQUENCY;
2738	–	aclass->ping_freq = DEFAULT_PINGFREQUENCY;
2739	–	aclass->max_total = MAXIMUM_LINKS_DEFAULT;
2740	–	aclass->max_sendq = DEFAULT_SENDQ;
1276
1277	<	client_check_cb = register_callback("check_client", check_client);
1278	<	}
2744	<
2745	<	/* get_sendq()
2746	<	*
2747	<	* inputs       - pointer to client
2748	<	* output       - sendq for this client as found from its class
2749	<	* side effects - NONE
2750	<	*/
2751	<	unsigned int
2752	<	get_sendq(struct Client *client_p)
2753	<	{
2754	<	unsigned int sendq = DEFAULT_SENDQ;
2755	<	dlink_node *cnode;
2756	<	struct ConfItem *class_conf;
2757	<	struct ClassItem *aclass;
2758	<	struct AccessItem *aconf;
2759	<
2760	<	assert(!IsMe(client_p));
2761	<
2762	<	if ((cnode = client_p->localClient->confs.head))
2763	<	{
2764	<	struct ConfItem *conf = cnode->data;
1277	>	if (!cold)
1278	>	clear_out_old_conf();
1279
1280	<	assert((conf->type == CLIENT_TYPE) || (conf->type == SERVER_TYPE) ||
1281	<	(conf->type == OPER_TYPE));
1280	>	read_conf(conf_parser_ctx.conf_file);
1281	>	fclose(conf_parser_ctx.conf_file);
1282
1283	<	aconf = map_to_conf(conf);
1283	>	log_reopen_all();
1284
1285	<	if ((class_conf = aconf->class_ptr) == NULL)
1286	<	return DEFAULT_SENDQ; /* TBV: shouldn't be possible at all */
1285	>	isupport_add("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
1286	>	isupport_add("NETWORK", ConfigServerInfo.network_name, -1);
1287
1288	<	aclass = map_to_conf(class_conf);
1289	<	sendq = aclass->max_sendq;
1290	<	return sendq;
1291	<	}
1288	>	snprintf(chanmodes, sizeof(chanmodes), "beI:%d", ConfigChannel.max_bans);
1289	>	isupport_add("MAXLIST", chanmodes, -1);
1290	>	isupport_add("MAXTARGETS", NULL, ConfigGeneral.max_targets);
1291	>	isupport_add("CHANTYPES", "#", -1);
1292	>
1293	>	snprintf(chanlimit, sizeof(chanlimit), "#:%d",
1294	>	ConfigChannel.max_channels);
1295	>	isupport_add("CHANLIMIT", chanlimit, -1);
1296	>	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,cimnprstCMORS");
1297	>	isupport_add("CHANNELLEN", NULL, CHANNELLEN);
1298	>	isupport_add("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
1299	>	isupport_add("CHANMODES", chanmodes, -1);
1300
1301	<	/* XXX return a default?
1302	<	* if here, then there wasn't an attached conf with a sendq
1303	<	* that is very bad -Dianora
1301	>	/*
1302	>	* message_locale may have changed.  rebuild isupport since it relies
1303	>	* on strlen(form_str(RPL_ISUPPORT))
1304		*/
1305	<	return DEFAULT_SENDQ;
1305	>	isupport_rebuild();
1306		}
1307
1308		/* conf_add_class_to_conf()
1309		*
1310		* inputs       - pointer to config item
1311		* output       - NONE
1312	<	* side effects - Add a class pointer to a conf
1312	>	* side effects - Add a class pointer to a conf
1313		*/
1314		void
1315	<	conf_add_class_to_conf(struct ConfItem *conf, const char *class_name)
1315	>	conf_add_class_to_conf(struct MaskItem *conf, const char *name)
1316		{
1317	<	struct AccessItem *aconf = map_to_conf(conf);
2796	<	struct ClassItem *class = NULL;
2797	<
2798	<	if (class_name == NULL)
1317	>	if (EmptyString(name) || (conf->class = class_find(name, 1)) == NULL)
1318		{
1319	<	aconf->class_ptr = class_default;
2801	<
2802	<	if (conf->type == CLIENT_TYPE)
2803	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2804	<	"Warning *** Defaulting to default class for %s@%s",
2805	<	aconf->user, aconf->host);
2806	<	else
2807	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2808	<	"Warning *** Defaulting to default class for %s",
2809	<	conf->name);
2810	<	}
2811	<	else
2812	<	aconf->class_ptr = find_class(class_name);
1319	>	conf->class = class_default;
1320
1321	<	if (aconf->class_ptr)
1322	<	class = map_to_conf(aconf->class_ptr);
1323	<
1324	<	if (aconf->class_ptr == NULL || !class->active)
2818	<	{
2819	<	if (conf->type == CLIENT_TYPE)
2820	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2821	<	"Warning *** Defaulting to default class for %s@%s",
2822	<	aconf->user, aconf->host);
1321	>	if (conf->type == CONF_CLIENT || conf->type == CONF_OPER)
1322	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1323	>	"Warning *** Defaulting to default class for %s@%s",
1324	>	conf->user, conf->host);
1325		else
1326	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1327	<	"Warning *** Defaulting to default class for %s",
1328	<	conf->name);
2827	<	aconf->class_ptr = class_default;
2828	<	}
2829	<	}
2830	<
2831	<	/* conf_add_server()
2832	<	*
2833	<	* inputs       - pointer to config item
2834	<	*              - pointer to link count already on this conf
2835	<	* output       - NONE
2836	<	* side effects - Add a connect block
2837	<	*/
2838	<	int
2839	<	conf_add_server(struct ConfItem *conf, const char *class_name)
2840	<	{
2841	<	struct AccessItem *aconf = map_to_conf(conf);
2842	<
2843	<	conf_add_class_to_conf(conf, class_name);
2844	<
2845	<	if (!aconf->host || !conf->name)
2846	<	{
2847	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Bad connect block");
2848	<	ilog(LOG_TYPE_IRCD, "Bad connect block");
2849	<	return -1;
2850	<	}
2851	<
2852	<	if (EmptyString(aconf->passwd))
2853	<	{
2854	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Bad connect block, name %s",
2855	<	conf->name);
2856	<	ilog(LOG_TYPE_IRCD, "Bad connect block, host %s", conf->name);
2857	<	return -1;
1326	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1327	>	"Warning *** Defaulting to default class for %s",
1328	>	conf->name);
1329		}
2859	–
2860	–	lookup_confhost(conf);
2861	–
2862	–	return 0;
1330		}
1331
1332		/* yyerror()
#	Line 2877 | Line 1344 | yyerror(const char *msg)
1344		return;
1345
1346		strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1347	<	sendto_realops_flags(UMODE_ALL, L_ALL, "\"%s\", line %u: %s: %s",
1347	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1348	>	"\"%s\", line %u: %s: %s",
1349	>	conffilebuf, lineno + 1, msg, newlinebuf);
1350	>	ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1351	>	conffilebuf, lineno + 1, msg, newlinebuf);
1352	>	}
1353	>
1354	>	void
1355	>	conf_error_report(const char *msg)
1356	>	{
1357	>	char newlinebuf[IRCD_BUFSIZE];
1358	>
1359	>	strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1360	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1361	>	"\"%s\", line %u: %s: %s",
1362		conffilebuf, lineno + 1, msg, newlinebuf);
1363		ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1364		conffilebuf, lineno + 1, msg, newlinebuf);
#	Line 2885 | Line 1366 | yyerror(const char *msg)
1366
1367		/*
1368		* valid_tkline()
1369	<	*
1369	>	*
1370		* inputs       - pointer to ascii string to check
1371		*              - whether the specified time is in seconds or minutes
1372		* output       - -1 not enough parameters
#	Line 2894 | Line 1375 | yyerror(const char *msg)
1375		* Originally written by Dianora (Diane, db@db.net)
1376		*/
1377		time_t
1378	<	valid_tkline(const char *p, int minutes)
1378	>	valid_tkline(const char *data, const int minutes)
1379		{
1380	+	const unsigned char *p = (const unsigned char *)data;
1381	+	unsigned char tmpch = '\0';
1382		time_t result = 0;
1383
1384	<	for (; *p; ++p)
1384	>	while ((tmpch = *p++))
1385		{
1386	<	if (!IsDigit(*p))
1386	>	if (!IsDigit(tmpch))
1387		return 0;
1388
1389		result *= 10;
1390	<	result += ((*p) & 0xF);
1390	>	result += (tmpch & 0xF);
1391		}
1392
1393		/*
1394	<	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1395	<	* i.e. they specifically use 0, I am going to return 1 instead
1396	<	* as a return value of non-zero is used to flag it as a temporary kline
1394	>	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1395	>	* i.e. they specifically use 0, I am going to return 1 instead as a return
1396	>	* value of non-zero is used to flag it as a temporary kline
1397		*/
1398		if (result == 0)
1399		result = 1;
1400
1401	<	/*
1401	>	/*
1402		* If the incoming time is in seconds convert it to minutes for the purpose
1403		* of this calculation
1404		*/
1405		if (!minutes)
1406	<	result = result / (time_t)60;
1406	>	result = result / 60;
1407
1408		if (result > MAX_TDKLINE_TIME)
1409		result = MAX_TDKLINE_TIME;
1410
1411	<	result = result * (time_t)60;  /* turn it into seconds */
1411	>	result = result * 60;  /* Turn it into seconds */
1412
1413		return result;
1414		}
1415
1416	+	/* valid_wild_card_simple()
1417	+	*
1418	+	* inputs       - data to check for sufficient non-wildcard characters
1419	+	* outputs      - 1 if valid, else 0
1420	+	* side effects - none
1421	+	*/
1422	+	int
1423	+	valid_wild_card_simple(const char *data)
1424	+	{
1425	+	const unsigned char *p = (const unsigned char *)data;
1426	+	unsigned char tmpch = '\0';
1427	+	unsigned int nonwild = 0, wild = 0;
1428	+
1429	+	while ((tmpch = *p++))
1430	+	{
1431	+	if (tmpch == '\\' && *p)
1432	+	{
1433	+	++p;
1434	+	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1435	+	return 1;
1436	+	}
1437	+	else if (!IsMWildChar(tmpch))
1438	+	{
1439	+	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1440	+	return 1;
1441	+	}
1442	+	else
1443	+	++wild;
1444	+	}
1445	+
1446	+	return !wild;
1447	+	}
1448	+
1449		/* valid_wild_card()
1450		*
1451		* input        - pointer to client
#	Line 2939 | Line 1455 | valid_tkline(const char *p, int minutes)
1455		* side effects - NOTICE is given to source_p if warn is 1
1456		*/
1457		int
1458	<	valid_wild_card(struct Client *source_p, int warn, int count, ...)
1458	>	valid_wild_card(struct Client *source_p, int count, ...)
1459		{
1460	<	char *p;
1461	<	char tmpch;
2946	<	int nonwild = 0;
1460	>	unsigned char tmpch = '\0';
1461	>	unsigned int nonwild = 0;
1462		va_list args;
1463
1464		/*
#	Line 2962 | Line 1477 | valid_wild_card(struct Client *source_p,
1477
1478		while (count--)
1479		{
1480	<	p = va_arg(args, char *);
1480	>	const unsigned char *p = va_arg(args, const unsigned char *);
1481		if (p == NULL)
1482		continue;
1483
#	Line 2974 | Line 1489 | valid_wild_card(struct Client *source_p,
1489		* If we find enough non-wild characters, we can
1490		* break - no point in searching further.
1491		*/
1492	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard)
1492	>	if (++nonwild >= ConfigGeneral.min_nonwildcard)
1493	>	{
1494	>	va_end(args);
1495		return 1;
1496	+	}
1497		}
1498		}
1499		}
1500
1501	<	if (warn)
1502	<	sendto_one(source_p, ":%s NOTICE %s :Please include at least %d non-wildcard characters with the mask",
1503	<	me.name, source_p->name, ConfigFileEntry.min_nonwildcard);
1501	>	if (IsClient(source_p))
1502	>	sendto_one_notice(source_p, &me,
1503	>	":Please include at least %u non-wildcard characters with the mask",
1504	>	ConfigGeneral.min_nonwildcard);
1505	>	va_end(args);
1506	>	return 0;
1507	>	}
1508	>
1509	>	/* find_user_host()
1510	>	*
1511	>	* inputs       - pointer to client placing kline
1512	>	*              - pointer to user_host_or_nick
1513	>	*              - pointer to user buffer
1514	>	*              - pointer to host buffer
1515	>	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
1516	>	* side effects -
1517	>	*/
1518	>	static int
1519	>	find_user_host(struct Client *source_p, char *user_host_or_nick,
1520	>	char *luser, char *lhost)
1521	>	{
1522	>	struct Client *target_p = NULL;
1523	>	char *hostp = NULL;
1524	>
1525	>	if (lhost == NULL)
1526	>	{
1527	>	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
1528	>	return 1;
1529	>	}
1530	>
1531	>	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
1532	>	{
1533	>	/* Explicit user@host mask given */
1534	>	if (hostp)                            /* I'm a little user@host */
1535	>	{
1536	>	*(hostp++) = '\0';                       /* short and squat */
1537	>
1538	>	if (*user_host_or_nick)
1539	>	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
1540	>	else
1541	>	strcpy(luser, "*");
1542	>
1543	>	if (*hostp)
1544	>	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
1545	>	else
1546	>	strcpy(lhost, "*");
1547	>	}
1548	>	else
1549	>	{
1550	>	luser[0] = '*';             /* no @ found, assume its *@somehost */
1551	>	luser[1] = '\0';
1552	>	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
1553	>	}
1554	>
1555	>	return 1;
1556	>	}
1557	>	else
1558	>	{
1559	>	/* Try to find user@host mask from nick */
1560	>	/* Okay to use source_p as the first param, because source_p == client_p */
1561	>	if ((target_p =
1562	>	find_chasing(source_p, user_host_or_nick)) == NULL)
1563	>	return 0;  /* find_chasing sends ERR_NOSUCHNICK */
1564	>
1565	>	if (HasFlag(target_p, FLAGS_EXEMPTKLINE))
1566	>	{
1567	>	if (IsClient(source_p))
1568	>	sendto_one_notice(source_p, &me, ":%s is E-lined", target_p->name);
1569	>	return 0;
1570	>	}
1571	>
1572	>	/*
1573	>	* Turn the "user" bit into "*user", blow away '~'
1574	>	* if found in original user name (non-idented)
1575	>	*/
1576	>	strlcpy(luser, target_p->username, USERLEN*4 + 1);
1577	>
1578	>	if (target_p->username[0] == '~')
1579	>	luser[0] = '*';
1580	>
1581	>	if (!strcmp(target_p->sockhost, "0"))
1582	>	strlcpy(lhost, target_p->host, HOSTLEN*4 + 1);
1583	>	else
1584	>	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
1585	>	return 1;
1586	>	}
1587	>
1588		return 0;
1589		}
1590
#	Line 2996 | Line 1598 | valid_wild_card(struct Client *source_p,
1598		*              - parse_flags bit map of things to test
1599		*              - pointer to user or string to parse into
1600		*              - pointer to host or NULL to parse into if non NULL
1601	<	*              - pointer to optional tkline time or NULL
1601	>	*              - pointer to optional tkline time or NULL
1602		*              - pointer to target_server to parse into if non NULL
1603		*              - pointer to reason to parse into
1604		*
1605	<	* output       - 1 if valid, -1 if not valid
1605	>	* output       - 1 if valid, 0 if not valid
1606		* side effects - A generalised k/d/x etc. line parser,
1607		*               "ALINE [time] user@host|string [ON] target :reason"
1608		*                will parse returning a parsed user, host if
#	Line 3018 | Line 1620 | valid_wild_card(struct Client *source_p,
1620		*/
1621		int
1622		parse_aline(const char *cmd, struct Client *source_p,
1623	<	int parc, char **parv,
1624	<	int parse_flags, char **up_p, char **h_p, time_t *tkline_time,
1625	<	char **target_server, char **reason)
1623	>	int parc, char **parv,
1624	>	int parse_flags, char **up_p, char **h_p, time_t *tkline_time,
1625	>	char **target_server, char **reason)
1626		{
1627		int found_tkline_time=0;
1628	<	static char def_reason[] = "No Reason";
1628	>	static char default_reason[] = CONF_NOREASON;
1629		static char user[USERLEN*4+1];
1630		static char host[HOSTLEN*4+1];
1631
#	Line 3032 | Line 1634 | parse_aline(const char *cmd, struct Clie
1634
1635		found_tkline_time = valid_tkline(*parv, TK_MINUTES);
1636
1637	<	if (found_tkline_time != 0)
1637	>	if (found_tkline_time)
1638		{
1639		parv++;
1640		parc--;
1641
1642	<	if (tkline_time != NULL)
1642	>	if (tkline_time)
1643		*tkline_time = found_tkline_time;
1644		else
1645		{
1646	<	sendto_one(source_p, ":%s NOTICE %s :temp_line not supported by %s",
1647	<	me.name, source_p->name, cmd);
3046	<	return -1;
1646	>	sendto_one_notice(source_p, &me, ":temp_line not supported by %s", cmd);
1647	>	return 0;
1648		}
1649		}
1650
1651		if (parc == 0)
1652		{
1653	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1654	<	me.name, source_p->name, cmd);
3054	<	return -1;
1653	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1654	>	return 0;
1655		}
1656
1657		if (h_p == NULL)
1658		*up_p = *parv;
1659		else
1660		{
1661	<	if (find_user_host(source_p, *parv, user, host, parse_flags) == 0)
1662	<	return -1;
1661	>	if (find_user_host(source_p, *parv, user, host) == 0)
1662	>	return 0;
1663
1664		*up_p = user;
1665		*h_p = host;
1666		}
1667	<
1667	>
1668		parc--;
1669		parv++;
1670
1671	<	if (parc != 0)
1671	>	if (parc)
1672		{
1673		if (irccmp(*parv, "ON") == 0)
1674		{
1675		parc--;
1676		parv++;
1677
3078	–	if (target_server == NULL)
3079	–	{
3080	–	sendto_one(source_p, ":%s NOTICE %s :ON server not supported by %s",
3081	–	me.name, source_p->name, cmd);
3082	–	return -1;
3083	–	}
3084	–
1678		if (!HasOFlag(source_p, OPER_FLAG_REMOTEBAN))
1679		{
1680	<	sendto_one(source_p, form_str(ERR_NOPRIVS),
1681	<	me.name, source_p->name, "remoteban");
3089	<	return -1;
1680	>	sendto_one_numeric(source_p, &me, ERR_NOPRIVS, "remoteban");
1681	>	return 0;
1682		}
1683
1684		if (parc == 0 || EmptyString(*parv))
1685		{
1686	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1687	<	me.name, source_p->name, cmd);
3096	<	return -1;
1686	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1687	>	return 0;
1688		}
1689
1690		*target_server = *parv;
#	Line 3105 | Line 1696 | parse_aline(const char *cmd, struct Clie
1696		/* Make sure target_server *is* NULL if no ON server found
1697		* caller probably NULL'd it first, but no harm to do it again -db
1698		*/
1699	<	if (target_server != NULL)
1700	<	*target_server = NULL;
1699	>	if (target_server)
1700	>	*target_server = NULL;
1701		}
1702		}
1703
1704	<	if (h_p != NULL)
1704	>	if (h_p)
1705		{
1706	<	if (strchr(user, '!') != NULL)
1706	>	if (strchr(user, '!'))
1707		{
1708	<	sendto_one(source_p, ":%s NOTICE %s :Invalid character '!' in kline",
1709	<	me.name, source_p->name);
3119	<	return -1;
1708	>	sendto_one_notice(source_p, &me, ":Invalid character '!' in kline");
1709	>	return 0;
1710		}
1711
1712	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 2, *up_p, *h_p))
1713	<	return -1;
1712	>	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 2, *up_p, *h_p))
1713	>	return 0;
1714		}
1715		else
1716	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 1, *up_p))
1717	<	return -1;
1716	>	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, *up_p))
1717	>	return 0;
1718
1719	<	if (reason != NULL)
1719	>	if (reason)
1720		{
1721	<	if (parc != 0 && !EmptyString(*parv))
3132	<	{
1721	>	if (parc && !EmptyString(*parv))
1722		*reason = *parv;
3134	–	if (!valid_comment(source_p, *reason, 1))
3135	–	return -1;
3136	–	}
1723		else
1724	<	*reason = def_reason;
1724	>	*reason = default_reason;
1725		}
1726
1727		return 1;
1728		}
1729
3144	–	/* find_user_host()
3145	–	*
3146	–	* inputs       - pointer to client placing kline
3147	–	*              - pointer to user_host_or_nick
3148	–	*              - pointer to user buffer
3149	–	*              - pointer to host buffer
3150	–	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
3151	–	* side effects -
3152	–	*/
3153	–	static int
3154	–	find_user_host(struct Client *source_p, char *user_host_or_nick,
3155	–	char *luser, char *lhost, unsigned int flags)
3156	–	{
3157	–	struct Client *target_p = NULL;
3158	–	char *hostp = NULL;
3159	–
3160	–	if (lhost == NULL)
3161	–	{
3162	–	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
3163	–	return 1;
3164	–	}
3165	–
3166	–	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
3167	–	{
3168	–	/* Explicit user@host mask given */
3169	–
3170	–	if (hostp != NULL)                            /* I'm a little user@host */
3171	–	{
3172	–	*(hostp++) = '\0';                       /* short and squat */
3173	–	if (*user_host_or_nick)
3174	–	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
3175	–	else
3176	–	strcpy(luser, "*");
3177	–	if (*hostp)
3178	–	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
3179	–	else
3180	–	strcpy(lhost, "*");
3181	–	}
3182	–	else
3183	–	{
3184	–	luser[0] = '*';             /* no @ found, assume its *@somehost */
3185	–	luser[1] = '\0';
3186	–	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
3187	–	}
3188	–
3189	–	return 1;
3190	–	}
3191	–	else if (!(flags & NOUSERLOOKUP))
3192	–	{
3193	–	/* Try to find user@host mask from nick */
3194	–	/* Okay to use source_p as the first param, because source_p == client_p */
3195	–	if ((target_p =
3196	–	find_chasing(source_p, source_p, user_host_or_nick, NULL)) == NULL)
3197	–	return 0;
3198	–
3199	–	if (IsExemptKline(target_p))
3200	–	{
3201	–	if (!IsServer(source_p))
3202	–	sendto_one(source_p,
3203	–	":%s NOTICE %s :%s is E-lined",
3204	–	me.name, source_p->name, target_p->name);
3205	–	return 0;
3206	–	}
3207	–
3208	–	/*
3209	–	* turn the "user" bit into "*user", blow away '~'
3210	–	* if found in original user name (non-idented)
3211	–	*/
3212	–	strlcpy(luser, target_p->username, USERLEN*4 + 1);
3213	–
3214	–	if (target_p->username[0] == '~')
3215	–	luser[0] = '*';
3216	–
3217	–	if (target_p->sockhost[0] == '\0' ||
3218	–	(target_p->sockhost[0] == '0' && target_p->sockhost[1] == '\0'))
3219	–	strlcpy(lhost, target_p->host, HOSTLEN*4 + 1);
3220	–	else
3221	–	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
3222	–	return 1;
3223	–	}
3224	–
3225	–	return 0;
3226	–	}
3227	–
3228	–	/* valid_comment()
3229	–	*
3230	–	* inputs       - pointer to client
3231	–	*              - pointer to comment
3232	–	* output       - 0 if no valid comment,
3233	–	*              - 1 if valid
3234	–	* side effects - truncates reason where necessary
3235	–	*/
3236	–	int
3237	–	valid_comment(struct Client *source_p, char *comment, int warn)
3238	–	{
3239	–	if (strchr(comment, '"'))
3240	–	{
3241	–	if (warn)
3242	–	sendto_one(source_p, ":%s NOTICE %s :Invalid character '\"' in comment",
3243	–	me.name, source_p->name);
3244	–	return 0;
3245	–	}
3246	–
3247	–	if (strlen(comment) > REASONLEN)
3248	–	comment[REASONLEN-1] = '\0';
3249	–
3250	–	return 1;
3251	–	}
3252	–
1730		/* match_conf_password()
1731		*
1732		* inputs       - pointer to given password
#	Line 3258 | Line 1735 | valid_comment(struct Client *source_p, c
1735		* side effects - none
1736		*/
1737		int
1738	<	match_conf_password(const char *password, const struct AccessItem *aconf)
1738	>	match_conf_password(const char *password, const struct MaskItem *conf)
1739		{
1740		const char *encr = NULL;
1741
1742	<	if (EmptyString(password) || EmptyString(aconf->passwd))
1742	>	if (EmptyString(password) || EmptyString(conf->passwd))
1743		return 0;
1744
1745	<	if (aconf->flags & CONF_FLAGS_ENCRYPTED)
1746	<	encr = crypt(password, aconf->passwd);
1745	>	if (conf->flags & CONF_FLAGS_ENCRYPTED)
1746	>	encr = crypt(password, conf->passwd);
1747		else
1748		encr = password;
1749
1750	<	return !strcmp(encr, aconf->passwd);
1750	>	return encr && !strcmp(encr, conf->passwd);
1751		}
1752
1753		/*
#	Line 3278 | Line 1755 | match_conf_password(const char *password
1755		*
1756		* inputs       - client sending the cluster
1757		*              - command name "KLINE" "XLINE" etc.
1758	<	*              - capab -- CAP_KLN etc. from s_serv.h
1758	>	*              - capab -- CAPAB_KLN etc. from server.h
1759		*              - cluster type -- CLUSTER_KLINE etc. from conf.h
1760		*              - pattern and args to send along
1761		* output       - none
#	Line 3286 | Line 1763 | match_conf_password(const char *password
1763		*                along to all servers that match capab and cluster type
1764		*/
1765		void
1766	<	cluster_a_line(struct Client *source_p, const char *command,
1767	<	int capab, int cluster_type, const char *pattern, ...)
1766	>	cluster_a_line(struct Client *source_p, const char *command, unsigned int capab,
1767	>	unsigned int cluster_type, const char *pattern, ...)
1768		{
1769		va_list args;
1770	<	char buffer[IRCD_BUFSIZE];
1771	<	const dlink_node *ptr = NULL;
1770	>	char buffer[IRCD_BUFSIZE] = "";
1771	>	const dlink_node *node = NULL;
1772
1773		va_start(args, pattern);
1774		vsnprintf(buffer, sizeof(buffer), pattern, args);
1775		va_end(args);
1776
1777	<	DLINK_FOREACH(ptr, cluster_items.head)
1777	>	DLINK_FOREACH(node, cluster_items.head)
1778		{
1779	<	const struct ConfItem *conf = ptr->data;
1779	>	const struct MaskItem *conf = node->data;
1780
1781		if (conf->flags & cluster_type)
1782	<	sendto_match_servs(source_p, conf->name, CAP_CLUSTER|capab,
1783	<	"%s %s %s", command, conf->name, buffer);
1782	>	sendto_match_servs(source_p, conf->name, CAPAB_CLUSTER | capab,
1783	>	"%s %s %s", command, conf->name, buffer);
1784		}
1785		}
1786
#	Line 3342 | Line 1819 | split_nuh(struct split_nuh_item *const i
1819
1820		if (iptr->nickptr)
1821		strlcpy(iptr->nickptr, "*", iptr->nicksize);
1822	+
1823		if (iptr->userptr)
1824		strlcpy(iptr->userptr, "*", iptr->usersize);
1825	+
1826		if (iptr->hostptr)
1827		strlcpy(iptr->hostptr, "*", iptr->hostsize);
1828
#	Line 3351 | Line 1830 | split_nuh(struct split_nuh_item *const i
1830		{
1831		*p = '\0';
1832
1833	<	if (iptr->nickptr && *iptr->nuhmask != '\0')
1833	>	if (iptr->nickptr && *iptr->nuhmask)
1834		strlcpy(iptr->nickptr, iptr->nuhmask, iptr->nicksize);
1835
1836	<	if ((q = strchr(++p, '@'))) {
1836	>	if ((q = strchr(++p, '@')))
1837	>	{
1838		*q++ = '\0';
1839
1840	<	if (*p != '\0')
1840	>	if (*p)
1841		strlcpy(iptr->userptr, p, iptr->usersize);
1842
1843	<	if (*q != '\0')
1843	>	if (*q)
1844		strlcpy(iptr->hostptr, q, iptr->hostsize);
1845		}
1846		else
1847		{
1848	<	if (*p != '\0')
1848	>	if (*p)
1849		strlcpy(iptr->userptr, p, iptr->usersize);
1850		}
1851		}
#	Line 3377 | Line 1857 | split_nuh(struct split_nuh_item *const i
1857		/* if found a @ */
1858		*p++ = '\0';
1859
1860	<	if (*iptr->nuhmask != '\0')
1860	>	if (*iptr->nuhmask)
1861		strlcpy(iptr->userptr, iptr->nuhmask, iptr->usersize);
1862
1863	<	if (*p != '\0')
1863	>	if (*p)
1864		strlcpy(iptr->hostptr, p, iptr->hostsize);
1865		}
1866		else
1867		{
1868	<	/* no @ found */
1868	>	/* No @ found */
1869		if (!iptr->nickptr || strpbrk(iptr->nuhmask, ".:"))
1870		strlcpy(iptr->hostptr, iptr->nuhmask, iptr->hostsize);
1871		else
#	Line 3393 | Line 1873 | split_nuh(struct split_nuh_item *const i
1873		}
1874		}
1875		}
3396	–
3397	–	/*
3398	–	* flags_to_ascii
3399	–	*
3400	–	* inputs       - flags is a bitmask
3401	–	*              - pointer to table of ascii letters corresponding
3402	–	*                to each bit
3403	–	*              - flag 1 for convert ToLower if bit missing
3404	–	*                0 if ignore.
3405	–	* output       - none
3406	–	* side effects - string pointed to by p has bitmap chars written to it
3407	–	*/
3408	–	static void
3409	–	flags_to_ascii(unsigned int flags, const unsigned int bit_table[], char *p,
3410	–	int lowerit)
3411	–	{
3412	–	unsigned int mask = 1;
3413	–	int i = 0;
3414	–
3415	–	for (mask = 1; (mask != 0) && (bit_table[i] != 0); mask <<= 1, i++)
3416	–	{
3417	–	if (flags & mask)
3418	–	*p++ = bit_table[i];
3419	–	else if (lowerit)
3420	–	*p++ = ToLower(bit_table[i]);
3421	–	}
3422	–	*p = '\0';
3423	–	}
3424	–
3425	–	/*
3426	–	* cidr_limit_reached
3427	–	*
3428	–	* inputs       - int flag allowing over_rule of limits
3429	–	*              - pointer to the ip to be added
3430	–	*              - pointer to the class
3431	–	* output       - non zero if limit reached
3432	–	*                0 if limit not reached
3433	–	* side effects -
3434	–	*/
3435	–	static int
3436	–	cidr_limit_reached(int over_rule,
3437	–	struct irc_ssaddr *ip, struct ClassItem *aclass)
3438	–	{
3439	–	dlink_node *ptr = NULL;
3440	–	struct CidrItem *cidr;
3441	–
3442	–	if (aclass->number_per_cidr <= 0)
3443	–	return 0;
3444	–
3445	–	if (ip->ss.ss_family == AF_INET)
3446	–	{
3447	–	if (aclass->cidr_bitlen_ipv4 <= 0)
3448	–	return 0;
3449	–
3450	–	DLINK_FOREACH(ptr, aclass->list_ipv4.head)
3451	–	{
3452	–	cidr = ptr->data;
3453	–	if (match_ipv4(ip, &cidr->mask, aclass->cidr_bitlen_ipv4))
3454	–	{
3455	–	if (!over_rule && (cidr->number_on_this_cidr >= aclass->number_per_cidr))
3456	–	return -1;
3457	–	cidr->number_on_this_cidr++;
3458	–	return 0;
3459	–	}
3460	–	}
3461	–	cidr = MyMalloc(sizeof(struct CidrItem));
3462	–	cidr->number_on_this_cidr = 1;
3463	–	cidr->mask = *ip;
3464	–	mask_addr(&cidr->mask, aclass->cidr_bitlen_ipv4);
3465	–	dlinkAdd(cidr, &cidr->node, &aclass->list_ipv4);
3466	–	}
3467	–	#ifdef IPV6
3468	–	else if (aclass->cidr_bitlen_ipv6 > 0)
3469	–	{
3470	–	DLINK_FOREACH(ptr, aclass->list_ipv6.head)
3471	–	{
3472	–	cidr = ptr->data;
3473	–	if (match_ipv6(ip, &cidr->mask, aclass->cidr_bitlen_ipv6))
3474	–	{
3475	–	if (!over_rule && (cidr->number_on_this_cidr >= aclass->number_per_cidr))
3476	–	return -1;
3477	–	cidr->number_on_this_cidr++;
3478	–	return 0;
3479	–	}
3480	–	}
3481	–	cidr = MyMalloc(sizeof(struct CidrItem));
3482	–	cidr->number_on_this_cidr = 1;
3483	–	cidr->mask = *ip;
3484	–	mask_addr(&cidr->mask, aclass->cidr_bitlen_ipv6);
3485	–	dlinkAdd(cidr, &cidr->node, &aclass->list_ipv6);
3486	–	}
3487	–	#endif
3488	–	return 0;
3489	–	}
3490	–
3491	–	/*
3492	–	* remove_from_cidr_check
3493	–	*
3494	–	* inputs       - pointer to the ip to be removed
3495	–	*              - pointer to the class
3496	–	* output       - NONE
3497	–	* side effects -
3498	–	*/
3499	–	static void
3500	–	remove_from_cidr_check(struct irc_ssaddr *ip, struct ClassItem *aclass)
3501	–	{
3502	–	dlink_node *ptr = NULL;
3503	–	dlink_node *next_ptr = NULL;
3504	–	struct CidrItem *cidr;
3505	–
3506	–	if (aclass->number_per_cidr == 0)
3507	–	return;
3508	–
3509	–	if (ip->ss.ss_family == AF_INET)
3510	–	{
3511	–	if (aclass->cidr_bitlen_ipv4 <= 0)
3512	–	return;
3513	–
3514	–	DLINK_FOREACH_SAFE(ptr, next_ptr, aclass->list_ipv4.head)
3515	–	{
3516	–	cidr = ptr->data;
3517	–	if (match_ipv4(ip, &cidr->mask, aclass->cidr_bitlen_ipv4))
3518	–	{
3519	–	cidr->number_on_this_cidr--;
3520	–	if (cidr->number_on_this_cidr == 0)
3521	–	{
3522	–	dlinkDelete(ptr, &aclass->list_ipv4);
3523	–	MyFree(cidr);
3524	–	return;
3525	–	}
3526	–	}
3527	–	}
3528	–	}
3529	–	#ifdef IPV6
3530	–	else if (aclass->cidr_bitlen_ipv6 > 0)
3531	–	{
3532	–	DLINK_FOREACH_SAFE(ptr, next_ptr, aclass->list_ipv6.head)
3533	–	{
3534	–	cidr = ptr->data;
3535	–	if (match_ipv6(ip, &cidr->mask, aclass->cidr_bitlen_ipv6))
3536	–	{
3537	–	cidr->number_on_this_cidr--;
3538	–	if (cidr->number_on_this_cidr == 0)
3539	–	{
3540	–	dlinkDelete(ptr, &aclass->list_ipv6);
3541	–	MyFree(cidr);
3542	–	return;
3543	–	}
3544	–	}
3545	–	}
3546	–	}
3547	–	#endif
3548	–	}
3549	–
3550	–	static void
3551	–	rebuild_cidr_list(int aftype, struct ConfItem *oldcl, struct ClassItem *newcl,
3552	–	dlink_list *old_list, dlink_list *new_list, int changed)
3553	–	{
3554	–	dlink_node *ptr;
3555	–	struct Client *client_p;
3556	–	struct ConfItem *conf;
3557	–	struct AccessItem *aconf;
3558	–
3559	–	if (!changed)
3560	–	{
3561	–	*new_list = *old_list;
3562	–	old_list->head = old_list->tail = NULL;
3563	–	old_list->length = 0;
3564	–	return;
3565	–	}
3566	–
3567	–	DLINK_FOREACH(ptr, local_client_list.head)
3568	–	{
3569	–	client_p = ptr->data;
3570	–	if (client_p->localClient->aftype != aftype)
3571	–	continue;
3572	–	if (dlink_list_length(&client_p->localClient->confs) == 0)
3573	–	continue;
3574	–
3575	–	conf = client_p->localClient->confs.tail->data;
3576	–	if (conf->type == CLIENT_TYPE)
3577	–	{
3578	–	aconf = map_to_conf(conf);
3579	–	if (aconf->class_ptr == oldcl)
3580	–	cidr_limit_reached(1, &client_p->localClient->ip, newcl);
3581	–	}
3582	–	}
3583	–	}
3584	–
3585	–	/*
3586	–	* rebuild_cidr_class
3587	–	*
3588	–	* inputs       - pointer to old conf
3589	–	*              - pointer to new_class
3590	–	* output       - none
3591	–	* side effects - rebuilds the class link list of cidr blocks
3592	–	*/
3593	–	void
3594	–	rebuild_cidr_class(struct ConfItem *conf, struct ClassItem *new_class)
3595	–	{
3596	–	struct ClassItem *old_class = map_to_conf(conf);
3597	–
3598	–	if (old_class->number_per_cidr > 0 && new_class->number_per_cidr > 0)
3599	–	{
3600	–	if (old_class->cidr_bitlen_ipv4 > 0 && new_class->cidr_bitlen_ipv4 > 0)
3601	–	rebuild_cidr_list(AF_INET, conf, new_class,
3602	–	&old_class->list_ipv4, &new_class->list_ipv4,
3603	–	old_class->cidr_bitlen_ipv4 != new_class->cidr_bitlen_ipv4);
3604	–
3605	–	#ifdef IPV6
3606	–	if (old_class->cidr_bitlen_ipv6 > 0 && new_class->cidr_bitlen_ipv6 > 0)
3607	–	rebuild_cidr_list(AF_INET6, conf, new_class,
3608	–	&old_class->list_ipv6, &new_class->list_ipv6,
3609	–	old_class->cidr_bitlen_ipv6 != new_class->cidr_bitlen_ipv6);
3610	–	#endif
3611	–	}
3612	–
3613	–	destroy_cidr_class(old_class);
3614	–	}
3615	–
3616	–	/*
3617	–	* destroy_cidr_list
3618	–	*
3619	–	* inputs       - pointer to class dlink list of cidr blocks
3620	–	* output       - none
3621	–	* side effects - completely destroys the class link list of cidr blocks
3622	–	*/
3623	–	static void
3624	–	destroy_cidr_list(dlink_list *list)
3625	–	{
3626	–	dlink_node *ptr = NULL, *next_ptr = NULL;
3627	–
3628	–	DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
3629	–	{
3630	–	dlinkDelete(ptr, list);
3631	–	MyFree(ptr->data);
3632	–	}
3633	–	}
3634	–
3635	–	/*
3636	–	* destroy_cidr_class
3637	–	*
3638	–	* inputs       - pointer to class
3639	–	* output       - none
3640	–	* side effects - completely destroys the class link list of cidr blocks
3641	–	*/
3642	–	static void
3643	–	destroy_cidr_class(struct ClassItem *aclass)
3644	–	{
3645	–	destroy_cidr_list(&aclass->list_ipv4);
3646	–	destroy_cidr_list(&aclass->list_ipv6);
3647	–	}

Diff Legend

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