ViewVC Help

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

root/svn/ircd-hybrid/branches/8.2.x/src/conf.c

Comparing:
ircd-hybrid-8/src/conf.c (file contents), Revision 1413 by michael, Sat May 26 08:25:12 2012 UTC vs.
ircd-hybrid/branches/8.2.x/src/conf.c (file contents), Revision 7725 by michael, Mon Sep 26 14:59:44 2016 UTC

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

Comparing:
ircd-hybrid-8/src/conf.c (property svn:keywords), Revision 1413 by michael, Sat May 26 08:25:12 2012 UTC vs.
ircd-hybrid/branches/8.2.x/src/conf.c (property svn:keywords), Revision 7725 by michael, Mon Sep 26 14:59:44 2016 UTC

#	Line 1 | Line 1
1	<	Id Revision
1	>	Id

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines