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 1411 by michael, Sat May 12 20:46:53 2012 UTC vs.
ircd-hybrid/trunk/src/conf.c (file contents), Revision 7159 by michael, Thu Jan 28 11:26:51 2016 UTC

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

Diff Legend

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