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 1316 by michael, Tue Mar 27 17:05:51 2012 UTC vs.
ircd-hybrid/trunk/src/conf.c (file contents), Revision 5039 by michael, Sat Dec 13 16:08:37 2014 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-2014 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 "hash.h"
36	–	#include "hook.h"
37		#include "irc_string.h"
38	–	#include "sprintf_irc.h"
38		#include "s_bsd.h"
39		#include "ircd.h"
40		#include "listener.h"
#	Line 45 | Line 44
44		#include "fdlist.h"
45		#include "log.h"
46		#include "send.h"
48	–	#include "s_gline.h"
49	–	#include "fileio.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
58	–	struct Callback *client_check_cb = NULL;
59	–	struct config_server_hide ConfigServerHide;
59
60		/* general conf items link list root, other than k lines etc. */
61	<	dlink_list service_items = { NULL, NULL, 0 };
62	<	dlink_list server_items  = { NULL, NULL, 0 };
63	<	dlink_list cluster_items = { NULL, NULL, 0 };
64	<	dlink_list hub_items     = { NULL, NULL, 0 };
65	<	dlink_list leaf_items    = { NULL, NULL, 0 };
66	<	dlink_list oconf_items   = { NULL, NULL, 0 };
67	<	dlink_list uconf_items   = { NULL, NULL, 0 };
68	<	dlink_list xconf_items   = { NULL, NULL, 0 };
70	<	dlink_list rxconf_items  = { NULL, NULL, 0 };
71	<	dlink_list rkconf_items  = { NULL, NULL, 0 };
72	<	dlink_list nresv_items   = { NULL, NULL, 0 };
73	<	dlink_list class_items   = { NULL, NULL, 0 };
74	<	dlink_list gdeny_items   = { NULL, NULL, 0 };
75	<
76	<	dlink_list temporary_klines  = { NULL, NULL, 0 };
77	<	dlink_list temporary_dlines  = { NULL, NULL, 0 };
78	<	dlink_list temporary_xlines  = { NULL, NULL, 0 };
79	<	dlink_list temporary_rklines = { NULL, NULL, 0 };
80	<	dlink_list temporary_glines  = { NULL, NULL, 0 };
81	<	dlink_list temporary_rxlines = { NULL, NULL, 0 };
82	<	dlink_list temporary_resv = { NULL, NULL, 0 };
61	>	dlink_list service_items;
62	>	dlink_list server_items;
63	>	dlink_list cluster_items;
64	>	dlink_list oconf_items;
65	>	dlink_list uconf_items;
66	>	dlink_list xconf_items;
67	>	dlink_list nresv_items;
68	>	dlink_list cresv_items;
69
70		extern unsigned int lineno;
71		extern char linebuf[];
72		extern char conffilebuf[IRCD_BUFSIZE];
87	–	extern char yytext[];
73		extern int yyparse(); /* defined in y.tab.c */
74
90	–	struct conf_parser_context conf_parser_ctx = { 0, 0, NULL };
91	–
92	–	/* internally defined functions */
93	–	static void lookup_confhost(struct ConfItem *);
94	–	static void set_default_conf(void);
95	–	static void validate_conf(void);
96	–	static void read_conf(FBFILE *);
97	–	static void clear_out_old_conf(void);
98	–	static void flush_deleted_I_P(void);
99	–	static void expire_tklines(dlink_list *);
100	–	static void garbage_collect_ip_entries(void);
101	–	static int hash_ip(struct irc_ssaddr *);
102	–	static int verify_access(struct Client *, const char *);
103	–	static int attach_iline(struct Client *, struct ConfItem *);
104	–	static struct ip_entry *find_or_add_ip(struct irc_ssaddr *);
105	–	static void parse_conf_file(int, int);
106	–	static dlink_list *map_to_list(ConfType);
107	–	static struct AccessItem *find_regexp_kline(const char *[]);
108	–	static int find_user_host(struct Client *, char *, char *, char *, unsigned int);
109	–
110	–	/*
111	–	* bit_len
112	–	*/
113	–	static int cidr_limit_reached(int, struct irc_ssaddr *, struct ClassItem *);
114	–	static void remove_from_cidr_check(struct irc_ssaddr *, struct ClassItem *);
115	–	static void destroy_cidr_class(struct ClassItem *);
116	–
117	–	static void flags_to_ascii(unsigned int, const unsigned int[], char *, int);
118	–
119	–	/* address of default class conf */
120	–	static struct ConfItem *class_default;
121	–
122	–	/* usually, with hash tables, you use a prime number...
123	–	* but in this case I am dealing with ip addresses,
124	–	* not ascii strings.
125	–	*/
126	–	#define IP_HASH_SIZE 0x1000
127	–
128	–	struct ip_entry
129	–	{
130	–	struct irc_ssaddr ip;
131	–	int count;
132	–	time_t last_attempt;
133	–	struct ip_entry *next;
134	–	};
135	–
136	–	static struct ip_entry *ip_hash_table[IP_HASH_SIZE];
137	–	static BlockHeap *ip_entry_heap = NULL;
138	–	static int ip_entries_count = 0;
139	–
140	–
141	–	void *
142	–	map_to_conf(struct ConfItem *aconf)
143	–	{
144	–	void *conf;
145	–	conf = (void *)((uintptr_t)aconf +
146	–	(uintptr_t)sizeof(struct ConfItem));
147	–	return(conf);
148	–	}
149	–
150	–	struct ConfItem *
151	–	unmap_conf_item(void *aconf)
152	–	{
153	–	struct ConfItem *conf;
154	–
155	–	conf = (struct ConfItem *)((uintptr_t)aconf -
156	–	(uintptr_t)sizeof(struct ConfItem));
157	–	return(conf);
158	–	}
75
76		/* conf_dns_callback()
77		*
78	<	* inputs       - pointer to struct AccessItem
78	>	* inputs       - pointer to struct MaskItem
79		*              - pointer to DNSReply reply
80		* output       - none
81		* side effects - called when resolver query finishes
#	Line 168 | Line 84 | unmap_conf_item(void *aconf)
84		* if successful save hp in the conf item it was called with
85		*/
86		static void
87	<	conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name)
87	>	conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name, size_t namelength)
88		{
89	<	struct AccessItem *aconf = vptr;
89	>	struct MaskItem *const conf = vptr;
90
91	<	aconf->dns_pending = 0;
91	>	conf->dns_pending = 0;
92
93	<	if (addr != NULL)
94	<	memcpy(&aconf->ipnum, addr, sizeof(aconf->ipnum));
93	>	if (addr)
94	>	memcpy(&conf->addr, addr, sizeof(conf->addr));
95		else
96	<	aconf->dns_failed = 1;
96	>	conf->dns_failed = 1;
97		}
98
99		/* conf_dns_lookup()
#	Line 187 | Line 103 | conf_dns_callback(void *vptr, const stru
103		* allocate a dns_query and start ns lookup.
104		*/
105		static void
106	<	conf_dns_lookup(struct AccessItem *aconf)
106	>	conf_dns_lookup(struct MaskItem *conf)
107		{
108	<	if (!aconf->dns_pending)
109	<	{
110	<	aconf->dns_pending = 1;
111	<	gethost_byname(conf_dns_callback, aconf, aconf->host);
112	<	}
108	>	if (conf->dns_pending)
109	>	return;
110	>
111	>	conf->dns_pending = 1;
112	>
113	>	if (conf->aftype == AF_INET)
114	>	gethost_byname_type(conf_dns_callback, conf, conf->host, T_A);
115	>	else
116	>	gethost_byname_type(conf_dns_callback, conf, conf->host, T_AAAA);
117		}
118
119	<	/* make_conf_item()
119	>	/* map_to_list()
120		*
121	<	* inputs       - type of item
122	<	* output       - pointer to new conf entry
123	<	* side effects - none
121	>	* inputs       - ConfType conf
122	>	* output       - pointer to dlink_list to use
123	>	* side effects - none
124		*/
125	<	struct ConfItem *
126	<	make_conf_item(ConfType type)
125	>	static dlink_list *
126	>	map_to_list(enum maskitem_type type)
127		{
208	–	struct ConfItem *conf = NULL;
209	–	struct AccessItem *aconf = NULL;
210	–	struct ClassItem *aclass = NULL;
211	–	int status = 0;
212	–
128		switch (type)
129		{
130	<	case DLINE_TYPE:
131	<	case EXEMPTDLINE_TYPE:
217	<	case GLINE_TYPE:
218	<	case KLINE_TYPE:
219	<	case CLIENT_TYPE:
220	<	case OPER_TYPE:
221	<	case SERVER_TYPE:
222	<	conf = MyMalloc(sizeof(struct ConfItem) +
223	<	sizeof(struct AccessItem));
224	<	aconf = map_to_conf(conf);
225	<	aconf->aftype = AF_INET;
226	<
227	<	/* Yes, sigh. switch on type again */
228	<	switch (type)
229	<	{
230	<	case EXEMPTDLINE_TYPE:
231	<	status = CONF_EXEMPTDLINE;
130	>	case CONF_XLINE:
131	>	return &xconf_items;
132		break;
133	<
134	<	case DLINE_TYPE:
235	<	status = CONF_DLINE;
133	>	case CONF_ULINE:
134	>	return &uconf_items;
135		break;
136	<
137	<	case KLINE_TYPE:
239	<	status = CONF_KLINE;
136	>	case CONF_NRESV:
137	>	return &nresv_items;
138		break;
139	<
140	<	case GLINE_TYPE:
243	<	status = CONF_GLINE;
139	>	case CONF_CRESV:
140	>	return &cresv_items;
141		break;
142	<
143	<	case CLIENT_TYPE:
247	<	status = CONF_CLIENT;
142	>	case CONF_OPER:
143	>	return &oconf_items;
144		break;
145	<
146	<	case OPER_TYPE:
251	<	status = CONF_OPERATOR;
252	<	dlinkAdd(conf, &conf->node, &oconf_items);
145	>	case CONF_SERVER:
146	>	return &server_items;
147		break;
148	<
149	<	case SERVER_TYPE:
256	<	status = CONF_SERVER;
257	<	dlinkAdd(conf, &conf->node, &server_items);
148	>	case CONF_SERVICE:
149	>	return &service_items;
150		break;
151	<
152	<	default:
151	>	case CONF_CLUSTER:
152	>	return &cluster_items;
153		break;
262	–	}
263	–	aconf->status = status;
264	–	break;
265	–
266	–	case LEAF_TYPE:
267	–	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
268	–	sizeof(struct MatchItem));
269	–	dlinkAdd(conf, &conf->node, &leaf_items);
270	–	break;
271	–
272	–	case HUB_TYPE:
273	–	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
274	–	sizeof(struct MatchItem));
275	–	dlinkAdd(conf, &conf->node, &hub_items);
276	–	break;
277	–
278	–	case ULINE_TYPE:
279	–	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
280	–	sizeof(struct MatchItem));
281	–	dlinkAdd(conf, &conf->node, &uconf_items);
282	–	break;
283	–
284	–	case GDENY_TYPE:
285	–	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
286	–	sizeof(struct AccessItem));
287	–	dlinkAdd(conf, &conf->node, &gdeny_items);
288	–	break;
289	–
290	–	case XLINE_TYPE:
291	–	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
292	–	sizeof(struct MatchItem));
293	–	dlinkAdd(conf, &conf->node, &xconf_items);
294	–	break;
295	–	#ifdef HAVE_LIBPCRE
296	–	case RXLINE_TYPE:
297	–	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
298	–	sizeof(struct MatchItem));
299	–	dlinkAdd(conf, &conf->node, &rxconf_items);
300	–	break;
301	–
302	–	case RKLINE_TYPE:
303	–	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
304	–	sizeof(struct AccessItem));
305	–	aconf = map_to_conf(conf);
306	–	aconf->status = CONF_KLINE;
307	–	dlinkAdd(conf, &conf->node, &rkconf_items);
308	–	break;
309	–	#endif
310	–	case CLUSTER_TYPE:
311	–	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem));
312	–	dlinkAdd(conf, &conf->node, &cluster_items);
313	–	break;
314	–
315	–	case CRESV_TYPE:
316	–	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
317	–	sizeof(struct ResvChannel));
318	–	break;
319	–
320	–	case NRESV_TYPE:
321	–	conf = (struct ConfItem *)MyMalloc(sizeof(struct ConfItem) +
322	–	sizeof(struct MatchItem));
323	–	dlinkAdd(conf, &conf->node, &nresv_items);
324	–	break;
325	–
326	–	case SERVICE_TYPE:
327	–	status = CONF_SERVICE;
328	–	conf = MyMalloc(sizeof(struct ConfItem));
329	–	dlinkAdd(conf, &conf->node, &service_items);
330	–	break;
331	–
332	–	case CLASS_TYPE:
333	–	conf = MyMalloc(sizeof(struct ConfItem) +
334	–	sizeof(struct ClassItem));
335	–	dlinkAdd(conf, &conf->node, &class_items);
336	–
337	–	aclass = map_to_conf(conf);
338	–	aclass->active = 1;
339	–	ConFreq(aclass) = DEFAULT_CONNECTFREQUENCY;
340	–	PingFreq(aclass) = DEFAULT_PINGFREQUENCY;
341	–	MaxTotal(aclass) = MAXIMUM_LINKS_DEFAULT;
342	–	MaxSendq(aclass) = DEFAULT_SENDQ;
343	–
344	–	break;
345	–
346	–	default:
347	–	conf = NULL;
348	–	break;
349	–	}
350	–
351	–	/* XXX Yes, this will core if default is hit. I want it to for now - db */
352	–	conf->type = type;
353	–
354	–	return conf;
355	–	}
356	–
357	–	void
358	–	delete_conf_item(struct ConfItem *conf)
359	–	{
360	–	dlink_node *m = NULL;
361	–	struct MatchItem *match_item;
362	–	struct AccessItem *aconf;
363	–	ConfType type = conf->type;
364	–
365	–	MyFree(conf->name);
366	–	conf->name = NULL;
367	–
368	–	switch(type)
369	–	{
370	–	case DLINE_TYPE:
371	–	case EXEMPTDLINE_TYPE:
372	–	case GLINE_TYPE:
373	–	case KLINE_TYPE:
374	–	case CLIENT_TYPE:
375	–	case OPER_TYPE:
376	–	case SERVER_TYPE:
377	–	aconf = map_to_conf(conf);
378	–
379	–	if (aconf->dns_pending)
380	–	delete_resolver_queries(aconf);
381	–	if (aconf->passwd != NULL)
382	–	memset(aconf->passwd, 0, strlen(aconf->passwd));
383	–	if (aconf->spasswd != NULL)
384	–	memset(aconf->spasswd, 0, strlen(aconf->spasswd));
385	–	aconf->class_ptr = NULL;
386	–
387	–	MyFree(aconf->passwd);
388	–	MyFree(aconf->spasswd);
389	–	MyFree(aconf->reason);
390	–	MyFree(aconf->oper_reason);
391	–	MyFree(aconf->user);
392	–	MyFree(aconf->host);
393	–	MyFree(aconf->cipher_list);
394	–	#ifdef HAVE_LIBCRYPTO
395	–	if (aconf->rsa_public_key)
396	–	RSA_free(aconf->rsa_public_key);
397	–	MyFree(aconf->rsa_public_key_file);
398	–	#endif
399	–
400	–	/* Yes, sigh. switch on type again */
401	–	switch(type)
402	–	{
403	–	case EXEMPTDLINE_TYPE:
404	–	case DLINE_TYPE:
405	–	case GLINE_TYPE:
406	–	case KLINE_TYPE:
407	–	case CLIENT_TYPE:
408	–	MyFree(conf);
409	–	break;
410	–
411	–	case OPER_TYPE:
412	–	aconf = map_to_conf(conf);
413	–	if (!IsConfIllegal(aconf))
414	–	dlinkDelete(&conf->node, &oconf_items);
415	–	MyFree(conf);
416	–	break;
417	–
418	–	case SERVER_TYPE:
419	–	aconf = map_to_conf(conf);
420	–	if (!IsConfIllegal(aconf))
421	–	dlinkDelete(&conf->node, &server_items);
422	–	MyFree(conf);
423	–	break;
424	–
154		default:
155	<	break;
427	<	}
428	<	break;
429	<
430	<	case HUB_TYPE:
431	<	match_item = map_to_conf(conf);
432	<	MyFree(match_item->user);
433	<	MyFree(match_item->host);
434	<	MyFree(match_item->reason);
435	<	MyFree(match_item->oper_reason);
436	<	/* If marked illegal, its already been pulled off of the hub_items list */
437	<	if (!match_item->illegal)
438	<	dlinkDelete(&conf->node, &hub_items);
439	<	MyFree(conf);
440	<	break;
441	<
442	<	case LEAF_TYPE:
443	<	match_item = map_to_conf(conf);
444	<	MyFree(match_item->user);
445	<	MyFree(match_item->host);
446	<	MyFree(match_item->reason);
447	<	MyFree(match_item->oper_reason);
448	<	/* If marked illegal, its already been pulled off of the leaf_items list */
449	<	if (!match_item->illegal)
450	<	dlinkDelete(&conf->node, &leaf_items);
451	<	MyFree(conf);
452	<	break;
453	<
454	<	case ULINE_TYPE:
455	<	match_item = map_to_conf(conf);
456	<	MyFree(match_item->user);
457	<	MyFree(match_item->host);
458	<	MyFree(match_item->reason);
459	<	MyFree(match_item->oper_reason);
460	<	dlinkDelete(&conf->node, &uconf_items);
461	<	MyFree(conf);
462	<	break;
463	<
464	<	case XLINE_TYPE:
465	<	match_item = map_to_conf(conf);
466	<	MyFree(match_item->user);
467	<	MyFree(match_item->host);
468	<	MyFree(match_item->reason);
469	<	MyFree(match_item->oper_reason);
470	<	dlinkDelete(&conf->node, &xconf_items);
471	<	MyFree(conf);
472	<	break;
473	<	#ifdef HAVE_LIBPCRE
474	<	case RKLINE_TYPE:
475	<	aconf = map_to_conf(conf);
476	<	MyFree(aconf->regexuser);
477	<	MyFree(aconf->regexhost);
478	<	MyFree(aconf->user);
479	<	MyFree(aconf->host);
480	<	MyFree(aconf->reason);
481	<	MyFree(aconf->oper_reason);
482	<	dlinkDelete(&conf->node, &rkconf_items);
483	<	MyFree(conf);
484	<	break;
485	<
486	<	case RXLINE_TYPE:
487	<	MyFree(conf->regexpname);
488	<	match_item = map_to_conf(conf);
489	<	MyFree(match_item->user);
490	<	MyFree(match_item->host);
491	<	MyFree(match_item->reason);
492	<	MyFree(match_item->oper_reason);
493	<	dlinkDelete(&conf->node, &rxconf_items);
494	<	MyFree(conf);
495	<	break;
496	<	#endif
497	<	case NRESV_TYPE:
498	<	match_item = map_to_conf(conf);
499	<	MyFree(match_item->user);
500	<	MyFree(match_item->host);
501	<	MyFree(match_item->reason);
502	<	MyFree(match_item->oper_reason);
503	<	dlinkDelete(&conf->node, &nresv_items);
504	<
505	<	if (conf->flags & CONF_FLAGS_TEMPORARY)
506	<	if ((m = dlinkFindDelete(&temporary_resv, conf)) != NULL)
507	<	free_dlink_node(m);
508	<
509	<	MyFree(conf);
510	<	break;
511	<
512	<	case GDENY_TYPE:
513	<	aconf = map_to_conf(conf);
514	<	MyFree(aconf->user);
515	<	MyFree(aconf->host);
516	<	dlinkDelete(&conf->node, &gdeny_items);
517	<	MyFree(conf);
518	<	break;
519	<
520	<	case CLUSTER_TYPE:
521	<	dlinkDelete(&conf->node, &cluster_items);
522	<	MyFree(conf);
523	<	break;
524	<
525	<	case CRESV_TYPE:
526	<	if (conf->flags & CONF_FLAGS_TEMPORARY)
527	<	if ((m = dlinkFindDelete(&temporary_resv, conf)) != NULL)
528	<	free_dlink_node(m);
529	<
530	<	MyFree(conf);
531	<	break;
532	<
533	<	case CLASS_TYPE:
534	<	dlinkDelete(&conf->node, &class_items);
535	<	MyFree(conf);
536	<	break;
537	<
538	<	case SERVICE_TYPE:
539	<	dlinkDelete(&conf->node, &service_items);
540	<	MyFree(conf);
541	<	break;
542	<
543	<	default:
544	<	break;
155	>	return NULL;
156		}
157		}
158
159	<	/* free_access_item()
160	<	*
550	<	* inputs       - pointer to conf to free
551	<	* output       - none
552	<	* side effects - crucial password fields are zeroed, conf is freed
553	<	*/
554	<	void
555	<	free_access_item(struct AccessItem *aconf)
159	>	struct MaskItem *
160	>	conf_make(enum maskitem_type type)
161		{
162	<	struct ConfItem *conf;
162	>	struct MaskItem *const conf = MyCalloc(sizeof(*conf));
163	>	dlink_list *list = NULL;
164
165	<	if (aconf == NULL)
166	<	return;
167	<	conf = unmap_conf_item(aconf);
562	<	delete_conf_item(conf);
563	<	}
165	>	conf->type   = type;
166	>	conf->active = 1;
167	>	conf->aftype = AF_INET;
168
169	<	static const unsigned int shared_bit_table[] =
170	<	{ 'K', 'k', 'U', 'X', 'x', 'Y', 'Q', 'q', 'R', 'L', 0};
169	>	if ((list = map_to_list(type)))
170	>	dlinkAdd(conf, &conf->node, list);
171	>	return conf;
172	>	}
173
568	–	/* report_confitem_types()
569	–	*
570	–	* inputs       - pointer to client requesting confitem report
571	–	*              - ConfType to report
572	–	* output       - none
573	–	* side effects -
574	–	*/
174		void
175	<	report_confitem_types(struct Client *source_p, ConfType type, int temp)
175	>	conf_free(struct MaskItem *conf)
176		{
177	<	dlink_node *ptr = NULL;
178	<	struct ConfItem *conf = NULL;
580	<	struct AccessItem *aconf = NULL;
581	<	struct MatchItem *matchitem = NULL;
582	<	struct ClassItem *classitem = NULL;
583	<	char buf[12];
584	<	char *p = NULL;
585	<	const char *pfx = NULL;
586	<
587	<	switch (type)
588	<	{
589	<	case GDENY_TYPE:
590	<	DLINK_FOREACH(ptr, gdeny_items.head)
591	<	{
592	<	conf = ptr->data;
593	<	aconf = map_to_conf(conf);
594	<
595	<	p = buf;
596	<
597	<	if (aconf->flags & GDENY_BLOCK)
598	<	*p++ = 'B';
599	<	else
600	<	*p++ = 'b';
601	<
602	<	if (aconf->flags & GDENY_REJECT)
603	<	*p++ = 'R';
604	<	else
605	<	*p++ = 'r';
606	<
607	<	*p = '\0';
608	<
609	<	sendto_one(source_p, ":%s %d %s V %s@%s %s %s",
610	<	me.name, RPL_STATSDEBUG, source_p->name,
611	<	aconf->user, aconf->host, conf->name, buf);
612	<	}
613	<	break;
614	<
615	<	case XLINE_TYPE:
616	<	DLINK_FOREACH(ptr, xconf_items.head)
617	<	{
618	<	conf = ptr->data;
619	<	matchitem = map_to_conf(conf);
177	>	dlink_node *node = NULL, *node_next = NULL;
178	>	dlink_list *list = NULL;
179
180	<	sendto_one(source_p, form_str(RPL_STATSXLINE),
181	<	me.name, source_p->name,
623	<	matchitem->hold ? "x": "X", matchitem->count,
624	<	conf->name, matchitem->reason);
625	<	}
626	<	break;
627	<
628	<	#ifdef HAVE_LIBPCRE
629	<	case RXLINE_TYPE:
630	<	DLINK_FOREACH(ptr, rxconf_items.head)
631	<	{
632	<	conf = ptr->data;
633	<	matchitem = map_to_conf(conf);
634	<
635	<	sendto_one(source_p, form_str(RPL_STATSXLINE),
636	<	me.name, source_p->name,
637	<	matchitem->hold ? "xR": "XR", matchitem->count,
638	<	conf->name, matchitem->reason);
639	<	}
640	<	break;
180	>	if ((list = map_to_list(conf->type)))
181	>	dlinkFindDelete(list, conf);
182
183	<	case RKLINE_TYPE:
643	<	pfx = temp ? "kR" : "KR";
644	<
645	<	DLINK_FOREACH(ptr, rkconf_items.head)
646	<	{
647	<	aconf = map_to_conf((conf = ptr->data));
183	>	MyFree(conf->name);
184
185	<	if (temp && !(conf->flags & CONF_FLAGS_TEMPORARY))
186	<	continue;
185	>	if (conf->dns_pending)
186	>	delete_resolver_queries(conf);
187	>	if (conf->passwd)
188	>	memset(conf->passwd, 0, strlen(conf->passwd));
189	>	if (conf->spasswd)
190	>	memset(conf->spasswd, 0, strlen(conf->spasswd));
191	>
192	>	conf->class = NULL;
193	>
194	>	MyFree(conf->passwd);
195	>	MyFree(conf->spasswd);
196	>	MyFree(conf->reason);
197	>	MyFree(conf->certfp);
198	>	MyFree(conf->user);
199	>	MyFree(conf->host);
200	>	#ifdef HAVE_LIBCRYPTO
201	>	MyFree(conf->cipher_list);
202
203	<	sendto_one(source_p, form_str(RPL_STATSKLINE), me.name,
204	<	source_p->name, pfx, aconf->host, aconf->user,
654	<	aconf->reason, aconf->oper_reason ? aconf->oper_reason : "");
655	<	}
656	<	break;
203	>	if (conf->rsa_public_key)
204	>	RSA_free(conf->rsa_public_key);
205		#endif
206	<
659	<	case ULINE_TYPE:
660	<	DLINK_FOREACH(ptr, uconf_items.head)
661	<	{
662	<	conf = ptr->data;
663	<	matchitem = map_to_conf(conf);
664	<
665	<	p = buf;
666	<
667	<	/* some of these are redundant for the sake of
668	<	* consistency with cluster{} flags
669	<	*/
670	<	*p++ = 'c';
671	<	flags_to_ascii(matchitem->action, shared_bit_table, p, 0);
672	<
673	<	sendto_one(source_p, form_str(RPL_STATSULINE),
674	<	me.name, source_p->name, conf->name,
675	<	matchitem->user?matchitem->user: "*",
676	<	matchitem->host?matchitem->host: "*", buf);
677	<	}
678	<
679	<	DLINK_FOREACH(ptr, cluster_items.head)
680	<	{
681	<	conf = ptr->data;
682	<
683	<	p = buf;
684	<
685	<	*p++ = 'C';
686	<	flags_to_ascii(conf->flags, shared_bit_table, p, 0);
687	<
688	<	sendto_one(source_p, form_str(RPL_STATSULINE),
689	<	me.name, source_p->name, conf->name,
690	<	"*", "*", buf);
691	<	}
692	<
693	<	break;
694	<
695	<	case OPER_TYPE:
696	<	DLINK_FOREACH(ptr, oconf_items.head)
697	<	{
698	<	conf = ptr->data;
699	<	aconf = map_to_conf(conf);
700	<
701	<	/* Don't allow non opers to see oper privs */
702	<	if (HasUMode(source_p, UMODE_OPER))
703	<	sendto_one(source_p, form_str(RPL_STATSOLINE),
704	<	me.name, source_p->name, 'O', aconf->user, aconf->host,
705	<	conf->name, oper_privs_as_string(aconf->port),
706	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
707	<	else
708	<	sendto_one(source_p, form_str(RPL_STATSOLINE),
709	<	me.name, source_p->name, 'O', aconf->user, aconf->host,
710	<	conf->name, "0",
711	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
712	<	}
713	<	break;
714	<
715	<	case CLASS_TYPE:
716	<	DLINK_FOREACH(ptr, class_items.head)
717	<	{
718	<	conf = ptr->data;
719	<	classitem = map_to_conf(conf);
720	<	sendto_one(source_p, form_str(RPL_STATSYLINE),
721	<	me.name, source_p->name, 'Y',
722	<	conf->name, PingFreq(classitem),
723	<	ConFreq(classitem),
724	<	MaxTotal(classitem), MaxSendq(classitem),
725	<	CurrUserCount(classitem),
726	<	classitem->active ? "active" : "disabled");
727	<	}
728	<	break;
729	<
730	<	case CONF_TYPE:
731	<	case CLIENT_TYPE:
732	<	break;
733	<
734	<	case SERVICE_TYPE:
735	<	DLINK_FOREACH(ptr, service_items.head)
736	<	{
737	<	conf = ptr->data;
738	<	sendto_one(source_p, form_str(RPL_STATSSERVICE),
739	<	me.name, source_p->name, 'S', "*", conf->name, 0, 0);
740	<	}
741	<	break;
742	<
743	<	case SERVER_TYPE:
744	<	DLINK_FOREACH(ptr, server_items.head)
745	<	{
746	<	p = buf;
747	<
748	<	conf = ptr->data;
749	<	aconf = map_to_conf(conf);
750	<
751	<	buf[0] = '\0';
752	<
753	<	if (IsConfAllowAutoConn(aconf))
754	<	*p++ = 'A';
755	<	if (IsConfSSL(aconf))
756	<	*p++ = 'S';
757	<	if (IsConfTopicBurst(aconf))
758	<	*p++ = 'T';
759	<	if (buf[0] == '\0')
760	<	*p++ = '*';
761	<
762	<	*p = '\0';
763	<
764	<	/*
765	<	* Allow admins to see actual ips unless hide_server_ips is enabled
766	<	*/
767	<	if (!ConfigServerHide.hide_server_ips && HasUMode(source_p, UMODE_ADMIN))
768	<	sendto_one(source_p, form_str(RPL_STATSCLINE),
769	<	me.name, source_p->name, 'C', aconf->host,
770	<	buf, conf->name, aconf->port,
771	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
772	<	else
773	<	sendto_one(source_p, form_str(RPL_STATSCLINE),
774	<	me.name, source_p->name, 'C',
775	<	"*@127.0.0.1", buf, conf->name, aconf->port,
776	<	aconf->class_ptr ? aconf->class_ptr->name : "<default>");
777	<	}
778	<	break;
779	<
780	<	case HUB_TYPE:
781	<	DLINK_FOREACH(ptr, hub_items.head)
782	<	{
783	<	conf = ptr->data;
784	<	matchitem = map_to_conf(conf);
785	<	sendto_one(source_p, form_str(RPL_STATSHLINE), me.name,
786	<	source_p->name, 'H', matchitem->host, conf->name, 0, "*");
787	<	}
788	<	break;
789	<
790	<	case LEAF_TYPE:
791	<	DLINK_FOREACH(ptr, leaf_items.head)
792	<	{
793	<	conf = ptr->data;
794	<	matchitem = map_to_conf(conf);
795	<	sendto_one(source_p, form_str(RPL_STATSLLINE), me.name,
796	<	source_p->name, 'L', matchitem->host, conf->name, 0, "*");
797	<	}
798	<	break;
799	<
800	<	case GLINE_TYPE:
801	<	case KLINE_TYPE:
802	<	case DLINE_TYPE:
803	<	case EXEMPTDLINE_TYPE:
804	<	case CRESV_TYPE:
805	<	case NRESV_TYPE:
806	<	case CLUSTER_TYPE:
807	<	default:
808	<	break;
809	<	}
810	<	}
811	<
812	<	/* check_client()
813	<	*
814	<	* inputs       - pointer to client
815	<	* output       - 0 = Success
816	<	*                NOT_AUTHORIZED    (-1) = Access denied (no I line match)
817	<	*                IRCD_SOCKET_ERROR (-2) = Bad socket.
818	<	*                I_LINE_FULL       (-3) = I-line is full
819	<	*                TOO_MANY          (-4) = Too many connections from hostname
820	<	*                BANNED_CLIENT     (-5) = K-lined
821	<	* side effects - Ordinary client access check.
822	<	*                Look for conf lines which have the same
823	<	*                status as the flags passed.
824	<	*/
825	<	static void *
826	<	check_client(va_list args)
827	<	{
828	<	struct Client *source_p = va_arg(args, struct Client *);
829	<	const char *username = va_arg(args, const char *);
830	<	int i;
831	<
832	<	/* I'm already in big trouble if source_p->localClient is NULL -db */
833	<	if ((i = verify_access(source_p, username)))
834	<	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
835	<	source_p->name, source_p->sockhost);
836	<
837	<	switch (i)
206	>	DLINK_FOREACH_SAFE(node, node_next, conf->hub_list.head)
207		{
208	<	case TOO_MANY:
209	<	sendto_realops_flags(UMODE_FULL, L_ALL,
210	<	"Too many on IP for %s (%s).",
842	<	get_client_name(source_p, SHOW_IP),
843	<	source_p->sockhost);
844	<	ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
845	<	get_client_name(source_p, SHOW_IP));
846	<	++ServerStats.is_ref;
847	<	exit_client(source_p, &me, "No more connections allowed on that IP");
848	<	break;
849	<
850	<	case I_LINE_FULL:
851	<	sendto_realops_flags(UMODE_FULL, L_ALL,
852	<	"I-line is full for %s (%s).",
853	<	get_client_name(source_p, SHOW_IP),
854	<	source_p->sockhost);
855	<	ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
856	<	get_client_name(source_p, SHOW_IP));
857	<	++ServerStats.is_ref;
858	<	exit_client(source_p, &me,
859	<	"No more connections allowed in your connection class");
860	<	break;
861	<
862	<	case NOT_AUTHORIZED:
863	<	++ServerStats.is_ref;
864	<	/* jdc - lists server name & port connections are on */
865	<	/*       a purely cosmetical change */
866	<	sendto_realops_flags(UMODE_UNAUTH, L_ALL,
867	<	"Unauthorized client connection from %s [%s] on [%s/%u].",
868	<	get_client_name(source_p, SHOW_IP),
869	<	source_p->sockhost,
870	<	source_p->localClient->listener->name,
871	<	source_p->localClient->listener->port);
872	<	ilog(LOG_TYPE_IRCD,
873	<	"Unauthorized client connection from %s on [%s/%u].",
874	<	get_client_name(source_p, SHOW_IP),
875	<	source_p->localClient->listener->name,
876	<	source_p->localClient->listener->port);
877	<
878	<	/* XXX It is prolematical whether it is better to use the
879	<	* capture reject code here or rely on the connecting too fast code.
880	<	* - Dianora
881	<	*/
882	<	if (REJECT_HOLD_TIME > 0)
883	<	{
884	<	sendto_one(source_p, ":%s NOTICE %s :You are not authorized to use this server",
885	<	me.name, source_p->name);
886	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
887	<	SetCaptured(source_p);
888	<	}
889	<	else
890	<	exit_client(source_p, &me, "You are not authorized to use this server");
891	<	break;
892	<
893	<	case BANNED_CLIENT:
894	<	/*
895	<	* Don't exit them immediately, play with them a bit.
896	<	* - Dianora
897	<	*/
898	<	if (REJECT_HOLD_TIME > 0)
899	<	{
900	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
901	<	SetCaptured(source_p);
902	<	}
903	<	else
904	<	exit_client(source_p, &me, "Banned");
905	<	++ServerStats.is_ref;
906	<	break;
907	<
908	<	case 0:
909	<	default:
910	<	break;
208	>	MyFree(node->data);
209	>	dlinkDelete(node, &conf->hub_list);
210	>	free_dlink_node(node);
211		}
212
213	<	return (i < 0 ? NULL : source_p);
914	<	}
915	<
916	<	/* verify_access()
917	<	*
918	<	* inputs       - pointer to client to verify
919	<	*              - pointer to proposed username
920	<	* output       - 0 if success -'ve if not
921	<	* side effect  - find the first (best) I line to attach.
922	<	*/
923	<	static int
924	<	verify_access(struct Client *client_p, const char *username)
925	<	{
926	<	struct AccessItem *aconf = NULL, *rkconf = NULL;
927	<	struct ConfItem *conf = NULL;
928	<	char non_ident[USERLEN + 1] = { '~', '\0' };
929	<	const char *uhi[3];
930	<
931	<	if (IsGotId(client_p))
213	>	DLINK_FOREACH_SAFE(node, node_next, conf->leaf_list.head)
214		{
215	<	aconf = find_address_conf(client_p->host, client_p->username,
216	<	&client_p->localClient->ip,
217	<	client_p->localClient->aftype,
936	<	client_p->localClient->passwd);
215	>	MyFree(node->data);
216	>	dlinkDelete(node, &conf->leaf_list);
217	>	free_dlink_node(node);
218		}
938	–	else
939	–	{
940	–	strlcpy(non_ident+1, username, sizeof(non_ident)-1);
941	–	aconf = find_address_conf(client_p->host,non_ident,
942	–	&client_p->localClient->ip,
943	–	client_p->localClient->aftype,
944	–	client_p->localClient->passwd);
945	–	}
946	–
947	–	uhi[0] = IsGotId(client_p) ? client_p->username : non_ident;
948	–	uhi[1] = client_p->host;
949	–	uhi[2] = client_p->sockhost;
950	–
951	–	rkconf = find_regexp_kline(uhi);
219
220	<	if (aconf != NULL)
220	>	DLINK_FOREACH_SAFE(node, node_next, conf->exempt_list.head)
221		{
222	<	if (IsConfClient(aconf) && !rkconf)
956	<	{
957	<	conf = unmap_conf_item(aconf);
958	<
959	<	if (IsConfRedir(aconf))
960	<	{
961	<	sendto_one(client_p, form_str(RPL_REDIR),
962	<	me.name, client_p->name,
963	<	conf->name ? conf->name : "",
964	<	aconf->port);
965	<	return(NOT_AUTHORIZED);
966	<	}
967	<
968	<	if (IsConfDoIdentd(aconf))
969	<	SetNeedId(client_p);
222	>	struct exempt *exptr = node->data;
223
224	<	/* Thanks for spoof idea amm */
225	<	if (IsConfDoSpoofIp(aconf))
226	<	{
227	<	conf = unmap_conf_item(aconf);
228	<
976	<	if (!ConfigFileEntry.hide_spoof_ips && IsConfSpoofNotice(aconf))
977	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "%s spoofing: %s as %s",
978	<	client_p->name, client_p->host, conf->name);
979	<	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
980	<	SetIPSpoof(client_p);
981	<	}
982	<
983	<	return(attach_iline(client_p, conf));
984	<	}
985	<	else if (rkconf || IsConfKill(aconf) || (ConfigFileEntry.glines && IsConfGline(aconf)))
986	<	{
987	<	/* XXX */
988	<	aconf = rkconf ? rkconf : aconf;
989	<	if (IsConfGline(aconf))
990	<	sendto_one(client_p, ":%s NOTICE %s :*** G-lined", me.name,
991	<	client_p->name);
992	<	if (ConfigFileEntry.kline_with_reason)
993	<	sendto_one(client_p, ":%s NOTICE %s :*** Banned %s",
994	<	me.name, client_p->name, aconf->reason);
995	<	return(BANNED_CLIENT);
996	<	}
224	>	dlinkDelete(node, &conf->exempt_list);
225	>	MyFree(exptr->name);
226	>	MyFree(exptr->user);
227	>	MyFree(exptr->host);
228	>	MyFree(exptr);
229		}
230
231	<	return(NOT_AUTHORIZED);
231	>	MyFree(conf);
232		}
233
234		/* attach_iline()
235		*
236	<	* inputs       - client pointer
237	<	*              - conf pointer
238	<	* output       -
239	<	* side effects - do actual attach
236	>	* inputs       - client pointer
237	>	*              - conf pointer
238	>	* output       -
239	>	* side effects - do actual attach
240		*/
241		static int
242	<	attach_iline(struct Client *client_p, struct ConfItem *conf)
242	>	attach_iline(struct Client *client_p, struct MaskItem *conf)
243		{
244	<	struct AccessItem *aconf;
1013	<	struct ClassItem *aclass;
244	>	const struct ClassItem *const class = conf->class;
245		struct ip_entry *ip_found;
246		int a_limit_reached = 0;
247	<	int local = 0, global = 0, ident = 0;
247	>	unsigned int local = 0, global = 0, ident = 0;
248
249	<	ip_found = find_or_add_ip(&client_p->localClient->ip);
249	>	ip_found = ipcache_find_or_add_address(&client_p->connection->ip);
250		ip_found->count++;
251	<	SetIpHash(client_p);
1021	<
1022	<	aconf = map_to_conf(conf);
1023	<	if (aconf->class_ptr == NULL)
1024	<	return NOT_AUTHORIZED;  /* If class is missing, this is best */
1025	<
1026	<	aclass = map_to_conf(aconf->class_ptr);
251	>	AddFlag(client_p, FLAGS_IPHASH);
252
253		count_user_host(client_p->username, client_p->host,
254		&global, &local, &ident);
#	Line 1032 | Line 257 | attach_iline(struct Client *client_p, st
257		* setting a_limit_reached if any limit is reached.
258		* - Dianora
259		*/
260	<	if (MaxTotal(aclass) != 0 && CurrUserCount(aclass) >= MaxTotal(aclass))
260	>	if (class->max_total && class->ref_count >= class->max_total)
261		a_limit_reached = 1;
262	<	else if (MaxPerIp(aclass) != 0 && ip_found->count > MaxPerIp(aclass))
262	>	else if (class->max_perip && ip_found->count > class->max_perip)
263		a_limit_reached = 1;
264	<	else if (MaxLocal(aclass) != 0 && local >= MaxLocal(aclass))
264	>	else if (class->max_local && local >= class->max_local)
265		a_limit_reached = 1;
266	<	else if (MaxGlobal(aclass) != 0 && global >= MaxGlobal(aclass))
266	>	else if (class->max_global && global >= class->max_global)
267		a_limit_reached = 1;
268	<	else if (MaxIdent(aclass) != 0 && ident >= MaxIdent(aclass) &&
268	>	else if (class->max_ident && ident >= class->max_ident &&
269		client_p->username[0] != '~')
270		a_limit_reached = 1;
271
272		if (a_limit_reached)
273		{
274	<	if (!IsConfExemptLimits(aconf))
274	>	if (!IsConfExemptLimits(conf))
275		return TOO_MANY;   /* Already at maximum allowed */
276
277	<	sendto_one(client_p,
278	<	":%s NOTICE %s :*** Your connection class is full, "
1054	<	"but you have exceed_limit = yes;", me.name, client_p->name);
277	>	sendto_one_notice(client_p, &me, ":*** Your connection class is full, "
278	>	"but you have exceed_limit = yes;");
279		}
280
281		return attach_conf(client_p, conf);
282		}
283
284	<	/* init_ip_hash_table()
1061	<	*
1062	<	* inputs               - NONE
1063	<	* output               - NONE
1064	<	* side effects         - allocate memory for ip_entry(s)
1065	<	*                      - clear the ip hash table
1066	<	*/
1067	<	void
1068	<	init_ip_hash_table(void)
1069	<	{
1070	<	ip_entry_heap = BlockHeapCreate("ip", sizeof(struct ip_entry),
1071	<	2 * hard_fdlimit);
1072	<	memset(ip_hash_table, 0, sizeof(ip_hash_table));
1073	<	}
1074	<
1075	<	/* find_or_add_ip()
1076	<	*
1077	<	* inputs       - pointer to struct irc_ssaddr
1078	<	* output       - pointer to a struct ip_entry
1079	<	* side effects -
284	>	/* verify_access()
285		*
286	<	* If the ip # was not found, a new struct ip_entry is created, and the ip
287	<	* count set to 0.
286	>	* inputs       - pointer to client to verify
287	>	* output       - 0 if success -'ve if not
288	>	* side effect  - find the first (best) I line to attach.
289		*/
290	<	static struct ip_entry *
291	<	find_or_add_ip(struct irc_ssaddr *ip_in)
290	>	static int
291	>	verify_access(struct Client *client_p)
292		{
293	<	struct ip_entry *ptr, *newptr;
294	<	int hash_index = hash_ip(ip_in), res;
1089	<	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
1090	<	#ifdef IPV6
1091	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
1092	<	#endif
293	>	struct MaskItem *conf = NULL;
294	>	char non_ident[USERLEN + 1] = "~";
295
296	<	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
296	>	if (IsGotId(client_p))
297		{
298	<	#ifdef IPV6
299	<	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
300	<	continue;
301	<	if (ip_in->ss.ss_family == AF_INET6)
302	<	{
303	<	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
304	<	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
305	<	}
306	<	else
307	<	#endif
308	<	{
309	<	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
1108	<	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
1109	<	}
1110	<	if (res == 0)
1111	<	{
1112	<	/* Found entry already in hash, return it. */
1113	<	return ptr;
1114	<	}
298	>	conf = find_address_conf(client_p->host, client_p->username,
299	>	&client_p->connection->ip,
300	>	client_p->connection->aftype,
301	>	client_p->connection->password);
302	>	}
303	>	else
304	>	{
305	>	strlcpy(non_ident + 1, client_p->username, sizeof(non_ident) - 1);
306	>	conf = find_address_conf(client_p->host, non_ident,
307	>	&client_p->connection->ip,
308	>	client_p->connection->aftype,
309	>	client_p->connection->password);
310		}
311
312	<	if (ip_entries_count >= 2 * hard_fdlimit)
313	<	garbage_collect_ip_entries();
314	<
315	<	newptr = BlockHeapAlloc(ip_entry_heap);
316	<	ip_entries_count++;
317	<	memcpy(&newptr->ip, ip_in, sizeof(struct irc_ssaddr));
318	<
319	<	newptr->next = ip_hash_table[hash_index];
320	<	ip_hash_table[hash_index] = newptr;
312	>	if (conf)
313	>	{
314	>	if (IsConfClient(conf))
315	>	{
316	>	if (IsConfRedir(conf))
317	>	{
318	>	sendto_one_numeric(client_p, &me, RPL_REDIR,
319	>	conf->name ? conf->name : "",
320	>	conf->port);
321	>	return NOT_AUTHORIZED;
322	>	}
323
324	<	return newptr;
325	<	}
324	>	/* Thanks for spoof idea amm */
325	>	if (IsConfDoSpoofIp(conf))
326	>	{
327	>	if (IsConfSpoofNotice(conf))
328	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE, "%s spoofing: %s as %s",
329	>	client_p->name, client_p->host, conf->name);
330
331	<	/* remove_one_ip()
332	<	*
1132	<	* inputs        - unsigned long IP address value
1133	<	* output        - NONE
1134	<	* side effects  - The ip address given, is looked up in ip hash table
1135	<	*                 and number of ip#'s for that ip decremented.
1136	<	*                 If ip # count reaches 0 and has expired,
1137	<	*                 the struct ip_entry is returned to the ip_entry_heap
1138	<	*/
1139	<	void
1140	<	remove_one_ip(struct irc_ssaddr *ip_in)
1141	<	{
1142	<	struct ip_entry *ptr;
1143	<	struct ip_entry *last_ptr = NULL;
1144	<	int hash_index = hash_ip(ip_in), res;
1145	<	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
1146	<	#ifdef IPV6
1147	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
1148	<	#endif
331	>	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
332	>	}
333
334	<	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
1151	<	{
1152	<	#ifdef IPV6
1153	<	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
1154	<	continue;
1155	<	if (ip_in->ss.ss_family == AF_INET6)
1156	<	{
1157	<	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
1158	<	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
334	>	return attach_iline(client_p, conf);
335		}
336	<	else
1161	<	#endif
1162	<	{
1163	<	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
1164	<	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
1165	<	}
1166	<	if (res)
1167	<	continue;
1168	<	if (ptr->count > 0)
1169	<	ptr->count--;
1170	<	if (ptr->count == 0 &&
1171	<	(CurrentTime-ptr->last_attempt) >= ConfigFileEntry.throttle_time)
336	>	else if (IsConfKill(conf) || (ConfigGeneral.glines && IsConfGline(conf)))
337		{
338	<	if (last_ptr != NULL)
339	<	last_ptr->next = ptr->next;
1175	<	else
1176	<	ip_hash_table[hash_index] = ptr->next;
338	>	if (IsConfGline(conf))
339	>	sendto_one_notice(client_p, &me, ":*** G-lined");
340
341	<	BlockHeapFree(ip_entry_heap, ptr);
342	<	ip_entries_count--;
1180	<	return;
341	>	sendto_one_notice(client_p, &me, ":*** Banned: %s", conf->reason);
342	>	return BANNED_CLIENT;
343		}
1182	–	last_ptr = ptr;
344		}
1184	–	}
345
346	<	/* hash_ip()
1187	<	*
1188	<	* input        - pointer to an irc_inaddr
1189	<	* output       - integer value used as index into hash table
1190	<	* side effects - hopefully, none
1191	<	*/
1192	<	static int
1193	<	hash_ip(struct irc_ssaddr *addr)
1194	<	{
1195	<	if (addr->ss.ss_family == AF_INET)
1196	<	{
1197	<	struct sockaddr_in *v4 = (struct sockaddr_in *)addr;
1198	<	int hash;
1199	<	uint32_t ip;
1200	<
1201	<	ip   = ntohl(v4->sin_addr.s_addr);
1202	<	hash = ((ip >> 12) + ip) & (IP_HASH_SIZE-1);
1203	<	return hash;
1204	<	}
1205	<	#ifdef IPV6
1206	<	else
1207	<	{
1208	<	int hash;
1209	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)addr;
1210	<	uint32_t *ip = (uint32_t *)&v6->sin6_addr.s6_addr;
1211	<
1212	<	hash  = ip[0] ^ ip[3];
1213	<	hash ^= hash >> 16;
1214	<	hash ^= hash >> 8;
1215	<	hash  = hash & (IP_HASH_SIZE - 1);
1216	<	return hash;
1217	<	}
1218	<	#else
1219	<	return 0;
1220	<	#endif
346	>	return NOT_AUTHORIZED;
347		}
348
349	<	/* count_ip_hash()
1224	<	*
1225	<	* inputs        - pointer to counter of number of ips hashed
1226	<	*               - pointer to memory used for ip hash
1227	<	* output        - returned via pointers input
1228	<	* side effects  - NONE
349	>	/* check_client()
350		*
351	<	* number of hashed ip #'s is counted up, plus the amount of memory
352	<	* used in the hash.
351	>	* inputs       - pointer to client
352	>	* output       - 0 = Success
353	>	*                NOT_AUTHORIZED    (-1) = Access denied (no I line match)
354	>	*                IRCD_SOCKET_ERROR (-2) = Bad socket.
355	>	*                I_LINE_FULL       (-3) = I-line is full
356	>	*                TOO_MANY          (-4) = Too many connections from hostname
357	>	*                BANNED_CLIENT     (-5) = K-lined
358	>	* side effects - Ordinary client access check.
359	>	*                Look for conf lines which have the same
360	>	*                status as the flags passed.
361		*/
362	<	void
363	<	count_ip_hash(unsigned int *number_ips_stored, uint64_t *mem_ips_stored)
362	>	int
363	>	check_client(struct Client *source_p)
364		{
1236	–	struct ip_entry *ptr;
365		int i;
366
367	<	*number_ips_stored = 0;
368	<	*mem_ips_stored    = 0;
367	>	if ((i = verify_access(source_p)))
368	>	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
369	>	source_p->name, source_p->sockhost);
370
371	<	for (i = 0; i < IP_HASH_SIZE; i++)
371	>	switch (i)
372		{
373	<	for (ptr = ip_hash_table[i]; ptr; ptr = ptr->next)
374	<	{
375	<	*number_ips_stored += 1;
376	<	*mem_ips_stored += sizeof(struct ip_entry);
377	<	}
378	<	}
379	<	}
373	>	case TOO_MANY:
374	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
375	>	"Too many on IP for %s (%s).",
376	>	get_client_name(source_p, SHOW_IP),
377	>	source_p->sockhost);
378	>	ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
379	>	get_client_name(source_p, SHOW_IP));
380	>	++ServerStats.is_ref;
381	>	exit_client(source_p, "No more connections allowed on that IP");
382	>	break;
383
384	<	/* garbage_collect_ip_entries()
385	<	*
386	<	* input        - NONE
387	<	* output       - NONE
388	<	* side effects - free up all ip entries with no connections
389	<	*/
390	<	static void
391	<	garbage_collect_ip_entries(void)
392	<	{
393	<	struct ip_entry *ptr;
1262	<	struct ip_entry *last_ptr;
1263	<	struct ip_entry *next_ptr;
1264	<	int i;
384	>	case I_LINE_FULL:
385	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
386	>	"auth {} block is full for %s (%s).",
387	>	get_client_name(source_p, SHOW_IP),
388	>	source_p->sockhost);
389	>	ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
390	>	get_client_name(source_p, SHOW_IP));
391	>	++ServerStats.is_ref;
392	>	exit_client(source_p, "No more connections allowed in your connection class");
393	>	break;
394
395	<	for (i = 0; i < IP_HASH_SIZE; i++)
396	<	{
397	<	last_ptr = NULL;
395	>	case NOT_AUTHORIZED:
396	>	/* jdc - lists server name & port connections are on */
397	>	/*       a purely cosmetical change */
398	>	sendto_realops_flags(UMODE_UNAUTH, L_ALL, SEND_NOTICE,
399	>	"Unauthorized client connection from %s [%s] on [%s/%u].",
400	>	get_client_name(source_p, SHOW_IP),
401	>	source_p->sockhost,
402	>	source_p->connection->listener->name,
403	>	source_p->connection->listener->port);
404	>	ilog(LOG_TYPE_IRCD, "Unauthorized client connection from %s on [%s/%u].",
405	>	get_client_name(source_p, SHOW_IP),
406	>	source_p->connection->listener->name,
407	>	source_p->connection->listener->port);
408
409	<	for (ptr = ip_hash_table[i]; ptr; ptr = next_ptr)
410	<	{
411	<	next_ptr = ptr->next;
409	>	++ServerStats.is_ref;
410	>	exit_client(source_p, "You are not authorized to use this server");
411	>	break;
412
413	<	if (ptr->count == 0 &&
414	<	(CurrentTime - ptr->last_attempt) >= ConfigFileEntry.throttle_time)
415	<	{
416	<	if (last_ptr != NULL)
417	<	last_ptr->next = ptr->next;
418	<	else
419	<	ip_hash_table[i] = ptr->next;
420	<	BlockHeapFree(ip_entry_heap, ptr);
1282	<	ip_entries_count--;
1283	<	}
1284	<	else
1285	<	last_ptr = ptr;
1286	<	}
413	>	case BANNED_CLIENT:
414	>	++ServerStats.is_ref;
415	>	exit_client(source_p, "Banned");
416	>	break;
417	>
418	>	case 0:
419	>	default:
420	>	break;
421		}
422	+
423	+	return !(i < 0);
424		}
425
426		/* detach_conf()
#	Line 1295 | Line 431 | garbage_collect_ip_entries(void)
431		* side effects - Disassociate configuration from the client.
432		*                Also removes a class from the list if marked for deleting.
433		*/
434	<	int
435	<	detach_conf(struct Client *client_p, ConfType type)
434	>	void
435	>	detach_conf(struct Client *client_p, enum maskitem_type type)
436		{
437	<	dlink_node *ptr, *next_ptr;
1302	<	struct ConfItem *conf;
1303	<	struct ClassItem *aclass;
1304	<	struct AccessItem *aconf;
1305	<	struct ConfItem *aclass_conf;
1306	<	struct MatchItem *match_item;
437	>	dlink_node *node = NULL, *node_next = NULL;
438
439	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->confs.head)
439	>	DLINK_FOREACH_SAFE(node, node_next, client_p->connection->confs.head)
440		{
441	<	conf = ptr->data;
441	>	struct MaskItem *conf = node->data;
442
443	<	if (type == CONF_TYPE || conf->type == type)
444	<	{
445	<	dlinkDelete(ptr, &client_p->localClient->confs);
1315	<	free_dlink_node(ptr);
443	>	assert(conf->type & (CONF_CLIENT | CONF_OPER | CONF_SERVER));
444	>	assert(conf->ref_count > 0);
445	>	assert(conf->class->ref_count > 0);
446
447	<	switch (conf->type)
448	<	{
1319	<	case CLIENT_TYPE:
1320	<	case OPER_TYPE:
1321	<	case SERVER_TYPE:
1322	<	aconf = map_to_conf(conf);
1323	<
1324	<	assert(aconf->clients > 0);
1325	<
1326	<	if ((aclass_conf = ClassPtr(aconf)) != NULL)
1327	<	{
1328	<	aclass = map_to_conf(aclass_conf);
1329	<
1330	<	assert(aclass->curr_user_count > 0);
1331	<
1332	<	if (conf->type == CLIENT_TYPE)
1333	<	remove_from_cidr_check(&client_p->localClient->ip, aclass);
1334	<	if (--aclass->curr_user_count == 0 && aclass->active == 0)
1335	<	delete_conf_item(aclass_conf);
1336	<	}
1337	<
1338	<	if (--aconf->clients == 0 && IsConfIllegal(aconf))
1339	<	delete_conf_item(conf);
447	>	if (!(conf->type & type))
448	>	continue;
449
450	<	break;
450	>	dlinkDelete(node, &client_p->connection->confs);
451	>	free_dlink_node(node);
452
453	<	case LEAF_TYPE:
454	<	case HUB_TYPE:
1345	<	match_item = map_to_conf(conf);
1346	<	if (match_item->ref_count == 0 && match_item->illegal)
1347	<	delete_conf_item(conf);
1348	<	break;
1349	<	default:
1350	<	break;
1351	<	}
453	>	if (conf->type == CONF_CLIENT)
454	>	remove_from_cidr_check(&client_p->connection->ip, conf->class);
455
456	<	if (type != CONF_TYPE)
457	<	return 0;
456	>	if (--conf->class->ref_count == 0 && conf->class->active == 0)
457	>	{
458	>	class_free(conf->class);
459	>	conf->class = NULL;
460		}
1356	–	}
461
462	<	return -1;
462	>	if (--conf->ref_count == 0 && conf->active == 0)
463	>	conf_free(conf);
464	>	}
465		}
466
467		/* attach_conf()
#	Line 1369 | Line 475 | detach_conf(struct Client *client_p, Con
475		*                attachment if there was an old one...
476		*/
477		int
478	<	attach_conf(struct Client *client_p, struct ConfItem *conf)
478	>	attach_conf(struct Client *client_p, struct MaskItem *conf)
479		{
480	<	if (dlinkFind(&client_p->localClient->confs, conf) != NULL)
480	>	if (dlinkFind(&client_p->connection->confs, conf))
481		return 1;
482
483	<	if (conf->type == CLIENT_TYPE ||
484	<	conf->type == SERVER_TYPE ||
485	<	conf->type == OPER_TYPE)
486	<	{
1381	<	struct AccessItem *aconf = map_to_conf(conf);
1382	<	struct ClassItem *aclass = map_to_conf(aconf->class_ptr);
1383	<
1384	<	if (IsConfIllegal(aconf))
1385	<	return NOT_AUTHORIZED;
483	>	if (conf->type == CONF_CLIENT)
484	>	if (cidr_limit_reached(IsConfExemptLimits(conf),
485	>	&client_p->connection->ip, conf->class))
486	>	return TOO_MANY;    /* Already at maximum allowed */
487
488	<	if (conf->type == CLIENT_TYPE)
489	<	if (cidr_limit_reached(IsConfExemptLimits(aconf),
1389	<	&client_p->localClient->ip, aclass))
1390	<	return TOO_MANY;    /* Already at maximum allowed */
488	>	conf->class->ref_count++;
489	>	conf->ref_count++;
490
491	<	CurrUserCount(aclass)++;
1393	<	aconf->clients++;
1394	<	}
1395	<	else if (conf->type == HUB_TYPE || conf->type == LEAF_TYPE)
1396	<	{
1397	<	struct MatchItem *match_item = map_to_conf(conf);
1398	<	match_item->ref_count++;
1399	<	}
1400	<
1401	<	dlinkAdd(conf, make_dlink_node(), &client_p->localClient->confs);
491	>	dlinkAdd(conf, make_dlink_node(), &client_p->connection->confs);
492
493		return 0;
494		}
#	Line 1415 | Line 505 | int
505		attach_connect_block(struct Client *client_p, const char *name,
506		const char *host)
507		{
508	<	dlink_node *ptr;
1419	<	struct ConfItem *conf;
1420	<	struct AccessItem *aconf;
508	>	dlink_node *node = NULL;
509
510	<	assert(client_p != NULL);
1423	<	assert(host != NULL);
510	>	assert(host);
511
512	<	if (client_p == NULL || host == NULL)
1426	<	return 0;
1427	<
1428	<	DLINK_FOREACH(ptr, server_items.head)
512	>	DLINK_FOREACH(node, server_items.head)
513		{
514	<	conf = ptr->data;
1431	<	aconf = map_to_conf(conf);
514	>	struct MaskItem *conf = node->data;
515
516	<	if (match(conf->name, name) == 0 || match(aconf->host, host) == 0)
516	>	if (match(conf->name, name) || match(conf->host, host))
517		continue;
518
519		attach_conf(client_p, conf);
#	Line 1440 | Line 523 | attach_connect_block(struct Client *clie
523		return 0;
524		}
525
1443	–	/* find_conf_exact()
1444	–	*
1445	–	* inputs       - type of ConfItem
1446	–	*              - pointer to name to find
1447	–	*              - pointer to username to find
1448	–	*              - pointer to host to find
1449	–	* output       - NULL or pointer to conf found
1450	–	* side effects - find a conf entry which matches the hostname
1451	–	*                and has the same name.
1452	–	*/
1453	–	struct ConfItem *
1454	–	find_conf_exact(ConfType type, const char *name, const char *user,
1455	–	const char *host)
1456	–	{
1457	–	dlink_node *ptr;
1458	–	dlink_list *list_p;
1459	–	struct ConfItem *conf = NULL;
1460	–	struct AccessItem *aconf;
1461	–
1462	–	/* Only valid for OPER_TYPE and ...? */
1463	–	list_p = map_to_list(type);
1464	–
1465	–	DLINK_FOREACH(ptr, (*list_p).head)
1466	–	{
1467	–	conf = ptr->data;
1468	–
1469	–	if (conf->name == NULL)
1470	–	continue;
1471	–	aconf = map_to_conf(conf);
1472	–	if (aconf->host == NULL)
1473	–	continue;
1474	–	if (irccmp(conf->name, name) != 0)
1475	–	continue;
1476	–
1477	–	/*
1478	–	** Accept if the *real* hostname (usually sockethost)
1479	–	** socket host) matches *either* host or name field
1480	–	** of the configuration.
1481	–	*/
1482	–	if (!match(aconf->host, host) || !match(aconf->user, user))
1483	–	continue;
1484	–	if (type == OPER_TYPE)
1485	–	{
1486	–	struct ClassItem *aclass = map_to_conf(aconf->class_ptr);
1487	–
1488	–	if (aconf->clients >= MaxTotal(aclass))
1489	–	continue;
1490	–	}
1491	–
1492	–	return conf;
1493	–	}
1494	–
1495	–	return NULL;
1496	–	}
1497	–
526		/* find_conf_name()
527		*
528		* inputs       - pointer to conf link list to search
#	Line 1504 | Line 532 | find_conf_exact(ConfType type, const cha
532		* side effects - find a conf entry which matches the name
533		*                and has the given mask.
534		*/
535	<	struct ConfItem *
536	<	find_conf_name(dlink_list *list, const char *name, ConfType type)
535	>	struct MaskItem *
536	>	find_conf_name(dlink_list *list, const char *name, enum maskitem_type type)
537		{
538	<	dlink_node *ptr;
1511	<	struct ConfItem* conf;
538	>	dlink_node *node = NULL;
539
540	<	DLINK_FOREACH(ptr, list->head)
540	>	DLINK_FOREACH(node, list->head)
541		{
542	<	conf = ptr->data;
543	<
542	>	struct MaskItem *conf = node->data;
543	>
544		if (conf->type == type)
545		{
546	<	if (conf->name && (irccmp(conf->name, name) == 0 ||
547	<	match(conf->name, name)))
1521	<	return conf;
546	>	if (conf->name && !irccmp(conf->name, name))
547	>	return conf;
548		}
549		}
550
551		return NULL;
552		}
553
1528	–	/* map_to_list()
1529	–	*
1530	–	* inputs       - ConfType conf
1531	–	* output       - pointer to dlink_list to use
1532	–	* side effects - none
1533	–	*/
1534	–	static dlink_list *
1535	–	map_to_list(ConfType type)
1536	–	{
1537	–	switch(type)
1538	–	{
1539	–	case RXLINE_TYPE:
1540	–	return(&rxconf_items);
1541	–	break;
1542	–	case XLINE_TYPE:
1543	–	return(&xconf_items);
1544	–	break;
1545	–	case ULINE_TYPE:
1546	–	return(&uconf_items);
1547	–	break;
1548	–	case NRESV_TYPE:
1549	–	return(&nresv_items);
1550	–	break;
1551	–	case OPER_TYPE:
1552	–	return(&oconf_items);
1553	–	break;
1554	–	case CLASS_TYPE:
1555	–	return(&class_items);
1556	–	break;
1557	–	case SERVER_TYPE:
1558	–	return(&server_items);
1559	–	break;
1560	–	case SERVICE_TYPE:
1561	–	return(&service_items);
1562	–	break;
1563	–	case CLUSTER_TYPE:
1564	–	return(&cluster_items);
1565	–	break;
1566	–	case CONF_TYPE:
1567	–	case GLINE_TYPE:
1568	–	case KLINE_TYPE:
1569	–	case DLINE_TYPE:
1570	–	case CRESV_TYPE:
1571	–	default:
1572	–	return NULL;
1573	–	}
1574	–	}
1575	–
554		/* find_matching_name_conf()
555		*
556		* inputs       - type of link list to look in
557		*              - pointer to name string to find
558		*              - pointer to user
559		*              - pointer to host
560	<	*              - optional action to match on as well
561	<	* output       - NULL or pointer to found struct MatchItem
560	>	*              - optional flags to match on as well
561	>	* output       - NULL or pointer to found struct MaskItem
562		* side effects - looks for a match on name field
563		*/
564	<	struct ConfItem *
565	<	find_matching_name_conf(ConfType type, const char *name, const char *user,
566	<	const char *host, int action)
567	<	{
568	<	dlink_node *ptr=NULL;
569	<	struct ConfItem *conf=NULL;
570	<	struct AccessItem *aconf=NULL;
1593	<	struct MatchItem *match_item=NULL;
1594	<	dlink_list *list_p = map_to_list(type);
564	>	struct MaskItem *
565	>	find_matching_name_conf(enum maskitem_type type, const char *name, const char *user,
566	>	const char *host, unsigned int flags)
567	>	{
568	>	dlink_node *node = NULL;
569	>	dlink_list *list = map_to_list(type);
570	>	struct MaskItem *conf = NULL;
571
572		switch (type)
573		{
574	<	#ifdef HAVE_LIBPCRE
575	<	case RXLINE_TYPE:
1600	<	DLINK_FOREACH(ptr, list_p->head)
1601	<	{
1602	<	conf = ptr->data;
1603	<	assert(conf->regexpname);
1604	<
1605	<	if (!ircd_pcre_exec(conf->regexpname, name))
1606	<	return conf;
1607	<	}
1608	<	break;
1609	<	#endif
1610	<	case SERVICE_TYPE:
1611	<	DLINK_FOREACH(ptr, list_p->head)
574	>	case CONF_SERVICE:
575	>	DLINK_FOREACH(node, list->head)
576		{
577	<	conf = ptr->data;
577	>	conf = node->data;
578
579		if (EmptyString(conf->name))
580		continue;
581	<	if ((name != NULL) && !irccmp(name, conf->name))
581	>	if (name && !irccmp(name, conf->name))
582		return conf;
583		}
584		break;
585
586	<	case XLINE_TYPE:
587	<	case ULINE_TYPE:
588	<	case NRESV_TYPE:
589	<	DLINK_FOREACH(ptr, list_p->head)
586	>	case CONF_XLINE:
587	>	case CONF_ULINE:
588	>	case CONF_NRESV:
589	>	case CONF_CRESV:
590	>	DLINK_FOREACH(node, list->head)
591		{
592	<	conf = ptr->data;
592	>	conf = node->data;
593
1629	–	match_item = map_to_conf(conf);
594		if (EmptyString(conf->name))
595	<	continue;
596	<	if ((name != NULL) && match_esc(conf->name, name))
595	>	continue;
596	>	if (name && !match(conf->name, name))
597		{
598	<	if ((user == NULL && (host == NULL)))
599	<	return conf;
600	<	if ((match_item->action & action) != action)
598	>	if ((user == NULL && (host == NULL)))
599	>	return conf;
600	>	if ((conf->flags & flags) != flags)
601		continue;
602	<	if (EmptyString(match_item->user) || EmptyString(match_item->host))
603	<	return conf;
604	<	if (match(match_item->user, user) && match(match_item->host, host))
605	<	return conf;
602	>	if (EmptyString(conf->user) || EmptyString(conf->host))
603	>	return conf;
604	>	if (!match(conf->user, user) && !match(conf->host, host))
605	>	return conf;
606		}
607		}
608		break;
609
610	<	case SERVER_TYPE:
611	<	DLINK_FOREACH(ptr, list_p->head)
610	>	case CONF_SERVER:
611	>	DLINK_FOREACH(node, list->head)
612		{
613	<	conf = ptr->data;
1650	<	aconf = map_to_conf(conf);
613	>	conf = node->data;
614
615	<	if ((name != NULL) && match_esc(name, conf->name))
615	>	if (name && !match(name, conf->name))
616		return conf;
617	<	else if ((host != NULL) && match_esc(host, aconf->host))
617	>	if (host && !match(host, conf->host))
618		return conf;
619		}
620		break;
621	<
621	>
622		default:
623		break;
624		}
#	Line 1668 | Line 631 | find_matching_name_conf(ConfType type, c
631		*              - pointer to name string to find
632		*              - pointer to user
633		*              - pointer to host
634	<	* output       - NULL or pointer to found struct MatchItem
634	>	* output       - NULL or pointer to found struct MaskItem
635		* side effects - looks for an exact match on name field
636		*/
637	<	struct ConfItem *
638	<	find_exact_name_conf(ConfType type, const struct Client *who, const char *name,
637	>	struct MaskItem *
638	>	find_exact_name_conf(enum maskitem_type type, const struct Client *who, const char *name,
639		const char *user, const char *host)
640		{
641	<	dlink_node *ptr = NULL;
642	<	struct AccessItem *aconf;
643	<	struct ConfItem *conf;
1681	<	struct MatchItem *match_item;
1682	<	dlink_list *list_p;
1683	<
1684	<	list_p = map_to_list(type);
641	>	dlink_node *node = NULL;
642	>	dlink_list *list = map_to_list(type);
643	>	struct MaskItem *conf = NULL;
644
645		switch(type)
646		{
647	<	case RXLINE_TYPE:
648	<	case XLINE_TYPE:
649	<	case ULINE_TYPE:
650	<	case NRESV_TYPE:
647	>	case CONF_XLINE:
648	>	case CONF_ULINE:
649	>	case CONF_NRESV:
650	>	case CONF_CRESV:
651
652	<	DLINK_FOREACH(ptr, list_p->head)
652	>	DLINK_FOREACH(node, list->head)
653		{
654	<	conf = ptr->data;
655	<	match_item = (struct MatchItem *)map_to_conf(conf);
654	>	conf = node->data;
655	>
656		if (EmptyString(conf->name))
657	<	continue;
658	<
657	>	continue;
658	>
659		if (irccmp(conf->name, name) == 0)
660		{
661	<	if ((user == NULL && (host == NULL)))
662	<	return (conf);
663	<	if (EmptyString(match_item->user) || EmptyString(match_item->host))
664	<	return (conf);
665	<	if (match(match_item->user, user) && match(match_item->host, host))
666	<	return (conf);
661	>	if ((user == NULL && (host == NULL)))
662	>	return conf;
663	>	if (EmptyString(conf->user) || EmptyString(conf->host))
664	>	return conf;
665	>	if (!match(conf->user, user) && !match(conf->host, host))
666	>	return conf;
667		}
668		}
669		break;
670
671	<	case OPER_TYPE:
672	<	DLINK_FOREACH(ptr, list_p->head)
671	>	case CONF_OPER:
672	>	DLINK_FOREACH(node, list->head)
673		{
674	<	conf = ptr->data;
1716	<	aconf = map_to_conf(conf);
674	>	conf = node->data;
675
676		if (EmptyString(conf->name))
677		continue;
#	Line 1722 | Line 680 | find_exact_name_conf(ConfType type, cons
680		{
681		if (!who)
682		return conf;
683	<	if (EmptyString(aconf->user) || EmptyString(aconf->host))
684	<	return conf;
685	<	if (match(aconf->user, who->username))
683	>	if (EmptyString(conf->user) || EmptyString(conf->host))
684	>	return NULL;
685	>	if (!match(conf->user, who->username))
686		{
687	<	switch (aconf->type)
687	>	switch (conf->htype)
688		{
689		case HM_HOST:
690	<	if (match(aconf->host, who->host) || match(aconf->host, who->sockhost))
691	<	return conf;
690	>	if (!match(conf->host, who->host) || !match(conf->host, who->sockhost))
691	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
692	>	return conf;
693		break;
694		case HM_IPV4:
695	<	if (who->localClient->aftype == AF_INET)
696	<	if (match_ipv4(&who->localClient->ip, &aconf->ipnum, aconf->bits))
697	<	return conf;
695	>	if (who->connection->aftype == AF_INET)
696	>	if (match_ipv4(&who->connection->ip, &conf->addr, conf->bits))
697	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
698	>	return conf;
699		break;
1740	–	#ifdef IPV6
700		case HM_IPV6:
701	<	if (who->localClient->aftype == AF_INET6)
702	<	if (match_ipv6(&who->localClient->ip, &aconf->ipnum, aconf->bits))
703	<	return conf;
701	>	if (who->connection->aftype == AF_INET6)
702	>	if (match_ipv6(&who->connection->ip, &conf->addr, conf->bits))
703	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
704	>	return conf;
705		break;
1746	–	#endif
706		default:
707		assert(0);
708		}
#	Line 1753 | Line 712 | find_exact_name_conf(ConfType type, cons
712
713		break;
714
715	<	case SERVER_TYPE:
716	<	DLINK_FOREACH(ptr, list_p->head)
715	>	case CONF_SERVER:
716	>	DLINK_FOREACH(node, list->head)
717		{
718	<	conf = ptr->data;
719	<	aconf = (struct AccessItem *)map_to_conf(conf);
718	>	conf = node->data;
719	>
720		if (EmptyString(conf->name))
721	<	continue;
722	<
721	>	continue;
722	>
723		if (name == NULL)
724		{
725	<	if (EmptyString(aconf->host))
726	<	continue;
727	<	if (irccmp(aconf->host, host) == 0)
728	<	return(conf);
725	>	if (EmptyString(conf->host))
726	>	continue;
727	>	if (irccmp(conf->host, host) == 0)
728	>	return conf;
729		}
730		else if (irccmp(conf->name, name) == 0)
731	<	{
1773	<	return (conf);
1774	<	}
731	>	return conf;
732		}
1776	–	break;
733
1778	–	case CLASS_TYPE:
1779	–	DLINK_FOREACH(ptr, list_p->head)
1780	–	{
1781	–	conf = ptr->data;
1782	–	if (EmptyString(conf->name))
1783	–	continue;
1784	–
1785	–	if (irccmp(conf->name, name) == 0)
1786	–	return (conf);
1787	–	}
734		break;
735
736		default:
737		break;
738		}
1793	–	return(NULL);
1794	–	}
1795	–
1796	–	/* rehash()
1797	–	*
1798	–	* Actual REHASH service routine. Called with sig == 0 if it has been called
1799	–	* as a result of an operator issuing this command, else assume it has been
1800	–	* called as a result of the server receiving a HUP signal.
1801	–	*/
1802	–	int
1803	–	rehash(int sig)
1804	–	{
1805	–	if (sig != 0)
1806	–	sendto_realops_flags(UMODE_ALL, L_ALL,
1807	–	"Got signal SIGHUP, reloading ircd.conf file");
1808	–
1809	–	restart_resolver();
1810	–
1811	–	/* don't close listeners until we know we can go ahead with the rehash */
1812	–
1813	–	/* Check to see if we magically got(or lost) IPv6 support */
1814	–	check_can_use_v6();
1815	–
1816	–	read_conf_files(0);
1817	–
1818	–	if (ServerInfo.description != NULL)
1819	–	strlcpy(me.info, ServerInfo.description, sizeof(me.info));
1820	–
1821	–	load_conf_modules();
1822	–
1823	–	flush_deleted_I_P();
739
740	<	rehashed_klines = 1;
1826	<	/* XXX */
1827	<	if (ConfigLoggingEntry.use_logging)
1828	<	log_close_all();
1829	<
1830	<	return(0);
740	>	return NULL;
741		}
742
743		/* set_default_conf()
#	Line 1845 | Line 755 | set_default_conf(void)
755		/* verify init_class() ran, this should be an unnecessary check
756		* but its not much work.
757		*/
758	<	assert(class_default == (struct ConfItem *) class_items.tail->data);
758	>	assert(class_default == class_get_list()->tail->data);
759
760		#ifdef HAVE_LIBCRYPTO
761	<	ServerInfo.rsa_private_key = NULL;
762	<	ServerInfo.rsa_private_key_file = NULL;
761	>	#if OPENSSL_VERSION_NUMBER >= 0x009080FFL && !defined(OPENSSL_NO_ECDH)
762	>	{
763	>	EC_KEY *key = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
764	>
765	>	if (key)
766	>	{
767	>	SSL_CTX_set_tmp_ecdh(ConfigServerInfo.server_ctx, key);
768	>	EC_KEY_free(key);
769	>	}
770	>	}
771	>
772	>	SSL_CTX_set_options(ConfigServerInfo.server_ctx, SSL_OP_SINGLE_ECDH_USE);
773	>	#endif
774	>
775	>	SSL_CTX_set_cipher_list(ConfigServerInfo.server_ctx, "EECDH+HIGH:EDH+HIGH:HIGH:!aNULL");
776	>	ConfigServerInfo.message_digest_algorithm = EVP_sha256();
777	>	ConfigServerInfo.rsa_private_key = NULL;
778	>	ConfigServerInfo.rsa_private_key_file = NULL;
779		#endif
780
781	<	/* ServerInfo.name is not rehashable */
782	<	/* ServerInfo.name = ServerInfo.name; */
783	<	ServerInfo.description = NULL;
784	<	DupString(ServerInfo.network_name, NETWORK_NAME_DEFAULT);
785	<	DupString(ServerInfo.network_desc, NETWORK_DESC_DEFAULT);
786	<
787	<	memset(&ServerInfo.ip, 0, sizeof(ServerInfo.ip));
788	<	ServerInfo.specific_ipv4_vhost = 0;
789	<	memset(&ServerInfo.ip6, 0, sizeof(ServerInfo.ip6));
790	<	ServerInfo.specific_ipv6_vhost = 0;
791	<
792	<	ServerInfo.max_clients = MAXCLIENTS_MAX;
793	<
794	<	ServerInfo.hub = 0;
795	<	ServerInfo.dns_host.sin_addr.s_addr = 0;
796	<	ServerInfo.dns_host.sin_port = 0;
797	<	AdminInfo.name = NULL;
798	<	AdminInfo.email = NULL;
799	<	AdminInfo.description = NULL;
781	>	/* ConfigServerInfo.name is not rehashable */
782	>	/* ConfigServerInfo.name = ConfigServerInfo.name; */
783	>	ConfigServerInfo.description = NULL;
784	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
785	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
786	>
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.max_clients = MAXCLIENTS_MAX;
793	>	ConfigServerInfo.max_nick_length = 9;
794	>	ConfigServerInfo.max_topic_length = 80;
795	>	ConfigServerInfo.hub = 0;
796	>
797	>	ConfigAdminInfo.name = NULL;
798	>	ConfigAdminInfo.email = NULL;
799	>	ConfigAdminInfo.description = NULL;
800
801	<	log_close_all();
801	>	log_del_all();
802
803	<	ConfigLoggingEntry.use_logging = 1;
1878	<	ConfigLoggingEntry.timestamp = 1;
803	>	ConfigLog.use_logging = 1;
804
805		ConfigChannel.disable_fake_channels = 0;
806	<	ConfigChannel.restrict_channels = 0;
807	<	ConfigChannel.disable_local_channels = 0;
808	<	ConfigChannel.use_invex = 1;
809	<	ConfigChannel.use_except = 1;
1885	<	ConfigChannel.use_knock = 1;
1886	<	ConfigChannel.knock_delay = 300;
806	>	ConfigChannel.invite_client_count = 10;
807	>	ConfigChannel.invite_client_time = 300;
808	>	ConfigChannel.knock_client_count = 1;
809	>	ConfigChannel.knock_client_time = 300;
810		ConfigChannel.knock_delay_channel = 60;
811	<	ConfigChannel.max_chans_per_user = 15;
1889	<	ConfigChannel.quiet_on_ban = 1;
811	>	ConfigChannel.max_channels = 25;
812		ConfigChannel.max_bans = 25;
813		ConfigChannel.default_split_user_count = 0;
814		ConfigChannel.default_split_server_count = 0;
815		ConfigChannel.no_join_on_split = 0;
816		ConfigChannel.no_create_on_split = 0;
1895	–	ConfigChannel.burst_topicwho = 1;
817
818		ConfigServerHide.flatten_links = 0;
819		ConfigServerHide.links_delay = 300;
820		ConfigServerHide.hidden = 0;
1900	–	ConfigServerHide.disable_hidden = 0;
821		ConfigServerHide.hide_servers = 0;
822	<	DupString(ConfigServerHide.hidden_name, NETWORK_NAME_DEFAULT);
822	>	ConfigServerHide.hide_services = 0;
823	>	ConfigServerHide.hidden_name = xstrdup(NETWORK_NAME_DEFAULT);
824		ConfigServerHide.hide_server_ips = 0;
825	+	ConfigServerHide.disable_remote_commands = 0;
826	+
827	+	ConfigGeneral.away_count = 2;
828	+	ConfigGeneral.away_time = 10;
829	+	ConfigGeneral.max_watch = WATCHSIZE_DEFAULT;
830	+	ConfigGeneral.cycle_on_host_change = 1;
831	+	ConfigGeneral.glines = 0;
832	+	ConfigGeneral.gline_time = 12 * 3600;
833	+	ConfigGeneral.gline_request_time = GLINE_REQUEST_EXPIRE_DEFAULT;
834	+	ConfigGeneral.gline_min_cidr = 16;
835	+	ConfigGeneral.gline_min_cidr6 = 48;
836	+	ConfigGeneral.invisible_on_connect = 1;
837	+	ConfigGeneral.tkline_expire_notices = 1;
838	+	ConfigGeneral.ignore_bogus_ts = 0;
839	+	ConfigGeneral.disable_auth = 0;
840	+	ConfigGeneral.kill_chase_time_limit = 90;
841	+	ConfigGeneral.default_floodcount = 8;
842	+	ConfigGeneral.failed_oper_notice = 1;
843	+	ConfigGeneral.dots_in_ident = 0;
844	+	ConfigGeneral.min_nonwildcard = 4;
845	+	ConfigGeneral.min_nonwildcard_simple = 3;
846	+	ConfigGeneral.max_accept = 20;
847	+	ConfigGeneral.anti_nick_flood = 0;
848	+	ConfigGeneral.max_nick_time = 20;
849	+	ConfigGeneral.max_nick_changes = 5;
850	+	ConfigGeneral.anti_spam_exit_message_time = 0;
851	+	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
852	+	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
853	+	ConfigGeneral.warn_no_connect_block = 1;
854	+	ConfigGeneral.stats_e_disabled = 0;
855	+	ConfigGeneral.stats_i_oper_only = 1;  /* 1 = masked */
856	+	ConfigGeneral.stats_k_oper_only = 1;  /* 1 = masked */
857	+	ConfigGeneral.stats_o_oper_only = 1;
858	+	ConfigGeneral.stats_m_oper_only = 1;
859	+	ConfigGeneral.stats_P_oper_only = 0;
860	+	ConfigGeneral.stats_u_oper_only = 0;
861	+	ConfigGeneral.caller_id_wait = 60;
862	+	ConfigGeneral.opers_bypass_callerid = 0;
863	+	ConfigGeneral.pace_wait = 10;
864	+	ConfigGeneral.pace_wait_simple = 1;
865	+	ConfigGeneral.short_motd = 0;
866	+	ConfigGeneral.ping_cookie = 0;
867	+	ConfigGeneral.no_oper_flood = 0;
868	+	ConfigGeneral.oper_pass_resv = 1;
869	+	ConfigGeneral.max_targets = MAX_TARGETS_DEFAULT;
870	+	ConfigGeneral.oper_only_umodes = UMODE_DEBUG;
871	+	ConfigGeneral.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE | UMODE_WALLOP;
872	+	ConfigGeneral.throttle_count = 1;
873	+	ConfigGeneral.throttle_time = 1;
874	+	}
875	+
876	+	static void
877	+	validate_conf(void)
878	+	{
879	+	if (ConfigGeneral.ts_warn_delta < TS_WARN_DELTA_MIN)
880	+	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
881	+
882	+	if (ConfigGeneral.ts_max_delta < TS_MAX_DELTA_MIN)
883	+	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
884	+
885	+	if (EmptyString(ConfigServerInfo.network_name))
886	+	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
887	+
888	+	if (EmptyString(ConfigServerInfo.network_desc))
889	+	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
890
891	<
1906	<	DupString(ConfigFileEntry.service_name, SERVICE_NAME_DEFAULT);
1907	<	ConfigFileEntry.max_watch = WATCHSIZE_DEFAULT;
1908	<	ConfigFileEntry.gline_min_cidr = 16;
1909	<	ConfigFileEntry.gline_min_cidr6 = 48;
1910	<	ConfigFileEntry.invisible_on_connect = 1;
1911	<	ConfigFileEntry.burst_away = 0;
1912	<	ConfigFileEntry.use_whois_actually = 1;
1913	<	ConfigFileEntry.tkline_expire_notices = 1;
1914	<	ConfigFileEntry.hide_spoof_ips = 1;
1915	<	ConfigFileEntry.ignore_bogus_ts = 0;
1916	<	ConfigFileEntry.disable_auth = 0;
1917	<	ConfigFileEntry.disable_remote = 0;
1918	<	ConfigFileEntry.kill_chase_time_limit = 90;
1919	<	ConfigFileEntry.default_floodcount = 8;
1920	<	ConfigFileEntry.failed_oper_notice = 1;
1921	<	ConfigFileEntry.dots_in_ident = 0;
1922	<	ConfigFileEntry.min_nonwildcard = 4;
1923	<	ConfigFileEntry.min_nonwildcard_simple = 3;
1924	<	ConfigFileEntry.max_accept = 20;
1925	<	ConfigFileEntry.anti_nick_flood = 0;
1926	<	ConfigFileEntry.max_nick_time = 20;
1927	<	ConfigFileEntry.max_nick_changes = 5;
1928	<	ConfigFileEntry.anti_spam_exit_message_time = 0;
1929	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
1930	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
1931	<	ConfigFileEntry.kline_with_reason = 1;
1932	<	ConfigFileEntry.kline_reason = NULL;
1933	<	ConfigFileEntry.warn_no_nline = 1;
1934	<	ConfigFileEntry.stats_o_oper_only = 0;
1935	<	ConfigFileEntry.stats_k_oper_only = 1;  /* masked */
1936	<	ConfigFileEntry.stats_i_oper_only = 1;  /* masked */
1937	<	ConfigFileEntry.stats_P_oper_only = 0;
1938	<	ConfigFileEntry.caller_id_wait = 60;
1939	<	ConfigFileEntry.opers_bypass_callerid = 0;
1940	<	ConfigFileEntry.pace_wait = 10;
1941	<	ConfigFileEntry.pace_wait_simple = 1;
1942	<	ConfigFileEntry.short_motd = 0;
1943	<	ConfigFileEntry.ping_cookie = 0;
1944	<	ConfigFileEntry.no_oper_flood = 0;
1945	<	ConfigFileEntry.true_no_oper_flood = 0;
1946	<	ConfigFileEntry.oper_pass_resv = 1;
1947	<	ConfigFileEntry.glines = 0;
1948	<	ConfigFileEntry.gline_time = 12 * 3600;
1949	<	ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
1950	<	ConfigFileEntry.client_flood = CLIENT_FLOOD_DEFAULT;
1951	<	ConfigFileEntry.oper_only_umodes = UMODE_DEBUG;
1952	<	ConfigFileEntry.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE |
1953	<	UMODE_OPERWALL | UMODE_WALLOP;
1954	<	ConfigFileEntry.use_egd = 0;
1955	<	ConfigFileEntry.egdpool_path = NULL;
1956	<	ConfigFileEntry.throttle_time = 10;
891	>	ConfigGeneral.max_watch = IRCD_MAX(ConfigGeneral.max_watch, WATCHSIZE_MIN);
892		}
893
894	<	/* read_conf()
894	>	/* read_conf()
895		*
896		* inputs       - file descriptor pointing to config file to use
897		* output       - None
898		* side effects - Read configuration file.
899		*/
900		static void
901	<	read_conf(FBFILE *file)
901	>	read_conf(FILE *file)
902		{
903		lineno = 0;
904
905	<	set_default_conf(); /* Set default values prior to conf parsing */
905	>	set_default_conf();  /* Set default values prior to conf parsing */
906		conf_parser_ctx.pass = 1;
907	<	yyparse();          /* pick up the classes first */
907	>	yyparse();  /* Pick up the classes first */
908
909	<	fbrewind(file);
909	>	rewind(file);
910
911		conf_parser_ctx.pass = 2;
912	<	yyparse();          /* Load the values from the conf */
913	<	validate_conf();    /* Check to make sure some values are still okay. */
914	<	/* Some global values are also loaded here. */
915	<	check_class();      /* Make sure classes are valid */
912	>	yyparse();  /* Load the values from the conf */
913	>	validate_conf();  /* Check to make sure some values are still okay. */
914	>	/* Some global values are also loaded here. */
915	>	class_delete_marked();  /* Delete unused classes that are marked for deletion */
916		}
917
918	<	static void
919	<	validate_conf(void)
918	>	/* conf_rehash()
919	>	*
920	>	* Actual REHASH service routine. Called with sig == 0 if it has been called
921	>	* as a result of an operator issuing this command, else assume it has been
922	>	* called as a result of the server receiving a HUP signal.
923	>	*/
924	>	int
925	>	conf_rehash(int sig)
926		{
927	<	if (ConfigFileEntry.ts_warn_delta < TS_WARN_DELTA_MIN)
928	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
927	>	if (sig)
928	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
929	>	"Got signal SIGHUP, reloading configuration file(s)");
930
931	<	if (ConfigFileEntry.ts_max_delta < TS_MAX_DELTA_MIN)
1990	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
1991	<
1992	<	if (ServerInfo.network_name == NULL)
1993	<	DupString(ServerInfo.network_name,NETWORK_NAME_DEFAULT);
931	>	restart_resolver();
932
933	<	if (ServerInfo.network_desc == NULL)
1996	<	DupString(ServerInfo.network_desc,NETWORK_DESC_DEFAULT);
933	>	/* don't close listeners until we know we can go ahead with the rehash */
934
935	<	if (ConfigFileEntry.service_name == NULL)
1999	<	DupString(ConfigFileEntry.service_name, SERVICE_NAME_DEFAULT);
935	>	read_conf_files(0);
936
937	<	if ((ConfigFileEntry.client_flood < CLIENT_FLOOD_MIN) ||
938	<	(ConfigFileEntry.client_flood > CLIENT_FLOOD_MAX))
2003	<	ConfigFileEntry.client_flood = CLIENT_FLOOD_MAX;
937	>	load_conf_modules();
938	>	check_conf_klines();
939
940	<	ConfigFileEntry.max_watch = IRCD_MAX(ConfigFileEntry.max_watch, WATCHSIZE_MIN);
940	>	return 0;
941		}
942
943		/* lookup_confhost()
#	Line 2010 | Line 945 | validate_conf(void)
945		* start DNS lookups of all hostnames in the conf
946		* line and convert an IP addresses in a.b.c.d number for to IP#s.
947		*/
948	<	static void
949	<	lookup_confhost(struct ConfItem *conf)
948	>	void
949	>	lookup_confhost(struct MaskItem *conf)
950		{
2016	–	struct AccessItem *aconf;
951		struct addrinfo hints, *res;
952
953	<	aconf = map_to_conf(conf);
954	<
2021	<	if (EmptyString(aconf->host) ||
2022	<	EmptyString(aconf->user))
2023	<	{
2024	<	ilog(LOG_TYPE_IRCD, "Host/server name error: (%s) (%s)",
2025	<	aconf->host, conf->name);
2026	<	return;
2027	<	}
2028	<
2029	<	if (strchr(aconf->host, '*') ||
2030	<	strchr(aconf->host, '?'))
2031	<	return;
2032	<
2033	<	/* Do name lookup now on hostnames given and store the
953	>	/*
954	>	* Do name lookup now on hostnames given and store the
955		* ip numbers in conf structure.
956		*/
957		memset(&hints, 0, sizeof(hints));
#	Line 2041 | Line 962 | lookup_confhost(struct ConfItem *conf)
962		/* Get us ready for a bind() and don't bother doing dns lookup */
963		hints.ai_flags = AI_PASSIVE | AI_NUMERICHOST;
964
965	<	if (getaddrinfo(aconf->host, NULL, &hints, &res))
965	>	if (getaddrinfo(conf->host, NULL, &hints, &res))
966		{
967	<	conf_dns_lookup(aconf);
967	>	conf_dns_lookup(conf);
968		return;
969		}
970
971	<	assert(res != NULL);
971	>	assert(res);
972	>
973	>	memcpy(&conf->addr, res->ai_addr, res->ai_addrlen);
974	>	conf->addr.ss_len = res->ai_addrlen;
975	>	conf->addr.ss.ss_family = res->ai_family;
976
2052	–	memcpy(&aconf->ipnum, res->ai_addr, res->ai_addrlen);
2053	–	aconf->ipnum.ss_len = res->ai_addrlen;
2054	–	aconf->ipnum.ss.ss_family = res->ai_family;
977		freeaddrinfo(res);
978		}
979
#	Line 2065 | Line 987 | lookup_confhost(struct ConfItem *conf)
987		int
988		conf_connect_allowed(struct irc_ssaddr *addr, int aftype)
989		{
990	<	struct ip_entry *ip_found;
991	<	struct AccessItem *aconf = find_dline_conf(addr, aftype);
990	>	struct ip_entry *ip_found = NULL;
991	>	struct MaskItem *const conf = find_dline_conf(addr, aftype);
992
993		/* DLINE exempt also gets you out of static limits/pacing... */
994	<	if (aconf && (aconf->status & CONF_EXEMPTDLINE))
994	>	if (conf && (conf->type == CONF_EXEMPT))
995		return 0;
996
997	<	if (aconf != NULL)
997	>	if (conf)
998		return BANNED_CLIENT;
999
1000	<	ip_found = find_or_add_ip(addr);
1000	>	ip_found = ipcache_find_or_add_address(addr);
1001
1002	<	if ((CurrentTime - ip_found->last_attempt) <
2081	<	ConfigFileEntry.throttle_time)
1002	>	if ((CurrentTime - ip_found->last_attempt) < ConfigGeneral.throttle_time)
1003		{
1004	<	ip_found->last_attempt = CurrentTime;
1005	<	return TOO_FAST;
1004	>	if (ip_found->connection_count >= ConfigGeneral.throttle_count)
1005	>	return TOO_FAST;
1006	>
1007	>	++ip_found->connection_count;
1008		}
1009	+	else
1010	+	ip_found->connection_count = 1;
1011
1012		ip_found->last_attempt = CurrentTime;
1013		return 0;
1014		}
1015
1016	<	static struct AccessItem *
2092	<	find_regexp_kline(const char *uhi[])
2093	<	{
2094	<	#ifdef HAVE_LIBPCRE
2095	<	const dlink_node *ptr = NULL;
2096	<
2097	<	DLINK_FOREACH(ptr, rkconf_items.head)
2098	<	{
2099	<	struct AccessItem *aptr = map_to_conf(ptr->data);
2100	<
2101	<	assert(aptr->regexuser);
2102	<	assert(aptr->regexhost);
2103	<
2104	<	if (!ircd_pcre_exec(aptr->regexuser, uhi[0]) &&
2105	<	(!ircd_pcre_exec(aptr->regexhost, uhi[1]) ||
2106	<	!ircd_pcre_exec(aptr->regexhost, uhi[2])))
2107	<	return aptr;
2108	<	}
2109	<	#endif
2110	<	return NULL;
2111	<	}
2112	<
2113	<	/* find_kill()
1016	>	/* expire_tklines()
1017		*
1018	<	* inputs       - pointer to client structure
1019	<	* output       - pointer to struct AccessItem if found
1020	<	* side effects - See if this user is klined already,
2118	<	*                and if so, return struct AccessItem pointer
1018	>	* inputs       - tkline list pointer
1019	>	* output       - NONE
1020	>	* side effects - expire tklines
1021		*/
1022	<	struct AccessItem *
1023	<	find_kill(struct Client *client_p)
2122	<	{
2123	<	struct AccessItem *aconf = NULL;
2124	<	const char *uhi[3];
2125	<
2126	<	uhi[0] = client_p->username;
2127	<	uhi[1] = client_p->host;
2128	<	uhi[2] = client_p->sockhost;
2129	<
2130	<	assert(client_p != NULL);
2131	<
2132	<	aconf = find_kline_conf(client_p->host, client_p->username,
2133	<	&client_p->localClient->ip,
2134	<	client_p->localClient->aftype);
2135	<	if (aconf == NULL)
2136	<	aconf = find_regexp_kline(uhi);
2137	<
2138	<	if (aconf && (aconf->status & CONF_KLINE))
2139	<	return aconf;
2140	<
2141	<	return NULL;
2142	<	}
2143	<
2144	<	struct AccessItem *
2145	<	find_gline(struct Client *client_p)
1022	>	static void
1023	>	expire_tklines(dlink_list *list)
1024		{
1025	<	struct AccessItem *aconf;
2148	<
2149	<	assert(client_p != NULL);
1025	>	dlink_node *node = NULL, *node_next = NULL;
1026
1027	<	aconf = find_gline_conf(client_p->host, client_p->username,
1028	<	&client_p->localClient->ip,
1029	<	client_p->localClient->aftype);
2154	<
2155	<	if (aconf && (aconf->status & CONF_GLINE))
2156	<	return aconf;
2157	<
2158	<	return NULL;
2159	<	}
1027	>	DLINK_FOREACH_SAFE(node, node_next, list->head)
1028	>	{
1029	>	struct MaskItem *conf = node->data;
1030
1031	<	/* add_temp_line()
1032	<	*
2163	<	* inputs        - pointer to struct ConfItem
2164	<	* output        - none
2165	<	* Side effects  - links in given struct ConfItem into
2166	<	*                 temporary *line link list
2167	<	*/
2168	<	void
2169	<	add_temp_line(struct ConfItem *conf)
2170	<	{
2171	<	struct AccessItem *aconf;
1031	>	if (!conf->until || conf->until > CurrentTime)
1032	>	continue;
1033
1034	<	if (conf->type == DLINE_TYPE)
1035	<	{
1036	<	aconf = map_to_conf(conf);
1037	<	SetConfTemporary(aconf);
1038	<	dlinkAdd(conf, &conf->node, &temporary_dlines);
1039	<	MyFree(aconf->user);
1040	<	aconf->user = NULL;
1041	<	add_conf_by_address(CONF_DLINE, aconf);
1042	<	}
1043	<	else if (conf->type == KLINE_TYPE)
1044	<	{
1045	<	aconf = map_to_conf(conf);
1046	<	SetConfTemporary(aconf);
1047	<	dlinkAdd(conf, &conf->node, &temporary_klines);
2187	<	add_conf_by_address(CONF_KILL, aconf);
2188	<	}
2189	<	else if (conf->type == GLINE_TYPE)
2190	<	{
2191	<	aconf = map_to_conf(conf);
2192	<	SetConfTemporary(aconf);
2193	<	dlinkAdd(conf, &conf->node, &temporary_glines);
2194	<	add_conf_by_address(CONF_GLINE, aconf);
2195	<	}
2196	<	else if (conf->type == XLINE_TYPE)
2197	<	{
2198	<	conf->flags |= CONF_FLAGS_TEMPORARY;
2199	<	dlinkAdd(conf, make_dlink_node(), &temporary_xlines);
2200	<	}
2201	<	else if (conf->type == RXLINE_TYPE)
2202	<	{
2203	<	conf->flags |= CONF_FLAGS_TEMPORARY;
2204	<	dlinkAdd(conf, make_dlink_node(), &temporary_rxlines);
2205	<	}
2206	<	else if (conf->type == RKLINE_TYPE)
2207	<	{
2208	<	conf->flags |= CONF_FLAGS_TEMPORARY;
2209	<	dlinkAdd(conf, make_dlink_node(), &temporary_rklines);
2210	<	}
2211	<	else if ((conf->type == NRESV_TYPE) || (conf->type == CRESV_TYPE))
2212	<	{
2213	<	conf->flags |= CONF_FLAGS_TEMPORARY;
2214	<	dlinkAdd(conf, make_dlink_node(), &temporary_resv);
1034	>	if (conf->type == CONF_XLINE)
1035	>	{
1036	>	if (ConfigGeneral.tkline_expire_notices)
1037	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1038	>	"Temporary X-line for [%s] expired", conf->name);
1039	>	conf_free(conf);
1040	>	}
1041	>	else if (conf->type == CONF_NRESV || conf->type == CONF_CRESV)
1042	>	{
1043	>	if (ConfigGeneral.tkline_expire_notices)
1044	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1045	>	"Temporary RESV for [%s] expired", conf->name);
1046	>	conf_free(conf);
1047	>	}
1048		}
1049		}
1050
#	Line 2223 | Line 1056 | add_temp_line(struct ConfItem *conf)
1056		*                This is an event started off in ircd.c
1057		*/
1058		void
1059	<	cleanup_tklines(void *notused)
1059	>	cleanup_tklines(void *unused)
1060		{
1061	<	expire_tklines(&temporary_glines);
1062	<	expire_tklines(&temporary_klines);
1063	<	expire_tklines(&temporary_dlines);
1064	<	expire_tklines(&temporary_xlines);
2232	<	expire_tklines(&temporary_rxlines);
2233	<	expire_tklines(&temporary_rklines);
2234	<	expire_tklines(&temporary_resv);
2235	<	}
2236	<
2237	<	/* expire_tklines()
2238	<	*
2239	<	* inputs       - tkline list pointer
2240	<	* output       - NONE
2241	<	* side effects - expire tklines
2242	<	*/
2243	<	static void
2244	<	expire_tklines(dlink_list *tklist)
2245	<	{
2246	<	dlink_node *ptr;
2247	<	dlink_node *next_ptr;
2248	<	struct ConfItem *conf;
2249	<	struct MatchItem *xconf;
2250	<	struct MatchItem *nconf;
2251	<	struct AccessItem *aconf;
2252	<	struct ResvChannel *cconf;
2253	<
2254	<	DLINK_FOREACH_SAFE(ptr, next_ptr, tklist->head)
2255	<	{
2256	<	conf = ptr->data;
2257	<	if (conf->type == GLINE_TYPE ||
2258	<	conf->type == KLINE_TYPE ||
2259	<	conf->type == DLINE_TYPE)
2260	<	{
2261	<	aconf = (struct AccessItem *)map_to_conf(conf);
2262	<	if (aconf->hold <= CurrentTime)
2263	<	{
2264	<	/* XXX - Do we want GLINE expiry notices?? */
2265	<	/* Alert opers that a TKline expired - Hwy */
2266	<	if (ConfigFileEntry.tkline_expire_notices)
2267	<	{
2268	<	if (aconf->status & CONF_KILL)
2269	<	{
2270	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2271	<	"Temporary K-line for [%s@%s] expired",
2272	<	(aconf->user) ? aconf->user : "*",
2273	<	(aconf->host) ? aconf->host : "*");
2274	<	}
2275	<	else if (conf->type == DLINE_TYPE)
2276	<	{
2277	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2278	<	"Temporary D-line for [%s] expired",
2279	<	(aconf->host) ? aconf->host : "*");
2280	<	}
2281	<	}
2282	<
2283	<	dlinkDelete(ptr, tklist);
2284	<	delete_one_address_conf(aconf->host, aconf);
2285	<	}
2286	<	}
2287	<	else if (conf->type == XLINE_TYPE ||
2288	<	conf->type == RXLINE_TYPE)
2289	<	{
2290	<	xconf = (struct MatchItem *)map_to_conf(conf);
2291	<	if (xconf->hold <= CurrentTime)
2292	<	{
2293	<	if (ConfigFileEntry.tkline_expire_notices)
2294	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2295	<	"Temporary X-line for [%s] %sexpired", conf->name,
2296	<	conf->type == RXLINE_TYPE ? "(REGEX) " : "");
2297	<	dlinkDelete(ptr, tklist);
2298	<	free_dlink_node(ptr);
2299	<	delete_conf_item(conf);
2300	<	}
2301	<	}
2302	<	else if (conf->type == RKLINE_TYPE)
2303	<	{
2304	<	aconf = map_to_conf(conf);
2305	<	if (aconf->hold <= CurrentTime)
2306	<	{
2307	<	if (ConfigFileEntry.tkline_expire_notices)
2308	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2309	<	"Temporary K-line for [%s@%s] (REGEX) expired",
2310	<	(aconf->user) ? aconf->user : "*",
2311	<	(aconf->host) ? aconf->host : "*");
2312	<	dlinkDelete(ptr, tklist);
2313	<	free_dlink_node(ptr);
2314	<	delete_conf_item(conf);
2315	<	}
2316	<	}
2317	<	else if (conf->type == NRESV_TYPE)
2318	<	{
2319	<	nconf = (struct MatchItem *)map_to_conf(conf);
2320	<	if (nconf->hold <= CurrentTime)
2321	<	{
2322	<	if (ConfigFileEntry.tkline_expire_notices)
2323	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2324	<	"Temporary RESV for [%s] expired", conf->name);
2325	<	dlinkDelete(ptr, tklist);
2326	<	free_dlink_node(ptr);
2327	<	delete_conf_item(conf);
2328	<	}
2329	<	}
2330	<	else if (conf->type == CRESV_TYPE)
2331	<	{
2332	<	cconf = (struct ResvChannel *)map_to_conf(conf);
2333	<	if (cconf->hold <= CurrentTime)
2334	<	{
2335	<	if (ConfigFileEntry.tkline_expire_notices)
2336	<	sendto_realops_flags(UMODE_ALL, L_ALL,
2337	<	"Temporary RESV for [%s] expired", cconf->name);
2338	<	delete_channel_resv(cconf);
2339	<	}
2340	<	}
2341	<	}
1061	>	hostmask_expire_temporary();
1062	>	expire_tklines(&xconf_items);
1063	>	expire_tklines(&nresv_items);
1064	>	expire_tklines(&cresv_items);
1065		}
1066
1067		/* oper_privs_as_string()
#	Line 2349 | Line 1072 | expire_tklines(dlink_list *tklist)
1072		*/
1073		static const struct oper_privs
1074		{
1075	<	const unsigned int oprivs;
1075	>	const unsigned int flag;
1076		const unsigned char c;
1077		} flag_list[] = {
1078	<	{ OPER_FLAG_ADMIN,       'A' },
1079	<	{ OPER_FLAG_REMOTEBAN,   'B' },
1080	<	{ OPER_FLAG_DIE,         'D' },
1081	<	{ OPER_FLAG_GLINE,       'G' },
1082	<	{ OPER_FLAG_REHASH,      'H' },
1083	<	{ OPER_FLAG_K,           'K' },
1084	<	{ OPER_FLAG_OPERWALL,    'L' },
1085	<	{ OPER_FLAG_N,           'N' },
1086	<	{ OPER_FLAG_GLOBAL_KILL, 'O' },
1087	<	{ OPER_FLAG_REMOTE,      'R' },
1088	<	{ OPER_FLAG_OPER_SPY,    'S' },
1089	<	{ OPER_FLAG_UNKLINE,     'U' },
1090	<	{ OPER_FLAG_X,           'X' },
1078	>	{ OPER_FLAG_ADMIN,          'A' },
1079	>	{ OPER_FLAG_REMOTEBAN,      'B' },
1080	>	{ OPER_FLAG_DIE,            'D' },
1081	>	{ OPER_FLAG_GLINE,          'G' },
1082	>	{ OPER_FLAG_REHASH,         'H' },
1083	>	{ OPER_FLAG_KLINE,          'K' },
1084	>	{ OPER_FLAG_KILL,           'N' },
1085	>	{ OPER_FLAG_KILL_REMOTE,    'O' },
1086	>	{ OPER_FLAG_CONNECT,        'P' },
1087	>	{ OPER_FLAG_CONNECT_REMOTE, 'Q' },
1088	>	{ OPER_FLAG_SQUIT,          'R' },
1089	>	{ OPER_FLAG_SQUIT_REMOTE,   'S' },
1090	>	{ OPER_FLAG_UNKLINE,        'U' },
1091	>	{ OPER_FLAG_XLINE,          'X' },
1092		{ 0, '\0' }
1093		};
1094
1095		char *
1096		oper_privs_as_string(const unsigned int port)
1097		{
1098	<	static char privs_out[16];
1098	>	static char privs_out[IRCD_BUFSIZE];
1099		char *privs_ptr = privs_out;
2376	–	unsigned int i = 0;
1100
1101	<	for (; flag_list[i].oprivs; ++i)
1101	>	for (const struct oper_privs *opriv = flag_list; opriv->flag; ++opriv)
1102		{
1103	<	if (port & flag_list[i].oprivs)
1104	<	*privs_ptr++ = flag_list[i].c;
1103	>	if (port & opriv->flag)
1104	>	*privs_ptr++ = opriv->c;
1105		else
1106	<	*privs_ptr++ = ToLowerTab[flag_list[i].c];
1106	>	*privs_ptr++ = ToLower(opriv->c);
1107		}
1108
1109		*privs_ptr = '\0';
#	Line 2389 | Line 1112 | oper_privs_as_string(const unsigned int
1112		}
1113
1114		/*
1115	<	* Input: A client to find the active oper{} name for.
1115	>	* Input: A client to find the active operator {} name for.
1116		* Output: The nick!user@host{oper} of the oper.
1117		*         "oper" is server name for remote opers
1118		* Side effects: None.
1119		*/
1120	<	char *
1120	>	const char *
1121		get_oper_name(const struct Client *client_p)
1122		{
2400	–	dlink_node *cnode;
2401	–	struct ConfItem *conf;
2402	–	struct AccessItem *aconf;
2403	–
1123		/* +5 for !,@,{,} and null */
1124		static char buffer[NICKLEN + USERLEN + HOSTLEN + HOSTLEN + 5];
1125
1126	+	if (IsServer(client_p))
1127	+	return client_p->name;
1128	+
1129		if (MyConnect(client_p))
1130		{
1131	<	DLINK_FOREACH(cnode, client_p->localClient->confs.head)
1131	>	const dlink_node *const node = client_p->connection->confs.head;
1132	>
1133	>	if (node)
1134		{
1135	<	conf = cnode->data;
2412	<	aconf = map_to_conf(conf);
1135	>	const struct MaskItem *const conf = node->data;
1136
1137	<	if (IsConfOperator(aconf))
1137	>	if (conf->type == CONF_OPER)
1138		{
1139	<	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1139	>	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1140		client_p->username, client_p->host, conf->name);
1141	<	return buffer;
1141	>	return buffer;
1142		}
1143		}
1144
1145	<	/* Probably should assert here for now. If there is an oper out there
1146	<	* with no oper{} conf attached, it would be good for us to know...
1145	>	/*
1146	>	* Probably should assert here for now. If there is an oper out there
1147	>	* with no operator {} conf attached, it would be good for us to know...
1148		*/
1149	<	assert(0); /* Oper without oper conf! */
1149	>	assert(0);  /* Oper without oper conf! */
1150		}
1151
1152		snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1153	<	client_p->username, client_p->host, client_p->servptr->name);
1153	>	client_p->username, client_p->host, client_p->servptr->name);
1154		return buffer;
1155		}
1156
2433	–	/* read_conf_files()
2434	–	*
2435	–	* inputs       - cold start YES or NO
2436	–	* output       - none
2437	–	* side effects - read all conf files needed, ircd.conf kline.conf etc.
2438	–	*/
2439	–	void
2440	–	read_conf_files(int cold)
2441	–	{
2442	–	const char *filename;
2443	–	char chanmodes[32];
2444	–	char chanlimit[32];
2445	–
2446	–	conf_parser_ctx.boot = cold;
2447	–	filename = get_conf_name(CONF_TYPE);
2448	–
2449	–	/* We need to know the initial filename for the yyerror() to report
2450	–	FIXME: The full path is in conffilenamebuf first time since we
2451	–	dont know anything else
2452	–
2453	–	- Gozem 2002-07-21
2454	–	*/
2455	–	strlcpy(conffilebuf, filename, sizeof(conffilebuf));
2456	–
2457	–	if ((conf_parser_ctx.conf_file = fbopen(filename, "r")) == NULL)
2458	–	{
2459	–	if (cold)
2460	–	{
2461	–	ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
2462	–	filename, strerror(errno));
2463	–	exit(-1);
2464	–	}
2465	–	else
2466	–	{
2467	–	sendto_realops_flags(UMODE_ALL, L_ALL,
2468	–	"Unable to read configuration file '%s': %s",
2469	–	filename, strerror(errno));
2470	–	return;
2471	–	}
2472	–	}
2473	–
2474	–	if (!cold)
2475	–	clear_out_old_conf();
2476	–
2477	–	read_conf(conf_parser_ctx.conf_file);
2478	–	fbclose(conf_parser_ctx.conf_file);
2479	–
2480	–	add_isupport("NETWORK", ServerInfo.network_name, -1);
2481	–	snprintf(chanmodes, sizeof(chanmodes), "b%s%s:%d",
2482	–	ConfigChannel.use_except ? "e" : "",
2483	–	ConfigChannel.use_invex ? "I" : "", ConfigChannel.max_bans);
2484	–	add_isupport("MAXLIST", chanmodes, -1);
2485	–	add_isupport("MAXTARGETS", NULL, ConfigFileEntry.max_targets);
2486	–
2487	–	if (ConfigChannel.disable_local_channels)
2488	–	add_isupport("CHANTYPES", "#", -1);
2489	–	else
2490	–	add_isupport("CHANTYPES", "#&", -1);
2491	–
2492	–	snprintf(chanlimit, sizeof(chanlimit), "%s:%d",
2493	–	ConfigChannel.disable_local_channels ? "#" : "#&",
2494	–	ConfigChannel.max_chans_per_user);
2495	–	add_isupport("CHANLIMIT", chanlimit, -1);
2496	–	snprintf(chanmodes, sizeof(chanmodes), "%s%s%s",
2497	–	ConfigChannel.use_except ? "e" : "",
2498	–	ConfigChannel.use_invex ? "I" : "", "b,k,l,imnprstORS");
2499	–	add_isupport("CHANNELLEN", NULL, LOCAL_CHANNELLEN);
2500	–
2501	–	if (ConfigChannel.use_except)
2502	–	add_isupport("EXCEPTS", "e", -1);
2503	–	if (ConfigChannel.use_invex)
2504	–	add_isupport("INVEX", "I", -1);
2505	–	add_isupport("CHANMODES", chanmodes, -1);
2506	–
2507	–	/*
2508	–	* message_locale may have changed.  rebuild isupport since it relies
2509	–	* on strlen(form_str(RPL_ISUPPORT))
2510	–	*/
2511	–	rebuild_isupport_message_line();
2512	–
2513	–	#ifdef HAVE_LIBPCRE
2514	–	parse_conf_file(RKLINE_TYPE, cold);
2515	–	parse_conf_file(RXLINE_TYPE, cold);
2516	–	#endif
2517	–	parse_conf_file(KLINE_TYPE, cold);
2518	–	parse_conf_file(DLINE_TYPE, cold);
2519	–	parse_conf_file(XLINE_TYPE, cold);
2520	–	parse_conf_file(NRESV_TYPE, cold);
2521	–	parse_conf_file(CRESV_TYPE, cold);
2522	–	}
2523	–
2524	–	/* parse_conf_file()
2525	–	*
2526	–	* inputs       - type of conf file to parse
2527	–	* output       - none
2528	–	* side effects - conf file for givenconf type is opened and read then parsed
2529	–	*/
2530	–	static void
2531	–	parse_conf_file(int type, int cold)
2532	–	{
2533	–	FBFILE *file = NULL;
2534	–	const char *filename = get_conf_name(type);
2535	–
2536	–	if ((file = fbopen(filename, "r")) == NULL)
2537	–	{
2538	–	if (cold)
2539	–	ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
2540	–	filename, strerror(errno));
2541	–	else
2542	–	sendto_realops_flags(UMODE_ALL, L_ALL,
2543	–	"Unable to read configuration file '%s': %s",
2544	–	filename, strerror(errno));
2545	–	}
2546	–	else
2547	–	{
2548	–	parse_csv_file(file, type);
2549	–	fbclose(file);
2550	–	}
2551	–	}
2552	–
1157		/* clear_out_old_conf()
1158		*
1159		* inputs       - none
#	Line 2559 | Line 1163 | parse_conf_file(int type, int cold)
1163		static void
1164		clear_out_old_conf(void)
1165		{
1166	<	dlink_node *ptr = NULL, *next_ptr = NULL;
2563	<	struct ConfItem *conf;
2564	<	struct AccessItem *aconf;
2565	<	struct ClassItem *cltmp;
2566	<	struct MatchItem *match_item;
1166	>	dlink_node *node = NULL, *node_next = NULL;
1167		dlink_list *free_items [] = {
1168	<	&server_items,   &oconf_items,    &hub_items, &leaf_items,
1169	<	&uconf_items,   &xconf_items, &rxconf_items, &rkconf_items,
1170	<	&nresv_items, &cluster_items,  &gdeny_items, &service_items, NULL
1168	>	&server_items,   &oconf_items,
1169	>	&uconf_items,   &xconf_items,
1170	>	&nresv_items, &cluster_items,  &service_items, &cresv_items, NULL
1171		};
1172
1173		dlink_list ** iterator = free_items; /* C is dumb */
#	Line 2575 | Line 1175 | clear_out_old_conf(void)
1175		/* We only need to free anything allocated by yyparse() here.
1176		* Resetting structs, etc, is taken care of by set_default_conf().
1177		*/
1178	<
1179	<	for (; *iterator != NULL; iterator++)
1178	>
1179	>	for (; *iterator; iterator++)
1180		{
1181	<	DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
1181	>	DLINK_FOREACH_SAFE(node, node_next, (*iterator)->head)
1182		{
1183	<	conf = ptr->data;
2584	<	/* XXX This is less than pretty */
2585	<	if (conf->type == SERVER_TYPE)
2586	<	{
2587	<	aconf = map_to_conf(conf);
1183	>	struct MaskItem *conf = node->data;
1184
1185	<	if (aconf->clients != 0)
1186	<	{
2591	<	SetConfIllegal(aconf);
2592	<	dlinkDelete(&conf->node, &server_items);
2593	<	}
2594	<	else
2595	<	{
2596	<	delete_conf_item(conf);
2597	<	}
2598	<	}
2599	<	else if (conf->type == OPER_TYPE)
2600	<	{
2601	<	aconf = map_to_conf(conf);
1185	>	conf->active = 0;
1186	>	dlinkDelete(&conf->node, *iterator);
1187
1188	<	if (aconf->clients != 0)
1189	<	{
2605	<	SetConfIllegal(aconf);
2606	<	dlinkDelete(&conf->node, &oconf_items);
2607	<	}
2608	<	else
2609	<	{
2610	<	delete_conf_item(conf);
2611	<	}
2612	<	}
2613	<	else if (conf->type == CLIENT_TYPE)
1188	>	/* XXX This is less than pretty */
1189	>	if (conf->type == CONF_SERVER || conf->type == CONF_OPER)
1190		{
1191	<	aconf = map_to_conf(conf);
1192	<
2617	<	if (aconf->clients != 0)
2618	<	{
2619	<	SetConfIllegal(aconf);
2620	<	}
2621	<	else
2622	<	{
2623	<	delete_conf_item(conf);
2624	<	}
1191	>	if (!conf->ref_count)
1192	>	conf_free(conf);
1193		}
1194	<	else if (conf->type == XLINE_TYPE  ||
2627	<	conf->type == RXLINE_TYPE ||
2628	<	conf->type == RKLINE_TYPE)
1194	>	else if (conf->type == CONF_XLINE)
1195		{
1196	<	/* temporary (r)xlines are also on
1197	<	* the (r)xconf items list */
2632	<	if (conf->flags & CONF_FLAGS_TEMPORARY)
2633	<	continue;
2634	<
2635	<	delete_conf_item(conf);
1196	>	if (!conf->until)
1197	>	conf_free(conf);
1198		}
1199		else
1200	<	{
2639	<	if ((conf->type == LEAF_TYPE) || (conf->type == HUB_TYPE))
2640	<	{
2641	<	match_item = map_to_conf(conf);
2642	<	if (match_item->ref_count <= 0)
2643	<	delete_conf_item(conf);
2644	<	else
2645	<	{
2646	<	match_item->illegal = 1;
2647	<	dlinkDelete(&conf->node, *iterator);
2648	<	}
2649	<	}
2650	<	else
2651	<	delete_conf_item(conf);
2652	<	}
1200	>	conf_free(conf);
1201		}
1202		}
1203
1204	+	motd_clear();
1205	+
1206		/*
1207		* don't delete the class table, rather mark all entries
1208	<	* for deletion. The table is cleaned up by check_class. - avalon
1208	>	* for deletion. The table is cleaned up by class_delete_marked. - avalon
1209		*/
1210	<	DLINK_FOREACH(ptr, class_items.head)
2661	<	{
2662	<	cltmp = map_to_conf(ptr->data);
2663	<
2664	<	if (ptr != class_items.tail)  /* never mark the "default" class */
2665	<	cltmp->active = 0;
2666	<	}
1210	>	class_mark_for_deletion();
1211
1212		clear_out_address_conf();
1213
1214		/* clean out module paths */
1215		mod_clear_paths();
1216
1217	<	/* clean out ServerInfo */
1218	<	MyFree(ServerInfo.description);
1219	<	ServerInfo.description = NULL;
1220	<	MyFree(ServerInfo.network_name);
1221	<	ServerInfo.network_name = NULL;
1222	<	MyFree(ServerInfo.network_desc);
1223	<	ServerInfo.network_desc = NULL;
1224	<	MyFree(ConfigFileEntry.egdpool_path);
1225	<	ConfigFileEntry.egdpool_path = NULL;
1217	>	pseudo_clear();
1218	>
1219	>	/* clean out ConfigServerInfo */
1220	>	MyFree(ConfigServerInfo.description);
1221	>	ConfigServerInfo.description = NULL;
1222	>	MyFree(ConfigServerInfo.network_name);
1223	>	ConfigServerInfo.network_name = NULL;
1224	>	MyFree(ConfigServerInfo.network_desc);
1225	>	ConfigServerInfo.network_desc = NULL;
1226		#ifdef HAVE_LIBCRYPTO
1227	<	if (ServerInfo.rsa_private_key != NULL)
1227	>	if (ConfigServerInfo.rsa_private_key)
1228		{
1229	<	RSA_free(ServerInfo.rsa_private_key);
1230	<	ServerInfo.rsa_private_key = NULL;
1229	>	RSA_free(ConfigServerInfo.rsa_private_key);
1230	>	ConfigServerInfo.rsa_private_key = NULL;
1231		}
1232
1233	<	MyFree(ServerInfo.rsa_private_key_file);
1234	<	ServerInfo.rsa_private_key_file = NULL;
2691	<
2692	<	if (ServerInfo.server_ctx)
2693	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2|
2694	<	SSL_OP_NO_SSLv3|
2695	<	SSL_OP_NO_TLSv1);
2696	<	if (ServerInfo.client_ctx)
2697	<	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv2|
2698	<	SSL_OP_NO_SSLv3|
2699	<	SSL_OP_NO_TLSv1);
1233	>	MyFree(ConfigServerInfo.rsa_private_key_file);
1234	>	ConfigServerInfo.rsa_private_key_file = NULL;
1235		#endif
1236
1237	<	/* clean out old resvs from the conf */
1238	<	clear_conf_resv();
1237	>	/* clean out ConfigAdminInfo */
1238	>	MyFree(ConfigAdminInfo.name);
1239	>	ConfigAdminInfo.name = NULL;
1240	>	MyFree(ConfigAdminInfo.email);
1241	>	ConfigAdminInfo.email = NULL;
1242	>	MyFree(ConfigAdminInfo.description);
1243	>	ConfigAdminInfo.description = NULL;
1244
2705	–	/* clean out AdminInfo */
2706	–	MyFree(AdminInfo.name);
2707	–	AdminInfo.name = NULL;
2708	–	MyFree(AdminInfo.email);
2709	–	AdminInfo.email = NULL;
2710	–	MyFree(AdminInfo.description);
2711	–	AdminInfo.description = NULL;
2712	–
2713	–	/* operator{} and class{} blocks are freed above */
1245		/* clean out listeners */
1246		close_listeners();
2716	–
2717	–	/* auth{}, quarantine{}, shared{}, connect{}, kill{}, deny{},
2718	–	* exempt{} and gecos{} blocks are freed above too
2719	–	*/
2720	–
2721	–	/* clean out general */
2722	–	MyFree(ConfigFileEntry.service_name);
2723	–	ConfigFileEntry.service_name = NULL;
2724	–
2725	–	delete_isupport("INVEX");
2726	–	delete_isupport("EXCEPTS");
1247		}
1248
1249	<	/* flush_deleted_I_P()
1249	>	/* read_conf_files()
1250		*
1251	<	* inputs       - none
1251	>	* inputs       - cold start YES or NO
1252		* output       - none
1253	<	* side effects - This function removes I/P conf items
1253	>	* side effects - read all conf files needed, ircd.conf kline.conf etc.
1254		*/
1255	<	static void
1256	<	flush_deleted_I_P(void)
1255	>	void
1256	>	read_conf_files(int cold)
1257		{
1258	<	dlink_node *ptr;
1259	<	dlink_node *next_ptr;
1260	<	struct ConfItem *conf;
2741	<	struct AccessItem *aconf;
2742	<	dlink_list * free_items [] = {
2743	<	&server_items, &oconf_items, NULL
2744	<	};
2745	<	dlink_list ** iterator = free_items; /* C is dumb */
1258	>	const char *filename = NULL;
1259	>	char chanmodes[IRCD_BUFSIZE] = "";
1260	>	char chanlimit[IRCD_BUFSIZE] = "";
1261
1262	<	/* flush out deleted I and P lines
1263	<	* although still in use.
2749	<	*/
2750	<	for (; *iterator != NULL; iterator++)
2751	<	{
2752	<	DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
2753	<	{
2754	<	conf = ptr->data;
2755	<	aconf = (struct AccessItem *)map_to_conf(conf);
2756	<
2757	<	if (IsConfIllegal(aconf))
2758	<	{
2759	<	dlinkDelete(ptr, *iterator);
2760	<
2761	<	if (aconf->clients == 0)
2762	<	delete_conf_item(conf);
2763	<	}
2764	<	}
2765	<	}
2766	<	}
2767	<
2768	<	/* get_conf_name()
2769	<	*
2770	<	* inputs       - type of conf file to return name of file for
2771	<	* output       - pointer to filename for type of conf
2772	<	* side effects - none
2773	<	*/
2774	<	const char *
2775	<	get_conf_name(ConfType type)
2776	<	{
2777	<	switch (type)
2778	<	{
2779	<	case CONF_TYPE:
2780	<	return ConfigFileEntry.configfile;
2781	<	break;
2782	<	case KLINE_TYPE:
2783	<	return ConfigFileEntry.klinefile;
2784	<	break;
2785	<	case RKLINE_TYPE:
2786	<	return ConfigFileEntry.rklinefile;
2787	<	break;
2788	<	case DLINE_TYPE:
2789	<	return ConfigFileEntry.dlinefile;
2790	<	break;
2791	<	case XLINE_TYPE:
2792	<	return ConfigFileEntry.xlinefile;
2793	<	break;
2794	<	case RXLINE_TYPE:
2795	<	return ConfigFileEntry.rxlinefile;
2796	<	break;
2797	<	case CRESV_TYPE:
2798	<	return ConfigFileEntry.cresvfile;
2799	<	break;
2800	<	case NRESV_TYPE:
2801	<	return ConfigFileEntry.nresvfile;
2802	<	break;
2803	<	case GLINE_TYPE:
2804	<	return ConfigFileEntry.glinefile;
2805	<	break;
2806	<
2807	<	default:
2808	<	return NULL;  /* This should NEVER HAPPEN since we call this function
2809	<	only with the above values, this will cause us to core
2810	<	at some point if this happens so we know where it was */
2811	<	}
2812	<	}
1262	>	conf_parser_ctx.boot = cold;
1263	>	filename = ConfigGeneral.configfile;
1264
1265	<	#define BAD_PING (-1)
1265	>	/* We need to know the initial filename for the yyerror() to report
1266	>	FIXME: The full path is in conffilenamebuf first time since we
1267	>	don't know anything else
1268
1269	<	/* get_conf_ping()
1270	<	*
1271	<	* inputs       - pointer to struct AccessItem
2819	<	*              - pointer to a variable that receives ping warning time
2820	<	* output       - ping frequency
2821	<	* side effects - NONE
2822	<	*/
2823	<	static int
2824	<	get_conf_ping(struct ConfItem *conf, int *pingwarn)
2825	<	{
2826	<	struct ClassItem *aclass;
2827	<	struct AccessItem *aconf;
1269	>	- Gozem 2002-07-21
1270	>	*/
1271	>	strlcpy(conffilebuf, filename, sizeof(conffilebuf));
1272
1273	<	if (conf != NULL)
1273	>	if ((conf_parser_ctx.conf_file = fopen(filename, "r")) == NULL)
1274		{
1275	<	aconf = (struct AccessItem *)map_to_conf(conf);
2832	<	if (aconf->class_ptr != NULL)
1275	>	if (cold)
1276		{
1277	<	aclass = (struct ClassItem *)map_to_conf(aconf->class_ptr);
1278	<	*pingwarn = PingWarning(aclass);
1279	<	return PingFreq(aclass);
1277	>	ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
1278	>	filename, strerror(errno));
1279	>	exit(-1);
1280		}
1281	<	}
2839	<
2840	<	return BAD_PING;
2841	<	}
2842	<
2843	<	/* get_client_class()
2844	<	*
2845	<	* inputs       - pointer to client struct
2846	<	* output       - pointer to name of class
2847	<	* side effects - NONE
2848	<	*/
2849	<	const char *
2850	<	get_client_class(struct Client *target_p)
2851	<	{
2852	<	dlink_node *ptr;
2853	<	struct ConfItem *conf;
2854	<	struct AccessItem *aconf;
2855	<
2856	<	if (target_p != NULL && !IsMe(target_p) &&
2857	<	target_p->localClient->confs.head != NULL)
2858	<	{
2859	<	DLINK_FOREACH(ptr, target_p->localClient->confs.head)
1281	>	else
1282		{
1283	<	conf = ptr->data;
1284	<
1285	<	if (conf->type == CLIENT_TYPE || conf->type == SERVER_TYPE ||
1286	<	conf->type == OPER_TYPE)
2865	<	{
2866	<	aconf = (struct AccessItem *) map_to_conf(conf);
2867	<	if (aconf->class_ptr != NULL)
2868	<	return aconf->class_ptr->name;
2869	<	}
1283	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1284	>	"Unable to read configuration file '%s': %s",
1285	>	filename, strerror(errno));
1286	>	return;
1287		}
1288		}
1289
1290	<	return "default";
1291	<	}
2875	<
2876	<	/* get_client_ping()
2877	<	*
2878	<	* inputs       - pointer to client struct
2879	<	*              - pointer to a variable that receives ping warning time
2880	<	* output       - ping frequency
2881	<	* side effects - NONE
2882	<	*/
2883	<	int
2884	<	get_client_ping(struct Client *target_p, int *pingwarn)
2885	<	{
2886	<	int ping;
2887	<	struct ConfItem *conf;
2888	<	dlink_node *nlink;
2889	<
2890	<	if (target_p->localClient->confs.head != NULL)
2891	<	DLINK_FOREACH(nlink, target_p->localClient->confs.head)
2892	<	{
2893	<	conf = nlink->data;
2894	<
2895	<	if ((conf->type == CLIENT_TYPE) || (conf->type == SERVER_TYPE) ||
2896	<	(conf->type == OPER_TYPE))
2897	<	{
2898	<	ping = get_conf_ping(conf, pingwarn);
2899	<	if (ping > 0)
2900	<	return ping;
2901	<	}
2902	<	}
2903	<
2904	<	*pingwarn = 0;
2905	<	return DEFAULT_PINGFREQUENCY;
2906	<	}
2907	<
2908	<	/* find_class()
2909	<	*
2910	<	* inputs       - string name of class
2911	<	* output       - corresponding Class pointer
2912	<	* side effects - NONE
2913	<	*/
2914	<	struct ConfItem *
2915	<	find_class(const char *classname)
2916	<	{
2917	<	struct ConfItem *conf;
2918	<
2919	<	if ((conf = find_exact_name_conf(CLASS_TYPE, NULL, classname, NULL, NULL)) != NULL)
2920	<	return conf;
2921	<
2922	<	return class_default;
2923	<	}
2924	<
2925	<	/* check_class()
2926	<	*
2927	<	* inputs       - NONE
2928	<	* output       - NONE
2929	<	* side effects -
2930	<	*/
2931	<	void
2932	<	check_class(void)
2933	<	{
2934	<	dlink_node *ptr = NULL, *next_ptr = NULL;
2935	<
2936	<	DLINK_FOREACH_SAFE(ptr, next_ptr, class_items.head)
2937	<	{
2938	<	struct ClassItem *aclass = map_to_conf(ptr->data);
2939	<
2940	<	if (!aclass->active && !CurrUserCount(aclass))
2941	<	{
2942	<	destroy_cidr_class(aclass);
2943	<	delete_conf_item(ptr->data);
2944	<	}
2945	<	}
2946	<	}
1290	>	if (!cold)
1291	>	clear_out_old_conf();
1292
1293	<	/* init_class()
1294	<	*
2950	<	* inputs       - NONE
2951	<	* output       - NONE
2952	<	* side effects -
2953	<	*/
2954	<	void
2955	<	init_class(void)
2956	<	{
2957	<	struct ClassItem *aclass;
1293	>	read_conf(conf_parser_ctx.conf_file);
1294	>	fclose(conf_parser_ctx.conf_file);
1295
1296	<	class_default = make_conf_item(CLASS_TYPE);
1296	>	log_reopen_all();
1297
1298	<	aclass = map_to_conf(class_default);
1299	<	aclass->active = 1;
2963	<	DupString(class_default->name, "default");
2964	<	ConFreq(aclass)  = DEFAULT_CONNECTFREQUENCY;
2965	<	PingFreq(aclass) = DEFAULT_PINGFREQUENCY;
2966	<	MaxTotal(aclass) = MAXIMUM_LINKS_DEFAULT;
2967	<	MaxSendq(aclass) = DEFAULT_SENDQ;
1298	>	add_isupport("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
1299	>	add_isupport("NETWORK", ConfigServerInfo.network_name, -1);
1300
1301	<	client_check_cb = register_callback("check_client", check_client);
1302	<	}
1301	>	snprintf(chanmodes, sizeof(chanmodes), "beI:%d", ConfigChannel.max_bans);
1302	>	add_isupport("MAXLIST", chanmodes, -1);
1303	>	add_isupport("MAXTARGETS", NULL, ConfigGeneral.max_targets);
1304	>	add_isupport("CHANTYPES", "#", -1);
1305
1306	<	/* get_sendq()
1307	<	*
1308	<	* inputs       - pointer to client
1309	<	* output       - sendq for this client as found from its class
1310	<	* side effects - NONE
1311	<	*/
1312	<	unsigned int
2979	<	get_sendq(struct Client *client_p)
2980	<	{
2981	<	unsigned int sendq = DEFAULT_SENDQ;
2982	<	dlink_node *ptr;
2983	<	struct ConfItem *conf;
2984	<	struct ConfItem *class_conf;
2985	<	struct ClassItem *aclass;
2986	<	struct AccessItem *aconf;
1306	>	snprintf(chanlimit, sizeof(chanlimit), "#:%d",
1307	>	ConfigChannel.max_channels);
1308	>	add_isupport("CHANLIMIT", chanlimit, -1);
1309	>	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,cimnprstMORS");
1310	>	add_isupport("CHANNELLEN", NULL, CHANNELLEN);
1311	>	add_isupport("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
1312	>	add_isupport("CHANMODES", chanmodes, -1);
1313
1314	<	if (client_p && !IsMe(client_p) && (client_p->localClient->confs.head))
1315	<	{
1316	<	DLINK_FOREACH(ptr, client_p->localClient->confs.head)
2991	<	{
2992	<	conf = ptr->data;
2993	<	if ((conf->type == SERVER_TYPE) || (conf->type == OPER_TYPE)
2994	<	|| (conf->type == CLIENT_TYPE))
2995	<	{
2996	<	aconf = (struct AccessItem *)map_to_conf(conf);
2997	<	if ((class_conf = aconf->class_ptr) == NULL)
2998	<	continue;
2999	<	aclass = (struct ClassItem *)map_to_conf(class_conf);
3000	<	sendq = MaxSendq(aclass);
3001	<	return sendq;
3002	<	}
3003	<	}
3004	<	}
3005	<	/* XXX return a default?
3006	<	* if here, then there wasn't an attached conf with a sendq
3007	<	* that is very bad -Dianora
1314	>	/*
1315	>	* message_locale may have changed.  rebuild isupport since it relies
1316	>	* on strlen(form_str(RPL_ISUPPORT))
1317		*/
1318	<	return DEFAULT_SENDQ;
1318	>	rebuild_isupport_message_line();
1319		}
1320
1321		/* conf_add_class_to_conf()
1322		*
1323		* inputs       - pointer to config item
1324		* output       - NONE
1325	<	* side effects - Add a class pointer to a conf
1325	>	* side effects - Add a class pointer to a conf
1326		*/
1327		void
1328	<	conf_add_class_to_conf(struct ConfItem *conf, const char *class_name)
1328	>	conf_add_class_to_conf(struct MaskItem *conf, const char *class_name)
1329		{
1330	<	struct AccessItem *aconf = map_to_conf(conf);
3022	<	struct ClassItem *class = NULL;
3023	<
3024	<	if (class_name == NULL)
1330	>	if (class_name == NULL)
1331		{
1332	<	aconf->class_ptr = class_default;
1332	>	conf->class = class_default;
1333
1334	<	if (conf->type == CLIENT_TYPE)
1335	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1336	<	"Warning *** Defaulting to default class for %s@%s",
1337	<	aconf->user, aconf->host);
1334	>	if (conf->type == CONF_CLIENT || conf->type == CONF_OPER)
1335	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1336	>	"Warning *** Defaulting to default class for %s@%s",
1337	>	conf->user, conf->host);
1338		else
1339	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1340	<	"Warning *** Defaulting to default class for %s",
1341	<	conf->name);
1339	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1340	>	"Warning *** Defaulting to default class for %s",
1341	>	conf->name);
1342		}
1343		else
1344	<	aconf->class_ptr = find_class(class_name);
1344	>	conf->class = class_find(class_name, 1);
1345
1346	<	if (aconf->class_ptr)
3041	<	class = map_to_conf(aconf->class_ptr);
3042	<
3043	<	if (aconf->class_ptr == NULL || !class->active)
1346	>	if (conf->class == NULL)
1347		{
1348	<	if (conf->type == CLIENT_TYPE)
1349	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1350	<	"Warning *** Defaulting to default class for %s@%s",
1351	<	aconf->user, aconf->host);
1348	>	if (conf->type == CONF_CLIENT || conf->type == CONF_OPER)
1349	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1350	>	"Warning *** Defaulting to default class for %s@%s",
1351	>	conf->user, conf->host);
1352		else
1353	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1354	<	"Warning *** Defaulting to default class for %s",
1355	<	conf->name);
1356	<	aconf->class_ptr = class_default;
3054	<	}
3055	<	}
3056	<
3057	<	/* conf_add_server()
3058	<	*
3059	<	* inputs       - pointer to config item
3060	<	*              - pointer to link count already on this conf
3061	<	* output       - NONE
3062	<	* side effects - Add a connect block
3063	<	*/
3064	<	int
3065	<	conf_add_server(struct ConfItem *conf, const char *class_name)
3066	<	{
3067	<	struct AccessItem *aconf;
3068	<	struct split_nuh_item nuh;
3069	<	char conf_user[USERLEN + 1];
3070	<	char conf_host[HOSTLEN + 1];
3071	<
3072	<	aconf = map_to_conf(conf);
3073	<
3074	<	conf_add_class_to_conf(conf, class_name);
3075	<
3076	<	if (!aconf->host || !conf->name)
3077	<	{
3078	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Bad connect block");
3079	<	ilog(LOG_TYPE_IRCD, "Bad connect block");
3080	<	return -1;
3081	<	}
3082	<
3083	<	if (EmptyString(aconf->passwd))
3084	<	{
3085	<	sendto_realops_flags(UMODE_ALL, L_ALL, "Bad connect block, name %s",
3086	<	conf->name);
3087	<	ilog(LOG_TYPE_IRCD, "Bad connect block, host %s", conf->name);
3088	<	return -1;
1353	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1354	>	"Warning *** Defaulting to default class for %s",
1355	>	conf->name);
1356	>	conf->class = class_default;
1357		}
3090	–
3091	–	nuh.nuhmask  = aconf->host;
3092	–	nuh.nickptr  = NULL;
3093	–	nuh.userptr  = conf_user;
3094	–	nuh.hostptr  = conf_host;
3095	–
3096	–	nuh.nicksize = 0;
3097	–	nuh.usersize = sizeof(conf_user);
3098	–	nuh.hostsize = sizeof(conf_host);
3099	–
3100	–	split_nuh(&nuh);
3101	–
3102	–	MyFree(aconf->host);
3103	–	aconf->host = NULL;
3104	–
3105	–	DupString(aconf->user, conf_user); /* somehow username checking for servers
3106	–	got lost in H6/7, will have to be re-added */
3107	–	DupString(aconf->host, conf_host);
3108	–
3109	–	lookup_confhost(conf);
3110	–
3111	–	return 0;
1358		}
1359
1360		/* yyerror()
#	Line 3126 | Line 1372 | yyerror(const char *msg)
1372		return;
1373
1374		strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1375	<	sendto_realops_flags(UMODE_ALL, L_ALL, "\"%s\", line %u: %s: %s",
1375	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1376	>	"\"%s\", line %u: %s: %s",
1377		conffilebuf, lineno + 1, msg, newlinebuf);
1378		ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1379		conffilebuf, lineno + 1, msg, newlinebuf);
1380		}
1381
1382	<	int
1383	<	conf_fbgets(char *lbuf, unsigned int max_size, FBFILE *fb)
1382	>	void
1383	>	conf_error_report(const char *msg)
1384		{
1385	<	if (fbgets(lbuf, max_size, fb) == NULL)
3139	<	return 0;
3140	<
3141	<	return strlen(lbuf);
3142	<	}
1385	>	char newlinebuf[IRCD_BUFSIZE];
1386
1387	<	int
1388	<	conf_yy_fatal_error(const char *msg)
1389	<	{
1390	<	return 0;
1387	>	strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1388	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1389	>	"\"%s\", line %u: %s: %s",
1390	>	conffilebuf, lineno + 1, msg, newlinebuf);
1391	>	ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1392	>	conffilebuf, lineno + 1, msg, newlinebuf);
1393		}
1394
1395		/*
1396		* valid_tkline()
1397	<	*
1397	>	*
1398		* inputs       - pointer to ascii string to check
1399		*              - whether the specified time is in seconds or minutes
1400		* output       - -1 not enough parameters
#	Line 3158 | Line 1403 | conf_yy_fatal_error(const char *msg)
1403		* Originally written by Dianora (Diane, db@db.net)
1404		*/
1405		time_t
1406	<	valid_tkline(const char *p, int minutes)
1406	>	valid_tkline(const char *data, const int minutes)
1407		{
1408	+	const unsigned char *p = (const unsigned char *)data;
1409	+	unsigned char tmpch = '\0';
1410		time_t result = 0;
1411
1412	<	for (; *p; ++p)
1412	>	while ((tmpch = *p++))
1413		{
1414	<	if (!IsDigit(*p))
1414	>	if (!IsDigit(tmpch))
1415		return 0;
1416
1417		result *= 10;
1418	<	result += ((*p) & 0xF);
1418	>	result += (tmpch & 0xF);
1419		}
1420
1421		/*
1422	<	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1422	>	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1423		* i.e. they specifically use 0, I am going to return 1 instead
1424		* as a return value of non-zero is used to flag it as a temporary kline
1425		*/
1426		if (result == 0)
1427		result = 1;
1428
1429	<	/*
1429	>	/*
1430		* If the incoming time is in seconds convert it to minutes for the purpose
1431		* of this calculation
1432		*/
1433		if (!minutes)
1434	<	result = result / (time_t)60;
1434	>	result = result / 60;
1435
1436		if (result > MAX_TDKLINE_TIME)
1437		result = MAX_TDKLINE_TIME;
1438
1439	<	result = result * (time_t)60;  /* turn it into seconds */
1439	>	result = result * 60;  /* turn it into seconds */
1440
1441		return result;
1442		}
1443
1444	+	/* valid_wild_card_simple()
1445	+	*
1446	+	* inputs       - data to check for sufficient non-wildcard characters
1447	+	* outputs      - 1 if valid, else 0
1448	+	* side effects - none
1449	+	*/
1450	+	int
1451	+	valid_wild_card_simple(const char *data)
1452	+	{
1453	+	const unsigned char *p = (const unsigned char *)data;
1454	+	unsigned char tmpch = '\0';
1455	+	unsigned int nonwild = 0;
1456	+
1457	+	while ((tmpch = *p++))
1458	+	{
1459	+	if (tmpch == '\\' && *p)
1460	+	{
1461	+	++p;
1462	+	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1463	+	return 1;
1464	+	}
1465	+	else if (!IsMWildChar(tmpch))
1466	+	{
1467	+	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1468	+	return 1;
1469	+	}
1470	+	}
1471	+
1472	+	return 0;
1473	+	}
1474	+
1475		/* valid_wild_card()
1476		*
1477		* input        - pointer to client
#	Line 3205 | Line 1483 | valid_tkline(const char *p, int minutes)
1483		int
1484		valid_wild_card(struct Client *source_p, int warn, int count, ...)
1485		{
1486	<	char *p;
1487	<	char tmpch;
3210	<	int nonwild = 0;
1486	>	unsigned char tmpch = '\0';
1487	>	unsigned int nonwild = 0;
1488		va_list args;
1489
1490		/*
#	Line 3226 | Line 1503 | valid_wild_card(struct Client *source_p,
1503
1504		while (count--)
1505		{
1506	<	p = va_arg(args, char *);
1506	>	const unsigned char *p = va_arg(args, const unsigned char *);
1507		if (p == NULL)
1508		continue;
1509
#	Line 3238 | Line 1515 | valid_wild_card(struct Client *source_p,
1515		* If we find enough non-wild characters, we can
1516		* break - no point in searching further.
1517		*/
1518	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard)
1518	>	if (++nonwild >= ConfigGeneral.min_nonwildcard)
1519	>	{
1520	>	va_end(args);
1521		return 1;
1522	+	}
1523		}
1524		}
1525		}
1526
1527		if (warn)
1528	<	sendto_one(source_p, ":%s NOTICE %s :Please include at least %d non-wildcard characters with the mask",
1529	<	me.name, source_p->name, ConfigFileEntry.min_nonwildcard);
1528	>	sendto_one_notice(source_p, &me,
1529	>	":Please include at least %u non-wildcard characters with the mask",
1530	>	ConfigGeneral.min_nonwildcard);
1531	>	va_end(args);
1532	>	return 0;
1533	>	}
1534	>
1535	>	/* find_user_host()
1536	>	*
1537	>	* inputs       - pointer to client placing kline
1538	>	*              - pointer to user_host_or_nick
1539	>	*              - pointer to user buffer
1540	>	*              - pointer to host buffer
1541	>	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
1542	>	* side effects -
1543	>	*/
1544	>	static int
1545	>	find_user_host(struct Client *source_p, char *user_host_or_nick,
1546	>	char *luser, char *lhost, unsigned int flags)
1547	>	{
1548	>	struct Client *target_p = NULL;
1549	>	char *hostp = NULL;
1550	>
1551	>	if (lhost == NULL)
1552	>	{
1553	>	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
1554	>	return 1;
1555	>	}
1556	>
1557	>	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
1558	>	{
1559	>	/* Explicit user@host mask given */
1560	>	if (hostp)                            /* I'm a little user@host */
1561	>	{
1562	>	*(hostp++) = '\0';                       /* short and squat */
1563	>
1564	>	if (*user_host_or_nick)
1565	>	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
1566	>	else
1567	>	strcpy(luser, "*");
1568	>
1569	>	if (*hostp)
1570	>	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
1571	>	else
1572	>	strcpy(lhost, "*");
1573	>	}
1574	>	else
1575	>	{
1576	>	luser[0] = '*';             /* no @ found, assume its *@somehost */
1577	>	luser[1] = '\0';
1578	>	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
1579	>	}
1580	>
1581	>	return 1;
1582	>	}
1583	>	else
1584	>	{
1585	>	/* Try to find user@host mask from nick */
1586	>	/* Okay to use source_p as the first param, because source_p == client_p */
1587	>	if ((target_p =
1588	>	find_chasing(source_p, user_host_or_nick)) == NULL)
1589	>	return 0;  /* find_chasing sends ERR_NOSUCHNICK */
1590	>
1591	>	if (IsExemptKline(target_p))
1592	>	{
1593	>	if (IsClient(source_p))
1594	>	sendto_one_notice(source_p, &me, ":%s is E-lined", target_p->name);
1595	>	return 0;
1596	>	}
1597	>
1598	>	/*
1599	>	* turn the "user" bit into "*user", blow away '~'
1600	>	* if found in original user name (non-idented)
1601	>	*/
1602	>	strlcpy(luser, target_p->username, USERLEN*4 + 1);
1603	>
1604	>	if (target_p->username[0] == '~')
1605	>	luser[0] = '*';
1606	>
1607	>	if (!strcmp(target_p->sockhost, "0"))
1608	>	strlcpy(lhost, target_p->host, HOSTLEN*4 + 1);
1609	>	else
1610	>	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
1611	>	return 1;
1612	>	}
1613	>
1614		return 0;
1615		}
1616
#	Line 3260 | Line 1624 | valid_wild_card(struct Client *source_p,
1624		*              - parse_flags bit map of things to test
1625		*              - pointer to user or string to parse into
1626		*              - pointer to host or NULL to parse into if non NULL
1627	<	*              - pointer to optional tkline time or NULL
1627	>	*              - pointer to optional tkline time or NULL
1628		*              - pointer to target_server to parse into if non NULL
1629		*              - pointer to reason to parse into
1630		*
#	Line 3282 | Line 1646 | valid_wild_card(struct Client *source_p,
1646		*/
1647		int
1648		parse_aline(const char *cmd, struct Client *source_p,
1649	<	int parc, char **parv,
1650	<	int parse_flags, char **up_p, char **h_p, time_t *tkline_time,
1651	<	char **target_server, char **reason)
1649	>	int parc, char **parv,
1650	>	int parse_flags, char **up_p, char **h_p, time_t *tkline_time,
1651	>	char **target_server, char **reason)
1652		{
1653		int found_tkline_time=0;
1654	<	static char def_reason[] = "No Reason";
1654	>	static char def_reason[] = CONF_NOREASON;
1655		static char user[USERLEN*4+1];
1656		static char host[HOSTLEN*4+1];
1657
#	Line 3296 | Line 1660 | parse_aline(const char *cmd, struct Clie
1660
1661		found_tkline_time = valid_tkline(*parv, TK_MINUTES);
1662
1663	<	if (found_tkline_time != 0)
1663	>	if (found_tkline_time)
1664		{
1665		parv++;
1666		parc--;
1667
1668	<	if (tkline_time != NULL)
1668	>	if (tkline_time)
1669		*tkline_time = found_tkline_time;
1670		else
1671		{
1672	<	sendto_one(source_p, ":%s NOTICE %s :temp_line not supported by %s",
3309	<	me.name, source_p->name, cmd);
1672	>	sendto_one_notice(source_p, &me, ":temp_line not supported by %s", cmd);
1673		return -1;
1674		}
1675		}
1676
1677		if (parc == 0)
1678		{
1679	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
3317	<	me.name, source_p->name, cmd);
1679	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1680		return -1;
1681		}
1682
#	Line 3328 | Line 1690 | parse_aline(const char *cmd, struct Clie
1690		*up_p = user;
1691		*h_p = host;
1692		}
1693	<
1693	>
1694		parc--;
1695		parv++;
1696
1697	<	if (parc != 0)
1697	>	if (parc)
1698		{
1699		if (irccmp(*parv, "ON") == 0)
1700		{
#	Line 3341 | Line 1703 | parse_aline(const char *cmd, struct Clie
1703
1704		if (target_server == NULL)
1705		{
1706	<	sendto_one(source_p, ":%s NOTICE %s :ON server not supported by %s",
1707	<	me.name, source_p->name, cmd);
3346	<	return -1;
1706	>	sendto_one_notice(source_p, &me, ":ON server not supported by %s", cmd);
1707	>	return -1;
1708		}
1709
1710		if (!HasOFlag(source_p, OPER_FLAG_REMOTEBAN))
1711		{
1712	<	sendto_one(source_p, form_str(ERR_NOPRIVS),
3352	<	me.name, source_p->name, "remoteban");
1712	>	sendto_one_numeric(source_p, &me, ERR_NOPRIVS, "remoteban");
1713		return -1;
1714		}
1715
1716		if (parc == 0 || EmptyString(*parv))
1717		{
1718	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1719	<	me.name, source_p->name, cmd);
3360	<	return -1;
1718	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1719	>	return -1;
1720		}
1721
1722		*target_server = *parv;
#	Line 3369 | Line 1728 | parse_aline(const char *cmd, struct Clie
1728		/* Make sure target_server *is* NULL if no ON server found
1729		* caller probably NULL'd it first, but no harm to do it again -db
1730		*/
1731	<	if (target_server != NULL)
1732	<	*target_server = NULL;
1731	>	if (target_server)
1732	>	*target_server = NULL;
1733		}
1734		}
1735
1736	<	if (h_p != NULL)
1736	>	if (h_p)
1737		{
1738	<	if (strchr(user, '!') != NULL)
1738	>	if (strchr(user, '!'))
1739		{
1740	<	sendto_one(source_p, ":%s NOTICE %s :Invalid character '!' in kline",
3382	<	me.name, source_p->name);
1740	>	sendto_one_notice(source_p, &me, ":Invalid character '!' in kline");
1741		return -1;
1742		}
1743
#	Line 3390 | Line 1748 | parse_aline(const char *cmd, struct Clie
1748		if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 1, *up_p))
1749		return -1;
1750
1751	<	if (reason != NULL)
1751	>	if (reason)
1752		{
1753	<	if (parc != 0 && !EmptyString(*parv))
1753	>	if (parc && !EmptyString(*parv))
1754		{
1755		*reason = *parv;
1756	+
1757		if (!valid_comment(source_p, *reason, 1))
1758	<	return -1;
1758	>	return -1;
1759		}
1760		else
1761		*reason = def_reason;
#	Line 3405 | Line 1764 | parse_aline(const char *cmd, struct Clie
1764		return 1;
1765		}
1766
3408	–	/* find_user_host()
3409	–	*
3410	–	* inputs       - pointer to client placing kline
3411	–	*              - pointer to user_host_or_nick
3412	–	*              - pointer to user buffer
3413	–	*              - pointer to host buffer
3414	–	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
3415	–	* side effects -
3416	–	*/
3417	–	static int
3418	–	find_user_host(struct Client *source_p, char *user_host_or_nick,
3419	–	char *luser, char *lhost, unsigned int flags)
3420	–	{
3421	–	struct Client *target_p = NULL;
3422	–	char *hostp = NULL;
3423	–
3424	–	if (lhost == NULL)
3425	–	{
3426	–	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
3427	–	return 1;
3428	–	}
3429	–
3430	–	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
3431	–	{
3432	–	/* Explicit user@host mask given */
3433	–
3434	–	if (hostp != NULL)                            /* I'm a little user@host */
3435	–	{
3436	–	*(hostp++) = '\0';                       /* short and squat */
3437	–	if (*user_host_or_nick)
3438	–	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
3439	–	else
3440	–	strcpy(luser, "*");
3441	–	if (*hostp)
3442	–	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
3443	–	else
3444	–	strcpy(lhost, "*");
3445	–	}
3446	–	else
3447	–	{
3448	–	luser[0] = '*';             /* no @ found, assume its *@somehost */
3449	–	luser[1] = '\0';
3450	–	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
3451	–	}
3452	–
3453	–	return 1;
3454	–	}
3455	–	else if (!(flags & NOUSERLOOKUP))
3456	–	{
3457	–	/* Try to find user@host mask from nick */
3458	–	/* Okay to use source_p as the first param, because source_p == client_p */
3459	–	if ((target_p =
3460	–	find_chasing(source_p, source_p, user_host_or_nick, NULL)) == NULL)
3461	–	return 0;
3462	–
3463	–	if (IsExemptKline(target_p))
3464	–	{
3465	–	if (!IsServer(source_p))
3466	–	sendto_one(source_p,
3467	–	":%s NOTICE %s :%s is E-lined",
3468	–	me.name, source_p->name, target_p->name);
3469	–	return 0;
3470	–	}
3471	–
3472	–	/*
3473	–	* turn the "user" bit into "*user", blow away '~'
3474	–	* if found in original user name (non-idented)
3475	–	*/
3476	–	strlcpy(luser, target_p->username, USERLEN*4 + 1);
3477	–
3478	–	if (target_p->username[0] == '~')
3479	–	luser[0] = '*';
3480	–
3481	–	if (target_p->sockhost[0] == '\0' ||
3482	–	(target_p->sockhost[0] == '0' && target_p->sockhost[1] == '\0'))
3483	–	strlcpy(lhost, target_p->host, HOSTLEN*4 + 1);
3484	–	else
3485	–	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
3486	–	return 1;
3487	–	}
3488	–
3489	–	return 0;
3490	–	}
3491	–
1767		/* valid_comment()
1768		*
1769		* inputs       - pointer to client
#	Line 3500 | Line 1775 | find_user_host(struct Client *source_p,
1775		int
1776		valid_comment(struct Client *source_p, char *comment, int warn)
1777		{
3503	–	if (strchr(comment, '"'))
3504	–	{
3505	–	if (warn)
3506	–	sendto_one(source_p, ":%s NOTICE %s :Invalid character '\"' in comment",
3507	–	me.name, source_p->name);
3508	–	return 0;
3509	–	}
3510	–
1778		if (strlen(comment) > REASONLEN)
1779		comment[REASONLEN-1] = '\0';
1780
#	Line 3522 | Line 1789 | valid_comment(struct Client *source_p, c
1789		* side effects - none
1790		*/
1791		int
1792	<	match_conf_password(const char *password, const struct AccessItem *aconf)
1792	>	match_conf_password(const char *password, const struct MaskItem *conf)
1793		{
1794		const char *encr = NULL;
1795
1796	<	if (password == NULL || aconf->passwd == NULL)
1796	>	if (EmptyString(password) || EmptyString(conf->passwd))
1797		return 0;
1798
1799	<	if (aconf->flags & CONF_FLAGS_ENCRYPTED)
1800	<	{
3534	<	/* use first two chars of the password they send in as salt */
3535	<	/* If the password in the conf is MD5, and ircd is linked
3536	<	* to scrypt on FreeBSD, or the standard crypt library on
3537	<	* glibc Linux, then this code will work fine on generating
3538	<	* the proper encrypted hash for comparison.
3539	<	*/
3540	<	if (*aconf->passwd)
3541	<	encr = crypt(password, aconf->passwd);
3542	<	else
3543	<	encr = "";
3544	<	}
1799	>	if (conf->flags & CONF_FLAGS_ENCRYPTED)
1800	>	encr = crypt(password, conf->passwd);
1801		else
1802		encr = password;
1803
1804	<	return !strcmp(encr, aconf->passwd);
1804	>	return encr && !strcmp(encr, conf->passwd);
1805		}
1806
1807		/*
#	Line 3553 | Line 1809 | match_conf_password(const char *password
1809		*
1810		* inputs       - client sending the cluster
1811		*              - command name "KLINE" "XLINE" etc.
1812	<	*              - capab -- CAP_KLN etc. from s_serv.h
1812	>	*              - capab -- CAP_KLN etc. from server.h
1813		*              - cluster type -- CLUSTER_KLINE etc. from conf.h
1814		*              - pattern and args to send along
1815		* output       - none
#	Line 3565 | Line 1821 | cluster_a_line(struct Client *source_p,
1821		int capab, int cluster_type, const char *pattern, ...)
1822		{
1823		va_list args;
1824	<	char buffer[IRCD_BUFSIZE];
1825	<	const dlink_node *ptr = NULL;
1824	>	char buffer[IRCD_BUFSIZE] = "";
1825	>	const dlink_node *node = NULL;
1826
1827		va_start(args, pattern);
1828		vsnprintf(buffer, sizeof(buffer), pattern, args);
1829		va_end(args);
1830
1831	<	DLINK_FOREACH(ptr, cluster_items.head)
1831	>	DLINK_FOREACH(node, cluster_items.head)
1832		{
1833	<	const struct ConfItem *conf = ptr->data;
1833	>	const struct MaskItem *conf = node->data;
1834
1835		if (conf->flags & cluster_type)
1836		sendto_match_servs(source_p, conf->name, CAP_CLUSTER|capab,
1837	<	"%s %s %s", command, conf->name, buffer);
1837	>	"%s %s %s", command, conf->name, buffer);
1838		}
1839		}
1840
#	Line 3617 | Line 1873 | split_nuh(struct split_nuh_item *const i
1873
1874		if (iptr->nickptr)
1875		strlcpy(iptr->nickptr, "*", iptr->nicksize);
1876	+
1877		if (iptr->userptr)
1878		strlcpy(iptr->userptr, "*", iptr->usersize);
1879	+
1880		if (iptr->hostptr)
1881		strlcpy(iptr->hostptr, "*", iptr->hostsize);
1882
#	Line 3626 | Line 1884 | split_nuh(struct split_nuh_item *const i
1884		{
1885		*p = '\0';
1886
1887	<	if (iptr->nickptr && *iptr->nuhmask != '\0')
1887	>	if (iptr->nickptr && *iptr->nuhmask)
1888		strlcpy(iptr->nickptr, iptr->nuhmask, iptr->nicksize);
1889
1890	<	if ((q = strchr(++p, '@'))) {
1890	>	if ((q = strchr(++p, '@')))
1891	>	{
1892		*q++ = '\0';
1893
1894	<	if (*p != '\0')
1894	>	if (*p)
1895		strlcpy(iptr->userptr, p, iptr->usersize);
1896
1897	<	if (*q != '\0')
1897	>	if (*q)
1898		strlcpy(iptr->hostptr, q, iptr->hostsize);
1899		}
1900		else
1901		{
1902	<	if (*p != '\0')
1902	>	if (*p)
1903		strlcpy(iptr->userptr, p, iptr->usersize);
1904		}
1905		}
#	Line 3652 | Line 1911 | split_nuh(struct split_nuh_item *const i
1911		/* if found a @ */
1912		*p++ = '\0';
1913
1914	<	if (*iptr->nuhmask != '\0')
1914	>	if (*iptr->nuhmask)
1915		strlcpy(iptr->userptr, iptr->nuhmask, iptr->usersize);
1916
1917	<	if (*p != '\0')
1917	>	if (*p)
1918		strlcpy(iptr->hostptr, p, iptr->hostsize);
1919		}
1920		else
#	Line 3668 | Line 1927 | split_nuh(struct split_nuh_item *const i
1927		}
1928		}
1929		}
3671	–
3672	–	/*
3673	–	* flags_to_ascii
3674	–	*
3675	–	* inputs       - flags is a bitmask
3676	–	*              - pointer to table of ascii letters corresponding
3677	–	*                to each bit
3678	–	*              - flag 1 for convert ToLower if bit missing
3679	–	*                0 if ignore.
3680	–	* output       - none
3681	–	* side effects - string pointed to by p has bitmap chars written to it
3682	–	*/
3683	–	static void
3684	–	flags_to_ascii(unsigned int flags, const unsigned int bit_table[], char *p,
3685	–	int lowerit)
3686	–	{
3687	–	unsigned int mask = 1;
3688	–	int i = 0;
3689	–
3690	–	for (mask = 1; (mask != 0) && (bit_table[i] != 0); mask <<= 1, i++)
3691	–	{
3692	–	if (flags & mask)
3693	–	*p++ = bit_table[i];
3694	–	else if (lowerit)
3695	–	*p++ = ToLower(bit_table[i]);
3696	–	}
3697	–	*p = '\0';
3698	–	}
3699	–
3700	–	/*
3701	–	* cidr_limit_reached
3702	–	*
3703	–	* inputs       - int flag allowing over_rule of limits
3704	–	*              - pointer to the ip to be added
3705	–	*              - pointer to the class
3706	–	* output       - non zero if limit reached
3707	–	*                0 if limit not reached
3708	–	* side effects -
3709	–	*/
3710	–	static int
3711	–	cidr_limit_reached(int over_rule,
3712	–	struct irc_ssaddr *ip, struct ClassItem *aclass)
3713	–	{
3714	–	dlink_node *ptr = NULL;
3715	–	struct CidrItem *cidr;
3716	–
3717	–	if (NumberPerCidr(aclass) <= 0)
3718	–	return 0;
3719	–
3720	–	if (ip->ss.ss_family == AF_INET)
3721	–	{
3722	–	if (CidrBitlenIPV4(aclass) <= 0)
3723	–	return 0;
3724	–
3725	–	DLINK_FOREACH(ptr, aclass->list_ipv4.head)
3726	–	{
3727	–	cidr = ptr->data;
3728	–	if (match_ipv4(ip, &cidr->mask, CidrBitlenIPV4(aclass)))
3729	–	{
3730	–	if (!over_rule && (cidr->number_on_this_cidr >= NumberPerCidr(aclass)))
3731	–	return -1;
3732	–	cidr->number_on_this_cidr++;
3733	–	return 0;
3734	–	}
3735	–	}
3736	–	cidr = MyMalloc(sizeof(struct CidrItem));
3737	–	cidr->number_on_this_cidr = 1;
3738	–	cidr->mask = *ip;
3739	–	mask_addr(&cidr->mask, CidrBitlenIPV4(aclass));
3740	–	dlinkAdd(cidr, &cidr->node, &aclass->list_ipv4);
3741	–	}
3742	–	#ifdef IPV6
3743	–	else if (CidrBitlenIPV6(aclass) > 0)
3744	–	{
3745	–	DLINK_FOREACH(ptr, aclass->list_ipv6.head)
3746	–	{
3747	–	cidr = ptr->data;
3748	–	if (match_ipv6(ip, &cidr->mask, CidrBitlenIPV6(aclass)))
3749	–	{
3750	–	if (!over_rule && (cidr->number_on_this_cidr >= NumberPerCidr(aclass)))
3751	–	return -1;
3752	–	cidr->number_on_this_cidr++;
3753	–	return 0;
3754	–	}
3755	–	}
3756	–	cidr = MyMalloc(sizeof(struct CidrItem));
3757	–	cidr->number_on_this_cidr = 1;
3758	–	cidr->mask = *ip;
3759	–	mask_addr(&cidr->mask, CidrBitlenIPV6(aclass));
3760	–	dlinkAdd(cidr, &cidr->node, &aclass->list_ipv6);
3761	–	}
3762	–	#endif
3763	–	return 0;
3764	–	}
3765	–
3766	–	/*
3767	–	* remove_from_cidr_check
3768	–	*
3769	–	* inputs       - pointer to the ip to be removed
3770	–	*              - pointer to the class
3771	–	* output       - NONE
3772	–	* side effects -
3773	–	*/
3774	–	static void
3775	–	remove_from_cidr_check(struct irc_ssaddr *ip, struct ClassItem *aclass)
3776	–	{
3777	–	dlink_node *ptr = NULL;
3778	–	dlink_node *next_ptr = NULL;
3779	–	struct CidrItem *cidr;
3780	–
3781	–	if (NumberPerCidr(aclass) == 0)
3782	–	return;
3783	–
3784	–	if (ip->ss.ss_family == AF_INET)
3785	–	{
3786	–	if (CidrBitlenIPV4(aclass) <= 0)
3787	–	return;
3788	–
3789	–	DLINK_FOREACH_SAFE(ptr, next_ptr, aclass->list_ipv4.head)
3790	–	{
3791	–	cidr = ptr->data;
3792	–	if (match_ipv4(ip, &cidr->mask, CidrBitlenIPV4(aclass)))
3793	–	{
3794	–	cidr->number_on_this_cidr--;
3795	–	if (cidr->number_on_this_cidr == 0)
3796	–	{
3797	–	dlinkDelete(ptr, &aclass->list_ipv4);
3798	–	MyFree(cidr);
3799	–	return;
3800	–	}
3801	–	}
3802	–	}
3803	–	}
3804	–	#ifdef IPV6
3805	–	else if (CidrBitlenIPV6(aclass) > 0)
3806	–	{
3807	–	DLINK_FOREACH_SAFE(ptr, next_ptr, aclass->list_ipv6.head)
3808	–	{
3809	–	cidr = ptr->data;
3810	–	if (match_ipv6(ip, &cidr->mask, CidrBitlenIPV6(aclass)))
3811	–	{
3812	–	cidr->number_on_this_cidr--;
3813	–	if (cidr->number_on_this_cidr == 0)
3814	–	{
3815	–	dlinkDelete(ptr, &aclass->list_ipv6);
3816	–	MyFree(cidr);
3817	–	return;
3818	–	}
3819	–	}
3820	–	}
3821	–	}
3822	–	#endif
3823	–	}
3824	–
3825	–	static void
3826	–	rebuild_cidr_list(int aftype, struct ConfItem *oldcl, struct ClassItem *newcl,
3827	–	dlink_list *old_list, dlink_list *new_list, int changed)
3828	–	{
3829	–	dlink_node *ptr;
3830	–	struct Client *client_p;
3831	–	struct ConfItem *conf;
3832	–	struct AccessItem *aconf;
3833	–
3834	–	if (!changed)
3835	–	{
3836	–	*new_list = *old_list;
3837	–	old_list->head = old_list->tail = NULL;
3838	–	old_list->length = 0;
3839	–	return;
3840	–	}
3841	–
3842	–	DLINK_FOREACH(ptr, local_client_list.head)
3843	–	{
3844	–	client_p = ptr->data;
3845	–	if (client_p->localClient->aftype != aftype)
3846	–	continue;
3847	–	if (dlink_list_length(&client_p->localClient->confs) == 0)
3848	–	continue;
3849	–
3850	–	conf = client_p->localClient->confs.tail->data;
3851	–	if (conf->type == CLIENT_TYPE)
3852	–	{
3853	–	aconf = map_to_conf(conf);
3854	–	if (aconf->class_ptr == oldcl)
3855	–	cidr_limit_reached(1, &client_p->localClient->ip, newcl);
3856	–	}
3857	–	}
3858	–	}
3859	–
3860	–	/*
3861	–	* rebuild_cidr_class
3862	–	*
3863	–	* inputs       - pointer to old conf
3864	–	*              - pointer to new_class
3865	–	* output       - none
3866	–	* side effects - rebuilds the class link list of cidr blocks
3867	–	*/
3868	–	void
3869	–	rebuild_cidr_class(struct ConfItem *conf, struct ClassItem *new_class)
3870	–	{
3871	–	struct ClassItem *old_class = map_to_conf(conf);
3872	–
3873	–	if (NumberPerCidr(old_class) > 0 && NumberPerCidr(new_class) > 0)
3874	–	{
3875	–	if (CidrBitlenIPV4(old_class) > 0 && CidrBitlenIPV4(new_class) > 0)
3876	–	rebuild_cidr_list(AF_INET, conf, new_class,
3877	–	&old_class->list_ipv4, &new_class->list_ipv4,
3878	–	CidrBitlenIPV4(old_class) != CidrBitlenIPV4(new_class));
3879	–
3880	–	#ifdef IPV6
3881	–	if (CidrBitlenIPV6(old_class) > 0 && CidrBitlenIPV6(new_class) > 0)
3882	–	rebuild_cidr_list(AF_INET6, conf, new_class,
3883	–	&old_class->list_ipv6, &new_class->list_ipv6,
3884	–	CidrBitlenIPV6(old_class) != CidrBitlenIPV6(new_class));
3885	–	#endif
3886	–	}
3887	–
3888	–	destroy_cidr_class(old_class);
3889	–	}
3890	–
3891	–	/*
3892	–	* destroy_cidr_list
3893	–	*
3894	–	* inputs       - pointer to class dlink list of cidr blocks
3895	–	* output       - none
3896	–	* side effects - completely destroys the class link list of cidr blocks
3897	–	*/
3898	–	static void
3899	–	destroy_cidr_list(dlink_list *list)
3900	–	{
3901	–	dlink_node *ptr = NULL, *next_ptr = NULL;
3902	–
3903	–	DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
3904	–	{
3905	–	dlinkDelete(ptr, list);
3906	–	MyFree(ptr->data);
3907	–	}
3908	–	}
3909	–
3910	–	/*
3911	–	* destroy_cidr_class
3912	–	*
3913	–	* inputs       - pointer to class
3914	–	* output       - none
3915	–	* side effects - completely destroys the class link list of cidr blocks
3916	–	*/
3917	–	static void
3918	–	destroy_cidr_class(struct ClassItem *aclass)
3919	–	{
3920	–	destroy_cidr_list(&aclass->list_ipv4);
3921	–	destroy_cidr_list(&aclass->list_ipv6);
3922	–	}

Diff Legend

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