ViewVC Help

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

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

Comparing:
ircd-hybrid-7.3/src/s_conf.c (file contents), Revision 1123 by michael, Sun Feb 6 21:57:50 2011 UTC vs.
ircd-hybrid/trunk/src/conf.c (file contents), Revision 5776 by michael, Sat Apr 4 17:31:30 2015 UTC

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

Diff Legend

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