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 1366 by michael, Tue Apr 24 18:35:34 2012 UTC vs.
ircd-hybrid/trunk/src/conf.c (file contents), Revision 6956 by michael, Thu Dec 17 10:54:07 2015 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  conf.c: Configuration file functions.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2002 by the past and present ircd coders, and others.
4	>	*  Copyright (c) 1997-2015 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 16 | Line 15
15		*
16		*  You should have received a copy of the GNU General Public License
17		*  along with this program; if not, write to the Free Software
18	<	*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
18	>	*  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
19		*  USA
20	<	*
21	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file conf.c
23	>	* \brief Configuration file functions.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
28		#include "list.h"
29		#include "ircd_defs.h"
28	–	#include "balloc.h"
30		#include "conf.h"
31	<	#include "s_serv.h"
31	>	#include "conf_pseudo.h"
32	>	#include "server.h"
33		#include "resv.h"
34		#include "channel.h"
35		#include "client.h"
36		#include "event.h"
35	–	#include "hook.h"
37		#include "irc_string.h"
38		#include "s_bsd.h"
39		#include "ircd.h"
#	Line 43 | Line 44
44		#include "fdlist.h"
45		#include "log.h"
46		#include "send.h"
46	–	#include "s_gline.h"
47		#include "memory.h"
48	<	#include "irc_res.h"
48	>	#include "res.h"
49		#include "userhost.h"
50	<	#include "s_user.h"
50	>	#include "user.h"
51		#include "channel_mode.h"
52		#include "parse.h"
53	<	#include "s_misc.h"
53	>	#include "misc.h"
54	>	#include "conf_db.h"
55	>	#include "conf_class.h"
56	>	#include "motd.h"
57	>	#include "ipcache.h"
58	>	#include "isupport.h"
59
60	<	struct Callback *client_check_cb = NULL;
61	<	struct config_server_hide ConfigServerHide;
60	>
61	>	struct config_channel_entry ConfigChannel;
62	>	struct config_serverhide_entry ConfigServerHide;
63	>	struct config_general_entry ConfigGeneral;
64	>	struct config_log_entry ConfigLog = { .use_logging = 1 };
65	>	struct config_serverinfo_entry ConfigServerInfo;
66	>	struct config_admin_entry ConfigAdminInfo;
67	>	struct conf_parser_context conf_parser_ctx;
68
69		/* general conf items link list root, other than k lines etc. */
70	<	dlink_list service_items = { NULL, NULL, 0 };
71	<	dlink_list server_items  = { NULL, NULL, 0 };
72	<	dlink_list cluster_items = { NULL, NULL, 0 };
73	<	dlink_list hub_items     = { NULL, NULL, 0 };
74	<	dlink_list leaf_items    = { NULL, NULL, 0 };
75	<	dlink_list oconf_items   = { NULL, NULL, 0 };
76	<	dlink_list uconf_items   = { NULL, NULL, 0 };
77	<	dlink_list xconf_items   = { NULL, NULL, 0 };
67	<	dlink_list rxconf_items  = { NULL, NULL, 0 };
68	<	dlink_list rkconf_items  = { NULL, NULL, 0 };
69	<	dlink_list nresv_items   = { NULL, NULL, 0 };
70	<	dlink_list class_items   = { NULL, NULL, 0 };
71	<	dlink_list gdeny_items   = { NULL, NULL, 0 };
72	<
73	<	dlink_list temporary_klines  = { NULL, NULL, 0 };
74	<	dlink_list temporary_dlines  = { NULL, NULL, 0 };
75	<	dlink_list temporary_xlines  = { NULL, NULL, 0 };
76	<	dlink_list temporary_rklines = { NULL, NULL, 0 };
77	<	dlink_list temporary_glines  = { NULL, NULL, 0 };
78	<	dlink_list temporary_rxlines = { NULL, NULL, 0 };
79	<	dlink_list temporary_resv = { NULL, NULL, 0 };
70	>	dlink_list service_items;
71	>	dlink_list server_items;
72	>	dlink_list cluster_items;
73	>	dlink_list operator_items;
74	>	dlink_list shared_items;
75	>	dlink_list gecos_items;
76	>	dlink_list nresv_items;
77	>	dlink_list cresv_items;
78
79		extern unsigned int lineno;
80		extern char linebuf[];
81		extern char conffilebuf[IRCD_BUFSIZE];
82		extern int yyparse(); /* defined in y.tab.c */
83
86	–	struct conf_parser_context conf_parser_ctx = { 0, 0, NULL };
87	–
88	–	/* internally defined functions */
89	–	static void read_conf(FILE *);
90	–	static void clear_out_old_conf(void);
91	–	static void flush_deleted_I_P(void);
92	–	static void expire_tklines(dlink_list *);
93	–	static void garbage_collect_ip_entries(void);
94	–	static int hash_ip(struct irc_ssaddr *);
95	–	static int verify_access(struct Client *, const char *);
96	–	static int attach_iline(struct Client *, struct ConfItem *);
97	–	static struct ip_entry *find_or_add_ip(struct irc_ssaddr *);
98	–	static void parse_conf_file(int, int);
99	–	static dlink_list *map_to_list(ConfType);
100	–	static struct AccessItem *find_regexp_kline(const char *[]);
101	–	static int find_user_host(struct Client *, char *, char *, char *, unsigned int);
102	–
103	–	/*
104	–	* bit_len
105	–	*/
106	–	static int cidr_limit_reached(int, struct irc_ssaddr *, struct ClassItem *);
107	–	static void remove_from_cidr_check(struct irc_ssaddr *, struct ClassItem *);
108	–	static void destroy_cidr_class(struct ClassItem *);
109	–
110	–	static void flags_to_ascii(unsigned int, const unsigned int[], char *, int);
111	–
112	–	/* address of default class conf */
113	–	static struct ConfItem *class_default;
114	–
115	–	/* usually, with hash tables, you use a prime number...
116	–	* but in this case I am dealing with ip addresses,
117	–	* not ascii strings.
118	–	*/
119	–	#define IP_HASH_SIZE 0x1000
120	–
121	–	struct ip_entry
122	–	{
123	–	struct irc_ssaddr ip;
124	–	int count;
125	–	time_t last_attempt;
126	–	struct ip_entry *next;
127	–	};
128	–
129	–	static struct ip_entry *ip_hash_table[IP_HASH_SIZE];
130	–	static BlockHeap *ip_entry_heap = NULL;
131	–	static int ip_entries_count = 0;
132	–
133	–
134	–	void *
135	–	map_to_conf(struct ConfItem *aconf)
136	–	{
137	–	void *conf;
138	–	conf = (void *)((uintptr_t)aconf +
139	–	(uintptr_t)sizeof(struct ConfItem));
140	–	return(conf);
141	–	}
142	–
143	–	struct ConfItem *
144	–	unmap_conf_item(void *aconf)
145	–	{
146	–	struct ConfItem *conf;
147	–
148	–	conf = (struct ConfItem *)((uintptr_t)aconf -
149	–	(uintptr_t)sizeof(struct ConfItem));
150	–	return(conf);
151	–	}
84
85		/* conf_dns_callback()
86		*
87	<	* inputs       - pointer to struct AccessItem
87	>	* inputs       - pointer to struct MaskItem
88		*              - pointer to DNSReply reply
89		* output       - none
90		* side effects - called when resolver query finishes
#	Line 161 | Line 93 | unmap_conf_item(void *aconf)
93		* if successful save hp in the conf item it was called with
94		*/
95		static void
96	<	conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name)
96	>	conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name, size_t namelength)
97		{
98	<	struct AccessItem *aconf = vptr;
98	>	struct MaskItem *const conf = vptr;
99
100	<	aconf->dns_pending = 0;
100	>	conf->dns_pending = 0;
101
102	<	if (addr != NULL)
103	<	memcpy(&aconf->ipnum, addr, sizeof(aconf->ipnum));
102	>	if (addr)
103	>	memcpy(&conf->addr, addr, sizeof(conf->addr));
104		else
105	<	aconf->dns_failed = 1;
105	>	conf->dns_failed = 1;
106		}
107
108		/* conf_dns_lookup()
#	Line 180 | Line 112 | conf_dns_callback(void *vptr, const stru
112		* allocate a dns_query and start ns lookup.
113		*/
114		static void
115	<	conf_dns_lookup(struct AccessItem *aconf)
115	>	conf_dns_lookup(struct MaskItem *conf)
116		{
117	<	if (!aconf->dns_pending)
118	<	{
119	<	aconf->dns_pending = 1;
120	<	gethost_byname(conf_dns_callback, aconf, aconf->host);
121	<	}
117	>	if (conf->dns_pending)
118	>	return;
119	>
120	>	conf->dns_pending = 1;
121	>
122	>	if (conf->aftype == AF_INET)
123	>	gethost_byname_type(conf_dns_callback, conf, conf->host, T_A);
124	>	else
125	>	gethost_byname_type(conf_dns_callback, conf, conf->host, T_AAAA);
126		}
127
128	<	/* make_conf_item()
128	>	/* map_to_list()
129		*
130	<	* inputs       - type of item
131	<	* output       - pointer to new conf entry
132	<	* side effects - none
130	>	* inputs       - ConfType conf
131	>	* output       - pointer to dlink_list to use
132	>	* side effects - none
133		*/
134	<	struct ConfItem *
135	<	make_conf_item(ConfType type)
134	>	static dlink_list *
135	>	map_to_list(enum maskitem_type type)
136		{
201	–	struct ConfItem *conf = NULL;
202	–	struct AccessItem *aconf = NULL;
203	–	struct ClassItem *aclass = NULL;
204	–	int status = 0;
205	–
137		switch (type)
138		{
139	<	case DLINE_TYPE:
140	<	case EXEMPTDLINE_TYPE:
210	<	case GLINE_TYPE:
211	<	case KLINE_TYPE:
212	<	case CLIENT_TYPE:
213	<	case OPER_TYPE:
214	<	case SERVER_TYPE:
215	<	conf = MyMalloc(sizeof(struct ConfItem) +
216	<	sizeof(struct AccessItem));
217	<	aconf = map_to_conf(conf);
218	<	aconf->aftype = AF_INET;
219	<
220	<	/* Yes, sigh. switch on type again */
221	<	switch (type)
222	<	{
223	<	case EXEMPTDLINE_TYPE:
224	<	status = CONF_EXEMPTDLINE;
225	<	break;
226	<
227	<	case DLINE_TYPE:
228	<	status = CONF_DLINE;
229	<	break;
230	<
231	<	case KLINE_TYPE:
232	<	status = CONF_KLINE;
233	<	break;
234	<
235	<	case GLINE_TYPE:
236	<	status = CONF_GLINE;
139	>	case CONF_XLINE:
140	>	return &gecos_items;
141		break;
142	<
143	<	case CLIENT_TYPE:
240	<	status = CONF_CLIENT;
142	>	case CONF_SHARED:
143	>	return &shared_items;
144		break;
145	<
146	<	case OPER_TYPE:
244	<	status = CONF_OPERATOR;
245	<	dlinkAdd(conf, &conf->node, &oconf_items);
145	>	case CONF_NRESV:
146	>	return &nresv_items;
147		break;
148	<
149	<	case SERVER_TYPE:
249	<	status = CONF_SERVER;
250	<	dlinkAdd(conf, &conf->node, &server_items);
148	>	case CONF_CRESV:
149	>	return &cresv_items;
150		break;
151	<
152	<	default:
151	>	case CONF_OPER:
152	>	return &operator_items;
153		break;
154	<	}
155	<	aconf->status = status;
257	<	break;
258	<
259	<	case LEAF_TYPE:
260	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
261	<	sizeof(struct MatchItem));
262	<	dlinkAdd(conf, &conf->node, &leaf_items);
263	<	break;
264	<
265	<	case HUB_TYPE:
266	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
267	<	sizeof(struct MatchItem));
268	<	dlinkAdd(conf, &conf->node, &hub_items);
269	<	break;
270	<
271	<	case ULINE_TYPE:
272	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
273	<	sizeof(struct MatchItem));
274	<	dlinkAdd(conf, &conf->node, &uconf_items);
275	<	break;
276	<
277	<	case GDENY_TYPE:
278	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
279	<	sizeof(struct AccessItem));
280	<	dlinkAdd(conf, &conf->node, &gdeny_items);
281	<	break;
282	<
283	<	case XLINE_TYPE:
284	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
285	<	sizeof(struct MatchItem));
286	<	dlinkAdd(conf, &conf->node, &xconf_items);
287	<	break;
288	<	#ifdef HAVE_LIBPCRE
289	<	case RXLINE_TYPE:
290	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
291	<	sizeof(struct MatchItem));
292	<	dlinkAdd(conf, &conf->node, &rxconf_items);
293	<	break;
294	<
295	<	case RKLINE_TYPE:
296	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
297	<	sizeof(struct AccessItem));
298	<	aconf = map_to_conf(conf);
299	<	aconf->status = CONF_KLINE;
300	<	dlinkAdd(conf, &conf->node, &rkconf_items);
301	<	break;
302	<	#endif
303	<	case CLUSTER_TYPE:
304	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem));
305	<	dlinkAdd(conf, &conf->node, &cluster_items);
306	<	break;
307	<
308	<	case CRESV_TYPE:
309	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
310	<	sizeof(struct ResvChannel));
311	<	break;
312	<
313	<	case NRESV_TYPE:
314	<	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
315	<	sizeof(struct MatchItem));
316	<	dlinkAdd(conf, &conf->node, &nresv_items);
317	<	break;
318	<
319	<	case SERVICE_TYPE:
320	<	status = CONF_SERVICE;
321	<	conf = MyMalloc(sizeof(struct ConfItem));
322	<	dlinkAdd(conf, &conf->node, &service_items);
323	<	break;
324	<
325	<	case CLASS_TYPE:
326	<	conf = MyMalloc(sizeof(struct ConfItem) +
327	<	sizeof(struct ClassItem));
328	<	dlinkAdd(conf, &conf->node, &class_items);
329	<
330	<	aclass = map_to_conf(conf);
331	<	aclass->active = 1;
332	<	ConFreq(aclass) = DEFAULT_CONNECTFREQUENCY;
333	<	PingFreq(aclass) = DEFAULT_PINGFREQUENCY;
334	<	MaxTotal(aclass) = MAXIMUM_LINKS_DEFAULT;
335	<	MaxSendq(aclass) = DEFAULT_SENDQ;
336	<
337	<	break;
338	<
339	<	default:
340	<	conf = NULL;
341	<	break;
342	<	}
343	<
344	<	/* XXX Yes, this will core if default is hit. I want it to for now - db */
345	<	conf->type = type;
346	<
347	<	return conf;
348	<	}
349	<
350	<	void
351	<	delete_conf_item(struct ConfItem *conf)
352	<	{
353	<	dlink_node *m = NULL;
354	<	struct MatchItem *match_item;
355	<	struct AccessItem *aconf;
356	<	ConfType type = conf->type;
357	<
358	<	MyFree(conf->name);
359	<	conf->name = NULL;
360	<
361	<	switch(type)
362	<	{
363	<	case DLINE_TYPE:
364	<	case EXEMPTDLINE_TYPE:
365	<	case GLINE_TYPE:
366	<	case KLINE_TYPE:
367	<	case CLIENT_TYPE:
368	<	case OPER_TYPE:
369	<	case SERVER_TYPE:
370	<	aconf = map_to_conf(conf);
371	<
372	<	if (aconf->dns_pending)
373	<	delete_resolver_queries(aconf);
374	<	if (aconf->passwd != NULL)
375	<	memset(aconf->passwd, 0, strlen(aconf->passwd));
376	<	if (aconf->spasswd != NULL)
377	<	memset(aconf->spasswd, 0, strlen(aconf->spasswd));
378	<	aconf->class_ptr = NULL;
379	<
380	<	MyFree(aconf->passwd);
381	<	MyFree(aconf->spasswd);
382	<	MyFree(aconf->reason);
383	<	MyFree(aconf->oper_reason);
384	<	MyFree(aconf->user);
385	<	MyFree(aconf->host);
386	<	MyFree(aconf->cipher_list);
387	<	#ifdef HAVE_LIBCRYPTO
388	<	if (aconf->rsa_public_key)
389	<	RSA_free(aconf->rsa_public_key);
390	<	MyFree(aconf->rsa_public_key_file);
391	<	#endif
392	<
393	<	/* Yes, sigh. switch on type again */
394	<	switch(type)
395	<	{
396	<	case EXEMPTDLINE_TYPE:
397	<	case DLINE_TYPE:
398	<	case GLINE_TYPE:
399	<	case KLINE_TYPE:
400	<	case CLIENT_TYPE:
401	<	MyFree(conf);
154	>	case CONF_SERVER:
155	>	return &server_items;
156		break;
157	<
158	<	case OPER_TYPE:
405	<	aconf = map_to_conf(conf);
406	<	if (!IsConfIllegal(aconf))
407	<	dlinkDelete(&conf->node, &oconf_items);
408	<	MyFree(conf);
157	>	case CONF_SERVICE:
158	>	return &service_items;
159		break;
160	<
161	<	case SERVER_TYPE:
412	<	aconf = map_to_conf(conf);
413	<	if (!IsConfIllegal(aconf))
414	<	dlinkDelete(&conf->node, &server_items);
415	<	MyFree(conf);
160	>	case CONF_CLUSTER:
161	>	return &cluster_items;
162		break;
417	–
163		default:
164	<	break;
420	<	}
421	<	break;
422	<
423	<	case HUB_TYPE:
424	<	match_item = map_to_conf(conf);
425	<	MyFree(match_item->user);
426	<	MyFree(match_item->host);
427	<	MyFree(match_item->reason);
428	<	MyFree(match_item->oper_reason);
429	<	/* If marked illegal, its already been pulled off of the hub_items list */
430	<	if (!match_item->illegal)
431	<	dlinkDelete(&conf->node, &hub_items);
432	<	MyFree(conf);
433	<	break;
434	<
435	<	case LEAF_TYPE:
436	<	match_item = map_to_conf(conf);
437	<	MyFree(match_item->user);
438	<	MyFree(match_item->host);
439	<	MyFree(match_item->reason);
440	<	MyFree(match_item->oper_reason);
441	<	/* If marked illegal, its already been pulled off of the leaf_items list */
442	<	if (!match_item->illegal)
443	<	dlinkDelete(&conf->node, &leaf_items);
444	<	MyFree(conf);
445	<	break;
446	<
447	<	case ULINE_TYPE:
448	<	match_item = map_to_conf(conf);
449	<	MyFree(match_item->user);
450	<	MyFree(match_item->host);
451	<	MyFree(match_item->reason);
452	<	MyFree(match_item->oper_reason);
453	<	dlinkDelete(&conf->node, &uconf_items);
454	<	MyFree(conf);
455	<	break;
456	<
457	<	case XLINE_TYPE:
458	<	match_item = map_to_conf(conf);
459	<	MyFree(match_item->user);
460	<	MyFree(match_item->host);
461	<	MyFree(match_item->reason);
462	<	MyFree(match_item->oper_reason);
463	<	dlinkDelete(&conf->node, &xconf_items);
464	<	MyFree(conf);
465	<	break;
466	<	#ifdef HAVE_LIBPCRE
467	<	case RKLINE_TYPE:
468	<	aconf = map_to_conf(conf);
469	<	MyFree(aconf->regexuser);
470	<	MyFree(aconf->regexhost);
471	<	MyFree(aconf->user);
472	<	MyFree(aconf->host);
473	<	MyFree(aconf->reason);
474	<	MyFree(aconf->oper_reason);
475	<	dlinkDelete(&conf->node, &rkconf_items);
476	<	MyFree(conf);
477	<	break;
478	<
479	<	case RXLINE_TYPE:
480	<	MyFree(conf->regexpname);
481	<	match_item = map_to_conf(conf);
482	<	MyFree(match_item->user);
483	<	MyFree(match_item->host);
484	<	MyFree(match_item->reason);
485	<	MyFree(match_item->oper_reason);
486	<	dlinkDelete(&conf->node, &rxconf_items);
487	<	MyFree(conf);
488	<	break;
489	<	#endif
490	<	case NRESV_TYPE:
491	<	match_item = map_to_conf(conf);
492	<	MyFree(match_item->user);
493	<	MyFree(match_item->host);
494	<	MyFree(match_item->reason);
495	<	MyFree(match_item->oper_reason);
496	<	dlinkDelete(&conf->node, &nresv_items);
497	<
498	<	if (conf->flags & CONF_FLAGS_TEMPORARY)
499	<	if ((m = dlinkFindDelete(&temporary_resv, conf)) != NULL)
500	<	free_dlink_node(m);
501	<
502	<	MyFree(conf);
503	<	break;
504	<
505	<	case GDENY_TYPE:
506	<	aconf = map_to_conf(conf);
507	<	MyFree(aconf->user);
508	<	MyFree(aconf->host);
509	<	dlinkDelete(&conf->node, &gdeny_items);
510	<	MyFree(conf);
511	<	break;
512	<
513	<	case CLUSTER_TYPE:
514	<	dlinkDelete(&conf->node, &cluster_items);
515	<	MyFree(conf);
516	<	break;
517	<
518	<	case CRESV_TYPE:
519	<	if (conf->flags & CONF_FLAGS_TEMPORARY)
520	<	if ((m = dlinkFindDelete(&temporary_resv, conf)) != NULL)
521	<	free_dlink_node(m);
522	<
523	<	MyFree(conf);
524	<	break;
525	<
526	<	case CLASS_TYPE:
527	<	dlinkDelete(&conf->node, &class_items);
528	<	MyFree(conf);
529	<	break;
530	<
531	<	case SERVICE_TYPE:
532	<	dlinkDelete(&conf->node, &service_items);
533	<	MyFree(conf);
534	<	break;
535	<
536	<	default:
537	<	break;
164	>	return NULL;
165		}
166		}
167
168	<	/* free_access_item()
169	<	*
543	<	* inputs       - pointer to conf to free
544	<	* output       - none
545	<	* side effects - crucial password fields are zeroed, conf is freed
546	<	*/
547	<	void
548	<	free_access_item(struct AccessItem *aconf)
168	>	struct MaskItem *
169	>	conf_make(enum maskitem_type type)
170		{
171	<	struct ConfItem *conf;
171	>	struct MaskItem *const conf = MyCalloc(sizeof(*conf));
172	>	dlink_list *list = NULL;
173
174	<	if (aconf == NULL)
175	<	return;
176	<	conf = unmap_conf_item(aconf);
555	<	delete_conf_item(conf);
556	<	}
174	>	conf->type   = type;
175	>	conf->active = 1;
176	>	conf->aftype = AF_INET;
177
178	<	static const unsigned int shared_bit_table[] =
179	<	{ 'K', 'k', 'U', 'X', 'x', 'Y', 'Q', 'q', 'R', 'L', 0};
178	>	if ((list = map_to_list(type)))
179	>	dlinkAdd(conf, &conf->node, list);
180	>	return conf;
181	>	}
182
561	–	/* report_confitem_types()
562	–	*
563	–	* inputs       - pointer to client requesting confitem report
564	–	*              - ConfType to report
565	–	* output       - none
566	–	* side effects -
567	–	*/
183		void
184	<	report_confitem_types(struct Client *source_p, ConfType type, int temp)
184	>	conf_free(struct MaskItem *conf)
185		{
186	<	dlink_node *ptr = NULL;
187	<	struct ConfItem *conf = NULL;
573	<	struct AccessItem *aconf = NULL;
574	<	struct MatchItem *matchitem = NULL;
575	<	struct ClassItem *classitem = NULL;
576	<	char buf[12];
577	<	char *p = NULL;
578	<	const char *pfx = NULL;
579	<
580	<	switch (type)
581	<	{
582	<	case GDENY_TYPE:
583	<	DLINK_FOREACH(ptr, gdeny_items.head)
584	<	{
585	<	conf = ptr->data;
586	<	aconf = map_to_conf(conf);
186	>	dlink_node *node = NULL, *node_next = NULL;
187	>	dlink_list *list = NULL;
188
189	<	p = buf;
189	>	if ((list = map_to_list(conf->type)))
190	>	dlinkFindDelete(list, conf);
191
192	<	if (aconf->flags & GDENY_BLOCK)
591	<	*p++ = 'B';
592	<	else
593	<	*p++ = 'b';
594	<
595	<	if (aconf->flags & GDENY_REJECT)
596	<	*p++ = 'R';
597	<	else
598	<	*p++ = 'r';
599	<
600	<	*p = '\0';
601	<
602	<	sendto_one(source_p, ":%s %d %s V %s@%s %s %s",
603	<	me.name, RPL_STATSDEBUG, source_p->name,
604	<	aconf->user, aconf->host, conf->name, buf);
605	<	}
606	<	break;
607	<
608	<	case XLINE_TYPE:
609	<	DLINK_FOREACH(ptr, xconf_items.head)
610	<	{
611	<	conf = ptr->data;
612	<	matchitem = map_to_conf(conf);
613	<
614	<	sendto_one(source_p, form_str(RPL_STATSXLINE),
615	<	me.name, source_p->name,
616	<	matchitem->hold ? "x": "X", matchitem->count,
617	<	conf->name, matchitem->reason);
618	<	}
619	<	break;
620	<
621	<	#ifdef HAVE_LIBPCRE
622	<	case RXLINE_TYPE:
623	<	DLINK_FOREACH(ptr, rxconf_items.head)
624	<	{
625	<	conf = ptr->data;
626	<	matchitem = map_to_conf(conf);
627	<
628	<	sendto_one(source_p, form_str(RPL_STATSXLINE),
629	<	me.name, source_p->name,
630	<	matchitem->hold ? "xR": "XR", matchitem->count,
631	<	conf->name, matchitem->reason);
632	<	}
633	<	break;
634	<
635	<	case RKLINE_TYPE:
636	<	pfx = temp ? "kR" : "KR";
637	<
638	<	DLINK_FOREACH(ptr, rkconf_items.head)
639	<	{
640	<	aconf = map_to_conf((conf = ptr->data));
192	>	MyFree(conf->name);
193
194	<	if (temp && !(conf->flags & CONF_FLAGS_TEMPORARY))
195	<	continue;
194	>	if (conf->dns_pending)
195	>	delete_resolver_queries(conf);
196	>	if (conf->passwd)
197	>	memset(conf->passwd, 0, strlen(conf->passwd));
198	>	if (conf->spasswd)
199	>	memset(conf->spasswd, 0, strlen(conf->spasswd));
200	>
201	>	conf->class = NULL;
202	>
203	>	MyFree(conf->passwd);
204	>	MyFree(conf->spasswd);
205	>	MyFree(conf->reason);
206	>	MyFree(conf->certfp);
207	>	MyFree(conf->whois);
208	>	MyFree(conf->user);
209	>	MyFree(conf->host);
210	>	#ifdef HAVE_LIBCRYPTO
211	>	MyFree(conf->cipher_list);
212
213	<	sendto_one(source_p, form_str(RPL_STATSKLINE), me.name,
214	<	source_p->name, pfx, aconf->host, aconf->user,
647	<	aconf->reason, aconf->oper_reason ? aconf->oper_reason : "");
648	<	}
649	<	break;
213	>	if (conf->rsa_public_key)
214	>	RSA_free(conf->rsa_public_key);
215		#endif
216	<
652	<	case ULINE_TYPE:
653	<	DLINK_FOREACH(ptr, uconf_items.head)
654	<	{
655	<	conf = ptr->data;
656	<	matchitem = map_to_conf(conf);
657	<
658	<	p = buf;
659	<
660	<	/* some of these are redundant for the sake of
661	<	* consistency with cluster{} flags
662	<	*/
663	<	*p++ = 'c';
664	<	flags_to_ascii(matchitem->action, shared_bit_table, p, 0);
665	<
666	<	sendto_one(source_p, form_str(RPL_STATSULINE),
667	<	me.name, source_p->name, conf->name,
668	<	matchitem->user?matchitem->user: "*",
669	<	matchitem->host?matchitem->host: "*", buf);
670	<	}
671	<
672	<	DLINK_FOREACH(ptr, cluster_items.head)
673	<	{
674	<	conf = ptr->data;
675	<
676	<	p = buf;
677	<
678	<	*p++ = 'C';
679	<	flags_to_ascii(conf->flags, shared_bit_table, p, 0);
680	<
681	<	sendto_one(source_p, form_str(RPL_STATSULINE),
682	<	me.name, source_p->name, conf->name,
683	<	"*", "*", buf);
684	<	}
685	<
686	<	break;
687	<
688	<	case OPER_TYPE:
689	<	DLINK_FOREACH(ptr, oconf_items.head)
690	<	{
691	<	conf = ptr->data;
692	<	aconf = map_to_conf(conf);
693	<
694	<	/* Don't allow non opers to see oper privs */
695	<	if (HasUMode(source_p, UMODE_OPER))
696	<	sendto_one(source_p, form_str(RPL_STATSOLINE),
697	<	me.name, source_p->name, 'O', aconf->user, aconf->host,
698	<	conf->name, oper_privs_as_string(aconf->port),
699	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
700	<	else
701	<	sendto_one(source_p, form_str(RPL_STATSOLINE),
702	<	me.name, source_p->name, 'O', aconf->user, aconf->host,
703	<	conf->name, "0",
704	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
705	<	}
706	<	break;
707	<
708	<	case CLASS_TYPE:
709	<	DLINK_FOREACH(ptr, class_items.head)
710	<	{
711	<	conf = ptr->data;
712	<	classitem = map_to_conf(conf);
713	<	sendto_one(source_p, form_str(RPL_STATSYLINE),
714	<	me.name, source_p->name, 'Y',
715	<	conf->name, PingFreq(classitem),
716	<	ConFreq(classitem),
717	<	MaxTotal(classitem), MaxSendq(classitem),
718	<	CurrUserCount(classitem),
719	<	classitem->active ? "active" : "disabled");
720	<	}
721	<	break;
722	<
723	<	case CONF_TYPE:
724	<	case CLIENT_TYPE:
725	<	break;
726	<
727	<	case SERVICE_TYPE:
728	<	DLINK_FOREACH(ptr, service_items.head)
729	<	{
730	<	conf = ptr->data;
731	<	sendto_one(source_p, form_str(RPL_STATSSERVICE),
732	<	me.name, source_p->name, 'S', "*", conf->name, 0, 0);
733	<	}
734	<	break;
735	<
736	<	case SERVER_TYPE:
737	<	DLINK_FOREACH(ptr, server_items.head)
738	<	{
739	<	p = buf;
740	<
741	<	conf = ptr->data;
742	<	aconf = map_to_conf(conf);
743	<
744	<	buf[0] = '\0';
745	<
746	<	if (IsConfAllowAutoConn(aconf))
747	<	*p++ = 'A';
748	<	if (IsConfSSL(aconf))
749	<	*p++ = 'S';
750	<	if (IsConfTopicBurst(aconf))
751	<	*p++ = 'T';
752	<	if (buf[0] == '\0')
753	<	*p++ = '*';
754	<
755	<	*p = '\0';
756	<
757	<	/*
758	<	* Allow admins to see actual ips unless hide_server_ips is enabled
759	<	*/
760	<	if (!ConfigServerHide.hide_server_ips && HasUMode(source_p, UMODE_ADMIN))
761	<	sendto_one(source_p, form_str(RPL_STATSCLINE),
762	<	me.name, source_p->name, 'C', aconf->host,
763	<	buf, conf->name, aconf->port,
764	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
765	<	else
766	<	sendto_one(source_p, form_str(RPL_STATSCLINE),
767	<	me.name, source_p->name, 'C',
768	<	"*@127.0.0.1", buf, conf->name, aconf->port,
769	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
770	<	}
771	<	break;
772	<
773	<	case HUB_TYPE:
774	<	DLINK_FOREACH(ptr, hub_items.head)
775	<	{
776	<	conf = ptr->data;
777	<	matchitem = map_to_conf(conf);
778	<	sendto_one(source_p, form_str(RPL_STATSHLINE), me.name,
779	<	source_p->name, 'H', matchitem->host, conf->name, 0, "*");
780	<	}
781	<	break;
782	<
783	<	case LEAF_TYPE:
784	<	DLINK_FOREACH(ptr, leaf_items.head)
785	<	{
786	<	conf = ptr->data;
787	<	matchitem = map_to_conf(conf);
788	<	sendto_one(source_p, form_str(RPL_STATSLLINE), me.name,
789	<	source_p->name, 'L', matchitem->host, conf->name, 0, "*");
790	<	}
791	<	break;
792	<
793	<	case GLINE_TYPE:
794	<	case KLINE_TYPE:
795	<	case DLINE_TYPE:
796	<	case EXEMPTDLINE_TYPE:
797	<	case CRESV_TYPE:
798	<	case NRESV_TYPE:
799	<	case CLUSTER_TYPE:
800	<	default:
801	<	break;
802	<	}
803	<	}
804	<
805	<	/* check_client()
806	<	*
807	<	* inputs       - pointer to client
808	<	* output       - 0 = Success
809	<	*                NOT_AUTHORIZED    (-1) = Access denied (no I line match)
810	<	*                IRCD_SOCKET_ERROR (-2) = Bad socket.
811	<	*                I_LINE_FULL       (-3) = I-line is full
812	<	*                TOO_MANY          (-4) = Too many connections from hostname
813	<	*                BANNED_CLIENT     (-5) = K-lined
814	<	* side effects - Ordinary client access check.
815	<	*                Look for conf lines which have the same
816	<	*                status as the flags passed.
817	<	*/
818	<	static void *
819	<	check_client(va_list args)
820	<	{
821	<	struct Client *source_p = va_arg(args, struct Client *);
822	<	const char *username = va_arg(args, const char *);
823	<	int i;
824	<
825	<	/* I'm already in big trouble if source_p->localClient is NULL -db */
826	<	if ((i = verify_access(source_p, username)))
827	<	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
828	<	source_p->name, source_p->sockhost);
829	<
830	<	switch (i)
216	>	DLINK_FOREACH_SAFE(node, node_next, conf->hub_list.head)
217		{
218	<	case TOO_MANY:
219	<	sendto_realops_flags(UMODE_FULL, L_ALL,
220	<	"Too many on IP for %s (%s).",
835	<	get_client_name(source_p, SHOW_IP),
836	<	source_p->sockhost);
837	<	ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
838	<	get_client_name(source_p, SHOW_IP));
839	<	++ServerStats.is_ref;
840	<	exit_client(source_p, &me, "No more connections allowed on that IP");
841	<	break;
842	<
843	<	case I_LINE_FULL:
844	<	sendto_realops_flags(UMODE_FULL, L_ALL,
845	<	"I-line is full for %s (%s).",
846	<	get_client_name(source_p, SHOW_IP),
847	<	source_p->sockhost);
848	<	ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
849	<	get_client_name(source_p, SHOW_IP));
850	<	++ServerStats.is_ref;
851	<	exit_client(source_p, &me,
852	<	"No more connections allowed in your connection class");
853	<	break;
854	<
855	<	case NOT_AUTHORIZED:
856	<	++ServerStats.is_ref;
857	<	/* jdc - lists server name & port connections are on */
858	<	/*       a purely cosmetical change */
859	<	sendto_realops_flags(UMODE_UNAUTH, L_ALL,
860	<	"Unauthorized client connection from %s [%s] on [%s/%u].",
861	<	get_client_name(source_p, SHOW_IP),
862	<	source_p->sockhost,
863	<	source_p->localClient->listener->name,
864	<	source_p->localClient->listener->port);
865	<	ilog(LOG_TYPE_IRCD,
866	<	"Unauthorized client connection from %s on [%s/%u].",
867	<	get_client_name(source_p, SHOW_IP),
868	<	source_p->localClient->listener->name,
869	<	source_p->localClient->listener->port);
870	<
871	<	/* XXX It is prolematical whether it is better to use the
872	<	* capture reject code here or rely on the connecting too fast code.
873	<	* - Dianora
874	<	*/
875	<	if (REJECT_HOLD_TIME > 0)
876	<	{
877	<	sendto_one(source_p, ":%s NOTICE %s :You are not authorized to use this server",
878	<	me.name, source_p->name);
879	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
880	<	SetCaptured(source_p);
881	<	}
882	<	else
883	<	exit_client(source_p, &me, "You are not authorized to use this server");
884	<	break;
885	<
886	<	case BANNED_CLIENT:
887	<	/*
888	<	* Don't exit them immediately, play with them a bit.
889	<	* - Dianora
890	<	*/
891	<	if (REJECT_HOLD_TIME > 0)
892	<	{
893	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
894	<	SetCaptured(source_p);
895	<	}
896	<	else
897	<	exit_client(source_p, &me, "Banned");
898	<	++ServerStats.is_ref;
899	<	break;
900	<
901	<	case 0:
902	<	default:
903	<	break;
218	>	MyFree(node->data);
219	>	dlinkDelete(node, &conf->hub_list);
220	>	free_dlink_node(node);
221		}
222
223	<	return (i < 0 ? NULL : source_p);
907	<	}
908	<
909	<	/* verify_access()
910	<	*
911	<	* inputs       - pointer to client to verify
912	<	*              - pointer to proposed username
913	<	* output       - 0 if success -'ve if not
914	<	* side effect  - find the first (best) I line to attach.
915	<	*/
916	<	static int
917	<	verify_access(struct Client *client_p, const char *username)
918	<	{
919	<	struct AccessItem *aconf = NULL, *rkconf = NULL;
920	<	struct ConfItem *conf = NULL;
921	<	char non_ident[USERLEN + 1] = { '~', '\0' };
922	<	const char *uhi[3];
923	<
924	<	if (IsGotId(client_p))
925	<	{
926	<	aconf = find_address_conf(client_p->host, client_p->username,
927	<	&client_p->localClient->ip,
928	<	client_p->localClient->aftype,
929	<	client_p->localClient->passwd);
930	<	}
931	<	else
223	>	DLINK_FOREACH_SAFE(node, node_next, conf->leaf_list.head)
224		{
225	<	strlcpy(non_ident+1, username, sizeof(non_ident)-1);
226	<	aconf = find_address_conf(client_p->host,non_ident,
227	<	&client_p->localClient->ip,
936	<	client_p->localClient->aftype,
937	<	client_p->localClient->passwd);
225	>	MyFree(node->data);
226	>	dlinkDelete(node, &conf->leaf_list);
227	>	free_dlink_node(node);
228		}
229
230	<	uhi[0] = IsGotId(client_p) ? client_p->username : non_ident;
941	<	uhi[1] = client_p->host;
942	<	uhi[2] = client_p->sockhost;
943	<
944	<	rkconf = find_regexp_kline(uhi);
945	<
946	<	if (aconf != NULL)
230	>	DLINK_FOREACH_SAFE(node, node_next, conf->exempt_list.head)
231		{
232	<	if (IsConfClient(aconf) && !rkconf)
949	<	{
950	<	conf = unmap_conf_item(aconf);
951	<
952	<	if (IsConfRedir(aconf))
953	<	{
954	<	sendto_one(client_p, form_str(RPL_REDIR),
955	<	me.name, client_p->name,
956	<	conf->name ? conf->name : "",
957	<	aconf->port);
958	<	return(NOT_AUTHORIZED);
959	<	}
960	<
961	<	if (IsConfDoIdentd(aconf))
962	<	SetNeedId(client_p);
232	>	struct exempt *exptr = node->data;
233
234	<	/* Thanks for spoof idea amm */
235	<	if (IsConfDoSpoofIp(aconf))
236	<	{
237	<	conf = unmap_conf_item(aconf);
238	<
969	<	if (!ConfigFileEntry.hide_spoof_ips && IsConfSpoofNotice(aconf))
970	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "%s spoofing: %s as %s",
971	<	client_p->name, client_p->host, conf->name);
972	<	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
973	<	SetIPSpoof(client_p);
974	<	}
975	<
976	<	return(attach_iline(client_p, conf));
977	<	}
978	<	else if (rkconf || IsConfKill(aconf) || (ConfigFileEntry.glines && IsConfGline(aconf)))
979	<	{
980	<	/* XXX */
981	<	aconf = rkconf ? rkconf : aconf;
982	<	if (IsConfGline(aconf))
983	<	sendto_one(client_p, ":%s NOTICE %s :*** G-lined", me.name,
984	<	client_p->name);
985	<	if (ConfigFileEntry.kline_with_reason)
986	<	sendto_one(client_p, ":%s NOTICE %s :*** Banned %s",
987	<	me.name, client_p->name, aconf->reason);
988	<	return(BANNED_CLIENT);
989	<	}
234	>	dlinkDelete(node, &conf->exempt_list);
235	>	MyFree(exptr->name);
236	>	MyFree(exptr->user);
237	>	MyFree(exptr->host);
238	>	MyFree(exptr);
239		}
240
241	<	return(NOT_AUTHORIZED);
241	>	MyFree(conf);
242		}
243
244		/* attach_iline()
245		*
246	<	* inputs       - client pointer
247	<	*              - conf pointer
248	<	* output       -
249	<	* side effects - do actual attach
246	>	* inputs       - client pointer
247	>	*              - conf pointer
248	>	* output       -
249	>	* side effects - do actual attach
250		*/
251		static int
252	<	attach_iline(struct Client *client_p, struct ConfItem *conf)
252	>	attach_iline(struct Client *client_p, struct MaskItem *conf)
253		{
254	<	struct AccessItem *aconf;
1006	<	struct ClassItem *aclass;
254	>	const struct ClassItem *const class = conf->class;
255		struct ip_entry *ip_found;
256		int a_limit_reached = 0;
257	<	int local = 0, global = 0, ident = 0;
257	>	unsigned int local = 0, global = 0, ident = 0;
258
259	<	ip_found = find_or_add_ip(&client_p->localClient->ip);
259	>	ip_found = ipcache_find_or_add_address(&client_p->connection->ip);
260		ip_found->count++;
261	<	SetIpHash(client_p);
261	>	AddFlag(client_p, FLAGS_IPHASH);
262
263	<	aconf = map_to_conf(conf);
264	<	if (aconf->class_ptr == NULL)
1017	<	return NOT_AUTHORIZED;  /* If class is missing, this is best */
1018	<
1019	<	aclass = map_to_conf(aconf->class_ptr);
1020	<
1021	<	count_user_host(client_p->username, client_p->host,
1022	<	&global, &local, &ident);
263	>	userhost_count(client_p->username, client_p->host,
264	>	&global, &local, &ident);
265
266		/* XXX blah. go down checking the various silly limits
267		* setting a_limit_reached if any limit is reached.
268		* - Dianora
269		*/
270	<	if (MaxTotal(aclass) != 0 && CurrUserCount(aclass) >= MaxTotal(aclass))
270	>	if (class->max_total && class->ref_count >= class->max_total)
271		a_limit_reached = 1;
272	<	else if (MaxPerIp(aclass) != 0 && ip_found->count > MaxPerIp(aclass))
272	>	else if (class->max_perip && ip_found->count > class->max_perip)
273		a_limit_reached = 1;
274	<	else if (MaxLocal(aclass) != 0 && local >= MaxLocal(aclass))
274	>	else if (class->max_local && local >= class->max_local)
275		a_limit_reached = 1;
276	<	else if (MaxGlobal(aclass) != 0 && global >= MaxGlobal(aclass))
276	>	else if (class->max_global && global >= class->max_global)
277		a_limit_reached = 1;
278	<	else if (MaxIdent(aclass) != 0 && ident >= MaxIdent(aclass) &&
278	>	else if (class->max_ident && ident >= class->max_ident &&
279		client_p->username[0] != '~')
280		a_limit_reached = 1;
281
282		if (a_limit_reached)
283		{
284	<	if (!IsConfExemptLimits(aconf))
284	>	if (!IsConfExemptLimits(conf))
285		return TOO_MANY;   /* Already at maximum allowed */
286
287	<	sendto_one(client_p,
288	<	":%s NOTICE %s :*** Your connection class is full, "
1047	<	"but you have exceed_limit = yes;", me.name, client_p->name);
287	>	sendto_one_notice(client_p, &me, ":*** Your connection class is full, "
288	>	"but you have exceed_limit = yes;");
289		}
290
291		return attach_conf(client_p, conf);
292		}
293
294	<	/* init_ip_hash_table()
1054	<	*
1055	<	* inputs               - NONE
1056	<	* output               - NONE
1057	<	* side effects         - allocate memory for ip_entry(s)
1058	<	*                      - clear the ip hash table
1059	<	*/
1060	<	void
1061	<	init_ip_hash_table(void)
1062	<	{
1063	<	ip_entry_heap = BlockHeapCreate("ip", sizeof(struct ip_entry),
1064	<	2 * hard_fdlimit);
1065	<	memset(ip_hash_table, 0, sizeof(ip_hash_table));
1066	<	}
1067	<
1068	<	/* find_or_add_ip()
1069	<	*
1070	<	* inputs       - pointer to struct irc_ssaddr
1071	<	* output       - pointer to a struct ip_entry
1072	<	* side effects -
294	>	/* verify_access()
295		*
296	<	* If the ip # was not found, a new struct ip_entry is created, and the ip
297	<	* count set to 0.
296	>	* inputs       - pointer to client to verify
297	>	* output       - 0 if success -'ve if not
298	>	* side effect  - find the first (best) I line to attach.
299		*/
300	<	static struct ip_entry *
301	<	find_or_add_ip(struct irc_ssaddr *ip_in)
300	>	static int
301	>	verify_access(struct Client *client_p)
302		{
303	<	struct ip_entry *ptr, *newptr;
1081	<	int hash_index = hash_ip(ip_in), res;
1082	<	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
1083	<	#ifdef IPV6
1084	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
1085	<	#endif
303	>	struct MaskItem *conf = NULL;
304
305	<	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
305	>	if (HasFlag(client_p, FLAGS_GOTID))
306		{
307	<	#ifdef IPV6
308	<	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
309	<	continue;
310	<	if (ip_in->ss.ss_family == AF_INET6)
1093	<	{
1094	<	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
1095	<	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
1096	<	}
1097	<	else
1098	<	#endif
1099	<	{
1100	<	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
1101	<	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
1102	<	}
1103	<	if (res == 0)
1104	<	{
1105	<	/* Found entry already in hash, return it. */
1106	<	return ptr;
1107	<	}
307	>	conf = find_address_conf(client_p->host, client_p->username,
308	>	&client_p->connection->ip,
309	>	client_p->connection->aftype,
310	>	client_p->connection->password);
311		}
312	+	else
313	+	{
314	+	char non_ident[USERLEN + 1] = "~";
315
316	<	if (ip_entries_count >= 2 * hard_fdlimit)
317	<	garbage_collect_ip_entries();
318	<
319	<	newptr = BlockHeapAlloc(ip_entry_heap);
320	<	ip_entries_count++;
321	<	memcpy(&newptr->ip, ip_in, sizeof(struct irc_ssaddr));
316	>	strlcpy(non_ident + 1, client_p->username, sizeof(non_ident) - 1);
317	>	conf = find_address_conf(client_p->host, non_ident,
318	>	&client_p->connection->ip,
319	>	client_p->connection->aftype,
320	>	client_p->connection->password);
321	>	}
322
323	<	newptr->next = ip_hash_table[hash_index];
324	<	ip_hash_table[hash_index] = newptr;
323	>	if (!conf)
324	>	return NOT_AUTHORIZED;
325
326	<	return newptr;
1121	<	}
326	>	assert(IsConfClient(conf) || IsConfKill(conf));
327
328	<	/* remove_one_ip()
1124	<	*
1125	<	* inputs        - unsigned long IP address value
1126	<	* output        - NONE
1127	<	* side effects  - The ip address given, is looked up in ip hash table
1128	<	*                 and number of ip#'s for that ip decremented.
1129	<	*                 If ip # count reaches 0 and has expired,
1130	<	*                 the struct ip_entry is returned to the ip_entry_heap
1131	<	*/
1132	<	void
1133	<	remove_one_ip(struct irc_ssaddr *ip_in)
1134	<	{
1135	<	struct ip_entry *ptr;
1136	<	struct ip_entry *last_ptr = NULL;
1137	<	int hash_index = hash_ip(ip_in), res;
1138	<	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
1139	<	#ifdef IPV6
1140	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
1141	<	#endif
1142	<
1143	<	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
328	>	if (IsConfClient(conf))
329		{
330	<	#ifdef IPV6
1146	<	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
1147	<	continue;
1148	<	if (ip_in->ss.ss_family == AF_INET6)
1149	<	{
1150	<	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
1151	<	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
1152	<	}
1153	<	else
1154	<	#endif
330	>	if (IsConfRedir(conf))
331		{
332	<	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
333	<	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
332	>	sendto_one_numeric(client_p, &me, RPL_REDIR,
333	>	conf->name ? conf->name : "",
334	>	conf->port);
335	>	return NOT_AUTHORIZED;
336		}
337	<	if (res)
338	<	continue;
1161	<	if (ptr->count > 0)
1162	<	ptr->count--;
1163	<	if (ptr->count == 0 &&
1164	<	(CurrentTime-ptr->last_attempt) >= ConfigFileEntry.throttle_time)
337	>
338	>	if (IsConfDoSpoofIp(conf))
339		{
340	<	if (last_ptr != NULL)
341	<	last_ptr->next = ptr->next;
342	<	else
1169	<	ip_hash_table[hash_index] = ptr->next;
340	>	if (IsConfSpoofNotice(conf))
341	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE, "%s spoofing: %s as %s",
342	>	client_p->name, client_p->host, conf->name);
343
344	<	BlockHeapFree(ip_entry_heap, ptr);
1172	<	ip_entries_count--;
1173	<	return;
344	>	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
345		}
1175	–	last_ptr = ptr;
1176	–	}
1177	–	}
346
347	<	/* hash_ip()
1180	<	*
1181	<	* input        - pointer to an irc_inaddr
1182	<	* output       - integer value used as index into hash table
1183	<	* side effects - hopefully, none
1184	<	*/
1185	<	static int
1186	<	hash_ip(struct irc_ssaddr *addr)
1187	<	{
1188	<	if (addr->ss.ss_family == AF_INET)
1189	<	{
1190	<	struct sockaddr_in *v4 = (struct sockaddr_in *)addr;
1191	<	int hash;
1192	<	uint32_t ip;
1193	<
1194	<	ip   = ntohl(v4->sin_addr.s_addr);
1195	<	hash = ((ip >> 12) + ip) & (IP_HASH_SIZE-1);
1196	<	return hash;
347	>	return attach_iline(client_p, conf);
348		}
349	<	#ifdef IPV6
350	<	else
351	<	{
1201	<	int hash;
1202	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)addr;
1203	<	uint32_t *ip = (uint32_t *)&v6->sin6_addr.s6_addr;
1204	<
1205	<	hash  = ip[0] ^ ip[3];
1206	<	hash ^= hash >> 16;
1207	<	hash ^= hash >> 8;
1208	<	hash  = hash & (IP_HASH_SIZE - 1);
1209	<	return hash;
1210	<	}
1211	<	#else
1212	<	return 0;
1213	<	#endif
349	>
350	>	sendto_one_notice(client_p, &me, ":*** Banned: %s", conf->reason);
351	>	return BANNED_CLIENT;
352		}
353
354	<	/* count_ip_hash()
1217	<	*
1218	<	* inputs        - pointer to counter of number of ips hashed
1219	<	*               - pointer to memory used for ip hash
1220	<	* output        - returned via pointers input
1221	<	* side effects  - NONE
354	>	/* check_client()
355		*
356	<	* number of hashed ip #'s is counted up, plus the amount of memory
357	<	* used in the hash.
356	>	* inputs       - pointer to client
357	>	* output       - 0 = Success
358	>	*                NOT_AUTHORIZED    (-1) = Access denied (no I line match)
359	>	*                IRCD_SOCKET_ERROR (-2) = Bad socket.
360	>	*                I_LINE_FULL       (-3) = I-line is full
361	>	*                TOO_MANY          (-4) = Too many connections from hostname
362	>	*                BANNED_CLIENT     (-5) = K-lined
363	>	* side effects - Ordinary client access check.
364	>	*                Look for conf lines which have the same
365	>	*                status as the flags passed.
366		*/
367	<	void
368	<	count_ip_hash(unsigned int *number_ips_stored, uint64_t *mem_ips_stored)
367	>	int
368	>	check_client(struct Client *source_p)
369		{
1229	–	struct ip_entry *ptr;
370		int i;
371
372	<	*number_ips_stored = 0;
373	<	*mem_ips_stored    = 0;
372	>	if ((i = verify_access(source_p)))
373	>	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
374	>	source_p->name, source_p->sockhost);
375
376	<	for (i = 0; i < IP_HASH_SIZE; i++)
376	>	switch (i)
377		{
378	<	for (ptr = ip_hash_table[i]; ptr; ptr = ptr->next)
379	<	{
380	<	*number_ips_stored += 1;
381	<	*mem_ips_stored += sizeof(struct ip_entry);
382	<	}
383	<	}
384	<	}
378	>	case TOO_MANY:
379	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
380	>	"Too many on IP for %s (%s).",
381	>	get_client_name(source_p, SHOW_IP),
382	>	source_p->sockhost);
383	>	ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
384	>	get_client_name(source_p, SHOW_IP));
385	>	++ServerStats.is_ref;
386	>	exit_client(source_p, "No more connections allowed on that IP");
387	>	break;
388
389	<	/* garbage_collect_ip_entries()
390	<	*
391	<	* input        - NONE
392	<	* output       - NONE
393	<	* side effects - free up all ip entries with no connections
394	<	*/
395	<	static void
396	<	garbage_collect_ip_entries(void)
397	<	{
398	<	struct ip_entry *ptr;
1255	<	struct ip_entry *last_ptr;
1256	<	struct ip_entry *next_ptr;
1257	<	int i;
389	>	case I_LINE_FULL:
390	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
391	>	"auth {} block is full for %s (%s).",
392	>	get_client_name(source_p, SHOW_IP),
393	>	source_p->sockhost);
394	>	ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
395	>	get_client_name(source_p, SHOW_IP));
396	>	++ServerStats.is_ref;
397	>	exit_client(source_p, "No more connections allowed in your connection class");
398	>	break;
399
400	<	for (i = 0; i < IP_HASH_SIZE; i++)
401	<	{
402	<	last_ptr = NULL;
400	>	case NOT_AUTHORIZED:
401	>	/* jdc - lists server name & port connections are on */
402	>	/*       a purely cosmetical change */
403	>	sendto_realops_flags(UMODE_UNAUTH, L_ALL, SEND_NOTICE,
404	>	"Unauthorized client connection from %s [%s] on [%s/%u].",
405	>	get_client_name(source_p, SHOW_IP),
406	>	source_p->sockhost,
407	>	source_p->connection->listener->name,
408	>	source_p->connection->listener->port);
409	>	ilog(LOG_TYPE_IRCD, "Unauthorized client connection from %s on [%s/%u].",
410	>	get_client_name(source_p, SHOW_IP),
411	>	source_p->connection->listener->name,
412	>	source_p->connection->listener->port);
413
414	<	for (ptr = ip_hash_table[i]; ptr; ptr = next_ptr)
415	<	{
416	<	next_ptr = ptr->next;
414	>	++ServerStats.is_ref;
415	>	exit_client(source_p, "You are not authorized to use this server");
416	>	break;
417
418	<	if (ptr->count == 0 &&
419	<	(CurrentTime - ptr->last_attempt) >= ConfigFileEntry.throttle_time)
420	<	{
421	<	if (last_ptr != NULL)
422	<	last_ptr->next = ptr->next;
423	<	else
424	<	ip_hash_table[i] = ptr->next;
425	<	BlockHeapFree(ip_entry_heap, ptr);
1275	<	ip_entries_count--;
1276	<	}
1277	<	else
1278	<	last_ptr = ptr;
1279	<	}
418	>	case BANNED_CLIENT:
419	>	++ServerStats.is_ref;
420	>	exit_client(source_p, "Banned");
421	>	break;
422	>
423	>	case 0:
424	>	default:
425	>	break;
426		}
427	+
428	+	return !(i < 0);
429		}
430
431		/* detach_conf()
#	Line 1288 | Line 436 | garbage_collect_ip_entries(void)
436		* side effects - Disassociate configuration from the client.
437		*                Also removes a class from the list if marked for deleting.
438		*/
439	<	int
440	<	detach_conf(struct Client *client_p, ConfType type)
439	>	void
440	>	detach_conf(struct Client *client_p, enum maskitem_type type)
441		{
442	<	dlink_node *ptr, *next_ptr;
1295	<	struct ConfItem *conf;
1296	<	struct ClassItem *aclass;
1297	<	struct AccessItem *aconf;
1298	<	struct ConfItem *aclass_conf;
1299	<	struct MatchItem *match_item;
442	>	dlink_node *node = NULL, *node_next = NULL;
443
444	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->confs.head)
444	>	DLINK_FOREACH_SAFE(node, node_next, client_p->connection->confs.head)
445		{
446	<	conf = ptr->data;
1304	<
1305	<	if (type == CONF_TYPE || conf->type == type)
1306	<	{
1307	<	dlinkDelete(ptr, &client_p->localClient->confs);
1308	<	free_dlink_node(ptr);
446	>	struct MaskItem *conf = node->data;
447
448	<	switch (conf->type)
449	<	{
450	<	case CLIENT_TYPE:
1313	<	case OPER_TYPE:
1314	<	case SERVER_TYPE:
1315	<	aconf = map_to_conf(conf);
1316	<
1317	<	assert(aconf->clients > 0);
1318	<
1319	<	if ((aclass_conf = ClassPtr(aconf)) != NULL)
1320	<	{
1321	<	aclass = map_to_conf(aclass_conf);
1322	<
1323	<	assert(aclass->curr_user_count > 0);
448	>	assert(conf->type & (CONF_CLIENT | CONF_OPER | CONF_SERVER));
449	>	assert(conf->ref_count > 0);
450	>	assert(conf->class->ref_count > 0);
451
452	<	if (conf->type == CLIENT_TYPE)
453	<	remove_from_cidr_check(&client_p->localClient->ip, aclass);
1327	<	if (--aclass->curr_user_count == 0 && aclass->active == 0)
1328	<	delete_conf_item(aclass_conf);
1329	<	}
452	>	if (!(conf->type & type))
453	>	continue;
454
455	<	if (--aconf->clients == 0 && IsConfIllegal(aconf))
456	<	delete_conf_item(conf);
455	>	dlinkDelete(node, &client_p->connection->confs);
456	>	free_dlink_node(node);
457
458	<	break;
458	>	if (conf->type == CONF_CLIENT)
459	>	remove_from_cidr_check(&client_p->connection->ip, conf->class);
460
461	<	case LEAF_TYPE:
462	<	case HUB_TYPE:
463	<	match_item = map_to_conf(conf);
464	<	if (match_item->ref_count == 0 && match_item->illegal)
1340	<	delete_conf_item(conf);
1341	<	break;
1342	<	default:
1343	<	break;
1344	<	}
1345	<
1346	<	if (type != CONF_TYPE)
1347	<	return 0;
461	>	if (--conf->class->ref_count == 0 && conf->class->active == 0)
462	>	{
463	>	class_free(conf->class);
464	>	conf->class = NULL;
465		}
1349	–	}
466
467	<	return -1;
467	>	if (--conf->ref_count == 0 && conf->active == 0)
468	>	conf_free(conf);
469	>	}
470		}
471
472		/* attach_conf()
#	Line 1362 | Line 480 | detach_conf(struct Client *client_p, Con
480		*                attachment if there was an old one...
481		*/
482		int
483	<	attach_conf(struct Client *client_p, struct ConfItem *conf)
483	>	attach_conf(struct Client *client_p, struct MaskItem *conf)
484		{
485	<	if (dlinkFind(&client_p->localClient->confs, conf) != NULL)
485	>	if (dlinkFind(&client_p->connection->confs, conf))
486		return 1;
487
488	<	if (conf->type == CLIENT_TYPE ||
489	<	conf->type == SERVER_TYPE ||
490	<	conf->type == OPER_TYPE)
491	<	{
1374	<	struct AccessItem *aconf = map_to_conf(conf);
1375	<	struct ClassItem *aclass = map_to_conf(aconf->class_ptr);
488	>	if (conf->type == CONF_CLIENT)
489	>	if (cidr_limit_reached(IsConfExemptLimits(conf),
490	>	&client_p->connection->ip, conf->class))
491	>	return TOO_MANY;    /* Already at maximum allowed */
492
493	<	if (IsConfIllegal(aconf))
494	<	return NOT_AUTHORIZED;
493	>	conf->class->ref_count++;
494	>	conf->ref_count++;
495
496	<	if (conf->type == CLIENT_TYPE)
1381	<	if (cidr_limit_reached(IsConfExemptLimits(aconf),
1382	<	&client_p->localClient->ip, aclass))
1383	<	return TOO_MANY;    /* Already at maximum allowed */
1384	<
1385	<	CurrUserCount(aclass)++;
1386	<	aconf->clients++;
1387	<	}
1388	<	else if (conf->type == HUB_TYPE || conf->type == LEAF_TYPE)
1389	<	{
1390	<	struct MatchItem *match_item = map_to_conf(conf);
1391	<	match_item->ref_count++;
1392	<	}
1393	<
1394	<	dlinkAdd(conf, make_dlink_node(), &client_p->localClient->confs);
496	>	dlinkAdd(conf, make_dlink_node(), &client_p->connection->confs);
497
498		return 0;
499		}
#	Line 1408 | Line 510 | int
510		attach_connect_block(struct Client *client_p, const char *name,
511		const char *host)
512		{
513	<	dlink_node *ptr;
1412	<	struct ConfItem *conf;
1413	<	struct AccessItem *aconf;
1414	<
1415	<	assert(client_p != NULL);
1416	<	assert(host != NULL);
513	>	dlink_node *node = NULL;
514
515	<	if (client_p == NULL || host == NULL)
1419	<	return 0;
515	>	assert(host);
516
517	<	DLINK_FOREACH(ptr, server_items.head)
517	>	DLINK_FOREACH(node, server_items.head)
518		{
519	<	conf = ptr->data;
1424	<	aconf = map_to_conf(conf);
519	>	struct MaskItem *conf = node->data;
520
521	<	if (match(conf->name, name) == 0 || match(aconf->host, host) == 0)
521	>	if (match(conf->name, name) || match(conf->host, host))
522		continue;
523
524		attach_conf(client_p, conf);
525	<	return -1;
525	>	return 1;
526		}
527
528		return 0;
529		}
530
1436	–	/* find_conf_exact()
1437	–	*
1438	–	* inputs       - type of ConfItem
1439	–	*              - pointer to name to find
1440	–	*              - pointer to username to find
1441	–	*              - pointer to host to find
1442	–	* output       - NULL or pointer to conf found
1443	–	* side effects - find a conf entry which matches the hostname
1444	–	*                and has the same name.
1445	–	*/
1446	–	struct ConfItem *
1447	–	find_conf_exact(ConfType type, const char *name, const char *user,
1448	–	const char *host)
1449	–	{
1450	–	dlink_node *ptr;
1451	–	dlink_list *list_p;
1452	–	struct ConfItem *conf = NULL;
1453	–	struct AccessItem *aconf;
1454	–
1455	–	/* Only valid for OPER_TYPE and ...? */
1456	–	list_p = map_to_list(type);
1457	–
1458	–	DLINK_FOREACH(ptr, (*list_p).head)
1459	–	{
1460	–	conf = ptr->data;
1461	–
1462	–	if (conf->name == NULL)
1463	–	continue;
1464	–	aconf = map_to_conf(conf);
1465	–	if (aconf->host == NULL)
1466	–	continue;
1467	–	if (irccmp(conf->name, name) != 0)
1468	–	continue;
1469	–
1470	–	/*
1471	–	** Accept if the *real* hostname (usually sockethost)
1472	–	** socket host) matches *either* host or name field
1473	–	** of the configuration.
1474	–	*/
1475	–	if (!match(aconf->host, host) || !match(aconf->user, user))
1476	–	continue;
1477	–	if (type == OPER_TYPE)
1478	–	{
1479	–	struct ClassItem *aclass = map_to_conf(aconf->class_ptr);
1480	–
1481	–	if (aconf->clients >= MaxTotal(aclass))
1482	–	continue;
1483	–	}
1484	–
1485	–	return conf;
1486	–	}
1487	–
1488	–	return NULL;
1489	–	}
1490	–
531		/* find_conf_name()
532		*
533		* inputs       - pointer to conf link list to search
#	Line 1497 | Line 537 | find_conf_exact(ConfType type, const cha
537		* side effects - find a conf entry which matches the name
538		*                and has the given mask.
539		*/
540	<	struct ConfItem *
541	<	find_conf_name(dlink_list *list, const char *name, ConfType type)
540	>	struct MaskItem *
541	>	find_conf_name(dlink_list *list, const char *name, enum maskitem_type type)
542		{
543	<	dlink_node *ptr;
1504	<	struct ConfItem* conf;
543	>	dlink_node *node = NULL;
544
545	<	DLINK_FOREACH(ptr, list->head)
545	>	DLINK_FOREACH(node, list->head)
546		{
547	<	conf = ptr->data;
548	<
547	>	struct MaskItem *conf = node->data;
548	>
549		if (conf->type == type)
550		{
551	<	if (conf->name && (irccmp(conf->name, name) == 0 ||
552	<	match(conf->name, name)))
1514	<	return conf;
551	>	if (conf->name && !irccmp(conf->name, name))
552	>	return conf;
553		}
554		}
555
556		return NULL;
557		}
558
1521	–	/* map_to_list()
1522	–	*
1523	–	* inputs       - ConfType conf
1524	–	* output       - pointer to dlink_list to use
1525	–	* side effects - none
1526	–	*/
1527	–	static dlink_list *
1528	–	map_to_list(ConfType type)
1529	–	{
1530	–	switch(type)
1531	–	{
1532	–	case RXLINE_TYPE:
1533	–	return(&rxconf_items);
1534	–	break;
1535	–	case XLINE_TYPE:
1536	–	return(&xconf_items);
1537	–	break;
1538	–	case ULINE_TYPE:
1539	–	return(&uconf_items);
1540	–	break;
1541	–	case NRESV_TYPE:
1542	–	return(&nresv_items);
1543	–	break;
1544	–	case OPER_TYPE:
1545	–	return(&oconf_items);
1546	–	break;
1547	–	case CLASS_TYPE:
1548	–	return(&class_items);
1549	–	break;
1550	–	case SERVER_TYPE:
1551	–	return(&server_items);
1552	–	break;
1553	–	case SERVICE_TYPE:
1554	–	return(&service_items);
1555	–	break;
1556	–	case CLUSTER_TYPE:
1557	–	return(&cluster_items);
1558	–	break;
1559	–	case CONF_TYPE:
1560	–	case GLINE_TYPE:
1561	–	case KLINE_TYPE:
1562	–	case DLINE_TYPE:
1563	–	case CRESV_TYPE:
1564	–	default:
1565	–	return NULL;
1566	–	}
1567	–	}
1568	–
559		/* find_matching_name_conf()
560		*
561		* inputs       - type of link list to look in
562		*              - pointer to name string to find
563		*              - pointer to user
564		*              - pointer to host
565	<	*              - optional action to match on as well
566	<	* output       - NULL or pointer to found struct MatchItem
565	>	*              - optional flags to match on as well
566	>	* output       - NULL or pointer to found struct MaskItem
567		* side effects - looks for a match on name field
568		*/
569	<	struct ConfItem *
570	<	find_matching_name_conf(ConfType type, const char *name, const char *user,
571	<	const char *host, int action)
572	<	{
573	<	dlink_node *ptr=NULL;
574	<	struct ConfItem *conf=NULL;
575	<	struct AccessItem *aconf=NULL;
1586	<	struct MatchItem *match_item=NULL;
1587	<	dlink_list *list_p = map_to_list(type);
569	>	struct MaskItem *
570	>	find_matching_name_conf(enum maskitem_type type, const char *name, const char *user,
571	>	const char *host, unsigned int flags)
572	>	{
573	>	dlink_node *node = NULL;
574	>	dlink_list *list = map_to_list(type);
575	>	struct MaskItem *conf = NULL;
576
577		switch (type)
578		{
579	<	#ifdef HAVE_LIBPCRE
580	<	case RXLINE_TYPE:
1593	<	DLINK_FOREACH(ptr, list_p->head)
1594	<	{
1595	<	conf = ptr->data;
1596	<	assert(conf->regexpname);
1597	<
1598	<	if (!ircd_pcre_exec(conf->regexpname, name))
1599	<	return conf;
1600	<	}
1601	<	break;
1602	<	#endif
1603	<	case SERVICE_TYPE:
1604	<	DLINK_FOREACH(ptr, list_p->head)
579	>	case CONF_SERVICE:
580	>	DLINK_FOREACH(node, list->head)
581		{
582	<	conf = ptr->data;
582	>	conf = node->data;
583
584		if (EmptyString(conf->name))
585		continue;
586	<	if ((name != NULL) && !irccmp(name, conf->name))
586	>	if (name && !irccmp(name, conf->name))
587		return conf;
588		}
589		break;
590
591	<	case XLINE_TYPE:
592	<	case ULINE_TYPE:
593	<	case NRESV_TYPE:
594	<	DLINK_FOREACH(ptr, list_p->head)
591	>	case CONF_XLINE:
592	>	case CONF_SHARED:
593	>	case CONF_NRESV:
594	>	case CONF_CRESV:
595	>	DLINK_FOREACH(node, list->head)
596		{
597	<	conf = ptr->data;
597	>	conf = node->data;
598
1622	–	match_item = map_to_conf(conf);
599		if (EmptyString(conf->name))
600	<	continue;
601	<	if ((name != NULL) && match_esc(conf->name, name))
600	>	continue;
601	>	if (name && !match(conf->name, name))
602		{
603	<	if ((user == NULL && (host == NULL)))
604	<	return conf;
605	<	if ((match_item->action & action) != action)
603	>	if ((user == NULL && (host == NULL)))
604	>	return conf;
605	>	if ((conf->flags & flags) != flags)
606		continue;
607	<	if (EmptyString(match_item->user) || EmptyString(match_item->host))
608	<	return conf;
609	<	if (match(match_item->user, user) && match(match_item->host, host))
610	<	return conf;
607	>	if (EmptyString(conf->user) || EmptyString(conf->host))
608	>	return conf;
609	>	if (!match(conf->user, user) && !match(conf->host, host))
610	>	return conf;
611		}
612		}
613		break;
614
615	<	case SERVER_TYPE:
616	<	DLINK_FOREACH(ptr, list_p->head)
615	>	case CONF_SERVER:
616	>	DLINK_FOREACH(node, list->head)
617		{
618	<	conf = ptr->data;
1643	<	aconf = map_to_conf(conf);
618	>	conf = node->data;
619
620	<	if ((name != NULL) && match_esc(name, conf->name))
620	>	if (name && !match(name, conf->name))
621		return conf;
622	<	else if ((host != NULL) && match_esc(host, aconf->host))
622	>	if (host && !match(host, conf->host))
623		return conf;
624		}
625		break;
626	<
626	>
627		default:
628		break;
629		}
#	Line 1661 | Line 636 | find_matching_name_conf(ConfType type, c
636		*              - pointer to name string to find
637		*              - pointer to user
638		*              - pointer to host
639	<	* output       - NULL or pointer to found struct MatchItem
639	>	* output       - NULL or pointer to found struct MaskItem
640		* side effects - looks for an exact match on name field
641		*/
642	<	struct ConfItem *
643	<	find_exact_name_conf(ConfType type, const struct Client *who, const char *name,
642	>	struct MaskItem *
643	>	find_exact_name_conf(enum maskitem_type type, const struct Client *who, const char *name,
644		const char *user, const char *host)
645		{
646	<	dlink_node *ptr = NULL;
647	<	struct AccessItem *aconf;
648	<	struct ConfItem *conf;
1674	<	struct MatchItem *match_item;
1675	<	dlink_list *list_p;
1676	<
1677	<	list_p = map_to_list(type);
646	>	dlink_node *node = NULL;
647	>	dlink_list *list = map_to_list(type);
648	>	struct MaskItem *conf = NULL;
649
650		switch(type)
651		{
652	<	case RXLINE_TYPE:
653	<	case XLINE_TYPE:
654	<	case ULINE_TYPE:
655	<	case NRESV_TYPE:
652	>	case CONF_XLINE:
653	>	case CONF_SHARED:
654	>	case CONF_NRESV:
655	>	case CONF_CRESV:
656
657	<	DLINK_FOREACH(ptr, list_p->head)
657	>	DLINK_FOREACH(node, list->head)
658		{
659	<	conf = ptr->data;
660	<	match_item = (struct MatchItem *)map_to_conf(conf);
659	>	conf = node->data;
660	>
661		if (EmptyString(conf->name))
662	<	continue;
663	<
662	>	continue;
663	>
664		if (irccmp(conf->name, name) == 0)
665		{
666	<	if ((user == NULL && (host == NULL)))
667	<	return (conf);
668	<	if (EmptyString(match_item->user) || EmptyString(match_item->host))
669	<	return (conf);
670	<	if (match(match_item->user, user) && match(match_item->host, host))
671	<	return (conf);
666	>	if ((user == NULL && (host == NULL)))
667	>	return conf;
668	>	if (EmptyString(conf->user) || EmptyString(conf->host))
669	>	return conf;
670	>	if (!match(conf->user, user) && !match(conf->host, host))
671	>	return conf;
672		}
673		}
674		break;
675
676	<	case OPER_TYPE:
677	<	DLINK_FOREACH(ptr, list_p->head)
676	>	case CONF_OPER:
677	>	DLINK_FOREACH(node, list->head)
678		{
679	<	conf = ptr->data;
1709	<	aconf = map_to_conf(conf);
679	>	conf = node->data;
680
681		if (EmptyString(conf->name))
682		continue;
#	Line 1715 | Line 685 | find_exact_name_conf(ConfType type, cons
685		{
686		if (!who)
687		return conf;
688	<	if (EmptyString(aconf->user) || EmptyString(aconf->host))
689	<	return conf;
690	<	if (match(aconf->user, who->username))
688	>	if (EmptyString(conf->user) || EmptyString(conf->host))
689	>	return NULL;
690	>	if (!match(conf->user, who->username))
691		{
692	<	switch (aconf->type)
692	>	switch (conf->htype)
693		{
694		case HM_HOST:
695	<	if (match(aconf->host, who->host) || match(aconf->host, who->sockhost))
696	<	return conf;
695	>	if (!match(conf->host, who->host) || !match(conf->host, who->sockhost))
696	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
697	>	return conf;
698		break;
699		case HM_IPV4:
700	<	if (who->localClient->aftype == AF_INET)
701	<	if (match_ipv4(&who->localClient->ip, &aconf->ipnum, aconf->bits))
702	<	return conf;
700	>	if (who->connection->aftype == AF_INET)
701	>	if (match_ipv4(&who->connection->ip, &conf->addr, conf->bits))
702	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
703	>	return conf;
704		break;
1733	–	#ifdef IPV6
705		case HM_IPV6:
706	<	if (who->localClient->aftype == AF_INET6)
707	<	if (match_ipv6(&who->localClient->ip, &aconf->ipnum, aconf->bits))
708	<	return conf;
706	>	if (who->connection->aftype == AF_INET6)
707	>	if (match_ipv6(&who->connection->ip, &conf->addr, conf->bits))
708	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
709	>	return conf;
710		break;
1739	–	#endif
711		default:
712		assert(0);
713		}
#	Line 1746 | Line 717 | find_exact_name_conf(ConfType type, cons
717
718		break;
719
720	<	case SERVER_TYPE:
721	<	DLINK_FOREACH(ptr, list_p->head)
720	>	case CONF_SERVER:
721	>	DLINK_FOREACH(node, list->head)
722		{
723	<	conf = ptr->data;
724	<	aconf = (struct AccessItem *)map_to_conf(conf);
723	>	conf = node->data;
724	>
725		if (EmptyString(conf->name))
726	<	continue;
727	<
726	>	continue;
727	>
728		if (name == NULL)
729		{
730	<	if (EmptyString(aconf->host))
731	<	continue;
732	<	if (irccmp(aconf->host, host) == 0)
733	<	return(conf);
730	>	if (EmptyString(conf->host))
731	>	continue;
732	>	if (irccmp(conf->host, host) == 0)
733	>	return conf;
734		}
735		else if (irccmp(conf->name, name) == 0)
736	<	{
1766	<	return (conf);
1767	<	}
736	>	return conf;
737		}
1769	–	break;
738
1771	–	case CLASS_TYPE:
1772	–	DLINK_FOREACH(ptr, list_p->head)
1773	–	{
1774	–	conf = ptr->data;
1775	–	if (EmptyString(conf->name))
1776	–	continue;
1777	–
1778	–	if (irccmp(conf->name, name) == 0)
1779	–	return (conf);
1780	–	}
739		break;
740
741		default:
742		break;
743		}
1786	–	return(NULL);
1787	–	}
1788	–
1789	–	/* rehash()
1790	–	*
1791	–	* Actual REHASH service routine. Called with sig == 0 if it has been called
1792	–	* as a result of an operator issuing this command, else assume it has been
1793	–	* called as a result of the server receiving a HUP signal.
1794	–	*/
1795	–	int
1796	–	rehash(int sig)
1797	–	{
1798	–	if (sig != 0)
1799	–	sendto_realops_flags(UMODE_ALL, L_ALL,
1800	–	"Got signal SIGHUP, reloading ircd.conf file");
1801	–
1802	–	restart_resolver();
1803	–
1804	–	/* don't close listeners until we know we can go ahead with the rehash */
1805	–
1806	–	/* Check to see if we magically got(or lost) IPv6 support */
1807	–	check_can_use_v6();
1808	–
1809	–	read_conf_files(0);
744
745	<	if (ServerInfo.description != NULL)
1812	<	strlcpy(me.info, ServerInfo.description, sizeof(me.info));
1813	<
1814	<	load_conf_modules();
1815	<
1816	<	flush_deleted_I_P();
1817	<
1818	<	rehashed_klines = 1;
1819	<	/* XXX */
1820	<	if (ConfigLoggingEntry.use_logging)
1821	<	log_close_all();
1822	<
1823	<	return(0);
745	>	return NULL;
746		}
747
748		/* set_default_conf()
#	Line 1838 | Line 760 | set_default_conf(void)
760		/* verify init_class() ran, this should be an unnecessary check
761		* but its not much work.
762		*/
763	<	assert(class_default == (struct ConfItem *) class_items.tail->data);
763	>	assert(class_default == class_get_list()->tail->data);
764
765		#ifdef HAVE_LIBCRYPTO
766	<	ServerInfo.rsa_private_key = NULL;
767	<	ServerInfo.rsa_private_key_file = NULL;
766	>	#if OPENSSL_VERSION_NUMBER >= 0x009080FFL && !defined(OPENSSL_NO_ECDH)
767	>	{
768	>	EC_KEY *key = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
769	>
770	>	if (key)
771	>	{
772	>	SSL_CTX_set_tmp_ecdh(ConfigServerInfo.server_ctx, key);
773	>	EC_KEY_free(key);
774	>	}
775	>	}
776	>
777	>	SSL_CTX_set_options(ConfigServerInfo.server_ctx, SSL_OP_SINGLE_ECDH_USE);
778	>	#endif
779	>
780	>	SSL_CTX_set_cipher_list(ConfigServerInfo.server_ctx, "EECDH+HIGH:EDH+HIGH:HIGH:!aNULL");
781	>	ConfigServerInfo.message_digest_algorithm = EVP_sha256();
782		#endif
783
784	<	/* ServerInfo.name is not rehashable */
785	<	/* ServerInfo.name = ServerInfo.name; */
1850	<	ServerInfo.description = NULL;
1851	<	DupString(ServerInfo.network_name, NETWORK_NAME_DEFAULT);
1852	<	DupString(ServerInfo.network_desc, NETWORK_DESC_DEFAULT);
1853	<
1854	<	memset(&ServerInfo.ip, 0, sizeof(ServerInfo.ip));
1855	<	ServerInfo.specific_ipv4_vhost = 0;
1856	<	memset(&ServerInfo.ip6, 0, sizeof(ServerInfo.ip6));
1857	<	ServerInfo.specific_ipv6_vhost = 0;
1858	<
1859	<	ServerInfo.max_clients = MAXCLIENTS_MAX;
1860	<
1861	<	ServerInfo.hub = 0;
1862	<	ServerInfo.dns_host.sin_addr.s_addr = 0;
1863	<	ServerInfo.dns_host.sin_port = 0;
1864	<	AdminInfo.name = NULL;
1865	<	AdminInfo.email = NULL;
1866	<	AdminInfo.description = NULL;
784	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
785	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
786
787	<	log_close_all();
787	>	memset(&ConfigServerInfo.ip, 0, sizeof(ConfigServerInfo.ip));
788	>	ConfigServerInfo.specific_ipv4_vhost = 0;
789	>	memset(&ConfigServerInfo.ip6, 0, sizeof(ConfigServerInfo.ip6));
790	>	ConfigServerInfo.specific_ipv6_vhost = 0;
791	>
792	>	ConfigServerInfo.default_max_clients = MAXCLIENTS_MAX;
793	>	ConfigServerInfo.max_nick_length = 9;
794	>	ConfigServerInfo.max_topic_length = 80;
795	>	ConfigServerInfo.hub = 0;
796
797	<	ConfigLoggingEntry.use_logging = 1;
797	>	log_del_all();
798	>
799	>	ConfigLog.use_logging = 1;
800
801		ConfigChannel.disable_fake_channels = 0;
802	<	ConfigChannel.restrict_channels = 0;
803	<	ConfigChannel.disable_local_channels = 0;
804	<	ConfigChannel.use_invex = 1;
805	<	ConfigChannel.use_except = 1;
806	<	ConfigChannel.use_knock = 1;
1878	<	ConfigChannel.knock_delay = 300;
802	>	ConfigChannel.invite_client_count = 10;
803	>	ConfigChannel.invite_client_time = 300;
804	>	ConfigChannel.invite_delay_channel = 5;
805	>	ConfigChannel.knock_client_count = 1;
806	>	ConfigChannel.knock_client_time = 300;
807		ConfigChannel.knock_delay_channel = 60;
808	<	ConfigChannel.max_chans_per_user = 15;
1881	<	ConfigChannel.quiet_on_ban = 1;
808	>	ConfigChannel.max_channels = 25;
809		ConfigChannel.max_bans = 25;
810	<	ConfigChannel.default_split_user_count = 0;
811	<	ConfigChannel.default_split_server_count = 0;
1885	<	ConfigChannel.no_join_on_split = 0;
1886	<	ConfigChannel.no_create_on_split = 0;
1887	<	ConfigChannel.burst_topicwho = 1;
810	>	ConfigChannel.default_join_flood_count = 18;
811	>	ConfigChannel.default_join_flood_time = 6;
812
813		ConfigServerHide.flatten_links = 0;
814	<	ConfigServerHide.links_delay = 300;
814	>	ConfigServerHide.flatten_links_delay = 300;
815		ConfigServerHide.hidden = 0;
1892	–	ConfigServerHide.disable_hidden = 0;
816		ConfigServerHide.hide_servers = 0;
817	<	DupString(ConfigServerHide.hidden_name, NETWORK_NAME_DEFAULT);
817	>	ConfigServerHide.hide_services = 0;
818	>	ConfigServerHide.hidden_name = xstrdup(NETWORK_NAME_DEFAULT);
819		ConfigServerHide.hide_server_ips = 0;
820	+	ConfigServerHide.disable_remote_commands = 0;
821
822	<
823	<	DupString(ConfigFileEntry.service_name, SERVICE_NAME_DEFAULT);
824	<	ConfigFileEntry.max_watch = WATCHSIZE_DEFAULT;
825	<	ConfigFileEntry.gline_min_cidr = 16;
826	<	ConfigFileEntry.gline_min_cidr6 = 48;
827	<	ConfigFileEntry.invisible_on_connect = 1;
828	<	ConfigFileEntry.burst_away = 0;
829	<	ConfigFileEntry.use_whois_actually = 1;
830	<	ConfigFileEntry.tkline_expire_notices = 1;
831	<	ConfigFileEntry.hide_spoof_ips = 1;
832	<	ConfigFileEntry.ignore_bogus_ts = 0;
833	<	ConfigFileEntry.disable_auth = 0;
834	<	ConfigFileEntry.disable_remote = 0;
835	<	ConfigFileEntry.kill_chase_time_limit = 90;
836	<	ConfigFileEntry.default_floodcount = 8;
837	<	ConfigFileEntry.failed_oper_notice = 1;
838	<	ConfigFileEntry.dots_in_ident = 0;
839	<	ConfigFileEntry.min_nonwildcard = 4;
840	<	ConfigFileEntry.min_nonwildcard_simple = 3;
841	<	ConfigFileEntry.max_accept = 20;
842	<	ConfigFileEntry.anti_nick_flood = 0;
843	<	ConfigFileEntry.max_nick_time = 20;
844	<	ConfigFileEntry.max_nick_changes = 5;
845	<	ConfigFileEntry.anti_spam_exit_message_time = 0;
846	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
847	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
848	<	ConfigFileEntry.kline_with_reason = 1;
849	<	ConfigFileEntry.kline_reason = NULL;
850	<	ConfigFileEntry.warn_no_nline = 1;
851	<	ConfigFileEntry.stats_o_oper_only = 0;
852	<	ConfigFileEntry.stats_k_oper_only = 1;  /* masked */
853	<	ConfigFileEntry.stats_i_oper_only = 1;  /* masked */
854	<	ConfigFileEntry.stats_P_oper_only = 0;
855	<	ConfigFileEntry.caller_id_wait = 60;
856	<	ConfigFileEntry.opers_bypass_callerid = 0;
857	<	ConfigFileEntry.pace_wait = 10;
858	<	ConfigFileEntry.pace_wait_simple = 1;
859	<	ConfigFileEntry.short_motd = 0;
860	<	ConfigFileEntry.ping_cookie = 0;
861	<	ConfigFileEntry.no_oper_flood = 0;
862	<	ConfigFileEntry.true_no_oper_flood = 0;
863	<	ConfigFileEntry.oper_pass_resv = 1;
864	<	ConfigFileEntry.glines = 0;
865	<	ConfigFileEntry.gline_time = 12 * 3600;
866	<	ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
867	<	ConfigFileEntry.client_flood = CLIENT_FLOOD_DEFAULT;
868	<	ConfigFileEntry.oper_only_umodes = UMODE_DEBUG;
1944	<	ConfigFileEntry.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE |
1945	<	UMODE_OPERWALL | UMODE_WALLOP;
1946	<	ConfigFileEntry.use_egd = 0;
1947	<	ConfigFileEntry.egdpool_path = NULL;
1948	<	ConfigFileEntry.throttle_time = 10;
822	>	ConfigGeneral.away_count = 2;
823	>	ConfigGeneral.away_time = 10;
824	>	ConfigGeneral.max_watch = 50;
825	>	ConfigGeneral.cycle_on_host_change = 1;
826	>	ConfigGeneral.dline_min_cidr = 16;
827	>	ConfigGeneral.dline_min_cidr6 = 48;
828	>	ConfigGeneral.kline_min_cidr = 16;
829	>	ConfigGeneral.kline_min_cidr6 = 48;
830	>	ConfigGeneral.invisible_on_connect = 1;
831	>	ConfigGeneral.tkline_expire_notices = 1;
832	>	ConfigGeneral.ignore_bogus_ts = 0;
833	>	ConfigGeneral.disable_auth = 0;
834	>	ConfigGeneral.kill_chase_time_limit = 90;
835	>	ConfigGeneral.default_floodcount = 8;
836	>	ConfigGeneral.failed_oper_notice = 1;
837	>	ConfigGeneral.dots_in_ident = 0;
838	>	ConfigGeneral.min_nonwildcard = 4;
839	>	ConfigGeneral.min_nonwildcard_simple = 3;
840	>	ConfigGeneral.max_accept = 50;
841	>	ConfigGeneral.anti_nick_flood = 0;
842	>	ConfigGeneral.max_nick_time = 20;
843	>	ConfigGeneral.max_nick_changes = 5;
844	>	ConfigGeneral.anti_spam_exit_message_time = 0;
845	>	ConfigGeneral.ts_warn_delta = 30;
846	>	ConfigGeneral.ts_max_delta = 600;
847	>	ConfigGeneral.warn_no_connect_block = 1;
848	>	ConfigGeneral.stats_e_disabled = 0;
849	>	ConfigGeneral.stats_i_oper_only = 1;  /* 1 = masked */
850	>	ConfigGeneral.stats_k_oper_only = 1;  /* 1 = masked */
851	>	ConfigGeneral.stats_o_oper_only = 1;
852	>	ConfigGeneral.stats_m_oper_only = 1;
853	>	ConfigGeneral.stats_P_oper_only = 0;
854	>	ConfigGeneral.stats_u_oper_only = 0;
855	>	ConfigGeneral.caller_id_wait = 60;
856	>	ConfigGeneral.opers_bypass_callerid = 0;
857	>	ConfigGeneral.pace_wait = 10;
858	>	ConfigGeneral.pace_wait_simple = 1;
859	>	ConfigGeneral.short_motd = 0;
860	>	ConfigGeneral.ping_cookie = 0;
861	>	ConfigGeneral.no_oper_flood = 0;
862	>	ConfigGeneral.max_targets = MAX_TARGETS_DEFAULT;
863	>	ConfigGeneral.oper_only_umodes = UMODE_DEBUG | UMODE_LOCOPS | UMODE_HIDDEN | UMODE_FARCONNECT |
864	>	UMODE_UNAUTH | UMODE_EXTERNAL | UMODE_BOTS | UMODE_NCHANGE |
865	>	UMODE_SPY | UMODE_FULL | UMODE_SKILL | UMODE_REJ | UMODE_CCONN;
866	>	ConfigGeneral.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE | UMODE_WALLOP;
867	>	ConfigGeneral.throttle_count = 1;
868	>	ConfigGeneral.throttle_time = 1;
869		}
870
871		static void
872		validate_conf(void)
873		{
874	<	if (ConfigFileEntry.ts_warn_delta < TS_WARN_DELTA_MIN)
875	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
1956	<
1957	<	if (ConfigFileEntry.ts_max_delta < TS_MAX_DELTA_MIN)
1958	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
1959	<
1960	<	if (ServerInfo.network_name == NULL)
1961	<	DupString(ServerInfo.network_name,NETWORK_NAME_DEFAULT);
1962	<
1963	<	if (ServerInfo.network_desc == NULL)
1964	<	DupString(ServerInfo.network_desc,NETWORK_DESC_DEFAULT);
1965	<
1966	<	if (ConfigFileEntry.service_name == NULL)
1967	<	DupString(ConfigFileEntry.service_name, SERVICE_NAME_DEFAULT);
874	>	if (EmptyString(ConfigServerInfo.network_name))
875	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
876
877	<	if ((ConfigFileEntry.client_flood < CLIENT_FLOOD_MIN) ||
878	<	(ConfigFileEntry.client_flood > CLIENT_FLOOD_MAX))
1971	<	ConfigFileEntry.client_flood = CLIENT_FLOOD_MAX;
1972	<
1973	<	ConfigFileEntry.max_watch = IRCD_MAX(ConfigFileEntry.max_watch, WATCHSIZE_MIN);
877	>	if (EmptyString(ConfigServerInfo.network_desc))
878	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
879		}
880
881	<	/* read_conf()
881	>	/* read_conf()
882		*
883		* inputs       - file descriptor pointing to config file to use
884		* output       - None
#	Line 1984 | Line 889 | read_conf(FILE *file)
889		{
890		lineno = 0;
891
892	<	set_default_conf(); /* Set default values prior to conf parsing */
892	>	set_default_conf();  /* Set default values prior to conf parsing */
893		conf_parser_ctx.pass = 1;
894	<	yyparse();          /* pick up the classes first */
894	>	yyparse();  /* Pick up the classes first */
895
896		rewind(file);
897
898		conf_parser_ctx.pass = 2;
899	<	yyparse();          /* Load the values from the conf */
900	<	validate_conf();    /* Check to make sure some values are still okay. */
901	<	/* Some global values are also loaded here. */
902	<	check_class();      /* Make sure classes are valid */
899	>	yyparse();  /* Load the values from the conf */
900	>	validate_conf();  /* Check to make sure some values are still okay. */
901	>	/* Some global values are also loaded here. */
902	>	class_delete_marked();  /* Delete unused classes that are marked for deletion */
903	>	}
904	>
905	>	/* conf_rehash()
906	>	*
907	>	* Actual REHASH service routine. Called with sig == 0 if it has been called
908	>	* as a result of an operator issuing this command, else assume it has been
909	>	* called as a result of the server receiving a HUP signal.
910	>	*/
911	>	void
912	>	conf_rehash(int sig)
913	>	{
914	>	if (sig)
915	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
916	>	"Got signal SIGHUP, reloading configuration file(s)");
917	>
918	>	restart_resolver();
919	>
920	>	/* don't close listeners until we know we can go ahead with the rehash */
921	>
922	>	read_conf_files(0);
923	>
924	>	load_conf_modules();
925	>	check_conf_klines();
926		}
927
928		/* lookup_confhost()
#	Line 2002 | Line 930 | read_conf(FILE *file)
930		* start DNS lookups of all hostnames in the conf
931		* line and convert an IP addresses in a.b.c.d number for to IP#s.
932		*/
933	<	static void
934	<	lookup_confhost(struct ConfItem *conf)
933	>	void
934	>	lookup_confhost(struct MaskItem *conf)
935		{
2008	–	struct AccessItem *aconf;
936		struct addrinfo hints, *res;
937
938	<	aconf = map_to_conf(conf);
939	<
2013	<	if (EmptyString(aconf->host) ||
2014	<	EmptyString(aconf->user))
2015	<	{
2016	<	ilog(LOG_TYPE_IRCD, "Host/server name error: (%s) (%s)",
2017	<	aconf->host, conf->name);
2018	<	return;
2019	<	}
2020	<
2021	<	if (strchr(aconf->host, '*') ||
2022	<	strchr(aconf->host, '?'))
2023	<	return;
2024	<
2025	<	/* Do name lookup now on hostnames given and store the
938	>	/*
939	>	* Do name lookup now on hostnames given and store the
940		* ip numbers in conf structure.
941		*/
942		memset(&hints, 0, sizeof(hints));
#	Line 2033 | Line 947 | lookup_confhost(struct ConfItem *conf)
947		/* Get us ready for a bind() and don't bother doing dns lookup */
948		hints.ai_flags = AI_PASSIVE | AI_NUMERICHOST;
949
950	<	if (getaddrinfo(aconf->host, NULL, &hints, &res))
950	>	if (getaddrinfo(conf->host, NULL, &hints, &res))
951		{
952	<	conf_dns_lookup(aconf);
952	>	conf_dns_lookup(conf);
953		return;
954		}
955
956	<	assert(res != NULL);
956	>	assert(res);
957	>
958	>	memcpy(&conf->addr, res->ai_addr, res->ai_addrlen);
959	>	conf->addr.ss_len = res->ai_addrlen;
960	>	conf->addr.ss.ss_family = res->ai_family;
961
2044	–	memcpy(&aconf->ipnum, res->ai_addr, res->ai_addrlen);
2045	–	aconf->ipnum.ss_len = res->ai_addrlen;
2046	–	aconf->ipnum.ss.ss_family = res->ai_family;
962		freeaddrinfo(res);
963		}
964
#	Line 2057 | Line 972 | lookup_confhost(struct ConfItem *conf)
972		int
973		conf_connect_allowed(struct irc_ssaddr *addr, int aftype)
974		{
975	<	struct ip_entry *ip_found;
976	<	struct AccessItem *aconf = find_dline_conf(addr, aftype);
975	>	struct ip_entry *ip_found = NULL;
976	>	const struct MaskItem *conf = find_dline_conf(addr, aftype);
977
978	<	/* DLINE exempt also gets you out of static limits/pacing... */
979	<	if (aconf && (aconf->status & CONF_EXEMPTDLINE))
980	<	return 0;
981	<
982	<	if (aconf != NULL)
978	>	if (conf)
979	>	{
980	>	/* DLINE exempt also gets you out of static limits/pacing... */
981	>	if (conf->type == CONF_EXEMPT)
982	>	return 0;
983		return BANNED_CLIENT;
984	+	}
985
986	<	ip_found = find_or_add_ip(addr);
986	>	ip_found = ipcache_find_or_add_address(addr);
987
988	<	if ((CurrentTime - ip_found->last_attempt) <
2073	<	ConfigFileEntry.throttle_time)
988	>	if ((CurrentTime - ip_found->last_attempt) < ConfigGeneral.throttle_time)
989		{
990	<	ip_found->last_attempt = CurrentTime;
991	<	return TOO_FAST;
990	>	if (ip_found->connection_count >= ConfigGeneral.throttle_count)
991	>	return TOO_FAST;
992	>
993	>	++ip_found->connection_count;
994		}
995	+	else
996	+	ip_found->connection_count = 1;
997
998		ip_found->last_attempt = CurrentTime;
999		return 0;
1000		}
1001
1002	<	static struct AccessItem *
2084	<	find_regexp_kline(const char *uhi[])
2085	<	{
2086	<	#ifdef HAVE_LIBPCRE
2087	<	const dlink_node *ptr = NULL;
2088	<
2089	<	DLINK_FOREACH(ptr, rkconf_items.head)
2090	<	{
2091	<	struct AccessItem *aptr = map_to_conf(ptr->data);
2092	<
2093	<	assert(aptr->regexuser);
2094	<	assert(aptr->regexhost);
2095	<
2096	<	if (!ircd_pcre_exec(aptr->regexuser, uhi[0]) &&
2097	<	(!ircd_pcre_exec(aptr->regexhost, uhi[1]) ||
2098	<	!ircd_pcre_exec(aptr->regexhost, uhi[2])))
2099	<	return aptr;
2100	<	}
2101	<	#endif
2102	<	return NULL;
2103	<	}
2104	<
2105	<	/* find_kill()
1002	>	/* expire_tklines()
1003		*
1004	<	* inputs       - pointer to client structure
1005	<	* output       - pointer to struct AccessItem if found
1006	<	* side effects - See if this user is klined already,
2110	<	*                and if so, return struct AccessItem pointer
1004	>	* inputs       - tkline list pointer
1005	>	* output       - NONE
1006	>	* side effects - expire tklines
1007		*/
1008	<	struct AccessItem *
1009	<	find_kill(struct Client *client_p)
2114	<	{
2115	<	struct AccessItem *aconf = NULL;
2116	<	const char *uhi[3];
2117	<
2118	<	uhi[0] = client_p->username;
2119	<	uhi[1] = client_p->host;
2120	<	uhi[2] = client_p->sockhost;
2121	<
2122	<	assert(client_p != NULL);
2123	<
2124	<	aconf = find_kline_conf(client_p->host, client_p->username,
2125	<	&client_p->localClient->ip,
2126	<	client_p->localClient->aftype);
2127	<	if (aconf == NULL)
2128	<	aconf = find_regexp_kline(uhi);
2129	<
2130	<	if (aconf && (aconf->status & CONF_KLINE))
2131	<	return aconf;
2132	<
2133	<	return NULL;
2134	<	}
2135	<
2136	<	struct AccessItem *
2137	<	find_gline(struct Client *client_p)
1008	>	static void
1009	>	expire_tklines(dlink_list *list)
1010		{
1011	<	struct AccessItem *aconf;
1011	>	dlink_node *node = NULL, *node_next = NULL;
1012
1013	<	assert(client_p != NULL);
1014	<
1015	<	aconf = find_gline_conf(client_p->host, client_p->username,
2144	<	&client_p->localClient->ip,
2145	<	client_p->localClient->aftype);
2146	<
2147	<	if (aconf && (aconf->status & CONF_GLINE))
2148	<	return aconf;
2149	<
2150	<	return NULL;
2151	<	}
1013	>	DLINK_FOREACH_SAFE(node, node_next, list->head)
1014	>	{
1015	>	struct MaskItem *conf = node->data;
1016
1017	<	/* add_temp_line()
1018	<	*
2155	<	* inputs        - pointer to struct ConfItem
2156	<	* output        - none
2157	<	* Side effects  - links in given struct ConfItem into
2158	<	*                 temporary *line link list
2159	<	*/
2160	<	void
2161	<	add_temp_line(struct ConfItem *conf)
2162	<	{
2163	<	struct AccessItem *aconf;
1017	>	if (!conf->until || conf->until > CurrentTime)
1018	>	continue;
1019
1020	<	if (conf->type == DLINE_TYPE)
1021	<	{
1022	<	aconf = map_to_conf(conf);
1023	<	SetConfTemporary(aconf);
2169	<	dlinkAdd(conf, &conf->node, &temporary_dlines);
2170	<	MyFree(aconf->user);
2171	<	aconf->user = NULL;
2172	<	add_conf_by_address(CONF_DLINE, aconf);
2173	<	}
2174	<	else if (conf->type == KLINE_TYPE)
2175	<	{
2176	<	aconf = map_to_conf(conf);
2177	<	SetConfTemporary(aconf);
2178	<	dlinkAdd(conf, &conf->node, &temporary_klines);
2179	<	add_conf_by_address(CONF_KILL, aconf);
2180	<	}
2181	<	else if (conf->type == GLINE_TYPE)
2182	<	{
2183	<	aconf = map_to_conf(conf);
2184	<	SetConfTemporary(aconf);
2185	<	dlinkAdd(conf, &conf->node, &temporary_glines);
2186	<	add_conf_by_address(CONF_GLINE, aconf);
2187	<	}
2188	<	else if (conf->type == XLINE_TYPE)
2189	<	{
2190	<	conf->flags |= CONF_FLAGS_TEMPORARY;
2191	<	dlinkAdd(conf, make_dlink_node(), &temporary_xlines);
2192	<	}
2193	<	else if (conf->type == RXLINE_TYPE)
2194	<	{
2195	<	conf->flags |= CONF_FLAGS_TEMPORARY;
2196	<	dlinkAdd(conf, make_dlink_node(), &temporary_rxlines);
2197	<	}
2198	<	else if (conf->type == RKLINE_TYPE)
2199	<	{
2200	<	conf->flags |= CONF_FLAGS_TEMPORARY;
2201	<	dlinkAdd(conf, make_dlink_node(), &temporary_rklines);
2202	<	}
2203	<	else if ((conf->type == NRESV_TYPE) || (conf->type == CRESV_TYPE))
2204	<	{
2205	<	conf->flags |= CONF_FLAGS_TEMPORARY;
2206	<	dlinkAdd(conf, make_dlink_node(), &temporary_resv);
1020	>	if (ConfigGeneral.tkline_expire_notices)
1021	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE, "Temporary %s for [%s] expired",
1022	>	(conf->type == CONF_XLINE) ? "X-line" : "RESV", conf->name);
1023	>	conf_free(conf);
1024		}
1025		}
1026
#	Line 2215 | Line 1032 | add_temp_line(struct ConfItem *conf)
1032		*                This is an event started off in ircd.c
1033		*/
1034		void
1035	<	cleanup_tklines(void *notused)
1035	>	cleanup_tklines(void *unused)
1036		{
1037	<	expire_tklines(&temporary_glines);
1038	<	expire_tklines(&temporary_klines);
1039	<	expire_tklines(&temporary_dlines);
1040	<	expire_tklines(&temporary_xlines);
2224	<	expire_tklines(&temporary_rxlines);
2225	<	expire_tklines(&temporary_rklines);
2226	<	expire_tklines(&temporary_resv);
2227	<	}
2228	<
2229	<	/* expire_tklines()
2230	<	*
2231	<	* inputs       - tkline list pointer
2232	<	* output       - NONE
2233	<	* side effects - expire tklines
2234	<	*/
2235	<	static void
2236	<	expire_tklines(dlink_list *tklist)
2237	<	{
2238	<	dlink_node *ptr;
2239	<	dlink_node *next_ptr;
2240	<	struct ConfItem *conf;
2241	<	struct MatchItem *xconf;
2242	<	struct MatchItem *nconf;
2243	<	struct AccessItem *aconf;
2244	<	struct ResvChannel *cconf;
2245	<
2246	<	DLINK_FOREACH_SAFE(ptr, next_ptr, tklist->head)
2247	<	{
2248	<	conf = ptr->data;
2249	<	if (conf->type == GLINE_TYPE ||
2250	<	conf->type == KLINE_TYPE ||
2251	<	conf->type == DLINE_TYPE)
2252	<	{
2253	<	aconf = (struct AccessItem *)map_to_conf(conf);
2254	<	if (aconf->hold <= CurrentTime)
2255	<	{
2256	<	/* XXX - Do we want GLINE expiry notices?? */
2257	<	/* Alert opers that a TKline expired - Hwy */
2258	<	if (ConfigFileEntry.tkline_expire_notices)
2259	<	{
2260	<	if (aconf->status & CONF_KILL)
2261	<	{
2262	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2263	<	"Temporary K-line for [%s@%s] expired",
2264	<	(aconf->user) ? aconf->user : "*",
2265	<	(aconf->host) ? aconf->host : "*");
2266	<	}
2267	<	else if (conf->type == DLINE_TYPE)
2268	<	{
2269	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2270	<	"Temporary D-line for [%s] expired",
2271	<	(aconf->host) ? aconf->host : "*");
2272	<	}
2273	<	}
2274	<
2275	<	dlinkDelete(ptr, tklist);
2276	<	delete_one_address_conf(aconf->host, aconf);
2277	<	}
2278	<	}
2279	<	else if (conf->type == XLINE_TYPE ||
2280	<	conf->type == RXLINE_TYPE)
2281	<	{
2282	<	xconf = (struct MatchItem *)map_to_conf(conf);
2283	<	if (xconf->hold <= CurrentTime)
2284	<	{
2285	<	if (ConfigFileEntry.tkline_expire_notices)
2286	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2287	<	"Temporary X-line for [%s] %sexpired", conf->name,
2288	<	conf->type == RXLINE_TYPE ? "(REGEX) " : "");
2289	<	dlinkDelete(ptr, tklist);
2290	<	free_dlink_node(ptr);
2291	<	delete_conf_item(conf);
2292	<	}
2293	<	}
2294	<	else if (conf->type == RKLINE_TYPE)
2295	<	{
2296	<	aconf = map_to_conf(conf);
2297	<	if (aconf->hold <= CurrentTime)
2298	<	{
2299	<	if (ConfigFileEntry.tkline_expire_notices)
2300	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2301	<	"Temporary K-line for [%s@%s] (REGEX) expired",
2302	<	(aconf->user) ? aconf->user : "*",
2303	<	(aconf->host) ? aconf->host : "*");
2304	<	dlinkDelete(ptr, tklist);
2305	<	free_dlink_node(ptr);
2306	<	delete_conf_item(conf);
2307	<	}
2308	<	}
2309	<	else if (conf->type == NRESV_TYPE)
2310	<	{
2311	<	nconf = (struct MatchItem *)map_to_conf(conf);
2312	<	if (nconf->hold <= CurrentTime)
2313	<	{
2314	<	if (ConfigFileEntry.tkline_expire_notices)
2315	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2316	<	"Temporary RESV for [%s] expired", conf->name);
2317	<	dlinkDelete(ptr, tklist);
2318	<	free_dlink_node(ptr);
2319	<	delete_conf_item(conf);
2320	<	}
2321	<	}
2322	<	else if (conf->type == CRESV_TYPE)
2323	<	{
2324	<	cconf = (struct ResvChannel *)map_to_conf(conf);
2325	<	if (cconf->hold <= CurrentTime)
2326	<	{
2327	<	if (ConfigFileEntry.tkline_expire_notices)
2328	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2329	<	"Temporary RESV for [%s] expired", cconf->name);
2330	<	delete_channel_resv(cconf);
2331	<	}
2332	<	}
2333	<	}
1037	>	hostmask_expire_temporary();
1038	>	expire_tklines(&gecos_items);
1039	>	expire_tklines(&nresv_items);
1040	>	expire_tklines(&cresv_items);
1041		}
1042
1043		/* oper_privs_as_string()
#	Line 2341 | Line 1048 | expire_tklines(dlink_list *tklist)
1048		*/
1049		static const struct oper_privs
1050		{
1051	<	const unsigned int oprivs;
1051	>	const unsigned int flag;
1052		const unsigned char c;
1053		} flag_list[] = {
1054	<	{ OPER_FLAG_ADMIN,       'A' },
1055	<	{ OPER_FLAG_REMOTEBAN,   'B' },
1056	<	{ OPER_FLAG_DIE,         'D' },
1057	<	{ OPER_FLAG_GLINE,       'G' },
1058	<	{ OPER_FLAG_REHASH,      'H' },
1059	<	{ OPER_FLAG_K,           'K' },
1060	<	{ OPER_FLAG_OPERWALL,    'L' },
1061	<	{ OPER_FLAG_N,           'N' },
1062	<	{ OPER_FLAG_GLOBAL_KILL, 'O' },
1063	<	{ OPER_FLAG_REMOTE,      'R' },
1064	<	{ OPER_FLAG_OPER_SPY,    'S' },
1065	<	{ OPER_FLAG_UNKLINE,     'U' },
1066	<	{ OPER_FLAG_X,           'X' },
1054	>	{ OPER_FLAG_ADMIN,          'A' },
1055	>	{ OPER_FLAG_CLOSE,          'B' },
1056	>	{ OPER_FLAG_CONNECT,        'C' },
1057	>	{ OPER_FLAG_CONNECT_REMOTE, 'D' },
1058	>	{ OPER_FLAG_DIE,            'E' },
1059	>	{ OPER_FLAG_DLINE,          'F' },
1060	>	{ OPER_FLAG_GLOBOPS,        'G' },
1061	>	{ OPER_FLAG_JOIN_RESV,      'H' },
1062	>	{ OPER_FLAG_KILL,           'I' },
1063	>	{ OPER_FLAG_KILL_REMOTE,    'J' },
1064	>	{ OPER_FLAG_KLINE,          'K' },
1065	>	{ OPER_FLAG_LOCOPS,         'L' },
1066	>	{ OPER_FLAG_MODULE,         'M' },
1067	>	{ OPER_FLAG_NICK_RESV,      'N' },
1068	>	{ OPER_FLAG_OPME,           'O' },
1069	>	{ OPER_FLAG_REHASH,         'P' },
1070	>	{ OPER_FLAG_REMOTEBAN,      'Q' },
1071	>	{ OPER_FLAG_RESTART,        'R' },
1072	>	{ OPER_FLAG_RESV,           'S' },
1073	>	{ OPER_FLAG_SET,            'T' },
1074	>	{ OPER_FLAG_SQUIT,          'U' },
1075	>	{ OPER_FLAG_SQUIT_REMOTE,   'V' },
1076	>	{ OPER_FLAG_UNDLINE,        'W' },
1077	>	{ OPER_FLAG_UNKLINE,        'X' },
1078	>	{ OPER_FLAG_UNRESV,         'Y' },
1079	>	{ OPER_FLAG_UNXLINE,        'Z' },
1080	>	{ OPER_FLAG_WALLOPS,        'a' },
1081	>	{ OPER_FLAG_XLINE,          'b' },
1082		{ 0, '\0' }
1083		};
1084
1085	<	char *
1085	>	const char *
1086		oper_privs_as_string(const unsigned int port)
1087		{
1088	<	static char privs_out[16];
1088	>	static char privs_out[IRCD_BUFSIZE];
1089		char *privs_ptr = privs_out;
2368	–	unsigned int i = 0;
1090
1091	<	for (; flag_list[i].oprivs; ++i)
1092	<	{
1093	<	if (port & flag_list[i].oprivs)
1094	<	*privs_ptr++ = flag_list[i].c;
1095	<	else
1096	<	*privs_ptr++ = ToLowerTab[flag_list[i].c];
2376	<	}
1091	>	for (const struct oper_privs *opriv = flag_list; opriv->flag; ++opriv)
1092	>	if (port & opriv->flag)
1093	>	*privs_ptr++ = opriv->c;
1094	>
1095	>	if (privs_ptr == privs_out)
1096	>	*privs_ptr++ = '0';
1097
1098		*privs_ptr = '\0';
1099
#	Line 2381 | Line 1101 | oper_privs_as_string(const unsigned int
1101		}
1102
1103		/*
1104	<	* Input: A client to find the active oper{} name for.
1104	>	* Input: A client to find the active operator {} name for.
1105		* Output: The nick!user@host{oper} of the oper.
1106		*         "oper" is server name for remote opers
1107		* Side effects: None.
#	Line 2389 | Line 1109 | oper_privs_as_string(const unsigned int
1109		const char *
1110		get_oper_name(const struct Client *client_p)
1111		{
1112	<	dlink_node *cnode = NULL;
1113	<	/* +5 for !,@,{,} and null */
1114	<	static char buffer[NICKLEN + USERLEN + HOSTLEN + HOSTLEN + 5];
1112	>	static char buffer[IRCD_BUFSIZE];
1113	>
1114	>	if (IsServer(client_p))
1115	>	return client_p->name;
1116
1117		if (MyConnect(client_p))
1118		{
1119	<	if ((cnode = client_p->localClient->confs.head))
1119	>	const dlink_node *const node = client_p->connection->confs.head;
1120	>
1121	>	if (node)
1122		{
1123	<	struct ConfItem *conf = cnode->data;
2401	<	const struct AccessItem *aconf = map_to_conf(conf);
1123	>	const struct MaskItem *const conf = node->data;
1124
1125	<	if (IsConfOperator(aconf))
1125	>	if (conf->type == CONF_OPER)
1126		{
1127	<	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1127	>	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1128		client_p->username, client_p->host, conf->name);
1129	<	return buffer;
1129	>	return buffer;
1130		}
1131		}
1132
1133	<	/* Probably should assert here for now. If there is an oper out there
1134	<	* with no oper{} conf attached, it would be good for us to know...
1133	>	/*
1134	>	* Probably should assert here for now. If there is an oper out there
1135	>	* with no operator {} conf attached, it would be good for us to know...
1136		*/
1137	<	assert(0); /* Oper without oper conf! */
1137	>	assert(0);  /* Oper without oper conf! */
1138		}
1139
1140		snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1141	<	client_p->username, client_p->host, client_p->servptr->name);
1141	>	client_p->username, client_p->host, client_p->servptr->name);
1142		return buffer;
1143		}
1144
2422	–	/* read_conf_files()
2423	–	*
2424	–	* inputs       - cold start YES or NO
2425	–	* output       - none
2426	–	* side effects - read all conf files needed, ircd.conf kline.conf etc.
2427	–	*/
2428	–	void
2429	–	read_conf_files(int cold)
2430	–	{
2431	–	const char *filename;
2432	–	char chanmodes[32];
2433	–	char chanlimit[32];
2434	–
2435	–	conf_parser_ctx.boot = cold;
2436	–	filename = get_conf_name(CONF_TYPE);
2437	–
2438	–	/* We need to know the initial filename for the yyerror() to report
2439	–	FIXME: The full path is in conffilenamebuf first time since we
2440	–	dont know anything else
2441	–
2442	–	- Gozem 2002-07-21
2443	–	*/
2444	–	strlcpy(conffilebuf, filename, sizeof(conffilebuf));
2445	–
2446	–	if ((conf_parser_ctx.conf_file = fopen(filename, "r")) == NULL)
2447	–	{
2448	–	if (cold)
2449	–	{
2450	–	ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
2451	–	filename, strerror(errno));
2452	–	exit(-1);
2453	–	}
2454	–	else
2455	–	{
2456	–	sendto_realops_flags(UMODE_ALL, L_ALL,
2457	–	"Unable to read configuration file '%s': %s",
2458	–	filename, strerror(errno));
2459	–	return;
2460	–	}
2461	–	}
2462	–
2463	–	if (!cold)
2464	–	clear_out_old_conf();
2465	–
2466	–	read_conf(conf_parser_ctx.conf_file);
2467	–	fclose(conf_parser_ctx.conf_file);
2468	–
2469	–	add_isupport("NETWORK", ServerInfo.network_name, -1);
2470	–	snprintf(chanmodes, sizeof(chanmodes), "b%s%s:%d",
2471	–	ConfigChannel.use_except ? "e" : "",
2472	–	ConfigChannel.use_invex ? "I" : "", ConfigChannel.max_bans);
2473	–	add_isupport("MAXLIST", chanmodes, -1);
2474	–	add_isupport("MAXTARGETS", NULL, ConfigFileEntry.max_targets);
2475	–
2476	–	if (ConfigChannel.disable_local_channels)
2477	–	add_isupport("CHANTYPES", "#", -1);
2478	–	else
2479	–	add_isupport("CHANTYPES", "#&", -1);
2480	–
2481	–	snprintf(chanlimit, sizeof(chanlimit), "%s:%d",
2482	–	ConfigChannel.disable_local_channels ? "#" : "#&",
2483	–	ConfigChannel.max_chans_per_user);
2484	–	add_isupport("CHANLIMIT", chanlimit, -1);
2485	–	snprintf(chanmodes, sizeof(chanmodes), "%s%s%s",
2486	–	ConfigChannel.use_except ? "e" : "",
2487	–	ConfigChannel.use_invex ? "I" : "", "b,k,l,imnprstORS");
2488	–	add_isupport("CHANNELLEN", NULL, LOCAL_CHANNELLEN);
2489	–
2490	–	if (ConfigChannel.use_except)
2491	–	add_isupport("EXCEPTS", "e", -1);
2492	–	if (ConfigChannel.use_invex)
2493	–	add_isupport("INVEX", "I", -1);
2494	–	add_isupport("CHANMODES", chanmodes, -1);
2495	–
2496	–	/*
2497	–	* message_locale may have changed.  rebuild isupport since it relies
2498	–	* on strlen(form_str(RPL_ISUPPORT))
2499	–	*/
2500	–	rebuild_isupport_message_line();
2501	–
2502	–	#ifdef HAVE_LIBPCRE
2503	–	parse_conf_file(RKLINE_TYPE, cold);
2504	–	parse_conf_file(RXLINE_TYPE, cold);
2505	–	#endif
2506	–	parse_conf_file(KLINE_TYPE, cold);
2507	–	parse_conf_file(DLINE_TYPE, cold);
2508	–	parse_conf_file(XLINE_TYPE, cold);
2509	–	parse_conf_file(NRESV_TYPE, cold);
2510	–	parse_conf_file(CRESV_TYPE, cold);
2511	–	}
2512	–
2513	–	/* parse_conf_file()
2514	–	*
2515	–	* inputs       - type of conf file to parse
2516	–	* output       - none
2517	–	* side effects - conf file for givenconf type is opened and read then parsed
2518	–	*/
2519	–	static void
2520	–	parse_conf_file(int type, int cold)
2521	–	{
2522	–	FILE *file = NULL;
2523	–	const char *filename = get_conf_name(type);
2524	–
2525	–	if ((file = fopen(filename, "r")) == NULL)
2526	–	{
2527	–	if (cold)
2528	–	ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
2529	–	filename, strerror(errno));
2530	–	else
2531	–	sendto_realops_flags(UMODE_ALL, L_ALL,
2532	–	"Unable to read configuration file '%s': %s",
2533	–	filename, strerror(errno));
2534	–	}
2535	–	else
2536	–	{
2537	–	parse_csv_file(file, type);
2538	–	fclose(file);
2539	–	}
2540	–	}
2541	–
1145		/* clear_out_old_conf()
1146		*
1147		* inputs       - none
#	Line 2548 | Line 1151 | parse_conf_file(int type, int cold)
1151		static void
1152		clear_out_old_conf(void)
1153		{
1154	<	dlink_node *ptr = NULL, *next_ptr = NULL;
2552	<	struct ConfItem *conf;
2553	<	struct AccessItem *aconf;
2554	<	struct ClassItem *cltmp;
2555	<	struct MatchItem *match_item;
1154	>	dlink_node *node = NULL, *node_next = NULL;
1155		dlink_list *free_items [] = {
1156	<	&server_items,   &oconf_items,    &hub_items, &leaf_items,
1157	<	&uconf_items,   &xconf_items, &rxconf_items, &rkconf_items,
1158	<	&nresv_items, &cluster_items,  &gdeny_items, &service_items, NULL
1156	>	&server_items,   &operator_items,
1157	>	&shared_items,   &gecos_items,
1158	>	&nresv_items, &cluster_items,  &service_items, &cresv_items, NULL
1159		};
1160
1161		dlink_list ** iterator = free_items; /* C is dumb */
#	Line 2564 | Line 1163 | clear_out_old_conf(void)
1163		/* We only need to free anything allocated by yyparse() here.
1164		* Resetting structs, etc, is taken care of by set_default_conf().
1165		*/
1166	<
1167	<	for (; *iterator != NULL; iterator++)
1166	>
1167	>	for (; *iterator; iterator++)
1168		{
1169	<	DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
1169	>	DLINK_FOREACH_SAFE(node, node_next, (*iterator)->head)
1170		{
1171	<	conf = ptr->data;
2573	<	/* XXX This is less than pretty */
2574	<	if (conf->type == SERVER_TYPE)
2575	<	{
2576	<	aconf = map_to_conf(conf);
2577	<
2578	<	if (aconf->clients != 0)
2579	<	{
2580	<	SetConfIllegal(aconf);
2581	<	dlinkDelete(&conf->node, &server_items);
2582	<	}
2583	<	else
2584	<	{
2585	<	delete_conf_item(conf);
2586	<	}
2587	<	}
2588	<	else if (conf->type == OPER_TYPE)
2589	<	{
2590	<	aconf = map_to_conf(conf);
1171	>	struct MaskItem *conf = node->data;
1172
1173	<	if (aconf->clients != 0)
2593	<	{
2594	<	SetConfIllegal(aconf);
2595	<	dlinkDelete(&conf->node, &oconf_items);
2596	<	}
2597	<	else
2598	<	{
2599	<	delete_conf_item(conf);
2600	<	}
2601	<	}
2602	<	else if (conf->type == CLIENT_TYPE)
2603	<	{
2604	<	aconf = map_to_conf(conf);
1173	>	conf->active = 0;
1174
1175	<	if (aconf->clients != 0)
2607	<	{
2608	<	SetConfIllegal(aconf);
2609	<	}
2610	<	else
2611	<	{
2612	<	delete_conf_item(conf);
2613	<	}
2614	<	}
2615	<	else if (conf->type == XLINE_TYPE  ||
2616	<	conf->type == RXLINE_TYPE ||
2617	<	conf->type == RKLINE_TYPE)
1175	>	if (!IsConfDatabase(conf))
1176		{
1177	<	/* temporary (r)xlines are also on
2620	<	* the (r)xconf items list */
2621	<	if (conf->flags & CONF_FLAGS_TEMPORARY)
2622	<	continue;
1177	>	dlinkDelete(&conf->node, *iterator);
1178
1179	<	delete_conf_item(conf);
1180	<	}
2626	<	else
2627	<	{
2628	<	if ((conf->type == LEAF_TYPE) || (conf->type == HUB_TYPE))
2629	<	{
2630	<	match_item = map_to_conf(conf);
2631	<	if (match_item->ref_count <= 0)
2632	<	delete_conf_item(conf);
2633	<	else
2634	<	{
2635	<	match_item->illegal = 1;
2636	<	dlinkDelete(&conf->node, *iterator);
2637	<	}
2638	<	}
2639	<	else
2640	<	delete_conf_item(conf);
1179	>	if (!conf->ref_count)
1180	>	conf_free(conf);
1181		}
1182		}
1183		}
1184
1185	+	motd_clear();
1186	+
1187		/*
1188	<	* don't delete the class table, rather mark all entries
1189	<	* for deletion. The table is cleaned up by check_class. - avalon
1188	>	* Don't delete the class table, rather mark all entries for deletion.
1189	>	* The table is cleaned up by class_delete_marked. - avalon
1190		*/
1191	<	DLINK_FOREACH(ptr, class_items.head)
2650	<	{
2651	<	cltmp = map_to_conf(ptr->data);
2652	<
2653	<	if (ptr != class_items.tail)  /* never mark the "default" class */
2654	<	cltmp->active = 0;
2655	<	}
1191	>	class_mark_for_deletion();
1192
1193		clear_out_address_conf();
1194
1195	<	/* clean out module paths */
1195	>	/* Clean out module paths */
1196		mod_clear_paths();
1197
1198	<	/* clean out ServerInfo */
1199	<	MyFree(ServerInfo.description);
1200	<	ServerInfo.description = NULL;
1201	<	MyFree(ServerInfo.network_name);
1202	<	ServerInfo.network_name = NULL;
1203	<	MyFree(ServerInfo.network_desc);
1204	<	ServerInfo.network_desc = NULL;
1205	<	MyFree(ConfigFileEntry.egdpool_path);
1206	<	ConfigFileEntry.egdpool_path = NULL;
1198	>	pseudo_clear();
1199	>
1200	>	/* Clean out ConfigServerInfo */
1201	>	MyFree(ConfigServerInfo.description);
1202	>	ConfigServerInfo.description = NULL;
1203	>	MyFree(ConfigServerInfo.network_name);
1204	>	ConfigServerInfo.network_name = NULL;
1205	>	MyFree(ConfigServerInfo.network_desc);
1206	>	ConfigServerInfo.network_desc = NULL;
1207		#ifdef HAVE_LIBCRYPTO
1208	<	if (ServerInfo.rsa_private_key != NULL)
1208	>	if (ConfigServerInfo.rsa_private_key)
1209		{
1210	<	RSA_free(ServerInfo.rsa_private_key);
1211	<	ServerInfo.rsa_private_key = NULL;
1210	>	RSA_free(ConfigServerInfo.rsa_private_key);
1211	>	ConfigServerInfo.rsa_private_key = NULL;
1212		}
1213
1214	<	MyFree(ServerInfo.rsa_private_key_file);
1215	<	ServerInfo.rsa_private_key_file = NULL;
2680	<
2681	<	if (ServerInfo.server_ctx)
2682	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2|
2683	<	SSL_OP_NO_SSLv3|
2684	<	SSL_OP_NO_TLSv1);
2685	<	if (ServerInfo.client_ctx)
2686	<	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv2|
2687	<	SSL_OP_NO_SSLv3|
2688	<	SSL_OP_NO_TLSv1);
1214	>	MyFree(ConfigServerInfo.rsa_private_key_file);
1215	>	ConfigServerInfo.rsa_private_key_file = NULL;
1216		#endif
1217
1218	<	/* clean out old resvs from the conf */
1219	<	clear_conf_resv();
1218	>	/* Clean out ConfigAdminInfo */
1219	>	MyFree(ConfigAdminInfo.name);
1220	>	ConfigAdminInfo.name = NULL;
1221	>	MyFree(ConfigAdminInfo.email);
1222	>	ConfigAdminInfo.email = NULL;
1223	>	MyFree(ConfigAdminInfo.description);
1224	>	ConfigAdminInfo.description = NULL;
1225
1226	<	/* clean out AdminInfo */
1227	<	MyFree(AdminInfo.name);
2696	<	AdminInfo.name = NULL;
2697	<	MyFree(AdminInfo.email);
2698	<	AdminInfo.email = NULL;
2699	<	MyFree(AdminInfo.description);
2700	<	AdminInfo.description = NULL;
2701	<
2702	<	/* operator{} and class{} blocks are freed above */
2703	<	/* clean out listeners */
2704	<	close_listeners();
2705	<
2706	<	/* auth{}, quarantine{}, shared{}, connect{}, kill{}, deny{},
2707	<	* exempt{} and gecos{} blocks are freed above too
2708	<	*/
1226	>	MyFree(ConfigServerHide.flatten_links_file);
1227	>	ConfigServerHide.flatten_links_file = NULL;
1228
1229	<	/* clean out general */
1230	<	MyFree(ConfigFileEntry.service_name);
2712	<	ConfigFileEntry.service_name = NULL;
2713	<
2714	<	delete_isupport("INVEX");
2715	<	delete_isupport("EXCEPTS");
1229	>	/* Clean out listeners */
1230	>	listener_close_marked();
1231		}
1232
1233	<	/* flush_deleted_I_P()
1233	>	/* read_conf_files()
1234		*
1235	<	* inputs       - none
1235	>	* inputs       - cold start YES or NO
1236		* output       - none
1237	<	* side effects - This function removes I/P conf items
2723	<	*/
2724	<	static void
2725	<	flush_deleted_I_P(void)
2726	<	{
2727	<	dlink_node *ptr;
2728	<	dlink_node *next_ptr;
2729	<	struct ConfItem *conf;
2730	<	struct AccessItem *aconf;
2731	<	dlink_list * free_items [] = {
2732	<	&server_items, &oconf_items, NULL
2733	<	};
2734	<	dlink_list ** iterator = free_items; /* C is dumb */
2735	<
2736	<	/* flush out deleted I and P lines
2737	<	* although still in use.
2738	<	*/
2739	<	for (; *iterator != NULL; iterator++)
2740	<	{
2741	<	DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
2742	<	{
2743	<	conf = ptr->data;
2744	<	aconf = (struct AccessItem *)map_to_conf(conf);
2745	<
2746	<	if (IsConfIllegal(aconf))
2747	<	{
2748	<	dlinkDelete(ptr, *iterator);
2749	<
2750	<	if (aconf->clients == 0)
2751	<	delete_conf_item(conf);
2752	<	}
2753	<	}
2754	<	}
2755	<	}
2756	<
2757	<	/* get_conf_name()
2758	<	*
2759	<	* inputs       - type of conf file to return name of file for
2760	<	* output       - pointer to filename for type of conf
2761	<	* side effects - none
2762	<	*/
2763	<	const char *
2764	<	get_conf_name(ConfType type)
2765	<	{
2766	<	switch (type)
2767	<	{
2768	<	case CONF_TYPE:
2769	<	return ConfigFileEntry.configfile;
2770	<	break;
2771	<	case KLINE_TYPE:
2772	<	return ConfigFileEntry.klinefile;
2773	<	break;
2774	<	case RKLINE_TYPE:
2775	<	return ConfigFileEntry.rklinefile;
2776	<	break;
2777	<	case DLINE_TYPE:
2778	<	return ConfigFileEntry.dlinefile;
2779	<	break;
2780	<	case XLINE_TYPE:
2781	<	return ConfigFileEntry.xlinefile;
2782	<	break;
2783	<	case RXLINE_TYPE:
2784	<	return ConfigFileEntry.rxlinefile;
2785	<	break;
2786	<	case CRESV_TYPE:
2787	<	return ConfigFileEntry.cresvfile;
2788	<	break;
2789	<	case NRESV_TYPE:
2790	<	return ConfigFileEntry.nresvfile;
2791	<	break;
2792	<	case GLINE_TYPE:
2793	<	return ConfigFileEntry.glinefile;
2794	<	break;
2795	<
2796	<	default:
2797	<	return NULL;  /* This should NEVER HAPPEN since we call this function
2798	<	only with the above values, this will cause us to core
2799	<	at some point if this happens so we know where it was */
2800	<	}
2801	<	}
2802	<
2803	<	#define BAD_PING (-1)
2804	<
2805	<	/* get_conf_ping()
2806	<	*
2807	<	* inputs       - pointer to struct AccessItem
2808	<	*              - pointer to a variable that receives ping warning time
2809	<	* output       - ping frequency
2810	<	* side effects - NONE
1237	>	* side effects - read all conf files needed, ircd.conf kline.conf etc.
1238		*/
1239	<	static int
1240	<	get_conf_ping(struct ConfItem *conf, int *pingwarn)
1239	>	void
1240	>	read_conf_files(int cold)
1241		{
1242	<	struct ClassItem *aclass;
1243	<	struct AccessItem *aconf;
1242	>	const char *filename = NULL;
1243	>	char chanmodes[IRCD_BUFSIZE] = "";
1244	>	char chanlimit[IRCD_BUFSIZE] = "";
1245
1246	<	if (conf != NULL)
1247	<	{
2820	<	aconf = (struct AccessItem *)map_to_conf(conf);
2821	<	if (aconf->class_ptr != NULL)
2822	<	{
2823	<	aclass = (struct ClassItem *)map_to_conf(aconf->class_ptr);
2824	<	*pingwarn = PingWarning(aclass);
2825	<	return PingFreq(aclass);
2826	<	}
2827	<	}
1246	>	conf_parser_ctx.boot = cold;
1247	>	filename = ConfigGeneral.configfile;
1248
1249	<	return BAD_PING;
1250	<	}
1249	>	/* We need to know the initial filename for the yyerror() to report
1250	>	FIXME: The full path is in conffilenamebuf first time since we
1251	>	don't know anything else
1252
1253	<	/* get_client_class()
1254	<	*
1255	<	* inputs       - pointer to client struct
2835	<	* output       - pointer to name of class
2836	<	* side effects - NONE
2837	<	*/
2838	<	const char *
2839	<	get_client_class(struct Client *target_p)
2840	<	{
2841	<	dlink_node *ptr;
2842	<	struct ConfItem *conf;
2843	<	struct AccessItem *aconf;
1253	>	- Gozem 2002-07-21
1254	>	*/
1255	>	strlcpy(conffilebuf, filename, sizeof(conffilebuf));
1256
1257	<	if (target_p != NULL && !IsMe(target_p) &&
2846	<	target_p->localClient->confs.head != NULL)
1257	>	if ((conf_parser_ctx.conf_file = fopen(filename, "r")) == NULL)
1258		{
1259	<	DLINK_FOREACH(ptr, target_p->localClient->confs.head)
2849	<	{
2850	<	conf = ptr->data;
2851	<
2852	<	if (conf->type == CLIENT_TYPE || conf->type == SERVER_TYPE ||
2853	<	conf->type == OPER_TYPE)
2854	<	{
2855	<	aconf = (struct AccessItem *) map_to_conf(conf);
2856	<	if (aconf->class_ptr != NULL)
2857	<	return aconf->class_ptr->name;
2858	<	}
2859	<	}
2860	<	}
2861	<
2862	<	return "default";
2863	<	}
2864	<
2865	<	/* get_client_ping()
2866	<	*
2867	<	* inputs       - pointer to client struct
2868	<	*              - pointer to a variable that receives ping warning time
2869	<	* output       - ping frequency
2870	<	* side effects - NONE
2871	<	*/
2872	<	int
2873	<	get_client_ping(struct Client *target_p, int *pingwarn)
2874	<	{
2875	<	int ping;
2876	<	struct ConfItem *conf;
2877	<	dlink_node *nlink;
2878	<
2879	<	if (target_p->localClient->confs.head != NULL)
2880	<	DLINK_FOREACH(nlink, target_p->localClient->confs.head)
1259	>	if (cold)
1260		{
1261	<	conf = nlink->data;
1262	<
1263	<	if ((conf->type == CLIENT_TYPE) || (conf->type == SERVER_TYPE) ||
2885	<	(conf->type == OPER_TYPE))
2886	<	{
2887	<	ping = get_conf_ping(conf, pingwarn);
2888	<	if (ping > 0)
2889	<	return ping;
2890	<	}
1261	>	ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
1262	>	filename, strerror(errno));
1263	>	exit(EXIT_FAILURE);
1264		}
1265	<
2893	<	*pingwarn = 0;
2894	<	return DEFAULT_PINGFREQUENCY;
2895	<	}
2896	<
2897	<	/* find_class()
2898	<	*
2899	<	* inputs       - string name of class
2900	<	* output       - corresponding Class pointer
2901	<	* side effects - NONE
2902	<	*/
2903	<	struct ConfItem *
2904	<	find_class(const char *classname)
2905	<	{
2906	<	struct ConfItem *conf;
2907	<
2908	<	if ((conf = find_exact_name_conf(CLASS_TYPE, NULL, classname, NULL, NULL)) != NULL)
2909	<	return conf;
2910	<
2911	<	return class_default;
2912	<	}
2913	<
2914	<	/* check_class()
2915	<	*
2916	<	* inputs       - NONE
2917	<	* output       - NONE
2918	<	* side effects -
2919	<	*/
2920	<	void
2921	<	check_class(void)
2922	<	{
2923	<	dlink_node *ptr = NULL, *next_ptr = NULL;
2924	<
2925	<	DLINK_FOREACH_SAFE(ptr, next_ptr, class_items.head)
2926	<	{
2927	<	struct ClassItem *aclass = map_to_conf(ptr->data);
2928	<
2929	<	if (!aclass->active && !CurrUserCount(aclass))
1265	>	else
1266		{
1267	<	destroy_cidr_class(aclass);
1268	<	delete_conf_item(ptr->data);
1267	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1268	>	"Unable to read configuration file '%s': %s",
1269	>	filename, strerror(errno));
1270	>	return;
1271		}
1272		}
2935	–	}
1273
1274	<	/* init_class()
1275	<	*
2939	<	* inputs       - NONE
2940	<	* output       - NONE
2941	<	* side effects -
2942	<	*/
2943	<	void
2944	<	init_class(void)
2945	<	{
2946	<	struct ClassItem *aclass;
1274	>	if (!cold)
1275	>	clear_out_old_conf();
1276
1277	<	class_default = make_conf_item(CLASS_TYPE);
1277	>	read_conf(conf_parser_ctx.conf_file);
1278	>	fclose(conf_parser_ctx.conf_file);
1279
1280	<	aclass = map_to_conf(class_default);
2951	<	aclass->active = 1;
2952	<	DupString(class_default->name, "default");
2953	<	ConFreq(aclass)  = DEFAULT_CONNECTFREQUENCY;
2954	<	PingFreq(aclass) = DEFAULT_PINGFREQUENCY;
2955	<	MaxTotal(aclass) = MAXIMUM_LINKS_DEFAULT;
2956	<	MaxSendq(aclass) = DEFAULT_SENDQ;
1280	>	log_reopen_all();
1281
1282	<	client_check_cb = register_callback("check_client", check_client);
1283	<	}
1282	>	isupport_add("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
1283	>	isupport_add("NETWORK", ConfigServerInfo.network_name, -1);
1284
1285	<	/* get_sendq()
1286	<	*
1287	<	* inputs       - pointer to client
1288	<	* output       - sendq for this client as found from its class
1289	<	* side effects - NONE
1290	<	*/
1291	<	unsigned int
1292	<	get_sendq(struct Client *client_p)
1293	<	{
1294	<	unsigned int sendq = DEFAULT_SENDQ;
1295	<	dlink_node *ptr;
1296	<	struct ConfItem *conf;
2973	<	struct ConfItem *class_conf;
2974	<	struct ClassItem *aclass;
2975	<	struct AccessItem *aconf;
1285	>	snprintf(chanmodes, sizeof(chanmodes), "beI:%u", ConfigChannel.max_bans);
1286	>	isupport_add("MAXLIST", chanmodes, -1);
1287	>	isupport_add("MAXTARGETS", NULL, ConfigGeneral.max_targets);
1288	>	isupport_add("CHANTYPES", "#", -1);
1289	>
1290	>	snprintf(chanlimit, sizeof(chanlimit), "#:%u",
1291	>	ConfigChannel.max_channels);
1292	>	isupport_add("CHANLIMIT", chanlimit, -1);
1293	>	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,cimnprstCMORST");
1294	>	isupport_add("CHANNELLEN", NULL, CHANNELLEN);
1295	>	isupport_add("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
1296	>	isupport_add("CHANMODES", chanmodes, -1);
1297
1298	<	if (client_p && !IsMe(client_p) && (client_p->localClient->confs.head))
1299	<	{
1300	<	DLINK_FOREACH(ptr, client_p->localClient->confs.head)
2980	<	{
2981	<	conf = ptr->data;
2982	<	if ((conf->type == SERVER_TYPE) || (conf->type == OPER_TYPE)
2983	<	|| (conf->type == CLIENT_TYPE))
2984	<	{
2985	<	aconf = (struct AccessItem *)map_to_conf(conf);
2986	<	if ((class_conf = aconf->class_ptr) == NULL)
2987	<	continue;
2988	<	aclass = (struct ClassItem *)map_to_conf(class_conf);
2989	<	sendq = MaxSendq(aclass);
2990	<	return sendq;
2991	<	}
2992	<	}
2993	<	}
2994	<	/* XXX return a default?
2995	<	* if here, then there wasn't an attached conf with a sendq
2996	<	* that is very bad -Dianora
1298	>	/*
1299	>	* message_locale may have changed.  rebuild isupport since it relies
1300	>	* on strlen(form_str(RPL_ISUPPORT))
1301		*/
1302	<	return DEFAULT_SENDQ;
1302	>	isupport_rebuild();
1303		}
1304
1305		/* conf_add_class_to_conf()
1306		*
1307		* inputs       - pointer to config item
1308		* output       - NONE
1309	<	* side effects - Add a class pointer to a conf
1309	>	* side effects - Add a class pointer to a conf
1310		*/
1311		void
1312	<	conf_add_class_to_conf(struct ConfItem *conf, const char *class_name)
1312	>	conf_add_class_to_conf(struct MaskItem *conf, const char *name)
1313		{
1314	<	struct AccessItem *aconf = map_to_conf(conf);
3011	<	struct ClassItem *class = NULL;
3012	<
3013	<	if (class_name == NULL)
1314	>	if (EmptyString(name) || (conf->class = class_find(name, 1)) == NULL)
1315		{
1316	<	aconf->class_ptr = class_default;
1316	>	conf->class = class_default;
1317
1318	<	if (conf->type == CLIENT_TYPE)
1319	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1320	<	"Warning *** Defaulting to default class for %s@%s",
1321	<	aconf->user, aconf->host);
1318	>	if (conf->type == CONF_CLIENT || conf->type == CONF_OPER)
1319	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1320	>	"Warning *** Defaulting to default class for %s@%s",
1321	>	conf->user, conf->host);
1322		else
1323	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1324	<	"Warning *** Defaulting to default class for %s",
1325	<	conf->name);
3025	<	}
3026	<	else
3027	<	aconf->class_ptr = find_class(class_name);
3028	<
3029	<	if (aconf->class_ptr)
3030	<	class = map_to_conf(aconf->class_ptr);
3031	<
3032	<	if (aconf->class_ptr == NULL || !class->active)
3033	<	{
3034	<	if (conf->type == CLIENT_TYPE)
3035	<	sendto_realops_flags(UMODE_ALL, L_ALL,
3036	<	"Warning *** Defaulting to default class for %s@%s",
3037	<	aconf->user, aconf->host);
3038	<	else
3039	<	sendto_realops_flags(UMODE_ALL, L_ALL,
3040	<	"Warning *** Defaulting to default class for %s",
3041	<	conf->name);
3042	<	aconf->class_ptr = class_default;
1323	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1324	>	"Warning *** Defaulting to default class for %s",
1325	>	conf->name);
1326		}
1327		}
1328
3046	–	/* conf_add_server()
3047	–	*
3048	–	* inputs       - pointer to config item
3049	–	*              - pointer to link count already on this conf
3050	–	* output       - NONE
3051	–	* side effects - Add a connect block
3052	–	*/
3053	–	int
3054	–	conf_add_server(struct ConfItem *conf, const char *class_name)
3055	–	{
3056	–	struct AccessItem *aconf = map_to_conf(conf);
3057	–
3058	–	conf_add_class_to_conf(conf, class_name);
3059	–
3060	–	if (!aconf->host || !conf->name)
3061	–	{
3062	–	sendto_realops_flags(UMODE_ALL, L_ALL, "Bad connect block");
3063	–	ilog(LOG_TYPE_IRCD, "Bad connect block");
3064	–	return -1;
3065	–	}
3066	–
3067	–	if (EmptyString(aconf->passwd))
3068	–	{
3069	–	sendto_realops_flags(UMODE_ALL, L_ALL, "Bad connect block, name %s",
3070	–	conf->name);
3071	–	ilog(LOG_TYPE_IRCD, "Bad connect block, host %s", conf->name);
3072	–	return -1;
3073	–	}
3074	–
3075	–	lookup_confhost(conf);
3076	–
3077	–	return 0;
3078	–	}
3079	–
1329		/* yyerror()
1330		*
1331		* inputs       - message from parser
#	Line 3092 | Line 1341 | yyerror(const char *msg)
1341		return;
1342
1343		strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1344	<	sendto_realops_flags(UMODE_ALL, L_ALL, "\"%s\", line %u: %s: %s",
1344	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1345	>	"\"%s\", line %u: %s: %s",
1346	>	conffilebuf, lineno + 1, msg, newlinebuf);
1347	>	ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1348	>	conffilebuf, lineno + 1, msg, newlinebuf);
1349	>	}
1350	>
1351	>	void
1352	>	conf_error_report(const char *msg)
1353	>	{
1354	>	char newlinebuf[IRCD_BUFSIZE];
1355	>
1356	>	strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1357	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1358	>	"\"%s\", line %u: %s: %s",
1359		conffilebuf, lineno + 1, msg, newlinebuf);
1360		ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1361		conffilebuf, lineno + 1, msg, newlinebuf);
#	Line 3100 | Line 1363 | yyerror(const char *msg)
1363
1364		/*
1365		* valid_tkline()
1366	<	*
1366	>	*
1367		* inputs       - pointer to ascii string to check
1368		*              - whether the specified time is in seconds or minutes
1369		* output       - -1 not enough parameters
#	Line 3109 | Line 1372 | yyerror(const char *msg)
1372		* Originally written by Dianora (Diane, db@db.net)
1373		*/
1374		time_t
1375	<	valid_tkline(const char *p, int minutes)
1375	>	valid_tkline(const char *data, const int minutes)
1376		{
1377	+	const unsigned char *p = (const unsigned char *)data;
1378	+	unsigned char tmpch = '\0';
1379		time_t result = 0;
1380
1381	<	for (; *p; ++p)
1381	>	while ((tmpch = *p++))
1382		{
1383	<	if (!IsDigit(*p))
1383	>	if (!IsDigit(tmpch))
1384		return 0;
1385
1386		result *= 10;
1387	<	result += ((*p) & 0xF);
1387	>	result += (tmpch & 0xF);
1388		}
1389
1390		/*
1391	<	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1392	<	* i.e. they specifically use 0, I am going to return 1 instead
1393	<	* as a return value of non-zero is used to flag it as a temporary kline
1391	>	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1392	>	* i.e. they specifically use 0, I am going to return 1 instead as a return
1393	>	* value of non-zero is used to flag it as a temporary kline
1394		*/
1395		if (result == 0)
1396		result = 1;
1397
1398	<	/*
1398	>	/*
1399		* If the incoming time is in seconds convert it to minutes for the purpose
1400		* of this calculation
1401		*/
1402		if (!minutes)
1403	<	result = result / (time_t)60;
1403	>	result = result / 60;
1404
1405		if (result > MAX_TDKLINE_TIME)
1406		result = MAX_TDKLINE_TIME;
1407
1408	<	result = result * (time_t)60;  /* turn it into seconds */
1408	>	result = result * 60;  /* Turn it into seconds */
1409
1410		return result;
1411		}
1412
1413	+	/* valid_wild_card_simple()
1414	+	*
1415	+	* inputs       - data to check for sufficient non-wildcard characters
1416	+	* outputs      - 1 if valid, else 0
1417	+	* side effects - none
1418	+	*/
1419	+	int
1420	+	valid_wild_card_simple(const char *data)
1421	+	{
1422	+	const unsigned char *p = (const unsigned char *)data;
1423	+	unsigned char tmpch = '\0';
1424	+	unsigned int nonwild = 0, wild = 0;
1425	+
1426	+	while ((tmpch = *p++))
1427	+	{
1428	+	if (tmpch == '\\' && *p)
1429	+	{
1430	+	++p;
1431	+	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1432	+	return 1;
1433	+	}
1434	+	else if (!IsMWildChar(tmpch))
1435	+	{
1436	+	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1437	+	return 1;
1438	+	}
1439	+	else
1440	+	++wild;
1441	+	}
1442	+
1443	+	return !wild;
1444	+	}
1445	+
1446		/* valid_wild_card()
1447		*
1448		* input        - pointer to client
#	Line 3154 | Line 1452 | valid_tkline(const char *p, int minutes)
1452		* side effects - NOTICE is given to source_p if warn is 1
1453		*/
1454		int
1455	<	valid_wild_card(struct Client *source_p, int warn, int count, ...)
1455	>	valid_wild_card(struct Client *source_p, int count, ...)
1456		{
1457	<	char *p;
1458	<	char tmpch;
3161	<	int nonwild = 0;
1457	>	unsigned char tmpch = '\0';
1458	>	unsigned int nonwild = 0;
1459		va_list args;
1460
1461		/*
#	Line 3177 | Line 1474 | valid_wild_card(struct Client *source_p,
1474
1475		while (count--)
1476		{
1477	<	p = va_arg(args, char *);
1477	>	const unsigned char *p = va_arg(args, const unsigned char *);
1478		if (p == NULL)
1479		continue;
1480
#	Line 3189 | Line 1486 | valid_wild_card(struct Client *source_p,
1486		* If we find enough non-wild characters, we can
1487		* break - no point in searching further.
1488		*/
1489	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard)
1489	>	if (++nonwild >= ConfigGeneral.min_nonwildcard)
1490	>	{
1491	>	va_end(args);
1492		return 1;
1493	+	}
1494		}
1495		}
1496		}
1497
1498	<	if (warn)
1499	<	sendto_one(source_p, ":%s NOTICE %s :Please include at least %d non-wildcard characters with the mask",
1500	<	me.name, source_p->name, ConfigFileEntry.min_nonwildcard);
1498	>	if (IsClient(source_p))
1499	>	sendto_one_notice(source_p, &me,
1500	>	":Please include at least %u non-wildcard characters with the mask",
1501	>	ConfigGeneral.min_nonwildcard);
1502	>	va_end(args);
1503	>	return 0;
1504	>	}
1505	>
1506	>	/* find_user_host()
1507	>	*
1508	>	* inputs       - pointer to client placing kline
1509	>	*              - pointer to user_host_or_nick
1510	>	*              - pointer to user buffer
1511	>	*              - pointer to host buffer
1512	>	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
1513	>	* side effects -
1514	>	*/
1515	>	static int
1516	>	find_user_host(struct Client *source_p, char *user_host_or_nick,
1517	>	char *luser, char *lhost)
1518	>	{
1519	>	struct Client *target_p = NULL;
1520	>	char *hostp = NULL;
1521	>
1522	>	if (lhost == NULL)
1523	>	{
1524	>	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
1525	>	return 1;
1526	>	}
1527	>
1528	>	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
1529	>	{
1530	>	/* Explicit user@host mask given */
1531	>	if (hostp)                            /* I'm a little user@host */
1532	>	{
1533	>	*(hostp++) = '\0';                       /* short and squat */
1534	>
1535	>	if (*user_host_or_nick)
1536	>	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
1537	>	else
1538	>	strcpy(luser, "*");
1539	>
1540	>	if (*hostp)
1541	>	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
1542	>	else
1543	>	strcpy(lhost, "*");
1544	>	}
1545	>	else
1546	>	{
1547	>	luser[0] = '*';             /* no @ found, assume its *@somehost */
1548	>	luser[1] = '\0';
1549	>	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
1550	>	}
1551	>
1552	>	return 1;
1553	>	}
1554	>	else
1555	>	{
1556	>	/* Try to find user@host mask from nick */
1557	>	/* Okay to use source_p as the first param, because source_p == client_p */
1558	>	if ((target_p =
1559	>	find_chasing(source_p, user_host_or_nick)) == NULL)
1560	>	return 0;  /* find_chasing sends ERR_NOSUCHNICK */
1561	>
1562	>	if (HasFlag(target_p, FLAGS_EXEMPTKLINE))
1563	>	{
1564	>	if (IsClient(source_p))
1565	>	sendto_one_notice(source_p, &me, ":%s is E-lined", target_p->name);
1566	>	return 0;
1567	>	}
1568	>
1569	>	/*
1570	>	* Turn the "user" bit into "*user", blow away '~'
1571	>	* if found in original user name (non-idented)
1572	>	*/
1573	>	strlcpy(luser, target_p->username, USERLEN*4 + 1);
1574	>
1575	>	if (target_p->username[0] == '~')
1576	>	luser[0] = '*';
1577	>
1578	>	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
1579	>	return 1;
1580	>	}
1581	>
1582		return 0;
1583		}
1584
#	Line 3211 | Line 1592 | valid_wild_card(struct Client *source_p,
1592		*              - parse_flags bit map of things to test
1593		*              - pointer to user or string to parse into
1594		*              - pointer to host or NULL to parse into if non NULL
1595	<	*              - pointer to optional tkline time or NULL
1595	>	*              - pointer to optional tkline time or NULL
1596		*              - pointer to target_server to parse into if non NULL
1597		*              - pointer to reason to parse into
1598		*
1599	<	* output       - 1 if valid, -1 if not valid
1599	>	* output       - 1 if valid, 0 if not valid
1600		* side effects - A generalised k/d/x etc. line parser,
1601		*               "ALINE [time] user@host|string [ON] target :reason"
1602		*                will parse returning a parsed user, host if
#	Line 3233 | Line 1614 | valid_wild_card(struct Client *source_p,
1614		*/
1615		int
1616		parse_aline(const char *cmd, struct Client *source_p,
1617	<	int parc, char **parv,
1618	<	int parse_flags, char **up_p, char **h_p, time_t *tkline_time,
1619	<	char **target_server, char **reason)
1617	>	int parc, char **parv,
1618	>	int parse_flags, char **up_p, char **h_p, time_t *tkline_time,
1619	>	char **target_server, char **reason)
1620		{
1621		int found_tkline_time=0;
1622	<	static char def_reason[] = "No Reason";
1622	>	static char default_reason[] = CONF_NOREASON;
1623		static char user[USERLEN*4+1];
1624		static char host[HOSTLEN*4+1];
1625
#	Line 3247 | Line 1628 | parse_aline(const char *cmd, struct Clie
1628
1629		found_tkline_time = valid_tkline(*parv, TK_MINUTES);
1630
1631	<	if (found_tkline_time != 0)
1631	>	if (found_tkline_time)
1632		{
1633		parv++;
1634		parc--;
1635
1636	<	if (tkline_time != NULL)
1636	>	if (tkline_time)
1637		*tkline_time = found_tkline_time;
1638		else
1639		{
1640	<	sendto_one(source_p, ":%s NOTICE %s :temp_line not supported by %s",
1641	<	me.name, source_p->name, cmd);
3261	<	return -1;
1640	>	sendto_one_notice(source_p, &me, ":temp_line not supported by %s", cmd);
1641	>	return 0;
1642		}
1643		}
1644
1645		if (parc == 0)
1646		{
1647	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1648	<	me.name, source_p->name, cmd);
3269	<	return -1;
1647	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1648	>	return 0;
1649		}
1650
1651		if (h_p == NULL)
1652		*up_p = *parv;
1653		else
1654		{
1655	<	if (find_user_host(source_p, *parv, user, host, parse_flags) == 0)
1656	<	return -1;
1655	>	if (find_user_host(source_p, *parv, user, host) == 0)
1656	>	return 0;
1657
1658		*up_p = user;
1659		*h_p = host;
1660		}
1661	<
1661	>
1662		parc--;
1663		parv++;
1664
1665	<	if (parc != 0)
1665	>	if (parc)
1666		{
1667		if (irccmp(*parv, "ON") == 0)
1668		{
1669		parc--;
1670		parv++;
1671
3293	–	if (target_server == NULL)
3294	–	{
3295	–	sendto_one(source_p, ":%s NOTICE %s :ON server not supported by %s",
3296	–	me.name, source_p->name, cmd);
3297	–	return -1;
3298	–	}
3299	–
1672		if (!HasOFlag(source_p, OPER_FLAG_REMOTEBAN))
1673		{
1674	<	sendto_one(source_p, form_str(ERR_NOPRIVS),
1675	<	me.name, source_p->name, "remoteban");
3304	<	return -1;
1674	>	sendto_one_numeric(source_p, &me, ERR_NOPRIVS, "remoteban");
1675	>	return 0;
1676		}
1677
1678		if (parc == 0 || EmptyString(*parv))
1679		{
1680	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1681	<	me.name, source_p->name, cmd);
3311	<	return -1;
1680	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1681	>	return 0;
1682		}
1683
1684		*target_server = *parv;
#	Line 3320 | Line 1690 | parse_aline(const char *cmd, struct Clie
1690		/* Make sure target_server *is* NULL if no ON server found
1691		* caller probably NULL'd it first, but no harm to do it again -db
1692		*/
1693	<	if (target_server != NULL)
1694	<	*target_server = NULL;
1693	>	if (target_server)
1694	>	*target_server = NULL;
1695		}
1696		}
1697
1698	<	if (h_p != NULL)
1698	>	if (h_p)
1699		{
1700	<	if (strchr(user, '!') != NULL)
1700	>	if (strchr(user, '!'))
1701		{
1702	<	sendto_one(source_p, ":%s NOTICE %s :Invalid character '!' in kline",
1703	<	me.name, source_p->name);
3334	<	return -1;
1702	>	sendto_one_notice(source_p, &me, ":Invalid character '!' in kline");
1703	>	return 0;
1704		}
1705
1706	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 2, *up_p, *h_p))
1707	<	return -1;
1706	>	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 2, *up_p, *h_p))
1707	>	return 0;
1708		}
1709		else
1710	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 1, *up_p))
1711	<	return -1;
1710	>	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, *up_p))
1711	>	return 0;
1712
1713	<	if (reason != NULL)
1713	>	if (reason)
1714		{
1715	<	if (parc != 0 && !EmptyString(*parv))
3347	<	{
1715	>	if (parc && !EmptyString(*parv))
1716		*reason = *parv;
3349	–	if (!valid_comment(source_p, *reason, 1))
3350	–	return -1;
3351	–	}
3352	–	else
3353	–	*reason = def_reason;
3354	–	}
3355	–
3356	–	return 1;
3357	–	}
3358	–
3359	–	/* find_user_host()
3360	–	*
3361	–	* inputs       - pointer to client placing kline
3362	–	*              - pointer to user_host_or_nick
3363	–	*              - pointer to user buffer
3364	–	*              - pointer to host buffer
3365	–	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
3366	–	* side effects -
3367	–	*/
3368	–	static int
3369	–	find_user_host(struct Client *source_p, char *user_host_or_nick,
3370	–	char *luser, char *lhost, unsigned int flags)
3371	–	{
3372	–	struct Client *target_p = NULL;
3373	–	char *hostp = NULL;
3374	–
3375	–	if (lhost == NULL)
3376	–	{
3377	–	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
3378	–	return 1;
3379	–	}
3380	–
3381	–	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
3382	–	{
3383	–	/* Explicit user@host mask given */
3384	–
3385	–	if (hostp != NULL)                            /* I'm a little user@host */
3386	–	{
3387	–	*(hostp++) = '\0';                       /* short and squat */
3388	–	if (*user_host_or_nick)
3389	–	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
3390	–	else
3391	–	strcpy(luser, "*");
3392	–	if (*hostp)
3393	–	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
3394	–	else
3395	–	strcpy(lhost, "*");
3396	–	}
3397	–	else
3398	–	{
3399	–	luser[0] = '*';             /* no @ found, assume its *@somehost */
3400	–	luser[1] = '\0';
3401	–	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
3402	–	}
3403	–
3404	–	return 1;
3405	–	}
3406	–	else if (!(flags & NOUSERLOOKUP))
3407	–	{
3408	–	/* Try to find user@host mask from nick */
3409	–	/* Okay to use source_p as the first param, because source_p == client_p */
3410	–	if ((target_p =
3411	–	find_chasing(source_p, source_p, user_host_or_nick, NULL)) == NULL)
3412	–	return 0;
3413	–
3414	–	if (IsExemptKline(target_p))
3415	–	{
3416	–	if (!IsServer(source_p))
3417	–	sendto_one(source_p,
3418	–	":%s NOTICE %s :%s is E-lined",
3419	–	me.name, source_p->name, target_p->name);
3420	–	return 0;
3421	–	}
3422	–
3423	–	/*
3424	–	* turn the "user" bit into "*user", blow away '~'
3425	–	* if found in original user name (non-idented)
3426	–	*/
3427	–	strlcpy(luser, target_p->username, USERLEN*4 + 1);
3428	–
3429	–	if (target_p->username[0] == '~')
3430	–	luser[0] = '*';
3431	–
3432	–	if (target_p->sockhost[0] == '\0' ||
3433	–	(target_p->sockhost[0] == '0' && target_p->sockhost[1] == '\0'))
3434	–	strlcpy(lhost, target_p->host, HOSTLEN*4 + 1);
1717		else
1718	<	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
3437	<	return 1;
1718	>	*reason = default_reason;
1719		}
1720
3440	–	return 0;
3441	–	}
3442	–
3443	–	/* valid_comment()
3444	–	*
3445	–	* inputs       - pointer to client
3446	–	*              - pointer to comment
3447	–	* output       - 0 if no valid comment,
3448	–	*              - 1 if valid
3449	–	* side effects - truncates reason where necessary
3450	–	*/
3451	–	int
3452	–	valid_comment(struct Client *source_p, char *comment, int warn)
3453	–	{
3454	–	if (strchr(comment, '"'))
3455	–	{
3456	–	if (warn)
3457	–	sendto_one(source_p, ":%s NOTICE %s :Invalid character '\"' in comment",
3458	–	me.name, source_p->name);
3459	–	return 0;
3460	–	}
3461	–
3462	–	if (strlen(comment) > REASONLEN)
3463	–	comment[REASONLEN-1] = '\0';
3464	–
1721		return 1;
1722		}
1723
#	Line 3473 | Line 1729 | valid_comment(struct Client *source_p, c
1729		* side effects - none
1730		*/
1731		int
1732	<	match_conf_password(const char *password, const struct AccessItem *aconf)
1732	>	match_conf_password(const char *password, const struct MaskItem *conf)
1733		{
1734		const char *encr = NULL;
1735
1736	<	if (password == NULL || aconf->passwd == NULL)
1736	>	if (EmptyString(password) || EmptyString(conf->passwd))
1737		return 0;
1738
1739	<	if (aconf->flags & CONF_FLAGS_ENCRYPTED)
1740	<	{
3485	<	/* use first two chars of the password they send in as salt */
3486	<	/* If the password in the conf is MD5, and ircd is linked
3487	<	* to scrypt on FreeBSD, or the standard crypt library on
3488	<	* glibc Linux, then this code will work fine on generating
3489	<	* the proper encrypted hash for comparison.
3490	<	*/
3491	<	if (*aconf->passwd)
3492	<	encr = crypt(password, aconf->passwd);
3493	<	else
3494	<	encr = "";
3495	<	}
1739	>	if (conf->flags & CONF_FLAGS_ENCRYPTED)
1740	>	encr = crypt(password, conf->passwd);
1741		else
1742		encr = password;
1743
1744	<	return !strcmp(encr, aconf->passwd);
1744	>	return encr && !strcmp(encr, conf->passwd);
1745		}
1746
1747		/*
#	Line 3504 | Line 1749 | match_conf_password(const char *password
1749		*
1750		* inputs       - client sending the cluster
1751		*              - command name "KLINE" "XLINE" etc.
1752	<	*              - capab -- CAP_KLN etc. from s_serv.h
1752	>	*              - capab -- CAPAB_KLN etc. from server.h
1753		*              - cluster type -- CLUSTER_KLINE etc. from conf.h
1754		*              - pattern and args to send along
1755		* output       - none
#	Line 3512 | Line 1757 | match_conf_password(const char *password
1757		*                along to all servers that match capab and cluster type
1758		*/
1759		void
1760	<	cluster_a_line(struct Client *source_p, const char *command,
1761	<	int capab, int cluster_type, const char *pattern, ...)
1760	>	cluster_a_line(struct Client *source_p, const char *command, unsigned int capab,
1761	>	unsigned int cluster_type, const char *pattern, ...)
1762		{
1763		va_list args;
1764	<	char buffer[IRCD_BUFSIZE];
1765	<	const dlink_node *ptr = NULL;
1764	>	char buffer[IRCD_BUFSIZE] = "";
1765	>	const dlink_node *node = NULL;
1766
1767		va_start(args, pattern);
1768		vsnprintf(buffer, sizeof(buffer), pattern, args);
1769		va_end(args);
1770
1771	<	DLINK_FOREACH(ptr, cluster_items.head)
1771	>	DLINK_FOREACH(node, cluster_items.head)
1772		{
1773	<	const struct ConfItem *conf = ptr->data;
1773	>	const struct MaskItem *conf = node->data;
1774
1775		if (conf->flags & cluster_type)
1776	<	sendto_match_servs(source_p, conf->name, CAP_CLUSTER|capab,
1777	<	"%s %s %s", command, conf->name, buffer);
1776	>	sendto_match_servs(source_p, conf->name, CAPAB_CLUSTER | capab,
1777	>	"%s %s %s", command, conf->name, buffer);
1778		}
1779		}
1780
#	Line 3568 | Line 1813 | split_nuh(struct split_nuh_item *const i
1813
1814		if (iptr->nickptr)
1815		strlcpy(iptr->nickptr, "*", iptr->nicksize);
1816	+
1817		if (iptr->userptr)
1818		strlcpy(iptr->userptr, "*", iptr->usersize);
1819	+
1820		if (iptr->hostptr)
1821		strlcpy(iptr->hostptr, "*", iptr->hostsize);
1822
#	Line 3577 | Line 1824 | split_nuh(struct split_nuh_item *const i
1824		{
1825		*p = '\0';
1826
1827	<	if (iptr->nickptr && *iptr->nuhmask != '\0')
1827	>	if (iptr->nickptr && *iptr->nuhmask)
1828		strlcpy(iptr->nickptr, iptr->nuhmask, iptr->nicksize);
1829
1830	<	if ((q = strchr(++p, '@'))) {
1830	>	if ((q = strchr(++p, '@')))
1831	>	{
1832		*q++ = '\0';
1833
1834	<	if (*p != '\0')
1834	>	if (*p)
1835		strlcpy(iptr->userptr, p, iptr->usersize);
1836
1837	<	if (*q != '\0')
1837	>	if (*q)
1838		strlcpy(iptr->hostptr, q, iptr->hostsize);
1839		}
1840		else
1841		{
1842	<	if (*p != '\0')
1842	>	if (*p)
1843		strlcpy(iptr->userptr, p, iptr->usersize);
1844		}
1845		}
#	Line 3603 | Line 1851 | split_nuh(struct split_nuh_item *const i
1851		/* if found a @ */
1852		*p++ = '\0';
1853
1854	<	if (*iptr->nuhmask != '\0')
1854	>	if (*iptr->nuhmask)
1855		strlcpy(iptr->userptr, iptr->nuhmask, iptr->usersize);
1856
1857	<	if (*p != '\0')
1857	>	if (*p)
1858		strlcpy(iptr->hostptr, p, iptr->hostsize);
1859		}
1860		else
1861		{
1862	<	/* no @ found */
1862	>	/* No @ found */
1863		if (!iptr->nickptr || strpbrk(iptr->nuhmask, ".:"))
1864		strlcpy(iptr->hostptr, iptr->nuhmask, iptr->hostsize);
1865		else
#	Line 3619 | Line 1867 | split_nuh(struct split_nuh_item *const i
1867		}
1868		}
1869		}
3622	–
3623	–	/*
3624	–	* flags_to_ascii
3625	–	*
3626	–	* inputs       - flags is a bitmask
3627	–	*              - pointer to table of ascii letters corresponding
3628	–	*                to each bit
3629	–	*              - flag 1 for convert ToLower if bit missing
3630	–	*                0 if ignore.
3631	–	* output       - none
3632	–	* side effects - string pointed to by p has bitmap chars written to it
3633	–	*/
3634	–	static void
3635	–	flags_to_ascii(unsigned int flags, const unsigned int bit_table[], char *p,
3636	–	int lowerit)
3637	–	{
3638	–	unsigned int mask = 1;
3639	–	int i = 0;
3640	–
3641	–	for (mask = 1; (mask != 0) && (bit_table[i] != 0); mask <<= 1, i++)
3642	–	{
3643	–	if (flags & mask)
3644	–	*p++ = bit_table[i];
3645	–	else if (lowerit)
3646	–	*p++ = ToLower(bit_table[i]);
3647	–	}
3648	–	*p = '\0';
3649	–	}
3650	–
3651	–	/*
3652	–	* cidr_limit_reached
3653	–	*
3654	–	* inputs       - int flag allowing over_rule of limits
3655	–	*              - pointer to the ip to be added
3656	–	*              - pointer to the class
3657	–	* output       - non zero if limit reached
3658	–	*                0 if limit not reached
3659	–	* side effects -
3660	–	*/
3661	–	static int
3662	–	cidr_limit_reached(int over_rule,
3663	–	struct irc_ssaddr *ip, struct ClassItem *aclass)
3664	–	{
3665	–	dlink_node *ptr = NULL;
3666	–	struct CidrItem *cidr;
3667	–
3668	–	if (NumberPerCidr(aclass) <= 0)
3669	–	return 0;
3670	–
3671	–	if (ip->ss.ss_family == AF_INET)
3672	–	{
3673	–	if (CidrBitlenIPV4(aclass) <= 0)
3674	–	return 0;
3675	–
3676	–	DLINK_FOREACH(ptr, aclass->list_ipv4.head)
3677	–	{
3678	–	cidr = ptr->data;
3679	–	if (match_ipv4(ip, &cidr->mask, CidrBitlenIPV4(aclass)))
3680	–	{
3681	–	if (!over_rule && (cidr->number_on_this_cidr >= NumberPerCidr(aclass)))
3682	–	return -1;
3683	–	cidr->number_on_this_cidr++;
3684	–	return 0;
3685	–	}
3686	–	}
3687	–	cidr = MyMalloc(sizeof(struct CidrItem));
3688	–	cidr->number_on_this_cidr = 1;
3689	–	cidr->mask = *ip;
3690	–	mask_addr(&cidr->mask, CidrBitlenIPV4(aclass));
3691	–	dlinkAdd(cidr, &cidr->node, &aclass->list_ipv4);
3692	–	}
3693	–	#ifdef IPV6
3694	–	else if (CidrBitlenIPV6(aclass) > 0)
3695	–	{
3696	–	DLINK_FOREACH(ptr, aclass->list_ipv6.head)
3697	–	{
3698	–	cidr = ptr->data;
3699	–	if (match_ipv6(ip, &cidr->mask, CidrBitlenIPV6(aclass)))
3700	–	{
3701	–	if (!over_rule && (cidr->number_on_this_cidr >= NumberPerCidr(aclass)))
3702	–	return -1;
3703	–	cidr->number_on_this_cidr++;
3704	–	return 0;
3705	–	}
3706	–	}
3707	–	cidr = MyMalloc(sizeof(struct CidrItem));
3708	–	cidr->number_on_this_cidr = 1;
3709	–	cidr->mask = *ip;
3710	–	mask_addr(&cidr->mask, CidrBitlenIPV6(aclass));
3711	–	dlinkAdd(cidr, &cidr->node, &aclass->list_ipv6);
3712	–	}
3713	–	#endif
3714	–	return 0;
3715	–	}
3716	–
3717	–	/*
3718	–	* remove_from_cidr_check
3719	–	*
3720	–	* inputs       - pointer to the ip to be removed
3721	–	*              - pointer to the class
3722	–	* output       - NONE
3723	–	* side effects -
3724	–	*/
3725	–	static void
3726	–	remove_from_cidr_check(struct irc_ssaddr *ip, struct ClassItem *aclass)
3727	–	{
3728	–	dlink_node *ptr = NULL;
3729	–	dlink_node *next_ptr = NULL;
3730	–	struct CidrItem *cidr;
3731	–
3732	–	if (NumberPerCidr(aclass) == 0)
3733	–	return;
3734	–
3735	–	if (ip->ss.ss_family == AF_INET)
3736	–	{
3737	–	if (CidrBitlenIPV4(aclass) <= 0)
3738	–	return;
3739	–
3740	–	DLINK_FOREACH_SAFE(ptr, next_ptr, aclass->list_ipv4.head)
3741	–	{
3742	–	cidr = ptr->data;
3743	–	if (match_ipv4(ip, &cidr->mask, CidrBitlenIPV4(aclass)))
3744	–	{
3745	–	cidr->number_on_this_cidr--;
3746	–	if (cidr->number_on_this_cidr == 0)
3747	–	{
3748	–	dlinkDelete(ptr, &aclass->list_ipv4);
3749	–	MyFree(cidr);
3750	–	return;
3751	–	}
3752	–	}
3753	–	}
3754	–	}
3755	–	#ifdef IPV6
3756	–	else if (CidrBitlenIPV6(aclass) > 0)
3757	–	{
3758	–	DLINK_FOREACH_SAFE(ptr, next_ptr, aclass->list_ipv6.head)
3759	–	{
3760	–	cidr = ptr->data;
3761	–	if (match_ipv6(ip, &cidr->mask, CidrBitlenIPV6(aclass)))
3762	–	{
3763	–	cidr->number_on_this_cidr--;
3764	–	if (cidr->number_on_this_cidr == 0)
3765	–	{
3766	–	dlinkDelete(ptr, &aclass->list_ipv6);
3767	–	MyFree(cidr);
3768	–	return;
3769	–	}
3770	–	}
3771	–	}
3772	–	}
3773	–	#endif
3774	–	}
3775	–
3776	–	static void
3777	–	rebuild_cidr_list(int aftype, struct ConfItem *oldcl, struct ClassItem *newcl,
3778	–	dlink_list *old_list, dlink_list *new_list, int changed)
3779	–	{
3780	–	dlink_node *ptr;
3781	–	struct Client *client_p;
3782	–	struct ConfItem *conf;
3783	–	struct AccessItem *aconf;
3784	–
3785	–	if (!changed)
3786	–	{
3787	–	*new_list = *old_list;
3788	–	old_list->head = old_list->tail = NULL;
3789	–	old_list->length = 0;
3790	–	return;
3791	–	}
3792	–
3793	–	DLINK_FOREACH(ptr, local_client_list.head)
3794	–	{
3795	–	client_p = ptr->data;
3796	–	if (client_p->localClient->aftype != aftype)
3797	–	continue;
3798	–	if (dlink_list_length(&client_p->localClient->confs) == 0)
3799	–	continue;
3800	–
3801	–	conf = client_p->localClient->confs.tail->data;
3802	–	if (conf->type == CLIENT_TYPE)
3803	–	{
3804	–	aconf = map_to_conf(conf);
3805	–	if (aconf->class_ptr == oldcl)
3806	–	cidr_limit_reached(1, &client_p->localClient->ip, newcl);
3807	–	}
3808	–	}
3809	–	}
3810	–
3811	–	/*
3812	–	* rebuild_cidr_class
3813	–	*
3814	–	* inputs       - pointer to old conf
3815	–	*              - pointer to new_class
3816	–	* output       - none
3817	–	* side effects - rebuilds the class link list of cidr blocks
3818	–	*/
3819	–	void
3820	–	rebuild_cidr_class(struct ConfItem *conf, struct ClassItem *new_class)
3821	–	{
3822	–	struct ClassItem *old_class = map_to_conf(conf);
3823	–
3824	–	if (NumberPerCidr(old_class) > 0 && NumberPerCidr(new_class) > 0)
3825	–	{
3826	–	if (CidrBitlenIPV4(old_class) > 0 && CidrBitlenIPV4(new_class) > 0)
3827	–	rebuild_cidr_list(AF_INET, conf, new_class,
3828	–	&old_class->list_ipv4, &new_class->list_ipv4,
3829	–	CidrBitlenIPV4(old_class) != CidrBitlenIPV4(new_class));
3830	–
3831	–	#ifdef IPV6
3832	–	if (CidrBitlenIPV6(old_class) > 0 && CidrBitlenIPV6(new_class) > 0)
3833	–	rebuild_cidr_list(AF_INET6, conf, new_class,
3834	–	&old_class->list_ipv6, &new_class->list_ipv6,
3835	–	CidrBitlenIPV6(old_class) != CidrBitlenIPV6(new_class));
3836	–	#endif
3837	–	}
3838	–
3839	–	destroy_cidr_class(old_class);
3840	–	}
3841	–
3842	–	/*
3843	–	* destroy_cidr_list
3844	–	*
3845	–	* inputs       - pointer to class dlink list of cidr blocks
3846	–	* output       - none
3847	–	* side effects - completely destroys the class link list of cidr blocks
3848	–	*/
3849	–	static void
3850	–	destroy_cidr_list(dlink_list *list)
3851	–	{
3852	–	dlink_node *ptr = NULL, *next_ptr = NULL;
3853	–
3854	–	DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
3855	–	{
3856	–	dlinkDelete(ptr, list);
3857	–	MyFree(ptr->data);
3858	–	}
3859	–	}
3860	–
3861	–	/*
3862	–	* destroy_cidr_class
3863	–	*
3864	–	* inputs       - pointer to class
3865	–	* output       - none
3866	–	* side effects - completely destroys the class link list of cidr blocks
3867	–	*/
3868	–	static void
3869	–	destroy_cidr_class(struct ClassItem *aclass)
3870	–	{
3871	–	destroy_cidr_list(&aclass->list_ipv4);
3872	–	destroy_cidr_list(&aclass->list_ipv6);
3873	–	}

Diff Legend

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