ViewVC Help

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

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

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

Comparing:
ircd-hybrid-8/src/conf.c (property svn:keywords), Revision 1503 by michael, Tue Aug 14 09:05:58 2012 UTC vs.
ircd-hybrid/trunk/src/conf.c (property svn:keywords), Revision 8500 by michael, Thu Apr 5 13:00:49 2018 UTC

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

Diff Legend

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